refactor: `IOURequestStepScan` clean-up, phase 3: Consolidate isMobile() and add useDragAndDropSupport by samranahm · Pull Request #83380 · Expensify/App

samranahm · 2026-02-24T20:51:47Z

Explanation of Change

Fixed Issues

$ #79929
PROPOSAL: N/A

Tests

Start the create expense flow.
Select scan.
On desktop web, verify that a dotted border appears with the text:
"Upload receipts or drag and drop them here".
Open the app on mobile and verify that:
- The dotted border is not shown.
- The camera view opens directly.
Open the image picker, choose a receipt, and complete the create expense flow.
Press FAB > Create expense and enable multi scan.
Capture pictures of multiple receipts and complete the flow.
Verify that expenses are created for all scanned receipts.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test

// 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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Copilot

Pull request overview

Refactors IOURequestStepScan to centralize mobile/desktop behavior checks and introduce a platform-specific useDragAndDropSupport helper for drag-and-drop availability.

Changes:

Added useDragAndDropSupport with web + native implementations.
Replaced repeated isMobile() calls with a cached boolean in IOURequestStepScan.
Updated layout logic to use the new drag-and-drop capability flag in places where desktop-only styling is applied.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File	Description
src/pages/iou/request/step/IOURequestStepScan/useDragAndDropSupport/index.ts	Adds web implementation for drag-and-drop support detection.
src/pages/iou/request/step/IOURequestStepScan/useDragAndDropSupport/index.native.ts	Adds native implementation (always false) for drag-and-drop support detection.
src/pages/iou/request/step/IOURequestStepScan/index.tsx	Uses `useDragAndDropSupport()` and consolidates `isMobile()` calls to drive UI/layout decisions.

Comments suppressed due to low confidence (4)

src/pages/iou/request/step/IOURequestStepScan/index.tsx:600

styles.chooseFilesView(!canUseDragAndDrop) ties the choose-files padding variant to drag-and-drop capability rather than layout width. Since canUseDragAndDrop is a feature flag (desktop web) and not a responsive breakpoint, this changes behavior from the prior isSmallScreenWidth-based styling and can cause incorrect padding calculations. Consider restoring the responsive boolean (e.g., via useResponsiveLayout() / shouldUseNarrowLayout) for the chooseFilesView(...) argument, and keep canUseDragAndDrop only for gating drag-and-drop-specific UI.

    const chooseFilesPaddingVertical = Number(styles.chooseFilesView(!canUseDragAndDrop).paddingVertical);

src/pages/iou/request/step/IOURequestStepScan/index.tsx:662

This condition/argument combination is self-contradictory: when canUseDragAndDrop is true, !canUseDragAndDrop is always false, so this will always apply styles.chooseFilesView(false) and never the other variant. If the intent is to select a narrow vs wide layout, pass the responsive boolean (as before) into chooseFilesView(...) instead of !canUseDragAndDrop.

                    style={[styles.flex1, canUseDragAndDrop && styles.chooseFilesView(!canUseDragAndDrop)]}

src/pages/iou/request/step/IOURequestStepScan/index.tsx:65

isMobileWeb is derived from isMobile() but the comment states it's intended to cover both mobile web and native apps. Either rename the variable to reflect the broader meaning (if isMobile() is cross-platform), or update the comment/logic so the name and behavior match (e.g., keep isMobileWeb only for web and use a separate native/mobile flag where needed).

    const isMobileWeb = isMobile();

src/pages/iou/request/step/IOURequestStepScan/index.tsx:601

isMobileWeb is derived from isMobile() but the comment states it's intended to cover both mobile web and native apps. Either rename the variable to reflect the broader meaning (if isMobile() is cross-platform), or update the comment/logic so the name and behavior match (e.g., keep isMobileWeb only for web and use a separate native/mobile flag where needed).

    // We use isMobileWeb here to explicitly hide the alternative methods component on both mobile web and native apps
    const chooseFilesPaddingVertical = Number(styles.chooseFilesView(!canUseDragAndDrop).paddingVertical);
    const shouldHideAlternativeMethods = isMobileWeb || alternativeMethodsHeight + desktopUploadViewHeight + chooseFilesPaddingVertical * 2 > containerHeight;

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

