Fix broken back button on currency select by dangrous · Pull Request #22135 · Expensify/App

dangrous · 2023-07-03T19:53:31Z

Details

Code was pointing to a function that didn't exist. Replaced it with the older (but more updated) version that was there previously. Fixes the bug!

Screenshots are in except for Mobile Chrome - I couldn't get it to load on my simulator, but it also wasn't loading on main so it's not this PR.

Fixed Issues

$ #22130

Tests

Click on FAB > Request money
Click on the currency
Remove the &backTo=... from the URL and press enter
Click on the back button
Make sure it goes back to the Request money screen
Repeat with splitting a bill
Repeat with requesting money from an existing money request (so there is a reportID in the URL)

Verify that no errors appear in the JS console

Offline tests

QA Steps

Click on FAB > Request money
Click on the currency
Click on the back button at the top
Make sure it goes back to the new request money screen
Repeat with splitting a bill

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

DesktopWeb.mp4

Mobile Web - Chrome

Mobile Web - Safari

MobileSafari.mp4

Desktop

Desktop.mp4

iOS

iOS.mp4

Android

Android.mp4

melvin-bot · 2023-07-03T19:53:36Z

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

abdulrahuman5196 · 2023-07-04T07:37:38Z

Starting to look into this

Julesssss

Thanks for fixing! I'm going to ask for a C+ in the channel so I can unblock todays deploy.

Julesssss · 2023-07-04T08:21:28Z

Oh sorry @abdulrahuman5196, I just saw your comment that you have started reviewing already!

abdulrahuman5196 · 2023-07-04T08:38:18Z

Yeah @Julesssss will complete the verification soon and update if any issues comes

abdulrahuman5196 · 2023-07-04T10:35:58Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

Screen.Recording.2023-07-04.at.4.10.39.PM.mp4

Mobile Web - Chrome

az_recorder_20230704_162822.mp4

Mobile Web - Safari

Untitled.2.mp4

Desktop

Screen.Recording.2023-07-04.at.5.37.06.PM.mp4

iOS

Screen.Recording.2023-07-04.at.5.28.41.PM.mp4

Android

az_recorder_20230704_174004.mp4

abdulrahuman5196 · 2023-07-04T12:55:59Z

NAB: Not sure why we have to do "Remove the &backTo=... from the URL and press enter" in tests. backTo is used during currency selection which is same way after this PR as well.

abdulrahuman5196

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @Julesssss

🎀👀🎀
C+ Reviewed

abdulrahuman5196 · 2023-07-04T13:02:04Z

NAB: Kindly mark "Verify that no errors appear in the JS console" in QA tests as well.

Julesssss · 2023-07-04T13:13:08Z

Screenshot for the missing Chrome Web platform:

Julesssss · 2023-07-04T13:14:04Z

Cherry-picking the fix: https://github.com/Expensify/App/actions/runs/5455140852

…nbackbutton Fix broken back button on currency select (cherry picked from commit 1fb5319)

OSBotify · 2023-07-04T13:52:10Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.36-4 🚀

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

OSBotify · 2023-07-05T17:11:54Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.36-5 🚀

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

dangrous · 2023-07-05T17:53:25Z

NAB: Not sure why we have to do "Remove the &backTo=... from the URL and press enter" in tests. backTo is used during currency selection which is same way after this PR as well.

@abdulrahuman5196

So this is because the code that we changed only gets triggered if there isn't a route in the URL already (otherwise Navigation.goBack() will use that &BackTo... part. At least, if I'm understanding it correctly - the thing we're passing is a fallback.

abdulrahuman5196 · 2023-07-05T18:00:40Z

Navigation.goBack() will use that &BackTo... part

@dangrous I doubt that. AFAIK backTo is only used after we select currency. The route we gave in Navigation.goBack will be used regardless of backTo present in the URL or not. Correct me if wrong.

dangrous · 2023-07-05T19:14:50Z

Hm maybe I'm misinterpreting the parameter name, it's definitely called a fallbackRoute but maybe the non-fallback route isn't from the URL

App/src/libs/Navigation/Navigation.js

Lines 89 to 105 in 3b68701

    
           function goBack(fallbackRoute = ROUTES.HOME, shouldEnforceFallback = false) { 
        
               if (!canNavigate('goBack')) { 
        
                   return; 
        
               } 
        
               if (!navigationRef.current.canGoBack()) { 
        
                   Log.hmmm('[Navigation] Unable to go back'); 
        
                   return; 
        
               } 
        
               if (shouldEnforceFallback || (!getActiveRouteIndex(navigationRef.current.getState()) && fallbackRoute)) { 
        
                   navigate(fallbackRoute, 'UP'); 
        
                   return; 
        
               } 
        
               navigationRef.current.goBack(); 
        
           }

Daniel Gale-Rosen added 2 commits July 3, 2023 15:40

switch to route that actually exists

6d0ded7

add back parameters

aab21c7

dangrous requested a review from a team as a code owner July 3, 2023 19:53

dangrous self-assigned this Jul 3, 2023

melvin-bot Bot requested review from abdulrahuman5196 and removed request for a team July 3, 2023 19:53

prettier

0c75f2e

dangrous mentioned this pull request Jul 3, 2023

Deploy Checklist: New Expensify 2023-07-03 #22116

Closed

40 tasks

Julesssss approved these changes Jul 4, 2023

View reviewed changes

Julesssss requested review from abdulrahuman5196 and removed request for abdulrahuman5196 July 4, 2023 08:21

abdulrahuman5196 approved these changes Jul 4, 2023

View reviewed changes

melvin-bot Bot requested a review from cristipaval July 4, 2023 13:01

Expensify deleted a comment from melvin-bot Bot Jul 4, 2023

cristipaval approved these changes Jul 4, 2023

View reviewed changes

cristipaval merged commit 1fb5319 into main Jul 4, 2023

cristipaval deleted the dangrous-fixcurrencyselectionbackbutton branch July 4, 2023 13:11

This comment was marked as outdated.

Sign in to view

OSBotify pushed a commit that referenced this pull request Jul 4, 2023

Merge pull request #22135 from Expensify/dangrous-fixcurrencyselectio…

b7e3b12

…nbackbutton Fix broken back button on currency select (cherry picked from commit 1fb5319)

melvin-bot Bot mentioned this pull request Jul 5, 2023

[$1000] [HOLD for payment 2023-07-14] Back button is not working on select a currency page #22130

Closed

6 tasks

Uh oh!

Conversation

dangrous commented Jul 3, 2023 • edited by Julesssss Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jul 3, 2023

Uh oh!

abdulrahuman5196 commented Jul 4, 2023

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

Julesssss commented Jul 4, 2023

Uh oh!

abdulrahuman5196 commented Jul 4, 2023

Uh oh!

abdulrahuman5196 commented Jul 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

abdulrahuman5196 commented Jul 4, 2023

Uh oh!

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

Uh oh!

abdulrahuman5196 commented Jul 4, 2023

Uh oh!

Julesssss commented Jul 4, 2023

Uh oh!

Julesssss commented Jul 4, 2023

Uh oh!

This comment was marked as outdated.

OSBotify commented Jul 4, 2023

Uh oh!

OSBotify commented Jul 5, 2023

Uh oh!

dangrous commented Jul 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abdulrahuman5196 commented Jul 5, 2023

Uh oh!

dangrous commented Jul 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dangrous commented Jul 3, 2023 •

edited by Julesssss

Loading

abdulrahuman5196 commented Jul 4, 2023 •

edited

Loading

dangrous commented Jul 5, 2023 •

edited

Loading

dangrous commented Jul 5, 2023 •

edited

Loading