Skip to content

[CP Staging] fix: Unable to close currency list using device back button.#55575

Merged
Beamanator merged 3 commits intoExpensify:mainfrom
Krishna2323:krishna2323/issue/55551
Jan 22, 2025
Merged

[CP Staging] fix: Unable to close currency list using device back button.#55575
Beamanator merged 3 commits intoExpensify:mainfrom
Krishna2323:krishna2323/issue/55551

Conversation

@Krishna2323
Copy link
Contributor

@Krishna2323 Krishna2323 commented Jan 21, 2025

Explanation of Change

This PR fixes regressions from #53845

REGRESSIONS: #55547 #55551 #55549 #55552 #55553 #55601

Fixed Issues

$ #53845
$ #55551
$ #55549
$ #55552
$ #55553
$ #55601
PROPOSAL: NA

Tests

  1. Go to Account settings > Workspaces
  2. Tap New workspace
  3. Tap Currency
  4. Exit the currency list using device back gesture
  5. Verify currency list is closed

--

  1. Go to Account settings > Workspaces.
  2. Tap New workspace.
  3. Tap on the workspace name field to bring up the keyboard.
  4. Tap on the avatar > Verify avatar upload options appears
  5. Tap on the workspace name field to bring up the keyboard.
  6. Tap Confirm button > Verify workspace is created

--

  1. Go to Account settings > Workspaces.
  2. Click New workspace.
  3. Click Currency.
  4. Press CMD+D > Verify currency list is closed and modal opens correctly.
  5. Click Currency.
  6. Press CMD+K. > Verify currency list is closed and modal opens correctly.
  • Verify that no errors appear in the JS console

Offline tests

  1. Go to Account settings > Workspaces
  2. Tap New workspace
  3. Tap Currency
  4. Exit the currency list using device back gesture
  5. Verify currency list is closed

--

  1. Go to Account settings > Workspaces.
  2. Tap New workspace.
  3. Tap on the workspace name field to bring up the keyboard.
  4. Tap on the avatar > Verify avatar upload options appears
  5. Tap on the workspace name field to bring up the keyboard.
  6. Tap Confirm button > Verify workspace is created

--

  1. Go to Account settings > Workspaces.
  2. Click New workspace.
  3. Click Currency.
  4. Press CMD+D > Verify currency list is closed and modal opens correctly.
  5. Click Currency.
  6. Press CMD+K. > Verify currency list is closed and modal opens correctly.

QA Steps

  1. Go to Account settings > Workspaces
  2. Tap New workspace
  3. Tap Currency
  4. Exit the currency list using device back gesture
  5. Verify currency list is closed

--

  1. Go to Account settings > Workspaces.
  2. Tap New workspace.
  3. Tap on the workspace name field to bring up the keyboard.
  4. Tap on the avatar > Verify avatar upload options appears
  5. Tap on the workspace name field to bring up the keyboard.
  6. Tap Confirm button > Verify workspace is created

--

  1. Go to Account settings > Workspaces.
  2. Click New workspace.
  3. Click Currency.
  4. Press CMD+D > Verify currency list is closed and modal opens correctly.
  5. Click Currency.
  6. Press CMD+K. > Verify currency list is closed and modal opens correctly.
  • 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 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 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 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.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 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.

Screenshots/Videos

Android: Native
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 requested a review from a team as a code owner January 21, 2025 21:15
@melvin-bot melvin-bot bot requested a review from jayeshmangwani January 21, 2025 21:15
@melvin-bot
Copy link

melvin-bot bot commented Jan 21, 2025

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

@melvin-bot melvin-bot bot removed the request for review from a team January 21, 2025 21:15
@Krishna2323
Copy link
Contributor Author

@allgandalf could you please check #55547 (comment) & #55553 (comment)?

Do you know why android native app is not working even after successful build?

@marcochavezf
Copy link
Contributor

Assigning @ishpaul777 for expedited C+ review per https://expensify.slack.com/archives/C02NK2DQWUX/p1737501890114999

@Krishna2323

This comment was marked as resolved.

@ishpaul777
Copy link
Contributor

ishpaul777 commented Jan 21, 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 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 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: Native
Screen.Recording.2025-01-22.at.5.51.27.AM.mov
Android: mWeb Chrome
iOS: Native
Screen.Recording.2025-01-22.at.6.00.15.AM.mov
iOS: mWeb Safari
Screen.Recording.2025-01-22.at.6.02.48.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-01-22.at.5.54.26.AM.mov
MacOS: Desktop
Screen.Recording.2025-01-22.at.6.35.10.PM.mov

