fix: redirect to proper place after upgrade #45730

allroundexperts · 2024-07-18T22:48:42Z

Details

This PR fixes a number of issues related to the upgrade flow.

Fixed Issues

$ #45692
$ #45689
$ #45682
$ #45884

PROPOSAL: N/A

Tests

Test 1

Create a workspace
Go to More Features
Click/tap on the slider for ‘Report fields’
Click ‘Upgrade’
Click ‘Got it, thanks’
Verify that the report fields is enabled and in the LHN and the user is directed back to the ‘More features’ page

Test 2

Create a workspace
Navigate to workspace settings page
Click on More features > toggle Report fields
Click on back icon on RHP
Verify that there should be a transition animation

Test 3

Create a workspace
Navigate to workspace settings page
Go to More features > Toggle on Report fields.
Click on the back button on RHP.
Verify that the page will not scroll up after clicking on back button on RHP.
Enable Accounting.
Go to Accounting.
Toggle on NetSuite.
Click on the back button on RHP.
Verify that the app will remain on the same accounting page after clicking on back button on RHP

Test 4

Create a new workspace in NewDot
Navigate to Workspace Settings > More Features
Enable Report Fields
Click 'Upgrade'
Click 'Got it, thanks'
Navigate to the #admins room for the workspace
Verify that the message in the #admins room should refer to the feature by its pretty name, 'Report Fields'.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Test 1

Create a workspace
Go to More Features
Click/tap on the slider for ‘Report fields’
Click ‘Upgrade’
Click ‘Got it, thanks’
Verify that the report fields is enabled and in the LHN and the user is directed back to the ‘More features’ page

Test 2

Create a workspace
Navigate to workspace settings page
Click on More features > toggle Report fields
Click on back icon on RHP
Verify that there should be a transition animation

Test 3

Create a workspace
Navigate to workspace settings page
Go to More features > Toggle on Report fields.
Click on the back button on RHP.
Verify that the page will not scroll up after clicking on back button on RHP.
Enable Accounting.
Go to Accounting.
Toggle on NetSuite.
Click on the back button on RHP.
Verify that the app will remain on the same accounting page after clicking on back button on RHP

Test 4

Create a new workspace in NewDot
Navigate to Workspace Settings > More Features
Enable Report Fields
Click 'Upgrade'
Click 'Got it, thanks'
Navigate to the #admins room for the workspace
Verify that the message in the #admins room should refer to the feature by its pretty name, 'Report Fields'.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2024-07-19.at.3.44.47.AM.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2024-07-19.at.3.39.45.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-19.at.3.31.56.AM.mov

Screen.Recording.2024-07-19.at.3.32.11.AM.mov

MacOS: Desktop

Screen.Recording.2024-07-19.at.3.35.00.AM.mov

melvin-bot · 2024-07-22T21:39:30Z

@dukenv0307 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]

dukenv0307 · 2024-07-23T02:44:51Z

I think @rushatgabhane should review this PR, right?

trjExpensify · 2024-07-23T11:23:08Z

Yep, @rushatgabhane please jump in on this one. 👀

rushatgabhane · 2024-07-24T02:36:54Z

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-07-25.at.19.39.47.mov

Screen.Recording.2024-07-25.at.19.39.40.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-07-25.at.19.32.33.mov

Screen.Recording.2024-07-25.at.19.32.10.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-07-24.at.20.42.17.mov

MacOS: Desktop

Screen.Recording.2024-07-25.at.19.36.39.mov

rushatgabhane

@allroundexperts on clicking "Got it, thanks" there is no animation for closing the modal

Screen.Recording.2024-07-24.at.20.42.172.mov

allroundexperts · 2024-07-24T23:04:34Z

@allroundexperts on clicking "Got it, thanks" there is no animation for closing the modal

Screen.Recording.2024-07-24.at.20.42.172.mov

@rushatgabhane I don't think this is a bug. Whenever we navigate from the RHP, the animation does not work. It only works when we either use goBack or dismissModal. Both of these can not be used here since we don't necessarily want to go back in case of other upgrade flows.

rushatgabhane

LGTM

trjExpensify · 2024-07-26T14:01:57Z

@madmax330 you good to review this PR today?

OSBotify · 2024-07-26T16:27:32Z

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

OSBotify · 2024-07-29T19:30:34Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.0.14-1 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

aldo-expensify · 2024-07-29T23:01:25Z

The animation in this video looks pretty broken after upgrading the workspace

Screen.Recording.2024-07-19.at.3.44.47.AM.mov

Did it look like that before this PR?

aldo-expensify · 2024-07-29T23:02:50Z

src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx

+        switch (feature.id) {
+            case CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.id:
+                Policy.enablePolicyReportFields(policyID, true);
+                return Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID), CONST.NAVIGATION.TYPE.UP);
+            default:
+                return route.params.backTo ? Navigation.navigate(route.params.backTo, CONST.NAVIGATION.TYPE.UP) : Navigation.goBack();


