Add 'Apply Cash Back to My Expensify Bill' toggle to card settings by allgandalf · Pull Request #87956 · Expensify/App

allgandalf · 2026-04-15T09:26:49Z

Explanation of Change

Adds the "Apply Cash Back to My Expensify Bill" toggle to the workspace Expensify Card settings page. This toggle exists in Expensify Classic but was missing from NewDot.

The toggle allows workspace admins to choose whether their Expensify Card cash back is applied toward their Expensify bill or sent to their settlement account. It defaults to enabled (matching Classic behavior).

Visibility constraints (matching Classic):

Only shown for US card programs (not UK/EU)
Hidden for invoiced subscription customers

Related PRs (must be merged together for the feature to work):

Auth: https://github.com/Expensify/Auth/pull/21079
Web-Expensify: https://github.com/Expensify/Web-Expensify/pull/52123

Fixed Issues

$ #77925

Tests

Navigate to a workspace with an Expensify Card enabled (US program)
Go to Settings > Workspaces > [workspace] > Expensify Card > Settings
Verify the "Apply cash back to my Expensify bill" toggle appears below settlement frequency
Verify the toggle defaults to ON
Toggle it OFF, verify optimistic UI update (toggle turns off immediately)
Refresh the page, verify the setting persisted
Toggle it back ON, verify it updates
Verify the toggle is hidden when viewing a workspace with a UK/EU Expensify Card feed
Verify the toggle is hidden when the account is on an invoicing subscription

Verify that no errors appear in the JS console

Offline tests

Turn off network
Toggle the cashback setting
Verify the toggle updates optimistically
Turn network back on
Verify the setting syncs correctly

QA Steps

Log into a workspace with US Expensify Cards on staging
Navigate to Workspace > Expensify Card > Settings
Verify "Apply cash back to my Expensify bill" toggle is visible
Toggle it off and on, verify it persists across page refreshes
For a workspace with UK/EU cards, verify the toggle does NOT appear
For an invoiced customer, verify the toggle does NOT appear

Verify that no errors appear in the JS console

PR Author Checklist

Screen.Recording.2026-04-29.at.1.15.08.PM.mov

melvin-bot · 2026-04-15T09:26:56Z

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:

Look at the code and make sure there are no malicious changes.
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 ts-node ./scripts/generateTranslations.ts --help

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

melvin-bot · 2026-04-15T09:26:57Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3309561d34

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

allgandalf · 2026-04-20T07:40:29Z

@JS00001 assigning you here since pull bearer assigned you in the Auth PR https://github.com/Expensify/Auth/pull/21079

codecov · 2026-04-20T07:49:18Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/API/types.ts	`100.00% <ø> (ø)`
src/libs/CardUtils.ts	`81.72% <100.00%> (ø)`
...kspace/expensifyCard/WorkspaceCardSettingsPage.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/Card.ts	`0.00% <0.00%> (ø)`
... and 14 files with indirect coverage changes

…k toggle

…gandalf/App into toggle-card-cashback-to-bill # Conflicts: # src/types/onyx/ExpensifyCardSettings.ts

JS00001

looking good

mkhutornyi · 2026-05-04T14:56:53Z

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

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

trjExpensify · 2026-05-05T10:55:28Z

@mkhutornyi have you completed your review?

mkhutornyi · 2026-05-05T11:10:22Z

yes, one minor issue:

No way to dismiss error when request failed.

Otherwise looks good.

JS00001 · 2026-05-05T12:53:03Z

@allgandalf could you fix the error dismissing problem real quick?

…gandalf/App into toggle-card-cashback-to-bill

allgandalf · 2026-05-05T14:31:34Z

fixed in 2e26f9b, added clearCashbackToBillError action and wired it as onCloseError on the toggle. the X now shows up and clears settings.errors when clicked

mkhutornyi

dismiss.error.mov

OSBotify · 2026-05-05T17:13:04Z

✋ 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 · 2026-05-05T19:17:13Z

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.3.67-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-05T19:21:12Z

Yes, help site changes are required. The PR adds a new Apply cash back to my Expensify bill toggle to the Expensify Card Settings page, which is not documented in the current help articles.

Draft PR created: #89641

Changes made:

Set-Up-and-Manage-the-Expensify-Card.md — Added a new "How to apply Expensify Card cash back to your Expensify bill" section documenting the toggle, its default state, navigation steps, and visibility constraints (US programs only, hidden for invoiced subscriptions)
Expensify-Card-Perks.md — Updated the Cashback section to note that Workspace Admins can control whether cash back applies to the bill or goes to the settlement account

Please mark the PR as "Ready for review" when it's ready.

jponikarchuk · 2026-05-06T04:26:34Z

@allgandalf @trjExpensify @mkhutornyi Could you please help? How can we test steps 5 and 6. What card should we use? Can you check these steps internally?

allgandalf · 2026-05-06T04:44:19Z

I think @trjExpensify would be able to help you with that

allgandalf added 6 commits April 15, 2026 14:44

