[CP Staging] Subscription plan card UI changes #55117

jayeshmangwani · 2025-01-11T11:23:11Z

Explanation of Change

In this PR, we implemented two main changes:

UpgradeIntro Component Update
Previously, the GenericFeaturesView was shown if the feature was null or there was no policyID. However, this approach failed for users accessing the "Categorize" option. When a user selects "Categorize" from the Self-DM whisper, the isCategorizing flag is set to true. In such scenarios, a separate Categories upgrade UI needs to be displayed. To address this, we added a condition to ensure that isCategorizing is false before checking the policyID.
SubscriptionPlanCard PressableWithFeedback Refactoring
We removed the parent View around the PressableWithFeedback for SubscriptionPlanCard component. This ensures that the PressableWithFeedback child has no untouchable area, allowing the entire card to act as a PressableWithFeedback.

Fixed Issues

$ #55110
$ #55111
$ #55112
$ #55113
PROPOSAL:

Tests

Test 1

Go to staging.new.expensify.com
Log in with a new Gmail account (no workspace).
Select "Track and budget expenses" during onboarding.
Complete the onboarding.
Go to self DM.
Track an expense.
Click Categorize it.
Veify that button in the upgrade modal should be "Upgrade" which allows user to directly create a new Collect workspace.

Test 2

Go to staging.new.expensify.com
Log in with a new account.
Create a workspace.
Go to Subscription tab.
Click on the empty space under Control plan content within the box.
Verify tha empty space under Control plan content within the box should respond to click.

Test 3

Go to staging.new.expensify.com
Log in with a new account.
Create a workspace.
Go back to Settings.
Go to Subscription tab.
Verify that Control plan modal will have bottom padding.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android.mov

Android: mWeb Chrome

mweb-chrome.mov

iOS: Native

iOS.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2025-01-11T11:23:16Z

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

jayeshmangwani · 2025-01-11T11:24:22Z

@DylanDylann Please help review this PR

DylanDylann · 2025-01-12T10:04:06Z

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

Uploading Screen Recording 2025-01-13 at 14.58.28.mov…

Android: mWeb Chrome

iOS: Native

Screen.Recording.2025-01-13.at.15.08.47.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-01-13.at.14.54.45.mov

MacOS: Desktop

Screen.Recording.2025-01-13.at.15.06.00.mov

MariaHCD

Code looks good overall but @jayeshmangwani could you outline the changes you've made in the Explanation of Change section of the PR description?

Beamanator

Agreed looking great! Will wait for @MariaHCD to merge 👍

Beamanator · 2025-01-13T08:35:06Z

Also FYI @jayeshmangwani I added $ before ALL GH issues in your PR description, not just the first one 👍

jayeshmangwani · 2025-01-13T08:46:44Z

@MariaHCD @Beamanator updated the Explanation of Change section and added a comment on the page explaining why we made this change. The comment is quite detailed, so let me know if you'd like me to revise or shorten it.

App/src/pages/workspace/upgrade/UpgradeIntro.tsx

