fix: Workspace - RBR displays after select secondary login account as Additional approver by annaweber830 · Pull Request #84092 · Expensify/App

annaweber830 · 2026-03-03T23:07:00Z

Explanation of Change

fix: Workspace - RBR displays after select secondary login account as Additional approver

Fixed Issues

Tests

Precondition: User B has a secondary login
User A creates a Workspace and adds the secondary login of user B as a member

Open the NewDot app
Navigate to the Workspace Settings -> Workflows
Change the current approver to User B
Enter any amount in the Report amount
Click on the Additional approver
Select the secondary login of user B
Click on the Workspace tab
No placeholder avatar account of secondary login in the Additional approver

Verify that no errors appear in the JS console

Offline tests

Same as test

QA Steps

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

Open the NewDot app
Navigate to the Workspace Settings -> Workflows
Change the current approver to User B
Enter any amount in the Report amount
Click on the Additional approver
Select the secondary login of user B
Click on the Workspace tab
No placeholder avatar account of secondary login in the Additional approver

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-03.at.2.49.18.PM.mp4

melvin-bot · 2026-03-03T23:07:07Z

@situchan 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 · 2026-03-03T23:07:12Z

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

situchan · 2026-03-04T08:13:53Z

@MelvinBot pull main

situchan · 2026-03-04T08:14:01Z

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-03-04.at.2.46.06.PM.mov

Android: mWeb Chrome

iOS: HybridApp

Screen.Recording.2026-03-04.at.2.39.56.PM.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

before fix:

Screen.Recording.2026-03-04.at.2.27.06.PM.mov

after fix:

Screen.Recording.2026-03-04.at.2.32.11.PM.mov

situchan · 2026-03-04T08:18:29Z

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx

+        const selectedAccountID = Number(policyMemberEmailsToAccountIDs[selectedApprover.login] ?? '');
+        if (!selectedAccountID) {
+            return;
+        }


What's this change for? It's redundant as already filtered out above

MelvinBot · 2026-03-04T08:18:56Z

I can't merge main into this branch because I didn't open this PR and I'm not listed as an assignee. To have me pull main, please add me as an assignee on this PR and then retry your request.

situchan · 2026-03-04T08:25:46Z

@annaweber830 you're missing precondition in Tests step

Precondition: User B has a secondary login
User A creates a Workspace and adds the secondary login of user B as a member

annaweber830 · 2026-03-04T08:49:11Z

Hi @situchan I updated test step.

situchan · 2026-03-04T08:52:44Z

Also address #84092 (comment) and pull main.

chatgpt-codex-connector · 2026-03-04T08:57:03Z

Codex Review: Didn't find any major issues. Bravo.

ℹ️ 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".

JmillsExpensify

Interesting one! Fix looks good to me.

lakchote · 2026-03-04T19:04:38Z

Also address #84092 (comment) and pull main.

@annaweber830 please handle this comment from @situchan

annaweber830 · 2026-03-04T23:01:25Z

Hi @situchan I updated my PR.

codecov · 2026-03-04T23:11:55Z

Codecov Report

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

Files with missing lines	Coverage Δ
...rkspaceWorkflowsApprovalsOverLimitApproverPage.tsx	`0.00% <0.00%> (ø)`
... and 211 files with indirect coverage changes

lakchote

LGTM

lakchote

LGTM

github-actions · 2026-03-05T17:49:32Z

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

OSBotify · 2026-03-05T17:53:02Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-03-05T17:58:12Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-84258a1-4f7f7ed-bf646305d72912783145ab3ef089a1509859bb9e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-84258a1-4f7f7ed-2531e3e28280e37c44624fc7675c94c51133c502/index.html

Web 🕸️
https://84092.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-06T04:16:15Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.3.32-0 🚀

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

OSBotify · 2026-03-06T22:45:28Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀

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

fix: init fix

d138cb0

annaweber830 requested review from a team as code owners March 3, 2026 23:07

melvin-bot bot assigned annaweber830 Mar 3, 2026

melvin-bot bot requested review from a team, JmillsExpensify and situchan and removed request for a team March 3, 2026 23:07

melvin-bot bot requested review from lakchote and removed request for a team March 3, 2026 23:07

situchan reviewed Mar 4, 2026

View reviewed changes

JmillsExpensify previously approved these changes Mar 4, 2026

View reviewed changes

fix: remove unnecessary

05992ed

annaweber830 dismissed JmillsExpensify’s stale review via 05992ed March 4, 2026 23:01

situchan approved these changes Mar 4, 2026

View reviewed changes

lakchote reviewed Mar 5, 2026

View reviewed changes

lakchote approved these changes Mar 5, 2026

View reviewed changes

lakchote merged commit 84258a1 into Expensify:main Mar 5, 2026
30 checks passed

OSBotify mentioned this pull request Mar 6, 2026

Deploy Checklist: New Expensify 2026-03-06 #84352

Closed

92 tasks

jponikarchuk mentioned this pull request Mar 6, 2026

feat: Handle the REJECTEDTOSUBMITTER #84053

Merged

53 tasks

Conversation

annaweber830 commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 3, 2026

Uh oh!

melvin-bot bot commented Mar 3, 2026

Uh oh!

situchan commented Mar 4, 2026

Uh oh!

situchan commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 4, 2026

Uh oh!

situchan commented Mar 4, 2026

Uh oh!

annaweber830 commented Mar 4, 2026

Uh oh!

situchan commented Mar 4, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 4, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

lakchote commented Mar 4, 2026

Uh oh!

annaweber830 commented Mar 4, 2026

Uh oh!

codecov bot commented Mar 4, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

OSBotify commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

annaweber830 commented Mar 3, 2026 •

edited

Loading

situchan commented Mar 4, 2026 •

edited

Loading

codecov bot commented Mar 4, 2026 •

edited by github-actions bot

Loading