Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP Staging] Revert "Remove withNavigationFallback.js HOC" #29844

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Oct 18, 2023

Details

Restore the withNavigationFallback to avoid app crashing. Straight revert of PR #29449.

Fixed Issues

$ #29839
PROPOSAL: #29839 (comment)

Tests

  1. Login in ND
  2. Go to any chat
  3. Send any message
  4. Hold message >> Delete message
  5. Verify that message is deleted and user can continue use app
  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

  1. Login in ND
  2. Go to any chat
  3. Send any message
  4. Hold message >> Delete message
  5. Verify that message is deleted and user can continue use app
  • 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 / 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
    • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
hoc-android-compressed.mov
Android: mWeb Chrome
hoc-chrome-compressed.mov
iOS: Native
hoc-ios-compressed.mov
iOS: mWeb Safari
hoc-safari-compressed.mov
MacOS: Chrome / Safari
hoc-web-compressed.mov
MacOS: Desktop
hoc-desktop-compressed.mov

@tienifr tienifr changed the title Revert "Remove 'withNavigationFallback.js' HOC" Revert "Remove withNavigationFallback.js HOC" Oct 18, 2023
@tienifr tienifr marked this pull request as ready for review October 18, 2023 04:33
@tienifr tienifr requested a review from a team as a code owner October 18, 2023 04:33
@melvin-bot melvin-bot bot removed the request for review from a team October 18, 2023 04:33
@melvin-bot
Copy link

melvin-bot bot commented Oct 18, 2023

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

Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

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

Hmm, this is not quite a straight revert due to these and these changes. Are they necessary?

@tienifr
Copy link
Contributor Author

tienifr commented Oct 18, 2023

Because we're restoring withNavigationFallback and getComponentDisplayName and a pascal-cased variable (WrappedComponent) were used there. The original author may forget to discard those changes after removing the HOC.

@Julesssss
Copy link
Contributor

Alright, thanks let me find someone for the C+ review 👍

@Julesssss Julesssss requested review from rushatgabhane and removed request for thesahindia October 18, 2023 08:15
Copy link
Member

@rushatgabhane rushatgabhane left a comment

Choose a reason for hiding this comment

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

Revert looks clean to me

Copy link
Member

@rushatgabhane rushatgabhane left a comment

Choose a reason for hiding this comment

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

@tienifr i can't delete the message on web

  1. tap and hold
  2. delete
Uncaught TypeError: Cannot read properties of undefined (reading '3708590258034326363')
    at eval (ReportActionsUtils.js:387:85)
    at Array.forEach (<anonymous>)
    at Module.getLastVisibleAction (ReportActionsUtils.js:386:1)
    at Module.getLastVisibleMessage (ReportUtils.js:1211:27)
    at Module.deleteReportComment (Report.js:990:33)
    at Object.eval [as onConfirm] (PopoverReportActionContextMenu.js:249:7)
    at Object.onConfirm [as onPress] (ConfirmModal.js:85:1)
Screen.Recording.2023-10-18.at.13.58.05.mov

@tienifr
Copy link
Contributor Author

tienifr commented Oct 18, 2023

Hmm I think it's another issue because I can still delete it 🤔 . Can you try other messages?

@rushatgabhane
Copy link
Member

still no luck, could you retest after merging main?

@rushatgabhane
Copy link
Member

Tested again, still can't delete any messages

@Expensify Expensify deleted a comment from rushatgabhane Oct 18, 2023
@youssef-lr
Copy link
Contributor

@rushatgabhane since it's late for you @situchan will be completing the checklist

@youssef-lr youssef-lr requested a review from situchan October 18, 2023 18:57
@situchan
Copy link
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
web.mov
Mobile Web - Chrome
mchrome.mov
Mobile Web - Safari
msafari.mov
Desktop
desktop.mov
iOS
ios.mov
Android
android.mov

@tienifr
Copy link
Contributor Author

tienifr commented Oct 18, 2023

I tried what @rushatgabhane told above but can't really reproduce the issue but faced another one instead. Note that he was deleting comment using popover context menu (not the mini one).

