diff --git a/src/pages/workspace/upgrade/GenericFeaturesView.tsx b/src/pages/workspace/upgrade/GenericFeaturesView.tsx index 731946182ad4..7084d491e65e 100644 --- a/src/pages/workspace/upgrade/GenericFeaturesView.tsx +++ b/src/pages/workspace/upgrade/GenericFeaturesView.tsx @@ -6,10 +6,8 @@ import * as Illustrations from '@components/Icon/Illustrations'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; import useLocalize from '@hooks/useLocalize'; -import usePreferredCurrency from '@hooks/usePreferredCurrency'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; -import {convertToShortDisplayString} from '@libs/CurrencyUtils'; import Navigation from '@libs/Navigation/Navigation'; import CONST from '@src/CONST'; import ROUTES from '@src/ROUTES'; @@ -18,14 +16,14 @@ type GenericFeaturesViewProps = { buttonDisabled?: boolean; loading?: boolean; onUpgrade: () => void; + formattedPrice: string; policyID?: string; }; -function GenericFeaturesView({onUpgrade, buttonDisabled, loading, policyID}: GenericFeaturesViewProps) { +function GenericFeaturesView({onUpgrade, buttonDisabled, loading, formattedPrice, policyID}: GenericFeaturesViewProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const {isExtraSmallScreenWidth} = useResponsiveLayout(); - const preferredCurrency = usePreferredCurrency(); const benefits = [ translate('workspace.upgrade.commonFeatures.benefits.benefit1'), @@ -34,12 +32,6 @@ function GenericFeaturesView({onUpgrade, buttonDisabled, loading, policyID}: Gen translate('workspace.upgrade.commonFeatures.benefits.benefit4'), ]; - const formattedPrice = React.useMemo(() => { - const upgradeCurrency = Object.hasOwn(CONST.SUBSCRIPTION_PRICES, preferredCurrency) ? preferredCurrency : CONST.PAYMENT_CARD_CURRENCY.USD; - const upgradePrice = CONST.SUBSCRIPTION_PRICES[upgradeCurrency][CONST.POLICY.TYPE.CORPORATE][CONST.SUBSCRIPTION.TYPE.ANNUAL]; - return `${convertToShortDisplayString(upgradePrice, upgradeCurrency)} `; - }, [preferredCurrency]); - return ( diff --git a/src/pages/workspace/upgrade/UpgradeIntro.tsx b/src/pages/workspace/upgrade/UpgradeIntro.tsx index e3d5b055c1a7..c64441d45899 100644 --- a/src/pages/workspace/upgrade/UpgradeIntro.tsx +++ b/src/pages/workspace/upgrade/UpgradeIntro.tsx @@ -40,10 +40,11 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi const preferredCurrency = usePreferredCurrency(); const formattedPrice = React.useMemo(() => { - const upgradePlan = isCategorizing ? CONST.POLICY.TYPE.TEAM : CONST.POLICY.TYPE.CORPORATE; const upgradeCurrency = Object.hasOwn(CONST.SUBSCRIPTION_PRICES, preferredCurrency) ? preferredCurrency : CONST.PAYMENT_CARD_CURRENCY.USD; - const upgradePrice = CONST.SUBSCRIPTION_PRICES[upgradeCurrency][upgradePlan][CONST.SUBSCRIPTION.TYPE.ANNUAL]; - return `${convertToShortDisplayString(upgradePrice, upgradeCurrency)} `; + return `${convertToShortDisplayString( + CONST.SUBSCRIPTION_PRICES[upgradeCurrency][isCategorizing ? CONST.POLICY.TYPE.TEAM : CONST.POLICY.TYPE.CORPORATE][CONST.SUBSCRIPTION.TYPE.ANNUAL], + upgradeCurrency, + )} `; }, [preferredCurrency, isCategorizing]); /** @@ -58,6 +59,7 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi