Block submission and approval in New Expensify if DEW is enabled on the workspace by lorretheboy · Pull Request #73348 · Expensify/App

lorretheboy · 2025-10-23T19:14:41Z

Explanation of Change

Fixed Issues

$ #73338
PROPOSAL: #73338 (comment)

Tests

Login to ND with account that has a workspace with DEW enabled
Open WS chat and submit a manual expense
Verify that after press Approve button (in all places across the app), a modal to redirect to OD should be shown up

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

WEBSITE.mov

MacOS: Desktop

DESKTOP.mov

lorretheboy · 2025-10-23T19:23:12Z

+        title: 'Flujo de aprobación personalizado',
+        description: 'Tu empresa tiene un flujo de aprobación personalizado en este espacio de trabajo, por favor realiza esta acción en Expensify Classic',
+        goToExpensifyClassic: 'Cambiar a Expensify Classic',
+    },


Confirmed copies here

codecov · 2025-10-23T19:36:14Z

Codecov Report

❌ Patch coverage is 6.15385% with 61 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/pages/Search/SearchPage.tsx	0.00%	18 Missing ⚠️
src/components/MoneyReportHeader.tsx	0.00%	14 Missing ⚠️
src/components/Search/index.tsx	0.00%	11 Missing ⚠️
...ReportPreview/MoneyRequestReportPreviewContent.tsx	9.09%	10 Missing ⚠️
src/libs/actions/Search.ts	11.11%	8 Missing ⚠️

Files with missing lines	Coverage Δ
src/components/Search/SearchList/index.tsx	`0.00% <ø> (ø)`
...onListWithSections/Search/ReportListItemHeader.tsx	`88.00% <ø> (ø)`
...stWithSections/Search/TransactionGroupListItem.tsx	`73.73% <ø> (-19.88%)`	⬇️
...ionListWithSections/Search/TransactionListItem.tsx	`1.63% <ø> (ø)`
src/libs/PolicyUtils.ts	`51.85% <100.00%> (+0.29%)`	⬆️
src/libs/actions/Search.ts	`11.68% <11.11%> (+0.06%)`	⬆️
...ReportPreview/MoneyRequestReportPreviewContent.tsx	`61.32% <9.09%> (-2.09%)`	⬇️
src/components/Search/index.tsx	`0.00% <0.00%> (ø)`
src/components/MoneyReportHeader.tsx	`0.18% <0.00%> (-0.01%)`	⬇️
src/pages/Search/SearchPage.tsx	`0.00% <0.00%> (ø)`

... and 21 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.

lorretheboy · 2025-10-23T20:20:53Z

        "Selec",
-        "setuptools"
+        "setuptools",
+        "DYNAMICEXTERNAL"


Fix spell check issue

melvin-bot · 2025-10-23T20:47:20Z

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

abzokhattab · 2025-10-23T20:50:05Z

Great job @lorretheboy 🔥, reviewing...

abzokhattab · 2025-10-23T21:01:21Z

