Part 1: Refactor ConfirmModal usage to useConfirmModal in workspace feature pages by lorretheboy · Pull Request #78060 · Expensify/App

lorretheboy · 2025-12-18T21:45:22Z

Explanation of Change

Fixed Issues

$ #76691
PROPOSAL: #76691 (comment)

Tests

WorkspaceMembersPage

Login ND
Go to WS settings
Go to Members
Try to remove a member in member list
Verify that modal is shown and works proper

WorkspaceMemberDetailsPage

Login ND
Go to WS settings
Go to Members
Click to view member details
Press remove member button
Verify that modal is shown and works proper

WorkspaceWorkflowsPage

Login ND
Go to WS settings
Go to Workflows
Disabled the Add approvals
Verify that modal is shown and works proper

WorkspaceWorkflowsApprovalsEditPage

Login ND
Go to WS settings
Go to Workflows
In Add approvals, view a workflow details --> Delete
Verify that modal is shown and works proper

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.mov

Android: mWeb Chrome

WEBSITE.ANDROID.mov

iOS: Native

IOS.mov

iOS: mWeb Safari

WEBSITE.IOS.mov

MacOS: Chrome / Safari

WorkspaceMembersPage.mov

WorkspaceMemberDetailsPage.mov

WorkspaceWorkflowsPage.mov

WorkspaceWorkflowsApprovalsEditPage.mov

melvin-bot · 2025-12-18T21:47:38Z

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

codecov · 2025-12-18T21:53:40Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...ace/workflows/approvals/ApprovalWorkflowEditor.tsx	`0.00% <ø> (ø)`
.../approvals/WorkspaceWorkflowsApprovalsEditPage.tsx	`0.00% <0.00%> (ø)`
...s/workspace/members/WorkspaceMemberDetailsPage.tsx	`0.00% <0.00%> (ø)`
src/pages/workspace/WorkspaceMembersPage.tsx	`61.07% <28.57%> (-6.84%)`	⬇️
...ges/workspace/workflows/WorkspaceWorkflowsPage.tsx	`0.00% <0.00%> (ø)`
... and 8 files with indirect coverage changes

joekaufmanexpensify · 2026-01-05T18:32:38Z

No product considerations, removing my review 👍

ZhenjaHorbach · 2026-01-07T15:46:06Z

Reviewer Checklist

Screenshots/Videos

Android: HybridApp

2026-01-26.14.54.34.mov

2026-01-26.14.56.04.mov

2026-01-26.15.02.36.mov

2026-01-26.15.02.56.mov

Android: mWeb Chrome

2026-01-26.15.05.11.mov

2026-01-26.15.05.33.mov

2026-01-26.15.06.05.mov

2026-01-26.15.06.18.mov

iOS: HybridApp

2026-01-26.14.28.04.mov

2026-01-26.14.28.29.mov

2026-01-26.14.29.14.mov

2026-01-26.14.29.28.mov

iOS: mWeb Safari

2026-01-26.14.34.36.mov

2026-01-26.14.35.15.mov

2026-01-26.14.35.47.mov

2026-01-26.14.36.03.mov

MacOS: Chrome / Safari

2026-01-26.14.14.57.mov

2026-01-26.14.16.42.mov

2026-01-26.14.18.18.mov

2026-01-26.14.19.17.mov

ZhenjaHorbach · 2026-01-07T15:46:22Z

@lorretheboy
Could you fix the conflicts, please?

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

ZhenjaHorbach · 2026-01-09T19:11:37Z

src/pages/workspace/WorkspaceMembersPage.tsx

+                InteractionManager.runAfterInteractions(() => {
+                    if (!textInputRef.current) {
+                        return;
+                    }
+                    textInputRef.current.focus();
+                });


Can you try, please, to add this logic in then without InteractionManager.runAfterInteractions?
I suppose it should work the same

Any updates?

src/pages/workspace/WorkspaceMembersPage.tsx

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

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

src/pages/workspace/WorkspaceMembersPage.tsx

ZhenjaHorbach · 2026-01-12T17:03:25Z

tests/ui/WorkspaceMembersTest.tsx

-            // Press confirm button
-            fireEvent.press(screen.getByLabelText(confirmText));
-
-            await waitForBatchedUpdatesWithAct();
-
-            // Verify workflow actions are only called once when an approver is removed
-            expect(updateWorkflowDataOnApproverRemoval).toHaveBeenCalledTimes(1);
-            expect(removeApprovalWorkflow).toHaveBeenCalledTimes(1);


Why did we remove this test case?

I'm removing this test because we've migrated the modal logic to use the new ModalProvider pattern (via showConfirmModal), the old code was written for the old modal pattern and doesn't work with the new architecture

…-1/76691

ZhenjaHorbach · 2026-01-21T16:59:01Z

src/pages/workspace/WorkspaceMembersPage.tsx

        return options;
    };

