ChildMindInstitute · anq83 · Feb 15, 2024 · Feb 2, 2024 · Feb 6, 2024 · Feb 6, 2024
diff --git a/src/app/index.tsx b/src/app/index.tsx
@@ -3,7 +3,7 @@ import { LogBox } from 'react-native';
 import { RootNavigator } from '@screens';
 
 import localization from '@jobs/localization';
-import { Logger, jobRunner, AnalyticsService } from '@shared/lib';
+import { Logger, jobRunner } from '@shared/lib';
 
 import { AppProvider } from './ui';
 
@@ -18,8 +18,6 @@ jobRunner.runAll([localization]);
 
 Logger.configure();
 
-AnalyticsService.init();
-
 const App = () => {
   return (
     <AppProvider>

diff --git a/src/app/ui/AppProvider/AnalyticsProvider.tsx b/src/app/ui/AppProvider/AnalyticsProvider.tsx
@@ -0,0 +1,19 @@
+import { FC, PropsWithChildren, useEffect } from 'react';
+
+import { AnalyticsService, Logger, useSystemBootUp } from '@app/shared/lib';
+
+const AnalyticsProvider: FC<PropsWithChildren> = ({ children }) => {
+  const { onModuleInitialized } = useSystemBootUp();
+
+  useEffect(() => {
+    AnalyticsService.init().then(() => {
+      Logger.log('[AnalyticsProvider]: Initialized');
+
+      onModuleInitialized('analytics');
+    });
+  }, [onModuleInitialized]);
+
+  return <>{children}</>;
+};
+
+export default AnalyticsProvider;
diff --git a/src/app/ui/AppProvider/SystemBootUpProvider.tsx b/src/app/ui/AppProvider/SystemBootUpProvider.tsx
@@ -9,7 +9,7 @@ type Props = PropsWithChildren<{
 const SYSTEM_BOOT_UP_DELAY = 300;
 
 function SystemBootUpProvider({ children, onLoadingFinished }: Props) {
-  const moduleWaitList = useRef(['cache', 'state']);
+  const moduleWaitList = useRef(['cache', 'state', 'analytics']);
 
   const onLoadingFinishedRef = useRef(onLoadingFinished);
 

diff --git a/src/app/ui/AppProvider/index.tsx b/src/app/ui/AppProvider/index.tsx
@@ -7,7 +7,9 @@ import { Dirs } from 'react-native-file-access';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 import { LocalizationProvider } from '@app/entities/localization';
+import { AnalyticsService, Logger, MixEvents } from '@app/shared/lib';
 
+import AnalyticsProvider from './AnalyticsProvider';
 import NavigationProvider from './NavigationProvider';
 import ReactQueryProvider from './ReactQueryProvider';
 import ReduxProvider from './ReduxProvider';
@@ -27,26 +29,36 @@ CacheManager.config = {
 const AppProvider: FC<PropsWithChildren> = ({ children }) => {
   const [isBootingUp, setIsBootingUp] = useState(true);
 
+  const onLoadingFinished = () => {
+    Logger.log('[AppProvider]: App loaded');
+
+    AnalyticsService.track(MixEvents.AppOpen);
+
+    setIsBootingUp(false);
+  };
+
   return (
     <GestureHandlerRootView style={styles.gestureHandlerView}>
-      <SystemBootUpProvider onLoadingFinished={() => setIsBootingUp(false)}>
-        <ReduxProvider>
-          <ReactQueryProvider>
-            <LocalizationProvider>
-              <TamaguiProvider>
-                <NavigationProvider>
-                  <PortalProvider>
-                    <ToastProvider>
-                      <SplashProvider isLoading={isBootingUp}>
-                        {children}
-                      </SplashProvider>
-                    </ToastProvider>
-                  </PortalProvider>
-                </NavigationProvider>
-              </TamaguiProvider>
-            </LocalizationProvider>
-          </ReactQueryProvider>
-        </ReduxProvider>
+      <SystemBootUpProvider onLoadingFinished={onLoadingFinished}>
+        <AnalyticsProvider>
+          <ReduxProvider>
+            <ReactQueryProvider>
+              <LocalizationProvider>
+                <TamaguiProvider>
+                  <NavigationProvider>
+                    <PortalProvider>
+                      <ToastProvider>
+                        <SplashProvider isLoading={isBootingUp}>
+                          {children}
+                        </SplashProvider>
+                      </ToastProvider>
+                    </PortalProvider>
+                  </NavigationProvider>
+                </TamaguiProvider>
+              </LocalizationProvider>
+            </ReactQueryProvider>
+          </ReduxProvider>
+        </AnalyticsProvider>
       </SystemBootUpProvider>
     </GestureHandlerRootView>
   );

diff --git a/src/entities/activity/lib/hooks/useRetryUpload.ts b/src/entities/activity/lib/hooks/useRetryUpload.ts
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 
-import { AnalyticsService } from '@shared/lib';
+import { AnalyticsService, MixEvents } from '@shared/lib';
 
 import { showUploadErrorAlert } from '../alerts';
 import { UploadObservable } from '../observables';
@@ -28,7 +28,7 @@ export const useRetryUpload = ({
 
     showUploadErrorAlert({
       onRetry: async () => {
-        AnalyticsService.track('Retry button pressed');
+        AnalyticsService.track(MixEvents.RetryButtonPressed);
         try {
           setIsAlertOpened(false);
 

diff --git a/src/entities/activity/ui/UploadRetryBanner.tsx b/src/entities/activity/ui/UploadRetryBanner.tsx
@@ -4,7 +4,7 @@ import { AccessibilityProps } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { Box, Button, Text } from '@app/shared/ui';
-import { AnalyticsService } from '@shared/lib';
+import { AnalyticsService, MixEvents } from '@shared/lib';
 
 import useQueueProcessing from '../lib/hooks/useQueueProcessing';
 
@@ -16,7 +16,7 @@ const UploadRetryBanner: FC<Props> = () => {
   const { t } = useTranslation();
 
   const onRetry = () => {
-    AnalyticsService.track('Retry button pressed');
+    AnalyticsService.track(MixEvents.RetryButtonPressed);
     process();
   };
 

diff --git a/src/entities/applet/model/hooks/useStartEntity.ts b/src/entities/applet/model/hooks/useStartEntity.ts
@@ -13,6 +13,8 @@ import {
   ILogger,
   isAppOnline,
   Logger,
+  MixEvents,
+  MixProperties,
   useAppDispatch,
   useAppletInfo,
   useAppSelector,
@@ -125,6 +127,36 @@ function useStartEntity({
       });
     };
 
+    const appletName = getAppletDisplayName(appletId);
+
+    const logStart = () => {
+      logger.log(
+        `[useStartEntity.startActivity]: Activity "${entityName}|${activityId}" started, applet "${appletName}|${appletId}"`,
+      );
+      AnalyticsService.track(MixEvents.AssessmentStarted, {
+        [MixProperties.AppletId]: appletId,
+      });
+    };
+    const logRestart = () => {
+      logger.log(
+        `[useStartEntity.startActivity]: Activity "${entityName}|${activityId}" restarted, applet "${appletName}|${appletId}"`,
+      );
+      AnalyticsService.track(MixEvents.ActivityRestart, {
+        [MixProperties.AppletId]: appletId,
+      });
+      AnalyticsService.track(MixEvents.AssessmentStarted, {
+        [MixProperties.AppletId]: appletId,
+      });
+    };
+    const logResume = () => {
+      logger.log(
+        `[useStartEntity.startActivity]: Activity "${entityName}|${activityId}" resumed, applet "${appletName}|${appletId}"`,
+      );
+      AnalyticsService.track(MixEvents.ActivityResume, {
+        [MixProperties.AppletId]: appletId,
+      });
+    };
+
     return new Promise<StartResult>(resolve => {
       if (shouldBreakDueToMediaReferences()) {
         onMediaReferencesFound();
@@ -148,8 +180,6 @@ function useStartEntity({
         getProgress(appletId, activityId, eventId),
       );
 
-      const appletName = getAppletDisplayName(appletId);
-
       if (isActivityInProgress) {
         if (isTimerElapsed) {
           resolve({ startedFromScratch: false });
@@ -159,27 +189,17 @@ function useStartEntity({
         onBeforeStartingActivity({
           onRestart: () => {
             cleanUpMediaFiles({ activityId, appletId, eventId, order: 0 });
-
-            logger.log(
-              `[useStartEntity.startActivity]: Activity "${entityName}|${activityId}" restarted, applet "${appletName}|${appletId}"`,
-            );
+            logRestart();
             activityStarted(appletId, activityId, eventId);
             resolve({ startedFromScratch: true });
           },
           onResume: () => {
-            logger.log(
-              `[useStartEntity.startActivity]: Activity "${entityName}|${activityId}" resumed, applet "${appletName}|${appletId}"`,
-            );
+            logResume();
             return resolve({ startedFromScratch: false });
           },
         });
       } else {
-        logger.log(
-          `[useStartEntity.startActivity]: Activity "${entityName}|${activityId}" started, applet "${appletName}|${appletId}"`,
-        );
-
-        AnalyticsService.track('Assessment started');
-
+        logStart();
         activityStarted(appletId, activityId, eventId);
         resolve({ startedFromScratch: true });
       }
@@ -230,6 +250,36 @@ function useStartEntity({
       return flow.activityIds;
     };
 
+    const appletName = getAppletDisplayName(appletId);
+
+    const logStart = () => {
+      logger.log(
+        `[useStartEntity.startFlow]: Flow "${entityName}|${flowId}" started, applet "${appletName}|${appletId}"`,
+      );
+      AnalyticsService.track(MixEvents.AssessmentStarted, {
+        [MixProperties.AppletId]: appletId,
+      });
+    };
+    const logRestart = () => {
+      logger.log(
+        `[useStartEntity.startFlow]: Flow "${entityName}|${flowId}" restarted, applet "${appletName}|${appletId}"`,
+      );
+      AnalyticsService.track(MixEvents.ActivityRestart, {
+        [MixProperties.AppletId]: appletId,
+      });
+      AnalyticsService.track(MixEvents.AssessmentStarted, {
+        [MixProperties.AppletId]: appletId,
+      });
+    };
+    const logResume = () => {
+      logger.log(
+        `[useStartEntity.startFlow]: Flow "${entityName}|${flowId}" resumed, applet "${appletName}|${appletId}"`,
+      );
+      AnalyticsService.track(MixEvents.ActivityResume, {
+        [MixProperties.AppletId]: appletId,
+      });
+    };
+
     const flowActivities: string[] = getFlowActivities();
 
     const firstActivityId: string = flowActivities[0];
@@ -255,8 +305,6 @@ function useStartEntity({
         getProgress(appletId, flowId, eventId),
       );
 
-      const appletName = getAppletDisplayName(appletId);
-
       if (isFlowInProgress) {
         if (isTimerElapsed) {
           resolve({
@@ -275,32 +323,21 @@ function useStartEntity({
                 order: i,
               });
             }
-            logger.log(
-              `[useStartEntity.startFlow]: Flow "${entityName}|${flowId}" restarted, applet "${appletName}|${appletId}"`,
-            );
-
+            logRestart();
             flowStarted(appletId, flowId, firstActivityId, eventId, 0);
             resolve({
               startedFromScratch: true,
             });
           },
           onResume: () => {
-            logger.log(
-              `[useStartEntity.startFlow]: Flow "${entityName}|${flowId}" resumed, applet "${appletName}|${appletId}"`,
-            );
-
+            logResume();
             return resolve({
               startedFromScratch: false,
             });
           },
         });
       } else {
-        logger.log(
-          `[useStartEntity.startFlow]: Flow "${entityName}|${flowId}" started, applet "${appletName}|${appletId}"`,
-        );
-
-        AnalyticsService.track('Assessment started');
-
+        logStart();
         flowStarted(appletId, flowId, firstActivityId, eventId, 0);
         resolve({
           startedFromScratch: true,

diff --git a/src/features/login/ui/LoginForm.tsx b/src/features/login/ui/LoginForm.tsx
@@ -12,6 +12,7 @@ import { SessionModel } from '@entities/session';
 import {
   AnalyticsService,
   executeIfOnline,
+  MixEvents,
   useAppDispatch,
   useAppForm,
   useFormChanges,
@@ -61,7 +62,7 @@ const LoginForm: FC<Props> = props => {
       SessionModel.storeSession(session);
 
       AnalyticsService.login(user.id).then(() => {
-        AnalyticsService.track('Login Successful');
+        AnalyticsService.track(MixEvents.LoginSuccessful);
       });
 
       props.onLoginSuccess();

diff --git a/src/features/pass-survey/model/tests/ScoresCalculator.collectMaxScores.test.ts b/src/features/pass-survey/model/tests/ScoresCalculator.collectMaxScores.test.ts
@@ -59,6 +59,7 @@ const getEmptyRadioItem = (name: string): RadioPipelineItem => {
       setAlerts: false,
       setPalette: false,
       options: [],
+      autoAdvance: false,
     },
     type: 'Radio',
   };

diff --git a/src/features/pass-survey/model/tests/ScoresCalculator.collectScoreForRadio.test.ts b/src/features/pass-survey/model/tests/ScoresCalculator.collectScoreForRadio.test.ts
@@ -34,6 +34,7 @@ const getEmptyItem = (): RadioPipelineItem => {
       setAlerts: false,
       setPalette: false,
       options: [],
+      autoAdvance: false,
     },
     type: 'Radio',
   };

diff --git a/src/features/pass-survey/ui/ActivityStepper.tsx b/src/features/pass-survey/ui/ActivityStepper.tsx
@@ -31,7 +31,7 @@ type Props = {
   idleTimer: HourMinute | null;
   entityStartedAt: number;
   timer: HourMinute | null;
-  onClose: () => void;
+  onClose: (reason: 'regular' | 'click-on-return') => void;
   onFinish: (reason: 'regular' | 'idle') => void;
 };
 
@@ -207,6 +207,10 @@ function ActivityStepper({
     restartIdleTimer();
   };
 
+  const onStartReached = () => {
+    onClose('click-on-return');
+  };
+
   const onEndReached = (isForced: boolean) => {
     if (!isForced) {
       trackUserAction(userActionCreator.done());
@@ -233,7 +237,7 @@ function ActivityStepper({
         onBack={onBack}
         onBeforeNext={onBeforeNext}
         onBeforeBack={onBeforeBack}
-        onStartReached={onClose}
+        onStartReached={onStartReached}
         onEndReached={onEndReached}
         onUndo={onUndo}
       >

diff --git a/src/features/sign-up/model/hooks/useRegistrationMutation.ts b/src/features/sign-up/model/hooks/useRegistrationMutation.ts
@@ -9,7 +9,7 @@ import {
   IdentityModel,
 } from '@entities/identity';
 import { SessionModel } from '@entities/session';
-import { AnalyticsService, useAppDispatch } from '@shared/lib';
+import { AnalyticsService, MixEvents, useAppDispatch } from '@shared/lib';
 import { encryption } from '@shared/lib';
 
 type UseRegistrationReturn = {
@@ -49,7 +49,7 @@ export const useRegistrationMutation = (
       SessionModel.storeSession(session);
 
       AnalyticsService.login(user.id).then(() => {
-        AnalyticsService.track('Signup Successful');
+        AnalyticsService.track(MixEvents.SignupSuccessful);
       });
 
       if (onSuccess) {