Skip to content

[Multi-Scan] Support Multi-Scan in Receipt page#63352

Merged
cristipaval merged 56 commits intoExpensify:mainfrom
callstack-internal:feature/multi-scan-wire-up
Jun 30, 2025
Merged

[Multi-Scan] Support Multi-Scan in Receipt page#63352
cristipaval merged 56 commits intoExpensify:mainfrom
callstack-internal:feature/multi-scan-wire-up

Conversation

@Swor71
Copy link
Contributor

@Swor71 Swor71 commented Jun 3, 2025

Explanation of Change

This PR introduces ReceiptViewModal to display receipts when pressed on from filmstrip in multi select mode. Additionally, it refactors common UI parts for AttachmentCarousel into AttachmentCarouselView

Fixed Issues

$ #61182
DOC: https://docs.google.com/document/d/1ZjSjfIM7N8jhBwyYA4nz3Fe0cvOEXdu-6FA3pethL1Q/edit?tab=t.0#bookmark=id.noo0mxn10b0l
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Pre-step: Turn canUseMultiScan value into true here and here.

Steps:

mWeb/mobile:

  1. Open the app.
  2. Start expense creation flow -> Scan.
  3. Tap on the multi-scan button to turn on this feature.
  4. Take several photos of the receipts.
  5. Press on a photo from the filmstrip
  6. A modal should open with selected photo
  7. Verify you can navigate with swiping and arrows
  8. Verify you can delete the selected photo by pressing on the trash bin icon in the top right corner of the modal (a modal confirmation modal should show up)
  9. After deleting the photo, or pressing on back button, user should be returned to Scan tab in expense creation flow

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
    • 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
480.Screen.Recording.2025-06-04.at.19.18.18.mov
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
480.ScreenRecording_06-04-2025.18-18-47_1.mov
MacOS: Chrome / Safari
MacOS: Desktop

@Swor71 Swor71 marked this pull request as ready for review June 5, 2025 11:14
@Swor71 Swor71 requested a review from a team as a code owner June 5, 2025 11:14
@melvin-bot melvin-bot bot requested review from dukenv0307 and removed request for a team June 5, 2025 11:14
@melvin-bot
Copy link

melvin-bot bot commented Jun 5, 2025

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

@Swor71
Copy link
Contributor Author

Swor71 commented Jun 25, 2025

I've seen a similar behaviour when adding a receipt as an attachment to a report. This is the same attachment view, which we reused as part of the refactor effort in this PR
image

@cristipaval
Copy link
Contributor

@Swor71, this is on the main branch, correct?

@Swor71
Copy link
Contributor Author

Swor71 commented Jun 25, 2025

@Swor71, this is on the main branch, correct?

@cristipaval that is correct, current main

@github-actions
Copy link
Contributor

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/63352/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/63352/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/63352/NewExpensify.dmg https://63352.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@dubielzyk-expensify
Copy link
Contributor

The delete button doesn't work for me in this latest adhoc build.

@Swor71
Copy link
Contributor Author

Swor71 commented Jun 26, 2025

The delete button doesn't work for me in this latest adhoc build.

@dubielzyk-expensify
we've also noticed this when talking with @cristipaval. There were no changes to delete functionality and it also works on Android ad hoc build.

Is there any chance something might've been broken with the ios ad hoc build as it was the case recently?

@Swor71
Copy link
Contributor Author

Swor71 commented Jun 26, 2025

@dubielzyk-expensify @cristipaval
Would you mind running the ad hoc build again? the delete confirmation modal should be fixed now, thanks!

@shawnborton
Copy link
Contributor

On it 🚀

@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/63352/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/63352/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/63352/NewExpensify.dmg https://63352.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@Swor71
Copy link
Contributor Author

Swor71 commented Jun 26, 2025

tested Android ad hoc build and it works as expected, however I do not have the option to test ios ad hoc build due to certificates issue, I'd appreciate it if someone could verify if the issue got fixed 🙏🏻

@cristipaval
Copy link
Contributor

delete button works on my iPhone too 👍

@dubielzyk-expensify
Copy link
Contributor

iOS looks good to me too 👍

@Swor71
Copy link
Contributor Author

Swor71 commented Jun 27, 2025

@cristipaval @dubielzyk-expensify hey, just wanted to ask if we should move forward with merging this PR and opening a follow up ticket about different size photos in the attachment carousel view?

@dubielzyk-expensify
Copy link
Contributor

Yep, that works for me 👍 As long as we follow-up shortly to address them I'm okay with merging

@cristipaval cristipaval merged commit 03e83c3 into Expensify:main Jun 30, 2025
18 checks passed
@OSBotify
Copy link
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.

@IuliiaHerets
Copy link

IuliiaHerets commented Jun 30, 2025

@Swor71 This PR can be tested only on mWeb and Native apps, right?

@github-actions
Copy link
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.1.73-0 🚀

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

@github-actions
Copy link
Contributor

github-actions bot commented Jul 1, 2025

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.73-0 🚀

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

}

InteractionManager.runAfterInteractions(() => {
removeTransactionReceipt(currentReceipt.transactionID);
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 #65252, if users delete the first receipt, we should promote the second one to the main transaction and preserve the common value from the first one

Comment on lines +56 to +61
const activeReceipt = receipts.find((receipt) => receipt.transactionID === route?.params?.transactionID);
const activeReceiptIndex = receipts.findIndex((receipt) => receipt.transactionID === activeReceipt?.transactionID);

setCurrentReceipt(activeReceipt);
setPage(activeReceiptIndex);
}, [receipts, route?.params?.transactionID]);
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 #79304 checklist: The current logic maintains two separate state variables:

  • page: Updated during carousel navigation
  • currentReceipt: Only set once on mount based on route.params.transactionID

When users navigate with arrows, page changes but currentReceipt never updates. The delete handler uses the stale currentReceipt.transactionID so we should get currentReceipt from page index

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.

9 participants