Skip to content

Refactor MoneyRequestView component to eliminate redundant checks - #70994

Merged
roryabraham merged 5 commits into
Expensify:mainfrom
callstack-internal:VickyStash/refactor/68829-MoneyRequestView-clean-up
Sep 26, 2025
Merged

roryabraham merged 5 commits into
Expensify:mainfrom
callstack-internal:VickyStash/refactor/68829-MoneyRequestView-clean-up

Conversation

@VickyStash

@VickyStash VickyStash commented Sep 22, 2025 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Refactor MoneyRequestView component to eliminate redundant checks

Fixed Issues

$ #68829
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console
  1. Create a workspace.
  2. Open the workspace chat.
  3. Create an expense there.
  4. Open it, make sure it's not empty and there is no endless loading.
  5. Create one more expense and open it. Make sure it's not empty and there is no endless loading.
  6. Create two duplicate expenses and go through the duplicates resolution flow. Make sure the confirmation page doesn't look empty and there is no endless loading.
  7. Create two more expenses. Select one of the expenses and process with the Merge flow. Make sure the confirmation page doesn't look empty and there is no endless loading.

Additional steps for WEB platform:

  1. Open SelfDM chat.
  2. Create an expense.
  3. Open the expense and copy the URL.
  4. Go to the Settings -> Troubleshoot. Tap Clear cache & restart.
  5. After that, navigate to the copied URL from step 3. Make sure the expense is shown after some loading indication.

Offline tests

Same, as in the Tests section

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • Verify that no errors appear in the JS console

Same, as in the Tests section

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.mp4
Android: mWeb Chrome
android_web.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
ios_web.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

@VickyStash
VickyStash marked this pull request as ready for review September 22, 2025 16:00
@VickyStash
VickyStash requested a review from a team as a code owner September 22, 2025 16:00
@melvin-bot
melvin-bot Bot requested review from linhvovan29546 and removed request for a team September 22, 2025 16:00
@melvin-bot

melvin-bot Bot commented Sep 22, 2025

Copy link
Copy Markdown

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

const actualParentReport = isFromMergeTransaction ? getReportOrDraftReport(getReportIDForExpense(updatedTransaction)) : parentReport;
const shouldShowReport = !!parentReportID || !!actualParentReport;

