Skip to content

[No QA] refactor: IOURequestStepScan clean-up, phase 3: Consolidate isMobile() and add useDragAndDropSupport#83380

Open
samranahm wants to merge 3 commits intoExpensify:mainfrom
samranahm:79929/IOURequestStepScan-clean-up-p3
Open

[No QA] refactor: IOURequestStepScan clean-up, phase 3: Consolidate isMobile() and add useDragAndDropSupport#83380
samranahm wants to merge 3 commits intoExpensify:mainfrom
samranahm:79929/IOURequestStepScan-clean-up-p3

Conversation

@samranahm
Copy link
Contributor

@samranahm samranahm commented Feb 24, 2026

Explanation of Change

Fixed Issues

$ #79929
PROPOSAL: N/A

Tests

  1. Start create expense flow
  2. Select Scan
  3. Verify on Desktop web there is dotted border with "Upload receipts or drag and drop them here" UI
  4. Open App on mobile and verify there is no dotted border and camera view opens
  • 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

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native Android Native
Android: mWeb Chrome Android mWeb Chrome
iOS: Native IOS Native
iOS: mWeb Safari IOS mWeb safari
MacOS: Chrome / Safari MacOS Chrome

Copilot AI review requested due to automatic review settings February 24, 2026 20:51
@samranahm samranahm requested review from a team as code owners February 24, 2026 20:51
@melvin-bot melvin-bot bot requested a review from bernhardoj February 24, 2026 20:51
@melvin-bot melvin-bot bot requested a review from trjExpensify February 24, 2026 20:51
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

@trjExpensify no product considerations here

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

codecov bot commented Feb 24, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...uestStepScan/useDragAndDropSupport/index.native.ts 0.00% <0.00%> (ø)
.../IOURequestStepScan/useDragAndDropSupport/index.ts 0.00% <0.00%> (ø)
...ages/iou/request/step/IOURequestStepScan/index.tsx 0.00% <0.00%> (ø)
... and 34 files with indirect coverage changes

@trjExpensify trjExpensify removed the request for review from a team February 24, 2026 22:54
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {isSmallScreenWidth} = useResponsiveLayout();
const isMobileWeb = isMobile();
const canUseDragAndDrop = useDragAndDropSupport();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

screenshotQuality={0}
/>
{canUseMultiScan && isMobile() ? (
{canUseMultiScan && isMobileWeb ? (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bernhardoj
Copy link
Contributor

bernhardoj commented Feb 25, 2026

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

image

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

image

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants