Merge pull request #41764 from software-mansion-labs/fix-init-url-hybrid

Fix `InitialUrlContextProvider` for HybridApp

src/components/InitialURLContextProvider.tsx

@@ -1,6 +1,5 @@
-import React, {createContext, useEffect, useState} from 'react';
+import React, {createContext} from 'react';
 import type {ReactNode} from 'react';
-import {Linking} from 'react-native';
 import type {Route} from '@src/ROUTES';
 
 /** Initial url that will be opened when NewDot is embedded into Hybrid App. */
@@ -15,16 +14,7 @@ type InitialURLContextProviderProps = {
 };
 
 function InitialURLContextProvider({children, url}: InitialURLContextProviderProps) {
-    const [initialURL, setInitialURL] = useState(url);
-    useEffect(() => {
-        if (initialURL) {
-            return;
-        }
-        Linking.getInitialURL().then((initURL) => {
-            setInitialURL(initURL as Route);
-        });
-    }, [initialURL]);
-    return <InitialURLContext.Provider value={initialURL}>{children}</InitialURLContext.Provider>;
+    return <InitialURLContext.Provider value={url}>{children}</InitialURLContext.Provider>;
 }
 
 InitialURLContextProvider.displayName = 'InitialURLContextProvider';

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;
                         }