+/**
+ * Checks if policy has Dynamic External Workflow enabled
+ */
+function hasDynamicExternalWorkflow(policy: OnyxEntry<Policy> | SearchPolicy): boolean {


Can we add a unit test for this function in the util test file

@abzokhattab I've just added them

abzokhattab · 2025-10-23T21:12:35Z


    const confirmApproval = () => {
        setRequestType(CONST.IOU.REPORT_ACTION_TYPE.APPROVE);
+        if (hasDynamicExternalWorkflow(policy)) {


I would recommend moving this condition above the setRequestType line... This state update is unnecessary .. what do you think?

You are correct. I will update accordingly

abzokhattab · 2025-10-23T21:28:23Z

+            if (hasDynamicExternalWorkflow(snapshotPolicy)) {
+                onDEWModalOpen?.();
+                return;
+            }
            approveMoneyRequestOnSearch(hash, [item.reportID], transactionID, currentSearchKey);
            return;
        case CONST.SEARCH.ACTION_TYPES.SUBMIT: {
-            submitMoneyRequestOnSearch(hash, [item], [snapshotPolicy], transactionID, currentSearchKey);
+            submitMoneyRequestOnSearch(hash, [item], [snapshotPolicy], transactionID, currentSearchKey, onDEWModalOpen);


Just a small improvement here, i would recommend removing the onDEWModalOpen from the submitMoneyRequestOnSearch function and adding the hasDynamicExternalWorkflow condition here, just like how it's done in the approve ... just to keep it consistent with the approve ... what do you think?

Let's do this in a follow up PR please @lorretheboy

abzokhattab · 2025-10-23T21:32:58Z

Looking at the report (#73348 (comment)), it seems coverage for TransactionGroupListItem decreased by ~19%. Could you please check if we can add unit tests for the new changes to the TransactionGroupListItemTest?

Ideally, when we modify a component that already has tests, we should update or add tests to cover the new behavior

trjExpensify · 2025-10-23T22:02:43Z

How we looking guys? Going to spin up a build.

github-actions · 2025-10-23T22:03:52Z

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

abzokhattab · 2025-10-23T22:04:20Z

Great almost there, i am taking videos and testing now, i added some comments above for improvement

github-actions · 2025-10-23T22:30:51Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #73348.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/73348/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/73348/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/73348/NewExpensify.dmg	https://73348.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

trjExpensify · 2025-10-23T22:39:16Z

Looking good to me on the build!

2025-10-23_23-35-51.mp4

2025-10-23_23-38-09.mp4

abzokhattab · 2025-10-23T22:47:26Z

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

Screen.Recording.2025-10-24.at.00.44.38.mov

Android: mWeb Chrome

Screen.Recording.2025-10-24.at.00.41.20.mov

iOS: HybridApp

Screen.Recording.2025-10-24.at.00.27.02.mov

iOS: mWeb Safari

Screen.Recording.2025-10-24.at.00.29.09.mov

MacOS: Chrome / Safari

Screen.Recording.2025-10-24.at.00.17.59.mov

MacOS: Desktop

Screen.Recording.2025-10-24.at.00.45.30.mov

abzokhattab · 2025-10-23T22:49:00Z

LGTM 🚀 it's working as expected.. i just have some improvement comments above. let us know what you think @lorretheboy

Block submission and approval in New Expensify if DEW is enabled on the workspace (cherry picked from commit e623fea) (cherry-picked to staging by AndrewGable)

OSBotify · 2025-10-24T00:50:35Z

✋ 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-24T01:21:52Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 9.2.37-6 🚀

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

trjExpensify · 2025-10-24T01:25:12Z

QA'd on staging, works fine!

2025-10-24_02-24-02.mp4

OSBotify · 2025-10-24T17:54:25Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.2.37-8 🚀

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

OSBotify · 2025-10-24T18:19:17Z

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

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

OSBotify · 2025-10-27T20:08:41Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.2.38-5 🚀

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

feat: add new OD switcher

04c5fd1

melvin-bot Bot assigned lorretheboy Oct 23, 2025

lorretheboy added 2 commits October 24, 2025 03:16

chore: remove redundant changes

21c2d1d

chore: add i18n

92ee432

lorretheboy commented Oct 23, 2025

View reviewed changes

lorretheboy added 4 commits October 24, 2025 03:50

fix: handle search screens

8ada061

fix: reports and approve screens

96ed48f

fix: update trans

8e8adfe

fix: spell issue

5ca0c8f

lorretheboy commented Oct 23, 2025

View reviewed changes

fix: eslint

3397f6f

lorretheboy marked this pull request as ready for review October 23, 2025 20:47

lorretheboy requested a review from a team as a code owner October 23, 2025 20:47

melvin-bot Bot requested review from abzokhattab and removed request for a team October 23, 2025 20:47

lorretheboy mentioned this pull request Oct 23, 2025

[Due for payment 2025-11-06] [Due for payment 2025-11-03] [CMB] [$250] Block submission and approval in New Expensify if DEW is enabled on the workspace #73338

Closed

abzokhattab reviewed Oct 23, 2025

View reviewed changes

chore: add UT

688773b

abzokhattab reviewed Oct 23, 2025

View reviewed changes

fix: ordering

a1e971c

abzokhattab reviewed Oct 23, 2025

View reviewed changes

abzokhattab approved these changes Oct 23, 2025

View reviewed changes

melvin-bot Bot requested a review from puneetlath October 23, 2025 23:59

AndrewGable approved these changes Oct 24, 2025

View reviewed changes

AndrewGable merged commit e623fea into Expensify:main Oct 24, 2025
30 of 32 checks passed

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

AndrewGable added the InternalQA This pull request required internal QA label Oct 24, 2025

OSBotify mentioned this pull request Oct 24, 2025

Deploy Checklist: New Expensify 2025-10-23 #73307

Closed

88 tasks

OSBotify mentioned this pull request Oct 24, 2025

Deploy Checklist: New Expensify 2025-10-24 #73445

Closed

71 tasks

sosek108 mentioned this pull request Oct 31, 2025

Consolidate ConfirmModal instances into a global component v3 #71169

Merged

52 tasks

Conversation

lorretheboy commented Oct 23, 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!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

lorretheboy Oct 23, 2025 • 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!

melvin-bot Bot commented Oct 23, 2025

Uh oh!

abzokhattab commented Oct 23, 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!

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

Uh oh!

Uh oh!

trjExpensify commented Oct 23, 2025

Uh oh!

github-actions Bot commented Oct 23, 2025

Uh oh!

abzokhattab commented Oct 23, 2025

Uh oh!

github-actions Bot commented Oct 23, 2025

Uh oh!

trjExpensify commented Oct 23, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab commented Oct 23, 2025

Uh oh!

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

trjExpensify commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

lorretheboy commented Oct 23, 2025 •

edited

Loading

codecov Bot commented Oct 23, 2025 •

edited

Loading

lorretheboy Oct 23, 2025 •

edited

Loading

abzokhattab commented Oct 23, 2025 •

edited

Loading

abzokhattab commented Oct 23, 2025 •

edited

Loading