Skip to content

[InternalQA] Split screen drop zone#62650

Merged
lakchote merged 38 commits intoExpensify:mainfrom
callstack-internal:feat/59442-split-screen-dropzone
Jun 9, 2025
Merged

[InternalQA] Split screen drop zone#62650
lakchote merged 38 commits intoExpensify:mainfrom
callstack-internal:feat/59442-split-screen-dropzone

Conversation

@koko57
Copy link
Contributor

@koko57 koko57 commented May 23, 2025

Implementation of
Stage 4: Introduce a split-screen Attach/Scan drag-and-drop control
-> Update the drag-and-drop control to have two zones: Attach and Scan
-> Ensure the Attach zone works exactly like it currently does
-> Ensure the Scan zone triggers a single-receipt scan, exactly as if the user had dragged a receipt into Global Create > Create Expense > Scan, with the following special behaviors depending on which room it's in:

Explanation of Change

Fixed Issues

$ #59442
PROPOSAL: -

Tests

PREREQUISITES: all betas / newDotMultiFilesDragAndDrop beta enabled

  1. Go to an Expense Report / Expense Chat / DM / Policy Expense Chat
  2. Drag an image or pdf over the report screen
  3. Verify that 2 dropzones are displayed
  4. Verify that a white border appears when dragging over and the opacity changes
  5. When dropping the file verify that:
    -> for the Attachment zone the Attachment Modal appears
    -> for the Scan Receipt:
    Ensure the Scan zone triggers a single-receipt scan, exactly as if the user had dragged a receipt into Global Create > Create Expense > Scan, with the following special behaviors depending on which room it's in:
  • Workspace chat - Use this workspace, even if not default (ie, like Attach > Create Expense > Scan)
  • Expense report - Attach the scanned expense to this workspace, overriding any auto-reporting logic that might otherwise exist (ie, like Attach > Create Expense > Scan)
  • Expense chat - Replace the current receipt (ie, like Replace > Scan by clicking on the receipt in question and acting upon the overflow menu)
  • DM - Trigger an IOU (ie, just like Attach > Create Expense > Scan)
  1. Verify that the dropzones are stacked vertically for smaller screens and for reports details on Reports Page
  • 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]."

PREREQUISITES: all betas / newDotMultiFilesDragAndDrop beta enabled

  1. Go to an Expense Report / Expense Chat / DM / Policy Expense Chat
  2. Drag an image or pdf over the report screen
  3. Verify that 2 dropzones are displayed
  4. Verify that a white border appears when dragging over and the opacity changes
  5. When dropping the file verify that:
    -> for the Attachment zone the Attachment Modal appears
    -> for the Scan Receipt:
    Ensure the Scan zone triggers a single-receipt scan, exactly as if the user had dragged a receipt into Global Create > Create Expense > Scan, with the following special behaviors depending on which room it's in:
  • Workspace chat - Use this workspace, even if not default (ie, like Attach > Create Expense > Scan)
  • Expense report - Attach the scanned expense to this workspace, overriding any auto-reporting logic that might otherwise exist (ie, like Attach > Create Expense > Scan)
  • Expense chat - Replace the current receipt (ie, like Replace > Scan by clicking on the receipt in question and acting upon the overflow menu)
  • DM - Trigger an IOU (ie, just like Attach > Create Expense > Scan)
  1. Verify that the dropzones are stacked vertically for smaller screens and for reports details on Reports Page
  • 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
    • MacOS: Desktop
  • 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 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2025-05-29.at.12.14.18.mp4
MacOS: Desktop

@koko57 koko57 marked this pull request as ready for review May 23, 2025 14:46
@koko57 koko57 requested review from a team as code owners May 23, 2025 14:46
@melvin-bot melvin-bot bot requested a review from getusha May 23, 2025 14:46
@melvin-bot
Copy link

melvin-bot bot commented May 23, 2025

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

@shawnborton
Copy link
Contributor

That's feeling pretty good! I could see an argument to make the hover styles a bit more distinct, as it's a bit subtle right now? But no strong feelings. cc @Expensify/design for thoughts on that

If we did try something else, I could see trying to make each zone's BG use a lighter opacity to start, and then the hover state would make the opacity darker?

@dannymcclain
Copy link
Contributor

If we did try something else, I could see trying to make each zone's BG use a lighter opacity to start, and then the hover state would make the opacity darker?

I like that idea! We could also add a bit of a transition to the dotted outline showing up instead of it just blasting in. If we wanted to go REAL crazy we could apply a very small scale (like 1.05) to the tex/illustration lock up on hover too. But I think the opacity is a great idea to start.

