Implement confirmation modal when user tries to create multiple empty reports by ShridharGoel · Pull Request #71609 · Expensify/App

ShridharGoel · 2025-09-30T19:37:14Z

Explanation of Change

Implement confirmation modal when user tries to create multiple empty reports.

Fixed Issues

$ #70999
PROPOSAL: #70999 (comment)

Tests

Create a new workspace.
Create a new empty report in that workspace. It should be created without any confirmation.
Try to create another empty report. It should show a confirmation modal.
Click "Create report" in the modal. The report should be created.
Repeat the step 3 and then click "Cancel" this time. No new report should be created.
Do the same steps from FAB.
Do the same steps from attachment picker in any workspace chat.
Do the same steps from empty search view.
Do the same steps via FAB with multiple workspaces, and in the scenario when there's no inferred workspace (so that you get the workspace selector).

Create a workspace with multiple expense reports + 1 empty report.
Create a new empty workspace.
In the empty workspace, create a new empty report. It should not ask for any confirmation.
Now, try to create another report. It should ask for confirmation.

Create 2 empty reports.
Delete one of them.
Create a new empty report. Confirmation should be shown.

Create 2 empty reports.
Delete both.
Create a new empty report. Confirmation should not be shown.

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

Screen.Recording.2025-10-02.at.5.30.00.PM.mp4

Android: mWeb Chrome

Screen.Recording.2025-10-02.at.4.42.31.PM.mp4

iOS: Native

Simulator.Screen.Recording.-.iPhone.16.Plus.-.2025-10-02.at.22.49.25.-.FPS.-.Videobolt.net.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.16.Plus.-.2025-10-02.at.21.56.56.-.COMPRESS.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-10-02.at.3.34.29.PM.1.online-video-cutter.com.1.mp4

MacOS: Desktop

Screen.Recording.2025-10-02.at.11.07.13.PM.mp4

codecov · 2025-10-02T06:45:09Z

Codecov Report

❌ Patch coverage is 54.49438% with 81 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/pages/NewReportWorkspaceSelectionPage.tsx	0.00%	39 Missing ⚠️
...es/home/sidebar/FloatingActionButtonAndPopover.tsx	34.61%	17 Missing ⚠️
src/pages/Search/EmptySearchView.tsx	42.85%	16 Missing ⚠️
...ortActionCompose/AttachmentPickerWithMenuItems.tsx	57.14%	6 Missing ⚠️
src/libs/ReportUtils.ts	96.15%	2 Missing ⚠️
src/libs/PolicyUtils.ts	83.33%	1 Missing ⚠️

Files with missing lines	Coverage Δ
src/hooks/useCreateEmptyReportConfirmation.tsx	`100.00% <100.00%> (ø)`
src/libs/PolicyUtils.ts	`51.40% <83.33%> (-0.17%)`	⬇️
src/libs/ReportUtils.ts	`74.60% <96.15%> (+0.19%)`	⬆️
...ortActionCompose/AttachmentPickerWithMenuItems.tsx	`47.20% <57.14%> (-32.40%)`	⬇️
src/pages/Search/EmptySearchView.tsx	`61.19% <42.85%> (-0.02%)`	⬇️
...es/home/sidebar/FloatingActionButtonAndPopover.tsx	`52.58% <34.61%> (+1.12%)`	⬆️
src/pages/NewReportWorkspaceSelectionPage.tsx	`0.00% <0.00%> (ø)`

... and 12 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

… reports

melvin-bot · 2025-10-02T17:43:32Z

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

hungvu193 · 2025-10-05T06:38:53Z

Will review on Monday

hungvu193 · 2025-10-06T02:31:47Z

Did we confirm this translation elsewhere?
And I thought we should also generate other transaction files right? Not only es and en.

I think the other translations can be generated by a workflow which can be started by an internal eng.

Added them.

hungvu193 · 2025-10-06T02:40:02Z

