Remove backTo param from Workspace Initial Page

software-mansion-labs · Dec 18, 2024 · 2e08e1e · 2e08e1e
1 parent f405f7e
commit 2e08e1e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts b/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
@@ -45,15 +45,6 @@ function adaptStateIfNecessary({state, options: {sidebarScreen, defaultCentralSc
         const paramsFromRoute = getParamsFromRoute(sidebarScreen);
         let params = pick(lastRoute?.params, paramsFromRoute);
 
-        // On a wide screen the backTo param has to be passed to the sidebar screen (SCREENS.WORKSPACE.INITIAL), because the back action is performed from this page
-        if (lastRoute?.name === SCREENS.WORKSPACE.PROFILE) {
-            const hasRouteBackToParam = lastRoute?.params && 'backTo' in lastRoute.params;
-
-            if (hasRouteBackToParam) {
-                params = {...params, backTo: lastRoute.params.backTo};
-            }
-        }
-
         // @ts-expect-error Updating read only property
         // noinspection JSConstantReassignment
         state.stale = true; // eslint-disable-line

diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
@@ -1422,7 +1422,6 @@ type SettingsSplitNavigatorParamList = {
 type WorkspaceSplitNavigatorParamList = {
     [SCREENS.WORKSPACE.INITIAL]: {
         policyID: string;
-        backTo?: string;
     };
     [SCREENS.WORKSPACE.PROFILE]: {
         policyID: string;

diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -406,14 +406,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
             >
                 <HeaderWithBackButton
                     title={policyName}
-                    onBackButtonPress={() => {
-                        if (route.params?.backTo) {
-                            Navigation.goBack(ROUTES.HOME);
-                            Navigation.isNavigationReady().then(() => Navigation.navigate(route.params?.backTo as Route));
-                        } else {
-                            Navigation.goBack(ROUTES.SETTINGS_WORKSPACES);
-                        }
-                    }}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
                     policyAvatar={policyAvatar}
                     style={styles.headerBarDesktopHeight}
                 />