[Payment history] add "Request early cancelation" menu item to the Subscription page (UI) #44763

JKobrynski · 2024-07-03T07:02:02Z

Details

Fixed Issues

$ #43282
PROPOSAL: N/A

Tests

Log into the app
Make sure you have a control/collect workspace with an annual subscription
Navigate to the Subscription Setttings page
Check if the new menu item (Request early cancellation) renders correctly
Click on it and go through the cancellation process
Once the subscription is successfully cancelled, hange it to an annual subscription and try cancelling it again

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

Automatic

chrome_automatic-compressed.webm

Manual

chrome_manual-compressed.webm

iOS: Native

iOS: mWeb Safari

Automatic

safari_automatic-compressed.mp4

Manual

safari_manual-compressed.mp4

MacOS: Chrome / Safari

Automatic

web_automatic-compressed.mov

Manual

web_manual-compressed.mov

MacOS: Desktop

Automatic

desktop_automatic-compressed.mov

Manual

desktop_manual-compressed.mov

melvin-bot · 2024-07-03T13:01:32Z

@rushatgabhane 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/languages/en.ts

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

mananjadhav

Some early review comments. Let me know once this is ready for review.

shawnborton · 2024-07-03T13:27:53Z

Screenshots seem to look pretty good.

JKobrynski · 2024-07-04T07:37:21Z

@mananjadhav PR updated, conflicts resolved!

dannymcclain · 2024-07-04T13:45:53Z

We've got some weirdness going on with the Done button on the second screen of the flows. Looks like it's not the right size for some reason. Also, is Done the right language to use here?

JKobrynski · 2024-07-04T14:01:14Z

@dannymcclain right, the "Done" button's size was wrong, but after adding large prop to it (like @mananjadhav suggested) it matches the Submit button's style. When it comes to the language used, I just copied what was in the design doc, let me know if you'd like to change it!

dannymcclain · 2024-07-04T14:42:40Z

@JKobrynski Ok awesome, thanks! Let's just leave Done since it's in the design doc.

src/languages/en.ts

mananjadhav · 2024-07-22T18:39:08Z

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

Menu not available on native

Android: mWeb Chrome

mweb-chrome-subscription-cancellation.mov

iOS: Native

Menu not available on native

iOS: mWeb Safari

mweb-safari-subscription-cancelation.mov

MacOS: Chrome / Safari

web-subscription-cancelation-1.mov

web-subscription-cancelation.mov

MacOS: Desktop

desktop-subscription-cancelation.mov

blimpich · 2024-07-22T18:59:32Z

I will review this pr and test it locally by the end of my work day today.

blimpich

I'm getting some weird behavior when I test this. The request returned "automatic" as the cancellation type but the UI shows the screen that should only show if the cancellation type is "manual". It looks like the onyx db is getting messed up somehow even though the request seems to be coming back with the correct data. @JKobrynski @mananjadhav are you not able to replicate this?

Screen.Recording.2024-07-22.at.2.48.48.PM.mov

Separately, can we add a loading indicator when the user hits "submit?" Having no immediate visual response when the user clicks "submit" feels weird. A loading indicator would be nice.

blimpich · 2024-07-22T22:22:27Z

src/types/onyx/CancellationDetails.ts

+    cancellationDate?: string;
+
+    /** Cancellation reason */
+    cancellationReason?: FeedbackSurveyOptionID;


I don't think this should be optional. Lets see if we can refactor 👍.

blimpich · 2024-07-22T22:22:29Z

src/types/onyx/CancellationDetails.ts

+    cancellationReason?: FeedbackSurveyOptionID;
+
+    /** Cancellation type (manual/automatic/none) */
+    cancellationType?: CancellationType;


I don't think this should be optional. Lets see if we can refactor 👍.

blimpich · 2024-07-22T22:23:46Z

src/libs/actions/Subscription.ts

+                {
+                    errors: undefined,
+                },


I think this is causing issues with the onyx db. It looks like this might be adding a "errors: undefined" json object every time the api is called, regardless of whether the api is successful or not. Doesn't seem right...

Right, I removed it

JKobrynski · 2024-07-23T09:23:43Z

@blimpich regarding cancellationType being optional, I am not sure we can make it a mandatory field, as in that case we would have to provide it in successData. What do you think?

JKobrynski · 2024-07-23T09:42:49Z

@blimpich about the video that you've posted, is it possible that you have an ongoing manual cancellation? I wasn't able to reproduce this on my end

blimpich · 2024-07-23T23:18:57Z

@blimpich regarding cancellationType being optional, I am not sure we can make it a mandatory field, as in that case we would have to provide it in successData. What do you think?

Lets discuss this in slack here: https://expensify.slack.com/archives/C036QM0SLJK/p1721774153958089

@blimpich about the video that you've posted, is it possible that you have an ongoing manual cancellation? I wasn't able to reproduce this on my end

Same with this, separate slack thread here: https://expensify.slack.com/archives/C036QM0SLJK/p1721776484735149

blimpich · 2024-07-23T23:20:37Z

And follow up to this comment, can we add a loading indicator when the user hits "submit?" Having no immediate visual response when the user clicks "submit" feels weird. A loading indicator would be nice. It will load for as long as it takes for the onyx data to come back and move us along to the next page. I think that should work?

dannymcclain · 2024-07-24T13:27:32Z

@blimpich would adding the loading spinner to the submit button work for what you're talking about? I feel like I've seen that pattern before and I think it would work well here for what we're trying to communicate ("Yes you've hit the button, we're working on it")

JKobrynski · 2024-07-24T13:27:58Z

@blimpich PR updated! I resolved both issues mentioned on slack, and I added a loading indicator to the form, let me know what you think!

blimpich

LGTM

src/libs/actions/Subscription.ts

OSBotify · 2024-07-24T17:06:01Z

✋ 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-07-25T03:37:56Z

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

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

OSBotify · 2024-07-26T05:13:07Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.12-0 🚀

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

OSBotify · 2024-07-26T05:36:20Z

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

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

JKobrynski added 9 commits June 28, 2024 08:16

add MenuItem and CalendarSolid icon

3255500

Merge branch 'main' into addRequestEarlyCancelationMenuItem

3f7797b

add RequestEarlyCancellationPage to navigator

012c728

add translations to first step

6b8ffab

create views for automatic and manual cancellation types

42c47a5

navigate to concierge chat from cancellation form

15c6bca

remove mocks and testing code

cbaac92

hide the menu item in native apps, fix styling

c2fd78b

Merge branch 'main' into addRequestEarlyCancelationMenuItem

2d341cc

JKobrynski marked this pull request as ready for review July 3, 2024 13:01

JKobrynski requested review from a team as code owners July 3, 2024 13:01

melvin-bot bot requested review from rushatgabhane and removed request for a team July 3, 2024 13:01