From 269d989965b2f4de87b53b69a677dcc13e76dfc1 Mon Sep 17 00:00:00 2001
From: yashmantri <mantri.ramkishor@navi.com>
Date: Tue, 9 Jul 2024 19:25:23 +0530
Subject: [PATCH] TP-72939 | MS clarity

---
 App.tsx                          | 20 ++++----------------
 src/common/TrackingComponent.tsx | 12 ++++++++++--
 src/constants/Global.ts          |  1 -
 src/screens/auth/AuthRouter.tsx  | 13 +++++++++----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/App.tsx b/App.tsx
index 1d54293a..725ddbae 100644
--- a/App.tsx
+++ b/App.tsx
@@ -20,13 +20,10 @@ import FullScreenLoader from './RN-UI-LIB/src/components/FullScreenLoader';
 import { toastConfigs, ToastContainer } from './RN-UI-LIB/src/components/toast';
 import { navigationRef } from './src/components/utlis/navigationUtlis';
 
-import {
-  getAsyncStorageItem,
-  sendDeviceDetailsToClickstream,
-} from '@components/utlis/commonFunctions';
+import { sendDeviceDetailsToClickstream } from '@components/utlis/commonFunctions';
 import { linkingConf } from '@components/utlis/deeplinkingUtils';
 import { getBuildFlavour } from '@components/utlis/DeviceUtils';
-import { GLOBAL, setGlobalBuildFlavour } from '@constants/Global';
+import { setGlobalBuildFlavour } from '@constants/Global';
 import analytics from '@react-native-firebase/analytics';
 import dayJs from 'dayjs';
 import { COLORS } from './RN-UI-LIB/src/styles/colors';
@@ -38,7 +35,7 @@ import { getPermissionsToRequest } from './src/components/utlis/PermissionUtils'
 import ScreenshotBlocker from './src/components/utlis/ScreenshotBlocker';
 import { initSentry } from './src/components/utlis/sentry';
 import { setItem } from './src/components/utlis/storageHelper';
-import { APM_APP_NAME, APM_BASE_URL, ENV, MS_CLARITY_PROJECT_ID } from './src/constants/config';
+import { APM_APP_NAME, APM_BASE_URL, ENV } from './src/constants/config';
 import usePolling from './src/hooks/usePolling';
 import AuthRouter from './src/screens/auth/AuthRouter';
 import { type TDocumentObj } from './src/screens/caseDetails/interface';
@@ -47,7 +44,7 @@ import { addClickstreamEvent } from './src/services/clickstreamEventService';
 import { setJsErrorHandler } from './src/services/exception-handler.service';
 import fetchUpdatedRemoteConfig from './src/services/firebaseFetchAndUpdate.service';
 import { StorageKeys } from './src/types/storageKeys';
-import { initialize, setCurrentScreenName } from 'react-native-clarity';
+import { setCurrentScreenName } from 'react-native-clarity';
 
 initSentry();
 
@@ -156,15 +153,6 @@ function App() {
     };
   }, []);
 
