[CP Staging] Fix empty report action for OldDot `TAKECONTROL` action by marcaaron · Pull Request #69307 · Expensify/App

marcaaron · 2025-08-26T21:56:36Z

Explanation of Change

Provides a fallback for OldDot "TAKECONTROL" actions that do not have mentions. For "TAKECONTROL" we don't need a mentionedAccountIDs and should be able to just use the reportAction.accountID which will always be the person who took control.

Fixed Issues

$ #69280
PROPOSAL:

Tests

Create new policy as ADMIN
Invite two users USER A and USER B
Setup advanced approvals
Set USER B to be USER A approver
As User A submit report to USER B
As ADMIN "Take Control" in OldDot
As any user view the report in NewDot
Verify that it says changed the approver to @[display name or email]

Verify that no errors appear in the JS console

Offline tests

❌

QA Steps

Same as Tests

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

MacOS: Desktop

…ECONTROL action

melvin-bot · 2025-08-26T22:02:09Z

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

allroundexperts · 2025-08-26T22:28:43Z

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

Unable to build android

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-08-27.at.3.41.09.AM.mov

MacOS: Desktop

allroundexperts · 2025-08-26T22:42:36Z

@marcaaron For some reason, the avatar is not showing up in the report item.

allroundexperts · 2025-08-26T23:07:06Z

@marcaaron For some reason, the avatar is not showing up in the report item.

I think this is out of scope for this issue. Going ahead and approving.

OSBotify · 2025-08-26T23:40:55Z

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

[CP Staging] Fix empty report action for OldDot `TAKECONTROL` action (cherry picked from commit 1dcf5de) (cherry-picked to staging by thienlnam)

OSBotify · 2025-08-27T00:17:55Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.1.99-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2025-08-28T01:21:08Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.99-11 🚀

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

OSBotify · 2025-08-28T01:40:38Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.2.0-0 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2025-09-02T22:19:30Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.0-5 🚀

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

OSBotify · 2025-09-02T23:12:43Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.0-5 🚀

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

linhvovan29546 · 2026-03-19T14:29:11Z

    const {mentionedAccountIDs} = getOriginalMessage(reportAction as ReportAction<T>) ?? {};

-    if (!mentionedAccountIDs?.length) {
+    // If mentionedAccountIDs exists and has values, use the first one


Checklist from #84288: When a report is created and approved in OldDot with auto‑pay enabled(the action is TAKE_CONTROL), ND always shows an extra Changed approver [owner name] system message. We've updated shouldReportActionBeVisible to hide that action.

marcaaron self-assigned this Aug 26, 2025

Fallback to accountID when no mentionedAccountIDs are present for TAK…

be42f63

…ECONTROL action

marcaaron force-pushed the marcaaron-fixEmptyReportAction branch from f8fa814 to be42f63 Compare August 26, 2025 22:00

marcaaron marked this pull request as ready for review August 26, 2025 22:02

marcaaron requested a review from a team as a code owner August 26, 2025 22:02

melvin-bot Bot requested a review from parasharrajat August 26, 2025 22:02

melvin-bot Bot removed the request for review from a team August 26, 2025 22:02

marcaaron requested review from allroundexperts and removed request for parasharrajat August 26, 2025 22:05

allroundexperts approved these changes Aug 26, 2025

View reviewed changes

melvin-bot Bot requested a review from Gonals August 26, 2025 23:07

Expensify deleted a comment from melvin-bot Bot Aug 26, 2025

marcaaron removed the request for review from Gonals August 26, 2025 23:19

roryabraham approved these changes Aug 26, 2025

View reviewed changes

roryabraham merged commit 1dcf5de into main Aug 26, 2025
25 of 27 checks passed

roryabraham deleted the marcaaron-fixEmptyReportAction branch August 26, 2025 23:29

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Aug 26, 2025

OSBotify mentioned this pull request Aug 26, 2025

Deploy Checklist: New Expensify 2025-08-26 #69233

Closed

nlemma mentioned this pull request Aug 27, 2025

[Due for payment 2025-09-23] [$250] mWeb - email in changed approver message does not wrap around the screen #69339

Closed

8 tasks

melvin-bot Bot mentioned this pull request Sep 2, 2025

[Due for payment 2025-09-09][$250] Expense - "took control" system message is blank and is not displayed #69280

Closed

8 tasks

MelvinBot mentioned this pull request Mar 9, 2026

[Due for payment 2026-03-18][$250] Report -“Changed approver” system message show in ND for reports created and autopaid in OD #84288

Closed

7 tasks

linhvovan29546 reviewed Mar 19, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix empty report action for OldDot `TAKECONTROL` action#69307

[CP Staging] Fix empty report action for OldDot `TAKECONTROL` action#69307
roryabraham merged 1 commit intomainfrom
marcaaron-fixEmptyReportAction

marcaaron commented Aug 26, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Aug 26, 2025 •

edited by marcaaron

Loading

Uh oh!

allroundexperts commented Aug 26, 2025 •

edited

Loading

Uh oh!

allroundexperts commented Aug 26, 2025

Uh oh!

allroundexperts commented Aug 26, 2025

Uh oh!

Uh oh!

OSBotify commented Aug 26, 2025

Uh oh!

OSBotify commented Aug 27, 2025

Uh oh!

OSBotify commented Aug 28, 2025

Uh oh!

OSBotify commented Aug 28, 2025

Uh oh!

OSBotify commented Sep 2, 2025

Uh oh!

OSBotify commented Sep 2, 2025

Uh oh!

linhvovan29546 Mar 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

marcaaron commented Aug 26, 2025 • 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 Aug 26, 2025 • edited by marcaaron Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

allroundexperts commented Aug 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts commented Aug 26, 2025

Uh oh!

allroundexperts commented Aug 26, 2025

Uh oh!

Uh oh!

OSBotify commented Aug 26, 2025

Uh oh!

OSBotify commented Aug 27, 2025

Uh oh!

OSBotify commented Aug 28, 2025

Uh oh!

OSBotify commented Aug 28, 2025

Uh oh!

OSBotify commented Sep 2, 2025

Uh oh!

OSBotify commented Sep 2, 2025

Uh oh!

linhvovan29546 Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

marcaaron commented Aug 26, 2025 •

edited

Loading

melvin-bot Bot commented Aug 26, 2025 •

edited by marcaaron

Loading

allroundexperts commented Aug 26, 2025 •

edited

Loading