feat: Subscription settings UI #42990

MrMuzyk · 2024-06-03T12:41:02Z

Details

Implemented Subscription settings UI section on subscription screen
Implemented FeedbackSurvey component
Implemented screen displayed when user tries to disable auto-renew

Fixed Issues

$ #38626
PROPOSAL:

Tests

go to /settings/subscription
try to disable auto renew
Verify that no errors appear in the JS console

Offline tests

QA Steps

go to /settings/subscription
try to disable auto renew
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

rezkiy37

Left comments.

src/pages/settings/Subscription/DisableAutoRenewSurveyPage.tsx

src/pages/settings/Subscription/SubscriptionSettingsSection.tsx

src/components/FeedbackSurvey.tsx

…sription-settings-ui

src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx

melvin-bot · 2024-06-04T08:13:36Z

@mollfpr 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/components/FeedbackSurvey.tsx

src/pages/settings/Subscription/SubscriptionSettingsSection.tsx

…sription-settings-ui

mollfpr · 2024-06-04T14:20:06Z

Mostly looks good. Just found a couple of issues.

The back button is shown on the subscription page when the disable auto-renew survey opens

Screen.Recording.2024-06-04.at.20.48.29.mp4

The text option in Spanish is overflow
The subscription settings page doesn't scrollable, we can add <ScrollView contentContainerStyle={styles.pt3}>. The style padding is to match the padding on the other page, between the header component and the section below.
The disable auto-renew survey is not scrollable either, and the submit button does not float when the screen is too small.

mollfpr · 2024-06-04T14:52:30Z

The save up to text is conflicted with the selection option.

…sription-settings-ui

mollfpr

LGTM 👍

amyevans

Just a few minor comments!

@Expensify/design would you like to review as well?

amyevans · 2024-06-06T14:58:18Z

src/languages/en.ts