-  React.useEffect(() => {
-    if (ENV === 'prod' && GLOBAL.IS_CLARTIY_ENABLED) {
-      if (MS_CLARITY_PROJECT_ID && !GLOBAL.MS_CLARITY_INITIALIZED) {
-        initialize(MS_CLARITY_PROJECT_ID);
-        GLOBAL.MS_CLARITY_INITIALIZED = true;
-      }
-    }
-  }, [GLOBAL.IS_CLARTIY_ENABLED]);
-
   return (
     <Provider store={store}>
       <PersistGate
diff --git a/src/common/TrackingComponent.tsx b/src/common/TrackingComponent.tsx
index 67868a83..08440991 100644
--- a/src/common/TrackingComponent.tsx
+++ b/src/common/TrackingComponent.tsx
@@ -19,7 +19,11 @@ import { setIsTimeSynced } from '../reducer/foregroundServiceSlice';
 import { logError } from '../components/utlis/errorUtils';
 import { useAppDispatch, useAppSelector } from '../hooks';
 import { dataSyncService } from '../services/dataSync.service';
-import { DATA_SYNC_TIME_INTERVAL, IS_DATA_SYNC_REQUIRED } from '../constants/config';
+import {
+  DATA_SYNC_TIME_INTERVAL,
+  IS_DATA_SYNC_REQUIRED,
+  MS_CLARITY_PROJECT_ID,
+} from '../constants/config';
 import useIsLocationEnabled from '../hooks/useIsLocationEnabled';
 import {
   type ISyncCaseIdPayload,
@@ -67,6 +71,7 @@ import { sendAudiosToServer } from '@services/audioSyncService';
 import { sendVideosToServer } from '@services/videoSyncService';
 import { getSyncUrl } from '@services/syncJsonDataToBe';
 import { handleCheckAndUpdatePullToRefreshStateForNearbyCases } from '@screens/allCases/utils';
+import { initialize } from 'react-native-clarity';
 
 export enum FOREGROUND_TASKS {
   GEOLOCATION = 'GEOLOCATION',
@@ -387,7 +392,10 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
         { 'x-customer-id': GLOBAL.AGENT_ID }
       );
 
-      GLOBAL.IS_CLARTIY_ENABLED = msClarityResponse;
+      if (MS_CLARITY_PROJECT_ID && !GLOBAL.MS_CLARITY_INITIALIZED && msClarityResponse) {
+        initialize(MS_CLARITY_PROJECT_ID);
+        GLOBAL.MS_CLARITY_INITIALIZED = true;
+      }
       setAsyncStorageItem(LocalStorageKeys.IS_DATA_SYNC_ALLOWED, dataSyncResponse);
     }
     if (nextAppState === AppStates.BACKGROUND) {
diff --git a/src/constants/Global.ts b/src/constants/Global.ts
index 4bb028a0..6dd1e0e4 100644
--- a/src/constants/Global.ts
+++ b/src/constants/Global.ts
@@ -17,7 +17,6 @@ export const GLOBAL = {
   SELECTED_AGENT_ID: '',
   BUILD_FLAVOUR: '',
   MS_CLARITY_INITIALIZED: false,
-  IS_CLARTIY_ENABLED: false
 };
 
 interface IGlobalUserData {
diff --git a/src/screens/auth/AuthRouter.tsx b/src/screens/auth/AuthRouter.tsx
index dd670dfe..4506d705 100644
--- a/src/screens/auth/AuthRouter.tsx
+++ b/src/screens/auth/AuthRouter.tsx
@@ -35,6 +35,8 @@ import getLitmusExperimentResult, {
 import { LocalStorageKeys } from '@common/Constants';
 import ModalWrapperForAlfredV2 from '@common/ModalWrapperForAlfredV2';
 import IdCardApproved from '@screens/AgentIdCard/IdCardStatus/IdCardApproved';
+import { MS_CLARITY_PROJECT_ID } from '@constants/config';
+import { initialize } from 'react-native-clarity';
 
 function AuthRouter() {
   const dispatch = useAppDispatch();
@@ -140,15 +142,18 @@ function AuthRouter() {
   }, [isLoggedIn]);
 
   useEffect(() => {
-    if (GLOBAL.DEVICE_ID) {
+    if (deviceId) {
       getLitmusExperimentResult(LitmusExperimentNameMap[LitmusExperimentName.MS_CLARITY], {
         'x-customer-id': GLOBAL.AGENT_ID,
-        deviceId: GLOBAL.DEVICE_ID,
+        deviceId: deviceId,
       }).then((response) => {
-        GLOBAL.IS_CLARTIY_ENABLED = response;
+        if (MS_CLARITY_PROJECT_ID && !GLOBAL.MS_CLARITY_INITIALIZED && response) {
+          initialize(MS_CLARITY_PROJECT_ID);
+          GLOBAL.MS_CLARITY_INITIALIZED = true;
+        }
       });
     }
-  }, [GLOBAL.DEVICE_ID]);
+  }, [deviceId]);
 
   // Firebase cloud messaging listener
   useFCM();