Call MoveIOUToPolicy even when policy expense chat is not loaded by grgia · Pull Request #69788 · Expensify/App

grgia · 2025-09-03T14:52:32Z

Explanation of Change

Screen.Recording.2025-09-15.at.3.11.37.PM.mov

We cannot guarantee that an admin will have the policy expense chat IDs for members in ONYX at any given time.

Therefore we are:

Rather than basing this button on policy expense chat, check for policy membership instead.
preexistingReportID is returned from BE in MoveIOUToExistingPolicy if the policy expense chat is not passed
Pass down the optimistic reportID

To keep things clean, in the next PR we will handle the offline optimistic data. From my testing, there may be one more BE fix to merge, so let's merge this and handle the offline opening of the report in a follow up. The app will simply not open the report optimistically if it is not loaded.

Optimistically create a report, populate it the expense, then allow the preexisting report middleware to clean up with the correct report

Fixed Issues

$ #68027
PROPOSAL:

Tests

See QA

Offline tests

QA Steps

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

Verify that no errors appear in the JS console
Create 2 Accounts. Both with USD as default.
1 Account as an admin with a policy which has bank account added to Policy. This will be the PAYER
1 Account as an employee B. This will be the EMPLOYEE/REQUESTOR

First: Test Move IOU and invite

From B/EMPLOYEE:
send a DM to A/PAYER
In the DM chat, create a USD
From A/PAYER:
Click on the dropdown in the payment button, click "pay via workspace"
[X]✅ Verify that a policy Expense chat is created and expense is moved

Second: Test Move IOU with Expense chat loaded

DO NOT LOG OUT FROM A/PAYER FOR THIS TEST
From B/EMPLOYEE:
send a second USD money request to A/PAYER
From A/PAYER:
Click on the dropdown in the payment button, click "pay via workspace"
[X]✅ Verify that expense is moved to existing policy expense chat

Third: Test Move IOU with Expense chat loaded

From B/EMPLOYEE:
send a third USD money request to A/PAYER
From A/PAYER:
Go to settings > troubleshoot > clear cache and restart
Click on the dropdown in the payment button, click "pay via workspace"
✅ Verify that "moved this report to workspace" is commented, but user is not navigated.
✅ Verify that clicking on " workspace" opens the policy expense chat

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

github-actions · 2025-09-03T14:53:19Z

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

github-actions · 2025-09-03T18:56:04Z

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

github-actions · 2025-09-03T19:29:16Z

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

grgia · 2025-09-11T16:05:00Z

