feat: Payment card subscription size screen UI by MrMuzyk · Pull Request #42683 · Expensify/App

MrMuzyk · 2024-05-28T08:57:46Z

Details

Implemented UI for subcription size screens

Fixed Issues

$ #38632
PROPOSAL:

Tests

go to /settings/subscription/subscription-size
Verify that no errors appear in the JS console

Offline tests

QA Steps

go to /settings/subscription/subscription-size
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

MacOS: Chrome / Safari

src/ROUTES.ts

src/languages/es.ts

src/pages/settings/Subscription/SubscriptionSize/SubscriptionSizePage.tsx

src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx

src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx

src/pages/settings/Subscription/SubscriptionSize/utils.ts

rezkiy37

Left minor comments, besides LGTM.

src/languages/es.ts

src/pages/settings/Subscription/SubscriptionSize/utils.ts

src/languages/es.ts

melvin-bot · 2024-05-29T05:37:00Z

@ikevin127 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/ROUTES.ts

src/languages/es.ts

ikevin127 · 2024-05-29T19:57:22Z

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

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

ikevin127

UI looks good to me! Currently only accessible via route URL.

Approved with the mention of #42683 (comment) where I noticed spanish translation empty space at the beginning of a string.

melvin-bot · 2024-05-29T19:59:34Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #38632 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

trjExpensify · 2024-05-29T20:53:39Z

Nice one, Kevin and Melvin! @amyevans will you review this one?

amyevans · 2024-05-29T21:02:30Z

Ah yep! Will get to it tonight although I have to step away for a few hours at the moment

amyevans

Two quick comments otherwise LGTM!

Also please update the base branch to main

src/pages/settings/Subscription/SubscriptionSize/utils.ts

amyevans · 2024-05-30T01:46:43Z

src/pages/settings/Subscription/SubscriptionSize/utils.ts

+    return errors;
+};
+
+const getNewSubscriptionRenewalDate = (): string => format(startOfMonth(addMonths(new Date(), 11)), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);


Suggested change

const getNewSubscriptionRenewalDate = (): string => format(startOfMonth(addMonths(new Date(), 11)), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);

const getNewSubscriptionRenewalDate = (): string => format(startOfMonth(addMonths(new Date(), 12)), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);

12 months matches the backend logic

Changing it. I've found 11 in doc. Must've been a mistake then

…ment-card-subscription-size-screen

shawnborton · 2024-06-03T08:01:52Z

For the second paragraph here:

We might as well make it in the same font size as the first paragraph. Otherwise it feels weird that it is smaller than the other but still uses the same color. cc @Expensify/design for thoughts.

For the small text under the input here

This feels like hint text, and we should make it follow the same pattern we have elsewhere for hint text under an input: move it closer to the input, and make it use our textSupporting color

I left similar comments in the design doc since I think we missed that part of the design review, but feel free to continue the conversation here

MrMuzyk · 2024-06-03T08:46:01Z

@shawnborton Would you like me to update styles of these texts now or should I wait for thoughts from design team you've CCed?

shawnborton · 2024-06-03T08:47:17Z

I have a feeling they will likely agree with me :) so I think it's probably okay to start updating them.

MrMuzyk · 2024-06-03T09:23:20Z

Does it look ok now? I've reduced the gap to 8px, I'm not sure if it's enough

shawnborton · 2024-06-03T09:27:16Z

That looks great to me!

amyevans

LGTM!

@ikevin127 can you give the latest changes a quick review once you're online?

dannymcclain · 2024-06-03T13:13:07Z

Thanks Shawn! I took care of the mocks in the doc, but glad it's gotten sorted here! And as you expected, I 100% agree with all your suggested updates 🤝

ikevin127

Matches the latest design requirements, let's go! 🚀

OSBotify · 2024-06-03T18:10:00Z

✋ 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-06T12:35:30Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

ahmedGaber93 · 2025-09-11T22:34:31Z

src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx

+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.SUBSCRIPTION_SIZE}
+                    label={translate('subscription.subscriptionSize.subscriptionSize')}
+                    aria-label={translate('subscription.subscriptionSize.subscriptionSize')}
+                    role={CONST.ROLE.PRESENTATION}
+                    defaultValue={defaultValues[INPUT_IDS.SUBSCRIPTION_SIZE]}
+                    shouldSaveDraft
+                />


