Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Popover Fixes #30882

Merged
merged 15 commits into from
Dec 14, 2023
Merged

Popover Fixes #30882

merged 15 commits into from
Dec 14, 2023

Conversation

neonbhai
Copy link
Contributor

@neonbhai neonbhai commented Nov 4, 2023

Details

We now confirm bank account deletion using a center alert modal style popover (this is bottom on mobile).

Fixed Issues

$ #29729
PROPOSAL: #29729 (comment)

Tests

Prerequisite: This feature is under the canUseWallets beta. Return true here to enable beta features.

Prerequisite: A bank account should be added to the user account.

Steps to add a bank Account:

Make sure you are using the staging server (Go to Preferences -> Use Staging Server)

  1. Click on Profile Icon -> Workspaces -> Click on a workspace
  2. Click on Bank Account.
  3. Click on Connect Online With Plaid
  4. Choose Wells Fargo. Use the following credentials:
    - Username: user_good
    - Password: pass_good
    - Mobile Code: credential_good
  5. Select Plaid Saving.
  6. Select both additional information checkboxes. Click Continue.
  7. Accept terms. Click on Connect Account Information
  8. Click on Allow
  9. You come back to connect Account Page. Click Save & Continue

Test Steps:

  1. Click on profile picture -> Wallet
  2. In the bank accounts card, we have a list of bank accounts. Click on a bank account.
  3. Click Delete.
  4. Verify that the confirmation popover shows in the middle for wide screens,
  5. Verify that the confirmation popover is bottom docked in mobile screens
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests Step.

QA Steps

Same as Tests Step.

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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
      • 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 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 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

Android: Native
Screencast.android.mov
Android: mWeb Chrome
mWeb.mov
iOS: Native
ios.mov
iOS: mWeb Safari
safari.mov
MacOS: Chrome / Safari
Web.mov
MacOS: Desktop
desktop.mov

@neonbhai neonbhai requested a review from a team as a code owner November 4, 2023 06:36
@melvin-bot melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team November 4, 2023 06:36
Copy link

melvin-bot bot commented Nov 4, 2023

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

@Santhosh-Sellavel
Copy link
Collaborator

@neonbhai Can you complete the author checklist & fix the lint issue?

@neonbhai
Copy link
Contributor Author

neonbhai commented Nov 6, 2023

@Santhosh-Sellavel on it

@neonbhai
Copy link
Contributor Author

neonbhai commented Nov 7, 2023

Ready for review @Santhosh-Sellavel!

@Santhosh-Sellavel
Copy link
Collaborator

Santhosh-Sellavel commented Nov 14, 2023

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(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 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 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 & iOS: Native Screenshot 2023-11-14 at 10 09 37 PM
Android: mWeb Chrome & iOS: mWeb Safari Screenshot 2023-11-14 at 10 11 17 PM
MacOS: Chrome / Safari Screenshot 2023-11-14 at 10 08 34 PM
MacOS: Desktop Screenshot 2023-11-14 at 10 08 50 PM

@Santhosh-Sellavel
Copy link
Collaborator

Santhosh-Sellavel commented Nov 14, 2023

@neonbhai

🔴 🔴 Bug: Delete operation is not working

Screen.Recording.2023-11-14.at.10.17.23.PM.mov

Copy link
Collaborator

@Santhosh-Sellavel Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix this #30882 (comment)

@neonbhai
Copy link
Contributor Author

working on it!

@Santhosh-Sellavel
Copy link
Collaborator

Any update?

@Santhosh-Sellavel
Copy link
Collaborator

bump @neonbhai

@neonbhai
Copy link
Contributor Author

@Santhosh-Sellavel, updating this quickly

@neonbhai
Copy link
Contributor Author

All test videos updated!

@neonbhai
Copy link
Contributor Author

Working on an improvement for this PR, please wait on the review!

@neonbhai
Copy link
Contributor Author

Still working on this, I have run into a weird behavior

I was working on an improvement for the code, to separate the closing logic for both the modals. Since before they were coupled and two separate states were being handled by a single function.

This works well for all platforms except ios native.

On ios native, this modal even with isVisible prop true does not render.

Screencast:

a56ad237-e523-4939-a173-028124273cce.mp4

I've been spending all my time on this to figure out why this behavior occurs and if is has something to do with handing of modals in ios native

Asking on slack here for help from the community to see anyone has encountered this.

@neonbhai
Copy link
Contributor Author

neonbhai commented Dec 2, 2023

As suggested in Slack, The issue was being caused by the two modals opening successively. The root cause seems to be in https://github.com/react-native-modal/react-native-modal

One way around this, is to use InteractionManager to make sure the first modal closes before we open the other one. But this seems to add a delay to the opening of the confirm modal.

But the delay is noticeable.

To make it snappier, we can use a variable to hide the first modal, and then a function to close both the ConfirmModal and Popover visible states.

Pushing changes for this today.

We use a check to hide the delete menu View when the Confirm Modal is visible.
@Santhosh-Sellavel
Copy link
Collaborator

@neonbhai Will this be ready for review tomorrow?

@neonbhai
Copy link
Contributor Author

neonbhai commented Dec 4, 2023

Yes, just updating tests on android! The build takes ages 🥲

All other platforms tested!

@neonbhai
Copy link
Contributor Author

neonbhai commented Dec 4, 2023

All platforms tested!

@neonbhai
Copy link
Contributor Author

neonbhai commented Dec 4, 2023

Ready for review @Santhosh-Sellavel

@Santhosh-Sellavel
Copy link
Collaborator

Thanks will review it tomorrow, meanwhile please test carefully and ensure there are no regressions. Resolve merge conflicts if any thanks!

This removes the redundant call to hide DefaultDeleteMenu from Confirm Modal's onModalHide prop.
@Santhosh-Sellavel
Copy link
Collaborator

Can you fix lint please?

@neonbhai
Copy link
Contributor Author

neonbhai commented Dec 6, 2023

lint error was in different part of the codebase coming from the updated Typescript Checks. Fixed by merging!

@Santhosh-Sellavel
Copy link
Collaborator

Can we merge this one @jasperhuangg ?

@jasperhuangg jasperhuangg merged commit b950c1e into Expensify:main Dec 14, 2023
15 of 17 checks passed
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 1.4.13-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 1.4.13-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.4.13-8 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants