Skip to content

Fix Reimbursable toggle hidden for personal card transactions#84596

Merged
Gonals merged 3 commits intomainfrom
claude-fixReimbursableToggleForPersonalCards
Mar 17, 2026
Merged

Fix Reimbursable toggle hidden for personal card transactions#84596
Gonals merged 3 commits intomainfrom
claude-fixReimbursableToggleForPersonalCards

Conversation

@MelvinBot
Copy link
Contributor

Explanation of Change

In MoneyRequestView, the shouldShowReimbursable condition was using isFromCreditCardImport to determine whether to hide the Reimbursable toggle. That helper returns true for both managed/company cards and personal cards imported via bank connection. This caused the Reimbursable toggle to be incorrectly hidden for personal card transactions.

This PR switches to using isManagedCardTransaction instead, which only returns true for centrally managed cards (Expensify or Company Cards). This ensures the Reimbursable toggle remains visible for personal card imports while still being hidden for managed card transactions.

Fixed Issues

$ #81997
PROPOSAL: #81997 (comment)

Tests

  1. Log in as an admin of a workspace that has personal card transactions
  2. Go to Reports > Approve
  3. Click on a report containing a personal card transaction
  4. Select a line item to open the expense
  5. Verify the "Reimbursable" toggle is visible and can be switched between Reimbursable and Non-reimbursable
  6. Verify that managed/company card transactions still do NOT show the Reimbursable toggle
  • Verify that no errors appear in the JS console

Offline tests

N/A — this change only affects UI visibility logic and does not involve network requests.

QA Steps

  1. Log in as an admin of a workspace with personal card transactions
  2. Go to Reports > Approve
  3. Open a report with a personal card expense
  4. Select the expense line item
  5. Verify the "Reimbursable" option is visible and functional
  6. Verify managed/company card transactions still hide the Reimbursable toggle
  • 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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

N/A — no UI layout changes, only visibility logic fix

Android: mWeb Chrome

N/A — no UI layout changes, only visibility logic fix

iOS: Native

N/A — no UI layout changes, only visibility logic fix

iOS: mWeb Safari

N/A — no UI layout changes, only visibility logic fix

MacOS: Chrome / Safari

N/A — no UI layout changes, only visibility logic fix

…imbursable toggle visibility

The Reimbursable toggle was hidden for personal card transactions because
isFromCreditCardImport returns true for both managed and personal cards.
Switching to isManagedCardTransaction ensures the toggle is only hidden
for managed/company card transactions while remaining visible for personal
card imports.

Co-authored-by: Alberto Gonzalez-Cela <Gonals@users.noreply.github.com>
Co-authored-by: Alberto Gonzalez-Cela <Gonals@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

Fixed the failing Prettier check: the isManagedCardTransaction import was placed out of alphabetical order in the named imports from @libs/TransactionUtils. Sorted it to the correct position.

@abzokhattab
Copy link
Contributor

abzokhattab commented Mar 13, 2026

@MelvinBot I found some regressions. Can you review this and implement it if you cannot flag any other issues.

Root Cause

In MoneyRequestView.tsx, the shouldShowReimbursable condition uses a misleadingly-named local variable isManagedCardTransaction that is actually bound to isFromCreditCardImport:

    isFromCreditCardImport as isCardTransactionTransactionUtils,
    const isManagedCardTransaction = isCardTransactionTransactionUtils(transaction);
    const shouldShowReimbursable =
        (isPolicyExpenseChat || (isExpenseUnreported && !!policy)) &&
        (policy?.disabledFields?.reimbursable !== true || isCurrentTransactionReimbursableDifferentFromPolicyDefault) &&
        !isManagedCardTransaction &&
        !isInvoice;

isFromCreditCardImport returns true for all card-imported transactions -- including personal cards (any transaction with bank, cardNumber, or transactionType === CARD). This causes shouldShowReimbursable to evaluate to false for personal card expenses, hiding the reimbursable toggle even for admins.

The real isManagedCardTransaction in TransactionUtils only checks !!transaction?.managedCard, which is true only for centrally managed cards (Expensify Card / company card feeds) -- not personal cards.

The expense creation flow in MoneyRequestConfirmationListFooter.tsx already uses the correct function:

    const shouldShowReimbursable =
        (isPolicyExpenseChat || isTrackExpense) && !!policy && policy?.disabledFields?.reimbursable !== true && !isManagedCardTransaction(transaction) && !isTypeInvoice;

So there's an inconsistency: the creation flow correctly shows the toggle for personal cards, but the detail/edit view hides it.

Fix

