[No QA] Add support for "none" cancellation type in `useCancellationType` hook and UI content map by marcaaron · Pull Request #64959 · Expensify/App

marcaaron · 2025-06-25T18:32:11Z

Explanation of Change

Added logic in useCancellationType to return CANCELLATION_TYPE.NONE if present in cancellation details.
Updated contentMap in RequestEarlyCancellationPage to handle the NONE cancellation type by mapping it to manualCancellationContent.

Fixed Issues

Tests

Prerequisites:

Create new account + control policy
Ran these queries to get the account in the correct state

UPDATE nameValuePairs 
SET value = JSON_OBJECT(
    'type', 'yearly2018',
    'endDate', '2025-07-01',
    'userCount', 18,
    'startDate', '2024-07-01',
    'autoRenew', true
)
WHERE name = 'private_subscription' 
AND accountID = 26949;

INSERT INTO purchases (accountID, created, amount, message, currency)
VALUES (
    26949,
    DATE('now'),
    100,
    JSON_OBJECT(
        'billingType', 'yearly2018',
        'totalActorCount', 21,
        'subscription', JSON_OBJECT(
            'userCount', 18,
            'type', 'yearly2018',
            'startDate', '2024-07-01',
            'endDate', '2025-07-01'
        ),
        'billableAmount', 100
    ),
    'USD'
);

Navigated to settings/subscription
Tapped "Request early cancellation" and answer survey with any reason
Verified that this copy shows

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

I think this is too complex of a billing situation for QA to reproduce so I am marking as No QA

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-06-25T18:32:17Z

@s77rt 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]

NikkiWines

You've got a lint failure but otherwise looks good!

marcaaron · 2025-06-26T17:11:55Z

Updated!

NikkiWines

👍

marcaaron · 2025-06-27T07:24:59Z

Oh, do we want to get a C+ to do the checklist or did you want to do that @NikkiWines ?

NikkiWines · 2025-06-27T18:39:34Z

I can do it after the hackathon today or on monday!

NikkiWines · 2025-07-07T12:41: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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp <-- N/A as it is not implemented there
- Android: mWeb Chrome
- iOS: HybridApp <-- N/A as it is not implemented there
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

NikkiWines · 2025-07-07T14:45:57Z

@marcaaron I don't seem to have the Request early cancellation option on iOS native (mweb is fine) can you confirm if you see the same?

I'm also unable to get my android emulator working correctly (it's just pointing to prod for some reason) but it looks fine on web, ios mweb, and desktop

marcaaron · 2025-07-11T22:54:23Z

Haven't had a chance to test this manually. I'll try to build this next week and see if I can repro what you saw @NikkiWines

marcaaron · 2025-07-23T00:37:07Z

Tried to look at this for a bit today, but getting the app to build is proving to be difficult and something more important keeps popping up. 🙃

marcaaron · 2025-07-23T02:21:06Z

Ok LOL so I spent FOREVER getting hybrid app to build. And then quickly realized that this is not supposed to show on native iOS or Android at all and was never implemented there 😄

@blimpich can you confirm? I think this is ready to merge otherwise as I won't be implementing it here if we need to.

OSBotify · 2025-07-23T02:31:05Z

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

github-actions · 2025-07-23T14:58:31Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.1.85-2 🚀

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

github-actions · 2025-07-25T07:16:13Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.1.85-5 🚀

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

Check cancellationDetails

0ea2469

marcaaron self-assigned this Jun 25, 2025

marcaaron requested a review from a team as a code owner June 25, 2025 18:32

melvin-bot Bot requested review from s77rt and removed request for a team June 25, 2025 18:32

marcaaron requested review from NikkiWines and removed request for s77rt June 25, 2025 18:32

NikkiWines requested changes Jun 25, 2025

View reviewed changes

Use canBeMissing: true

4ef9528

NikkiWines approved these changes Jun 27, 2025

View reviewed changes

Merge branch 'main' into marcaaron-requestEarlyCancellation

efe316c

marcaaron merged commit 15aa1ad into main Jul 23, 2025
22 of 23 checks passed

marcaaron deleted the marcaaron-requestEarlyCancellation branch July 23, 2025 02:22

github-actions Bot mentioned this pull request Jul 23, 2025

Deploy Checklist: New Expensify 2025-07-23 #66960

Closed

74 tasks

melvin-bot Bot mentioned this pull request Jul 25, 2025

[Due for payment 2025-08-01] RequestEarlyCancellation - CancellationType: none is not displaying the accurate message on the page. #64058

Closed

16 tasks

Conversation

marcaaron commented Jun 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 25, 2025

Uh oh!

NikkiWines left a comment

Choose a reason for hiding this comment

Uh oh!

marcaaron commented Jun 26, 2025

Uh oh!

NikkiWines left a comment

Choose a reason for hiding this comment

Uh oh!

marcaaron commented Jun 27, 2025

Uh oh!

NikkiWines commented Jun 27, 2025

Uh oh!

NikkiWines commented Jul 7, 2025 • edited by marcaaron Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

NikkiWines commented Jul 7, 2025

Uh oh!

marcaaron commented Jul 11, 2025

Uh oh!

marcaaron commented Jul 23, 2025

Uh oh!

marcaaron commented Jul 23, 2025

Uh oh!

Uh oh!

OSBotify commented Jul 23, 2025

Uh oh!

github-actions Bot commented Jul 23, 2025

Uh oh!

github-actions Bot commented Jul 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

marcaaron commented Jun 25, 2025 •

edited

Loading

NikkiWines commented Jul 7, 2025 •

edited by marcaaron

Loading