Skip to content

fix: Scan - Image can be dropped on scan zone in room when there are 2 members which leads to error.#68084

Merged
jasperhuangg merged 15 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/66643
Sep 10, 2025
Merged

fix: Scan - Image can be dropped on scan zone in room when there are 2 members which leads to error.#68084
jasperhuangg merged 15 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/66643

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Aug 7, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #66643
PROPOSAL: #66643 (comment)

Tests

  • Note: Tests are only for Web and Desktop app, mWeb and native app does not support drag and drop
  1. Open FAB > Start chat > Room.
  2. Create a room.
  3. Open room header > Members.
  4. Invite two members to the room.
  5. Close the RHP.
  6. Drag and image over drag and drop area.
  7. Verify only attachment drop area is shown
  8. Go to a group chat
  9. Drag and image over drag and drop area.
  10. Verify only attachment drop area is shown
  11. Go to self report
  12. Drag and drop an image to Scan zone.
  13. Verify scan request confirmation page appears
  14. Confirm scan request is created without any error
  15. Go go policy expense chat
  16. Drag and drop an image to Scan zone.
  17. Verify scan request confirmation page appears
  18. Confirm scan request
  19. Verify scan request confirmation page appears
  • Verify that no errors appear in the JS console

Offline tests

  • Note: Tests are only for Web and Desktop app, mWeb and native app does not support drag and drop
  1. Open FAB > Start chat > Room.
  2. Create a room.
  3. Open room header > Members.
  4. Invite two members to the room.
  5. Close the RHP.
  6. Drag and image over drag and drop area.
  7. Verify only attachment drop area is shown
  8. Go to a group chat
  9. Drag and image over drag and drop area.
  10. Verify only attachment drop area is shown
  11. Go to self report
  12. Drag and drop an image to Scan zone.
  13. Verify scan request confirmation page appears
  14. Confirm scan request is created without any error
  15. Go go policy expense chat
  16. Drag and drop an image to Scan zone.
  17. Verify scan request confirmation page appears
  18. Confirm scan request
  19. Verify scan request confirmation page appears

QA Steps

  • Note: Tests are only for Web and Desktop app, mWeb and native app does not support drag and drop
  1. Open FAB > Start chat > Room.
  2. Create a room.
  3. Open room header > Members.
  4. Invite two members to the room.
  5. Close the RHP.
  6. Drag and image over drag and drop area.
  7. Verify only attachment drop area is shown
  8. Go to a group chat
  9. Drag and image over drag and drop area.
  10. Verify only attachment drop area is shown
  11. Go to self report
  12. Drag and drop an image to Scan zone.
  13. Verify scan request confirmation page appears
  14. Confirm scan request is created without any error
  15. Go go policy expense chat
  16. Drag and drop an image to Scan zone.
  17. Verify scan request confirmation page appears
  18. Confirm scan request
  19. Verify scan request confirmation page appears
  • 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 verified the translation was requested/reviewed 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.js 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.
  • 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.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
Monosnap.screencast.2025-09-06.12-54-44.mp4
MacOS: Desktop
desktop_app.1.mp4

…2 members which leads to error.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323

Copy link
Copy Markdown
Contributor Author

Facing an issue on desktop app, will try to fix it in this PR but it doesn't seem related.

Monosnap.screencast.2025-08-08.18-26-11.mp4

@Krishna2323 Krishna2323 marked this pull request as ready for review August 25, 2025 06:45
@Krishna2323 Krishna2323 requested a review from a team as a code owner August 25, 2025 06:45
@melvin-bot melvin-bot Bot requested review from rushatgabhane and removed request for a team August 25, 2025 06:45
@melvin-bot

melvin-bot Bot commented Aug 25, 2025

Copy link
Copy Markdown

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

@jasperhuangg jasperhuangg removed the request for review from rushatgabhane August 28, 2025 13:53
@jasperhuangg

Copy link
Copy Markdown
Contributor

Reached out here to find a new C+ to take over

@jasperhuangg jasperhuangg requested a review from hoangzinh August 28, 2025 13:58
@hoangzinh

Copy link
Copy Markdown
Contributor

Thank you for spinning up a PR @Krishna2323. Give me some time to read the issue context first.

@hoangzinh

hoangzinh commented Aug 29, 2025

Copy link
Copy Markdown
Contributor

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-08-29.at.20.51.12.android.mov
Android: mWeb Chrome
Screen.Recording.2025-08-29.at.20.44.48.android.chrome.mov
iOS: HybridApp
Screen.Recording.2025-08-29.at.21.02.25.ios.mov
iOS: mWeb Safari
Screen.Recording.2025-08-29.at.21.03.34.mov
MacOS: Chrome / Safari
Screen.Recording.2025-09-10.at.05.18.04.mov
MacOS: Desktop
Screen.Recording.2025-09-10.at.05.20.27.mov

