From efea5b62c76b776d04aca0a8341f060d124fb87c Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Thu, 28 Nov 2024 23:03:41 +0700 Subject: [PATCH 1/2] fix learn more link if no workspace --- src/pages/workspace/upgrade/UpgradeIntro.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/upgrade/UpgradeIntro.tsx b/src/pages/workspace/upgrade/UpgradeIntro.tsx index df6306c79023..29da6b773550 100644 --- a/src/pages/workspace/upgrade/UpgradeIntro.tsx +++ b/src/pages/workspace/upgrade/UpgradeIntro.tsx @@ -9,9 +9,12 @@ import * as Expensicon from '@components/Icon/Expensicons'; import * as Illustrations from '@components/Icon/Illustrations'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; +import useEnvironment from '@hooks/useEnvironment'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; +import useSubscriptionPlan from '@hooks/useSubscriptionPlan'; import useThemeStyles from '@hooks/useThemeStyles'; +import {openLink} from '@libs/actions/Link'; import Navigation from '@libs/Navigation/Navigation'; import CONST from '@src/CONST'; import ROUTES from '@src/ROUTES'; @@ -29,6 +32,8 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi const styles = useThemeStyles(); const {isExtraSmallScreenWidth} = useResponsiveLayout(); const {translate} = useLocalize(); + const {environmentURL} = useEnvironment(); + const subscriptionPlan = useSubscriptionPlan(); if (!feature) { return ( @@ -91,7 +96,12 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi {translate('workspace.upgrade.note.upgradeWorkspace')}{' '} Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)} + onPress={() => { + if (!subscriptionPlan) { + openLink(CONST.PLAN_TYPES_AND_PRICING_HELP_URL, environmentURL); + } + Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION); + }} > {translate('workspace.upgrade.note.learnMore')} {' '} From 6ada95b9d23ab63ee80cfbac558424de95c3b96c Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Thu, 28 Nov 2024 23:33:20 +0700 Subject: [PATCH 2/2] return early --- src/pages/workspace/upgrade/UpgradeIntro.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/upgrade/UpgradeIntro.tsx b/src/pages/workspace/upgrade/UpgradeIntro.tsx index 29da6b773550..80546e198000 100644 --- a/src/pages/workspace/upgrade/UpgradeIntro.tsx +++ b/src/pages/workspace/upgrade/UpgradeIntro.tsx @@ -99,6 +99,7 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi onPress={() => { if (!subscriptionPlan) { openLink(CONST.PLAN_TYPES_AND_PRICING_HELP_URL, environmentURL); + return; } Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION); }}