reset the state for the delay context action if it is not the delete action by Pujan92 · Pull Request #12917 · Expensify/App

Pujan92 · 2022-11-22T06:28:55Z

Details

Reset the state for the delay context action if it is not the delete action. delete action modal handles/reset the state by itself.

Fixed Issues

$ 11086
PROPOSAL: 11086

Tests

Open the context menu for any message
Click on copy to clipboard action of popover
On the same opened popover click Delete comment
Delete comment should work and delete the message

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open the context menu for any message
Click on copy to clipboard action of popover
On the same opened popover click Delete comment
Delete comment should work and delete the message

Verify that no errors appear in the JS console

PR Author Checklist

PR Reviewer Checklist

The reviewer will copy/paste it into a new comment and complete it after the author checklist is completed

Screenshots

Web

7a78da9c-72c7-43d6-935d-82a2b5c1361e.webm

Mobile Web - Chrome

chr.mp4

Mobile Web - Safari

Simulator.Screen.Recording.-.iPhone.14.-.2022-12-01.at.01.17.40.mp4

Desktop

7a78da9c-72c7-43d6-935d-82a2b5c1361e.webm

iOS

Simulator.Screen.Recording.-.iPhone.14.-.2022-12-01.at.01.16.28.mp4

Android

android.1.mp4

melvin-bot · 2022-11-22T12:24:35Z

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

Julesssss · 2022-11-22T17:43:04Z

Hi @mananjadhav @deetergp, not sure why I was assigned instead of you here.

mananjadhav · 2022-11-29T11:10:20Z

@Pujan92 I don't follow the change. We're adding a check whether delete modal is visible. Tomorrow if we add another action/modal we'll end up with the complex branching.

I personally liked this proposal here by @0xmiroslav. @deetergp what are your thoughts?

Pujan92 · 2022-11-29T12:10:27Z

I personally liked this proposal here by @0xmiroslav. @deetergp what are your thoughts?

That solution is cleaner but the only concern there is about mutating the state directly which I think we should avoid.

0xmiroslav · 2022-11-29T12:16:37Z

That solution is cleaner but the only concern there is about mutating the state directly which I think we should avoid.

I already provided alternative solution to use setState instead of this.state.xxx=

mananjadhav · 2022-11-29T12:16:59Z

I personally liked this proposal here by @0xmiroslav. @deetergp what are your thoughts?

That solution is cleaner but the only concern there is about mutating the state directly which I think we should avoid.

@Pujan92 one of the earlier comments was mutating the state with this.state = ..., the one I linked uses setState with a callback. Not mutating the state there.

Pujan92 · 2022-11-29T12:27:11Z

Oh, Ok. But I think in that case delete won't work as we are resetting report fields. I just tried that, can you plz check once.
Bcoz for the delete we are hiding the context modal and showing the confirmation modal.

0xmiroslav · 2022-11-29T12:35:25Z

Oh, Ok. But I think in that case delete won't work as we are resetting report fields. I just tried that, can you plz check once.

tests well for me

Pujan92 · 2022-11-29T12:38:54Z

tests well for me

Copy to clipboard and delete working together for you? I just put in your changes but seems not working

ed179627-b711-443f-9d91-b62889ec774d.webm

As per my understanding, your solution will reset the report fields as long as we hide the context menu. but for deletion I think we do not need to reset and for that reason, I might have added an extra condition.

Julesssss · 2022-11-29T14:27:09Z

Bumping @deetergp

0xmiroslav · 2022-11-29T17:36:19Z

@Pujan92 can you elaborate my code changes you applied for test?

deetergp · 2022-11-29T23:02:25Z

I liked @0xmiroslav proposal as well. Once we figure out why it isn't working for @Pujan92 and get it to work, then I'm all for going that route 👍

Pujan92 · 2022-11-30T01:02:41Z

@Pujan92 can you elaborate my code changes you applied for test?

I added it here, please correct me if I added it incorrectly or you can share the working video.

   runAndResetOnPopoverHide() {
        this.setState({reportID: '0', reportAction: {}}, () => {
            this.onPopoverHide = this.runAndResetCallback(this.onPopoverHide);
            this.onPopoverHideActionCallback = this.runAndResetCallback(this.onPopoverHideActionCallback);
        });
    }

0xmiroslav · 2022-11-30T01:04:20Z

@Pujan92 I already guessed you missed this code:

    hideContextMenu(onHideActionCallback) {
        if (_.isFunction(onHideActionCallback)) {
            this.onPopoverHideActionCallback = onHideActionCallback;
        }
        this.setState({
-           reportID: '0',
-           reportAction: {},
            selection: '',
            reportActionDraftMessage: '',
            isPopoverVisible: false,
        });
    }

Pujan92 · 2022-11-30T01:44:06Z

@Pujan92 I already guessed you missed this code:

    hideContextMenu(onHideActionCallback) {
        if (_.isFunction(onHideActionCallback)) {
            this.onPopoverHideActionCallback = onHideActionCallback;
        }
        this.setState({
-           reportID: '0',
-           reportAction: {},
            selection: '',
            reportActionDraftMessage: '',
            isPopoverVisible: false,
        });
    }

Oh, yes. It is working as expected @0xmiroslav 🎉

mananjadhav · 2022-11-30T03:00:10Z

@Pujan92 Can you work on the changes please?

Pujan92 · 2022-11-30T05:38:57Z