+        if (isConfirmLoading) {
+            return;
+        }
+
+        setIsConfirmLoading(true);
+
+        const result = onConfirm();
+
+        // If the result is not a Promise, convert it to one for consistent handling
+        const resultPromise = result instanceof Promise ? result : Promise.resolve();
+
+        resultPromise
+            .catch(() => {})
+            .finally(() => {
+                setIsConfirmLoading(false);
+                setIsVisible(false);


just wonder why we need this handle here? 🤔

AFAIK, after pressing Confirm, we navigate to the empty report immediately. Is there any case that user can press Cancel in that meantime?

For this line:

const resultPromise = result instanceof Promise ? result : Promise.resolve();

We can use onConfirm?.() no?

Makes sense, updated accordingly.

hungvu193 · 2025-10-06T02:49:39Z

+ * This excludes reports that are being deleted or have errors.
+ */
+function hasEmptyReportsForPolicy(reports: OnyxCollection<Report>, policyID: string | undefined, accountID: number): boolean {
+    if (!policyID || !Number.isFinite(accountID)) {


I'm not sure if isFinite is the correct way. What if accountID equals CONST.DEFAULT_NUMBER_ID?

Suggested change

if (!policyID || !Number.isFinite(accountID)) {

if (!policyID || accountID === CONST.DEFAULT_NUMBER_ID) {

hungvu193 · 2025-10-06T02:53:22Z

+    const inferredWorkspacePolicy = useMemo(() => {
+        if (activePolicy && activePolicy.isPolicyExpenseChatEnabled && isPaidGroupPolicy(activePolicy)) {
+            return activePolicy;
+        }
+
+        if (groupPoliciesWithChatEnabled.length === 1) {
+            return groupPoliciesWithChatEnabled.at(0);
+        }
+
+        return undefined;
+    }, [activePolicy, groupPoliciesWithChatEnabled]);
+
+    const inferredWorkspaceID = inferredWorkspacePolicy?.id;


it looks like we also repeat this block of code more than 1 time, can we create util funciton for it?

hungvu193 · 2025-10-06T02:54:52Z

+            const reports = toCollection(buildReport());
+
+            expect(hasEmptyReportsForPolicy(reports, undefined, accountID)).toBe(false);
+            expect(hasEmptyReportsForPolicy(reports, policyID, Number.NaN)).toBe(false);


Let's update the test here to cover the case when accountID equals CONST.DEFAULT_NUMBER_ID

did you update this?

hungvu193 · 2025-10-07T07:45:50Z

+            clearLastSearchParams();
+        }
+
+        const createdReportID = createNewReport(currentUserPersonalDetails, inferredWorkspaceID);


Let's fix the linting here

hungvu193 · 2025-10-07T07:46:15Z

+            return;
+        }
+
+        const createdReportID = createNewReport(currentUserPersonalDetails, inferredWorkspaceID);


Same here. it looks like we need to merge main, createNewReport has been updated elsewhere

hungvu193 · 2025-10-07T08:08:00Z

@ShridharGoel It looks like I can still create empty report from Global create, can you double check?

Screen.Recording.2025-10-07.at.15.05.39.mov

…ionButtonAndPopover

ShridharGoel · 2025-10-07T08:23:17Z

@hungvu193 Looks like two extra params got added in the hasEmptyReportsForPolicy call from FloatingActionButtonAndPopover, maybe while resolving conflicts. I've updated it now.

hungvu193 · 2025-10-07T08:24:09Z

Cool. Ty. That was fast. Lemme retest.

hungvu193 · 2025-10-14T11:46:36Z

Lint is still failing

ShridharGoel · 2025-10-14T13:02:27Z

@hungvu193 Can you check now?

ShridharGoel · 2025-10-16T14:36:50Z

@puneetlath Please take a look.

OSBotify · 2025-10-16T15:49:07Z

✋ 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-10-16T23:41:39Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.2.33-0 🚀

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

OSBotify · 2025-10-20T09:25:27Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.33-4 🚀

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

melvin-bot Bot assigned ShridharGoel Sep 30, 2025

ShridharGoel force-pushed the confirmEmpty branch from e552640 to c500c8a Compare October 2, 2025 06:33

ShridharGoel force-pushed the confirmEmpty branch 2 times, most recently from 199c5b3 to 2f1d70b Compare October 2, 2025 11:26

Implement confirmation modal when user tries to create multiple empty…

0b909c6

… reports

ShridharGoel force-pushed the confirmEmpty branch from 2f1d70b to 0b909c6 Compare October 2, 2025 11:39

ShridharGoel added 3 commits October 2, 2025 19:46

Update tests

6457ce2

Lint and other fixes

e2a419c

Fixes

108edd0

ShridharGoel marked this pull request as ready for review October 2, 2025 17:43

ShridharGoel requested a review from a team as a code owner October 2, 2025 17:43

melvin-bot Bot requested review from hungvu193 and removed request for a team October 2, 2025 17:43

hungvu193 reviewed Oct 6, 2025

View reviewed changes

ShridharGoel added 7 commits October 6, 2025 10:18

Update based on comments

16b50f8

Merge branch 'main' into confirmEmpty

f0ec673

Prettier updates

6bceb39

Update tests

7da8e89

Lint fixes

032385a

Add translations for other languages

27d2b74

Merge

d03b744

ShridharGoel requested a review from hungvu193 October 6, 2025 20:33

hungvu193 reviewed Oct 7, 2025

View reviewed changes

Remove extra params from hasEmptyReportsForPolicy call in FloatingAct…

e056f50

…ionButtonAndPopover

ShridharGoel added 5 commits October 13, 2025 16:52

Update to remove unnecessary changes

be4b008

Fix lint

92f1cd5

Check for transactions instead of money

2f5426e

Merge

1ddc053

Fixes

9b6cae0

ShridharGoel added 3 commits October 14, 2025 17:23

Fix lint

35908ab

Fix lint

d099a8e

Lint fix

8ec4256

ShridharGoel added 2 commits October 15, 2025 02:26

Update inferred to defaultChatEnabled

4eb17d9

Merge main

fa29236

hungvu193 approved these changes Oct 15, 2025

View reviewed changes

puneetlath approved these changes Oct 16, 2025

View reviewed changes

puneetlath merged commit 13f6b4b into Expensify:main Oct 16, 2025
22 checks passed

OSBotify mentioned this pull request Oct 16, 2025

Deploy Checklist: New Expensify 2025-10-16 #72816

Closed

67 tasks

jponikarchuk mentioned this pull request Oct 17, 2025

Expense - Confirm modal is not shown when there is an outstanding empty report #72835

Closed

8 tasks

mjasikowski mentioned this pull request Oct 17, 2025

[CP Staging] Revert "Implement confirmation modal when user tries to create multiple empty reports" #72844

Merged

52 tasks

mitarachim mentioned this pull request Oct 17, 2025

Expense - Rate field changes to "Rate out of policy" after changing category #72864

Closed

8 tasks

melvin-bot Bot mentioned this pull request Oct 20, 2025

[Awaiting Checklist] [$250] Improvement: Workspace chat - The ability to create empty reports without confirmation modal #70999

Closed

16 tasks

	if (!policyID \|\| !Number.isFinite(accountID)) {
	if (!policyID \|\| accountID === CONST.DEFAULT_NUMBER_ID) {

Uh oh!

Conversation

ShridharGoel commented Sep 30, 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!

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

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Oct 2, 2025

Uh oh!

hungvu193 commented Oct 5, 2025

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!

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!

hungvu193 commented Oct 7, 2025

Uh oh!

ShridharGoel commented Oct 7, 2025

Uh oh!

hungvu193 commented Oct 7, 2025

Uh oh!

hungvu193 commented Oct 14, 2025

Uh oh!

ShridharGoel commented Oct 14, 2025

Uh oh!

ShridharGoel commented Oct 16, 2025

Uh oh!

Uh oh!

OSBotify commented Oct 16, 2025

Uh oh!

OSBotify commented Oct 16, 2025

Uh oh!

OSBotify commented Oct 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ShridharGoel commented Sep 30, 2025 •

edited

Loading

codecov Bot commented Oct 2, 2025 •

edited

Loading