Skip to content

Remove split button from settlement button - #98963

Merged
grgia merged 10 commits into
Expensify:mainfrom
bernhardoj:feat/98663-remove-split-pay-button
Aug 28, 2026
Merged

Remove split button from settlement button#98963
grgia merged 10 commits into
Expensify:mainfrom
bernhardoj:feat/98663-remove-split-pay-button

Conversation

@bernhardoj

@bernhardoj bernhardoj commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #98663
PROPOSAL:

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Prerequisite: have at least once paid a report on a workspace

  1. Submit and approve an expense on the workspace
  2. Verify the pay button on the report preview and report header shows "Pay {amount}" instead of the last payment method used
  3. Verify the pay button doesn't split between the text and arrow down
  4. Press the pay button
  5. Verify it shows the payment method menu
  6. Go to the search page and look for the report to be paid
  7. Verify the pay button shows "Pay"
  8. Repeat steps 4-5

DM
Prerequisite: have paid a user at least once

  1. Open a DM from the prerequisite
  2. Press composer + button > Pay
  3. Enter any amount and next
  4. Verify the pay button says Pay
  5. Press the pay button
  6. Verify it shows the payment method menu
  • 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
  • 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 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 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)
  • 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)
  • 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.
  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mp4
image

@bernhardoj
bernhardoj requested review from a team as code owners August 19, 2026 08:33
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and truph01 and removed request for a team August 19, 2026 08:33
@melvin-bot

melvin-bot Bot commented Aug 19, 2026

Copy link
Copy Markdown

@truph01 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 requested review from a team and grgia and removed request for a team August 19, 2026 08:33
@melvin-bot

melvin-bot Bot commented Aug 19, 2026

Copy link
Copy Markdown

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

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

Copy link
Copy Markdown

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: a458c774fc

ℹ️ 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".

Comment on lines +635 to 636
shouldAlwaysShowDropdownMenu
customText={customText}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve the approve-only CTA

When a user can approve but cannot pay, the caller sets shouldHidePaymentOptions and shouldShowApproveButton, producing the single approveButtonOption. Forcing the dropdown branch makes customText override that option's label, so the primary action now says “Pay {amount}” and opens a one-item menu even though payment is unavailable and the only action is Approve. Keep the approve-only case as a direct Approve button, or derive the displayed text from its sole option.

Useful? React with 👍 / 👎.

@bernhardoj bernhardoj Aug 19, 2026

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.

shouldShowApproveButton is true when the approved animation is running and SettlementButton won't be shown when an animation is running.

{!isAnimationRunning && (
<SettlementButton
{...settlementButtonProps}
wrapperStyle={wrapperStyle}
isDisabled={isAnimationRunning || isDisabled}
sentryLabel={sentryLabel}
/>

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.

Removed the dead shouldShowApproveButton logic

@melvin-bot

melvin-bot Bot commented Aug 19, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

onPaymentOptionsShow={onPaymentOptionsShow}
onPaymentOptionsHide={onPaymentOptionsHide}
formattedAmount={formattedAmount}
confirmApproval={confirmApproval}

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.

Dead prop. shouldShowApproveButton is not passed as true in this component, so confirmApproval will never be called.

@codecov

codecov Bot commented Aug 19, 2026

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
...Item/MoneyRequestReportPreview/PayActionButton.tsx 96.29% <ø> (-0.20%) ⬇️
...ents/SettlementButton/AnimatedSettlementButton.tsx 3.33% <ø> (+0.05%) ⬆️
src/hooks/usePaymentOptions.ts 55.91% <ø> (ø)
...oneyReportHeaderPrimaryAction/PayPrimaryAction.tsx 0.00% <0.00%> (ø)
src/components/SettlementButton/index.tsx 74.39% <60.00%> (-13.39%) ⬇️
... and 224 files with indirect coverage changes

@joekaufmanexpensify
joekaufmanexpensify removed the request for review from flaviadefaria August 20, 2026 13:34
@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

I can take product review here

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

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

Working well from my perspective!

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

@truph01 could you share an ETA for reviewing this one?

@truph01

truph01 commented Aug 25, 2026

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
  • 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 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)
  • 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)
  • 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.
  • 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-08-25.at.11.01.39.mov
