Skip to content

Add Reimbursable setting to company card feeds - #104160

Open
youssef-lr wants to merge 26 commits into
Expensify:mainfrom
youssef-lr:app-103342-add-reimbursable-setting-company
Open

youssef-lr wants to merge 26 commits into
Expensify:mainfrom
youssef-lr:app-103342-add-reimbursable-setting-company

Conversation

@youssef-lr

@youssef-lr youssef-lr commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Let admins choose the Reimbursable rule from company card feed settings. Add the four choices used for cash expenses and show setting changes in the workspace admins room.

Fixed Issues

$ #103342
PROPOSAL:

Tests

Planned manual tests (not yet completed):

  1. As a workspace admin, open Company cards, select one company card feed, and open Settings. Verify Reimbursable appears below Statement close date and above the liability toggle. Open it and verify the four choices are Always reimbursable, Always non-reimbursable, Reimbursable, and Non-reimbursable.
  2. Select Always reimbursable and save. Verify the settings row updates, then reload and reopen Reimbursable. Verify Always reimbursable remains selected.
  3. Open the workspace admins room. Verify the change log shows the feed name and the previous and new settings.
  • Verify that no errors appear in the JS console

Offline tests

Planned offline test (not yet run):

  1. Open a company feed’s Reimbursable page and disconnect from the network.
  2. Choose a different option and save. Verify the settings row shows the new value as pending.
  3. Reconnect and reopen the page. Verify the choice persists and the pending indicator clears.
  4. If saving fails, verify the previous choice is restored and the row shows an error.

QA Steps

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

  • 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 verified any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

Screen.Recording.2026-10-19.at.16.33.27.mov

@melvin-bot

melvin-bot Bot commented Oct 15, 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

@codecov

codecov Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 95.90% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/components/CategoryPicker/index.tsx 97.91% <ø> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
src/libs/CardFeedUtils.ts 81.60% <100.00%> (+0.37%) ⬆️
src/libs/CardUtils.ts 89.04% <100.00%> (+0.08%) ⬆️
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 62.50% <ø> (ø)
src/libs/ReportAlternateTextUtils.ts 92.29% <100.00%> (+0.03%) ⬆️
src/libs/TransactionUtils/duplicates.ts 90.10% <100.00%> (ø)
... and 12 more
... and 9 files with indirect coverage changes

@youssef-lr

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 16, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-19T16:52:10.820274Z 18237d8 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@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: 904d55d196

ℹ️ 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/CONST/index.ts
Comment thread src/libs/actions/CompanyCards.ts
…ates

- Prefer pending/errored local direct-feed forceReimbursable over stale OAuth values in getCombinedCardFeedsFromAllFeeds
- Preserve the kept managed card's imported reimbursable value in compareDuplicateTransactionFields instead of forcing false
- Add regression tests for both
…setting-company' into app-103342-add-reimbursable-setting-company
@youssef-lr
youssef-lr marked this pull request as ready for review October 19, 2026 16:37
@youssef-lr
youssef-lr requested a review from a team as a code owner October 19, 2026 16:37
@youssef-lr
youssef-lr requested a review from a team as a code owner October 19, 2026 16:37
@melvin-bot
melvin-bot Bot requested review from getusha and removed request for a team October 19, 2026 16:37
@melvin-bot

melvin-bot Bot commented Oct 19, 2026

Copy link
Copy Markdown

@getusha 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 joekaufmanexpensify and removed request for a team October 19, 2026 16:37
Comment thread src/libs/CardFeedUtils.ts
}
}

// Use the local reimbursable value during pending or failed saves; the OAuth value may be stale.

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.

❌ CONSISTENCY-15 (docs)

This comment joins two independent clauses with a semicolon, which the plain-comment-style rule calls out. Comments should read as plain, separate sentences.

Split it into two sentences:

// Use the local reimbursable value during pending or failed saves. The OAuth value may be stale.

Reviewed at: 18237d8 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

};

if (isLoadingOnyxValue(cardFeedsResult) || isLoadingOnyxValue(lastSelectedFeedResult)) {
return <FullScreenLoadingIndicator />;

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.

❌ UI-1 (docs)

This early-return renders FullscreenLoadingIndicator with no navigation component (no HeaderWithBackButton) in the same branch, so if loading hangs the user has no way to escape. When no navigation is visible, FullscreenLoadingIndicator must set shouldUseGoBackButton so the emergency "Go Back" button appears after a timeout.

if (isLoadingOnyxValue(cardFeedsResult) || isLoadingOnyxValue(lastSelectedFeedResult)) {
    return <FullScreenLoadingIndicator shouldUseGoBackButton />;
}

Reviewed at: 18237d8 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

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

Android 🤖 iOS 🍎
⏩ SKIPPED ⏩ ⏩ SKIPPED ⏩
The build for Android was skipped The build for iOS was skipped
Web 🕸️
https://104160.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@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: 18237d89f0

ℹ️ 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/CONST/index.ts
@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

BUG: unable to change setting on shared feed

Steps:

  1. Add a company card feed and assign a card on a workspace.
  2. Create a second workspace and share the feed to the second workspace.
  3. Try to adjust this setting from the second workspace.

Expected result

You're able to adjust the setting and it applies everywhere the feed is shown.

Actual result

We show a generic API error, and the setting is not changed. Logs.

2026-10-19_13-38-25.mp4

@youssef-lr

Copy link
Copy Markdown
Contributor Author

It will need a fix in Auth. Working on it now.

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

Thanks! Otherwise, the setting is working really well.

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

Please ping me when that all change is done, and I will retest. 🫡

This branch has not been deployed

No deployments
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.

2 participants