@Pujan92 Can you work on the changes please?

Done, applied the suggested change by @0xmiroslav .

mananjadhav · 2022-11-30T18:50:18Z

@Pujan92 Sorry I should've highlighted this. I just started to test this and saw we're on the old theme. We've moved to Dark theme since the time we've merged and had a regression. Can you please take the latest main branch? Also update the PR screencasts to cover the new UI.

…action

Pujan92 · 2022-11-30T18:55:34Z

@Pujan92 Sorry I should've highlighted this. I just started to test this and saw we're on the old theme. We've moved to Dark theme since the time we've merged and had a regression. Can you please take the latest main branch? Also update the PR screencasts to cover the new UI.

Ok. @mananjadhav I updated the screencasts with the latest main branch.

mananjadhav · 2022-12-01T19:14:53Z

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:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- 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 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 was added in all src/languages/* files
- I verified any copy / text that was added to the app is correct English and 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 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web-delete-actions-menu.mov

Mobile Web - Chrome

mweb-chrome-delete-actions-menu.mov

Mobile Web - Safari

mweb-safari-delete-actions-menu.mov

Desktop

desktop-delete-actions-menu.mov

iOS

ios-delete-actions-menu.mov

Android

android-delete-actions-menu.mov

mananjadhav · 2022-12-01T19:16:25Z

Thanks for the updated changes @Pujan92. Appreciate you sticking around and taking this to the finish line.

@deetergp All yours.

I am not sure why @Julesssss is still tagged. I don't have a way to change this. May be @deetergp can help.

🎀 👀 🎀
C+ reviewed

deetergp

LGTM. Thanks for the changes 👍

OSBotify · 2022-12-01T23:18:56Z

✋ 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 · 2022-12-02T19:43:33Z

🚀 Deployed to staging by @deetergp in version: 1.2.36-0 🚀

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

OSBotify · 2022-12-08T02:03:36Z

🚀 Deployed to production by @francoisl in version: 1.2.36-4 🚀

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

Pujan92 marked this pull request as ready for review November 22, 2022 12:24

Pujan92 requested a review from a team as a code owner November 22, 2022 12:24

melvin-bot bot requested review from Julesssss and removed request for a team November 22, 2022 12:24

Julesssss assigned Pujan92 Nov 29, 2022

Pujan92 added 2 commits December 1, 2022 00:23

reset the state for the delay context action if it is not the delete …

b9bb4e6

…action

fix for reset report fields

d3cd179

Pujan92 force-pushed the fix/delete-comment_11086 branch from 374537e to d3cd179 Compare November 30, 2022 18:54

mananjadhav approved these changes Dec 1, 2022

View reviewed changes

deetergp requested review from deetergp and removed request for Julesssss December 1, 2022 22:59

deetergp approved these changes Dec 1, 2022

View reviewed changes

deetergp merged commit e565b12 into Expensify:main Dec 1, 2022

0xmiroslav mentioned this pull request Dec 2, 2022

[HOLD for payment 2022-11-29] [$250] Deleting a comment unresponsive after right click to copy - reported by @gadhiyamanan #11086

Closed

b1tjoy mentioned this pull request Dec 2, 2022

[Hold #12917] [$1000] IOU - copy to clipboard appears before closing the context menu #13004

Closed

OSBotify mentioned this pull request Dec 2, 2022

Deploy Checklist: New Expensify 2022-12-02 #13283

Closed

38 tasks

kbecciv mentioned this pull request Dec 2, 2022

Web - User unable to select Delete button after click on copy to clipboard action of popover #13293

Closed

Conversation

Pujan92 commented Nov 22, 2022 • 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

PR Reviewer Checklist

Screenshots

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

Uh oh!

melvin-bot bot commented Nov 22, 2022

Uh oh!

Julesssss commented Nov 22, 2022

Uh oh!

mananjadhav commented Nov 29, 2022

Uh oh!

Pujan92 commented Nov 29, 2022

Uh oh!

0xmiroslav commented Nov 29, 2022

Uh oh!

mananjadhav commented Nov 29, 2022

Uh oh!

Pujan92 commented Nov 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xmiroslav commented Nov 29, 2022

Uh oh!

Pujan92 commented Nov 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Julesssss commented Nov 29, 2022

Uh oh!

0xmiroslav commented Nov 29, 2022

Uh oh!

deetergp commented Nov 29, 2022

Uh oh!

Pujan92 commented Nov 30, 2022

Uh oh!

0xmiroslav commented Nov 30, 2022

Uh oh!

Pujan92 commented Nov 30, 2022

Uh oh!

mananjadhav commented Nov 30, 2022

Uh oh!

Pujan92 commented Nov 30, 2022

Uh oh!

mananjadhav commented Nov 30, 2022

Uh oh!

Pujan92 commented Nov 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mananjadhav commented Dec 1, 2022

Reviewer Checklist

Screenshots/Videos

Uh oh!

mananjadhav commented Dec 1, 2022

Uh oh!

deetergp left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Dec 1, 2022

Uh oh!

OSBotify commented Dec 2, 2022

Uh oh!

OSBotify commented Dec 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Pujan92 commented Nov 22, 2022 •

edited

Loading

Pujan92 commented Nov 29, 2022 •

edited

Loading

Pujan92 commented Nov 29, 2022 •

edited

Loading

Pujan92 commented Nov 30, 2022 •

edited

Loading