Wrap in Modal.close callback to fix IOS by aldo-expensify · Pull Request #46755 · Expensify/App

aldo-expensify · 2024-08-02T23:36:04Z

Details

This PR did some changes on how we call the MenuItem callback and broke the delete confirmation modal: https://github.com/Expensify/App/pull/45762/files#r1702389013

I'm copying the solution from the same PR that was implemented for the workspace confirmation modal:

Fixed Issues

$ #46746
PROPOSAL:

Tests

Launch New Expensify app
Go to workspace chat
Submit a distance expense with three waypoints
Go to transaction thread
Tap Distance
Tap on waypoint
Tap on the three-dot menu
Tap Delete waypoint
Confirm that the confirmation modal to delete the waypoint appears:
Click the red "Delete" button
Confirm that the modal closes and that the waypoint is deleted

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-08-02.at.4.37.05.PM.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-08-02T23:53:26Z

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

aldo-expensify · 2024-08-03T00:40:55Z

Replacing C+ by shubham1206agra since they reviewed the PR that introduced the regression: https://github.com/Expensify/App/pull/45762/files#r1702389013

robertjchen · 2024-08-03T05:42:19Z

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

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

OSBotify · 2024-08-05T13:45:13Z

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

…-modal Wrap in Modal.close callback to fix IOS (cherry picked from commit 04efea2)

OSBotify · 2024-08-05T17:48:29Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.0.16-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

arosiclair · 2024-08-05T18:35:28Z

QA passed ✅

RPReplay_Final1722882819.MP4

OSBotify · 2024-08-06T04:03:37Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.16-8 🚀

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

Wrap in Modal.close callback to fix IOS

16f6c20

aldo-expensify self-assigned this Aug 2, 2024

Lint

ac58c5c

aldo-expensify marked this pull request as ready for review August 2, 2024 23:53

aldo-expensify requested a review from a team as a code owner August 2, 2024 23:53

melvin-bot Bot removed the request for review from a team August 2, 2024 23:53

melvin-bot Bot requested a review from alitoshmatov August 2, 2024 23:53

aldo-expensify mentioned this pull request Aug 2, 2024

[HOLD for payment 2024-08-14] [HOLD for payment 2024-08-13] iOS - Distance - Unable to delete waypoint from 3-dot menu #46746

Closed

1 of 6 tasks

aldo-expensify requested review from shubham1206agra and removed request for alitoshmatov August 3, 2024 00:40

robertjchen approved these changes Aug 3, 2024

View reviewed changes

arosiclair approved these changes Aug 5, 2024

View reviewed changes

arosiclair merged commit 04efea2 into main Aug 5, 2024

arosiclair deleted the aldo_fix-delete-confirmation-modal branch August 5, 2024 13:32

OSBotify pushed a commit that referenced this pull request Aug 5, 2024

Merge pull request #46755 from Expensify/aldo_fix-delete-confirmation…

aca97b3

…-modal Wrap in Modal.close callback to fix IOS (cherry picked from commit 04efea2)

github-actions Bot mentioned this pull request Aug 5, 2024

Deploy Checklist: New Expensify 2024-08-02 #46687

Closed

50 tasks done

Navigation Menu

Repository navigation

Wrap in Modal.close callback to fix IOS - #46755

Wrap in Modal.close callback to fix IOS#46755
arosiclair merged 2 commits into
mainfrom
aldo_fix-delete-confirmation-modal

aldo-expensify commented Aug 2, 2024 •

edited

Loading

Uh oh!

melvin-bot Bot commented Aug 2, 2024

Uh oh!

aldo-expensify commented Aug 3, 2024

Uh oh!

robertjchen commented Aug 3, 2024 •

edited

Loading

Uh oh!

OSBotify commented Aug 5, 2024

Uh oh!

OSBotify commented Aug 5, 2024

Uh oh!

arosiclair commented Aug 5, 2024

Uh oh!

OSBotify commented Aug 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

aldo-expensify commented Aug 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Aug 2, 2024

Uh oh!

aldo-expensify commented Aug 3, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Aug 5, 2024

Uh oh!

OSBotify commented Aug 5, 2024

Uh oh!

arosiclair commented Aug 5, 2024

Uh oh!

OSBotify commented Aug 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

aldo-expensify commented Aug 2, 2024 •

edited

Loading

robertjchen commented Aug 3, 2024 •

edited

Loading