Skip to content

Multi ws copies upgrade #55858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlosmiceli merged 3 commits into from
Jan 28, 2025
Merged

Multi ws copies upgrade #55858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb43b28
added note to display text for changes to multiple workspace plan types
jayeshmangwani Jan 28, 2025
d97bc75
Merge branch 'main' into multi_ws_copies_upgrade
jayeshmangwani Jan 28, 2025
c7bb766
added conditional padding for note
jayeshmangwani Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4450,6 +4450,8 @@ const translations = {
benefit2: 'Smart expense rules',
benefit3: 'Multi-level approval workflows',
benefit4: 'Enhanced security controls',
toUpgrade: 'To upgrade, click',
selectWorkspace: 'select a workspace, and change the plan type to',
},
},
},
Expand All @@ -4466,6 +4468,9 @@ const translations = {
benefit2: 'Smart expense rules',
benefit3: 'Multi-level approval workflows',
benefit4: 'Enhanced security controls',
headsUp: 'Heads up!',
multiWorkspaceNote: 'You’ll need to downgrade all your workspaces before your first monthly payment to begin a subscription at the Collect rate. Click',
selectStep: '> select each workspace > change the plan type to',
},
},
completed: {
Expand Down
6 changes: 6 additions & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4516,6 +4516,8 @@ const translations = {
benefit2: 'Reglas inteligentes de gastos',
benefit3: 'Flujos de aprobación de varios niveles',
benefit4: 'Controles de seguridad mejorados',
toUpgrade: 'Para mejorar, haz clic',
selectWorkspace: 'selecciona un espacio de trabajo y cambia el tipo de plan a Controlar.',

@jayeshmangwani jayeshmangwani Jan 31, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DylanDylann @carlosmiceli, in this copy, we mistakenly show the plan type(Controlar) twice. I will raise a follow-up PR, but before that, I’ve bumped it on Slack again to get confirmation from the team on this Spanish copy.

},
},
},
Expand All @@ -4532,6 +4534,10 @@ const translations = {
benefit2: 'Reglas inteligentes de gastos',
benefit3: 'Flujos de aprobación de varios niveles',
benefit4: 'Controles de seguridad mejorados',
headsUp: '¡Atención!',
multiWorkspaceNote:
'Tendrás que bajar de categoría todos tus espacios de trabajo antes de tu primer pago mensual para comenzar una suscripción con la tasa del plan Recopilar. Haz clic',
selectStep: '> selecciona cada espacio de trabajo > cambia el tipo de plan a Recopilar.',
},
},
completed: {
Expand Down
18 changes: 14 additions & 4 deletions src/pages/workspace/downgrade/DowngradeIntro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,20 @@ function DowngradeIntro({onDowngrade, buttonDisabled, loading, policyID}: Props)
</TextLink>
.
</Text>
<Text style={[styles.mv4]}>
<Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.downgrade.commonFeatures.benefits.confirm')}</Text>{' '}
<Text style={[styles.textBold, styles.textSupporting]}>{translate('workspace.downgrade.commonFeatures.benefits.warning')}</Text>
</Text>
{policyID ? (
<Text style={[styles.mv4]}>
<Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.downgrade.commonFeatures.benefits.confirm')}</Text>{' '}
<Text style={[styles.textBold, styles.textSupporting]}>{translate('workspace.downgrade.commonFeatures.benefits.warning')}</Text>
</Text>
) : (
<Text style={[styles.mv4]}>
<Text style={[styles.textBold, styles.textSupporting]}>{translate('workspace.downgrade.commonFeatures.benefits.headsUp')}</Text>{' '}
<Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.downgrade.commonFeatures.benefits.multiWorkspaceNote')}</Text>{' '}
<Text style={[styles.textBold, styles.textSupporting]}>{translate('workspace.common.goToWorkspaces')}</Text>{' '}
<Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.downgrade.commonFeatures.benefits.selectStep')}</Text>{' '}
<Text style={[styles.textBold, styles.textSupporting]}>{translate('workspace.type.collect')}</Text>.
</Text>
)}
</View>
{policyID ? (
<Button
Expand Down
10 changes: 9 additions & 1 deletion src/pages/workspace/upgrade/GenericFeaturesView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function GenericFeaturesView({onUpgrade, buttonDisabled, loading, policyID}: Gen
height={48}
/>
</View>
<View style={styles.mb5}>
<View style={policyID ? styles.mb5 : styles.mb4}>
<Text style={[styles.textHeadlineH1, styles.mb4]}>{translate('workspace.upgrade.commonFeatures.title')}</Text>
<Text style={[styles.textNormal, styles.textSupporting, styles.mb4]}>{translate('workspace.upgrade.commonFeatures.note')}</Text>
{benefits.map((benefit) => (
Expand All @@ -74,6 +74,14 @@ function GenericFeaturesView({onUpgrade, buttonDisabled, loading, policyID}: Gen
{translate('workspace.upgrade.commonFeatures.benefits.pricing')}
</Text>
</View>
{!policyID && (
<Text style={[styles.mb5, styles.textNormal, styles.textSupporting]}>
<Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.upgrade.commonFeatures.benefits.toUpgrade')}</Text>{' '}
<Text style={[styles.textBold, styles.textSupporting]}>{translate('workspace.common.goToWorkspaces')}</Text>,{' '}
<Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.upgrade.commonFeatures.benefits.selectWorkspace')}</Text>{' '}
<Text style={[styles.textBold, styles.textSupporting]}>{translate('workspace.type.control')}</Text>.
</Text>
)}
{policyID ? (
<Button
isLoading={loading}
Expand Down