[Payment card / Subscription] Integrate “Your plan” section with backend data and related screens #43128

JKobrynski · 2024-06-05T14:14:21Z

Details

To access this newly created component, paste the following link into the browser

https://dev.new.expensify.com:8082/settings/subscription

or add this effect to InitialSettingsPage.tsx

useEffect(() => {
    Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)
}, [])

Fixed Issues

$ #38621
PROPOSAL: N/A

Tests

Log into the app using an account that has a Collect/Control workspace
Navigate to the Subscription Settings page (see Details section above for instructions)
Verify if you can see the correct price and currency in "Your plan" section

Verify that no errors appear in the JS console

Offline tests

Same as Tests section above

QA Steps

Same as Tests section above

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: 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 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 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 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…ynamic price

melvin-bot · 2024-06-06T12:59:32Z

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

src/libs/CurrencyUtils.ts

eh2077 · 2024-06-06T13:27:30Z

src/hooks/useSubscriptionPrice.ts

+import usePreferredCurrency from './usePreferredCurrency';
+import useSubscriptionPlan from './useSubscriptionPlan';
+
+const SUBSCRIPTION_PRICES = {


Is it better to move it to CONST.ts?

Its values are based on CONST, so it's impossible to put it in that object, and I also can't see any other const being exported from that file, only types

@JKobrynski Hmm, I was thinking if we should code subscription prices in CONST.ts too - then it'll be easier for the team to maintain them, like team members from business team

I agree this is not ideal but I'm also not seeing a better way to handle it so I think it is what it is

src/libs/CurrencyUtils.ts

src/pages/settings/Subscription/SubscriptionPlan.tsx

JKobrynski · 2024-06-06T14:23:25Z

@eh2077 PR updated

eh2077 · 2024-06-06T14:41:44Z

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

0-android.mp4

Android: mWeb Chrome

0-mobile-chrome.mp4

iOS: Native

0-ios.mp4

iOS: mWeb Safari

0-mobile-safari.mp4

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

0-desktop.mp4

src/hooks/usePreferredCurrency.ts

src/hooks/useSubscriptionPrice.ts

src/pages/settings/Subscription/SubscriptionPlan.tsx

eh2077 · 2024-06-06T14:50:32Z

@JKobrynski The control plan is missing Custom insights and reporting.

JKobrynski · 2024-06-07T07:36:40Z

@eh2077 PR updated, I added the missing benefit

eh2077 · 2024-06-07T11:38:57Z

@JKobrynski For collect plan, do we need to include the benefit - Custom insights and reporting? I saw it's not included in the design doc.

JKobrynski · 2024-06-07T11:41:33Z

@eh2077 I'm not sure, it changed over time and it's difficult to say what is the final version, I think we need someone to clarify this.

CC: @amyevans @MitchExpensify

eh2077 · 2024-06-07T12:21:17Z

@JKobrynski Android App crashed when opening the subscription page. I tried following methods

Add the effect you suggested to InitialSettingsPage.tsx
Open via npx uri-scheme open new-expensify://settings/subscription --android

0-android-crash-when-open-subscription-page.mp4

amyevans · 2024-06-07T12:51:28Z

@JKobrynski For collect plan, do we need to include the benefit - Custom insights and reporting? I saw it's not included in the design doc.

@eh2077 I'm not sure, it changed over time and it's difficult to say what is the final version, I think we need someone to clarify this.

Custom insights and reporting should show as a benefit for the Collect plan (per this thread in the doc). It is implicitly included as a benefit for the Control plan because we say Everything in Collect, plus: as the first benefit, but it should not be a separate bullet point under Control.

JKobrynski · 2024-06-10T12:40:34Z

@amyevans @eh2077 bug resolved, PR updated! Ready for another review

eh2077

Code looks good! I'm working on preparing recordings for native Apps

eh2077 · 2024-06-10T14:42:18Z

src/libs/CurrencyUtils.ts

    return NumberFormatUtils.format(BaseLocaleListener.getPreferredLocale(), convertedAmount, {
        style: 'currency',
        currency,

        // There will be no decimals displayed (e.g. $9)
+        minimumFractionDigits: 0,


Just out of curiosity, does adding this line fix the crash on Android? If so, why?

Yes, it does fix it! Hard to say why, it just doesn't work without it, the app crashes and doesn't show any useful crash details, even when using adb logcat with filters

eh2077

Tested well! Checklist is completed.

amyevans · 2024-06-10T16:07:02Z

src/hooks/usePreferredCurrency.ts

+/**
+ * Get user's preferred currency in the following order:
+ *
+ * 1. Default card currency


Suggested change

* 1. Default card currency

* 1. Payment card currency

amyevans · 2024-06-10T16:24:12Z

src/hooks/usePreferredCurrency.ts

+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
+
+    const defaultCardCurrency = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault)?.accountData?.currency, [fundList]);


Suggested change

const defaultCardCurrency = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault)?.accountData?.currency, [fundList]);

const paymentCardCurrency = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard)?.accountData?.currency, [fundList]);

The defaultCard is for P2P wallet, we want to identify the payment card (backend data will match my suggestion after #43136 is completed)

Got it, so basically we have to wait for #43136 to be closed so we can merge this?

No I don't think we need to wait for it to finish/deploy, we can make the update here ahead of time and merge since we know what the shape will be

amyevans · 2024-06-10T16:39:07Z

src/hooks/useSubscriptionPrice.ts

+import usePreferredCurrency from './usePreferredCurrency';
+import useSubscriptionPlan from './useSubscriptionPlan';
+
+const SUBSCRIPTION_PRICES = {


I agree this is not ideal but I'm also not seeing a better way to handle it so I think it is what it is

OSBotify · 2024-06-11T14:43:07Z

✋ 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-06-11T22:28:47Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.4.82-0 🚀

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

OSBotify · 2024-06-13T15:31:23Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.82-4 🚀

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

JKobrynski added 3 commits June 5, 2024 16:13

create usePreferredCurrency and useSubscriptionPrice hooks, display d…

044c287

…ynamic price

display dynamic subscription price with correct currency

4ec5cc3

simplify usePreferredCurrency

6e5e314

JKobrynski marked this pull request as ready for review June 6, 2024 12:59

JKobrynski requested a review from a team as a code owner June 6, 2024 12:59

melvin-bot bot requested review from eh2077 and removed request for a team June 6, 2024 12:59

VickyStash reviewed Jun 6, 2024

View reviewed changes

src/libs/CurrencyUtils.ts Show resolved Hide resolved

pasyukevich approved these changes Jun 6, 2024

View reviewed changes

eh2077 reviewed Jun 6, 2024

View reviewed changes

JKobrynski added 2 commits June 6, 2024 16:12

add subscription price multiply factor to CONST

eb0f8d0

add unit tests for convertToShortDisplayString util function

56a64f1

JKobrynski requested review from eh2077 and VickyStash June 6, 2024 14:23

fabioh8010 reviewed Jun 6, 2024

View reviewed changes

src/hooks/usePreferredCurrency.ts Outdated Show resolved Hide resolved

src/hooks/useSubscriptionPrice.ts Outdated Show resolved Hide resolved

src/pages/settings/Subscription/SubscriptionPlan.tsx Show resolved Hide resolved

JKobrynski added 3 commits June 7, 2024 09:13

Merge branch 'main' into integrateYourPlanSectionWithBackend

02c0354

apply minor improvements based on feedback

6f67061

add missing benefit to Control plan

457b4a2

JKobrynski added 3 commits June 10, 2024 09:23

fix control benefits list

1e04b25

Merge branch 'main' into integrateYourPlanSectionWithBackend

0472281

lint code

1f77593

add minimumFractionDigits to convertToShortDisplayString util function

50880d2

JKobrynski requested a review from fabioh8010 June 10, 2024 14:19

eh2077 reviewed Jun 10, 2024

View reviewed changes

eh2077 approved these changes Jun 10, 2024

View reviewed changes

melvin-bot bot requested a review from amyevans June 10, 2024 15:25

amyevans requested changes Jun 10, 2024

View reviewed changes

JKobrynski added 2 commits June 11, 2024 08:58

Merge branch 'main' into integrateYourPlanSectionWithBackend

1385573

fix typing in usePreferredCurrency

b330d98

JKobrynski requested a review from amyevans June 11, 2024 07:10

update usePreferredCurrency hook

e393f85

amyevans approved these changes Jun 11, 2024

View reviewed changes

amyevans merged commit 1021ae7 into Expensify:main Jun 11, 2024
16 checks passed

github-actions bot mentioned this pull request Jun 11, 2024

Deploy Checklist: New Expensify 2024-06-11 #43515

Closed

59 tasks

izarutskaya mentioned this pull request Jun 12, 2024

Subscription - Subscription settings and parts of details are missing #43555

Closed

6 tasks

melvin-bot bot mentioned this pull request Jun 13, 2024

[HOLD for payment 2024-06-20] [Payment card / Subscription] Integrate “Your plan” section with backend data and related screens #38621

Closed

rayane-djouah mentioned this pull request Jul 9, 2024

fix: IOU - On entering amount with decimals, 3rd decimal 0 is added in IOU confirmation page. #44416

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Payment card / Subscription] Integrate “Your plan” section with backend data and related screens #43128

[Payment card / Subscription] Integrate “Your plan” section with backend data and related screens #43128

JKobrynski commented Jun 5, 2024 •

edited

Loading

melvin-bot bot commented Jun 6, 2024

eh2077 Jun 6, 2024

JKobrynski Jun 6, 2024

eh2077 Jun 6, 2024

amyevans Jun 10, 2024

JKobrynski commented Jun 6, 2024

eh2077 commented Jun 6, 2024 •

edited

Loading

eh2077 commented Jun 6, 2024

JKobrynski commented Jun 7, 2024

eh2077 commented Jun 7, 2024

JKobrynski commented Jun 7, 2024

eh2077 commented Jun 7, 2024

amyevans commented Jun 7, 2024

JKobrynski commented Jun 10, 2024

eh2077 left a comment

eh2077 Jun 10, 2024

JKobrynski Jun 11, 2024

eh2077 left a comment

amyevans Jun 10, 2024

amyevans Jun 10, 2024

amyevans Jun 10, 2024

JKobrynski Jun 11, 2024

amyevans Jun 11, 2024

JKobrynski Jun 11, 2024

amyevans Jun 10, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 13, 2024

	const defaultCardCurrency = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault)?.accountData?.currency, [fundList]);
	const paymentCardCurrency = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard)?.accountData?.currency, [fundList]);

[Payment card / Subscription] Integrate “Your plan” section with backend data and related screens #43128

[Payment card / Subscription] Integrate “Your plan” section with backend data and related screens #43128

Conversation

JKobrynski commented Jun 5, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JKobrynski commented Jun 6, 2024

eh2077 commented Jun 6, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 commented Jun 6, 2024

JKobrynski commented Jun 7, 2024

eh2077 commented Jun 7, 2024

JKobrynski commented Jun 7, 2024

eh2077 commented Jun 7, 2024

amyevans commented Jun 7, 2024

JKobrynski commented Jun 10, 2024

eh2077 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eh2077 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OSBotify commented Jun 11, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 13, 2024

JKobrynski commented Jun 5, 2024 •

edited

Loading

eh2077 commented Jun 6, 2024 •

edited

Loading