Skip to content

fix: Approve and Reject options are not available for Admin after changing workspace - #82823

Merged
cead22 merged 11 commits into
Expensify:mainfrom
nkdengineer:fix/80582
Apr 8, 2026
Merged

cead22 merged 11 commits into
Expensify:mainfrom
nkdengineer:fix/80582

Conversation

@nkdengineer

@nkdengineer nkdengineer commented Feb 18, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #80582
PROPOSAL: #80582 (comment)

Tests

Preconditions: Create an Admin and a Member, selecting "Manage my team's expenses" option

  1. As Admin, invite the Member to the workspace
  2. As Member, create 2 expenses in your own workspace chat, click Submit
  3. As Member, open the report, click More - Change workspace - Admin's workspace
  4. Verify that the Approve button doesn't appear, and the next step is Waiting for admin to approve the expense
  5. As Admin, navigate to the Member's workspace chat, open the expense report - Verify that the approve option appears
  6. As Admin, select one of the expenses - More menu - Verify that the Reject option appears
  • Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as test

  • 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.

Screenshots/Videos

Android: Native
Screen.Recording.2026-02-18.at.22.46.41.mov
Android: mWeb Chrome
Screen.Recording.2026-02-18.at.22.47.49.mov
iOS: Native
Screen.Recording.2026-02-18.at.22.45.32.mov
iOS: mWeb Safari
Screen.Recording.2026-02-18.at.22.49.07.mov
MacOS: Chrome / Safari
Screen.Recording.2026-02-18.at.22.42.20.mp4

@nkdengineer
nkdengineer marked this pull request as ready for review February 18, 2026 16:15
@nkdengineer
nkdengineer requested review from a team as code owners February 18, 2026 16:15
@melvin-bot

melvin-bot Bot commented Feb 18, 2026

Copy link
Copy Markdown

@DylanDylann 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 request for a team February 18, 2026 16:15

@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: 4021ca61db

ℹ️ 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/libs/actions/Report/index.ts Resolved
@DylanDylann

Copy link
Copy Markdown
Contributor

@nkdengineer However, I'm not sure if the logic in getNextApproverAccountID is correct when we change the workspace. Consider this case: the approval chain in the admin workspace is Approver A → Employee → Approver B. When changing the report to the admin workspace, getNextApproverAccountID returns Approver B. Is this correct? Or should approval start from the first approver (Approver A) when switching to a new workspace?

@nkdengineer

Copy link
Copy Markdown
Contributor Author

@cead22 Can you please confirm what should be the expected in the case above?

@cead22

cead22 commented Feb 25, 2026

Copy link
Copy Markdown
Contributor

I'm not sure I understand, so it'd be helpful to spell out the whole config and flow.

the approval chain in the admin workspace is Approver A → Employee → Approver B.

If I understand correctly, and the report belongs to Employee, and Employee submits to Approver B in the new workspace, then the next step is for Approver B to approve

But the approval chain in the admin workspace is Approver A → Employee → Approver B. is confusing, because it's kinda implying that the approval chain is Employee → Approver A → Employee → Approver B. which I'm not sure it makes sense

@DylanDylann

Copy link
Copy Markdown
Contributor

In the admin workspace:

First approver: Approver A
Second approver: Employee
Third approver: Approver B