+    const showRequiresInternetModal = () => {


@lorretheboy
Friendly bump
And it's React compiler issue

Could you check this instruction and update your PR if needed?
https://expensify.slack.com/archives/C08CZDJFJ77/p1768416848669629?thread_ts=1768413533.697819&cid=C08CZDJFJ77

ZhenjaHorbach · 2026-01-26T14:08:18Z

But overall, changes work well!

ZhenjaHorbach · 2026-01-28T18:21:44Z

@lorretheboy
Any updates?

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

src/pages/workspace/WorkspaceMembersPage.tsx

…-1/76691

OSBotify · 2026-02-04T02:04:43Z

✋ 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 · 2026-02-05T20:46:01Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.13-1 🚀

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

OSBotify · 2026-02-05T21:46:26Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.15-0 🚀

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

OSBotify · 2026-02-10T07:02:21Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.15-10 🚀

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

fix: part 1 of refactoring use confirm modal

9c4d376

melvin-bot bot assigned lorretheboy Dec 18, 2025

lorretheboy marked this pull request as ready for review December 18, 2025 21:47

lorretheboy requested review from a team as code owners December 18, 2025 21:47

melvin-bot bot requested review from ZhenjaHorbach and joekaufmanexpensify and removed request for a team December 18, 2025 21:47

melvin-bot bot removed the request for review from a team December 18, 2025 21:47

chore: conflicts

3c658d2

joekaufmanexpensify removed their request for review January 5, 2026 18:32

ZhenjaHorbach reviewed Jan 9, 2026

View reviewed changes

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Outdated Show resolved Hide resolved

ZhenjaHorbach reviewed Jan 9, 2026

View reviewed changes

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx Show resolved Hide resolved

ZhenjaHorbach reviewed Jan 9, 2026

View reviewed changes

src/pages/workspace/WorkspaceMembersPage.tsx Outdated Show resolved Hide resolved

ZhenjaHorbach reviewed Jan 9, 2026

View reviewed changes

src/pages/workspace/WorkspaceMembersPage.tsx Show resolved Hide resolved

lorretheboy added 4 commits January 11, 2026 15:32

fix: conflicts

ef935cb

chore: remove redundant changes

e7ba60a

chore: resolve comments

84271a7

fix: remove then

124fe0d

ZhenjaHorbach reviewed Jan 11, 2026

View reviewed changes

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx Outdated Show resolved Hide resolved

ZhenjaHorbach reviewed Jan 11, 2026

View reviewed changes

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Outdated Show resolved Hide resolved

ZhenjaHorbach reviewed Jan 11, 2026

View reviewed changes

src/pages/workspace/WorkspaceMembersPage.tsx Outdated Show resolved Hide resolved

lorretheboy added 2 commits January 12, 2026 17:16

fix: conflicts

b870ae0

fix: remove .then pattern

c8ea61a

lorretheboy added 2 commits January 12, 2026 17:42

fix: test

5e21c82

fix: test

35547a1

ZhenjaHorbach reviewed Jan 12, 2026

View reviewed changes

lorretheboy added 2 commits January 14, 2026 14:44

Merge branch 'main' of https://github.com/Expensify/App into fix-part…

fc7be4d

…-1/76691

chore: merge main

8105ea0

ZhenjaHorbach reviewed Jan 21, 2026

View reviewed changes

lorretheboy added 5 commits January 29, 2026 14:29

fix: conflicts

0e6dbf9

fix: runAfterInteractions

4e3d181

fix: react compiler

b2a6c8e

fix: comments

67bceba

fix: eslint

f5ee1bc

ZhenjaHorbach approved these changes Jan 29, 2026

View reviewed changes

melvin-bot bot requested a review from roryabraham January 29, 2026 09:03

roryabraham requested changes Jan 30, 2026

View reviewed changes

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Show resolved Hide resolved

src/pages/workspace/WorkspaceMembersPage.tsx Outdated Show resolved Hide resolved

lorretheboy added 2 commits February 4, 2026 00:49

Merge branch 'main' of https://github.com/Expensify/App into fix-part…

b0e5896

…-1/76691

fix: wrap func to usecallback

719bf87

roryabraham approved these changes Feb 4, 2026

View reviewed changes

roryabraham merged commit a5ec775 into Expensify:main Feb 4, 2026
29 checks passed

roryabraham mentioned this pull request Feb 4, 2026

Refactor ConfirmModal usage to useConfirmModal in workspace feature pages #76691

Open

OSBotify mentioned this pull request Feb 5, 2026

Deploy Checklist: New Expensify 2026-02-05 #81590

Closed

amyevans mentioned this pull request Feb 9, 2026

[HOLD ON #79732][$250] Workspace - RHN currency list page does not open after clicking Update workspace currency #81788

Closed

7 tasks

Conversation

lorretheboy commented Dec 18, 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 Dec 18, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

joekaufmanexpensify commented Jan 5, 2026

Uh oh!

ZhenjaHorbach commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Jan 7, 2026

Uh oh!

Uh oh!

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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!

ZhenjaHorbach commented Jan 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Jan 28, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

OSBotify commented Feb 4, 2026

Uh oh!

OSBotify commented Feb 5, 2026

Uh oh!

OSBotify commented Feb 5, 2026

Uh oh!

OSBotify commented Feb 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lorretheboy commented Dec 18, 2025 •

edited

Loading

codecov bot commented Dec 18, 2025 •

edited by github-actions bot

Loading

ZhenjaHorbach commented Jan 7, 2026 •

edited

Loading

ZhenjaHorbach commented Jan 26, 2026 •

edited

Loading