navigate to homescreen when onyx state is fully set

Expensify · Dec 13, 2024 · 981ee0d · 981ee0d
1 parent 47aae42
commit 981ee0d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 26 deletions.
diff --git a/src/components/ImportOnyxState/index.native.tsx b/src/components/ImportOnyxState/index.native.tsx
@@ -46,7 +46,7 @@ function applyStateInChunks(state: OnyxValues) {
     return promise;
 }
 
-export default function ImportOnyxState({setIsLoading, isLoading}: ImportOnyxStateProps) {
+export default function ImportOnyxState({setIsLoading}: ImportOnyxStateProps) {
     const [isErrorModalVisible, setIsErrorModalVisible] = useState(false);
     const [session] = useOnyx(ONYXKEYS.SESSION);
 
@@ -71,14 +71,7 @@ export default function ImportOnyxState({setIsLoading, isLoading}: ImportOnyxSta
             })
             .catch(() => {
                 setIsErrorModalVisible(true);
-            })
-            .finally(() => {
-                setIsLoading(false);
             });
-
-        if (isLoading) {
-            setIsLoading(false);
-        }
     };
 
     return (

diff --git a/src/components/ImportOnyxState/index.tsx b/src/components/ImportOnyxState/index.tsx
@@ -11,7 +11,7 @@ import BaseImportOnyxState from './BaseImportOnyxState';
 import type ImportOnyxStateProps from './types';
 import {cleanAndTransformState} from './utils';
 
-export default function ImportOnyxState({setIsLoading, isLoading}: ImportOnyxStateProps) {
+export default function ImportOnyxState({setIsLoading}: ImportOnyxStateProps) {
     const [isErrorModalVisible, setIsErrorModalVisible] = useState(false);
     const [session] = useOnyx(ONYXKEYS.SESSION);
 
@@ -33,24 +33,16 @@ export default function ImportOnyxState({setIsLoading, isLoading}: ImportOnyxSta
                 setPreservedUserSession(currentUserSessionCopy);
                 setShouldForceOffline(true);
                 Onyx.clear(KEYS_TO_PRESERVE).then(() => {
-                    Onyx.multiSet(transformedState)
-                        .then(() => {
-                            setIsUsingImportedState(true);
-                            Navigation.navigate(ROUTES.HOME);
-                        })
-                        .finally(() => {
-                            setIsLoading(false);
-                        });
+                    Onyx.multiSet(transformedState).then(() => {
+                        setIsUsingImportedState(true);
+                        Navigation.navigate(ROUTES.HOME);
+                    });
                 });
             })
             .catch(() => {
                 setIsErrorModalVisible(true);
                 setIsLoading(false);
             });
-
-        if (isLoading) {
-            setIsLoading(false);
-        }
     };
 
     return (

diff --git a/src/components/ImportOnyxState/types.ts b/src/components/ImportOnyxState/types.ts
@@ -1,5 +1,4 @@
 type ImportOnyxStateProps = {
-    isLoading: boolean;
     setIsLoading: (isLoading: boolean) => void;
 };
 

diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -144,10 +144,7 @@ function TroubleshootPage() {
                                     />
                                 </TestToolRow>
                             </View>
-                            <ImportOnyxState
-                                setIsLoading={setIsLoading}
-                                isLoading={isLoading}
-                            />
+                            <ImportOnyxState setIsLoading={setIsLoading} />
                             <MenuItemList
                                 menuItems={menuItems}
                                 shouldUseSingleExecution