Skip to content

[CP Staging] Fixing the race condition on history.go due to buggy queue async callbacks#25989

Merged
mountiny merged 3 commits into
Expensify:mainfrom
shubham1206agra:revert-25963-revert-25866-react-navigation-native-fix
Sep 1, 2023
Merged

[CP Staging] Fixing the race condition on history.go due to buggy queue async callbacks#25989
mountiny merged 3 commits into
Expensify:mainfrom
shubham1206agra:revert-25963-revert-25866-react-navigation-native-fix

Conversation

@shubham1206agra

@shubham1206agra shubham1206agra commented Aug 26, 2023 •
edited by mountiny
Loading

Copy link
Copy Markdown
Contributor

Reverts #25963

Details

Fixed Issues

$ #25527
$ #25626
PROPOSAL: #25527 (comment)

Tests / QA Steps

  1. Open the app
  2. Click CTRL+K
  3. Click CTRL+SHIFT+K
  4. Again click CTRL+K
  1. Request money
  2. Write some amount
  3. Click on the currency symbol to change currency
  4. Select different currency
  5. Verify you have been naivgated back to the amount page and correct amount and currency are selected
  6. Contine in the request money flow
  7. On the confirmation page, select amount and chage the amount and currency
  8. Verify this work correctly
  9. Request the money from another user
  10. Navigate to the expense detail
  11. Edit the amount and currency
  12. Verify it worked correctly
  • Verify that no errors appear in the JS console
  • Verify that the search page should be open at last

Additional Test

  1. Open settings
  2. CMD + K to open search
  3. CMD+ SHIFT + K to open new group
  4. CMD + K again to open search
  • Verify that no errors appear in the JS console
  • Verify that the search page should be open at last
  1. Click on FAB
  2. Request Money
  3. On the amount page, click the currency symbol to change the currency
  4. Select some other currency
  1. Request money
  2. Write some amount
  3. Click on the currency symbol to change currency
  4. Select different currency
  5. Verify you have been naivgated back to the amount page and correct amount and currency are selected
  6. Contine in the request money flow
  7. On the confirmation page, select amount and chage the amount and currency
  8. Verify this work correctly
  9. Request the money from another user
  10. Navigate to the expense detail
  11. Edit the amount and currency
  12. Verify it worked correctly
  • Verify that no errors appear in the JS console
  • Verify that the amount should be open at last

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 / Chrome
    • iOS / native
    • iOS / 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 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
      • 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 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 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Screen.Recording.2023-08-21.at.7.13.50.PM.mov
Mobile Web - Chrome

NA

Mobile Web - Safari

NA

Desktop
Screen.Recording.2023-08-24.at.9.21.04.PM.mov
iOS

NA

Android

NA

@shubham1206agra

shubham1206agra commented Aug 26, 2023

Copy link
Copy Markdown
Contributor Author

Do not merge before #25988

@shubham1206agra shubham1206agra mentioned this pull request Aug 28, 2023
Merged
59 tasks
@tjferriss tjferriss mentioned this pull request Aug 30, 2023
Closed
6 tasks
@mountiny mountiny mentioned this pull request Aug 31, 2023
Merged
58 tasks
@shubham1206agra shubham1206agra marked this pull request as ready for review August 31, 2023 16:09
@shubham1206agra shubham1206agra requested a review from a team as a code owner August 31, 2023 16:09
@melvin-bot melvin-bot Bot requested review from Ollyws and removed request for a team August 31, 2023 16:10
@melvin-bot

melvin-bot Bot commented Aug 31, 2023

Copy link
Copy Markdown

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

@shubham1206agra

shubham1206agra commented Aug 31, 2023

Copy link
Copy Markdown
Contributor Author

Please retest the flow

@mountiny mountiny self-requested a review August 31, 2023 20:18
@shubham1206agra shubham1206agra mentioned this pull request Sep 1, 2023
Closed
6 tasks
@shubham1206agra

shubham1206agra commented Sep 1, 2023

Copy link
Copy Markdown
Contributor Author

Looks like flow working properly now

@mountiny

mountiny commented Sep 1, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

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 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 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
25989web.mp4
Mobile Web - Chrome

N/A

Mobile Web - Safari
25989safari.mp4
Desktop

Author listed

iOS

N/A

Android

N/A

@mountiny mountiny changed the title Fixing the race condition on history.go due to buggy queue async callbacks [CP Staging] Fixing the race condition on history.go due to buggy queue async callbacks Sep 1, 2023
mountiny
mountiny approved these changes Sep 1, 2023
View reviewed changes

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We have confirmed this is fixing a serious bug with currency list not working so I would like to get this CPed

@mountiny mountiny merged commit 12a6f87 into Expensify:main Sep 1, 2023
@OSBotify

OSBotify commented Sep 1, 2023

Copy link
Copy Markdown
Contributor

✋ 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

OSBotify commented Sep 1, 2023

Copy link
Copy Markdown
Contributor

🧪🧪 Use the links below to test this build in android and iOS. Happy testing! 🧪🧪

android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/25989/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/25989/index.html
Android iOS
desktop 💻 web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/25989/NewExpensify.dmg https://25989.pr-testing.expensify.com
Desktop Web

OSBotify pushed a commit that referenced this pull request Sep 1, 2023
@mountiny @OSBotify
Merge pull request #25989 from shubham1206agra/revert-25963-revert-25…
1f93469 
…866-react-navigation-native-fix

[CP Staging] Fixing the race condition on `history.go` due to buggy queue async callbacks

(cherry picked from commit 12a6f87)
@OSBotify

OSBotify commented Sep 1, 2023

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.61-2 🚀

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

@mountiny mountiny mentioned this pull request Sep 1, 2023
Closed
36 tasks
@OSBotify

OSBotify commented Sep 1, 2023

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.61-3 🚀

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

@fabOnReact fabOnReact mentioned this pull request Sep 11, 2023
Closed
6 tasks
@shubham1206agra shubham1206agra deleted the revert-25963-revert-25866-react-navigation-native-fix branch September 22, 2023 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mountiny mountiny mountiny approved these changes

@Ollyws Ollyws Awaiting requested review from Ollyws

Assignees

@shubham1206agra shubham1206agra

Labels

Ready To Build

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@shubham1206agra @mountiny @OSBotify