fix(PopoverMenu): Deleting receipts by zfurtak · Pull Request #47341 · Expensify/App

zfurtak · 2024-08-13T15:18:18Z

Details

Fixed Issues

$ #46852

Tests

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

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

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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 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 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

src/components/PopoverMenu.tsx

BrtqKr · 2024-08-14T10:31:49Z

src/libs/Navigation/AppNavigator/AuthScreens.tsx

-                Modal.close(Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.CHAT_FINDER)));
+                Modal.close(
+                    Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.CHAT_FINDER)),
+                    true,


what was isNavigating meant for?

isNavigating is later passed to closeModals function, however it's true as a default so, it doesn't change anything here

BrtqKr · 2024-08-14T10:32:47Z

src/libs/actions/Modal.ts

        return;
    }
-    if (closeModals.length) {
+    if (closeModals.length && shouldCloseAll) {


Remember to pass it for the QA team to check as we discussed 🙏

war-in · 2024-08-19T11:00:47Z

I'll take it over because @zfurtak is OOO this week. The Fixed issue is #46852 (I can't modify the description 😢)

melvin-bot · 2024-08-19T16:41:21Z

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

fedirjh · 2024-08-20T10:58:14Z

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

fedirjh

Looks good to me and tests well.

arosiclair · 2024-08-20T21:26:50Z

Looks like there's conflicts @war-in

# Conflicts: # src/pages/workspace/accounting/PolicyAccountingPage.tsx

war-in · 2024-08-21T06:38:01Z

@arosiclair Conflicts resolved 🎉

melvin-bot · 2024-08-21T14:36:36Z

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

OSBotify · 2024-08-21T14:53:23Z

✋ 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-08-22T17:28:10Z

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

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

OSBotify · 2024-08-22T19:32:57Z

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

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

…/fix-popoverMenu" This reverts commit 715e167, reversing changes made to c9954ad.

@zfurtak

Revert "Merge pull request #47341 from software-mansion-labs/@zfurtak…

@zfurtak

Revert "Merge pull request #47341 from software-mansion-labs/@zfurtak… (cherry picked from commit 804bd26) (CP triggered by mountiny)

OSBotify · 2024-08-26T22:59:29Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.24-5 🚀

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

OSBotify · 2024-08-26T23:18:27Z

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

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

OSBotify · 2024-08-27T00:08:49Z

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

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

Introduce new fix

0984dbf

zfurtak mentioned this pull request Aug 13, 2024

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

Closed

6 tasks

BrtqKr reviewed Aug 14, 2024

View reviewed changes

Adjusted to review

25d93c7

BrtqKr approved these changes Aug 14, 2024

View reviewed changes

arosiclair assigned war-in Aug 19, 2024

arosiclair marked this pull request as ready for review August 19, 2024 16:40

arosiclair requested a review from a team as a code owner August 19, 2024 16:40

melvin-bot bot requested a review from youssef-lr August 19, 2024 16:41

melvin-bot bot removed the request for review from a team August 19, 2024 16:41

arosiclair requested review from fedirjh and removed request for youssef-lr August 19, 2024 16:42

fedirjh approved these changes Aug 20, 2024

View reviewed changes

melvin-bot bot requested a review from arosiclair August 20, 2024 14:45

arosiclair previously approved these changes Aug 20, 2024

View reviewed changes

war-in added 2 commits August 21, 2024 08:24

Merge branch 'refs/heads/main' into @zfurtak/fix-popoverMenu

5c912ba

# Conflicts: # src/pages/workspace/accounting/PolicyAccountingPage.tsx

fix lint

afeb37e

war-in dismissed arosiclair’s stale review via afeb37e August 21, 2024 06:28

arosiclair approved these changes Aug 21, 2024

View reviewed changes

arosiclair merged commit 715e167 into Expensify:main Aug 21, 2024

github-actions bot mentioned this pull request Aug 22, 2024

Deploy Checklist: New Expensify 2024-08-22 #47873

Closed

50 tasks

arosiclair mentioned this pull request Aug 22, 2024

mWeb/Safari - Chat - Nothing happens when "Add attachment" option is tapped #47876

Closed

6 tasks

arosiclair added a commit that referenced this pull request Aug 22, 2024

Revert "Merge pull request #47341 from software-mansion-labs/@zfurtak…

f3312e1

…/fix-popoverMenu" This reverts commit 715e167, reversing changes made to c9954ad.

ChavdaSachin mentioned this pull request Aug 23, 2024

mWeb/Safari - Group chat - Photo upload options not displayed when tapped on upload photo menu #47896

Closed

6 tasks

arosiclair added a commit that referenced this pull request Aug 23, 2024

Merge pull request #47882 from Expensify/arosiclair-revert-47341

804bd26

Revert "Merge pull request #47341 from software-mansion-labs/@zfurtak…

mountiny mentioned this pull request Aug 23, 2024

[CP Staging] Revert "Merge pull request #47341 from software-mansion-labs/@zfurtak… #47882

Merged

50 tasks

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

Merge pull request #47882 from Expensify/arosiclair-revert-47341

615ef53

Revert "Merge pull request #47341 from software-mansion-labs/@zfurtak… (cherry picked from commit 804bd26) (CP triggered by mountiny)

Nodebrute mentioned this pull request Aug 23, 2024

[$250] iOS - Composer - Add attachment modal is hidden behind the keyboard #47925

Closed

6 tasks

github-actions bot mentioned this pull request Aug 26, 2024

Deploy Checklist: New Expensify 2024-08-26 #48035

Closed

zfurtak deleted the @zfurtak/fix-popoverMenu branch April 4, 2025 13:07

Conversation

zfurtak commented Aug 13, 2024 • edited by arosiclair 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!

Uh oh!

Uh oh!

BrtqKr Aug 14, 2024

Choose a reason for hiding this comment

Uh oh!

zfurtak Aug 14, 2024

Choose a reason for hiding this comment

Uh oh!

BrtqKr Aug 14, 2024

Choose a reason for hiding this comment

Uh oh!

war-in commented Aug 19, 2024

Uh oh!

melvin-bot bot commented Aug 19, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

arosiclair commented Aug 20, 2024

Uh oh!

war-in commented Aug 21, 2024

Uh oh!

melvin-bot bot commented Aug 21, 2024

Uh oh!

OSBotify commented Aug 21, 2024

Uh oh!

OSBotify commented Aug 22, 2024

Uh oh!

OSBotify commented Aug 22, 2024

Uh oh!

OSBotify commented Aug 26, 2024

Uh oh!

OSBotify commented Aug 26, 2024

Uh oh!

OSBotify commented Aug 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

zfurtak commented Aug 13, 2024 •

edited by arosiclair

Loading

fedirjh commented Aug 20, 2024 •

edited

Loading