Add shouldApplyCashbackToBill field to ExpensifyCardSettingsBase type

8138110

Create ToggleCardCashbackToBillParams API parameter type

8648e3b

Register TOGGLE_CARD_CASHBACK_TO_BILL write command

104faba

Add toggleCashbackToBill action function

090e40e

Add cashback-to-bill translations for en and es

fb6801e

Add cashback-to-bill toggle to workspace card settings page

3309561

allgandalf requested review from a team as code owners April 15, 2026 09:26

melvin-bot Bot assigned allgandalf Apr 15, 2026

melvin-bot Bot requested review from ZhenjaHorbach and flaviadefaria April 15, 2026 09:26

melvin-bot Bot removed the request for review from a team April 15, 2026 09:26

allgandalf removed request for ZhenjaHorbach and flaviadefaria April 15, 2026 09:27

allgandalf marked this pull request as draft April 15, 2026 09:27

github-actions Bot reviewed Apr 15, 2026

View reviewed changes

Comment thread src/libs/actions/Card.ts

chatgpt-codex-connector Bot reviewed Apr 15, 2026

View reviewed changes

Comment thread src/languages/en.ts Outdated

allgandalf added 2 commits April 20, 2026 13:04

Fix curly quote syntax error in en.ts translations

00dbe09

Add pendingFields to toggleCashbackToBill to drive OfflineWithFeedback

7725780

allgandalf requested a review from JS00001 April 20, 2026 07:40

allgandalf added 5 commits April 20, 2026 13:20

Add cashback toggle translations for de

1db74a4

Add cashback toggle translations for fr

7cee725

Add cashback toggle translations for it

cd66006

Add cashback toggle translations for ja

e60af3f

Add cashback toggle translations for nl

1198b6d

allgandalf added 3 commits May 4, 2026 16:44

Merge branch 'Expensify:main' into toggle-card-cashback-to-bill

1e827f5

Use ToggleSettingOptionRow's built-in OfflineWithFeedback for cashbac…

d301b09

…k toggle

Merge branch 'toggle-card-cashback-to-bill' of https://github.com/all…

fe72e7f

…gandalf/App into toggle-card-cashback-to-bill # Conflicts: # src/types/onyx/ExpensifyCardSettings.ts

allgandalf dismissed JS00001’s stale review via fe72e7f May 4, 2026 11:24

JS00001 approved these changes May 4, 2026

View reviewed changes

allgandalf requested a review from mkhutornyi May 4, 2026 14:52

mkhutornyi approved these changes May 5, 2026

View reviewed changes

melvin-bot Bot requested a review from JS00001 May 5, 2026 11:11

JS00001 previously approved these changes May 5, 2026

View reviewed changes

allgandalf added 3 commits May 5, 2026 19:53

Merge branch 'Expensify:main' into toggle-card-cashback-to-bill

1e3c4d6

Add onCloseError handler to dismiss cashback toggle errors

2e26f9b

Merge branch 'toggle-card-cashback-to-bill' of https://github.com/all…

b08f45a

…gandalf/App into toggle-card-cashback-to-bill

allgandalf dismissed JS00001’s stale review via b08f45a May 5, 2026 14:31

allgandalf requested review from JS00001 and mkhutornyi May 5, 2026 14:32

mkhutornyi approved these changes May 5, 2026

View reviewed changes

JS00001 approved these changes May 5, 2026

View reviewed changes

JS00001 merged commit acaf7ed into Expensify:main May 5, 2026
40 checks passed

OSBotify mentioned this pull request May 5, 2026

Deploy Checklist: New Expensify 2026-05-05 #89627

Open

81 tasks

MelvinBot mentioned this pull request May 5, 2026

Docs updates for E/A#87956 Add cash back toggle to card settings docs #89641

Draft

4 tasks

Conversation

allgandalf commented Apr 15, 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

Uh oh!

melvin-bot Bot commented Apr 15, 2026

Uh oh!

melvin-bot Bot commented Apr 15, 2026

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

allgandalf commented Apr 20, 2026

Uh oh!

codecov Bot commented Apr 20, 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!

JS00001 left a comment

Choose a reason for hiding this comment

Uh oh!

mkhutornyi commented May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

trjExpensify commented May 5, 2026

Uh oh!

mkhutornyi commented May 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JS00001 commented May 5, 2026

Uh oh!

allgandalf commented May 5, 2026

Uh oh!

mkhutornyi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented May 5, 2026

Uh oh!

OSBotify commented May 5, 2026

Uh oh!

MelvinBot commented May 5, 2026

Uh oh!

jponikarchuk commented May 6, 2026

Uh oh!

allgandalf commented May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

allgandalf commented Apr 15, 2026 •

edited

Loading

codecov Bot commented Apr 20, 2026 •

edited by github-actions Bot

Loading

mkhutornyi commented May 4, 2026 •

edited

Loading

mkhutornyi commented May 5, 2026 •

edited

Loading