Lines 49 to 58 in 84bc92c

    
               /** 
        
                * 
        
                * If the feature is null or there is no policyID, it indicates the user is not associated with any specific workspace. 
        
                * In this case, the generic upgrade view should be shown. 
        
                * However, the policyID check is only necessary when the user is not coming from the "Categorize" option. 
        
                * The "isCategorizing" flag is set to true when the user accesses the "Categorize" option in the Self-DM whisper. 
        
                * In such scenarios, a separate Categories upgrade UI is displayed. 
        
                * 
        
                */ 
        
               if (!feature || (!isCategorizing && !policyID)) {

jayeshmangwani · 2025-01-13T08:48:06Z

I added $ before ALL GH issues in your PR description, not just the first one 👍

Thanks for doing this! I'll make sure to add $ to all the issues in the future."

src/pages/workspace/upgrade/UpgradeIntro.tsx

Beamanator

All you @MariaHCD !

OSBotify · 2025-01-13T10:19:39Z

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

…ui_changes [CP Staging] Subscription plan card UI changes (cherry picked from commit b545bcf) (CP triggered by Beamanator)

github-actions · 2025-01-13T11:33:34Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.0.84-3 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-01-14T13:36:50Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.84-7 🚀

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

github-actions · 2025-01-14T13:58:46Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.84-7 🚀

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

jayeshmangwani added 2 commits January 11, 2025 13:57

fixed showing the collect upgrade policy view for categorizing

3492563

removed pressable parent View from Subscription Plans Card

1d869ea

jayeshmangwani requested a review from a team as a code owner January 11, 2025 11:23

melvin-bot bot requested review from suneox and removed request for a team January 11, 2025 11:23

Merge branch 'main' into subscription_plan_card_ui_changes

e1a655c

Merge branch 'main' into subscription_plan_card_ui_changes

67f949a

MariaHCD requested review from DylanDylann and removed request for suneox January 13, 2025 07:24

DylanDylann approved these changes Jan 13, 2025

View reviewed changes

melvin-bot bot requested a review from youssef-lr January 13, 2025 07:54

MariaHCD requested review from MariaHCD and removed request for youssef-lr January 13, 2025 07:59

MariaHCD reviewed Jan 13, 2025

View reviewed changes

Merge branch 'main' into subscription_plan_card_ui_changes

e1ad3d2

Beamanator mentioned this pull request Jan 13, 2025

$250 Track expense - Learn more in Upgrade modal opens not here page #55111

Closed

8 tasks

Beamanator previously approved these changes Jan 13, 2025

View reviewed changes

Beamanator changed the title ~~Subscription plan card UI changes~~ [CP Staging] Subscription plan card UI changes Jan 13, 2025

added a comment for GenericFeaturesView,when to display

84bc92c

jayeshmangwani dismissed Beamanator’s stale review via 84bc92c January 13, 2025 08:44

Beamanator requested changes Jan 13, 2025

View reviewed changes

src/pages/workspace/upgrade/UpgradeIntro.tsx Outdated Show resolved Hide resolved

removed unnecessary empty lines from comment

c52c520

Beamanator approved these changes Jan 13, 2025

View reviewed changes

MariaHCD approved these changes Jan 13, 2025

View reviewed changes

MariaHCD merged commit b545bcf into Expensify:main Jan 13, 2025
18 checks passed

OSBotify pushed a commit that referenced this pull request Jan 13, 2025

Merge pull request #55117 from jayeshmangwani/subscription_plan_card_…

84583f8

…ui_changes [CP Staging] Subscription plan card UI changes (cherry picked from commit b545bcf) (CP triggered by Beamanator)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Jan 13, 2025

github-actions bot mentioned this pull request Jan 13, 2025

Deploy Checklist: New Expensify 2025-01-11 #55109

Closed

39 tasks

CyberAndrii mentioned this pull request Jan 13, 2025

[CP Staging] Revert removal of the receipt param #55126

Merged

48 tasks

joekaufmanexpensify mentioned this pull request Jan 13, 2025

[HOLD for payment 2025-01-22] [HOLD for payment 2025-01-21] Track expense - "Go to workspaces" button appears in upgrade modal when there is no workspace #55110

Closed

8 tasks

srikarparsi mentioned this pull request Jan 13, 2025

[HOLD for payment 2025-01-22] [HOLD for payment 2025-01-21] Subscription - Empty space under plan content within the box does not respond to click #55112

Closed

8 tasks

melvin-bot bot mentioned this pull request Jan 14, 2025

[HOLD for payment 2025-01-22] [HOLD for payment 2025-01-21] mWeb - Subscription - Control plan modal does not have bottom padding #55113

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Subscription plan card UI changes #55117

[CP Staging] Subscription plan card UI changes #55117

jayeshmangwani commented Jan 11, 2025 •

edited

Loading

melvin-bot bot commented Jan 11, 2025

jayeshmangwani commented Jan 11, 2025

DylanDylann commented Jan 12, 2025 •

edited

Loading

MariaHCD left a comment

Beamanator left a comment

Beamanator commented Jan 13, 2025

jayeshmangwani commented Jan 13, 2025

jayeshmangwani commented Jan 13, 2025

Beamanator left a comment

OSBotify commented Jan 13, 2025

github-actions bot commented Jan 13, 2025

github-actions bot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

[CP Staging] Subscription plan card UI changes #55117

[CP Staging] Subscription plan card UI changes #55117

Conversation

jayeshmangwani commented Jan 11, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 11, 2025

jayeshmangwani commented Jan 11, 2025

DylanDylann commented Jan 12, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

MariaHCD left a comment

Choose a reason for hiding this comment

Beamanator left a comment

Choose a reason for hiding this comment

Beamanator commented Jan 13, 2025

jayeshmangwani commented Jan 13, 2025

jayeshmangwani commented Jan 13, 2025

Beamanator left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 13, 2025

github-actions bot commented Jan 13, 2025

github-actions bot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

jayeshmangwani commented Jan 11, 2025 •

edited

Loading

DylanDylann commented Jan 12, 2025 •

edited

Loading