refactor: code restructuring and cleanup (#453)

tsyirvo · web-flow · commit dc783cff57e9 · 2026-01-07T10:35:44.000+01:00
* refactor: move around the navigation utils files

* refactor: simplify auth context folder structure

* feat: start tracking user as soon as available

* refactor: better feature flag type separation

* refactor: better types for useRunOnMount

* chore: leverage doppler default config

* fix: proper positioning of overlay components

* chore: add placeholder env value

* chore: handle PR review
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -0,0 +1,26 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+language: 'en-US'
+early_access: false
+reviews:
+  profile: 'chill'
+  request_changes_workflow: false
+  high_level_summary: true
+  poem: false
+  review_status: true
+  collapse_walkthrough: false
+  changed_files_summary: false
+  estimate_code_review_effort: false
+  auto_review:
+    enabled: true
+    drafts: false
+  tools:
+    github-checks:
+      enabled: true
+      timeout_ms: 300000
+chat:
+  auto_reply: true
+knowledge_base:
+  linear:
+    usage: 'enabled'
+    team_keys:
+      - 'INO'
diff --git a/.env.development b/.env.development
@@ -1,6 +1,7 @@
 APP_NAME="Dev"
 EAS_PROJECT_ID=""
 EXPO_APPLE_TEAM_ID=""
+EXPO_UPDATE_URL=""
 
 API_URL=""
 ITUNES_ITEM_ID=""
diff --git a/.env.production b/.env.production
@@ -1,6 +1,7 @@
 APP_NAME="RN Starter"
 EAS_PROJECT_ID=""
 EXPO_APPLE_TEAM_ID=""
+EXPO_UPDATE_URL=""
 
 API_URL=""
 ITUNES_ITEM_ID=""
diff --git a/.env.staging b/.env.staging
@@ -1,6 +1,7 @@
 APP_NAME="Staging"
 EAS_PROJECT_ID=""
 EXPO_APPLE_TEAM_ID=""
+EXPO_UPDATE_URL=""
 
 API_URL=""
 ITUNES_ITEM_ID=""
diff --git a/package.json b/package.json
@@ -26,20 +26,20 @@
     "node": ">=22.14"
   },
   "scripts": {
-    "start:dev": "APP_ENV=development doppler run -p rn-starter -c dev -- expo start --dev-client",
+    "start:dev": "APP_ENV=development doppler run -- expo start --dev-client",
     "start:staging": "APP_ENV=staging expo start --no-dev --minify",
     "start:production": "APP_ENV=production expo start --no-dev --minify",
     "//// BUILDS ////": "",
-    "build:dev:ios": "doppler run -p rn-starter -c dev -- eas build --profile development --platform ios --local",
-    "build:dev:android": "doppler run -p rn-starter -c dev -- eas build --profile development --platform android --local",
-    "build:dev-device:ios": "doppler run -p rn-starter -c dev -- eas build --profile development-device --platform ios --local",
+    "build:dev:ios": "doppler run -- eas build --profile development --platform ios --local",
+    "build:dev:android": "doppler run -- eas build --profile development --platform android --local",
+    "build:dev-device:ios": "doppler run -- eas build --profile development-device --platform ios --local",
     "build:staging:ios": "APP_ENV=staging eas build --profile staging --platform ios --local",
     "build:staging:android": "APP_ENV=staging eas build --profile staging --platform android --local",
     "build:production:ios": "APP_ENV=production eas build --profile production --platform ios --local",
     "build:production:android": "APP_ENV=production eas build --profile production --platform android --local",
     "//// TESTS ////": "",
     "test": "jest --cache --coverage=false",
-    "test:e2e": "doppler run -p rn-starter -c dev -- maestro test ./e2e/authNavigation.yaml",
+    "test:e2e": "doppler run -- maestro test ./e2e/authNavigation.yaml",
     "test:coverage": "jest",
     "//// QUALITY ////": "",
     "lint:ts": "yarn tsc",
@@ -52,7 +52,7 @@
     "generate:icons": "svgr --config-file src/shared/icons/svgs/config/svgrConfig.js --svgo-config src/shared/icons/svgs/config/svgoConfig.js --index-template src/shared/icons/svgs/config/index-template.js --template src/shared/icons/svgs/config/icon-template.js --out-dir src/shared/icons/components -- src/shared/icons/svgs && eslint './src/shared/icons/components/**/*.{ts,tsx}' --ext .ts,.tsx --fix --quiet && prettier --write './src/shared/icons/components/**/*.{ts,tsx}'",
     "//// STORYBOOK ////": "",
     "storybook:generate": "sb-rn-get-stories",
-    "start:storybook": "STORYBOOK_ENABLED=true doppler run -p rn-starter -c dev -- expo start",
+    "start:storybook": "STORYBOOK_ENABLED=true doppler run -- expo start",
     "//// VERSIONNING ////": "",
     "version:bump": "standard-version --skip.commit --skip.changelog --skip.tag",
     "version:tag": "standard-version",
diff --git a/src/app/(protected)/(tabs)/features/(blogPost)/[blogPostId].tsx b/src/app/(protected)/(tabs)/features/(blogPost)/[blogPostId].tsx
@@ -1,8 +1,8 @@
 import { Stack, useLocalSearchParams } from 'expo-router';
 import { useTranslation } from 'react-i18next';
 
+import { BlogPostScreenParams } from '$domain/navigation';
 import { BlogPost as BlogPostComponent } from '$features/blogPost';
-import { BlogPostScreenParams } from '$features/navigation';
 import { Screen } from '$shared/components';
 
 const BlogPostScreen = () => {
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
@@ -17,10 +17,6 @@ import { StyleSheet } from 'react-native-unistyles';
 
 import { config } from '$domain/constants';
 import { AuthContextProvider } from '$domain/contexts';
-import {
-  useAppScreenTracking,
-  useAppStateTracking,
-} from '$features/navigation';
 import { useAppFocusManager } from '$infra/api';
 import { persistOptions, queryClient } from '$infra/api/queryClient';
 import { ErrorMonitoring } from '$infra/monitoring';
@@ -34,6 +30,8 @@ import {
   Splashscreen,
 } from '$shared/components';
 import {
+  useAppScreenTracking,
+  useAppStateTracking,
   useCheckNetworkStateOnMount,
   useRoutingInstrumentation,
 } from '$shared/hooks';
diff --git a/src/domain/contexts/authContext/AuthContextProvider.tsx b/src/domain/contexts/authContext/AuthContextProvider.tsx
@@ -1,5 +1,5 @@
 import { useQueryClient } from '@tanstack/react-query';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { User, UserLogin } from '$domain/entities';
 import { Analytics } from '$infra/analytics';
@@ -15,13 +15,15 @@ import {
 } from '$infra/store';
 import { sleep } from '$shared/utils';
 
-import AuthContext from '../AuthContext';
+import AuthContext from './AuthContext';
 
 interface AuthContextProviderProps {
   children: React.ReactNode;
 }
 
 export const AuthContextProvider = ({ children }: AuthContextProviderProps) => {
+  const hasTrackedUserRef = useRef(false);
+
   const [user, setUser] = useState<User | null>(null);
 
   const setIsUserLoggedIn = useAppStore((state) => state.setIsUserLoggedIn);
@@ -55,6 +57,14 @@ export const AuthContextProvider = ({ children }: AuthContextProviderProps) => {
     Notifications.removeUserEmail(user.email);
   }, []);
 
+  useEffect(() => {
+    if (user && !hasTrackedUserRef.current) {
+      hasTrackedUserRef.current = true;
+
+      void startTrackingUser(user);
+    }
+  }, [user, startTrackingUser]);
+
   const signIn = useCallback(
     async (data: UserLogin) => {
       try {
@@ -68,8 +78,6 @@ export const AuthContextProvider = ({ children }: AuthContextProviderProps) => {
 
         setUser(userDataPayload);
         setIsUserLoggedIn(true);
-
-        await startTrackingUser(userDataPayload);
       } catch (error) {
         Logger.error({
           error,
@@ -78,7 +86,7 @@ export const AuthContextProvider = ({ children }: AuthContextProviderProps) => {
         });
       }
     },
-    [setIsUserLoggedIn, startTrackingUser],
+    [setIsUserLoggedIn],
   );
 
   const signOut = useCallback(async () => {
@@ -94,6 +102,8 @@ export const AuthContextProvider = ({ children }: AuthContextProviderProps) => {
       queryClient.clear();
 
       await clearAccessAndRefreshTokens();
+
+      hasTrackedUserRef.current = false;
     } catch (error) {
       Logger.error({
         error,
diff --git a/src/domain/contexts/authContext/components/index.ts b/src/domain/contexts/authContext/components/index.ts
diff --git a/src/domain/contexts/authContext/hooks/index.ts b/src/domain/contexts/authContext/hooks/index.ts
diff --git a/src/domain/contexts/authContext/index.ts b/src/domain/contexts/authContext/index.ts
@@ -1,3 +1,3 @@
 export * from './AuthContext';
-export * from './components';
-export * from './hooks';
+export * from './AuthContextProvider';
+export * from './useAuthContext';
diff --git a/src/domain/contexts/authContext/useAuthContext.ts b/src/domain/contexts/authContext/useAuthContext.ts
@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 
-import AuthContext from '../AuthContext';
+import AuthContext from './AuthContext';
 
 export const useAuthContext = () => {
   const value = useContext(AuthContext);
diff --git a/src/domain/navigation/index.ts b/src/domain/navigation/index.ts
@@ -0,0 +1 @@
+export * from './navigation.types';
diff --git a/src/domain/navigation/navigation.types.ts b/src/domain/navigation/navigation.types.ts
diff --git a/src/features/navigation/hooks/index.ts b/src/features/navigation/hooks/index.ts
diff --git a/src/features/navigation/index.ts b/src/features/navigation/index.ts
diff --git a/src/features/navigation/utils/index.ts b/src/features/navigation/utils/index.ts
diff --git a/src/infra/featureFlags/defaultFlags.ts b/src/infra/featureFlags/defaultFlags.ts
@@ -15,6 +15,6 @@ export const defaultRemoteConfig: Record<
   AvailableRemoteConfig,
   VersionFlagType
 > = {
-  'last-supported-app-version': { version: '2.0.0' },
-  'latest-released-app-version': { version: '2.1.0' },
+  'last-supported-app-version': { type: 'version', version: '2.0.0' },
+  'latest-released-app-version': { type: 'version', version: '2.1.0' },
 };
diff --git a/src/infra/featureFlags/featureFlags.types.ts b/src/infra/featureFlags/featureFlags.types.ts
@@ -10,5 +10,6 @@ export type BooleanFeatureFlags = Extract<
 >;
 
 export interface VersionFlagType {
+  type: 'version';
   version: string;
 }
diff --git a/src/shared/components/appUpdateNeeded/AppUpdateNeeded.tsx b/src/shared/components/appUpdateNeeded/AppUpdateNeeded.tsx
@@ -25,7 +25,7 @@ export const AppUpdateNeeded = () => {
       'last-supported-app-version',
     );
 
-    if (!payload) {
+    if (!payload || !('version' in payload)) {
       return;
     }
 
@@ -81,6 +81,7 @@ export const AppUpdateNeeded = () => {
 
 const styles = StyleSheet.create((theme) => ({
   container: {
+    ...StyleSheet.absoluteFillObject,
     backgroundColor: theme.colors.bg_base,
     width: '100%',
     height: '100%',
diff --git a/src/shared/components/appUpdateNeeded/__tests__/AppUpdateNeeded.test.tsx b/src/shared/components/appUpdateNeeded/__tests__/AppUpdateNeeded.test.tsx
@@ -21,8 +21,8 @@ describe('AppUpdateNeeded component', () => {
 
   it('should render nothing if the versions are equal', () => {
     jest.spyOn(FeatureFlags, 'useGetRemoteConfigSync').mockReturnValue({
-      getFlagPayloadSync: <T = { version: string },>() =>
-        ({ version: '2.0.0' }) as T,
+      getFlagPayloadSync: <T = { type: 'version'; version: string },>() =>
+        ({ type: 'version', version: '2.0.0' }) as T,
     });
 
     config.version = '2.0.0';
@@ -34,8 +34,8 @@ describe('AppUpdateNeeded component', () => {
 
   it('should render nothing if the flagged version is supported', () => {
     jest.spyOn(FeatureFlags, 'useGetRemoteConfigSync').mockReturnValue({
-      getFlagPayloadSync: <T = { version: string },>() =>
-        ({ version: '2.0.0' }) as T,
+      getFlagPayloadSync: <T = { type: 'version'; version: string },>() =>
+        ({ type: 'version', version: '2.0.0' }) as T,
     });
 
     config.version = '3.0.0';
@@ -47,8 +47,8 @@ describe('AppUpdateNeeded component', () => {
 
   it('should render the update screen when the flagged version is unsupported', () => {
     jest.spyOn(FeatureFlags, 'useGetRemoteConfigSync').mockReturnValue({
-      getFlagPayloadSync: <T = { version: string },>() =>
-        ({ version: '3.0.0' }) as T,
+      getFlagPayloadSync: <T = { type: 'version'; version: string },>() =>
+        ({ type: 'version', version: '3.0.0' }) as T,
     });
 
     config.version = '2.0.0';
@@ -62,8 +62,8 @@ describe('AppUpdateNeeded component', () => {
     config.version = '2.0.0';
 
     jest.spyOn(FeatureFlags, 'useGetRemoteConfigSync').mockReturnValue({
-      getFlagPayloadSync: <T = { version: string },>() =>
-        ({ version: '3.0.0' }) as T,
+      getFlagPayloadSync: <T = { type: 'version'; version: string },>() =>
+        ({ type: 'version', version: '3.0.0' }) as T,
     });
 
     const openURL = jest.fn();
diff --git a/src/shared/components/maintenanceMode/MaintenanceMode.tsx b/src/shared/components/maintenanceMode/MaintenanceMode.tsx
@@ -34,6 +34,7 @@ export const MaintenanceMode = ({
 
 const styles = StyleSheet.create((theme) => ({
   container: {
+    ...StyleSheet.absoluteFillObject,
     backgroundColor: theme.colors.bg_base,
     width: '100%',
     height: '100%',
diff --git a/src/shared/hooks/index.ts b/src/shared/hooks/index.ts
@@ -1,4 +1,6 @@
+export * from './useAppScreenTracking';
 export * from './useAppState';
+export * from './useAppStateTracking';
 export * from './useCheckNetworkStateOnMount';
 export * from './useDebouncedFunction';
 export * from './useGetSessionState';
diff --git a/src/shared/hooks/useAppScreenTracking.ts b/src/shared/hooks/useAppScreenTracking.ts
@@ -2,8 +2,7 @@ import { usePathname } from 'expo-router';
 import { useCallback, useEffect } from 'react';
 
 import { Analytics } from '$infra/analytics';
-
-import { convertStringToKebabCase } from '../utils/navigation.utils';
+import { convertStringToKebabCase } from '$shared/utils';
 
 export const useAppScreenTracking = () => {
   const pathname = usePathname();
diff --git a/src/shared/hooks/useAppStateTracking.ts b/src/shared/hooks/useAppStateTracking.ts
diff --git a/src/shared/hooks/useIsNewStoreVersionAvailable.ts b/src/shared/hooks/useIsNewStoreVersionAvailable.ts
@@ -19,7 +19,7 @@ export const useIsNewStoreVersionAvailable = () => {
       'latest-released-app-version',
     );
 
-    if (!payload) {
+    if (!payload || !('version' in payload)) {
       return;
     }
 
diff --git a/src/shared/hooks/useRunOnMount.ts b/src/shared/hooks/useRunOnMount.ts
@@ -1,7 +1,7 @@
-/* eslint-disable */
+import { type EffectCallback, useEffect } from 'react';
 
-import { useEffect } from 'react';
-
-export const useRunOnMount = (callback: () => void) => {
+export const useRunOnMount = (callback: EffectCallback) => {
+  // eslint-disable-next-line react-compiler/react-compiler
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   useEffect(callback, []);
 };
diff --git a/src/shared/uiKit/bottomSheet/BottomSheet.tsx b/src/shared/uiKit/bottomSheet/BottomSheet.tsx
diff --git a/src/shared/utils/convertStringToKebabCase.ts b/src/shared/utils/convertStringToKebabCase.ts
diff --git a/src/shared/utils/index.ts b/src/shared/utils/index.ts