roryabraham · 2026-02-24T21:19:33Z

@trjExpensify no product considerations here

codecov · 2026-02-24T22:44:22Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../step/IOURequestStepOdometerImage/index.native.tsx	`0.00% <ø> (ø)`
...request/step/IOURequestStepOdometerImage/index.tsx	`0.00% <ø> (ø)`
...epScan/components/NavigationAwareCamera/Camera.tsx	`0.00% <ø> (ø)`
...can/components/NavigationAwareCamera/WebCamera.tsx	`0.00% <ø> (ø)`
...eceiptPreviews/SubmitButtonShadow/index.native.tsx	`100.00% <ø> (ø)`
...nents/ReceiptPreviews/SubmitButtonShadow/index.tsx	`0.00% <ø> (ø)`
...questStepScan/components/ReceiptPreviews/index.tsx	`93.54% <ø> (ø)`
...p/IOURequestStepScan/hooks/useMobileReceiptScan.ts	`100.00% <100.00%> (ø)`
...st/step/IOURequestStepScan/hooks/useReceiptScan.ts	`91.66% <ø> (ø)`
...u/request/step/IOURequestStepScan/index.native.tsx	`40.50% <100.00%> (+0.25%)`	⬆️
... and 4 more
... and 10 files with indirect coverage changes

bernhardoj · 2026-02-25T04:36:59Z

src/pages/iou/request/step/IOURequestStepScan/index.tsx

-    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
-    const {isSmallScreenWidth} = useResponsiveLayout();
+    const isMobileWeb = isMobile();
+    const canUseDragAndDrop = useDragAndDropSupport();


Hmm, since this hook doesn't use any React APIs or trigger re-renders, it might be better implemented as a utility function rather than a hook.

Also, since we use this on index.tsx file only, we can just simply use isMobileWeb here.

const canUseDragAndDrop = !isMobileWeb;

cc: @roryabraham

If we refactor this further as I commented here, then we probably can just remove this.

I agree, we don't really need a hook here.

sounds good

bernhardoj · 2026-02-25T04:52:17Z

src/pages/iou/request/step/IOURequestStepScan/index.tsx

                            screenshotQuality={0}
                        />
