Skip to content

Fix: On tapping device back button to close troubleshoot box from LHN, navigated out of site#62345

Merged
blimpich merged 13 commits into
Expensify:mainfrom
nyomanjyotisa:issue-58383-fix
Jun 12, 2025
Merged

Fix: On tapping device back button to close troubleshoot box from LHN, navigated out of site#62345
blimpich merged 13 commits into
Expensify:mainfrom
nyomanjyotisa:issue-58383-fix

Conversation

@nyomanjyotisa
Copy link
Copy Markdown
Member

@nyomanjyotisa nyomanjyotisa commented May 20, 2025

Explanation of Change

Fixed Issues

$ #58383
PROPOSAL: #58383 (comment)

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

  1. Open the test tool modal with Command + D or a four-finger gesture on mobile.
  2. Tap the browser back button or the device's back button.
  3. Verify that the test tool modal is closed.
  4. Open the search modal with Command + K or tap the search icon at the top.
  5. Tap the browser back button or the device's back button.
  6. Verify that the search modal is closed.
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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-Native.mp4
Android: mWeb Chrome
Android-mWeb.Chrome.mp4
iOS: Native
iOS-Native.mp4
iOS: mWeb Safari
iOS-mWeb.Safari.mp4
MacOS: Chrome / Safari
MacOS-Chrome.mp4
MacOS: Desktop
MacOS-Desktop.mp4

@nyomanjyotisa nyomanjyotisa marked this pull request as ready for review May 30, 2025 08:33
@nyomanjyotisa nyomanjyotisa requested review from a team as code owners May 30, 2025 08:33
@melvin-bot melvin-bot Bot requested review from hungvu193 and removed request for a team May 30, 2025 08:33
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 30, 2025

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

@hungvu193
Copy link
Copy Markdown
Contributor

will review this weekend

@hungvu193
Copy link
Copy Markdown
Contributor

on Android, when I change options for categories and open test tool modal, it's navigated back to Category main page.

Screen.Recording.2025-06-02.at.09.28.21.mov

@nyomanjyotisa
Copy link
Copy Markdown
Member Author

on Android, when I change options for categories and open test tool modal, it's navigated back to Category main page.

Will check on this today

@nyomanjyotisa
Copy link
Copy Markdown
Member Author

PR updated @hungvu193

@hungvu193
Copy link
Copy Markdown
Contributor

PR updated @hungvu193

Thanks @nyomanjyotisa I'll do more testing today.
just curious about the previous deploy blocker related to chat switcher. Can you explain the RCA it here so I'll have a better context when reviewing the codes?

@nyomanjyotisa
Copy link
Copy Markdown
Member Author

Can you explain the RCA it here so I'll have a better context when reviewing the codes?

Ah yeah, in the previous PR, we called window.history.back() in the SearchRouterContext to close the search modal, instead of simply setting isSearchModalOpen to false. This caused the modal to take users back to their previous page, instead of letting them proceed to their selected item. In this PR, we’ve fixed that by using window.history.replaceState({ isSearchModalOpen: false }) to close the search modal properly

@hungvu193
Copy link
Copy Markdown
Contributor

Still under review. The progress is a bit slower since I've been slammed by some other deploy blockers.

@hungvu193
Copy link
Copy Markdown
Contributor

All the cases I was concerned about were passed 🎉 I'll handle the checklist

@nyomanjyotisa
Copy link
Copy Markdown
Member Author

Should we build the ad-hoc and then ask the QA team to test this PR before you approve it? I think it would be better if the QA team could help. What do you think about this, @hungvu193?

@hungvu193
Copy link
Copy Markdown
Contributor

yeah I would love if we could do it. What do you think? @blimpich ?

Comment on lines +43 to +47
if (!canListenPopState) {
return;
}

const handlePopState = (event: PopStateEvent) => {
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.

it should be helpful if you can leave a comment here to explain how it works.

Comment thread src/styles/index.ts Outdated
Comment on lines +5852 to +5858
TestToolsNavigatorOuterView: (shouldUseNarrowLayout: boolean) => ({
flex: 1,
justifyContent: shouldUseNarrowLayout ? 'flex-end' : 'center',
alignItems: 'center',
}),

TestToolsNavigatorInnerView: (shouldUseNarrowLayout: boolean, isAuthenticated: boolean) => {
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.

These two style name are different with our current convention (camel case), let's change their name to match the current convention then?
I think it can be: getTestToolNavigatorOuterView or so.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Sure thing, PR updated!

@blimpich
Copy link
Copy Markdown
Contributor

blimpich commented Jun 6, 2025

Hmm, strange, not sure why the android build failed... 🙁

@hungvu193
Copy link
Copy Markdown
Contributor

Hmm yeah, that was pretty weird. Could you try again?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 9, 2025

🚧 @dylanexpensify has triggered a test Expensify/App build. You can view the workflow run here.

@gijoe0295
Copy link
Copy Markdown
Contributor

gijoe0295 commented Jun 9, 2025

Hi I just came across multiple workflow failures from this PR. They stem from my PR #62058. I knew the root cause and am creating a fix now. If testing Android is not urgent, can you please hold on several hours before @roryabraham gets online and review the fix? Thanks!

@hungvu193
Copy link
Copy Markdown
Contributor

Yeah. Sure

@gijoe0295
Copy link
Copy Markdown
Contributor

gijoe0295 commented Jun 9, 2025

@hungvu193 @nyomanjyotisa Can you try to merge main and rerun the workflow? There are major changes with the workflow, not just from my PR, and this PR is not up to date with them.

@nyomanjyotisa
Copy link
Copy Markdown
Member Author

I've merged with the latest main

@github-actions
Copy link
Copy Markdown
Contributor

🚧 @dylanexpensify has triggered a test Expensify/App build. You can view the workflow run here.

@blimpich
Copy link
Copy Markdown
Contributor

Re-running ad-hoc build here: https://github.com/Expensify/App/actions/runs/15530663255

@github-actions
Copy link
Copy Markdown
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #62345.

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

👀 View the workflow run that generated this build 👀

@blimpich
Copy link
Copy Markdown
Contributor

Asked for QA to test this here

@isagoico
Copy link
Copy Markdown

Issue was not reproducible on the Ad-Hoc builds 🎉 Videos below

Evidence
az_recorder_20250611_222756.mp4
1000127113.mp4
62345.mp4

@hungvu193
Copy link
Copy Markdown
Contributor

Nice 🚀. Thanks for checking. I'll handle checklist today!

@hungvu193
Copy link
Copy Markdown
Contributor

hungvu193 commented Jun 12, 2025

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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: HybridApp
Screen.Recording.2025-06-12.at.15.55.20.mov
Android: mWeb Chrome
Screen.Recording.2025-06-12.at.15.43.13.mov
mAndroid.mov
iOS: HybridApp
fade.mov
push.from.bottom.mov
Screen.Recording.2025-05-08.at.16.26.52.mov
iOS: mWeb Safari
Safari.mov
Screen.Recording.2025-06-12.at.15.00.19.mov
MacOS: Chrome / Safari
Chrome.mov
Screen.Recording.2025-06-12.at.14.52.23.mov
MacOS: Desktop
Desktop.mov

@melvin-bot melvin-bot Bot requested a review from blimpich June 12, 2025 08:56
@blimpich blimpich merged commit 38b53fc into Expensify:main Jun 12, 2025
18 checks passed
@OSBotify
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.

@github-actions
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.1.66-0 🚀

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

@github-actions
Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.1.66-5 🚀

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

@github-actions
Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.1.66-5 🚀

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

@github-actions
Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.1.66-5 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants