Skip to content

Commit de279a6

Browse files
tgolentgolen
authored
Merge pull request #57237 from daledah/fix/56997
fix: correct back button in workspace list page
2 parents 8a019d4 + 4bcfb58 commit de279a6

21 files changed

+56
-31
lines changed

‎src/ROUTES.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ const ROUTES = {
151151
SETTINGS_PRIORITY_MODE: 'settings/preferences/priority-mode',
152152
SETTINGS_LANGUAGE: 'settings/preferences/language',
153153
SETTINGS_THEME: 'settings/preferences/theme',
154-
SETTINGS_WORKSPACES: 'settings/workspaces',
154+
SETTINGS_WORKSPACES: {route: 'settings/workspaces', getRoute: (backTo?: string) => getUrlWithBackToParam('settings/workspaces', backTo)},
155155
SETTINGS_SECURITY: 'settings/security',
156156
SETTINGS_CLOSE: 'settings/security/closeAccount',
157157
SETTINGS_ADD_DELEGATE: 'settings/security/delegate',

‎src/components/Navigation/BottomTabBar/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function BottomTabBar({selectedTab, isTooltipAllowed = false}: BottomTabBarProps
191191

192192
// If there is settings workspace screen in the settings navigator, then we should open the settings workspaces as it should be "remembered".
193193
if (state?.routes?.at(-1)?.name === SCREENS.SETTINGS.WORKSPACES) {
194-
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
194+
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
195195
return;
196196
}
197197

‎src/libs/Navigation/linkingConfig/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
15461546
screens: {
15471547
[SCREENS.SETTINGS.ROOT]: ROUTES.SETTINGS,
15481548
[SCREENS.SETTINGS.WORKSPACES]: {
1549-
path: ROUTES.SETTINGS_WORKSPACES,
1549+
path: ROUTES.SETTINGS_WORKSPACES.route,
15501550
exact: true,
15511551
},
15521552
[SCREENS.SETTINGS.PROFILE.ROOT]: {

‎src/libs/Navigation/types.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ type SettingsNavigatorParamList = {
221221
};
222222
[SCREENS.WORKSPACE.DOWNGRADE]: {
223223
policyID?: string;
224+
backTo?: Routes;
224225
};
225226
[SCREENS.WORKSPACE.CATEGORIES_SETTINGS]: {
226227
policyID: string;
@@ -1599,7 +1600,9 @@ type ReportsSplitNavigatorParamList = {
15991600

16001601
type SettingsSplitNavigatorParamList = {
16011602
[SCREENS.SETTINGS.ROOT]: undefined;
1602-
[SCREENS.SETTINGS.WORKSPACES]: undefined;
1603+
[SCREENS.SETTINGS.WORKSPACES]: {
1604+
backTo?: Routes;
1605+
};
16031606
[SCREENS.SETTINGS.PREFERENCES.ROOT]: undefined;
16041607
[SCREENS.SETTINGS.SECURITY]: undefined;
16051608
[SCREENS.SETTINGS.PROFILE.ROOT]: undefined;

‎src/libs/PolicyUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ function getPolicyEmployeeListByIdWithoutCurrentUser(policies: OnyxCollection<Pi
520520
}
521521

522522
function goBackFromInvalidPolicy() {
523-
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
523+
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
524524
}
525525

526526
/** Get a tax with given ID from policy */

‎src/libs/navigateAfterJoinRequest/index.desktop.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const navigateAfterJoinRequest = () => {
77
if (getIsSmallScreenWidth()) {
88
Navigation.navigate(ROUTES.SETTINGS);
99
}
10-
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
10+
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
1111
};
1212
export default navigateAfterJoinRequest;

‎src/libs/navigateAfterJoinRequest/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import ROUTES from '@src/ROUTES';
44
const navigateAfterJoinRequest = () => {
55
Navigation.goBack(undefined, {shouldPopToTop: true});
66
Navigation.navigate(ROUTES.SETTINGS);
7-
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
7+
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
88
};
99
export default navigateAfterJoinRequest;

‎src/libs/navigateAfterJoinRequest/index.web.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const navigateAfterJoinRequest = () => {
77
if (getIsSmallScreenWidth()) {
88
Navigation.navigate(ROUTES.SETTINGS);
99
}
10-
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
10+
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
1111
};
1212
export default navigateAfterJoinRequest;

‎src/pages/home/sidebar/AllSettingsScreen.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import useLocalize from '@hooks/useLocalize';
99
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1010
import useThemeStyles from '@hooks/useThemeStyles';
1111
import useWaitForNavigation from '@hooks/useWaitForNavigation';
12+
import {buildOldDotURL, openOldDotLink} from '@libs/actions/Link';
1213
import Navigation from '@libs/Navigation/Navigation';
1314
import {hasGlobalWorkspaceSettingsRBR} from '@libs/WorkspacesSettingsUtils';
14-
import * as Link from '@userActions/Link';
1515
import CONST from '@src/CONST';
1616
import type {TranslationPaths} from '@src/languages/types';
1717
import ONYXKEYS from '@src/ONYXKEYS';
@@ -39,7 +39,7 @@ function AllSettingsScreen() {
3939
icon: Expensicons.Building,
4040
action: () => {
4141
waitForNavigate(() => {
42-
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
42+
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
4343
})();
4444
},
4545
focused: !shouldUseNarrowLayout,
@@ -51,23 +51,23 @@ function AllSettingsScreen() {
5151
translationKey: 'allSettingsScreen.subscription',
5252
icon: Expensicons.MoneyBag,
5353
action: () => {
54-
Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_POLICIES_URL);
54+
openOldDotLink(CONST.OLDDOT_URLS.ADMIN_POLICIES_URL);
5555
},
5656
shouldShowRightIcon: true,
5757
iconRight: Expensicons.NewWindow,
58-
link: () => Link.buildOldDotURL(CONST.OLDDOT_URLS.ADMIN_POLICIES_URL),
58+
link: () => buildOldDotURL(CONST.OLDDOT_URLS.ADMIN_POLICIES_URL),
5959
},
6060
]
6161
: []),
6262
{
6363
translationKey: 'allSettingsScreen.domains',
6464
icon: Expensicons.Globe,
6565
action: () => {
66-
Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL);
66+
openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL);
6767
},
6868
shouldShowRightIcon: true,
6969
iconRight: Expensicons.NewWindow,
70-
link: () => Link.buildOldDotURL(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL),
70+
link: () => buildOldDotURL(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL),
7171
},
7272
];
7373
return baseMenuItems.map((item) => ({

‎src/pages/settings/InitialSettingsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
190190
icon: Expensicons.Buildings,
191191
screenName: SCREENS.SETTINGS.WORKSPACES,
192192
brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies, allConnectionSyncProgresses) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
193-
action: () => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES),
193+
action: () => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route),
194194
},
195195
{
196196
translationKey: 'allSettingsScreen.domains',

‎src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import TextLink from '@components/TextLink';
1313
import useCancellationType from '@hooks/useCancellationType';
1414
import useLocalize from '@hooks/useLocalize';
1515
import useThemeStyles from '@hooks/useThemeStyles';
16+
import {navigateToConciergeChat} from '@libs/actions/Report';
17+
import {cancelBillingSubscription} from '@libs/actions/Subscription';
1618
import Navigation from '@libs/Navigation/Navigation';
17-
import * as Report from '@userActions/Report';
18-
import * as Subscription from '@userActions/Subscription';
1919
import type {CancellationType, FeedbackSurveyOptionID} from '@src/CONST';
2020
import CONST from '@src/CONST';
2121
import ONYXKEYS from '@src/ONYXKEYS';
@@ -31,7 +31,7 @@ function RequestEarlyCancellationPage() {
3131

3232
const handleSubmit = (cancellationReason: FeedbackSurveyOptionID, cancellationNote = '') => {
3333
setIsLoading(true);
34-
Subscription.cancelBillingSubscription(cancellationReason, cancellationNote);
34+
cancelBillingSubscription(cancellationReason, cancellationNote);
3535
};
3636

3737
const acknowledgementText = useMemo(
@@ -52,7 +52,7 @@ function RequestEarlyCancellationPage() {
5252
<Text style={styles.textHeadline}>{translate('subscription.requestEarlyCancellation.requestSubmitted.title')}</Text>
5353
<Text style={[styles.mt1, styles.textNormalThemeText]}>
5454
{translate('subscription.requestEarlyCancellation.requestSubmitted.subtitle.part1')}
55-
<TextLink onPress={() => Report.navigateToConciergeChat()}>{translate('subscription.requestEarlyCancellation.requestSubmitted.subtitle.link')}</TextLink>
55+
<TextLink onPress={() => navigateToConciergeChat()}>{translate('subscription.requestEarlyCancellation.requestSubmitted.subtitle.link')}</TextLink>
5656
{translate('subscription.requestEarlyCancellation.requestSubmitted.subtitle.part2')}
5757
</Text>
5858
</View>
@@ -78,7 +78,7 @@ function RequestEarlyCancellationPage() {
7878
<Text style={[styles.mv4, styles.textNormalThemeText]}>{translate('subscription.requestEarlyCancellation.subscriptionCanceled.info')}</Text>
7979
<Text>
8080
{translate('subscription.requestEarlyCancellation.subscriptionCanceled.preventFutureActivity.part1')}
81-
<TextLink onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}>
81+
<TextLink onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route)}>
8282
{translate('subscription.requestEarlyCancellation.subscriptionCanceled.preventFutureActivity.link')}
8383
</TextLink>
8484
{translate('subscription.requestEarlyCancellation.subscriptionCanceled.preventFutureActivity.part2')}

‎src/pages/workspace/AccessOrNotFoundWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function PageNotFoundFallback({policyID, fullPageNotFoundViewProps, isFeatureEna
9292
shouldShowOfflineIndicator={false}
9393
onBackButtonPress={() => {
9494
if (isPolicyNotAccessible) {
95-
Navigation.goBack(ROUTES.SETTINGS_WORKSPACES);
95+
Navigation.goBack(ROUTES.SETTINGS_WORKSPACES.route);
9696
return;
9797
}
9898
Navigation.goBack(policyID && !isMoneyRequest ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyID) : undefined);

‎src/pages/workspace/WorkspaceInitialPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
442442
>
443443
<HeaderWithBackButton
444444
title={policyName}
445-
onBackButtonPress={() => Navigation.goBack(route.params?.backTo ?? ROUTES.SETTINGS_WORKSPACES)}
445+
onBackButtonPress={() => Navigation.goBack(route.params?.backTo ?? ROUTES.SETTINGS_WORKSPACES.route)}
446446
policyAvatar={policyAvatar}
447447
style={styles.headerBarDesktopHeight}
448448
/>

‎src/pages/workspace/WorkspaceNewRoomPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ function WorkspaceNewRoomPage() {
222222
success
223223
large
224224
text={translate('footer.learnMore')}
225-
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}
225+
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route)}
226226
style={[styles.mh5, styles.mb5]}
227227
/>
228228
{isSmallScreenWidth && (

‎src/pages/workspace/WorkspacePageWithSections.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ function WorkspacePageWithSections({
175175
shouldShowOfflineIndicatorInWideScreen={shouldShowOfflineIndicatorInWideScreen && !shouldShow}
176176
>
177177
<FullPageNotFoundView
178-
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
178+
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES.route)}
179179
onLinkPress={Navigation.goBackToHome}
180180
shouldShow={shouldShow}
181181
subtitleKey={shouldShowPolicy ? 'workspace.common.notAuthorized' : undefined}

‎src/pages/workspace/WorkspacesListPage.tsx

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import {useRoute} from '@react-navigation/native';
12
import React, {useCallback, useMemo, useState} from 'react';
23
import {FlatList, View} from 'react-native';
34
import {useOnyx} from 'react-native-onyx';
@@ -35,12 +36,16 @@ import interceptAnonymousUser from '@libs/interceptAnonymousUser';
3536
import localeCompare from '@libs/LocaleCompare';
3637
import resetPolicyIDInNavigationState from '@libs/Navigation/helpers/resetPolicyIDInNavigationState';
3738
import Navigation from '@libs/Navigation/Navigation';
39+
import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
40+
import type {SettingsSplitNavigatorParamList} from '@libs/Navigation/types';
3841
import {getPolicy, getPolicyBrickRoadIndicatorStatus, getWorkspaceAccountID, isPolicyAdmin, shouldShowPolicy} from '@libs/PolicyUtils';
3942
import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
4043
import type {AvatarSource} from '@libs/UserUtils';
44+
import useHandleBackButton from '@pages/Search/useHandleBackButton';
4145
import CONST from '@src/CONST';
4246
import ONYXKEYS from '@src/ONYXKEYS';
4347
import ROUTES from '@src/ROUTES';
48+
import type SCREENS from '@src/SCREENS';
4449
import type {Policy as PolicyType} from '@src/types/onyx';
4550
import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
4651
import type {PolicyDetailsForNonMembers} from '@src/types/onyx/Policy';
@@ -120,6 +125,7 @@ function WorkspacesListPage() {
120125
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
121126
const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
122127
const shouldShowLoadingIndicator = isLoadingApp && !isOffline;
128+
const route = useRoute<PlatformStackRouteProp<SettingsSplitNavigatorParamList, typeof SCREENS.SETTINGS.WORKSPACES>>();
123129

124130
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
125131
const [policyIDToDelete, setPolicyIDToDelete] = useState<string>();
@@ -429,6 +435,13 @@ function WorkspacesListPage() {
429435
/>
430436
);
431437

438+
const onBackButtonPress = () => {
439+
Navigation.goBack(route.params?.backTo ?? ROUTES.SETTINGS);
440+
return true;
441+
};
442+
443+
useHandleBackButton(onBackButtonPress);
444+
432445
if (isEmptyObject(workspaces)) {
433446
return (
434447
<ScreenWrapper
@@ -442,7 +455,7 @@ function WorkspacesListPage() {
442455
title={translate('common.workspaces')}
443456
shouldShowBackButton={shouldUseNarrowLayout}
444457
shouldDisplaySearchRouter
445-
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
458+
onBackButtonPress={onBackButtonPress}
446459
icon={Illustrations.Buildings}
447460
shouldUseHeadlineHeader
448461
/>
@@ -482,7 +495,7 @@ function WorkspacesListPage() {
482495
title={translate('common.workspaces')}
483496
shouldShowBackButton={shouldUseNarrowLayout}
484497
shouldDisplaySearchRouter
485-
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
498+
onBackButtonPress={onBackButtonPress}
486499
icon={Illustrations.Buildings}
487500
shouldUseHeadlineHeader
488501
>

‎src/pages/workspace/downgrade/DowngradeIntro.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ import {openLink} from '@libs/actions/Link';
1313
import Navigation from '@libs/Navigation/Navigation';
1414
import CONST from '@src/CONST';
1515
import ROUTES from '@src/ROUTES';
16+
import type {Route} from '@src/ROUTES';
1617

1718
type Props = {
1819
buttonDisabled?: boolean;
1920
loading?: boolean;
2021
onDowngrade: () => void;
2122
policyID?: string;
23+
backTo?: Route;
2224
};
2325

24-
function DowngradeIntro({onDowngrade, buttonDisabled, loading, policyID}: Props) {
26+
function DowngradeIntro({onDowngrade, buttonDisabled, loading, policyID, backTo}: Props) {
2527
const styles = useThemeStyles();
2628
const {translate} = useLocalize();
2729
const {environmentURL} = useEnvironment();
@@ -93,7 +95,7 @@ function DowngradeIntro({onDowngrade, buttonDisabled, loading, policyID}: Props)
9395
<Button
9496
text={translate('workspace.common.goToWorkspaces')}
9597
success
96-
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES, {forceReplace: true})}
98+
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.getRoute(backTo ?? Navigation.getActiveRoute()), {forceReplace: true})}
9799
large
98100
/>
99101
)}

‎src/pages/workspace/downgrade/WorkspaceDowngradePage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ function WorkspaceDowngradePage({route}: WorkspaceDowngradePageProps) {
9898
onDowngrade={onDowngradeToTeam}
9999
buttonDisabled={isOffline}
100100
loading={policy?.isPendingDowngrade}
101+
backTo={route.params.backTo}
101102
/>
102103
)}
103104
</ScrollView>

‎src/pages/workspace/upgrade/GenericFeaturesView.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
1010
import useThemeStyles from '@hooks/useThemeStyles';
1111
import Navigation from '@libs/Navigation/Navigation';
1212
import ROUTES from '@src/ROUTES';
13+
import type {Route} from '@src/ROUTES';
1314

1415
type GenericFeaturesViewProps = {
1516
buttonDisabled?: boolean;
1617
loading?: boolean;
1718
onUpgrade: () => void;
1819
formattedPrice: string;
1920
policyID?: string;
21+
backTo?: Route;
2022
};
2123

22-
function GenericFeaturesView({onUpgrade, buttonDisabled, loading, formattedPrice, policyID}: GenericFeaturesViewProps) {
24+
function GenericFeaturesView({onUpgrade, buttonDisabled, loading, formattedPrice, backTo, policyID}: GenericFeaturesViewProps) {
2325
const styles = useThemeStyles();
2426
const {translate} = useLocalize();
2527
const {isExtraSmallScreenWidth} = useResponsiveLayout();
@@ -86,7 +88,7 @@ function GenericFeaturesView({onUpgrade, buttonDisabled, loading, formattedPrice
8688
<Button
8789
text={translate('workspace.common.goToWorkspaces')}
8890
success
89-
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES, {forceReplace: true})}
91+
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.getRoute(backTo ?? Navigation.getActiveRoute()), {forceReplace: true})}
9092
large
9193
/>
9294
)}

‎src/pages/workspace/upgrade/UpgradeIntro.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {convertToShortDisplayString} from '@libs/CurrencyUtils';
2020
import Navigation from '@libs/Navigation/Navigation';
2121
import CONST from '@src/CONST';
2222
import ROUTES from '@src/ROUTES';
23+
import type {Route} from '@src/ROUTES';
2324
import GenericFeaturesView from './GenericFeaturesView';
2425

2526
type Props = {
@@ -29,9 +30,10 @@ type Props = {
2930
onUpgrade: () => void;
3031
isCategorizing?: boolean;
3132
policyID?: string;
33+
backTo?: Route;
3234
};
3335

34-
function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizing, policyID}: Props) {
36+
function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizing, policyID, backTo}: Props) {
3537
const styles = useThemeStyles();
3638
const {isExtraSmallScreenWidth} = useResponsiveLayout();
3739
const {translate} = useLocalize();
@@ -62,6 +64,7 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi
6264
formattedPrice={formattedPrice}
6365
loading={loading}
6466
policyID={policyID}
67+
backTo={backTo}
6568
/>
6669
);
6770
}

‎src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
201201
onUpgrade={onUpgradeToCorporate}
202202
buttonDisabled={isOffline}
203203
loading={policy?.isPendingUpgrade}
204+
backTo={route.params.backTo}
204205
/>
205206
)}
206207
</ScrollView>

0 commit comments

Comments
 (0)