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

Feature: Implement SCA support to transfer owner #49411

Merged
merged 20 commits into from
Sep 30, 2024

Conversation

waterim
Copy link
Contributor

@waterim waterim commented Sep 18, 2024

Details

Feature: Implement SCA support to transfer owner

Fixed Issues

$ #42490
PROPOSAL: N/A

Tests

NOTE: You need to connect to someone local backend to test live mode of the stripe

  1. Fill out payment card form and make sure the currency is GBP.
  2. Click "Accept terms & add payment card"
  3. In the network tab we should see 1 call to AddPaymentCardGBP and a new iframe modal should pop up with Stripe's 3DS verification screen.
  4. Click "complete"
  5. In the network tab there should be 1 call to a new api command called verifySetupIntentAndRequestPolicyOwnerChange, the iframe modal should close, and the right-pane UI should change to the UI that says "Take over annual subscription".
  6. Click "Transfer subscription" button
  7. In the network tab should see 1 new call to RequestWorkspaceOwnerChange and should see success screen that says "Woohoo! All set."
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

None

  • 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 / Chrome
    • iOS / native
    • iOS / 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
    • 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 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

Web
8mb.video.compressor.1.mp4

@waterim waterim marked this pull request as ready for review September 24, 2024 17:51
@waterim waterim requested a review from a team as a code owner September 24, 2024 17:51
@melvin-bot melvin-bot bot requested review from ntdiary and removed request for a team September 24, 2024 17:51
Copy link

melvin-bot bot commented Sep 24, 2024

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

@waterim
Copy link
Contributor Author

waterim commented Sep 24, 2024

@blimpich Opened a PR

@waterim
Copy link
Contributor Author

waterim commented Sep 24, 2024

NOTE:
We know that failure of the GBP card is not working correctly here!

@blimpich blimpich requested review from DylanDylann and removed request for ntdiary September 25, 2024 16:13
@blimpich
Copy link
Contributor

NOTE:
We know that failure of the GBP card is not working correctly here!

@waterim and I have been working on a fix for the scenario where the user fails the SCA authentication. Requires a small backend change which I have a PR out for here. @DylanDylann since you will be testing this PR using my ngrok credentials my backend should already have the necessary fix, so we should be able to make this work for both the success and failure scenario now.

src/libs/actions/Policy/Policy.ts Outdated Show resolved Hide resolved
src/libs/actions/Policy/Policy.ts Outdated Show resolved Hide resolved
@DylanDylann
Copy link
Contributor

DylanDylann commented Sep 26, 2024

Crash App because using window Object on native app (RCA here: #44321 (comment))

Screenshot 2024-09-27 at 01 50 08

@DylanDylann DylanDylann mentioned this pull request Sep 26, 2024
58 tasks
@blimpich
Copy link
Contributor

blimpich commented Sep 26, 2024

Ah, this reminds me, we can't actually add a billing card if this is on native mobile. This is due to legal reasons. If we allow people to add billing cards on mobile then Apple will want to take 30% of our subscription revenue. So @waterim if the user is on mobile and they don't have a billing card they should not have the option to transfer the account.

cc: @trjExpensify to double check me on this

we could maybe make this a new issue, will look into if this is an existing bug with the transfer owner flow or not

@DylanDylann
Copy link
Contributor

From: #44321 (comment)

in the doc it is mentioned that stripe flow won't be allowed in native.

@trjExpensify
Copy link
Contributor

Ah, this reminds me, we can't actually add a billing card if this is on native mobile. This is due to legal reasons. If we allow people to add billing cards on mobile then Apple will want to take 30% of our subscription revenue. So @waterim if the user is on mobile and they don't have a billing card they should not have the option to transfer the account.

cc: @trjExpensify to double check me on this

Yep, correct. Can't put a billing card down on native mobile, so we shouldn't allow it here.

@waterim
Copy link
Contributor Author

waterim commented Sep 27, 2024

@DylanDylann updated

@DylanDylann
Copy link
Contributor

@waterim Type check error

@DylanDylann
Copy link
Contributor

DylanDylann commented Sep 27, 2024

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
Screen.Recording.2024-09-27.at.01.31.11.mov
iOS: Native
Screen.Recording.2024-10-01.at.00.18.41.mov
iOS: mWeb Safari
Screen.Recording.2024-09-27.at.01.24.50.mov
MacOS: Chrome / Safari
Screen.Recording.2024-09-27.at.01.13.17.mov
MacOS: Desktop
Screen.Recording.2024-09-27.at.01.22.49.mov

@waterim
Copy link
Contributor Author

waterim commented Sep 27, 2024

@DylanDylann @blimpich updated everything

@blimpich
Copy link
Contributor

@waterim can you address this discussion thread and also get the eslint/prettier checks passing? Won't be able to merge without those passing.

@waterim
Copy link
Contributor Author

waterim commented Sep 29, 2024

@DylanDylann @blimpich updated everything

@waterim
Copy link
Contributor Author

waterim commented Sep 30, 2024

Merged main and resolved coflicts

@blimpich
Copy link
Contributor

@DylanDylann back to you for review 👍

@DylanDylann
Copy link
Contributor

@blimpich BE bug: The pusher doesn't return the FundList field to subscribers. Even though, if we log in again, the BE also doesn't return FundList. Fundlist field will only be returned to the user who calls VerifySetupIntentAndRequestPolicyOwnerChange API

@melvin-bot melvin-bot bot requested a review from blimpich September 30, 2024 17:35
@blimpich
Copy link
Contributor

@DylanDylann Thank you! I will follow up with you and make a fix so the backend updates that correctly.

@blimpich blimpich merged commit d589746 into Expensify:main Sep 30, 2024
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.

Copy link
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.42-0 🚀

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.

5 participants