-                        {canUseMultiScan && isMobile() ? (
+                        {canUseMultiScan && isMobileWeb ? (


We can remove isMobileWeb condition from mobileCameraView since we only shows mobileCameraView if isMobileWeb is true.

bernhardoj · 2026-02-25T04:58:41Z

Btw, I think we should refactor this further, so that it looks like what the AI suggested here

We need to isolate the code that belongs to either the mobile or the desktop view. For example, for mobile view, we don't need the drag and drop support, and for desktop, we don't need the camera code and screenshot.

The Phase 5 recommended splitting it into 2 files

but I think we can just create both mobile and desktop components in the IOURequestStepScan/index.ts file.

samranahm · 2026-02-26T16:24:08Z

but I think we can just create both mobile and desktop components in the IOURequestStepScan/index.ts file.

yes this work but I think having separate component for MobileCameraView and DesktopUploadView is more align with architecture, instead of having the both components in IOURequestStepScan/index.ts. @bernhardoj WDYT

…sMobileWeb true

bernhardoj · 2026-02-27T03:29:23Z

@samranahm I think since it's a web component only, it's better to put it in IOURequestStepScan/index.ts, so it won't be exported because we only use it once in IOURequestStepScan/index.ts file. (basically to isolate both components in the non-native file)

I think if we have the MobileCameraView file, it can confuse people because Mobile relates to native, yet we don't use it in the native file.

roryabraham · 2026-02-27T05:00:18Z

I don't feel strongly, but this is one case where I think the code could be made cleaner/clearer if we subdivide IOURequestStepScan/index.ts into MobileWebCameraView and DesktopWebUploadView, since the components are so different (it's rare that mWeb has such a different experience than desktop web beyond just layout). I think that's a bit more true to our composition-over-configuration philosophy.

roryabraham · 2026-02-27T05:00:43Z

Though I agree MobileWebCameraView is clearer than MobileCameraView

bernhardoj · 2026-02-27T07:39:35Z

Though I agree MobileWebCameraView is clearer than MobileCameraView

Okay, let's separate it into 2 files, but name the mobile web one MobileWebCameraView.

…pScan-clean-up-p3

…DesktopWebUploadView

samranahm · 2026-03-02T00:23:42Z

@codex review.

bernhardoj · 2026-03-10T05:09:33Z

src/pages/iou/request/step/IOURequestStepScan/index.tsx

-                <ReceiptPreviews
+            {isMobileWeb ? (
+                <MobileWebCameraView
+                    receiptScan={receiptScan}


I don't really like the way we pass everything from useReceiptScan hook to the component here. Can we pass the individual prop that we needed? Don't include the one that we don't need.

…dView

…pScan-clean-up-p3

samranahm · 2026-03-10T20:03:56Z

@bernhardoj Please take a look.

roryabraham · 2026-03-10T21:16:35Z

@samranahm you’ve got conflicts

…pScan-clean-up-p3 # Conflicts: # src/pages/iou/request/step/IOURequestStepScan/index.native.tsx # src/pages/iou/request/step/IOURequestStepScan/index.tsx

bernhardoj · 2026-03-11T04:39:54Z

@samranahm I did some tidying up and updating the test. You can apply the patch here.

a.patch

I'm testing now the app...

bernhardoj · 2026-03-11T04:55:34Z

The drag and drop area is stuck.

dnd.stuck.mp4

Other platforms work fine so far.

NOTE: I can't test adding the receipt image in iOS because of this issue

Screenshots/Videos

Android: HybridApp

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: HybridApp

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

bernhardoj · 2026-03-11T05:30:40Z

The drag and drop area is stuck.

Oh, this actually happens on main too. I think we should create a new issue for this, or maybe add a phase 7 to fix it.

cc: @roryabraham

bernhardoj · 2026-03-11T05:31:53Z

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

Android: mWeb Chrome

android.mweb.mp4

iOS: HybridApp

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

samranahm · 2026-03-11T18:30:34Z

Resolving merge conflicts.

…pScan-clean-up-p3

roryabraham · 2026-03-12T03:31:27Z

The drag and drop area is stuck.

Oh, this actually happens on main too. I think we should create a new issue for this, or maybe add a phase 7 to fix it.

@bernhardoj up to you. I trust you to decide whichever you think most appropriate. Go ahead and create a new issue if you want

bernhardoj · 2026-03-12T13:41:52Z

I reported it in Slack.

@samranahm another conflict 😬

samranahm · 2026-03-12T15:09:45Z

I reported it in Slack.

@samranahm another conflict 😬

No problem 😄 Happy to resolve it.

…pScan-clean-up-p3

bernhardoj · 2026-03-12T15:39:22Z

The test is unrelated. It's a flaky one.

samranahm · 2026-03-12T17:16:50Z

@roryabraham All yours.

samranahm added 2 commits February 25, 2026 01:44

Add useDragAndDropSupport hook for native and web environment

63f573d

Refactor IOURequestStepScan to use isMobileWeb and canUseDragAndDrop

6b6563c

Copilot AI review requested due to automatic review settings February 24, 2026 20:51

samranahm requested review from a team as code owners February 24, 2026 20:51

melvin-bot bot requested a review from bernhardoj February 24, 2026 20:51

melvin-bot bot assigned samranahm Feb 24, 2026

melvin-bot bot requested a review from trjExpensify February 24, 2026 20:51

Copilot AI reviewed Feb 24, 2026

View reviewed changes

fix prettier

0490ef1

samranahm mentioned this pull request Feb 24, 2026

[Waiting on #83380] [Due for payment 2026-03-04] [$250] Clean up IOURequestStepScan #79929

Open

roryabraham requested review from roryabraham and removed request for trjExpensify February 24, 2026 21:19

trjExpensify removed the request for review from a team February 24, 2026 22:54

bernhardoj reviewed Feb 25, 2026

View reviewed changes

samranahm added 2 commits February 26, 2026 21:54

remove useDragAndDropSupport hook

ffcdcf5

remove isMobileWeb from mobileCameraView since we only show this if i…

711c503

…sMobileWeb true

samranahm added 3 commits March 2, 2026 03:48

Merge remote-tracking branch 'upstream/main' into 79929/IOURequestSte…

e07e6d5

…pScan-clean-up-p3

Add DesktopWebUploadView and MobileWebCameraView components

3866b79

Refactor IOURequestStepScan component to use MobileWebCameraView and …

e3c6c50

…DesktopWebUploadView

bernhardoj reviewed Mar 10, 2026

View reviewed changes

samranahm added 7 commits March 10, 2026 22:58

Add isDraggingOverWrapper from useDragAndDropState in DesktopWebUploa…

839ffad

…dView

add UseMobileReceiptScanParams type

c7cdc51

Move LocationPermissionFlowSelector to Selectors

c29310e

reafactor the hooks to pass required params only

36d8ac9

updated test to remove createMockReceiptScan mock

cd58af9

lint

6c8a190

Merge remote-tracking branch 'upstream/main' into 79929/IOURequestSte…

8b126c2

…pScan-clean-up-p3

Merge remote-tracking branch 'upstream/main' into 79929/IOURequestSte…

bef83fd

…pScan-clean-up-p3 # Conflicts: # src/pages/iou/request/step/IOURequestStepScan/index.native.tsx # src/pages/iou/request/step/IOURequestStepScan/index.tsx

samranahm added 2 commits March 11, 2026 23:46

Merge remote-tracking branch 'upstream/main' into 79929/IOURequestSte…

f1e0dc2

…pScan-clean-up-p3

Refactor IOURequestStepScan components and hooks for clarity

feabace

This comment was marked as outdated.

Sign in to view

Merge branch 'Expensify:main' into 79929/IOURequestStepScan-clean-up-p3

9f39222

samranahm changed the title ~~[No QA] refactor: IOURequestStepScan clean-up, phase 3: Consolidate isMobile() and add useDragAndDropSupport~~ refactor: IOURequestStepScan clean-up, phase 3: Consolidate isMobile() and add useDragAndDropSupport Mar 12, 2026

This comment was marked as resolved.

Sign in to view

Merge remote-tracking branch 'upstream/main' into 79929/IOURequestSte…

c8be9a4

…pScan-clean-up-p3

bernhardoj approved these changes Mar 12, 2026

View reviewed changes

Conversation

samranahm commented Feb 24, 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!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

roryabraham commented Feb 24, 2026

Uh oh!

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

bernhardoj Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

bernhardoj Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

samranahm Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

roryabraham Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

bernhardoj Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

samranahm commented Feb 26, 2026

Uh oh!

bernhardoj commented Feb 27, 2026

Uh oh!

roryabraham commented Feb 27, 2026

Uh oh!

roryabraham commented Feb 27, 2026

Uh oh!

bernhardoj commented Feb 27, 2026

Uh oh!

samranahm commented Mar 2, 2026

Uh oh!

bernhardoj Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

samranahm commented Mar 10, 2026

Uh oh!

roryabraham commented Mar 10, 2026

Uh oh!

bernhardoj commented Mar 11, 2026

Uh oh!

bernhardoj commented Mar 11, 2026

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

bernhardoj commented Mar 11, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

samranahm commented Mar 11, 2026

Uh oh!

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as resolved.

roryabraham commented Mar 12, 2026

Uh oh!

bernhardoj commented Mar 12, 2026

Uh oh!

samranahm commented Feb 24, 2026 •

edited

Loading

codecov bot commented Feb 24, 2026 •

edited by github-actions bot

Loading

bernhardoj commented Feb 25, 2026 •

edited

Loading

bernhardoj commented Mar 11, 2026 •

edited

Loading