And the employee moves their expense (from employee's workspace) to the admin workspace chat

@DylanDylann

Copy link
Copy Markdown
Contributor

@cead22 I thought of this case because @nkdengineer is using getNextApproverAccountID to get the managerID for submitted expense reports when changing workspaces. When changing the workspace of a submitted expense, I think we should point it to the first approver of the new workspace

@cead22

cead22 commented Feb 25, 2026

Copy link
Copy Markdown
Contributor

In the admin workspace:
First approver:
Approver A
Second approver: Employee
Third approver: Approver B

Can you share a screenshot or the policy.employeeList for this?

@DylanDylann

Copy link
Copy Markdown
Contributor

First approver: Admin : dylandylan9112+200134253600@gmail.com
Second approver: Employee : dylandylan9112+128213243576@gmail.com
Third approver: habdejf@gmail.com

Screenshot 2026-02-26 at 12 39 24

@cead22

cead22 commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

In the backend PR, we're do the following

int64_t newPolicyApproverID = auth.policy.getSubmitsTo(db, policyID, submitterEmail);
...
newManagerID = newPolicyApproverID;

This is in line with what you're saying 👍. I assumed getNextApproverAccountID worked the same way, but if it doesn't, it probably should.

Looking at the code, it seems to me like it should return the report's managerID from here https://github.com/Expensify/App/blob/1fd4f51f927/src/libs/ReportUtils.ts#L4721, is that not the case?

@DylanDylann

Copy link
Copy Markdown
Contributor

Looking at the code, it seems to me like it should return the report's managerID from here https://github.com/Expensify/App/blob/1fd4f51f927/src/libs/ReportUtils.ts#L4721, is that not the case?

@nkdengineer You're missing isUnapproved. Please add it and verify that this scenario works correctly.

@nkdengineer

Copy link
Copy Markdown
Contributor Author

@nkdengineer You're missing isUnapproved. Please add it and verify that this scenario works correctly.

@DylanDylann getNextApproverAccountID will return the current user if this user is included in the approver chain then when isUnapproved is true

@DylanDylann

Copy link
Copy Markdown
Contributor

Looking at the code, it seems to me like it should return the report's managerID from here https://github.com/Expensify/App/blob/1fd4f51f927/src/libs/ReportUtils.ts#L4721, is that not the case?

@cead22 This is not my case because isUnapproved is false here

@nkdengineer

Copy link
Copy Markdown
Contributor Author

@cead22 Any thought on the comment from Dylan above?

@cead22

cead22 commented Mar 24, 2026

Copy link
Copy Markdown
Contributor

I'm not sure what I'm being asked. I think we need to update getNextApproverAccountID to return the correct managerID, right?

If not, then there must be another function that we can use for this. Is that the case?

@cead22

cead22 commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

Bump @nkdengineer

@nkdengineer

Copy link
Copy Markdown
Contributor Author

I will check this today

@DylanDylann

Copy link
Copy Markdown
Contributor

@nkdengineer Could you also merge latest main?

@MelvinBot

Copy link
Copy Markdown
Contributor

PR Review

The approach is sound — resetting managerID to the new policy's first approver when changing workspace on a submitted report, and using bypassNextApproverID to keep the optimistic next step in sync.

Issues to address

1. Unnecessary policyID spread (line 6565)
As DylanDylann noted: getManagerAccountID(policy, {...report, policyID: policy.id}) — the function only reads ownerAccountID from the report object, not policyID (the policy is the first arg). Simplify to:

const newManagerAccountID = getManagerAccountID(policy, report);

2. Inline shouldResetApprovalChain
Agree with DylanDylann's suggestion — the let + mutation pattern is unnecessary:

const shouldResetApprovalChain = isProcessingReport(report) && newManagerAccountID !== report.managerID;
if (shouldResetApprovalChain) {

3. Potential conflict with the "manager not in new policy" block (lines 6587-6612)
When a report is processing AND the old manager is not a member of the new policy, both blocks fire:

  • Lines 6565-6585: sets managerID: newManagerAccountID
  • Lines 6591-6612: sets managerID: getNextApproverAccountID(report, true) and reopens the report

Since both push separate MERGE operations to the same Onyx key, the second one wins — overriding your new manager with a value from getNextApproverAccountID(report, true), which operates on the old report (old policyID). This could produce an incorrect manager.

Consider either:

  • Skipping the new block when the old manager isn't in the new policy (since the reopen block handles that case), or
  • Updating line 6599 to use newManagerAccountID when shouldResetApprovalChain is true, so both paths agree on the manager

Minor nit

The bypassNextApproverID: shouldResetApprovalChain ? newManagerAccountID : undefined pattern appears twice (lines 6649, 6659) — one for failure next step, one for optimistic. This is correct and consistent.


Overall: Logic is on the right track. Please address the open review comments from DylanDylann and the overlap with the existing manager-reassignment block, then this should be good to go.

@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: 20f0f2797a

ℹ️ 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/libs/actions/Report/index.ts Resolved
@nkdengineer

Copy link
Copy Markdown
Contributor Author

@DylanDylann Updated.

@codecov

codecov Bot commented Apr 7, 2026 •

Copy link
Copy Markdown

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 Δ
src/libs/actions/Report/index.ts 67.96% <75.00%> (-0.11%) ⬇️
... and 17 files with indirect coverage changes

@DylanDylann

Copy link
Copy Markdown
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
    • 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
Screen.Recording.2026-04-07.at.13.59.03.mov
Android: mWeb Chrome
Screen.Recording.2026-04-07.at.14.00.11.mov
iOS: HybridApp
Screen.Recording.2026-04-07.at.13.57.18.mov
iOS: mWeb Safari
Screen.Recording.2026-04-07.at.13.58.48.mov
MacOS: Chrome / Safari
Screen.Recording.2026-04-07.at.13.56.26.mov

@DylanDylann

Copy link
Copy Markdown
Contributor

@nkdengineer Looks like the issue can't be reproduced on main anymore. Could you help to verify if this fix is necessary now?

Screen.Recording.2026-04-07.at.14.13.04.mov

@nkdengineer

Copy link
Copy Markdown
Contributor Author

@DylanDylann Still can reproduce this issue on the latest main.

Screen.Recording.2026-04-07.at.14.42.30.mov

@DylanDylann

Copy link
Copy Markdown
Contributor

@nkdengineer Oops, your steps here are different from what you described in the PR description. Could you update the test steps to reflect the correct changes?

@nkdengineer

Copy link
Copy Markdown
Contributor Author

@nkdengineer Oops, your steps here are different from what you described in the PR description. Could you update the test steps to reflect the correct changes?

@DylanDylann What is the different?

@DylanDylann

Copy link
Copy Markdown
Contributor

Ah sorry, we merged a BE PR before to fix on the admin side

@DylanDylann DylanDylann left a comment

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.

LGTM

@melvin-bot
melvin-bot Bot requested a review from cead22 April 7, 2026 08:01
@cead22
cead22 merged commit f066c17 into Expensify:main Apr 8, 2026
34 of 35 checks passed
@github-actions

github-actions Bot commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Apr 8, 2026

Copy link
Copy Markdown
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 OSBotify mentioned this pull request Apr 9, 2026
66 tasks done
@OSBotify

OSBotify commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cead22 in version: 9.3.55-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

This is a bug fix that corrects the approval chain logic when changing a report's workspace — specifically, it resets the managerID to the new policy's submit-to account when the report is in a processing state. The change is entirely in internal approval flow logic (src/libs/actions/Report/index.ts) and doesn't affect any user-facing feature names, settings labels, or documented workflows.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cead22 in version: 9.3.57-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

This PR fixes a bug in the approval chain logic when changing workspaces on expense reports (src/libs/actions/Report/index.ts). It resets the managerID and passes a bypassNextApproverID so that Approve/Reject options appear correctly for admins after a workspace change.

These changes are purely internal bug fixes — they don't alter any user-facing feature names, workflows, settings, or UI labels that would be documented in App/docs/articles.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.57-1 🚀

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.

5 participants