From e1928a7dc91a8c855f6b921500e92964ac6c5a9f Mon Sep 17 00:00:00 2001
From: Rodrigo Lino da Costa <5201282+rlinoz@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:22:07 -0300
Subject: [PATCH] Revert "fix: view your subscription link does not navigate to
 subscription page"

---
 .../upgrade/WorkspaceUpgradePage.tsx          | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
index 0cdb15e33ac91..673b77d9c9a17 100644
--- a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
+++ b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
@@ -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;
@@ -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', () => {
@@ -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}
                 />
             )}