In src/components/ReportActionItem/MoneyRequestView.tsx:

  1. Import the real isManagedCardTransaction from TransactionUtils
  2. Rename the existing local variable from isManagedCardTransaction to isFromCardImport to eliminate the naming confusion (no behavioral change)
  3. Use the real isManagedCardTransaction in the shouldShowReimbursable condition only

The other usages of the renamed variable (shouldShowCard, shouldShowConvertedAmount, posted date/original amount display) remain unchanged since they intentionally apply to all card imports.

 import {
     ...
     isFromCreditCardImport as isCardTransactionTransactionUtils,
     isCategoryBeingAnalyzed,
+    isManagedCardTransaction as isManagedCardTransactionTransactionUtils,
     ...
 } from '@libs/TransactionUtils';

-    const isManagedCardTransaction = isCardTransactionTransactionUtils(transaction);
+    const isFromCardImport = isCardTransactionTransactionUtils(transaction);
     const cardProgramName = getCompanyCardDescription(...);
-    const shouldShowCard = isManagedCardTransaction && cardProgramName;
+    const shouldShowCard = isFromCardImport && cardProgramName;

     const shouldShowReimbursable =
         (isPolicyExpenseChat || (isExpenseUnreported && !!policy)) &&
         (policy?.disabledFields?.reimbursable !== true || ...) &&
-        !isManagedCardTransaction &&
+        !isManagedCardTransactionTransactionUtils(transaction) &&
         !isInvoice;

     // shouldShowConvertedAmount and posted date block: unchanged, use isFromCardImport

What changes behaviorally: Only shouldShowReimbursable -- personal card transactions now correctly show the reimbursable toggle, matching the creation flow in MoneyRequestConfirmationListFooter.

What doesn't change: Card name display, converted amount visibility, and posted date/original amount descriptions all continue using isFromCardImport (the broad check), preserving existing behavior for all card types.

The previous approach replaced isFromCreditCardImport with
isManagedCardTransaction for ALL usages, which unintentionally
changed the behavior of shouldShowCard, shouldShowConvertedAmount,
and the posted date/original amount display.

This commit takes a more surgical approach:
- Renames local variable to isFromCardImport (uses broad isFromCreditCardImport)
- Only shouldShowReimbursable uses the narrow isManagedCardTransaction check
- Card name, converted amount, and posted date continue using isFromCardImport

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
@abzokhattab
Copy link
Contributor

Melven only works if I post on the main issue, as I am not the main author 🥲

@abzokhattab
Copy link
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 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 Screenshot 2026-03-13 at 04 43 34
Android: mWeb Chrome Screenshot 2026-03-13 at 04 40 55
iOS: HybridApp Screenshot 2026-03-13 at 04 44 04
iOS: mWeb Safari Screenshot 2026-03-13 at 04 40 45
MacOS: Chrome / Safari
Screen.Recording.2026-03-13.at.04.37.45.mov

@MelvinBot MelvinBot marked this pull request as ready for review March 13, 2026 04:03
@MelvinBot MelvinBot requested a review from a team as a code owner March 13, 2026 04:03
@melvin-bot melvin-bot bot requested review from abzokhattab and removed request for a team March 13, 2026 04:03
@melvin-bot
Copy link

melvin-bot bot commented Mar 13, 2026

@abzokhattab 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 heyjennahay and removed request for a team March 13, 2026 04:03
@melvin-bot melvin-bot bot requested a review from Gonals March 13, 2026 04:03
@codecov
Copy link

codecov bot commented Mar 13, 2026

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 Δ
...c/components/ReportActionItem/MoneyRequestView.tsx 0.23% <0.00%> (-0.21%) ⬇️
... and 447 files with indirect coverage changes

@Gonals
Copy link
Contributor

Gonals commented Mar 17, 2026

Melven only works if I post on the main issue, as I am not the main author 🥲

It seems like it did make some changes, right?

@abzokhattab
Copy link
Contributor

yes but i had to post on the issue not the PR as you are the author here...

i think its still expected

@Gonals Gonals merged commit 4fb0b95 into main Mar 17, 2026
40 checks passed
@Gonals Gonals deleted the claude-fixReimbursableToggleForPersonalCards branch March 17, 2026 14:20
@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
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
Contributor

🚀 Deployed to staging by https://github.com/Gonals in version: 9.3.40-0 🚀

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

@kavimuru
Copy link

@Gonals @heyjennahay , Applause QA does not have personal card transactions, could this be verified internally?

Log in as an admin of a workspace that has personal card transactions

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/Gonals in version: 9.3.40-0 🚀

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

@joekaufmanexpensify
Copy link
Contributor

Works well for me on staging. Checked off for QA!

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

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