Skip to content

[CP Staging] fix: unable hold expense from reports #57979

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

Conversation

linhvovan29546
Copy link
Contributor

@linhvovan29546 linhvovan29546 commented Mar 7, 2025

Explanation of Change

Fixed Issues

$ #57972
PROPOSAL: #57972 (comment)

Tests

  1. Go to staging.new.expensify.com
  2. Open any chat.
  3. Submit an expense.
  4. Go to Reports.
  5. Select the expense from Step 3 via checkbox.
  6. Open dropdown menu.
  7. Click Hold.
  8. Enter reason and save it.
  9. Click on the expense.
  10. Click on the report header.
  11. Verify the expense will be held.
  • Verify that no errors appear in the JS console

Offline tests

Same test above

QA Steps

Same test above

  • 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 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
Screen.Recording.2025-03-07.at.13.35.19.mov
Android: mWeb Chrome
Screen.Recording.2025-03-07.at.11.57.55.mov
iOS: Native
Screen.Recording.2025-03-07.at.11.56.06.mov
iOS: mWeb Safari
Screen.Recording.2025-03-07.at.11.52.45.mov
MacOS: Chrome / Safari
Screen.Recording.2025-03-07.at.11.50.04.mov
MacOS: Desktop
Screen.Recording.2025-03-07.at.11.53.29.mov

@linhvovan29546

This comment was marked as resolved.

@linhvovan29546 linhvovan29546 marked this pull request as ready for review March 7, 2025 05:02
@linhvovan29546 linhvovan29546 requested a review from a team as a code owner March 7, 2025 05:02
@melvin-bot melvin-bot bot requested a review from DylanDylann March 7, 2025 05:02
Copy link

melvin-bot bot commented Mar 7, 2025

@DylanDylann 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 March 7, 2025 05:02
@linhvovan29546

This comment was marked as resolved.

@DylanDylann
Copy link
Contributor

DylanDylann commented Mar 7, 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 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 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.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(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.
  • 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-03-07.at.21.35.22.mov
Android: mWeb Chrome
Screen.Recording.2025-03-07.at.21.32.45.mov
iOS: Native
Screen.Recording.2025-03-07.at.21.33.40.mov
iOS: mWeb Safari
Screen.Recording.2025-03-07.at.21.34.09.mov
MacOS: Chrome / Safari
Screen.Recording.2025-03-07.at.21.30.56.mov
MacOS: Desktop
Screen.Recording.2025-03-07.at.21.31.30.mov

@DylanDylann
Copy link
Contributor

DylanDylann commented Mar 7, 2025

@linhvovan29546 We haven't removed SCREENS.SEARCH.ROOT, it is still used in our App in some places. And isSearchTopmostFullScreenRoute function is used in many places. Why do you think this change is compatible with all usage places of isSearchTopmostFullScreenRoute

@linhvovan29546
Copy link
Contributor Author

@DylanDylann I have tested several places where isSearchTopmostFullScreenRoute is used, and it works well (except for IOU actions, which I haven't tested yet). As i know that we added SEARCH_FULLSCREEN_NAVIGATOR to the top of the stack (previously SCREENS.SEARCH.ROOT).

@DylanDylann
Copy link
Contributor

@linhvovan29546 Could you please dishtinguish SEARCH_FULLSCREEN_NAVIGATOR and SCREENS.SEARCH.ROOT. When should we use SEARCH_FULLSCREEN_NAVIGATOR? When should we use SCREENS.SEARCH.ROOT?

@DylanDylann
Copy link
Contributor

I think we need to deep dive into the offending PR to understand it thoroughly

@linhvovan29546
Copy link
Contributor Author

linhvovan29546 commented Mar 7, 2025

The SCREENS.SEARCH.ROOT will always be inside SEARCH_FULLSCREEN_NAVIGATOR
The code changes in isSearchTopmostFullScreenRoute are similar to isReportTopmostSplitNavigator because both are root stacks
Screenshot 2025-03-07 at 15 02 10

@DylanDylann
Copy link
Contributor

@linhvovan29546 Thanks for your update. Your PR looks fine. But let's me recheck this one more time

@melvin-bot melvin-bot bot requested a review from mollfpr March 7, 2025 14:36
@DylanDylann
Copy link
Contributor

DylanDylann commented Mar 7, 2025

Note regarding the implementation: isSearchTopmostFullScreenRoute will return true for both Search_Root and Search_Report routes, I've reviewed the offending PR and confirmed this behavior is acceptable.
@mollfpr Thus, I think we are good to go

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

Thank you guys for the quick PR and review!

@mollfpr mollfpr merged commit 3c6cafe into Expensify:main Mar 7, 2025
18 of 19 checks passed
@mollfpr mollfpr changed the title fix: unable hold expense from reports [CP Staging] fix: unable hold expense from reports Mar 7, 2025
@OSBotify
Copy link
Contributor

OSBotify commented Mar 7, 2025

✋ 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 pushed a commit that referenced this pull request Mar 7, 2025
…xpense-from-report

fix: unable hold expense from reports
(cherry picked from commit 3c6cafe)

(CP triggered by puneetlath)
@github-actions github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Mar 7, 2025
Copy link
Contributor

github-actions bot commented Mar 7, 2025

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.1.10-2 🚀

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.

Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.10-6 🚀

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

@linhvovan29546 linhvovan29546 deleted the fix/57972-unable-hold-expense-from-report branch March 18, 2025 12:12
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants