[Search] Display ConfirmModal before deleting expenses by WojtekBoman · Pull Request #45143 · Expensify/App

WojtekBoman · 2024-07-10T09:42:49Z

Details

This PR adds a confirmation modal that is shown before deleting expenses on SearchPage.

Fixed Issues

$ #44385 (comment)
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Launch New Expensify.
Open Search Page.
Select expenses on the list that can be deleted.
Click on the dropdown button in the right corner and select the Delete option.
Check if the confirmation modal is displayed.
Click on the delete button and verify that the selected expenses have been deleted and the confirmation modal is closed.

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-07-11.at.16.56.16.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-07-12.at.10.01.47.mov

iOS: mWeb Safari

Screen.Recording.2024-07-11.at.17.03.33.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-12.at.10.07.34.mov

MacOS: Desktop

Screen.Recording.2024-07-11.at.16.33.46.mov

Kicu

Not much to comment, code looks simple. Suggested 1 rename

src/components/Search/SearchPageHeader.tsx

Kicu · 2024-07-10T10:10:56Z

Btw lint is failing

Kicu

Fix name 🙃

src/languages/types.ts

melvin-bot · 2024-07-12T08:53:58Z

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

hayata-suenaga

🟢

hayata-suenaga · 2024-07-15T14:04: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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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-07-15T14:16:52Z

✋ 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-07-15T21:06:59Z

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 9.0.7-3 🚀

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

OSBotify · 2024-07-15T22:15:43Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀

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

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

OSBotify · 2024-07-17T00:23:58Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

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

OSBotify · 2024-07-18T13:52:38Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.8-6 🚀

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

abdulrahuman5196 · 2024-08-14T15:12:30Z

src/components/Search/SearchListWithHeader.tsx

+            <ConfirmModal
+                isVisible={deleteExpensesConfirmModalVisible}
+                onConfirm={handleDeleteExpenses}
+                onCancel={handleOnCancelConfirmModal}


FYI: OnModalHide is not handled here causing this issue - #45447

Display ConfirmModal before deleting expenses

11819fa

Kicu approved these changes Jul 10, 2024

View reviewed changes

src/components/Search/SearchPageHeader.tsx Outdated Show resolved Hide resolved

WojtekBoman added 4 commits July 11, 2024 11:55

Add selectedItemsToDelete to SearchListWithHeader

a0e10cb

Merge branch 'main' into search/bulk-delete-modal

e32fccb

Add shouldCloseModalOnSelect to DropdownOption

e684ada

Add translations for deleting multiple expenses

488e7a1

Kicu reviewed Jul 11, 2024

View reviewed changes

src/languages/types.ts Outdated Show resolved Hide resolved

WojtekBoman changed the title ~~Display ConfirmModal before deleting expenses~~ [Search] Display ConfirmModal before deleting expenses Jul 11, 2024

WojtekBoman added 4 commits July 11, 2024 16:19

Fix TS in SearchPageHeader

acf7bd4

Rename SearchHeaderProps to SearchPageHeaderProps

5df8ba6

Fix displaying delete modal on iOS

4c7775c

Rename DeleteExpenseParams to DeleteExpenseTranslationParams

97a916a

WojtekBoman marked this pull request as ready for review July 12, 2024 08:53

WojtekBoman requested a review from a team as a code owner July 12, 2024 08:53

melvin-bot bot removed the request for review from a team July 12, 2024 08:53

melvin-bot bot requested a review from hayata-suenaga July 12, 2024 08:53

hayata-suenaga approved these changes Jul 15, 2024

View reviewed changes

hayata-suenaga merged commit 20b5192 into Expensify:main Jul 15, 2024

github-actions bot mentioned this pull request Jul 15, 2024

Deploy Checklist: New Expensify 2024-07-15 #45421

Closed

m-natarajan mentioned this pull request Jul 16, 2024

[HOLD for payment 2024-08-14] [$250] Search - Delete modal message changes to ".. these expenses" briefly when clicking Cancel #45447

Closed

6 tasks

abdulrahuman5196 reviewed Aug 14, 2024

View reviewed changes

Conversation

WojtekBoman commented Jul 10, 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!

Kicu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Kicu commented Jul 10, 2024

Uh oh!

Kicu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented Jul 12, 2024

Uh oh!

hayata-suenaga left a comment

Choose a reason for hiding this comment

Uh oh!

hayata-suenaga commented Jul 15, 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 Jul 15, 2024

Uh oh!

OSBotify commented Jul 15, 2024

Uh oh!

OSBotify commented Jul 15, 2024

Uh oh!

OSBotify commented Jul 17, 2024

Uh oh!

OSBotify commented Jul 18, 2024

Uh oh!

abdulrahuman5196 Aug 14, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

WojtekBoman commented Jul 10, 2024 •

edited

Loading

hayata-suenaga commented Jul 15, 2024 •

edited

Loading