Fix : Reports - Create report button does not show upgrade page when account has no workspace by M00rish · Pull Request #78995 · Expensify/App

M00rish · 2026-01-07T12:06:21Z

Explanation of Change

Fixed Issues

$ #73762
PROPOSAL:
comment

Tests

Precondition: Account has self DM and no workspace

Go to self DM
Create an expense
Go to Reports > Expenses
Select the expense via checkbox
Click dropdown menu > Move expense > create
verify Upgrade page opens
verify when go back you land at previous screen (create menu)
verify when confirm new workspace the expense get moved.
verify bulk move work

Verify that no errors appear in the JS console

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

PR Author Checklist

Screenshots/Videos

Android: Native

Android.webm

Android: mWeb Chrome

AndroidWeb.webm

iOS: Native

ios.webm

iOS: mWeb Safari

iosWeb.webm

MacOS: Chrome / Safari

web.webm

codecov · 2026-01-07T12:15:49Z

Codecov Report

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

Files with missing lines	Coverage Δ
...rc/pages/workspace/upgrade/UpgradeConfirmation.tsx	`72.22% <100.00%> (ø)`
...rc/pages/Search/SearchTransactionsChangeReport.tsx	`0.00% <0.00%> (ø)`
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx	`0.00% <0.00%> (ø)`
... and 58 files with indirect coverage changes

melvin-bot · 2026-01-29T07:11:52Z

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

github-actions · 2026-01-29T07:13:19Z

src/pages/workspace/upgrade/UpgradeConfirmation.tsx


    const description = useMemo(() => {
-        if (isCategorizing ?? isReporting) {
+        if (isCategorizing || isReporting) {


❌ CONSISTENCY-2

The ?? operator was likely intentional for null/undefined checking, but || treats falsy values differently (including false, 0, ""). If isCategorizing or isReporting are explicitly false, this will incorrectly fall through to the condition.

Suggested fix: Keep the nullish coalescing operator if the intent was to only check for null/undefined:

if (isCategorizing ?? isReporting) {

Or if you intended OR logic, use explicit checks:

if (isCategorizing || isReporting) {

Note: This appears to be a logical change rather than just a style fix - ensure the new behavior is correct.

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: db5cf3efa9

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

chatgpt-codex-connector · 2026-01-29T07:19:39Z

src/pages/iou/request/step/IOURequestStepUpgrade.tsx

+                policy: newPolicy,
+                reportNextStep,
+                policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`],
+                allTransactions,
+            });


Pass selected transactions data to bulk move

In this upgrade flow you pass allTransactions from the Onyx TRANSACTION collection into changeTransactionsReport, but the selected items here come from SearchContext (snapshot search results) and aren’t guaranteed to exist in that Onyx collection. changeTransactionsReport filters missing entries and returns early when none are found, so the post-upgrade bulk move can become a no-op for search-based selections. Consider building the allTransactions map from selectedTransactions (as the search change-report flow does) or otherwise ensuring the selected IDs are present before calling.

Useful? React with 👍 / 👎.

…ort in IOURequestStepUpgrade

shubham1206agra · 2026-02-06T11:26:14Z

@M00rish Please fix errors

M00rish · 2026-02-09T06:02:31Z

Done @shubham1206agra

ShridharGoel · 2026-02-09T14:47:56Z

I'll take this up for review based on Slack

ShridharGoel · 2026-02-09T20:14:23Z

@JmillsExpensify On staging, it says "Collect" plan before upgrading, and "Control" plan after it's done. Is it a bug?

Screen.Recording.2026-02-10.at.1.44.03.AM.mov

ShridharGoel · 2026-02-09T20:47:34Z

src/pages/iou/request/step/IOURequestStepUpgrade.tsx

        const expenseReportID = policyDataRef.current?.expenseChatReportID ?? reportID;
        const policyID = policyDataRef.current?.policyID;
+
+        if (upgradePath === CONST.UPGRADE_PATHS.REPORTS && policyID && selectedTransactionsKeys.length > 0) {


But this can be true for actions other than move-expenses also?

Export, Merge, and Delete never navigate to STEP_UPGRADE.

ShridharGoel · 2026-02-09T20:57:27Z

src/pages/iou/request/step/IOURequestStepUpgrade.tsx

+        if (upgradePath === CONST.UPGRADE_PATHS.REPORTS && policyID && selectedTransactionsKeys.length > 0) {
+            const newPolicy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+
+            const optimisticReport = createNewReport(currentUserPersonalDetails, hasViolations, isASAPSubmitBetaEnabled, newPolicy, betas);


Shouldn't we use selectedReport?.ownerAccountID ? See how it's done in IOURequestEditReport.

yes thanks for the catch.

ShridharGoel · 2026-02-09T20:58:35Z

src/pages/iou/request/step/IOURequestStepUpgrade.tsx

+    const navigateWithMicrotask = useCallback(
+        (route: Route) => {
+            if (isWeb) {
+                Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(route));
+            } else {
+                Navigation.navigate(route);
+            }
+        },
+        [isWeb],
+    );


Why has this been changed?

reverted it

ShridharGoel · 2026-02-09T21:00:03Z

src/pages/iou/request/step/IOURequestStepUpgrade.tsx

        const expenseReportID = policyDataRef.current?.expenseChatReportID ?? reportID;
        const policyID = policyDataRef.current?.policyID;
+
+        if (upgradePath === CONST.UPGRADE_PATHS.REPORTS && policyID && selectedTransactionsKeys.length > 0) {


Also, why not handle this via switch inside CONST.UPGRADE_PATHS.REPORTS ?

that would complicate things and require a rewrite of the function especially with Navigation.goBack()

ShridharGoel

Bug and the reason: Bulk-move can run for unrelated upgrade flows due to shared SearchContext state. If selectedTransactions remains populated (for example user entered upgrade from Search, backed out, then went to a normal submit-upgrade flow), this will move the older selected expenses.

See how the first expense got moved even though we did it for the second expense individually.

Screen.Recording.2026-02-15.at.10.43.15.PM.mov

M00rish · 2026-02-19T03:46:42Z

Screencast.from.2026-02-18.00-31-35.webm

fixed @ShridharGoel

ShridharGoel · 2026-02-20T14:19:38Z

Shouldn't the upgrade page open directly after clicking "Move expenses" and before the "Create report" option shows? Similar to how it works when we click on the reports row in expense details

ShridharGoel · 2026-02-20T14:20:33Z

@heyjennahay Can you confirm the expected behaviour?

M00rish · 2026-02-24T15:12:19Z

This was discussed and decided here: #77040 (review)

ShridharGoel · 2026-02-25T07:47:04Z

Bug: Name shows empty in the subtitle and "waiting for" statement, after moving expense in offline mode possibly due to ownerAccountID missing.

M00rish · 2026-02-27T04:07:01Z

will check that today.

M00rish · 2026-03-04T19:08:37Z

Sorry for the delay will have an update today *or tomorow

# Conflicts: # src/pages/iou/request/step/IOURequestStepUpgrade.tsx

M00rish · 2026-03-11T07:49:30Z

looks good on my end @ShridharGoel

ShridharGoel · 2026-04-03T16:16:03Z

Can you merge main here?

ShridharGoel · 2026-04-03T16:16:31Z

looks good on my end

Did you try with offline mode?

show upgrade first

be2e732

melvin-bot bot assigned M00rish Jan 7, 2026

M00rish changed the title ~~show upgrade first~~ Fix : Reports - Create report button does not show upgrade page when account has no workspace Jan 7, 2026

M00rish added 8 commits January 13, 2026 12:25

Merge origin/main into upgradepath

e7255f1

fix bulk move and navigation

47c974e

merge main

a442f00

Merge remote-tracking branch 'origin/main' into upgradepath

6be40c0

Update IOURequestStepUpgrade and UpgradeConfirmation components

d8ec835

Merge branch 'Expensify:main' into upgradepath

df0fb46

lint

0ecce10

Merge branch 'Expensify:main' into upgradepath

db5cf3e

M00rish marked this pull request as ready for review January 29, 2026 07:11

M00rish requested review from a team as code owners January 29, 2026 07:11

melvin-bot bot requested review from heyjennahay and shubham1206agra and removed request for a team January 29, 2026 07:11

melvin-bot bot removed the request for review from a team January 29, 2026 07:11

github-actions bot reviewed Jan 29, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Jan 29, 2026

View reviewed changes

M00rish added 4 commits February 6, 2026 03:44

Fix selectedTransactions not properly passed to changeTransactionsRep…

e861d89

…ort in IOURequestStepUpgrade

lint

2f2628c

Fix TypeScript errors: add null check and remove extra false arg

9cbf2d2

Merge branch 'Expensify:main' into upgradepath

cce4c9a

M00rish added 2 commits February 8, 2026 23:34

fix: add missing betas parameter to createNewReport call

e56d95f

Merge branch 'Expensify:main' into upgradepath

5f10d0c

ShridharGoel suggested changes Feb 9, 2026

View reviewed changes

fixes

93c9809

ShridharGoel suggested changes Feb 15, 2026

View reviewed changes

fix expense selection

e1fe4bc

M00rish added 3 commits March 5, 2026 16:11

Merge remote-tracking branch 'origin/main' into upgradepath

c8744b8

# Conflicts: # src/pages/iou/request/step/IOURequestStepUpgrade.tsx

Merge branch 'Expensify:main' into upgradepath

2dd9072

resolve conflict

fc8b21b

Conversation

M00rish commented Jan 7, 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!

codecov bot commented Jan 7, 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!

melvin-bot bot commented Jan 29, 2026

Uh oh!

github-actions bot Jan 29, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-2

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Feb 6, 2026

Uh oh!

M00rish commented Feb 9, 2026

Uh oh!

ShridharGoel commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ShridharGoel commented Feb 9, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ShridharGoel left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

M00rish commented Feb 19, 2026

Uh oh!

ShridharGoel commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ShridharGoel commented Feb 20, 2026

Uh oh!

M00rish commented Feb 24, 2026

Uh oh!

ShridharGoel commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

M00rish commented Feb 27, 2026

Uh oh!

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

Uh oh!

Uh oh!

M00rish commented Mar 11, 2026

Uh oh!

ShridharGoel commented Apr 3, 2026

Uh oh!

ShridharGoel commented Apr 3, 2026

Uh oh!

M00rish commented Jan 7, 2026 •

edited

Loading

codecov bot commented Jan 7, 2026 •

edited by github-actions bot

Loading

ShridharGoel commented Feb 9, 2026 •

edited

Loading

ShridharGoel left a comment •

edited

Loading

ShridharGoel commented Feb 20, 2026 •

edited

Loading

ShridharGoel commented Feb 25, 2026 •

edited

Loading

M00rish commented Mar 4, 2026 •

edited

Loading