Multi ws copies upgrade #55858

jayeshmangwani · 2025-01-28T13:27:46Z

Explanation of Change

In this PR, we added a highlight in the downgrade/upgrade RHP to address the missing explanation that users with multiple subscriptions will need to downgrade each workspace individually.

Fixed Issues

$ #52588
PROPOSAL:

Tests

Single Workspace Upgrade

Create a new account
Create a workspace
Navigate to subscriptions
Click on 'Control'
Confirm Upgrade RHP opens
Verify that The Control plan starts at $9 per active member per month. Learn more about our plans and pricing. note displayed above the "Upgrade" button

Single Workspace Downgrade (follow Single Workspace Upgrade steps first)

Navigate to subscriptions
Click on 'Collect'
Confirm Downgrade RHP opens
Verify that Are you sure you want to downgrade and remove your configurations? This cannot be undone. note displayed above the "Downgrade workspace" button

Multi Workspace Upgrade (follow Single Workspace Upgrade + Downgrade steps first)

Create an additional workspace
Navigate to subscriptions
Click on 'Control'
Confirm Upgrade RHP opens for multi workspaces
Verify that To upgrade, click Go to workspaces, select a workspace, and change the plan type to Control. note displayed above the "Go to Workspaces" button

Multi Workspace Downgrade (follow Multi Workspace Upgrade steps first)

Navigate to subscriptions
Click on 'Collect'
Confirm Downgrade RHP opens for multi workspaces
Verify that Heads up! You’ll need to downgrade all your workspaces before your first monthly payment to begin a subscription at the Collect rate. Click Go to workspaces > select each workspace > change the plan type to Collect. note displayed above the "Go to Workspaces" button

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as above Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-01-28T13:27:52Z

@paultsimura Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

jayeshmangwani · 2025-01-28T13:29:18Z

@DylanDylann tagging you for review here

DylanDylann · 2025-01-28T14:23:56Z

@jayeshmangwani Could you add an explanation for this PR?

jayeshmangwani · 2025-01-28T14:30:59Z

@DylanDylann I’ve added it. Go ahead with testing.

DylanDylann · 2025-01-28T14:54:13Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

DylanDylann

Minor update. LGTM

carlosmiceli · 2025-01-28T15:12:14Z

Good stuff, thanks guys!

OSBotify · 2025-01-28T15:21:30Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-01-29T06:42:40Z

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.0.91-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2025-01-30T01:29:58Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.91-2 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

jayeshmangwani · 2025-01-31T06:42:57Z

src/languages/es.ts

@@ -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.',


@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.

jayeshmangwani added 3 commits January 28, 2025 17:06

added note to display text for changes to multiple workspace plan types

fb43b28

Merge branch 'main' into multi_ws_copies_upgrade

d97bc75

added conditional padding for note

c7bb766

jayeshmangwani requested a review from a team as a code owner January 28, 2025 13:27

melvin-bot bot requested review from paultsimura and removed request for a team January 28, 2025 13:27

jayeshmangwani mentioned this pull request Jan 28, 2025

[HOLD for payment 2025-02-06] [HOLD for payment 2025-01-21] Add plan changes to Subscriptions #52588

Open

DylanDylann approved these changes Jan 28, 2025

View reviewed changes

melvin-bot bot requested a review from carlosmiceli January 28, 2025 14:55

carlosmiceli approved these changes Jan 28, 2025

View reviewed changes

carlosmiceli merged commit 232a753 into Expensify:main Jan 28, 2025
18 checks passed

github-actions bot mentioned this pull request Jan 29, 2025

Deploy Checklist: New Expensify 2025-01-29 #55926

Closed

50 tasks

jayeshmangwani commented Jan 31, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multi ws copies upgrade #55858

Multi ws copies upgrade #55858

jayeshmangwani commented Jan 28, 2025 •

edited

Loading

melvin-bot bot commented Jan 28, 2025

jayeshmangwani commented Jan 28, 2025

DylanDylann commented Jan 28, 2025

jayeshmangwani commented Jan 28, 2025

DylanDylann commented Jan 28, 2025 •

edited

Loading

DylanDylann left a comment

carlosmiceli commented Jan 28, 2025

OSBotify commented Jan 28, 2025

github-actions bot commented Jan 29, 2025

github-actions bot commented Jan 30, 2025

jayeshmangwani Jan 31, 2025

Multi ws copies upgrade #55858

Multi ws copies upgrade #55858

Conversation

jayeshmangwani commented Jan 28, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Single Workspace Upgrade

Single Workspace Downgrade (follow Single Workspace Upgrade steps first)

Multi Workspace Upgrade (follow Single Workspace Upgrade + Downgrade steps first)

Multi Workspace Downgrade (follow Multi Workspace Upgrade steps first)

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 28, 2025

jayeshmangwani commented Jan 28, 2025

DylanDylann commented Jan 28, 2025

jayeshmangwani commented Jan 28, 2025

DylanDylann commented Jan 28, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann left a comment

Choose a reason for hiding this comment

carlosmiceli commented Jan 28, 2025

OSBotify commented Jan 28, 2025

github-actions bot commented Jan 29, 2025

github-actions bot commented Jan 30, 2025

jayeshmangwani Jan 31, 2025

Choose a reason for hiding this comment

jayeshmangwani commented Jan 28, 2025 •

edited

Loading

DylanDylann commented Jan 28, 2025 •

edited

Loading