+        subscriptionSettings: {
+            title: 'Subscription settings',
+            autoRenew: 'Auto-renew',
+            yourAnnual: 'Your annual subscription will automatically renew on (date). You can switch to pay-per-use starting 30 days before renewal.',


(date) should be a variable here, equal to nvp_private_subscription.endDate + 1 month

Actually this translation key is not used anywhere 😅 It was present in the doc so I've added it but its not used anywhere so Im removing it

I will however adjust the renewal date we display under auto-renew toggle

Ah okay good catch, I think that initial text was from a previous iteration (I see it in the high level portion of the doc, but not Figma or the mocks in Detailed, so I think we're good to remove it).

src/languages/es.ts

amyevans · 2024-06-06T15:08:53Z

src/languages/en.ts

+            autoRenew: 'Auto-renew',
+            yourAnnual: 'Your annual subscription will automatically renew on (date). You can switch to pay-per-use starting 30 days before renewal.',
+            autoIncrease: 'Auto-increase annual seats',
+            saveUpTo: 'Save up to $10/month per active member',


This needs to be slightly variable: it should be 10 for a Collect plan and 18 for a Control plan. I'm also asking in the doc if it should always be in USD or not

Just gonna tag you here directly too @MitchExpensify 😄

I think this should be localised to the billing currency, personally. It doesn't make sense if you're billed in GBP.

At the moment all prices on main Subscription page have fixed $ currency. Do you want me to fix them all as part of this PR or do we leave the currency as it is for now and change it later in a separate issue?

I think it's fine to be a follow-up, but let's make sure we do it.

Ok, so should we create new issue for it? If so, who's job is it? :)

Polish GH for later follow-up: #43277

amyevans · 2024-06-06T15:16:38Z

src/pages/settings/Subscription/DisableAutoRenewSurveyPage.tsx

+    return (
+        <ScreenWrapper
+            testID={DisableAutoRenewSurveyPage.displayName}
+            includeSafeAreaPaddingBottom={false}


Could this in theory still be accessed on native via deep link? Should we implement return null for native?

shawnborton · 2024-06-06T15:29:06Z

Looks like the cards are not using the max-width style that we use everywhere else:

MrMuzyk · 2024-06-07T06:45:42Z

Looks like the cards are not using the max-width style that we use everywhere else:

It will be fixed with next rebase. Fix for it made it to main late afternoon :)

…sription-settings-ui

MrMuzyk · 2024-06-07T08:37:08Z

@amyevans I've replied to/fixed whats been pointed out. Have a look when you can :)

amyevans

1 small thing to go (my bad!), then we can merge!

amyevans · 2024-06-07T13:40:39Z

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

    // TODO these default state values will come from API in next phase
    const [autoRenew, setAutoRenew] = useState(true);
    const [autoIncrease, setAutoIncrease] = useState(false);

-    // TODO this will come from API in next phase
-    const expirationDate = format(new Date(), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);
+    const autoRenewalDate = privateSubscription?.endDate ? format(addMonths(new Date(privateSubscription?.endDate), 1), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT) : '';


Sorry, I gave you bad info regarding adding a month to the end date. The autoRenewalDate should just be equal to the endDate (keep the formatting you've applied here though)

I think we need to tweak what is passed to the Date constructor? Ultimately it should say it renews on June 1, 2025 in this case

hmm, checking

Thats weird, because it is working fine on my end

I think

const autoRenewalDate = privateSubscription?.endDate ? format(new Date(`${privateSubscription?.endDate}T00:00:00`), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT) : '';

would work, currently it's picking up my local timezone I think

Ok, I've changed it. I will be finishing for today but on monday I might get back to this (in this or one of next PRs) and refactor it to something more elegant. I believe getNewSubscriptionRenewalDate might have the same TZ issue so I will look into it

Okay, I'm going to merge this PR to keep things moving but definitely feel free to refactor in a follow up PR. Thank you!

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

OSBotify · 2024-06-07T15:00:44Z

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

zanyrenney · 2024-06-11T12:27:53Z

The submit button is unresponsive here. @MrMuzyk @mollfpr are you able to resolve this in the related GH issue- #43466

MrMuzyk · 2024-06-11T12:42:29Z

@zanyrenney

Only UI was implemented in this PR. Submit action will come in the next phase - there is a comment that serves as a reminder as well.

App/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx

Lines 14 to 16 in 4f2901f

    
           const handleSubmit = () => { 
        
               // TODO API call to submit feedback will be implemented in next phase 
        
           };

It might be the case that it's being already implemented in one of the PRs.

OSBotify · 2024-06-11T23:34:04Z

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

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

alitoshmatov · 2024-07-06T21:03:22Z

src/components/FeedbackSurvey.tsx

+                <FormAlertWithSubmitButton
+                    isAlertVisible={shouldShowReasonError}
+                    onSubmit={handleSubmit}
+                    message="common.error.pleaseCompleteForm"


Error message here was left hardcoded, it needed translate function. #44075

MrMuzyk added 4 commits June 3, 2024 09:49

feat: subscription settings ui

5ae57d9

Merge branch 'main' into feat/subsription-settings-ui

af7b6df

feat: disable auto renew page

7881f60

fix: translations and cut corporate karma

2f96052

rezkiy37 suggested changes Jun 3, 2024

View reviewed changes

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

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

koko57 reviewed Jun 3, 2024

View reviewed changes

src/components/FeedbackSurvey.tsx Outdated Show resolved Hide resolved

MrMuzyk added 4 commits June 3, 2024 15:14

fix: cr fixes

7da4c58

fix: translations

690d095

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

b2c9f6f

…sription-settings-ui

fix: remove memo

2ca5e3c

MrMuzyk requested review from rezkiy37 and koko57 June 4, 2024 08:02

koko57 reviewed Jun 4, 2024

View reviewed changes

src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx Show resolved Hide resolved

rezkiy37 approved these changes Jun 4, 2024

View reviewed changes

fix: whitespaces before comments

a5ad54a

MrMuzyk marked this pull request as ready for review June 4, 2024 08:13

MrMuzyk requested a review from a team as a code owner June 4, 2024 08:13

melvin-bot bot requested review from mollfpr and removed request for a team June 4, 2024 08:13

koko57 approved these changes Jun 4, 2024

View reviewed changes

fabioh8010 reviewed Jun 4, 2024

View reviewed changes

fix: cr fixes

06b74cc

MrMuzyk requested a review from fabioh8010 June 4, 2024 11:03

fix: add new const for feedback survey options

f866282

fabioh8010 approved these changes Jun 4, 2024

View reviewed changes

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

8139378

…sription-settings-ui

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

e72b647

…sription-settings-ui

mollfpr approved these changes Jun 6, 2024

View reviewed changes

melvin-bot bot requested a review from amyevans June 6, 2024 12:00

amyevans requested changes Jun 6, 2024

View reviewed changes

MrMuzyk added 2 commits June 7, 2024 09:30

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

11add28

…sription-settings-ui

fix: small cr fixes

f3cba59

MrMuzyk requested a review from amyevans June 7, 2024 08:37

amyevans mentioned this pull request Jun 7, 2024

[HOLD for payment 2024-07-15] [Payment card / Subscription] Localize subscription prices to appropriate currency #43277

Closed

amyevans requested changes Jun 7, 2024

View reviewed changes

fix: update auto renewal date

6c5d56c

MrMuzyk requested a review from amyevans June 7, 2024 14:08

fix: date

551789b

amyevans approved these changes Jun 7, 2024

View reviewed changes

amyevans merged commit eff0783 into Expensify:main Jun 7, 2024
17 checks passed

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

Deploy Checklist: New Expensify 2024-06-10 #43344

Closed

This was referenced Jun 11, 2024

[$250] Workspace - "It's not here" error when opening the subscriptions page #43461

Closed

[Subscriptions] - Unable to disable auto renew as Submit button on RHP is unresponsive when clicked #43466

Closed

kbecciv mentioned this pull request Jun 11, 2024

Subscriptions - Unable to disable auto renew #43467

Closed

6 tasks

izarutskaya mentioned this pull request Jun 11, 2024

Subscription - Checkboxes under "Subscription details" are always in dark mode #43471

Closed

6 tasks

amyevans mentioned this pull request Jun 11, 2024

integrate payment card section with API #43473

Merged

50 tasks

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

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [Payment card / Subscription] Implement “Subscription settings” section (UI) #38626

Closed

amyevans mentioned this pull request Jun 13, 2024

feat: Subscription size backend integration #43484

Merged

50 tasks

alitoshmatov reviewed Jul 6, 2024

View reviewed changes

alitoshmatov mentioned this pull request Jul 6, 2024

[HOLD for payment 2024-07-10] [$250] Subscription - "common.error.pleaseCompleteForm" is shown when submitting empty survey #44075

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Subscription settings UI #42990

feat: Subscription settings UI #42990

MrMuzyk commented Jun 3, 2024 •

edited

Loading

rezkiy37 left a comment

melvin-bot bot commented Jun 4, 2024

mollfpr commented Jun 4, 2024

mollfpr commented Jun 4, 2024

mollfpr left a comment

amyevans left a comment

amyevans Jun 6, 2024

MrMuzyk Jun 7, 2024

MrMuzyk Jun 7, 2024

amyevans Jun 7, 2024

amyevans Jun 6, 2024

amyevans Jun 6, 2024

trjExpensify Jun 7, 2024

MrMuzyk Jun 7, 2024

trjExpensify Jun 7, 2024

MrMuzyk Jun 7, 2024

amyevans Jun 7, 2024

amyevans Jun 6, 2024

shawnborton commented Jun 6, 2024

MrMuzyk commented Jun 7, 2024 •

edited

Loading

MrMuzyk commented Jun 7, 2024

amyevans left a comment

amyevans Jun 7, 2024

amyevans Jun 7, 2024

MrMuzyk Jun 7, 2024

MrMuzyk Jun 7, 2024

amyevans Jun 7, 2024 •

edited

Loading

MrMuzyk Jun 7, 2024

amyevans Jun 7, 2024

OSBotify commented Jun 7, 2024

zanyrenney commented Jun 11, 2024

MrMuzyk commented Jun 11, 2024

OSBotify commented Jun 11, 2024

alitoshmatov Jul 6, 2024

feat: Subscription settings UI #42990

feat: Subscription settings UI #42990

Conversation

MrMuzyk 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

melvin-bot bot commented Jun 4, 2024

mollfpr commented Jun 4, 2024

mollfpr commented Jun 4, 2024

mollfpr left a comment

Choose a reason for hiding this comment

amyevans 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

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

shawnborton commented Jun 6, 2024

MrMuzyk commented Jun 7, 2024 • edited Loading

MrMuzyk commented Jun 7, 2024

amyevans 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

amyevans Jun 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OSBotify commented Jun 7, 2024

zanyrenney commented Jun 11, 2024

MrMuzyk commented Jun 11, 2024

OSBotify commented Jun 11, 2024

Choose a reason for hiding this comment

MrMuzyk commented Jun 3, 2024 •

edited

Loading

MrMuzyk commented Jun 7, 2024 •

edited

Loading

amyevans Jun 7, 2024 •

edited

Loading