[Payment card / Subscription] Rollout feature: replace Subscriptions menu item #45089
Conversation
|
@rayane-djouah 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] |
| @@ -52,7 +52,7 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) { | |||
| ...(shouldShowSubscriptionsMenu | |||
There was a problem hiding this comment.
what about this place? Shouldnt flag be removed from here as well and then altogether from codebase?
There was a problem hiding this comment.
I think it would make sense, but from what I can see, this screen is not used anywhere 🤔 What do you think?
CC: @fabioh8010
There was a problem hiding this comment.
Hmm I thought you've added it here :D Now that I think of it shouldn't the action lead to NewDot Subscription page now that we've build it here or is this something completely different?
There was a problem hiding this comment.
It seems that AllSettingsScreen is not used anywhere in the app, but I think it's safer to replace shouldShowSubscriptionsMenu with the new NVP there. and delete shouldShowSubscriptionsMenu files as they are not needed anymore.
|
How can I create an active subscription in old dot? |
Just create a |
|
@rayane-djouah confirming you're good here? |
|
@trjExpensify - yeah, will update shortly, could you please give me access to the design doc to ensure that I have full requirements understanding? |
|
Done! |
| @@ -222,7 +221,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa | |||
| sectionTranslationKey: 'common.workspaces', | |||
| items, | |||
| }; | |||
| }, [policies, styles.badgeSuccess, styles.workspaceSettingsSectionContainer, translate]); | |||
| }, [policies, privateSubscription, styles, translate]); | |||
There was a problem hiding this comment.
| }, [policies, privateSubscription, styles, translate]); | |
| }, [policies, privateSubscription, styles.lhnSuccessText, styles.workspaceSettingsSectionContainer, translate]); |
|
Bug: "Free trial" label is not aligned to the right with other icons 
cc @Expensify/design |
|
Hmm yeah, and shouldn't that use our badge pattern to? From staging, I see this when I make a trial: |
|
I see this in the design mocks: 
So, I guess we don't use the badge pattern for this by design? and I guess the "Free trial" label and the RBR also should be aligned to the right with other icons, right? |
|
cc @Expensify/design - do you remember where we landed with this one? |
Screenshots/VideosAndroid: NativeScreen.Recording.2024-07-10.at.6.47.52.PM.movAndroid: mWeb ChromeScreen.Recording.2024-07-10.at.6.37.49.PM.moviOS: NativeSimulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-07-10.at.18.38.18.mp4iOS: mWeb SafariSimulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-07-10.at.18.34.51.mp4MacOS: Chrome / SafariScreen.Recording.2024-07-10.at.6.31.19.PM.mov
MacOS: DesktopScreen.Recording.2024-07-10.at.6.35.10.PM.mov |
|
@JKobrynski - has the Spanish copy been approved internally? |
We landed on using the badge as seen in this Figma file/mock. I think the mock that's being referenced here is an old one. TLDR: Staging is correct. |
|
@dannymcclain - could you please share the mock here, the shared link is internal |
|
Oops, sorry! It basically looks identical to what Shawn's screenshot shows.
|
|
Updated, this is what it looks like now:
|
|
Can you show us what the hover/active state of that row looks like too? |
|
@shawnborton - Here is a video that shows the hover/active state: Screen.Recording.2024-07-11.at.3.41.00.PM.movAnd this screenshot shows the RBR: 
|
| lhnSuccessText: { | ||
| color: theme.success, | ||
| fontWeight: FontUtils.fontWeight.bold, | ||
| }, | ||
|
|
There was a problem hiding this comment.
| lhnSuccessText: { | |
| color: theme.success, | |
| fontWeight: FontUtils.fontWeight.bold, | |
| }, |
| @@ -89,7 +90,7 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) { | |||
| hoverAndPressStyle: styles.hoveredComponentBG, | |||
| brickRoadIndicator: item.brickRoadIndicator, | |||
| })); | |||
| }, [isSmallScreenWidth, styles.hoveredComponentBG, styles.sectionMenuItem, translate, waitForNavigate, policies]); | |||
| }, [isSmallScreenWidth, policies, privateSubscription, waitForNavigate, translate, styles]); | |||
There was a problem hiding this comment.
| }, [isSmallScreenWidth, policies, privateSubscription, waitForNavigate, translate, styles]); | |
| }, [isSmallScreenWidth, policies, privateSubscription, waitForNavigate, translate, styles.hoveredComponentBG, styles.sectionMenuItem]); |
There was a problem hiding this comment.
NAB as this component is not used anywhere in the app
Screenshots/VideosAndroid: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / SafariScreen.Recording.2024-07-11.at.3.41.00.PM.movMacOS: DesktopScreen.Recording.2024-07-11.at.3.51.56.PM.mov |
|
Nice, this looks pretty great to me. Thanks! |
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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.
toggleReportand notonIconClick). - 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
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
There was a problem hiding this comment.
LGTM, waiting for confirmation that we're ready to make the subscription page available to customers before merging.
blimpich
changed the title
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.7-3 🚀
|
|
🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
|
🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀
|
|
🚀 Deployed to production by https://github.com/mountiny in version: 9.0.8-6 🚀
|
| @@ -49,10 +50,10 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) { | |||
| focused: !isSmallScreenWidth, | |||
| brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined, | |||
| }, | |||
| ...(shouldShowSubscriptionsMenu | |||
| ...(privateSubscription | |||
There was a problem hiding this comment.
Not considering an active subscription plan based on control/collect workspace for display of subscription menu resulted in #45720
Details
Fixed Issues
$ #42473
PROPOSAL: N/A
Tests
Offline tests
N/A
QA Steps
Same as Tests section above
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
MacOS: Chrome / Safari
Active
Inactive
Free trial
Brick road indicator