Skip to content

refactor: Remove manual memoization from SettlementButton and add UI tests#81818

Merged
roryabraham merged 11 commits intoExpensify:mainfrom
TaduJR:test-Clean-up-SettlementButton
Mar 2, 2026
Merged

refactor: Remove manual memoization from SettlementButton and add UI tests#81818
roryabraham merged 11 commits intoExpensify:mainfrom
TaduJR:test-Clean-up-SettlementButton

Conversation

@TaduJR
Copy link
Contributor

@TaduJR TaduJR commented Feb 9, 2026

Explanation of Change

This PR addresses the first two goals of #79387: adding automated UI tests and removing manual memoization from SettlementButton.

Fixed Issues

$ #79387
PROPOSAL: #79387 (comment)

Tests

Prerequisites

  • Have a workspace with a verified business bank account connected
  • Have Expensify Wallet set up (Gold tier)
  • Have a second test account to send/receive payments
  • Have an invoice room set up between two accounts

Test 1 — Pay from Report Preview in Chat

  1. Open a chat containing a submitted expense report preview card
  2. Verify the Pay button on the preview card displays with the correct amount (e.g. "Pay $50.00")
  3. Verify the subtitle below the button shows the correct payment method (e.g. bank last 4 digits or policy name)
  4. Press the Pay button to open the dropdown
  5. Verify the expected payment options appear (business bank account, "Mark as paid")
  6. Verify no "Wallet" option appears for expense reports
  7. Select a payment method and verify the payment processes
  8. Verify the paid animation (checkmark) plays after successful payment

Test 2 — Pay from Report Header

  1. Open the full expense report view (tap into the report from the chat)
  2. Verify the Pay button displays correctly in the header with the correct amount
  3. Press the Pay button dropdown and verify the payment options appear
  4. If an Approve option appears inside the dropdown, verify tapping it changes the report status
  5. Select "Mark as paid" and verify the payment completes
  6. Verify the paid animation (checkmark) plays after successful payment