Android: mWeb Chrome
Screen.Recording.2026-08-25.at.10.59.19.mov
iOS: HybridApp
Screen.Recording.2026-08-25.at.10.58.09.mov
iOS: mWeb Safari
Screen.Recording.2026-08-25.at.11.01.12.mov
MacOS: Chrome / Safari
Screen.Recording.2026-08-25.at.10.40.10.mov

@truph01

truph01 commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

Bug: 1

  1. Open a DM with another user.
  2. Create an expense.
  3. Actual: The Pay button is displayed.
    Expected: The Pay button should not be displayed.

@bernhardoj

Copy link
Copy Markdown
Contributor Author

It was a bug in main. Merged with main. Now gone.

const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();

const hasPreferredPaymentMethod = !!lastPaymentMethod;
const lastPaymentPolicy = usePolicy(lastPaymentMethod);

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.

NAB. can we also drop defaultSelectedIndex, lastPaymentPolicy = usePolicy(lastPaymentMethod), and the event ? lastPaymentPolicy : undefined fallback? With isSplitButton={false} and customText always set they no longer affect anything, so every settlement button keeps a policy subscription whose result is thrown away.

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

@bernhardoj lemme know thoughts on that comment, otherwise LGTM can approve/merge

@bernhardoj

Copy link
Copy Markdown
Contributor Author

You're right, we can remove them. Removed.

@grgia
grgia merged commit 9091dc5 into Expensify:main Aug 28, 2026
36 of 37 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.4.64-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Yes — one help site article needed updating. Draft PR: #99800

docs/articles/new-expensify/wallet-and-payments/Pay-Expenses.md documented the split button in both pay flows — "your most recent payment method will appear automatically" and "tap the right side of the button to see all available options." That UI no longer exists after this PR, so those steps now describe something members can't find.

What the docs PR changes

  • Replaces the remembered-method and right-side-dropdown steps with a single step: select Pay, then choose a method from the menu that opens.
  • Names the options using the product labels: Pay with business account, Pay with wallet, Mark as paid.
  • Adds an FAQ entry for members who remember the old behavior and go looking for a setting.
  • Rewrites the closing FAQ answer that referenced the "Pay button dropdown."
  • Fixes heading structure to satisfy docs/HELP_AUTHORING_GUIDELINES.md (the article had three # headings and no title heading).

Needs a human: docs/assets/images/Reports_PayExpense_02_Update.png shows the removed split button — a Pay $14.62 pill with a "Bank account • 1234" subtitle and a chevron segment. I removed the reference and left a <!-- SCREENSHOT: --> placeholder describing the replacement, but someone with asset access needs to shoot the new image.

No other article needed changes. Reimbursement-Payment-Methods.md already describes choosing a payment method every time, and Pay-an-invoice.md never mentioned the split button.

How I verified the new behavior

Drove dev NewDot on web: created a workspace, submitted a €25.00 expense to myself, approved it, then inspected the payable report.

Step Status Observation
Exact primary action button text on the report header pass Single button labelled Pay €25.00 (EUR because the workspace default currency is EUR).
Pay button is one solid button, no separate dropdown segment pass Accessibility tree exposes exactly one interactive node for the control; no sibling chevron node. One green pill with no divider.
Pressing Pay opens a payment method menu instead of paying pass Opened a popover with two options in order: Pay with business account, Mark as paid. No bank account rows, since this workspace has no connected bank account. Report stayed Approved; no payment was triggered.
Exact label on the report preview's pay button pass Same label: Pay €25.00, also one pill.
Evidence (3)

Report header showing a single Pay button with no dropdown segment

Report header showing a single Pay button with no dropdown segment

Payment method menu showing Pay with business account and Mark as paid

Payment method menu showing Pay with business account and Mark as paid

Report preview card pay button

Report preview card pay button

@bernhardoj, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review


view run

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