if (!report || !transaction) {

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.

I’m unable to reproduce the issue where the report or transaction is empty, even after following the steps in the description.

I also have a question: the old condition checked whether the reportID or transactionID was empty, but the new changes check if the entire report or transaction object. I think these are not equivalent. as I remember reportID or transactionID can sometimes be '' or 0.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I’m unable to reproduce the issue where the report or transaction is empty, even after following the steps in the description.

@linhvovan29546 and it's expected. The test steps also say it shouldn't be empty!

Let me update the condition!

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.

When empty, a separator line appears on the screen
Screenshot 2025-09-24 at 15 04 29

I’m unable to reproduce the issue where the report or transaction is empty, even after following the steps in the description.

Okay, I can reproduce the empty when opening the page for the first time. If we clear the cache and then access the page via its URL.

@VickyStash VickyStash Sep 24, 2025 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@linhvovan29546 It works as expected on my end:

Monosnap.screencast.2025-09-24.10-45-58.mp4

Could you please provide more detailed steps (maybe I did something wrong)?
Also, can you please try to do the same with the same page on main and let me know what are the results

@linhvovan29546 linhvovan29546 Sep 24, 2025 •

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.

Ah, sorry—the image above is hardcoded, so it is incorrect. You can try following the steps in the video to reproduce the issue.
I was able to reproduce in the personal space, I'm not sure if this is expected. On the main branch, we still display the MoneyRequestView even when the value is empty.

Screen.Recording.2025-09-24.at.16.04.32.mov

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yep, I was able to reproduce it!
I've updated the logic to show the loading instead, cause on main it shows the expense with no details for a second, which isn't great as well. @linhvovan29546 Let me know what you think!

@linhvovan29546

Copy link
Copy Markdown
Contributor

In this PR, we’ve implemented skeleton loading for the MoneyRequestView when opening an expense. @Expensify/design, could you please help confirm if this change looks good?

This will show a loading indicator while waiting for the data

Screen.Recording.2025-09-25.at.17.44.06.mov
Screenshot 2025-09-25 at 17 38 53

@shawnborton

Copy link
Copy Markdown
Contributor

What did it look like before?

@linhvovan29546

linhvovan29546 commented Sep 25, 2025 •

Copy link
Copy Markdown
Contributor

Previously, the page was displayed with empty values.

Screenshot 2025-09-25 at 21 09 52

@shawnborton

Copy link
Copy Markdown
Contributor

Can you show a recording of what it was before?

I don't have strong feelings with this new skeleton view though, I guess it is consistent with other chat views in the app. Any additional thoughts @mountiny? Asking you since you've worked on these things before I think.

@mountiny

Copy link
Copy Markdown
Contributor

Yeah same I think this is ok to show it this way with the skeleton

@linhvovan29546

Copy link
Copy Markdown
Contributor

Can you show a recording of what it was before?

You can see it at 0:11

Screen.Recording.2025-09-25.at.21.09.21.mov

@linhvovan29546

linhvovan29546 commented Sep 26, 2025 •

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 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-09-26.at.19.19.11.mov
Android: mWeb Chrome
Screen.Recording.2025-09-26.at.19.26.56.mov
iOS: HybridApp
Screen.Recording.2025-09-26.at.18.57.47.mov
iOS: mWeb Safari
Screen.Recording.2025-09-26.at.19.07.09.mov
MacOS: Chrome / Safari
Screen.Recording.2025-09-26.at.18.39.31.mov
MacOS: Desktop
Screen.Recording.2025-09-26.at.19.50.20.mov

@linhvovan29546

Copy link
Copy Markdown
Contributor

@VickyStash Could you please merge the main branch again? I encountered a crash when following these steps, but it doesn’t happen on the main branch.

Screen.Recording.2025-09-26.at.18.14.40.mov

@codecov

codecov Bot commented Sep 26, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...c/components/ReportActionItem/MoneyRequestView.tsx 0.00% 3 Missing ⚠️

📢 Thoughts on this report? Let us know!

@linhvovan29546

Copy link
Copy Markdown
Contributor

@VickyStash This worked for me. Could you please help add test section for personal space(selfDM) as well?

@VickyStash

Copy link
Copy Markdown
Contributor Author

@VickyStash This worked for me. Could you please help add test section for personal space(selfDM) as well?

Sure, just updated the section, let me know if anything else is needed!

@linhvovan29546 linhvovan29546 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.

The PR worked for me. I’m not sure if we should add UI test for this change as well.

@melvin-bot
melvin-bot Bot requested a review from roryabraham September 26, 2025 13:30
@roryabraham

Copy link
Copy Markdown
Contributor

UI tests would be great, but it's NAB.

@roryabraham

Copy link
Copy Markdown
Contributor

spellcheck is unrelated, ignoring for now

@roryabraham
roryabraham merged commit 8e8e5c3 into Expensify:main Sep 26, 2025
20 of 21 checks passed
@melvin-bot melvin-bot Bot added the Emergency label Sep 26, 2025
@melvin-bot

melvin-bot Bot commented Sep 26, 2025

Copy link
Copy Markdown

@roryabraham looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@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.

@OSBotify OSBotify mentioned this pull request Sep 26, 2025
62 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.2.19-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.19-3 🚀

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

const actualParentReport = isFromMergeTransaction ? getReportOrDraftReport(getReportIDForExpense(updatedTransaction)) : parentReport;
const shouldShowReport = !!parentReportID || !!actualParentReport;

if (!report?.reportID || !transaction?.transactionID) {

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.

Coming from #79072. transaction can be undefined for a self-DM expense opened whilst offline. So this condition would lead to displaying an infinite loader rather than displaying the cached data.

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