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.

Sign up for GitHub

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

Jump to bottom

fix: Lock workspace settings after Delete #9490

Merged
merged 11 commits into from
Jun 20, 2022
Merged

fix: Lock workspace settings after Delete #9490

merged 11 commits into from
Jun 20, 2022

Conversation

mananjadhav
Copy link
Collaborator

@mananjadhav mananjadhav commented Jun 19, 2022 •
edited
Loading

Details

If the bankAccountId matches the reimbursementAccount then we also delete the data from Onyx.reimbursementAccount.

Fixed Issues

$ #7432

Tests

  1. Tested by adding the reimbursementAccount info in OnyxDB as I didn't have access to the flow
  2. Tested Delete Payment from Payments page and the lock symbol.

The same is also valid for Delete Bank Account from the Payments page.

  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 tagging the marketing team 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
  • 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 */
    • Any functional components have the displayName property
    • 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
  • 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.

PR Reviewer Checklist
  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 tagging the marketing team 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 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 */
    • Any functional components have the displayName property
    • 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.

QA Steps

  1. Launch the app and go to settings
  2. Enable Staging Setting
  3. Go to any Workspace and click Connect bank account
  4. Select Connect by Plaid and add the Bank account (on Dev I couldn't test this piece)
  5. Go to Setting - Payments
  6. Verify the Bank account is displayed
  7. Go to OldDot with the same account
  8. Go to Setting - Account - Payments
  9. Delete the VBA
  10. Go to New Expensify app
  11. Tap on Setting - Workspace
  12. Check each of the Workspace option setting and make sure it locked
  • Verify that no errors appear in the JS console

Screenshots

Web

workspace-delete-web.mov

Mobile Web

workspace-delete-mweb.mov

Desktop

workspace-delete-desktop.mov

iOS

workspace-delete-ios.mov

Android

workspace-delete-android.mov

mananjadhav added 11 commits March 7, 2022 09:29
@mananjadhav
fix: added delete reimbursement code during delete bank account
c960066
@mananjadhav
feat: remove reimbursement account from the list
ee7a1e4
@mananjadhav
fix: Moved the function and lint fixes
30ce3a1
@mananjadhav
fix: fixed imports for bank accounts
e2e1e30
@mananjadhav
Merge branch 'main' of https://github.com/mananjadhav/App into fix/wk…
e345590 
…space-settings-lock-after-delete
@mananjadhav
Merge branch 'main' of https://github.com/mananjadhav/App into fix/wk…
9e1c4a9 
…space-settings-lock-after-delete
@mananjadhav
Merge branch 'main' of https://github.com/mananjadhav/App into fix/wk…
83903bf 
…space-settings-lock-after-delete
@mananjadhav
Merge branch 'main' of https://github.com/mananjadhav/App into fix/wk…
0e75c3b 
…space-settings-lock-after-delete
@mananjadhav
Merge branch 'main' of github.com:mananjadhav/App into fix/wkspace-se…
68c2036 
…ttings-delete-lock

# Conflicts:
#	src/libs/actions/BankAccounts.js
@mananjadhav
style: space lint fix
53f2257
@mananjadhav
doc: added comment for function
70405d1
@mananjadhav mananjadhav mentioned this pull request Jun 19, 2022
Closed
50 tasks
@mananjadhav mananjadhav marked this pull request as ready for review June 19, 2022 19:00
@mananjadhav mananjadhav requested a review from a team as a code owner June 19, 2022 19:00
@melvin-bot melvin-bot bot requested review from pecanoro and removed request for a team June 19, 2022 19:00
@mananjadhav mananjadhav changed the title Fix/wkspace settings delete lock fix: Lock workspace settings after Delete Jun 19, 2022
@mananjadhav mananjadhav mentioned this pull request Jun 19, 2022
Closed
@pecanoro
Copy link
Contributor

@mananjadhav Ready for a review then? 😄

@mananjadhav
Copy link
Collaborator Author

Yeah @pecanoro :D Finally!

@pecanoro pecanoro merged commit e758c88 into Expensify:main Jun 20, 2022
@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 @pecanoro in version: 1.1.78-2 🚀

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

@OSBotify OSBotify mentioned this pull request Jun 21, 2022
Closed
50 tasks
@mvtglobally
Copy link

@mananjadhav we can use Test steps to QA, right?

@kbecciv kbecciv mentioned this pull request Jun 22, 2022
Closed
@mananjadhav
Copy link
Collaborator Author

@mananjadhav we can use Test steps to QA, right?

Yeah. 😨 Thanks for pointing out @mvtglobally. I've moved them to QA steps.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @sketchydroide in version: 1.1.78-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
Reviewers

@pecanoro pecanoro pecanoro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mananjadhav @pecanoro @OSBotify @mvtglobally