Fix bugs connected to changed modal logic by zfurtak · Pull Request #47991 · Expensify/App

zfurtak · 2024-08-26T10:45:42Z

Fixed Issues

Details

This reverts commit 804bd26, reversing changes made to 2026c78.

There were two issues related to this fix: #47896 and #47876. Both issues were observed only on mWeb Safari. The root cause was that opening the image/attachment picker on Safari can't be done from onSelected prop, it needs a check and a call from the onItemSelected() function.

PROPOSAL:
I went back to the previous changes that fix the delete receipt problem but also added an additional check in the PopoverMenu component (&& !Browser.isSafari) which fixes the mWeb problems and since the Modal.close(() => function is specifically required only for iOS, it's not needed in the Safari case.

Tests

Open Expensify App on IOS
Submit an expense -> add a receipt
Click the expense on the chat
Click on the receipt photo
Click ThreeDotsMenu in the upper right corner -> then Delete receipt
Confirm delete modal should appear

Additional issues resolved:
$ #47896

Open Expensify App on iPhone Safari
Create a group chat or select existing one
Click to see details of the chat
Click on the photo -> then Upload photo
Native menu should be shown with : Photo library, Take Photo, Choose File

$ #47876

Open Expensify App on iPhone Safari
Select chosen chat
Click + -> Add attachment
Native menu should be shown with : Photo library, Take Photo or Video, Choose File

Below I uploaded videos to these 3 cases.

Verify that no errors appear in the JS console

Offline tests

same as above

QA Steps

Besides this issue, I changed code in Modal component, it would be great to test modals in different parts of the application.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Deleting receipt:

android-receipt-1.mov

Changing photo of a group chat:

android-photo.mov

Adding attachment to a message:

android-attach.mov

Android: mWeb Chrome

Deleting receipt:

mweb-android-receipt.mov

Changing photo of a group chat:

mweb-photo.mov

Adding attachment to a message:

mweb-android-attach.mov

iOS: Native

Deleting receipt:

ios-receipt-1.mov

Changing photo of a group chat:

ios-photo-1.mov

Adding attachment to a message:

ios-attach-1.mov

iOS: mWeb Safari

Deleting receipt:

mweb-receipt.mov

Changing photo of a group chat:

mweb-photo-1.mov

Adding attachment to a message:

mweb-attach.mov

MacOS: Chrome / Safari

Deleting receipt:

web-receipt.mov

Changing photo of a group chat:

web-photo.mov

Adding attachment to a message:

web-attach.mov

MacOS: Desktop

Deleting receipt:

desktop-receipt.mov

Changing photo of a group chat:

desktop-photo.mov

Adding attachment to a message:

desktop-attach-1.mov

…revert-47341" This reverts commit 804bd26, reversing changes made to 2026c78.

melvin-bot · 2024-08-26T14:42:11Z

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

fedirjh · 2024-08-27T14:45:50Z

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 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. toggleReport and not onIconClick).
- 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 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.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 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.
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: Native

Android: mWeb Chrome

iOS: Native

CleanShot.2024-08-27.at.15.24.48-converted.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-08-28.at.16.49.20.mp4

MacOS: Chrome / Safari

MacOS: Desktop

fedirjh · 2024-08-27T15:39:25Z

@zfurtak Uploading an avatar for a user group fails for me.

Open Expensify App on iPhone Safari
Create a group chat or select an existing one
Click to see details of the chat
Click on the photo → then Upload photo
Native menu should be shown with: Photo library, Take Photo, Choose File
Select the Photo library, then select a photo you want to upload
Verify there is an image crop modal displayed

zfurtak · 2024-08-28T10:06:33Z

@fedirjh should be fixed 😉

fedirjh · 2024-08-28T16:01:27Z

@zfurtak Thanks, it's fixed for avatar picker, but it's still exist in the composer's attachment picker

Open Expensify App on iPhone Safari
Select chosen chat
Click + -> Add attachment
Native menu should be shown with : Photo library, Take Photo or Video, Choose File
Select the Photo library, then select a photo you want to upload
Verify there is an image crop modal displayed

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-08-28.at.16.52.01.mp4

