Chore/3034123

src/components/screens/HomeScreen/HomeScreen.tsx

@@ -7,6 +7,7 @@ import { DebugBottomSheet } from "components/analytics/DebugBottomSheet";
 import { BaseLayout } from "components/layout/BaseLayout";
 import ManageAccounts from "components/screens/HomeScreen/ManageAccounts";
 import WelcomeBannerBottomSheet from "components/screens/HomeScreen/WelcomeBannerBottomSheet";
+import { LoadingScreen } from "components/screens/LoadingScreen";
 import Avatar from "components/sds/Avatar";
 import Icon from "components/sds/Icon";
 import { Display, Text } from "components/sds/Typography";
@@ -62,7 +63,8 @@ type HomeScreenProps = BottomTabScreenProps<
 export const HomeScreen: React.FC<HomeScreenProps> = React.memo(
   ({ navigation }) => {
     const { account } = useGetActiveAccount();
-    const { network, getAllAccounts, allAccounts } = useAuthenticationStore();
+    const { network, getAllAccounts, allAccounts, isSwitchingAccount } =
+      useAuthenticationStore();
     const { themeColors } = useColors();
     const manageAccountsBottomSheetRef = useRef<BottomSheetModal>(null);
     const analyticsDebugBottomSheetRef = useRef<BottomSheetModal>(null);
@@ -100,6 +102,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = React.memo(
         account,
         isFunded,
         isLoadingBalances,
+        isSwitchingAccount,
       });
 
     // NOTE: VIEW_HOME analytics event is already tracked by useNavigationAnalytics
@@ -228,6 +231,11 @@ export const HomeScreen: React.FC<HomeScreenProps> = React.memo(
       fetchActiveSessions,
     ]);
 
+    // Show full screen loading when switching accounts
+    if (isSwitchingAccount) {
+      return <LoadingScreen />;
+    }
+
     return (
       <BaseLayout
         insets={{ bottom: false, top: false, left: false, right: false }}

src/config/constants.ts

@@ -294,6 +294,7 @@ export enum STORAGE_KEYS {
   WELCOME_BANNER_SHOWN_PREFIX = "welcomeBanner_shown_",
   HAS_SEEN_BIOMETRICS_ENABLE_SCREEN = "hasSeenBiometricsEnableScreen",
   APP_UPDATE_DISMISSED_REQUIRED_VERSION = "appUpdateDismissedRequiredVersion",
+  AUTH_STATUS = "authStatus",
 }
 
 /**

src/config/types.ts

@@ -58,6 +58,8 @@ export const AUTH_STATUS = {
   AUTHENTICATED: "AUTHENTICATED",
   // User is authenticated. Hash key is expired and temporary store is found.
   HASH_KEY_EXPIRED: "HASH_KEY_EXPIRED",
+  // User is locked. Hash key is expired but temporary store with private keys is preserved.
+  LOCKED: "LOCKED",
 } as const;
 
 export type AuthStatus = (typeof AUTH_STATUS)[keyof typeof AUTH_STATUS];