refactor: reorganize and rename mobile screens

app/package.json

@@ -129,6 +129,7 @@
     "react-dom": "^18.3.1",
     "react-native": "0.76.9",
     "react-native-app-auth": "^8.0.3",
+    "react-native-b4a": "^0.0.4",
     "react-native-biometrics": "^3.0.1",
     "react-native-check-version": "^1.3.0",
     "react-native-cloud-storage": "^2.2.2",

app/src/components/NavBar/index.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 // NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
+export { AadhaarNavBar } from '@/components/NavBar/AadhaarNavBar';
 export { DefaultNavBar } from '@/components/NavBar/DefaultNavBar';
 export { HomeNavBar } from '@/components/NavBar/HomeNavBar';
 export { IdDetailsNavBar } from '@/components/NavBar/IdDetailsNavBar';

app/src/components/homeScreen/idCard.tsx

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 // NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
-import type { FC } from 'react';
+import React, { type FC } from 'react';
 import { Dimensions } from 'react-native';
 import { Separator, Text, XStack, YStack } from 'tamagui';
 

app/src/hooks/useModal.ts

@@ -5,7 +5,7 @@
 import { useCallback, useRef, useState } from 'react';
 import { useNavigation } from '@react-navigation/native';
 
-import type { ModalParams } from '@/screens/system/ModalScreen';
+import type { ModalParams } from '@/screens/app/ModalScreen';
 import {
   getModalCallbacks,
   registerModalCallbacks,

app/src/navigation/settings.ts → app/src/navigation/account.ts

@@ -4,44 +4,52 @@
 
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 
-import CloudBackupScreen from '@/screens/settings/CloudBackupScreen';
-import DocumentDataInfoScreen from '@/screens/settings/DocumentDataInfoScreen';
-import ManageDocumentsScreen from '@/screens/settings/ManageDocumentsScreen';
-import SettingsScreen from '@/screens/settings/SettingsScreen';
-import ShowRecoveryPhraseScreen from '@/screens/settings/ShowRecoveryPhraseScreen';
+import AccountRecoveryChoiceScreen from '@/screens/account/recovery/AccountRecoveryChoiceScreen';
+import AccountRecoveryScreen from '@/screens/account/recovery/AccountRecoveryScreen';
+// Removed DocumentDataNotFound route; use ComingSoon instead where needed
+import RecoverWithPhraseScreen from '@/screens/account/recovery/RecoverWithPhraseScreen';
+import CloudBackupScreen from '@/screens/account/settings/CloudBackupScreen';
+import SettingsScreen from '@/screens/account/settings/SettingsScreen';
+import ShowRecoveryPhraseScreen from '@/screens/account/settings/ShowRecoveryPhraseScreen';
 import { black, slate300, white } from '@/utils/colors';
 
-const settingsScreens = {
-  CloudBackupSettings: {
-    screen: CloudBackupScreen,
+const accountScreens = {
+  AccountRecovery: {
+    screen: AccountRecoveryScreen,
     options: {
-      title: 'Cloud backup',
+      headerShown: false,
+    } as NativeStackNavigationOptions,
+  },
+  AccountRecoveryChoice: {
+    screen: AccountRecoveryChoiceScreen,
+    options: {
+      headerShown: false,
+    } as NativeStackNavigationOptions,
+  },
+  // DocumentDataNotFound screen entry removed
+  RecoverWithPhrase: {
+    screen: RecoverWithPhraseScreen,
+    options: {
+      headerTintColor: black,
+      title: 'Enter Recovery Phrase',
       headerStyle: {
         backgroundColor: black,
       },
       headerTitleStyle: {
         color: slate300,
       },
+      headerBackTitle: 'close',
     } as NativeStackNavigationOptions,
   },
-  ManageDocuments: {
-    screen: ManageDocumentsScreen,
+  CloudBackupSettings: {
+    screen: CloudBackupScreen,
     options: {
-      title: 'Manage Documents',
+      title: 'Cloud backup',
       headerStyle: {
-        backgroundColor: white,
+        backgroundColor: black,
       },
       headerTitleStyle: {
-        color: black,
-      },
-    } as NativeStackNavigationOptions,
-  },
-  DocumentDataInfo: {
-    screen: DocumentDataInfoScreen,
-    options: {
-      title: 'Document Data Info',
-      headerStyle: {
-        backgroundColor: white,
+        color: slate300,
       },
     } as NativeStackNavigationOptions,
   },
@@ -72,4 +80,4 @@ const settingsScreens = {
   },
 };
 
-export default settingsScreens;
+export default accountScreens;

app/src/navigation/account.web.ts

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
+
+import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
+
+// Removed DocumentDataNotFound route; use ComingSoon instead where needed
+import SettingsScreen from '@/screens/account/settings/SettingsScreen';
+import { black, white } from '@/utils/colors';
+
+const accountScreens = {
+  // DocumentDataNotFound screen entry removed
+  Settings: {
+    screen: SettingsScreen,
+    options: {
+      animation: 'slide_from_bottom',
+      title: 'Settings',
+      headerStyle: {
+        backgroundColor: white,
+      },
+      headerTitleStyle: {
+        color: black,
+      },
+    } as NativeStackNavigationOptions,
+    config: {
+      screens: {},
+    },
+  },
+};
+
+export default accountScreens;

app/src/navigation/system.tsx → app/src/navigation/app.tsx

@@ -8,13 +8,13 @@ import type { NativeStackNavigationOptions } from '@react-navigation/native-stac
 
 import type { DocumentCategory } from '@selfxyz/common/utils/types';
 
-import DeferredLinkingInfoScreen from '@/screens/system/DeferredLinkingInfoScreen';
-import LaunchScreen from '@/screens/system/LaunchScreen';
-import LoadingScreen from '@/screens/system/Loading';
-import ModalScreen from '@/screens/system/ModalScreen';
-import SplashScreen from '@/screens/system/SplashScreen';
+import DeferredLinkingInfoScreen from '@/screens/app/DeferredLinkingInfoScreen';
+import LaunchScreen from '@/screens/app/LaunchScreen';
+import LoadingScreen from '@/screens/app/LoadingScreen';
+import ModalScreen from '@/screens/app/ModalScreen';
+import SplashScreen from '@/screens/app/SplashScreen';
 
-const systemScreens = {
+const appScreens = {
   Launch: {
     screen: LaunchScreen,
     options: {
@@ -56,4 +56,4 @@ const systemScreens = {
   },
 };
 
-export default systemScreens;
+export default appScreens;