@Krishna2323
Copy link
Contributor Author

Krishna2323 commented Jan 21, 2025

@ishpaul777, are you able to reproduce #55553? And what do you think about #55547 (comment).

@github-actions
Copy link
Contributor

🚧 @marcochavezf has triggered a test build. You can view the workflow run here.

@ishpaul777
Copy link
Contributor

ishpaul777 commented Jan 21, 2025

i can reproduce this #55553, if you compare with other currency selector the padding is extra

Screen.Recording.2025-01-22.at.5.28.18.AM.mov

@ishpaul777
Copy link
Contributor

I think this is same as #53692, can this be handled there?

#55547 (comment) i think yeah the linked issue seems to have same problem fix should be similar, can be handled there

@github-actions
Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/55575/index.html ❌ FAILED ❌
Android The QR code can't be generated, because the iOS build failed
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/55575/NewExpensify.dmg https://55575.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@ishpaul777
Copy link
Contributor

bug: notice when the currency selector open it changes the color of device navigation buttons to white

Screen.Recording.2025-01-22.at.5.47.16.AM.mov

@ishpaul777
Copy link
Contributor

Bug: tapping device back button redirects to workspace list page instead of workpace edit page

Screen.Recording.2025-01-22.at.6.09.35.AM.mov

@ishpaul777
Copy link
Contributor

found few bugs @Krishna2323 ^

@Krishna2323
Copy link
Contributor Author

if you compare with other currency selector the padding is extra

While other currency selectors have their own dedicated pages, the workspace confirmation page uses a modal for its currency selector. Consequently, it inherits the same padding as the initial workspace confirmation page. Same happens in the state selector modal in connect bank account flow.

Monosnap.screencast.2025-01-22.10-56-44.mp4

@Krishna2323
Copy link
Contributor Author

Bug: tapping device back button redirects to workspace list page instead of workpace edit page

Since we are using a modal for the currency picker, it closes the workspace confirmation page even when the user is on currency selector modal. This behavior is also observed in multiple other areas of the application.

Monosnap.screencast.2025-01-22.11-07-30.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Beamanator
Copy link
Contributor

How we goin' here? Looks like there's still a few bugs to be resolved?

@Krishna2323
Copy link
Contributor Author

bug: notice when the currency selector open it changes the color of device navigation buttons to white

@ishpaul777, I’m unable to reproduce this issue on iOS Native, and the Android app crashes as soon as it launches. I’ve been trying to get the Android app to work for the last 3 days but have been unsuccessful. I also tried this, but it didn’t work.

ios_native_back_buttons.mp4
android_native.mp4

@ishpaul777
Copy link
Contributor

@Krishna2323 i think the issue with android build fixed on main with #55513 can you try building again?

@Krishna2323
Copy link
Contributor Author

i think the issue with android build fixed on main with #55513 can you try building again?

Still fails to launch.

@ishpaul777
Copy link
Contributor

ishpaul777 commented Jan 22, 2025

@Krishna2323 Can you check logs to see why and where its crashing?

@allgandalf
Copy link
Contributor

allgandalf commented Jan 22, 2025

Still fails to launch.

You also need to clear the gradle i think:

rm -rf android/build android/app/build android/.gradle android/app/.gradle android/.cxx android/app/.cxx

And

cd android && ./gradlew clean

And then build again

@melvin-bot
Copy link

melvin-bot bot commented Jan 22, 2025

🎯 @ishpaul777, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #55603.

Copy link
Contributor

@Beamanator Beamanator left a comment

Choose a reason for hiding this comment

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

LGTM!

@Beamanator Beamanator merged commit f38cb04 into Expensify:main Jan 22, 2025
18 checks passed
@Beamanator Beamanator changed the title fix: Unable to close currency list using device back button. [CP Staging] fix: Unable to close currency list using device back button. Jan 22, 2025
OSBotify pushed a commit that referenced this pull request Jan 22, 2025
fix: Unable to close currency list using device back button.
(cherry picked from commit f38cb04)

(CP triggered by Beamanator)
@github-actions github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Jan 22, 2025
@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.

@github-actions
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.0.88-6 🚀

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

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

@github-actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.88-7 🚀

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

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

Labels

CP Staging marks PRs that have been CP'd to staging Ready To Build

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants