Skip to content

Add 'Apply Cash Back to My Expensify Bill' toggle to card settings#87956

Draft
allgandalf wants to merge 16 commits intoExpensify:mainfrom
allgandalf:toggle-card-cashback-to-bill
Draft

Add 'Apply Cash Back to My Expensify Bill' toggle to card settings#87956
allgandalf wants to merge 16 commits intoExpensify:mainfrom
allgandalf:toggle-card-cashback-to-bill

Conversation

@allgandalf
Copy link
Copy Markdown
Contributor

@allgandalf allgandalf commented Apr 15, 2026

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

Fixed Issues

$ #77925

Tests

  1. Navigate to a workspace with an Expensify Card enabled (US program)
  2. Go to Settings > Workspaces > [workspace] > Expensify Card > Settings
  3. Verify the "Apply cash back to my Expensify bill" toggle appears below settlement frequency
  4. Verify the toggle defaults to ON
  5. Toggle it OFF, verify optimistic UI update (toggle turns off immediately)
  6. Refresh the page, verify the setting persisted
  7. Toggle it back ON, verify it updates
  8. Verify the toggle is hidden when viewing a workspace with a UK/EU Expensify Card feed
  9. Verify the toggle is hidden when the account is on an invoicing subscription
  • Verify that no errors appear in the JS console

Offline tests

  1. Turn off network
  2. Toggle the cashback setting
  3. Verify the toggle updates optimistically
  4. Turn network back on
  5. Verify the setting syncs correctly

QA Steps

  1. Log into a workspace with US Expensify Cards on staging
  2. Navigate to Workspace > Expensify Card > Settings
  3. Verify "Apply cash back to my Expensify bill" toggle is visible
  4. Toggle it off and on, verify it persists across page refreshes
  5. For a workspace with UK/EU cards, verify the toggle does NOT appear
  6. For an invoiced customer, verify the toggle does NOT appear
  • 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 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 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@allgandalf allgandalf requested review from a team as code owners April 15, 2026 09:26
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 15, 2026

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 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 melvin-bot Bot removed the request for review from a team April 15, 2026 09:26
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 15, 2026

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

@melvin-bot melvin-bot Bot removed the request for review from a team April 15, 2026 09:26
@allgandalf allgandalf marked this pull request as draft April 15, 2026 09:27
Comment thread src/libs/actions/Card.ts
Copy link
Copy Markdown

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

Comment thread src/languages/en.ts Outdated
@allgandalf allgandalf requested a review from JS00001 April 20, 2026 07:40
@allgandalf
Copy link
Copy Markdown
Contributor Author

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

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 20, 2026

Codecov Report

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

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

Comment thread src/languages/en.ts
Comment on lines +5367 to +5368
applyCashbackToBill: 'Apply cash back to my Expensify bill',
applyCashbackToBillDescription: 'Cash back from the Expensify Card will be used towards payment for your Expensify bill.',
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.

@@ -32,6 +36,11 @@ function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) {
const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`);
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.

It seems like we are using the expensify card settings NVP here, but I dont think we are in the auth PR

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.

yeah we write to DOMAIN_MEMBER in Auth, but getFullExpensifyCardsSettingsForOnyx reads that value and injects it into the PRIVATE_EXPENSIFYCARD_SETTINGS response. so the frontend reads from PRIVATE_EXPENSIFY_CARD_SETTINGS Onyx key and the value is always the current DOMAIN_MEMBER state, kept in sync by the backend

@@ -0,0 +1,6 @@
type ToggleCardCashbackToBillParams = {
workspaceAccountID: number;
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.

Lets make this the domain account ID

Suggested change
workspaceAccountID: number;
domainAccountID: number;

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.

keeping workspaceAccountID to match the existing UpdateCardSettlementFrequencyParams pattern in the same file. the Web-E handler accepts both policyAccountID and workspaceAccountID (same as UpdateCardSettlementFrequency) before passing as domainAccountID to Auth

@shawnborton
Copy link
Copy Markdown
Contributor

Let us know when there are screenshots/videos to review.

@allgandalf
Copy link
Copy Markdown
Contributor Author

will let you know, we need to deploy auth and Web-E first so put this in draft

@allgandalf allgandalf requested a review from JS00001 April 21, 2026 12:49
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.

3 participants