We could try the static state at .7 opacity and bump it up to .9 on hover?

@dubielzyk-expensify
Copy link
Contributor

Yeah, I'd also love a bit more distinction on background so curious to see how the values Danny suggested would look. Otherwise it's looking pretty great

@koko57
Copy link
Contributor Author

koko57 commented May 26, 2025

ok, I will try to apply these changes

@koko57
Copy link
Contributor Author

koko57 commented May 26, 2025

@shawnborton @dannymcclain @dubielzyk-expensify as I'll be working on a second PR for the Stage 4 - can I make these changes in the second PR?

@shawnborton
Copy link
Contributor

That works for me 👍

@koko57
Copy link
Contributor Author

koko57 commented May 27, 2025

@getusha can we proceed with review?

}
}}
>
<DropZoneUI
Copy link
Contributor

Choose a reason for hiding this comment

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

is this how it's supposed to look?

Screenshot 2025-05-27 at 5 18 27 in the afternoon

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, I will fix it, thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed!

if (isTransactionThreadView && transactionID) {
replaceReceipt({transactionID, file: file as File, source});
} else {
initMoneyRequest(newReportID, undefined, true, undefined, CONST.IOU.REQUEST_TYPE.SCAN);
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
initMoneyRequest(newReportID, undefined, true, undefined, CONST.IOU.REQUEST_TYPE.SCAN);
initMoneyRequest({reportID: newReportID, isFromGlobalCreate: true, newIouRequestType: CONST.IOU.REQUEST_TYPE.SCAN});

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, I did this change in my other PR #62486

const file = e?.dataTransfer?.files[0];
if (file) {
file.uri = URL.createObjectURL(file);
setReceiptAndNavigate(file);
Copy link
Contributor

Choose a reason for hiding this comment

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

We should be navigating to the confirmation page on drop, not participants page.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, but it will be done in the next PR. It seems easy but in fact it wasn't to set a participant correctly and navigate to the confirmation page. I wrote that for now it works like on the SearchPage

onDrop={(event: DragEvent) => {
{!!canUseMultiFilesDragAndDrop && shouldDisplayDualDropZone && (
<DualDropZone
isEditing={isTransactionThreadView}
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if we should show a new copy like "Add a receipt" or "Scan receipts" when there is no receipt attached to the expense.

Screen.Recording.2025-05-27.at.5.48.24.in.the.afternoon.mov

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we don't need a new copy - we have scan request, but I haven't added the condition when no receipt is attached

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed!

@getusha
Copy link
Contributor

getusha commented May 27, 2025

Out of the scope but we should have a system message when we replace a receipt @lakchote

Screen.Recording.2025-05-27.at.5.42.18.in.the.afternoon.mov

@koko57 koko57 mentioned this pull request May 27, 2025
50 tasks
@koko57
Copy link
Contributor Author

koko57 commented May 27, 2025

Out of the scope but we should have a system message when we replace a receipt @lakchote

Screen.Recording.2025-05-27.at.5.42.18.in.the.afternoon.mov

we don't have it in the current version, so I guess it would also require some BE changes

lakchote
lakchote previously approved these changes Jun 5, 2025
Copy link
Contributor

@lakchote lakchote left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for your thorough review @getusha, and thanks for your hard work on this @koko57.

@koko57
Copy link
Contributor Author

koko57 commented Jun 9, 2025

@lakchote do this need another round of review before it's merged?

@lakchote lakchote removed the request for review from Valforte June 9, 2025 14:39
@lakchote
Copy link
Contributor

lakchote commented Jun 9, 2025

@lakchote do this need another round of review before it's merged?

I was waiting for @Valforte to take a look but they seem to be busy, so let's proceed with the merge since I've already reviewed it too as an internal engineer.

@lakchote lakchote merged commit 5f4cfaf into Expensify:main Jun 9, 2025
17 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jun 9, 2025

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 9, 2025

🚀 Deployed to staging by https://github.com/lakchote in version: 9.1.63-0 🚀

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

@nlemma
Copy link

nlemma commented Jun 9, 2025

@koko57 This PR is failing because of #63791

@MonilBhavsar
Copy link
Contributor

This PR seems to have caused #63809
@koko57 @getusha @lakchote could anyone please take a look

@robertjchen
Copy link
Contributor

Potentially related to #63807 as well? 🙏

@github-actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.1.63-6 🚀

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

const shouldStackVertically = shouldUseNarrowLayout || isMediumScreenWidth;

return (
<DragAndDropConsumer>
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming from #69452, we should add the no-op onDrop to clean-up onDrop when switching between single and dual drop zone

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.