[Payment card / Subscription] Integrate “Subscription settings” section with backend data #43367

JKobrynski · 2024-06-10T13:26:43Z

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

$ #38627
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 change subscription settings (auto renew, auto increase)
Verify if a feedback survey is shown if you try to disable auto renew

Verify that no errors appear in the JS console

Offline tests

Same as Tests section above (it's pattern B offline behaviour)

QA Steps

Same as Tests section above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Subscription settings are unavailable in the native apps

Android: mWeb Chrome

chrome-compressed.webm

iOS: Native

Subscription settings are unavailable in the native apps

iOS: mWeb Safari

safari-compressed.mp4

MacOS: Chrome / Safari

web-compressed.mov

MacOS: Desktop

desktop-compressed.mov

…nSettingsWithBackend

melvin-bot · 2024-06-11T10:26:44Z

@DylanDylann 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/types/onyx/PrivateSubscription.ts

src/libs/actions/Subscription.ts

JKobrynski · 2024-06-11T11:05:42Z

@VickyStash PR updated!

src/libs/actions/Subscription.ts

JKobrynski · 2024-06-11T12:12:02Z

@VickyStash @rezkiy37 PR updated!

src/libs/actions/Subscription.ts

DylanDylann · 2024-06-11T14:40:31Z

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

This feature isn't available in native app

Android: mWeb Chrome

Screen.Recording.2024-06-17.at.15.22.41.mov

iOS: Native

This feature isn't available in native app

iOS: mWeb Safari

Screen.Recording.2024-06-17.at.15.21.18.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-17.at.15.03.18.mov

MacOS: Desktop

Screen.Recording.2024-06-17.at.15.23.20.mov

DylanDylann · 2024-06-11T14:50:58Z

@JKobrynski Auto-increase annual seats is toggled of automatically

Screen.Recording.2024-06-11.at.21.49.52.mov

DylanDylann · 2024-06-17T07:12:05Z

I'm working on it

DylanDylann · 2024-06-17T07:51:11Z

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

            return;
        }
        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_DISABLE_AUTO_RENEW_SURVEY);
    };
    const handleAutoIncreaseToggle = () => {
-        // TODO make API call to toggle auto increase here
-        setAutoIncrease(!autoIncrease);
+        if (privateSubscription?.addNewUsersAutomatically === undefined) {


I think this is enough

const handleAutoIncreaseToggle = () => { Subscription.updateSubscriptionAddNewUsersAutomatically(!privateSubscription?.addNewUsersAutomatically); };

DylanDylann · 2024-06-17T08:00:09Z

src/components/FeedbackSurvey.tsx

@@ -57,7 +60,7 @@ function FeedbackSurvey({title, description, onSubmit, optionRowStyles}: Feedbac
            return;
        }

-        onSubmit(reason);
+        onSubmit(reason.key, additionalNote);


Let's trim additionalNote before submitting

DylanDylann · 2024-06-17T08:03:00Z

@JKobrynski Some minor comments, everything else looks fine

DylanDylann · 2024-06-17T08:11:29Z

@JKobrynski @amyevans We are using pending action fields for APIs, then when executing APIs offline will make both Subscription settings and Subscription detail greyed out

Screen.Recording.2024-06-17.at.15.03.18.mov

If we want to fix this, we can use pendingFields instead of pendingAction to specify the offline action for each part

Edited: This isn't a big problem, If this is an urgent PR we can ignore this here and create an issue to follow up

DylanDylann · 2024-06-17T08:16:16Z

@amyevans @JKobrynski One inconsistency is that we can't toggle off "Auto-renew" when offline, but we can toggle off "Auto increase". Although this isn't related to this PR, we can fix it by adding an enableWhenOffline parameter to the FormAlertWithSubmitButton component in FeedbackSurvey.

Edited: This isn't a big problem, If this is an urgent PR we can ignore this here and create an issue to follow up

DylanDylann · 2024-06-17T08:43:04Z

About two of these above problems
This isn't a big problem, If this is an urgent PR we can ignore this here and create an issue to follow up**

JKobrynski · 2024-06-17T13:28:17Z

@DylanDylann I replaced pendingAction with pendingFields, tested and it worked on my end. I also added enabledWhenOffline to the submit button and now it's possible to disable both switches offline. Conflicts were also resolved, let me know what you think!

DylanDylann · 2024-06-18T03:24:19Z

src/components/FeedbackSurvey.tsx

@@ -57,7 +60,7 @@ function FeedbackSurvey({title, description, onSubmit, optionRowStyles}: Feedbac
            return;
        }

-        onSubmit(reason);
+        onSubmit(reason.key, note);


@JKobrynski Whoops, I mean note.trim() 😄

DylanDylann · 2024-06-18T03:46:20Z

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

-                />
-                <Text style={[styles.mutedTextLabel, styles.mt2]}>{translate('subscription.subscriptionSettings.automaticallyIncrease')}</Text>
-            </View>
+            <OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.autoRenew ?? privateSubscription?.pendingFields?.addNewUsersAutomatically}>


Suggested change

<OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.autoRenew ?? privateSubscription?.pendingFields?.addNewUsersAutomatically}>

<OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.autoRenew}>

DylanDylann · 2024-06-18T03:46:49Z

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

+                        onToggle={handleAutoRenewToggle}
+                        isActive={privateSubscription?.autoRenew ?? false}
+                    />
+                    {!!autoRenewalDate && <Text style={[styles.mutedTextLabel, styles.mt2]}>{translate('subscription.subscriptionSettings.renewsOn', {date: autoRenewalDate})}</Text>}


Let's add

<OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.addNewUsersAutomatically}>

DylanDylann

@JKobrynski Minor comments. Everything else looks good

JKobrynski · 2024-06-18T06:53:18Z

@DylanDylann PR updated again!

DylanDylann · 2024-06-18T10:34:45Z

@blimpich All yours 🚀

blimpich

Looks great! Great work everyone! 🎉

OSBotify · 2024-06-18T18:00:45Z

✋ 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-19T21:52:28Z

🚀 Deployed to staging by https://github.com/blimpich in version: 1.4.86-0 🚀

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

OSBotify · 2024-06-19T22:17:10Z

🚀 Deployed to staging by https://github.com/blimpich in version: 1.4.86-0 🚀

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

OSBotify · 2024-06-19T22:51:09Z

🚀 Deployed to staging by https://github.com/blimpich in version: 1.4.86-0 🚀

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

OSBotify · 2024-06-21T21:21:47Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.0-9 🚀

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

JKobrynski added 7 commits June 6, 2024 16:04

display values from API in subscription settings section

80b5c36

Merge branch 'main' into integrateSubscriptionSettingsWithBackend

90d8701

Merge branch 'feat/subsription-settings-ui' into integrateSubscriptio…

0214f78

…nSettingsWithBackend

add new api commands for subscription settings

2e571e9

implement auto-increase annual seats setting

a91bd2f

Merge branch 'main' into implementAllToggleActions

32bc827

start integrating UpdateSubscriptionAutoRenew API method

b6bfeb6

JKobrynski changed the title ~~[Payment card / Subscription] Implement all toggle actions~~ [Payment card / Subscription] Integrate “Subscription settings” section with backend data Jun 10, 2024

JKobrynski added 3 commits June 11, 2024 09:16

Merge branch 'main' into implementAllToggleActions

5919906

integrate auto renew setting and feedback survey with API

7718cda

add offline support to subscription settings

d2e0378

JKobrynski marked this pull request as ready for review June 11, 2024 10:26

JKobrynski requested a review from a team as a code owner June 11, 2024 10:26

melvin-bot bot requested review from DylanDylann and removed request for a team June 11, 2024 10:26

VickyStash reviewed Jun 11, 2024

View reviewed changes

src/types/onyx/PrivateSubscription.ts Outdated Show resolved Hide resolved

src/libs/actions/Subscription.ts Outdated Show resolved Hide resolved

apply suggested changes

49d387a

JKobrynski requested a review from VickyStash June 11, 2024 11:05

rezkiy37 reviewed Jun 11, 2024

View reviewed changes

src/libs/actions/Subscription.ts Outdated Show resolved Hide resolved

rezkiy37 reviewed Jun 11, 2024

View reviewed changes

src/libs/actions/Subscription.ts Outdated Show resolved Hide resolved

avoid overwriting values in successData

51466c3

JKobrynski requested a review from rezkiy37 June 11, 2024 12:12

rezkiy37 approved these changes Jun 11, 2024

View reviewed changes

VickyStash approved these changes Jun 11, 2024

View reviewed changes

DylanDylann reviewed Jun 11, 2024

View reviewed changes

src/libs/actions/Subscription.ts Show resolved Hide resolved

DylanDylann reviewed Jun 17, 2024

View reviewed changes

JKobrynski added 4 commits June 17, 2024 13:52

Merge branch 'main' into implementAllToggleActions

2839c6a

apply suggested changes

07dffcc

replace pendingAction with pendingFields

fc13ff4

remove comments, add enabledWhenOffline to FeedbackSurvey submit button

98217b1

JKobrynski requested a review from DylanDylann June 17, 2024 13:28

DylanDylann reviewed Jun 18, 2024

View reviewed changes

DylanDylann approved these changes Jun 18, 2024

View reviewed changes

JKobrynski added 2 commits June 18, 2024 08:21

Merge branch 'main' into implementAllToggleActions

d1cbc24

apply suggested changes

9b805ba

DylanDylann approved these changes Jun 18, 2024

View reviewed changes

blimpich approved these changes Jun 18, 2024

View reviewed changes

blimpich merged commit 86a2e3d into Expensify:main Jun 18, 2024
16 checks passed

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

Deploy Checklist: New Expensify 2024-06-19 #44047

Closed

59 tasks

kbecciv mentioned this pull request Jun 20, 2024

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

Closed

6 tasks

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

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

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Payment card / Subscription] Integrate “Subscription settings” section with backend data #43367

[Payment card / Subscription] Integrate “Subscription settings” section with backend data #43367

JKobrynski commented Jun 10, 2024 •

edited

Loading

melvin-bot bot commented Jun 11, 2024

JKobrynski commented Jun 11, 2024

JKobrynski commented Jun 11, 2024

DylanDylann commented Jun 11, 2024 •

edited

Loading

DylanDylann commented Jun 11, 2024

DylanDylann commented Jun 17, 2024

DylanDylann Jun 17, 2024

DylanDylann Jun 17, 2024

DylanDylann commented Jun 17, 2024

DylanDylann commented Jun 17, 2024 •

edited

Loading

DylanDylann commented Jun 17, 2024 •

edited

Loading

DylanDylann commented Jun 17, 2024 •

edited

Loading

JKobrynski commented Jun 17, 2024

DylanDylann Jun 18, 2024

DylanDylann Jun 18, 2024

DylanDylann Jun 18, 2024

DylanDylann left a comment

JKobrynski commented Jun 18, 2024

DylanDylann commented Jun 18, 2024

blimpich left a comment

OSBotify commented Jun 18, 2024

OSBotify commented Jun 19, 2024

OSBotify commented Jun 19, 2024

OSBotify commented Jun 19, 2024

OSBotify commented Jun 21, 2024

	<OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.autoRenew ?? privateSubscription?.pendingFields?.addNewUsersAutomatically}>
	<OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.autoRenew}>

[Payment card / Subscription] Integrate “Subscription settings” section with backend data #43367

[Payment card / Subscription] Integrate “Subscription settings” section with backend data #43367

Conversation

JKobrynski commented Jun 10, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 11, 2024

JKobrynski commented Jun 11, 2024

JKobrynski commented Jun 11, 2024

DylanDylann commented Jun 11, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Jun 11, 2024

DylanDylann commented Jun 17, 2024

DylanDylann Jun 17, 2024

Choose a reason for hiding this comment

DylanDylann Jun 17, 2024

Choose a reason for hiding this comment

DylanDylann commented Jun 17, 2024

DylanDylann commented Jun 17, 2024 • edited Loading

DylanDylann commented Jun 17, 2024 • edited Loading

DylanDylann commented Jun 17, 2024 • edited Loading

JKobrynski commented Jun 17, 2024

DylanDylann Jun 18, 2024

Choose a reason for hiding this comment

DylanDylann Jun 18, 2024

Choose a reason for hiding this comment

DylanDylann Jun 18, 2024

Choose a reason for hiding this comment

DylanDylann left a comment

Choose a reason for hiding this comment

JKobrynski commented Jun 18, 2024

DylanDylann commented Jun 18, 2024

blimpich left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 18, 2024

OSBotify commented Jun 19, 2024

OSBotify commented Jun 19, 2024

OSBotify commented Jun 19, 2024

OSBotify commented Jun 21, 2024

JKobrynski commented Jun 10, 2024 •

edited

Loading

DylanDylann commented Jun 11, 2024 •

edited

Loading

DylanDylann commented Jun 17, 2024 •

edited

Loading

DylanDylann commented Jun 17, 2024 •

edited

Loading

DylanDylann commented Jun 17, 2024 •

edited

Loading