Skip to content

Revert "fix: view your subscription link does not navigate to subscription page" #49070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rlinoz wants to merge 1 commit into from
Closed

Revert "fix: view your subscription link does not navigate to subscription page" #49070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 6 additions & 28 deletions src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,6 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
const canPerformUpgrade = !!feature && !!policy && PolicyUtils.isPolicyAdmin(policy);
const isUpgraded = React.useMemo(() => PolicyUtils.isControlPolicy(policy), [policy]);

const goBack = useCallback(() => {
if (!feature) {
return;
}
switch (feature.id) {
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.id:
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.id:
return Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
default:
return route.params.backTo ? Navigation.navigate(route.params.backTo) : Navigation.goBack();
}
}, [feature, policyID, route.params.backTo]);

const upgradeToCorporate = () => {
if (!canPerformUpgrade) {
return;
Expand All @@ -60,13 +47,14 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
switch (feature.id) {
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.id:
Policy.enablePolicyReportFields(policyID, true, true);
break;
return Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
case CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.id:
Policy.enablePolicyRules(policyID, true, true);
break;
return Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
default:
return route.params.backTo ? Navigation.navigate(route.params.backTo) : Navigation.goBack();
}
}, [feature, policyID]);
}, [feature, policyID, route.params.backTo]);

useEffect(() => {
const unsubscribeListener = navigation.addListener('blur', () => {
Expand All @@ -91,21 +79,11 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
>
<HeaderWithBackButton
title={translate('common.upgrade')}
onBackButtonPress={() => {
if (isUpgraded) {
Navigation.dismissModal();
} else {
Navigation.goBack();
}
goBack();
}}
onBackButtonPress={() => (isUpgraded ? Navigation.dismissModal() : Navigation.goBack())}
/>
{isUpgraded && (
<UpgradeConfirmation
onConfirmUpgrade={() => {
Navigation.dismissModal();
goBack();
}}
onConfirmUpgrade={() => Navigation.dismissModal()}
policyName={policy.name}
/>
)}
Expand Down