Test 3 — Invoice Room (Regression for #80189)

  1. Create or open an invoice room with an individual receiver
  2. Verify the app does NOT freeze or hang when the invoice room loads
  3. Verify the Pay button renders correctly on the invoice
  4. Press the Pay button and verify the dropdown shows two options:
    • "Pay $X.XX as an individual" (opens submenu with personal bank accounts, "Add bank account", and "Mark as paid")
    • "Pay $X.XX as a business" (opens submenu with business bank accounts, "Add bank account", and "Mark as paid")
  5. Verify no workspace is created automatically — check Settings > Workspaces for unexpected new workspaces
  6. Repeat with a business invoice room:
    • Verify payment options show directly as a flat list (business bank accounts, "Add bank account", "Mark as paid") without the individual/business split
    • Verify only fully verified bank accounts appear (partially setup ones should not)

Test 4 — Search Results

  1. Navigate to the Search tab
  2. Find unpaid expenses/IOUs in the results
  3. Verify the compact "Pay" button appears (just "Pay", no amount shown)
  4. Press the Pay button and verify the dropdown options appear
  5. Select a payment method and verify the payment processes

Test 5 — Pay Someone (Quick Action)

  1. Open a DM chat with another user
  2. Tap the "Pay someone" quick action
  3. Enter an amount on the amount screen
  4. Verify the Pay button appears directly on the amount screen (not a "Next" button)
  5. Verify payment method options are available in the dropdown (Wallet, personal bank account, "Mark as paid")
  6. Select a payment method and verify the payment completes

  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

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

  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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-1.mp4
Android-Native-2.mp4
Android: mWeb Chrome
iOS: Native
iOS-Native.mp4
iOS: mWeb Safari
iOS-Safari.mp4
MacOS: Chrome / Safari
Mac-Chrome-1.mp4
Mac-Chrome-2.mp4

@TaduJR TaduJR requested review from a team as code owners February 9, 2026 05:47
@melvin-bot melvin-bot bot requested review from JmillsExpensify and thesahindia and removed request for a team and JmillsExpensify February 9, 2026 05:47
@melvin-bot
Copy link

melvin-bot bot commented Feb 9, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team February 9, 2026 05:47
@codecov
Copy link

codecov bot commented Feb 9, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/components/SettlementButton/index.tsx 86.50% <87.93%> (+86.50%) ⬆️
... and 23 files with indirect coverage changes

@TaduJR TaduJR marked this pull request as draft February 9, 2026 06:52
@TaduJR TaduJR marked this pull request as ready for review February 10, 2026 16:16
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 843ae81054

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@linhvovan29546
Copy link
Contributor

I’ll review this based on the discussion in Slack

@linhvovan29546
Copy link
Contributor

linhvovan29546 commented Feb 11, 2026

Ah, it looks like @roryabraham wants to review this PR instead of assigning it to C+, since you reviewed the original one as well.

@thesahindia
Copy link
Member

Ah, it looks like @roryabraham wants to review this PR instead of assigning it to C+, since you reviewed the original one as well.

Apologies 😓 I didn't look into it before posting.

@roryabraham
Copy link
Contributor

@linhvovan29546 can you please review this PR?

@roryabraham roryabraham requested review from linhvovan29546 and removed request for thesahindia February 18, 2026 00:31
@linhvovan29546
Copy link
Contributor

Reviewing...

Copy link
Contributor

@linhvovan29546 linhvovan29546 left a comment

Choose a reason for hiding this comment

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

getPaymentSubItems and paymentButtonOptions are not automatically memoized after applying this check. Could you please re-check? I used react complier playground(and react-compiler-marker extension) tool to verify the auto memoization

Copy link
Contributor

@roryabraham roryabraham left a comment

Choose a reason for hiding this comment

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

Generally I think the pattern of defining a function in render to generate some object, then calling it once in render to generate that object is a bad practice in React Compiler world.

Because you're obfuscating the logic and wrapping it up into an unnecessary function that's called only once. If you instead inline the content of the function in render, I think React Compiler will do a better job memoizing it. The code tends to end up simpler too.

@linhvovan29546
Copy link
Contributor

I'm blocked by this bug. I'll test the PR once it's resolved.

@linhvovan29546
Copy link
Contributor

@TaduJR Please add videos to the PR description. These tests are easy to record and attach.

@TaduJR TaduJR changed the title test: Clean up SettlementButton refactor: Remove manual memoization from SettlementButton and add UI tests Feb 25, 2026
@TaduJR
Copy link
Contributor Author

TaduJR commented Feb 25, 2026

NAB: Please extract getPolicyID outside getInvoicesOptions to avoid redefining it on every call. Defining it in the outer scope ensures it's created only once per render.

Done.

Please update the PR title to match the guidelines

Done.

@linhvovan29546
Copy link
Contributor

@TaduJR #81818 (comment)

@TaduJR
Copy link
Contributor Author

TaduJR commented Feb 26, 2026

@linhvovan29546

I am having difficulties setting up VBBA.

Raised a discussion here https://expensify.slack.com/archives/C01GTK53T8Q/p1772106257184279?thread_ts=1711049879.962529&cid=C01GTK53T8Q

Feel free to reply if you have any suggestions.

Thanks!

@linhvovan29546
Copy link
Contributor

Feel free to reply if you have any suggestions.

I’ve replied. Could you merge main and resolve the conflicts?

…up-SettlementButton

# Conflicts:
#	src/components/SettlementButton/index.tsx
@TaduJR
Copy link
Contributor Author

TaduJR commented Feb 27, 2026

@TaduJR Please add videos to the PR description. These tests are easy to record and attach.

Done.

@linhvovan29546
Copy link
Contributor

linhvovan29546 commented Feb 27, 2026

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
  • 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: HybridApp
Screen.Recording.2026-02-27.at.17.17.55.mov
Android: mWeb Chrome
Screen.Recording.2026-02-27.at.17.13.42.mov
iOS: HybridApp
Screen.Recording.2026-02-27.at.17.07.15.mov
iOS: mWeb Safari
Screen.Recording.2026-02-27.at.17.03.13.mov
MacOS: Chrome / Safari
Screen.Recording.2026-02-27.at.16.58.11.mov
Screen.Recording.2026-02-27.at.17.00.58.mov

Copy link
Contributor

@linhvovan29546 linhvovan29546 left a comment

Choose a reason for hiding this comment

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

The metric in this PR looks better than the one in main.

Screenshot 2026-02-27 at 17 49 37

@melvin-bot melvin-bot bot requested a review from roryabraham February 27, 2026 10:42
@roryabraham
Copy link
Contributor

@TaduJR looks like we've got some conflicts

…up-SettlementButton

# Conflicts:
#	src/components/SettlementButton/index.tsx
@TaduJR
Copy link
Contributor Author

TaduJR commented Feb 27, 2026

@TaduJR looks like we've got some conflicts

Done.

@roryabraham roryabraham merged commit c75239a into Expensify:main Mar 2, 2026
29 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2026

✋ 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

github-actions bot commented Mar 2, 2026

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2026

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

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

@IuliiaHerets
Copy link

Hi @TaduJR. QA team doesn't have a Gold tier.
Will it be enough to enable it in the Wallet?

cc @roryabraham

image

@linhvovan29546
Copy link
Contributor

@IuliiaHerets We don’t need the Gold tier

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

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

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.30-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 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.

6 participants