Added new route for profile plan type #52117

jayeshmangwani · 2024-11-06T14:29:54Z

Explanation of Change

Fixed Issues

$ #51768
PROPOSAL:

Tests

Go to Workspaces -> Workspace -> Profile.
If the user has admin access, they will see the Plan Type tab under the Company address menu item.
Click on Plan Type to open a new RHP screen for Plan Type, where the current workspace plan will be preselected.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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.

Screenshots/Videos

Android: Native

Android.mov

Android: mWeb Chrome

mweb-chrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-11-11T09:30:49Z

@rayane-djouah 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]

rayane-djouah · 2024-11-11T09:32:21Z

@jayeshmangwani Do you need my review here?

jayeshmangwani · 2024-11-11T09:34:11Z

In this PR, @DylanDylann , we’ve added the Plan Type row and a new RHP page specifically for Plan Type. Currently, we're only implementing the pre-selection of the Plan Type on this page.

jayeshmangwani · 2024-11-11T09:35:11Z

@jayeshmangwani Do you need my review here?

No no, thanks for checking! @rayane-djouah Your review won’t be needed here.

DylanDylann · 2024-11-12T04:31:36Z

BUG: Offline indicator displays above the button

DylanDylann · 2024-11-12T04:34:28Z

BUG: (Tested on IPhone 15 Promax, IOS 17.2)

The button should display above the device border
The subtitle should be in the scroll view

Screen.Recording.2024-11-12.at.11.33.10.mov

jayeshmangwani · 2024-11-12T13:21:25Z

Thanks for the review, @DylanDylann! I’ve fixed the button position issue when offline. I’ll be adding the upgrade component to this PR next.

jayeshmangwani · 2024-11-12T13:23:55Z

The subtitle should be in the scroll view

We’re currently keeping the subtitle text outside the ScrollView for the SelectionList on some pages, like the Priority and Theme pages. I don’t have a strong opinion on this; I’ve kept it outside mainly for consistency.

subtitle-scrollview-outside.mov

DylanDylann · 2024-11-13T07:50:59Z

@jayeshmangwani Thanks for your update. Please ping me when you push the new code for upgrade component

jayeshmangwani · 2024-11-21T11:59:40Z

Plan Types and Workspace Upgrade Attachments

iOS

upgrade-workspace-ios.mov

Desktop:

upgrade-workspace-deesktop.mov

web:

upgrade-workspace-web.mov

jayeshmangwani · 2024-11-21T12:01:13Z

@DylanDylann I've added the Plan Type page and handled the upgrade workspace case. Feel free to review! A few things are yet to be confirmed (I’ve added comments above for those), but they shouldn't block the initial review of these changes.

Thanks!

DylanDylann · 2024-11-25T04:34:49Z

src/pages/workspace/upgrade/UpgradeIntro.tsx

@@ -88,4 +98,60 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading}: Props) {
    );
 }

