[Payment card / Subscription] Implement “Subscription details” section (UI) #42975

JKobrynski · 2024-06-03T08:27:34Z

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

$ #38623
PROPOSAL: N/A

Tests

Prerequisites

To test this component you are going to need a Collect workspace or a Control workspace. To create either one go to https://staging.expensify.com and then to Settings -> Workspaces and click the New Workspace button. In the next step you can create a Collect/Control workspace, that will be available in new dot (on the same account) after login.

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 the Subscription details section of the screen

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as Tests section above

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

MacOS: Desktop

…ction

src/components/OptionsPicker/OptionItem.tsx

src/components/OptionsPicker/index.tsx

src/libs/API/types.ts

src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx

src/pages/settings/Subscription/SubscriptionDetails/index.tsx

src/pages/settings/Subscription/SubscriptionPlan.tsx

src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx

src/pages/settings/Subscription/SubscriptionDetails/index.tsx

src/hooks/useSubscriptionPlan.ts

rezkiy37

Left comments.

src/components/OptionsPicker/OptionItem.tsx

src/components/OptionsPicker/index.tsx

src/pages/settings/Subscription/SubscriptionDetails/index.tsx

src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx

src/pages/settings/Subscription/SubscriptionDetails/index.tsx

JKobrynski · 2024-06-03T13:49:18Z

@fabioh8010 @VickyStash @rezkiy37 PR updated! I think I addressed everything

src/pages/settings/Subscription/SubscriptionSettingsPage.tsx

Ollyws · 2024-06-04T09:55: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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

Ollyws

LGTM.

dubielzyk-expensify · 2024-06-04T10:06:01Z

I believe the corner radius here should be 8px, but it looks 4px to me?

dubielzyk-expensify · 2024-06-04T10:07:25Z

These checkmarks look 20x20px (see below), but should be 16x16px according to the Figma file.

Let me know if I'm wrong btw 😄 A bit hard to judge some of this stuff

JKobrynski · 2024-06-04T13:12:45Z

@dubielzyk-expensify the border radius was 6px - in between 😄 The icons were indeed 20px, I changed them to 16x16, good catch!

src/styles/index.ts

shawnborton · 2024-06-04T14:55:01Z

Can we see this screenshot but in light mode?

JKobrynski · 2024-06-04T16:05:52Z

@shawnborton

Good catch again, it's the wrong logo, can you send me a file with the light theme version of ExpensifyApproved?

amyevans

Light logo change looks good! 🚀

OSBotify · 2024-06-04T16:46:30Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

roryabraham · 2024-06-06T17:51:34Z

src/pages/settings/Subscription/SubscriptionDetails/index.tsx

+
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [preferredTheme] = useOnyx(ONYXKEYS.PREFERRED_THEME);


Why did you use useOnyx directly here instead of useTheme? Theme context would probably be more performant in general, plus it's just more consistent across the codebase.

roryabraham · 2024-06-06T17:52:26Z

src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx

+            {!!account?.isApprovedAccountant || !!account?.isApprovedAccountantClient ? (
+                <View style={[styles.borderedContentCard, styles.p5, styles.mt5]}>
+                    <Icon
+                        src={Illustrations.ExpensifyApprovedLogo}


Didn't you forget to update this based on the theme?

roryabraham

ok, actually @JKobrynski can you please create a follow-up PR to use themed illustrations and the useThemeIllustrations hook for the ExpensifyApproved logo? see https://github.com/Expensify/App/tree/32f176fe7734c27ee0b8e0256e8a8fd5a6ac237d/src/styles/theme/illustrations

feel free to tag me on the review

amyevans · 2024-06-07T15:43:13Z

@roryabraham @JKobrynski I moved it to a new GH so it doesn't get lost forever: #43306

OSBotify · 2024-06-11T23:33:52Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

JKobrynski added 8 commits May 29, 2024 14:51

add translations

b43b00a

start implementing section UI

439794e

Merge branch 'createYourPlanSection' into createSubscriptionDetailsSe…

432d883

…ction

add heads up section

d6e9e0e

add new illustrations

6222434

implement Optionitem component

153daee

implement OptionsPicker component

ca23503

implement mobile subscription details section and subscription size part

a4fa1e7

fabioh8010 reviewed Jun 3, 2024

View reviewed changes

VickyStash reviewed Jun 3, 2024

View reviewed changes

src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx Outdated Show resolved Hide resolved

src/pages/settings/Subscription/SubscriptionDetails/index.tsx Outdated Show resolved Hide resolved

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

rezkiy37 suggested changes Jun 3, 2024

View reviewed changes

remove subscription size section from pay per use variant

e4374cb

fabioh8010 reviewed Jun 3, 2024

View reviewed changes

src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx Outdated Show resolved Hide resolved

src/pages/settings/Subscription/SubscriptionDetails/index.tsx Outdated Show resolved Hide resolved

JKobrynski added 2 commits June 3, 2024 14:07

change OptionItems layout

c6a24ef

make updates based on comments

6f1ab30

JKobrynski requested review from fabioh8010, VickyStash and rezkiy37 June 3, 2024 13:49

pasyukevich reviewed Jun 3, 2024

View reviewed changes

src/pages/settings/Subscription/SubscriptionSettingsPage.tsx Outdated Show resolved Hide resolved

pasyukevich approved these changes Jun 3, 2024

View reviewed changes

rezkiy37 approved these changes Jun 3, 2024

View reviewed changes

fabioh8010 approved these changes Jun 3, 2024

View reviewed changes

add generic typing to OptionsPicker, unify styling

ded5927

JKobrynski marked this pull request as ready for review June 3, 2024 16:45

JKobrynski requested review from a team as code owners June 3, 2024 16:45

melvin-bot bot requested review from amyevans and removed request for a team and VickyStash June 3, 2024 16:45

JKobrynski requested review from amyevans, VickyStash and Ollyws June 4, 2024 07:04

Ollyws approved these changes Jun 4, 2024

View reviewed changes

change border radius and icon size

e09329d

shawnborton reviewed Jun 4, 2024

View reviewed changes

src/styles/index.ts Outdated Show resolved Hide resolved

JKobrynski added 2 commits June 4, 2024 15:21

Merge branch 'main' into createSubscriptionDetailsSection

37245b5

remove borderedContentCardFocused style

42de07c

JKobrynski requested a review from shawnborton June 4, 2024 13:28

amyevans previously approved these changes Jun 4, 2024

View reviewed changes

add light theme ExpensifyApproved! logo

352e354

JKobrynski dismissed amyevans’s stale review via 352e354 June 4, 2024 16:27

amyevans approved these changes Jun 4, 2024

View reviewed changes

amyevans merged commit 1fcd788 into Expensify:main Jun 4, 2024
16 checks passed

This was referenced Jun 5, 2024

[HOLD for payment 2024-06-28] [Payment card / Subscription] Integrate “Subscription settings” section with backend data #38627

Closed

[Payment card / Subscription] Integrate “Subscription details” section with backend data #38624

Closed

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

Deploy Checklist: New Expensify 2024-06-06 #43168

Closed

m-natarajan mentioned this pull request Jun 6, 2024

Subscription-Expensify is barely visible in Expensify approved section in device setting mode #43195

Closed

6 tasks

roryabraham reviewed Jun 6, 2024

View reviewed changes

amyevans mentioned this pull request Jun 7, 2024

[HOLD for payment 2024-06-20] [Payment card / Subscription] Polish "Subscription details" section with useThemeIllustrations #43306

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Payment card / Subscription] Implement “Subscription details” section (UI) #42975

[Payment card / Subscription] Implement “Subscription details” section (UI) #42975

JKobrynski commented Jun 3, 2024 •

edited

Loading

rezkiy37 left a comment

JKobrynski commented Jun 3, 2024

Ollyws commented Jun 4, 2024

Ollyws left a comment

dubielzyk-expensify commented Jun 4, 2024

dubielzyk-expensify commented Jun 4, 2024

JKobrynski commented Jun 4, 2024

shawnborton commented Jun 4, 2024

JKobrynski commented Jun 4, 2024

amyevans left a comment

OSBotify commented Jun 4, 2024

roryabraham Jun 6, 2024

roryabraham Jun 6, 2024

roryabraham left a comment •

edited

Loading

amyevans commented Jun 7, 2024

OSBotify commented Jun 11, 2024

[Payment card / Subscription] Implement “Subscription details” section (UI) #42975

[Payment card / Subscription] Implement “Subscription details” section (UI) #42975

Conversation

JKobrynski commented Jun 3, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

rezkiy37 left a comment

Choose a reason for hiding this comment

JKobrynski commented Jun 3, 2024

Ollyws commented Jun 4, 2024

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment

Choose a reason for hiding this comment

dubielzyk-expensify commented Jun 4, 2024

dubielzyk-expensify commented Jun 4, 2024

JKobrynski commented Jun 4, 2024

shawnborton commented Jun 4, 2024

JKobrynski commented Jun 4, 2024

amyevans left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 4, 2024

roryabraham Jun 6, 2024

Choose a reason for hiding this comment

roryabraham Jun 6, 2024

Choose a reason for hiding this comment

roryabraham left a comment • edited Loading

Choose a reason for hiding this comment

amyevans commented Jun 7, 2024

OSBotify commented Jun 11, 2024

JKobrynski commented Jun 3, 2024 •

edited

Loading

roryabraham left a comment •

edited

Loading