Refactor/36648 wallet enablement flow terms #40567

koko57 · 2024-04-19T13:29:23Z

Details

Fees and Terms step only UI

Fixed Issues

$ #36648
PROPOSAL:

Tests

Go to settings/wallet page
Web / mWeb: Type in '/enable-payments-temporary-terms' after the URL address Mobile: run npx uri-scheme open new-expensify://settings/wallet/enable-payments-temporary-terms --android or npx uri-scheme open new-expensify://settings/wallet/enable-payments-temporary-terms --ios (on desktop it won't work)
If you're on a real device try typing new-expensify://settings/wallet/enable-payments-temporary-terms in the chrome/safari searchbar - it should open the installed app.
Verify that the Fees step and table are displayed correctly.
Go to the terms step
Do not check any checkbox - click enable payments - an error should appear.
Verify that you're able to check a checkbox.
Clicking Enable payments should close the view for now.

Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

Go to settings/wallet page
Web / mWeb: Type in '/enable-payments-temporary-terms' after the URL address Mobile: run npx uri-scheme open new-expensify://settings/wallet/enable-payments-temporary-terms --android or npx uri-scheme open new-expensify://settings/wallet/enable-payments-temporary-terms --ios (on desktop it won't work).
If you're on a real device try typing new-expensify://settings/wallet/enable-payments-temporary-terms in the chrome/safari searchbar - it should open the installed app.
Verify that the Fees step and table are displayed correctly.
Go to the terms step
Do not check any checkbox - click enable payments - an error should appear.
Verify that you're able to check a checkbox.
Clicking Enable payments should close the view for now.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-04-24.at.15.32.28.mov

MacOS: Desktop

n/a

melvin-bot · 2024-04-24T14:03:53Z

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

shawnborton · 2024-04-24T14:32:59Z

Screenshots look pretty good to me, thanks Agata!

Pujan92 · 2024-04-30T06:26:42Z

@koko57 Needs to resolve conflicts.

Pujan92

Minor style changes

Pujan92 · 2024-04-30T06:33:35Z

src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx

+                message={errorMessage}
+                isAlertVisible={error || Boolean(errorMessage)}
+                isLoading={!!walletTerms?.isLoading}
+                containerStyles={[styles.mh0, styles.mv4]}


Suggested change

containerStyles={[styles.mh0, styles.mv4]}

containerStyles={[styles.mh0, styles.mv5]}

Let's make the margin consistent

Pujan92 · 2024-04-30T06:43:39Z

src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx

@@ -32,7 +32,7 @@ function ShortTermsForm(props: ShortTermsFormProps) {
                <View style={[styles.shortTermsRow, styles.mb4]}>
                    <View style={[styles.flex2]}>
                        <View style={[styles.flexRow, styles.mb1]}>
-                            <Text style={styles.textLarge}>{translate('termsStep.monthlyFee')}</Text>
+                            <Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.monthlyFee')}</Text>


Suggested change

<Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.monthlyFee')}</Text>

<Text style={[styles.mutedNormalTextLabel]}>{translate('termsStep.monthlyFee')}</Text>

Pujan92 · 2024-04-30T06:43:54Z

src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx

@@ -41,7 +41,7 @@ function ShortTermsForm(props: ShortTermsFormProps) {
                    <View style={[styles.flex2]}>
                        <View style={[styles.flex2]}>
                            <View style={[styles.flexRow, styles.mb1]}>
-                                <Text style={styles.textLarge}>{translate('termsStep.shortTermsForm.perPurchase')}</Text>
+                                <Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.shortTermsForm.perPurchase')}</Text>


Suggested change

<Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.shortTermsForm.perPurchase')}</Text>

<Text style={[styles.mutedNormalTextLabel]}>{translate('termsStep.shortTermsForm.perPurchase')}</Text>

Pujan92 · 2024-04-30T06:44:14Z

src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx

                        <View style={[styles.flexRow, styles.mb1]}>
-                            <Text style={styles.textLarge}>{translate('termsStep.shortTermsForm.atmWithdrawal')}</Text>
+                            <Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.shortTermsForm.atmWithdrawal')}</Text>


Suggested change

<Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.shortTermsForm.atmWithdrawal')}</Text>

<Text style={[styles.mutedNormalTextLabel]}>{translate('termsStep.shortTermsForm.atmWithdrawal')}</Text>

Pujan92 · 2024-04-30T06:45:02Z

src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx

                        </View>
                    </View>
                    <View style={[styles.flex2]}>
                        <View style={[styles.flex2]}>
                            <View style={[styles.flexRow, styles.mb1]}>
-                                <Text style={styles.textLarge}>{translate('termsStep.shortTermsForm.cashReload')}</Text>
+                                <Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.shortTermsForm.cashReload')}</Text>


Suggested change

<Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.shortTermsForm.cashReload')}</Text>

<Text style={[styles.mutedNormalTextLabel]}>{translate('termsStep.shortTermsForm.cashReload')}</Text>

Pujan92 · 2024-04-30T07:07:52Z

src/styles/index.ts

@@ -3349,6 +3349,7 @@ const styles = (theme: ThemeColors) =>
        shortTermsBorder: {
            borderWidth: 1,
            borderColor: theme.border,
+            borderRadius: 5,


Suggested change

borderRadius: 5,

borderRadius: variables.componentBorderRadius,

Pujan92 · 2024-05-01T14:30:45Z

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

oop1.webm

Android: mWeb Chrome

oop2.webm

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-01.at.19.49.44.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-01.at.19.58.00.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-05-01.at.19.46.58.mov

MacOS: Desktop

Screen.Recording.2024-05-01.at.20.00.05.mov

Pujan92

LGTM!

mountiny · 2024-05-10T23:25:57Z

Thanks for keeping it in sync, we will be able to merge it now after release1 being done i will check it out soon

Sorry was ooo previous week

mountiny

Thank you @koko57 for patience

OSBotify · 2024-05-13T13:07:57Z

✋ 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-05-15T10:12:38Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.74-0 🚀

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

kavimuru · 2024-05-15T10:32:53Z

@koko57 Our QA team can't run in the native apps. Are there alternative steps for apps?

Mobile: run npx uri-scheme open new-expensify://settings/wallet/enable-payments-temporary-terms --android or npx uri-scheme open new-expensify://settings/wallet/enable-payments-temporary-terms --ios

koko57 · 2024-05-15T11:07:23Z

@kavimuru try the same as the previous PR: #40357 (comment) but with proper path: new-expensify://settings/wallet/enable-payments-temporary-terms. I'll update the test steps shortly

OSBotify · 2024-05-22T23:57:39Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.4.74-6 🚀

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

koko57 added 6 commits April 17, 2024 22:50

feat: setup Terms and Fees step

ed168c1

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

804917f

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

448d358

feat: rename terms and feex, fix styling, create temporary test route

0999bf7

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

9ec31be

fix: redirect to wallet settings when going back or ending the flow

52ea9dd

mountiny assigned koko57 Apr 20, 2024

koko57 added 2 commits April 24, 2024 15:27

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

caeaaae

fix: fix lint

dac9dc8

koko57 marked this pull request as ready for review April 24, 2024 14:03

koko57 requested review from a team as code owners April 24, 2024 14:03

melvin-bot bot requested review from Pujan92 and removed request for a team April 24, 2024 14:03

Pujan92 suggested changes Apr 30, 2024

View reviewed changes

koko57 added 2 commits April 30, 2024 19:23

fix: resolve conflicts

4d70ba3

fix: apply requested changes

dae4561

Pujan92 approved these changes May 1, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny May 1, 2024 14:31

koko57 added 3 commits May 6, 2024 16:12

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

206d6d6

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

98a8b7a

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

d5ecde9

Merge branch 'main' into refactor/36648-wallet-enablement-flow-terms

267ef3c

mountiny approved these changes May 13, 2024

View reviewed changes

mountiny merged commit 1e5c18c into Expensify:main May 13, 2024
15 checks passed

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

Deploy Checklist: New Expensify 2024-05-15 #42185

Closed

mountiny mentioned this pull request Jul 22, 2024

[HOLD for payment 2024-07-23] [CRITICAL] [P2P] Refactor the wallet enablement flow to be step by step and conform with our new design system #36648

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor/36648 wallet enablement flow terms #40567

Refactor/36648 wallet enablement flow terms #40567

koko57 commented Apr 19, 2024 •

edited

Loading

melvin-bot bot commented Apr 24, 2024

shawnborton commented Apr 24, 2024

Pujan92 commented Apr 30, 2024

Pujan92 left a comment

Pujan92 Apr 30, 2024

Pujan92 Apr 30, 2024

Pujan92 Apr 30, 2024

Pujan92 Apr 30, 2024

Pujan92 Apr 30, 2024

Pujan92 Apr 30, 2024

Pujan92 commented May 1, 2024

Pujan92 left a comment

mountiny commented May 10, 2024

mountiny left a comment

OSBotify commented May 13, 2024

OSBotify commented May 15, 2024

kavimuru commented May 15, 2024

koko57 commented May 15, 2024 •

edited

Loading

OSBotify commented May 22, 2024

	containerStyles={[styles.mh0, styles.mv4]}
	containerStyles={[styles.mh0, styles.mv5]}

	<Text style={[styles.textLabel, styles.textSupporting]}>{translate('termsStep.monthlyFee')}</Text>
	<Text style={[styles.mutedNormalTextLabel]}>{translate('termsStep.monthlyFee')}</Text>

	borderRadius: 5,
	borderRadius: variables.componentBorderRadius,

Refactor/36648 wallet enablement flow terms #40567

Refactor/36648 wallet enablement flow terms #40567

Conversation

koko57 commented Apr 19, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 24, 2024

shawnborton commented Apr 24, 2024

Pujan92 commented Apr 30, 2024

Pujan92 left a comment

Choose a reason for hiding this comment

Pujan92 Apr 30, 2024

Choose a reason for hiding this comment

Pujan92 Apr 30, 2024

Choose a reason for hiding this comment

Pujan92 Apr 30, 2024

Choose a reason for hiding this comment

Pujan92 Apr 30, 2024

Choose a reason for hiding this comment

Pujan92 Apr 30, 2024

Choose a reason for hiding this comment

Pujan92 Apr 30, 2024

Choose a reason for hiding this comment

Pujan92 commented May 1, 2024

Reviewer Checklist

Screenshots/Videos

Pujan92 left a comment

Choose a reason for hiding this comment

mountiny commented May 10, 2024

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented May 13, 2024

OSBotify commented May 15, 2024

kavimuru commented May 15, 2024

koko57 commented May 15, 2024 • edited Loading

OSBotify commented May 22, 2024

koko57 commented Apr 19, 2024 •

edited

Loading

koko57 commented May 15, 2024 •

edited

Loading