Comment thread src/libs/ReportUtils.ts Outdated
Comment on lines +8973 to +8974
const preferredOrder: IOUType[] = [CONST.IOU.TYPE.TRACK, CONST.IOU.TYPE.SUBMIT, CONST.IOU.TYPE.SPLIT];
return preferredOrder.find((type) => iouOptions.includes(type) && (type !== 'track' || isSelfDM(report)));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
const preferredOrder: IOUType[] = [CONST.IOU.TYPE.TRACK, CONST.IOU.TYPE.SUBMIT, CONST.IOU.TYPE.SPLIT];
return preferredOrder.find((type) => iouOptions.includes(type) && (type !== 'track' || isSelfDM(report)));
if (isSelfDM(report) && iouOptions.includes(CONST.IOU.TYPE.TRACK)) {
return CONST.IOU.TYPE.TRACK;
}
const preferredOrder: IOUType[] = [CONST.IOU.TYPE.SUBMIT, CONST.IOU.TYPE.SPLIT];
return preferredOrder.find((type) => iouOptions.includes(type));

I think it would be simpler. Beside that, can you add a test for this new util?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated and added a util test.


const hasReceipt = useMemo(() => hasReceiptTransactionUtils(transaction), [transaction]);

const scannableOption = getPreferredScannableIOUType(temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs, isReportArchived), report);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
const scannableOption = getPreferredScannableIOUType(temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs, isReportArchived), report);
const scannableIouType = getPreferredScannableIOUType(temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs, isReportArchived), report);

Besides that, should we add useMemo for this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, I think it's a good idea. Updated.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 requested a review from a team as a code owner August 29, 2025 07:58
Comment thread tests/unit/ReportUtilsTest.ts Outdated
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@hoangzinh

Copy link
Copy Markdown
Contributor

@Krishna2323 can you elaborate what are differents between step 6-9 and step 11-14

@hoangzinh

Copy link
Copy Markdown
Contributor

Besides that, can you also add a note that those tests are only for Web/Desktop?

@Krishna2323

Copy link
Copy Markdown
Contributor Author

can you elaborate what are differents between step 6-9 and step 11-14

The steps are same but one is performed in a room chat and the other one in a group chat.

@hoangzinh hoangzinh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks. LGTM

@melvin-bot melvin-bot Bot requested a review from jasperhuangg August 31, 2025 05:53

@trjExpensify trjExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@lakchote @koko57 - tagging ya'll for vis here with regards to drag and drop. Just confirming whether we had creating a split in a groupDM or room in scope?

@koko57

koko57 commented Sep 2, 2025

Copy link
Copy Markdown
Contributor

@lakchote @koko57 - tagging ya'll for vis here with regards to drag and drop. Just confirming whether we had creating a split in a groupDM or room in scope?

no, as far as I remember we blocked the possibility to drop on groupDM or room

@koko57

koko57 commented Sep 2, 2025

Copy link
Copy Markdown
Contributor
Screenshot 2025-09-02 at 13 38 06

two option is Receipt dropzone and Attachment dropzone - in other like group dm or room we only should display Attachment dropzone

@lakchote

lakchote commented Sep 2, 2025

Copy link
Copy Markdown
Contributor

^ @koko57 is correct

@hoangzinh

Copy link
Copy Markdown
Contributor

@Krishna2323 looks like we should disable scan zone in group dm or room

@trjExpensify

Copy link
Copy Markdown
Contributor

@koko57 is correct

Cool, thanks for confirming both!

@Krishna2323 looks like we should disable scan zone in group dm or room

Yes, we should do this.

@Krishna2323

Copy link
Copy Markdown
Contributor Author

I'll update this PR today.

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@hoangzinh updated:

Monosnap.screencast.2025-09-06.12-54-44.mp4

CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
reportID,
),
ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, scannableIouType ?? CONST.IOU.TYPE.SUBMIT, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, reportID),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It seems we don't really need this, do we? If yes, can we revert this code?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reverted

const isSettledOrApproved = isSettled(report) || isSettled(parentReport) || isReportApproved({report}) || isReportApproved({report: parentReport});
return (shouldAddOrReplaceReceipt && !isSettledOrApproved) || !!temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs, isReportArchived).length;
}, [shouldAddOrReplaceReceipt, report, policy, reportParticipantIDs, isReportArchived]);
return ((shouldAddOrReplaceReceipt && !isSettledOrApproved) || !!scannableIouType) && canRequestMoney;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@Krishna2323 do you think it's better if we explicitly exclude group chat and room here? I guess it will be easier to extend the feature later, as canRequestMoney is more complex.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Agree with you, updated the code.

@hoangzinh hoangzinh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@hoangzinh

Copy link
Copy Markdown
Contributor

Please help review this PR again when you have time. cc @trjExpensify @jasperhuangg

@trjExpensify

Copy link
Copy Markdown
Contributor

I'm happy with #68084 (comment) 👍

@jasperhuangg jasperhuangg merged commit 40d51fc into Expensify:main Sep 10, 2025
21 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 9.2.9-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 9.2.11-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.12-4 🚀

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

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.

7 participants