refactor: Migrate "Add Attachment" flows to AttachmentModalScreen#69523
refactor: Migrate "Add Attachment" flows to AttachmentModalScreen#69523mountiny merged 45 commits intoExpensify:mainfrom
AttachmentModalScreen#69523Conversation
melvin-bot
bot
requested review from
youssef-lr
and removed request for
a team
|
@youssef-lr 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] |
chrispader
force-pushed
the
@chrispader/add-attachment-modal-refactor
branch
from
ed59c75 to
be9b2b9
Compare
chrispader
changed the title
AttachmentModalScreenAttachmentModalScreen
|
I will be reviewing it... First #69524 will go. |
|
Something is wrong with assignment automation. |
|
@parasharrajat this PR is based on #69524 without having it as the base branch yet, just to be clear. |
|
PR doesn’t need product input as it stands. Removing the tag and unsubscribing myself. |
|
@chrispader Please let me know when this PR is ready. |
chrispader
changed the title
AttachmentModalScreenAttachmentModalScreen
|
@parasharrajat this PR should be ready! FYI, i've removed the validation logic from the "Report Attachment" screen ( |
| return unsubscribeEscapeKey; | ||
| }, [onClose]); | ||
|
|
||
| const threeDotsMenuItems = useMemo(() => { |
There was a problem hiding this comment.
This code seems to be missing. I can see a related bug.
Web: wrong menu is shown for expense receipt attachment.
There was a problem hiding this comment.
Ok, it seems that this issue is present on staging too. So all good. But can you please show me where this code is now moved.
There was a problem hiding this comment.
This was only used in the TransactionReceipt AttachmentModal, since we have an if clause here right at the beginning.
At the moment (with this PR) only the Report Attachments and Add report attachments modals use this new AttachmentModalScreen implementation.
| ); | ||
|
|
||
| const threeDotsMenuItems = useMemo( | ||
| () => (typeof threeDotsMenuItemsProp === 'function' ? threeDotsMenuItemsProp({file: fileToDisplay, source, isLocalSource}) : (threeDotsMenuItemsProp ?? [])), |
There was a problem hiding this comment.
You can see a usage of this new threeDotsMenuItems prop implementation here: https://github.com/Expensify/App/pull/65245/files#diff-971882198249314b190232785b42e127828b053109f0e3d4a48e03cfc44984b4R148-R212
There was a problem hiding this comment.
@parasharrajat i simplified this a bit. I will update the usage of this accordingly once i continue working on the Transaction Receipt modal.
Screenshots🔲 iOS / native08.09.2025_18.45.11_REC.mp4🔲 iOS / Safari05.10.2025_20.55.46_REC.mp4🔲 MacOS / Desktop05.10.2025_19.18.50_REC.mp4🔲 MacOS / Chrome05.10.2025_19.13.43_REC.mp4🔲 Android / Chrome05.10.2025_19.56.04_REC.mp4🔲 Android / native05.10.2025_19.46.59_REC.mp4 |
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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.
toggleReportand notonIconClick). - I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - 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 approved by marketing by adding the
Waiting for Copylabel for a copy review on the original GH to get the correct copy. - 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
- 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.
- 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 usingAvatarhave 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.js 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
|
@mountiny just merged |
|
@chrispader @parasharrajat I am really sorry, we did merge the wide RHP PR recently and I think @parasharrajat tested before that, could you please merge main so we can retest the PR with the new RHP for expenses just to make sure the attachment modal will show correctly 🥺 |
@mountiny you mean this one, right? I've just merged main today and re-tested and everything worked on my side: Screen.Recording.2025-10-07.at.15.04.20.mov |
|
I will test this once more after sometime. |
|
Damn conflicts again. |
|
CONFLICTSSSTSTSTSTSTTSTS :tableflip: |
|
We can merge this after conflcts are resolved @chrispader @mountiny |
@parasharrajat @mountiny conflicts resolved! |
mountiny
left a comment
mountiny
left a comment
There was a problem hiding this comment.
thank you, the changes are really large. Lets give this a go but be ready to revert in case of regressions
src/pages/media/AttachmentModalScreen/routes/report/ReportAddAttachmentModalContent.tsx
Show resolved
Hide resolved
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/mountiny in version: 9.2.28-0 🚀
|
|
🚀 Deployed to production by https://github.com/lakchote in version: 9.2.28-5 🚀
|
| <SafeAreaConsumer> | ||
| {({safeAreaPaddingBottomStyle}) => ( | ||
| <Animated.View | ||
| style={safeAreaPaddingBottomStyle} | ||
| entering={FadeIn} | ||
| > |
There was a problem hiding this comment.
SafeAreaConsumer caused an issue where offline text overlapped with button - #77488
9 participants
@mountiny @parasharrajat
Explanation of Change
In #63630 we migrated the
ReportAttachmentsscreen to the newAttachmentModalScreeninstead ofAttachmentModalcomponent. This PR migrates all "Add Attachment" flows to useAttachmentModalScreencomponent. The screen handles the different appearance on web vs. native.This PR also refactors the multi-file upload/send support from
AttachmentComposerModalsupport added in #65316 and integrates it into the new structure for attachment modal screens.Additional changes for multi file upload support are implemented in #68551
Fixed Issues
$ #53493
PROPOSAL:
Tests
AttachmentModal flows:
Go to all "Add attachment" flow that show attachments and and check if
Clipboard pasting (only support for a single file)
Multi-file upload support
Send attachment:
Offline tests
Not needed.
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as in Tests.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen_Recording_20250207_004027_New.Expensify.Dev.mp4
Screen_Recording_20250207_004044_New.Expensify.Dev.mp4
Screen_Recording_20250207_003937_New.Expensify.Dev.mp4
Screen_Recording_20250207_004006_New.Expensify.Dev.2.mp4
Android: mWeb Chrome
iOS: Native
Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-02-06.at.16.32.44.mp4
Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-02-06.at.16.32.30.mp4
Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-02-03.at.11.26.24.mp4
Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-02-06.at.16.32.17.mp4
Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-02-06.at.16.33.13.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2025-02-06.at.16.38.14.mov
Screen.Recording.2025-02-06.at.16.37.58.mov
Screen.Recording.2025-02-06.at.16.37.32.mov
Screen.Recording.2025-02-06.at.16.37.47.mov
Screen.Recording.2025-02-06.at.16.36.50.mov
MacOS: Desktop