Merge pull request Expensify#42997 from software-mansion-labs/fix-hyb…

…rid-init-url Fix InitialUrlContextProvider for HybridApp #2
ishpaul777 · Jun 3, 2024 · 174ff97 · 174ff97
2 parents fe32d94 + 5154ef0
commit 174ff97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/InitialURLContextProvider.tsx b/src/components/InitialURLContextProvider.tsx
@@ -17,13 +17,14 @@ type InitialURLContextProviderProps = {
 function InitialURLContextProvider({children, url}: InitialURLContextProviderProps) {
     const [initialURL, setInitialURL] = useState(url);
     useEffect(() => {
-        if (initialURL) {
+        if (url) {
+            setInitialURL(url);
             return;
         }
         Linking.getInitialURL().then((initURL) => {
             setInitialURL(initURL as Route);
         });
-    }, [initialURL]);
+    }, [url]);
     return <InitialURLContext.Provider value={initialURL}>{children}</InitialURLContext.Provider>;
 }
 

diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
@@ -87,6 +87,7 @@ function ExitSurveyConfirmPage({exitReason, isLoading, route, navigation}: ExitS
                         ExitSurvey.switchToOldDot();
 
                         if (NativeModules.HybridAppModule) {
+                            Navigation.resetToHome();
                             NativeModules.HybridAppModule.closeReactNativeApp();
                             return;
                         }