+function CommonCorporateFeatures({buttonDisabled, loading, onUpgrade}: {buttonDisabled?: boolean; loading?: boolean; onUpgrade: () => void}) {


@jayeshmangwani Let's move this component to a new file

DylanDylann · 2024-11-25T04:37:38Z

@jayeshmangwani Also please help to resolve conflict

DylanDylann · 2024-11-25T04:39:51Z

Please add pending action to the new field when creating a new workspace

Screen.Recording.2024-11-25.at.11.39.06.mov

… add for workspace type

jayeshmangwani · 2024-11-25T08:44:29Z

Thanks for the review, @DylanDylann! I’ve resolved the merge conflicts and CommonCorporateFeatures migrated to a new component (GenericFeaturesView). However, I’m not sure if the new component name fully justifies its purpose 😄.

DylanDylann · 2024-11-25T14:44:33Z

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

Screen.Recording.2024-11-25.at.21.52.45.mov

Android: mWeb Chrome

Screen.Recording.2024-11-25.at.21.48.07.mov

iOS: Native

Screen.Recording.2024-11-25.at.21.51.40.mov

iOS: mWeb Safari

Screen.Recording.2024-11-25.at.21.46.51.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-25.at.21.44.47.mov

MacOS: Desktop

Screen.Recording.2024-11-25.at.21.45.09.mov

DylanDylann · 2024-11-27T06:56:00Z

@carlosmiceli Friendly bump

carlosmiceli · 2024-11-27T15:02:22Z

Thanks for the bump, been waiting for a review on a BE PR to get merged. @DylanDylann correct me if I'm wrong, but wouldn't we risk showing a non-working plan type selector with this PR if the BE is not ready?

DylanDylann · 2024-11-27T15:17:20Z

@carlosmiceli We can merge this PR first without an update from BE, this PR is about the upgrade flow and the API for this is done before

carlosmiceli · 2024-11-27T15:58:24Z

Gotcha, let's solve conflicts and we can merge! 🙇
cc @jayeshmangwani

jayeshmangwani · 2024-11-27T16:06:57Z

Conflicts have been resolved @carlosmiceli. Before merging the PR, please check these comments: #52117 (comment) and #52117 (comment)

OSBotify · 2024-11-27T22:56:35Z

✋ 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 · 2024-11-28T14:47:15Z

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

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

github-actions · 2024-11-30T13:51:50Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.68-7 🚀

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

carlosmiceli · 2024-11-30T16:17:55Z

@jayeshmangwani how does it work with the changes from this PR that got reverted? Are you creating another PR with the same changes now that the BE is ready?

jayeshmangwani · 2024-11-30T16:22:18Z

Yes, I'll be raising the PR in a few hours. I'm away from the keyboard right now.

carlosmiceli · 2024-11-30T16:25:30Z

No rush at all, it's Saturday 😄

jayeshmangwani · 2024-11-30T21:14:57Z

@carlosmiceli @DylanDylann New PR containing the same changes has been created here #53343

jayeshmangwani added 7 commits November 6, 2024 19:53

added new route for profile plan type

6a6e6b1

merge main and resolved conflicts

354e371

added plan type and pricing help for URL

fe3d7ad

Merge branch 'main' into workspace_downgrade_plan_type_page

aa22a9d

added selection list for ws plan type selection

a5a0ba0

Merge branch 'main' into workspace_downgrade_plan_type_page

6e5a07d

Merge branch 'main' into workspace_downgrade_plan_type_page

cc5de45

jayeshmangwani marked this pull request as ready for review November 11, 2024 09:30

jayeshmangwani requested a review from a team as a code owner November 11, 2024 09:30

melvin-bot bot requested review from rayane-djouah and removed request for a team November 11, 2024 09:30

jayeshmangwani added 2 commits November 11, 2024 15:13

removed unused en.ts key

bfbe6d1

removed unused es.ts key

eb2b373

DylanDylann mentioned this pull request Nov 12, 2024

[HOLD for payment 2025-01-02] [HOLD for payment 2024-12-07] Create missing upgrade and RHP components #51768

Closed

jayeshmangwani added 2 commits November 12, 2024 17:48

Merge branch 'main' into workspace_downgrade_plan_type_page

fc72d50

fixed footer button position when offline

ca5a6c2

jayeshmangwani added 5 commits November 13, 2024 17:09

Merge branch 'main' into workspace_downgrade_plan_type_page

60fc866

Merge branch 'main' into workspace_downgrade_plan_type_page

02ba6dc

Merge branch 'main' into workspace_downgrade_plan_type_page

5874d3b

Merge branch 'main' into workspace_downgrade_plan_type_page

a893592

Merge branch 'main' into workspace_downgrade_plan_type_page

3ecbd4a

Merge branch 'main' into workspace_downgrade_plan_type_page

1778c65

DylanDylann reviewed Nov 25, 2024

View reviewed changes

jayeshmangwani added 2 commits November 25, 2024 12:33

merged main and resolved conflicts

baf3180

generic upgrade features moved to a new file and added pending action…

c6f8a99

… add for workspace type

DylanDylann approved these changes Nov 25, 2024

View reviewed changes

melvin-bot bot requested a review from carlosmiceli November 25, 2024 14:58

merged main and resolved conflicts

728afd4

carlosmiceli approved these changes Nov 27, 2024

View reviewed changes

carlosmiceli merged commit 849b20a into Expensify:main Nov 27, 2024
19 checks passed

github-actions bot mentioned this pull request Nov 28, 2024

Deploy Checklist: New Expensify 2024-11-28 #53245

Closed

72 tasks

carlosmiceli mentioned this pull request Nov 28, 2024

[HOLD for payment 2024-12-09] [HOLD for payment 2024-12-07] Workspace - The button to save the type of plan doesn't work #53254

Closed

8 tasks

jayeshmangwani mentioned this pull request Nov 28, 2024

[No QA] Rever PR 52117 #53258

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added new route for profile plan type #52117

Added new route for profile plan type #52117

jayeshmangwani commented Nov 6, 2024 •

edited

Loading

melvin-bot bot commented Nov 11, 2024

rayane-djouah commented Nov 11, 2024

jayeshmangwani commented Nov 11, 2024

jayeshmangwani commented Nov 11, 2024

DylanDylann commented Nov 12, 2024

DylanDylann commented Nov 12, 2024 •

edited

Loading

jayeshmangwani commented Nov 12, 2024

jayeshmangwani commented Nov 12, 2024

DylanDylann commented Nov 13, 2024

jayeshmangwani commented Nov 21, 2024

jayeshmangwani commented Nov 21, 2024

DylanDylann Nov 25, 2024

DylanDylann commented Nov 25, 2024

DylanDylann commented Nov 25, 2024

jayeshmangwani commented Nov 25, 2024

DylanDylann commented Nov 25, 2024 •

edited

Loading

DylanDylann commented Nov 27, 2024

carlosmiceli commented Nov 27, 2024

DylanDylann commented Nov 27, 2024

carlosmiceli commented Nov 27, 2024

jayeshmangwani commented Nov 27, 2024

OSBotify commented Nov 27, 2024

github-actions bot commented Nov 28, 2024

github-actions bot commented Nov 30, 2024

carlosmiceli commented Nov 30, 2024

jayeshmangwani commented Nov 30, 2024

carlosmiceli commented Nov 30, 2024

jayeshmangwani commented Nov 30, 2024

Added new route for profile plan type #52117

Added new route for profile plan type #52117

Conversation

jayeshmangwani commented Nov 6, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 11, 2024

rayane-djouah commented Nov 11, 2024

jayeshmangwani commented Nov 11, 2024

jayeshmangwani commented Nov 11, 2024

DylanDylann commented Nov 12, 2024

DylanDylann commented Nov 12, 2024 • edited Loading

jayeshmangwani commented Nov 12, 2024

jayeshmangwani commented Nov 12, 2024

DylanDylann commented Nov 13, 2024

jayeshmangwani commented Nov 21, 2024

jayeshmangwani commented Nov 21, 2024

DylanDylann Nov 25, 2024

Choose a reason for hiding this comment

DylanDylann commented Nov 25, 2024

DylanDylann commented Nov 25, 2024

jayeshmangwani commented Nov 25, 2024

DylanDylann commented Nov 25, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Nov 27, 2024

carlosmiceli commented Nov 27, 2024

DylanDylann commented Nov 27, 2024

carlosmiceli commented Nov 27, 2024

jayeshmangwani commented Nov 27, 2024

OSBotify commented Nov 27, 2024

github-actions bot commented Nov 28, 2024

github-actions bot commented Nov 30, 2024

carlosmiceli commented Nov 30, 2024

jayeshmangwani commented Nov 30, 2024

carlosmiceli commented Nov 30, 2024

jayeshmangwani commented Nov 30, 2024

jayeshmangwani commented Nov 6, 2024 •

edited

Loading

DylanDylann commented Nov 12, 2024 •

edited

Loading

DylanDylann commented Nov 25, 2024 •

edited

Loading