Navigate back to feed selector after adding work email

Co-authored-by: Maxence Coulibaly <madmax330@users.noreply.github.com>

Author: MelvinBot

config/eslint/eslint.seatbelt.tsv

@@ -1346,7 +1346,6 @@
 "../../src/pages/workspace/categories/WorkspaceCategoriesPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/workspace/companyCards/BankConnection/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/workspace/companyCards/WorkspaceCompanyCardAddWorkEmailPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardEditTransactionStartDatePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1

src/pages/workspace/companyCards/WorkspaceCompanyCardAddWorkEmailPage.tsx

@@ -52,7 +52,8 @@ function WorkspaceCompanyCardAddWorkEmailPage({route}: WorkspaceCompanyCardAddWo
                     <Button
                         variant="success"
                         size={CONST.BUTTON_SIZE.LARGE}
-                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(Navigation.getActiveRoute()))}
+                        // After the user adds their work email, the back button should take them to the feed selector to pick a feed again, not back to this now-stale prompt page.
+                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.getRoute(policyID)))}
                     >
                         <Button.Text>{translate('onboarding.workEmail.addWorkEmail')}</Button.Text>
                     </Button>

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardAddWorkEmailPage.tsx

@@ -7,6 +7,7 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 
 import Navigation from '@navigation/Navigation';
@@ -15,7 +16,7 @@ import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 import React from 'react';
@@ -52,7 +53,14 @@ function WorkspaceExpensifyCardAddWorkEmailPage({route}: WorkspaceExpensifyCardA
                     <Button
                         variant="success"
                         size={CONST.BUTTON_SIZE.LARGE}
-                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(Navigation.getActiveRoute()))}
+                        // After the user adds their work email, the back button should take them to the feed selector to pick a feed again, not back to this now-stale prompt page.
+                        onPress={() =>
+                            Navigation.navigate(
+                                ROUTES.SETTINGS_CONTACT_METHODS.getRoute(
+                                    createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_SELECT_FEED.path, ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID)),
+                                ),
+                            )
+                        }
                     >
                         <Button.Text>{translate('onboarding.workEmail.addWorkEmail')}</Button.Text>
                     </Button>