zfurtak · 2024-08-29T09:52:14Z

@fedirjh it was a similar case 😅 Also fixed!

fedirjh

Looks good to me.

arosiclair

Changes LGTM. Are we confident about these changes @zfurtak @fedirjh? Are there any other popover flows we think we should test? We've had a couple reverts now so let's try to get this through this time.

github-actions · 2024-08-30T15:09:00Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/47991/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/47991/NewExpensify.dmg	https://47991.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

zfurtak · 2024-09-01T21:43:46Z

@arosiclair I tested all the cases I spotted, also reviewed the previous issues, however I think it will be good if a QA take their time to look closely into this modal, in case I missed something

arosiclair · 2024-09-02T13:45:01Z

Alright lets merge this and see how it fares in QA

OSBotify · 2024-09-02T14:03:11Z

✋ 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 · 2024-09-02T23:45:02Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.0.28-0 🚀

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

OSBotify · 2024-09-03T23:25:38Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.28-3 🚀

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

zfurtak added 2 commits August 26, 2024 12:42

Revert "Merge pull request Expensify#47882 from Expensify/arosiclair-…

5b18080

…revert-47341" This reverts commit 804bd26, reversing changes made to 2026c78.

Fix mWeb issues

0048918

BrtqKr approved these changes Aug 26, 2024

View reviewed changes

zfurtak marked this pull request as ready for review August 26, 2024 14:42

zfurtak requested a review from a team as a code owner August 26, 2024 14:42

melvin-bot Bot requested review from fedirjh and removed request for a team August 26, 2024 14:42

greg-schroeder mentioned this pull request Aug 27, 2024

[HOLD for payment 2024-09-10] [$250] iOS - Scan - Unable to delete receipt #46852

Closed

6 tasks

zfurtak added 2 commits August 28, 2024 11:34

Fixed updating photo

c8988d7

Removed console logs

8e6c8ac

Fixed attachment picker on mWeb ios

68be6ff

fedirjh approved these changes Aug 29, 2024

View reviewed changes

melvin-bot Bot requested a review from arosiclair August 29, 2024 10:25

arosiclair reviewed Aug 29, 2024

View reviewed changes

mountiny added the Ready To Build label Aug 30, 2024

arosiclair approved these changes Sep 2, 2024

View reviewed changes

arosiclair merged commit 46bd3f7 into Expensify:main Sep 2, 2024

github-actions Bot mentioned this pull request Sep 2, 2024

Deploy Checklist: New Expensify 2024-09-02 #48438

Closed

46 tasks

situchan mentioned this pull request Sep 3, 2024

[HOLD for payment 2024-09-10] [$250] iOS - Composer - Add attachment modal is hidden behind the keyboard #48452

Closed

6 tasks

FitseTLT mentioned this pull request Feb 26, 2025

[Due for payment 2025-03-21] [$250] mWeb - Search type menu gets stuck when changing type #57493

Closed

8 tasks

zfurtak deleted the @zfurtak/fix-modals branch April 4, 2025 13:08

Uh oh!

Conversation

zfurtak commented Aug 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Fixed Issues

Details

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Aug 26, 2024

Uh oh!

fedirjh commented Aug 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh commented Aug 27, 2024

Uh oh!

zfurtak commented Aug 28, 2024

Uh oh!

fedirjh commented Aug 28, 2024

Uh oh!

zfurtak commented Aug 29, 2024

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

arosiclair left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Aug 30, 2024

Uh oh!

zfurtak commented Sep 1, 2024

Uh oh!

arosiclair commented Sep 2, 2024

Uh oh!

OSBotify commented Sep 2, 2024

Uh oh!

OSBotify commented Sep 2, 2024

Uh oh!

OSBotify commented Sep 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

zfurtak commented Aug 26, 2024 •

edited

Loading

fedirjh commented Aug 27, 2024 •

edited

Loading