From f5e23af44ca703a985b749e795c9f3cf86ea581d Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Wed, 20 Aug 2025 15:02:41 +0700 Subject: [PATCH 1/2] fix: view your subcription link not responsive --- .../workspace/upgrade/UpgradeConfirmation.tsx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/upgrade/UpgradeConfirmation.tsx b/src/pages/workspace/upgrade/UpgradeConfirmation.tsx index 438ac3e60348..51c1877429da 100644 --- a/src/pages/workspace/upgrade/UpgradeConfirmation.tsx +++ b/src/pages/workspace/upgrade/UpgradeConfirmation.tsx @@ -1,4 +1,4 @@ -import React, {useMemo} from 'react'; +import React, {useCallback, useEffect, useMemo, useState} from 'react'; import {View} from 'react-native'; import ConfirmationPage from '@components/ConfirmationPage'; import RenderHTML from '@components/RenderHTML'; @@ -20,6 +20,16 @@ function UpgradeConfirmation({policyName, onConfirmUpgrade, isCategorizing, isTr const {translate} = useLocalize(); const styles = useThemeStyles(); const {environmentURL} = useEnvironment(); + const [subscriptionLink, setSubscriptionLink] = useState(''); + + const updateSubscriptionLink = useCallback(() => { + const backTo = Navigation.getActiveRoute(); + setSubscriptionLink(`${environmentURL}/${ROUTES.SETTINGS_SUBSCRIPTION.getRoute(backTo)}`); + }, [environmentURL]); + + useEffect(() => { + Navigation.isNavigationReady().then(() => updateSubscriptionLink()); + }, [updateSubscriptionLink]); const description = useMemo(() => { if (isCategorizing) { @@ -30,9 +40,6 @@ function UpgradeConfirmation({policyName, onConfirmUpgrade, isCategorizing, isTr return {translate('workspace.upgrade.completed.travelMessage')}; } - const backTo = Navigation.getActiveRoute(); - const subscriptionLink = `${environmentURL}/${ROUTES.SETTINGS_SUBSCRIPTION.getRoute(backTo)}`; - return ( From d753fb5b903a66d227f26ab361de91765cd6b7ca Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Wed, 20 Aug 2025 15:34:40 +0700 Subject: [PATCH 2/2] update code --- src/pages/workspace/upgrade/UpgradeConfirmation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/upgrade/UpgradeConfirmation.tsx b/src/pages/workspace/upgrade/UpgradeConfirmation.tsx index 51c1877429da..2e6a537c4e26 100644 --- a/src/pages/workspace/upgrade/UpgradeConfirmation.tsx +++ b/src/pages/workspace/upgrade/UpgradeConfirmation.tsx @@ -45,7 +45,7 @@ function UpgradeConfirmation({policyName, onConfirmUpgrade, isCategorizing, isTr ); - }, [environmentURL, isCategorizing, isTravelUpgrade, policyName, styles.renderHTML, styles.textAlignCenter, styles.w100, translate]); + }, [environmentURL, isCategorizing, isTravelUpgrade, policyName, styles.renderHTML, styles.textAlignCenter, styles.w100, translate, subscriptionLink]); return (