+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticExpenseChatReportID}`,
+            value: {
+                reportID: optimisticExpenseChatReportID,
+                policyID,
+                ownerAccountID: employeeAccountID,
+                type: CONST.REPORT.TYPE.CHAT,
+                chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
+            },
+        });


I will remove the optimistic updates for now as the BE requires an update. I will instead break this into 2 PRs as described

grgia · 2025-09-11T16:05:14Z

+                        const isMember = isPolicyMember(policy, getLoginByAccountID(iouReport.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID));
+                        if (!isMember) {
                            const {policyExpenseChatReportID: newPolicyExpenseChatReportID} = moveIOUReportToPolicyAndInviteSubmitter(iouReport.reportID, policy.id, formatPhoneNumber) ?? {};
-                            savePreferredPaymentMethod(iouReport.policyID, policy.id, CONST.LAST_PAYMENT_METHOD.IOU, lastPaymentMethod?.[policy.id]);
-                            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(newPolicyExpenseChatReportID));
+                            if (newPolicyExpenseChatReportID) {
+                                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(newPolicyExpenseChatReportID));
+                            }
                        } else {
-                            moveIOUReportToPolicy(iouReport.reportID, policy.id, true);
+                            const {policyExpenseChatReportID, useTemporaryOptimisticExpenseChatReportID} = moveIOUReportToPolicy(iouReport, policy, true) ?? {};


this is the main change

grgia · 2025-09-11T16:05:30Z

+    const useTemporaryOptimisticExpenseChatReportID = !expenseChatReportId;
+    const optimisticExpenseChatReportID = expenseChatReportId ?? generateReportID();


as with this default to an optimisticID

hungvu193 · 2025-09-11T16:14:00Z

@getusha Could you review this PR while I'm working on bulk pay?

joekaufmanexpensify · 2025-09-11T16:16:55Z

LMK when this is ready to test and I will do that 👍

github-actions · 2025-09-15T09:57:40Z

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

github-actions · 2025-09-15T10:39:09Z

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

joekaufmanexpensify · 2025-09-19T14:21:07Z

Let us know your thoughts @getusha

grgia · 2025-09-23T16:43:20Z

@getusha or @hungvu193 this PR needs final review if you're available

getusha · 2025-09-24T09:57:46Z

Reviewing

getusha · 2025-09-24T12:27:35Z

Looks completely unrelated but only able to reproduce this on this branch, extra space on top.

Screenshot 2025-09-24 at 3 14 40 in the afternoon

grgia · 2025-09-24T13:58:41Z

@getusha yeah I can merge main if needed, but no styles are updated here

getusha · 2025-09-25T12:48:32Z

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

android-rec-45.webm

Android: mWeb Chrome

android-rec-42.webm

iOS: HybridApp

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2025-09-25.at.14.33.03.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2025-09-25.at.14.04.59.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-09-24.at.3.56.46.in.the.afternoon.mov

MacOS: Desktop

Screen.Recording.2025-09-25.at.2.29.49.in.the.afternoon.mov

melvin-bot · 2025-09-25T12:58:01Z

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

Valforte

LGTM

grgia · 2025-09-25T16:17:22Z

@Valforte fixed conflicts

codecov · 2025-09-25T16:28:02Z

Codecov Report

❌ Patch coverage is 10.52632% with 17 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/components/KYCWall/BaseKYCWall.tsx	0.00%	12 Missing ⚠️
src/pages/ReportChangeWorkspacePage.tsx	0.00%	5 Missing ⚠️

📢 Thoughts on this report? Let us know!

Valforte · 2025-09-25T17:23:03Z

There is this ESLint error now

/home/runner/work/App/App/src/components/KYCWall/BaseKYCWall.tsx
Warning:   160:9  warning  React Hook useCallback has unnecessary dependencies: 'onSuccessfulKYC', 'source', and 'walletTerms.source'. Either exclude them or remove the dependency array  react-hooks/exhaustive-deps

joekaufmanexpensify · 2025-09-26T12:52:25Z

Looks like all checks passing now. Could you re-review @Valforte ?

OSBotify · 2025-09-26T14:59:13Z

✋ 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 · 2025-09-26T23:06:39Z

🚀 Deployed to staging by https://github.com/Valforte in version: 9.2.19-0 🚀

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

OSBotify · 2025-09-29T20:15:51Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.19-3 🚀

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

grgia added 4 commits September 3, 2025 15:06

convert login to SMS

cf8401c

unnecessary based on confirmed dagta

e3d4f85

use policy member check instead of expense chat, which we may not have

5c4b164

check for membership

28f2ffb

grgia self-assigned this Sep 3, 2025

This comment has been minimized.

Sign in to view

send optimistic data

a7ab475

grgia changed the title ~~Georgia moveiou fix~~ Call MoveIOUToPolicy even when policy expense chat is not loaded Sep 3, 2025

This comment was marked as outdated.

Sign in to view

grgia added 2 commits September 3, 2025 20:14

optimistic updates

854e540

optimistic

d7c478b

This comment was marked as outdated.

Sign in to view

grgia added 3 commits September 11, 2025 14:18

Merge branch 'main' into georgia-moveiou-fix

9ad9db6

fix call

cec3615

prettier

ca6a49b

grgia requested review from hungvu193 and joekaufmanexpensify September 11, 2025 16:00

grgia commented Sep 11, 2025

View reviewed changes

remove optimistic data

499c60c

This comment was marked as outdated.

Sign in to view

remove optimistic data

3551ca8

getusha approved these changes Sep 25, 2025

View reviewed changes

melvin-bot Bot requested a review from MarioExpensify September 25, 2025 12:57

Valforte previously approved these changes Sep 25, 2025

View reviewed changes

Merge branch 'main' into georgia-moveiou-fix

17bca9f

grgia dismissed stale reviews from Valforte and joekaufmanexpensify via 17bca9f September 25, 2025 16:16

grgia requested a review from Valforte September 25, 2025 16:17

Valforte previously approved these changes Sep 25, 2025

View reviewed changes

fix conflicts

141d3ef

grgia dismissed Valforte’s stale review via 141d3ef September 26, 2025 10:44

MarioExpensify approved these changes Sep 26, 2025

View reviewed changes

Valforte approved these changes Sep 26, 2025

View reviewed changes

Valforte merged commit 7b004f4 into main Sep 26, 2025
25 checks passed

Valforte deleted the georgia-moveiou-fix branch September 26, 2025 14:47

OSBotify mentioned this pull request Sep 26, 2025

Deploy Checklist: New Expensify 2025-09-26 #71399

Closed

62 tasks done

Julesssss mentioned this pull request Oct 1, 2025

Revert "Call MoveIOUToPolicy even when policy expense chat is not loaded" #71710

Closed

		const useTemporaryOptimisticExpenseChatReportID = !expenseChatReportId;
		const optimisticExpenseChatReportID = expenseChatReportId ?? generateReportID();

Conversation

grgia commented Sep 3, 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!

github-actions Bot commented Sep 3, 2025

Uh oh!

This comment has been minimized.

github-actions Bot commented Sep 3, 2025

Uh oh!

This comment was marked as outdated.

github-actions Bot commented Sep 3, 2025

Uh oh!

This comment was marked as outdated.

grgia Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

grgia Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

grgia Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

hungvu193 commented Sep 11, 2025

Uh oh!

joekaufmanexpensify commented Sep 11, 2025

Uh oh!

github-actions Bot commented Sep 15, 2025

Uh oh!

This comment was marked as outdated.

github-actions Bot commented Sep 15, 2025

Uh oh!

joekaufmanexpensify commented Sep 19, 2025

Uh oh!

grgia commented Sep 23, 2025

Uh oh!

getusha commented Sep 24, 2025

Uh oh!

getusha commented Sep 24, 2025

Uh oh!

grgia commented Sep 24, 2025

Uh oh!

getusha commented Sep 25, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Sep 25, 2025

Uh oh!

Valforte left a comment

Choose a reason for hiding this comment

Uh oh!

grgia commented Sep 25, 2025

Uh oh!

codecov Bot commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Valforte commented Sep 25, 2025

Uh oh!

joekaufmanexpensify commented Sep 26, 2025

Uh oh!

Uh oh!

OSBotify commented Sep 26, 2025

Uh oh!

OSBotify commented Sep 26, 2025

Uh oh!

OSBotify commented Sep 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

grgia commented Sep 3, 2025 •

edited

Loading

codecov Bot commented Sep 25, 2025 •

edited

Loading