coming from #69011, for better UX, we add inputMode={CONST.INPUT_MODE.NUMERIC} to this input to open the correct keyboard type.

MrMuzyk added 3 commits May 28, 2024 10:52

feat: Subscription size screen UI

aa73006

fix: adjust type

9c5ad15

fix: back button fix

9ecf73c

pasyukevich reviewed May 28, 2024

View reviewed changes

src/ROUTES.ts Outdated Show resolved Hide resolved

fabioh8010 reviewed May 28, 2024

View reviewed changes

rezkiy37 suggested changes May 28, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

src/pages/settings/Subscription/SubscriptionSize/utils.ts Outdated Show resolved Hide resolved

fix: cr fixes

b4b8e46

MrMuzyk requested review from fabioh8010 and pasyukevich May 28, 2024 11:28

rezkiy37 approved these changes May 28, 2024

View reviewed changes

fabioh8010 approved these changes May 28, 2024

View reviewed changes

pasyukevich approved these changes May 28, 2024

View reviewed changes

koko57 reviewed May 28, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

MrMuzyk added 2 commits May 29, 2024 07:18

fix: typo

4dcce10

fix: spanish error translation

89d3c47

MrMuzyk marked this pull request as ready for review May 29, 2024 05:36

MrMuzyk requested a review from a team as a code owner May 29, 2024 05:36

melvin-bot bot requested review from ikevin127 and removed request for a team May 29, 2024 05:36

fix: nest translations one level deeper

8838d6f

fabioh8010 reviewed May 29, 2024

View reviewed changes

src/ROUTES.ts Outdated Show resolved Hide resolved

fix: route typo

7b5e8b8

ikevin127 reviewed May 29, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

ikevin127 approved these changes May 29, 2024

View reviewed changes

amyevans self-requested a review May 29, 2024 21:02

amyevans requested changes May 30, 2024

View reviewed changes

Merge branch 'main' of https://github.com/Expensify/App into feat/pay…

c637d92

…ment-card-subscription-size-screen

MrMuzyk requested a review from a team as a code owner June 3, 2024 07:52

MrMuzyk changed the base branch from feature-payment-card-subscription to main June 3, 2024 07:53

fix: changed validation and renewal date

5b13859

fix: adjusted styles

0b0fd42

MrMuzyk requested review from amyevans and ikevin127 June 3, 2024 09:42

amyevans approved these changes Jun 3, 2024

View reviewed changes

ikevin127 approved these changes Jun 3, 2024

View reviewed changes

melvin-bot bot requested a review from amyevans June 3, 2024 17:44

amyevans approved these changes Jun 3, 2024

View reviewed changes

amyevans merged commit e6c89d9 into Expensify:main Jun 3, 2024

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

Deploy Checklist: New Expensify 2024-06-04 #43037

Closed

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

[$250] [HOLD for payment 2024-06-13] [Payment card / Subscription] Implement “Subscription size” screen (UI) #38632

Closed

ahmedGaber93 reviewed Sep 11, 2025

View reviewed changes

	const getNewSubscriptionRenewalDate = (): string => format(startOfMonth(addMonths(new Date(), 11)), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);
	const getNewSubscriptionRenewalDate = (): string => format(startOfMonth(addMonths(new Date(), 12)), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);

Conversation

MrMuzyk commented May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rezkiy37 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

melvin-bot bot commented May 29, 2024

Uh oh!

Uh oh!

Uh oh!

ikevin127 commented May 29, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented May 29, 2024

Uh oh!

trjExpensify commented May 29, 2024

Uh oh!

amyevans commented May 29, 2024

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

amyevans May 30, 2024

Choose a reason for hiding this comment

Uh oh!

MrMuzyk Jun 3, 2024

Choose a reason for hiding this comment

Uh oh!

shawnborton commented Jun 3, 2024

Uh oh!

MrMuzyk commented Jun 3, 2024

Uh oh!

shawnborton commented Jun 3, 2024

Uh oh!

MrMuzyk commented Jun 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shawnborton commented Jun 3, 2024

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

dannymcclain commented Jun 3, 2024

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jun 3, 2024

Uh oh!

OSBotify commented Jun 6, 2024

Uh oh!

ahmedGaber93 Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

MrMuzyk commented May 28, 2024 •

edited

Loading

MrMuzyk commented Jun 3, 2024 •

edited

Loading