fix: call onModalHide when the confirm modal is closed #18897

akinwale · 2023-05-13T18:14:26Z

Details

Properly clean up the state if there is an attempt to upload an invalid / unsupported attachment.

Fixed Issues

$ #18888
PROPOSAL: #18888 (comment)

Tests

Open an Expensify chat in the browser.
Attempt to upload a non supported file.
Close the error message.
Drag and drop a supported file to the chat.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests.

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 / Chrome
- iOS / native
- iOS / 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 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
  - 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 approved by marketing by adding the Waiting for Copy label 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
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 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

18888-web.mp4

Mobile Web - Chrome

Mobile Web - Safari

Desktop

18888-desktop.mp4

iOS

Android

melvin-bot · 2023-05-13T18:14:31Z

@neil-marcellini @rushatgabhane One of you needs to 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]

youssef-lr · 2023-05-14T01:39:17Z

src/components/AttachmentModal.js

@@ -155,6 +155,9 @@ class AttachmentModal extends PureComponent {
     */
    closeConfirmModal() {
        this.setState({isAttachmentInvalid: false});
+        if (_.isFunction(this.props.onModalHide)) {


I think we should keep this consistent with the similar check above. This prop is also guaranteed to always be passed to the component so I'm not really sure why we have these checks.

Suggested change

if (_.isFunction(this.props.onModalHide)) {

if (this.props.onModalHide) {

youssef-lr · 2023-05-14T01:46:22Z

While we're at it, can we fix the naming of the event handler and prefix it with onAttachmentPreviewClosed, or, my personal preference, place those lines directly in the prop:

onModalHide={() => {
    this.setShouldBlockEmojiCalcToFalse();
    this.setState({isAttachmentPreviewActive: false});
}}

github-actions · 2023-05-14T10:56:57Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

rushatgabhane · 2023-05-14T10:58:14Z

@mountiny why are we CPing ?

rushatgabhane · 2023-05-14T10:58:51Z

oh my bad it's a deploy blocker

parasharrajat · 2023-05-14T11:58:36Z

src/components/AttachmentModal.js

+        if (this.props.onModalHide) {
+            this.props.onModalHide();
+        }


Bad logic... This callback should not be called with confirmModal. This will cause issues in the future. onModalHide is for the main Attachment preview Modal. Let's find another way of fixing this.

Should we expose the onConfirm/onCancel for the ConfirmModal as props to the AttachmentModal? The AttachmentModal is responsible for displaying the ConfirmModal, and it's only ever displayed if the attachment is invalid.

What if we pass a prop called onModalShow to AttachmentModal and call it on the innerModal's onModalShow. Now set the isAttachmentPreviewActive in this callback from ReportActionCompose

@parasharrajat let's discuss this deploy blocker on slack for a quick resolution

https://expensify.slack.com/archives/C01GTK53T8Q/p1684066546167389?thread_ts=1683990789.327809&cid=C01GTK53T8Q

What if we pass a prop called onModalShow to AttachmentModal and call it on the innerModal's onModalShow. Now set the isAttachmentPreviewActive in this callback from ReportActionCompose

This sounds like it could work. I'll test it out.

@rushatgabhane I've implemented @parasharrajat's suggestion and it works great. Pushed up a new commit for review.

…state

rushatgabhane · 2023-05-14T12:54:39Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label 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
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(themeColors.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 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

Web

Screen.Recording.2023-05-14.at.18.23.55.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

Screen.Recording.2023-05-14.at.18.29.51.mov

iOS

Android

parasharrajat

Code LGTM.

parasharrajat · 2023-05-14T13:00:34Z

@rushatgabhane Do you want to complete the Checklist for this regression PR? I don't mind 😄 .

rushatgabhane

@youssef-lr LGTM!

mountiny

Thanks everyone!

fix: call onModalHide when the confirm modal is closed (cherry picked from commit f4ca548)

…-18897 🍒 Cherry pick PR #18897 to staging 🍒

OSBotify · 2023-05-14T14:27:26Z

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

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

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

OSBotify · 2023-05-15T08:23:18Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.13-5 🚀

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

OSBotify · 2023-06-15T01:30:21Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

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

OSBotify · 2023-06-16T18:48:10Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

call onModalHide when the confirm modal is closed

6b8e4bf

akinwale requested a review from a team as a code owner May 13, 2023 18:14

melvin-bot bot requested review from neil-marcellini and rushatgabhane and removed request for a team May 13, 2023 18:14

mountiny assigned akinwale May 13, 2023

mountiny self-requested a review May 13, 2023 19:15

youssef-lr reviewed May 14, 2023

View reviewed changes

cleanup naming

f5453be

akinwale requested a review from youssef-lr May 14, 2023 02:47

mountiny added the CP Staging label May 14, 2023

use anonymous event handler for onModalHide

117f603

parasharrajat reviewed May 14, 2023

View reviewed changes

use AttachmentModal's onModalShow to set the attachmentPreviewActive …

e782a78

…state

parasharrajat approved these changes May 14, 2023

View reviewed changes

rushatgabhane approved these changes May 14, 2023

View reviewed changes

mountiny approved these changes May 14, 2023

View reviewed changes

mountiny merged commit f4ca548 into Expensify:main May 14, 2023

OSBotify pushed a commit that referenced this pull request May 14, 2023

Merge pull request #18897 from akinwale/task-18888

dab66fb

fix: call onModalHide when the confirm modal is closed (cherry picked from commit f4ca548)

OSBotify mentioned this pull request May 14, 2023

🍒 Cherry pick PR #18897 to staging 🍒 #18920

Merged

OSBotify added a commit that referenced this pull request May 14, 2023

Merge pull request #18920 from Expensify/OSBotify-cherry-pick-staging…

9fb9875

…-18897 🍒 Cherry pick PR #18897 to staging 🍒

OSBotify mentioned this pull request May 14, 2023

Deploy Checklist: New Expensify 2023-05-11 #18764

Closed

51 tasks

melvin-bot bot mentioned this pull request May 15, 2023

[HOLD for payment 2023-05-23] [$1000] [HOLD for payment 2023-05-22] Unable to drag and drop an attachment after trying to upload a non-supported attachment. #18888

Closed

6 tasks

OSBotify mentioned this pull request May 15, 2023

Deploy Checklist: New Expensify 2023-05-15 #18938

Closed

67 tasks

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: call onModalHide when the confirm modal is closed #18897

fix: call onModalHide when the confirm modal is closed #18897

akinwale commented May 13, 2023

melvin-bot bot commented May 13, 2023

youssef-lr May 14, 2023

akinwale May 14, 2023

youssef-lr commented May 14, 2023

github-actions bot commented May 14, 2023

rushatgabhane commented May 14, 2023

rushatgabhane commented May 14, 2023

parasharrajat May 14, 2023 •

edited

Loading

akinwale May 14, 2023

parasharrajat May 14, 2023 •

edited

Loading

rushatgabhane May 14, 2023 •

edited

Loading

akinwale May 14, 2023

akinwale May 14, 2023 •

edited

Loading

rushatgabhane commented May 14, 2023 •

edited

Loading

parasharrajat left a comment

parasharrajat commented May 14, 2023

rushatgabhane left a comment

mountiny left a comment

OSBotify commented May 14, 2023

OSBotify commented May 15, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

	if (_.isFunction(this.props.onModalHide)) {
	if (this.props.onModalHide) {

fix: call onModalHide when the confirm modal is closed #18897

fix: call onModalHide when the confirm modal is closed #18897

Conversation

akinwale commented May 13, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 13, 2023

youssef-lr May 14, 2023

Choose a reason for hiding this comment

akinwale May 14, 2023

Choose a reason for hiding this comment

youssef-lr commented May 14, 2023

github-actions bot commented May 14, 2023

rushatgabhane commented May 14, 2023

rushatgabhane commented May 14, 2023

parasharrajat May 14, 2023 • edited Loading

Choose a reason for hiding this comment

akinwale May 14, 2023

Choose a reason for hiding this comment

parasharrajat May 14, 2023 • edited Loading

Choose a reason for hiding this comment

rushatgabhane May 14, 2023 • edited Loading

Choose a reason for hiding this comment

akinwale May 14, 2023

Choose a reason for hiding this comment

akinwale May 14, 2023 • edited Loading

Choose a reason for hiding this comment

rushatgabhane commented May 14, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

parasharrajat left a comment

Choose a reason for hiding this comment

parasharrajat commented May 14, 2023

rushatgabhane left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented May 14, 2023

OSBotify commented May 15, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

parasharrajat May 14, 2023 •

edited

Loading

parasharrajat May 14, 2023 •

edited

Loading

rushatgabhane May 14, 2023 •

edited

Loading

akinwale May 14, 2023 •

edited

Loading

rushatgabhane commented May 14, 2023 •

edited

Loading