Skip to content

Conversation

@samranahm
Copy link
Contributor

Explanation of Change

Fixed Issues

$ #78247
PROPOSAL: #78247 (comment)

Tests

Preconditions:

  • Create a workspace as admin A and add a business bank account to the workspace. Set admin A as the workspace payer.
  • Add admin B to the workspace as an admin who has access to the same business bank account. Set admin B as the approver.
  • Invite employee C to the workspace as a member.

Test:

  1. As employee C, submit an expense report.
  2. As admin B, approve the report.
  3. Verify that admin B sees the option to pay the report since they have access to the business bank account.
  4. Open the report as admin A and verify that the pay option is available since admin A is the actual payer.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test

// 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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.

This PR will be tested by an internal engineer due to inability to add a real business bank account for testing. #78247 (comment)

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes an issue where admins with business bank account access could not pay reports in New Expensify, even though they could in Expensify Classic. The fix enables the payment action for workspace admins who have access to the same business bank account as the reimburser, even if they are not the designated reimburser themselves.

Key Changes:

  • Modified the isPayer function to check if an admin has bank account access via the sharees field in addition to checking if they are the reimburser
  • Threaded the bankAccountList parameter through multiple utility functions and React components to enable bank account access validation
  • Added test coverage for the new bank account access logic

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
src/libs/ReportUtils.ts Core logic change: Updated isPayer function to accept bankAccountList parameter and check if admin has bank account access via sharees
src/libs/ReportSecondaryActionUtils.ts Updated function signatures to accept and pass bankAccountList for secondary actions (cancel payment, export, mark as exported)
src/libs/ReportPrimaryActionUtils.ts Updated isPrimaryPayAction and getReportPrimaryAction to accept and pass bankAccountList parameter
src/libs/ReportPreviewActionUtils.ts Updated canPay and getReportPreviewAction to accept and pass bankAccountList parameter
src/libs/NextStepUtils.ts Updated next step calculation functions to accept and pass bankAccountList for correct payer determination
src/hooks/useTodos.ts Added bankAccountList hook and passed it to isPrimaryPayAction for todo list calculations
src/components/MoneyReportHeader.tsx Added bankAccountList hook and passed it through primary/secondary action calculations
src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx Added bankAccountList hook and included it in report preview action calculations
tests/unit/ReportUtilsTest.ts Added test case validating that admins with bank account access via sharees can pay reports

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@codecov
Copy link

codecov bot commented Jan 2, 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 Δ
...ReportPreview/MoneyRequestReportPreviewContent.tsx 61.20% <100.00%> (+0.13%) ⬆️
src/components/Search/index.tsx 34.22% <100.00%> (+0.16%) ⬆️
...ts/SelectionListWithSections/Search/ActionCell.tsx 54.90% <100.00%> (+0.90%) ⬆️
...stWithSections/Search/TransactionGroupListItem.tsx 71.69% <100.00%> (+0.26%) ⬆️
src/hooks/useTodos.ts 94.73% <100.00%> (+0.14%) ⬆️
src/libs/ReportPreviewActionUtils.ts 90.38% <100.00%> (-0.97%) ⬇️
src/libs/ReportPrimaryActionUtils.ts 90.65% <100.00%> (ø)
src/libs/ReportSecondaryActionUtils.ts 91.80% <100.00%> (ø)
src/libs/ReportUtils.ts 73.02% <100.00%> (-0.05%) ⬇️
src/libs/SearchUIUtils.ts 59.32% <100.00%> (ø)
... and 7 more
... and 9 files with indirect coverage changes

@samranahm
Copy link
Contributor Author

Failing checks are not related to our changes.

@bernhardoj
Copy link
Contributor

image

@samranahm This missing bankAccountList from deps related to our PR.

@samranahm
Copy link
Contributor Author

WIP

@bernhardoj
Copy link
Contributor

@samranahm also, please merge with main to see if the lint is fixed

Copy link
Contributor

@JS00001 JS00001 left a comment

Choose a reason for hiding this comment

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

Code looks good to me, one comment thats not critical

@bernhardoj
Copy link
Contributor

@samranahm please fix the conflicts and also this lint error

image

@samranahm
Copy link
Contributor Author

On it, will fix them ASAP

@JS00001
Copy link
Contributor

JS00001 commented Jan 7, 2026

Looks like prettier is failing

@JS00001 JS00001 requested a review from bernhardoj January 7, 2026 14:03
@samranahm
Copy link
Contributor Author

@bernhardoj All yours.

@trjExpensify
Copy link
Contributor

@bernhardoj can you re-review it today? It's a feature disparity gap we'd like to get fixed ASAP. 👍

@bernhardoj
Copy link
Contributor

@samranahm the bankAccountList is still optional in getReportPrimaryAction, getSecondaryReportActions, and canIOUBePaid.

@samranahm
Copy link
Contributor Author

Ahh, I’ll make them required here too and review all the changes again.

@JS00001
Copy link
Contributor

JS00001 commented Jan 8, 2026

@samranahm let us know when this is ready for another review!

@samranahm
Copy link
Contributor Author

I’m reviewing it one more time and will ping you shortly.

@samranahm
Copy link
Contributor Author

@bernhardoj @JS00001 PR ready, please take a look.

});

let allBankAccountList: OnyxEntry<OnyxTypes.BankAccountList> = {};
Onyx.connectWithoutView({
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we want to add a new Onyx.connectWithoutView usage in this file. Let's pass it all from useOnyx hook.

Copy link
Contributor

Choose a reason for hiding this comment

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

Btw, I see that we use it mostly for hasOutstandingChildRequest(). @JS00001 When the non-payer approver can pay (bcs the bank account is shared), should the hasOutstandingChildRequest be true or not?

If not, then we can just pass undefined to hasOutstandingChildRequest()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, we should get confirmation here. Do we want to show the GBR for admins with bank account access, or should it only be displayed for the actual payer? I think passing undefined to hasOutstandingChildRequest makes sense. @JS00001 what do you think?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we want to add a new Onyx.connectWithoutView usage in this file. Let's pass it all from useOnyx hook.

Agree, lets remove this

Yes, we should get confirmation here. Do we want to show the GBR for admins with bank account access, or should it only be displayed for the actual payer?

I think it should show for only the payer, not all admins, cc @trjExpensify

Copy link
Contributor

Choose a reason for hiding this comment

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

Right, agreed. 👍

@bernhardoj
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
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@bernhardoj
Copy link
Contributor

Code LGTM. @JS00001 can we have an ad-hoc build so @joekaufmanexpensify can help us test this? (for ref)

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.

4 participants