It did not throw any error or crashed the app but the comment was not deleted until I switched to another report and came back. I think this is out of scope.

delete-web-compressed.mov

@youssef-lr
Copy link
Contributor

youssef-lr commented Oct 18, 2023

@tienifr what do you think about this bug @situchan encountered here? also cc @kacper-mikolajczak I see you encountered this bug before here

Screenshot 2023-10-19 at 03 12 57

@situchan
Copy link
Contributor

It did not throw any error or crashed the app but the comment was not deleted until I switched to another report and came back

This seems like another deploy blocker with different root cause

@tienifr
Copy link
Contributor Author

tienifr commented Oct 18, 2023

@tienifr what do you think about this bug @situchan encountered here?

@youssef-lr Yes, I was able to reproduce the resizing issue. Having looked at the errors, I thought it's not related to this PR.

@youssef-lr
Copy link
Contributor

Yes, I was able to reproduce the resizing issue. Having looked at the errors, I thought it's not related to this PR.

Yeah my guess as well, I think we have another PR causing this issue. So I'm gonna go ahead and merge this one, thanks everyone!

@youssef-lr youssef-lr merged commit fbab24b into Expensify:main Oct 18, 2023
11 checks passed
@youssef-lr youssef-lr changed the title Revert "Remove withNavigationFallback.js HOC" [CP Staging] Revert "Remove withNavigationFallback.js HOC" Oct 18, 2023
@OSBotify
Copy link
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.

@tienifr
Copy link
Contributor Author

tienifr commented Oct 18, 2023

It did not throw any error or crashed the app but the comment was not deleted until I switched to another report and came back

This seems like another deploy blocker with different root cause

@youssef-lr Can you please create a GH issue for this? Seems critical. I'd like to investigate.

WIP: I'm writing a draft following bug report template.

OSBotify pushed a commit that referenced this pull request Oct 18, 2023
…NavigationFallback-hoc

Revert "Remove `withNavigationFallback.js` HOC"

(cherry picked from commit fbab24b)
@youssef-lr
Copy link
Contributor

sounds good @tienifr, also, this PR just got deployed yesterday, @kacper-mikolajczak ran into this issue while working on it, could it be what's causing that bug on staging?

@youssef-lr
Copy link
Contributor

Yeah I know. I think we also need to figure out the resizing issue.

@tienifr
Copy link
Contributor Author

tienifr commented Oct 18, 2023

Hmm so strange. I can't reproduce it (i.e. the delete by popover menu issue) anymore on the latest main after we merged this. Thanks for your patience @youssef-lr !

@situchan
Copy link
Contributor

Hmm so strange. I can't reproduce it (i.e. the delete by popover menu issue) anymore on the latest main after we merged this. Thanks for your patience @youssef-lr !

I suspect #29784 (merged 15 min ago) might have fixed this as it's the only one related to popover merged within 1 hr.
I was able to reproduce 1 hr ago on this branch merged with latest main locally.

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 1.3.86-4 🚀

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.

@rushatgabhane
Copy link
Member

rushatgabhane commented Oct 18, 2023

@situchan @youssef-lr why did we merge this PR? we still can't delete messages on staging with the same error as here #29844 (review)

Screen.Recording.2023-10-19.at.03.35.37.mov

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-5 🚀

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

@situchan
Copy link
Contributor

@rushatgabhane I can delete message successfully on staging (both from context menu and from mini context menu)

Screen.Recording.2023-10-19.at.11.00.57.AM.mov
Screen.Recording.2023-10-19.at.11.01.31.AM.mov

@youssef-lr
Copy link
Contributor

youssef-lr commented Oct 19, 2023

@situchan @tienifr the resizing error has made it to production, can we confirm if this PR is the culprit? just a guess as Kacper encountered this error while working on the PR

Screenshot 2023-10-19 at 19 08 04

@youssef-lr
Copy link
Contributor

OK I can confirm that reverting that PR fixes the issue for me locally

@kacper-mikolajczak
Copy link
Contributor

Looking into it now 🔧

@youssef-lr
Copy link
Contributor

Thanks @kacper-mikolajczak!

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/youssef-lr in version: 1.3.88-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.88-11 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants