Show settlement button only if monthly frequency by rlinoz · Pull Request #85558 · Expensify/App

rlinoz · 2026-03-17T15:44:22Z

Explanation of Change

Manual settlement can only run if settlement frequency is monthly, updating the code to do that.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/612428
PROPOSAL:

Tests

Supportalled into user's account in the adhoc build and verify the settlement button doesn't show up
Update onyx to have a monthly settlment date and verify the button shows up

Verify that no errors appear in the JS console

Offline tests

QA Steps

Not sure if this can be QAd by Applasuse but:

Have ECards enabled using a Plaid account with more than 90 days of bank statemement
Go to Workspace > Expensify Cards
Verify the Settle amount button doesnt show up
Update the frequency to be monthly
Verify the settle amount button shows up

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Daily:

Monthly:

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-03-17T16:05:51Z

Codecov Report

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

Files with missing lines	Coverage Δ
...orkspace/expensifyCard/WorkspaceCardsListLabel.tsx	`0.00% <0.00%> (ø)`
... and 7 files with indirect coverage changes

rlinoz · 2026-03-17T17:33:07Z

@MelvinBot can you test this change?

MelvinBot · 2026-03-17T17:45:04Z

I tested this change. Here's what I found:

✅ Test Results

TypeScript: No new type errors introduced (only pre-existing @react-navigation errors in node_modules)
ESLint: Passes cleanly
Browser: Page loads without JS errors related to this change

Screenshots

Note: The test workspace doesn't have Expensify Cards fully configured (no bank account linked), so the page shows the empty state. The settlement button logic couldn't be exercised end-to-end, but the page renders without errors.

Code Review

The logic change is correct and consistent with the existing pattern in WorkspaceSettlementFrequencyPage.tsx:35:

const selectedFrequency = settings?.monthlySettlementDate
  ? CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY
  : CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY;

One observation: The parent component WorkspaceCardListLabels.tsx:29 still uses isMonthlySettlementAllowed for layout decisions:

const shouldShowSettlementButtonOrDate = !!cardSettings?.isMonthlySettlementAllowed || cardManualBilling;

This controls the small-screen layout — when true, it puts "Current Balance" on its own row to make room for the settlement button. After this PR, there's a theoretical scenario where isMonthlySettlementAllowed is true but monthlySettlementDate is absent — the parent would use the wider layout but the child wouldn't render the button. This is a minor cosmetic issue (extra whitespace), not a functional one. Worth considering whether the parent should also use monthlySettlementDate for consistency.

github-actions · 2026-03-17T18:00:07Z

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

melvin-bot · 2026-03-17T18:41:33Z

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

ZhenjaHorbach · 2026-03-18T13:56:21Z

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

Android: mWeb Chrome

iOS: HybridApp

2026-03-20.17.18.16.mov

iOS: mWeb Safari

2026-03-20.17.14.57.mov

MacOS: Chrome / Safari

2026-03-20.17.07.24.mov

trjExpensify

Makes sense 👍

rlinoz · 2026-03-20T15:40:45Z

@ZhenjaHorbach can you continue the review here please?

ZhenjaHorbach · 2026-03-20T15:44:47Z

Sorry
I will check soon!

ZhenjaHorbach · 2026-03-20T16:23:11Z

LGTM!

melvin-bot · 2026-03-20T16:23:56Z

@marcochavezf 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 · 2026-03-20T16:23:59Z

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

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

github-actions · 2026-03-23T22:19:15Z

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

github-actions · 2026-03-23T22:23:52Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-53ba97a-de8080e-4504a39ff5ef6fb7227a26f6bfac2b2c0da65bde/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-53ba97a-de8080e-efa721b6b5f85ea24ef921f7435ec0e4bcb108c0/index.html

Web 🕸️
https://85558.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-23T22:27:22Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

m-natarajan · 2026-03-24T12:00:29Z

@rlinoz @ZhenjaHorbach @marcochavezf Can this one please be tested internally as the steps are blocked for Applause

rlinoz · 2026-03-24T12:39:15Z

Button is gone from daily settlemnet account

OSBotify · 2026-03-25T16:10:26Z

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

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

make settlement button diplay only if monthly

9de76e4

rlinoz self-assigned this Mar 17, 2026

This comment has been minimized.

Sign in to view

rlinoz marked this pull request as ready for review March 17, 2026 18:41

rlinoz requested review from a team as code owners March 17, 2026 18:41

melvin-bot Bot requested a review from ZhenjaHorbach March 17, 2026 18:41

melvin-bot Bot requested review from trjExpensify and removed request for a team March 17, 2026 18:41

trjExpensify approved these changes Mar 18, 2026

View reviewed changes

ZhenjaHorbach approved these changes Mar 20, 2026

View reviewed changes

melvin-bot Bot requested a review from marcochavezf March 20, 2026 16:23

melvin-bot Bot mentioned this pull request Mar 20, 2026

Payment issue for E/App PR#85558 #85969

Closed

marcochavezf approved these changes Mar 23, 2026

View reviewed changes

marcochavezf merged commit 53ba97a into main Mar 23, 2026
45 of 47 checks passed

marcochavezf deleted the rodrigo-fix-settlmenet-button branch March 23, 2026 22:18

OSBotify mentioned this pull request Mar 24, 2026

Deploy Checklist: New Expensify 2026-03-24 #86199

Closed

53 tasks

Conversation

rlinoz commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Mar 17, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

rlinoz commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

✅ Test Results

Screenshots

Code Review

Uh oh!

github-actions Bot commented Mar 17, 2026

Uh oh!

This comment has been minimized.

melvin-bot Bot commented Mar 17, 2026

Uh oh!

ZhenjaHorbach commented Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

rlinoz commented Mar 20, 2026

Uh oh!

ZhenjaHorbach commented Mar 20, 2026

Uh oh!

ZhenjaHorbach commented Mar 20, 2026

Uh oh!

melvin-bot Bot commented Mar 20, 2026

Uh oh!

melvin-bot Bot commented Mar 20, 2026

Uh oh!

Uh oh!

github-actions Bot commented Mar 23, 2026

Uh oh!

github-actions Bot commented Mar 23, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

m-natarajan commented Mar 24, 2026

Uh oh!

rlinoz commented Mar 24, 2026

Uh oh!

OSBotify commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

rlinoz commented Mar 17, 2026 •

edited

Loading

codecov Bot commented Mar 17, 2026 •

edited by github-actions Bot

Loading

ZhenjaHorbach commented Mar 18, 2026 •

edited

Loading