Skip to content

Commit 966e609

Browse files
Merge pull request Expensify#61812 from Expensify/amy-active-member
Remove "active" member reference for new Collect pricing
2 parents 5e3d7c3 + 55269a3 commit 966e609

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

src/languages/en.ts

+1
Original file line numberDiff line numberDiff line change
@@ -4829,6 +4829,7 @@ const translations = {
48294829
},
48304830
pricing: {
48314831
perActiveMember: 'per active member per month.',
4832+
perMember: 'per member per month.',
48324833
},
48334834
note: {
48344835
upgradeWorkspace: 'Upgrade your workspace to access this feature, or',

src/languages/es.ts

+1
Original file line numberDiff line numberDiff line change
@@ -4902,6 +4902,7 @@ const translations = {
49024902
},
49034903
pricing: {
49044904
perActiveMember: 'por miembro activo al mes.',
4905+
perMember: 'por miembro al mes.',
49054906
},
49064907
upgradeToUnlock: 'Desbloquear esta función',
49074908
completed: {

src/pages/workspace/upgrade/GenericFeaturesView.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Icon from '@components/Icon';
55
import * as Illustrations from '@components/Icon/Illustrations';
66
import Text from '@components/Text';
77
import TextLink from '@components/TextLink';
8+
import useHasTeam2025Pricing from '@hooks/useHasTeam2025Pricing';
89
import useLocalize from '@hooks/useLocalize';
910
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1011
import useThemeStyles from '@hooks/useThemeStyles';
@@ -25,6 +26,7 @@ function GenericFeaturesView({onUpgrade, buttonDisabled, loading, formattedPrice
2526
const styles = useThemeStyles();
2627
const {translate} = useLocalize();
2728
const {isExtraSmallScreenWidth} = useResponsiveLayout();
29+
const hasTeam2025Pricing = useHasTeam2025Pricing();
2830

2931
const benefits = [
3032
translate('workspace.upgrade.commonFeatures.benefits.benefit1'),
@@ -57,7 +59,7 @@ function GenericFeaturesView({onUpgrade, buttonDisabled, loading, formattedPrice
5759
<Text style={[styles.textNormal, styles.textSupporting, styles.mt4]}>
5860
{translate('workspace.upgrade.commonFeatures.benefits.startsAt')}
5961
<Text style={[styles.textSupporting, styles.textBold]}>{formattedPrice}</Text>
60-
{translate('workspace.upgrade.commonFeatures.benefits.perMember')}{' '}
62+
{hasTeam2025Pricing ? translate('workspace.upgrade.pricing.perMember') : translate('workspace.upgrade.pricing.perActiveMember')}
6163
<TextLink
6264
style={[styles.link]}
6365
onPress={() => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION.getRoute(Navigation.getActiveRoute()))}

src/pages/workspace/upgrade/UpgradeIntro.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import * as Illustrations from '@components/Icon/Illustrations';
1010
import Text from '@components/Text';
1111
import TextLink from '@components/TextLink';
1212
import useEnvironment from '@hooks/useEnvironment';
13+
import useHasTeam2025Pricing from '@hooks/useHasTeam2025Pricing';
1314
import useLocalize from '@hooks/useLocalize';
1415
import usePreferredCurrency from '@hooks/usePreferredCurrency';
1516
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -40,6 +41,7 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi
4041
const {environmentURL} = useEnvironment();
4142
const subscriptionPlan = useSubscriptionPlan();
4243
const preferredCurrency = usePreferredCurrency();
44+
const hasTeam2025Pricing = useHasTeam2025Pricing();
4345

4446
const formattedPrice = React.useMemo(() => {
4547
const upgradeCurrency = Object.hasOwn(CONST.SUBSCRIPTION_PRICES, preferredCurrency) ? preferredCurrency : CONST.PAYMENT_CARD_CURRENCY.USD;
@@ -102,7 +104,7 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi
102104
<Text style={[styles.textNormal, styles.textSupporting]}>
103105
{translate(`workspace.upgrade.${feature.id}.onlyAvailableOnPlan`)}
104106
<Text style={[styles.textSupporting, styles.textBold]}>{formattedPrice}</Text>
105-
{translate(`workspace.upgrade.pricing.perActiveMember`)}
107+
{hasTeam2025Pricing ? translate('workspace.upgrade.pricing.perMember') : translate('workspace.upgrade.pricing.perActiveMember')}
106108
</Text>
107109
</View>
108110
<Button

0 commit comments

Comments
 (0)