Why is this not simply Navigation.goBack()? Seems to work fine and fix #46450, but maybe I'm missing something 🤷

OSBotify · 2024-07-31T19:40:29Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.14-6 🚀

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

fix: redirect to proper place after upgrade

allroundexperts added 3 commits July 19, 2024 03:30

redirect to proper place after upgrade

a545409

Merge branch 'main' into fix-45689

5a7f4d0

update feature name for admin message

36b02a3

allroundexperts marked this pull request as ready for review July 22, 2024 21:39

allroundexperts requested review from a team as code owners July 22, 2024 21:39

melvin-bot bot requested review from dukenv0307 and removed request for a team July 22, 2024 21:39

garrettmknight requested review from rushatgabhane and removed request for dukenv0307 July 23, 2024 10:11

rushatgabhane suggested changes Jul 24, 2024

View reviewed changes

Merge branch 'main' into fix-45689

a8527a6

allroundexperts requested a review from rushatgabhane July 24, 2024 23:04

rushatgabhane approved these changes Jul 25, 2024

View reviewed changes

melvin-bot bot requested a review from madmax330 July 25, 2024 16:41

madmax330 approved these changes Jul 26, 2024

View reviewed changes

madmax330 merged commit e997502 into Expensify:main Jul 26, 2024
15 checks passed

allroundexperts mentioned this pull request Jul 28, 2024

[HOLD for payment 2024-08-07] [Upgrades] There is no transition animation when closing upgrade RHP #45689

Closed

6 tasks

hungvu193 mentioned this pull request Jul 29, 2024

[QBO Export] feat: handling auto-sync errors #45251

Merged

50 tasks

github-actions bot mentioned this pull request Jul 29, 2024

Deploy Checklist: New Expensify 2024-07-29 #46436

Closed

84 tasks

m-natarajan mentioned this pull request Jul 29, 2024

Workspace - Back button returns to the same workspace page after upgrading to Control #46450

Closed

6 tasks

aldo-expensify reviewed Jul 29, 2024

View reviewed changes

aldo-expensify mentioned this pull request Jul 29, 2024

[CP Staging] Revert "fix: redirect to proper place after upgrade" #46460

Merged

allroundexperts pushed a commit to allroundexperts/Expensify that referenced this pull request Jul 31, 2024

Merge pull request Expensify#45730 from allroundexperts/fix-45689

fd56509

fix: redirect to proper place after upgrade

trjExpensify mentioned this pull request Jul 31, 2024

fix: redirect to proper place after upgrade #46617

Merged

50 tasks

neonbhai mentioned this pull request Aug 20, 2024

Fix: When navigate back from NetSuite page workspace profile page opens #46776

Closed

49 tasks

stephanieelliott mentioned this pull request Aug 21, 2024

[$250] Accounting – When navigate back from NetSuite page workspace profile page opens #46230

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: redirect to proper place after upgrade #45730

fix: redirect to proper place after upgrade #45730

allroundexperts commented Jul 18, 2024 •

edited

Loading

melvin-bot bot commented Jul 22, 2024

dukenv0307 commented Jul 23, 2024

trjExpensify commented Jul 23, 2024

rushatgabhane commented Jul 24, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

allroundexperts commented Jul 24, 2024

rushatgabhane left a comment

trjExpensify commented Jul 26, 2024

OSBotify commented Jul 26, 2024

OSBotify commented Jul 29, 2024

aldo-expensify commented Jul 29, 2024 •

edited

Loading

aldo-expensify Jul 29, 2024 •

edited

Loading

OSBotify commented Jul 31, 2024

fix: redirect to proper place after upgrade #45730

fix: redirect to proper place after upgrade #45730

Conversation

allroundexperts commented Jul 18, 2024 • edited Loading

Details

Fixed Issues

Tests

Test 1

Test 2

Test 3

Test 4

Offline tests

QA Steps

Test 1

Test 2

Test 3

Test 4

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 22, 2024

dukenv0307 commented Jul 23, 2024

trjExpensify commented Jul 23, 2024

rushatgabhane commented Jul 24, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

allroundexperts commented Jul 24, 2024

rushatgabhane left a comment

Choose a reason for hiding this comment

trjExpensify commented Jul 26, 2024

OSBotify commented Jul 26, 2024

OSBotify commented Jul 29, 2024

aldo-expensify commented Jul 29, 2024 • edited Loading

aldo-expensify Jul 29, 2024 • edited Loading

Choose a reason for hiding this comment

OSBotify commented Jul 31, 2024

allroundexperts commented Jul 18, 2024 •

edited

Loading

rushatgabhane commented Jul 24, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

aldo-expensify commented Jul 29, 2024 •

edited

Loading

aldo-expensify Jul 29, 2024 •

edited

Loading