[Collect Pricing Update] Update Collect subscription pricing and the subscription page composition - #59077
Conversation
…tion-settings-rhp
…tion-settings-rhp
…tion-settings-rhp # Conflicts: # src/languages/params.ts
VickyStash
changed the title
|
On HOLD till BE updates are ready! |
…tion-settings-rhp # Conflicts: # src/pages/settings/Subscription/SubscriptionDetails/index.tsx
|
@amyevans If you're just looking to test the compare plan's navigation bar issue, this build #59077 (comment) should work too. |
Are you sure? Cause I've added a fix today morning 😅 |
Sorry, Please ignore my previous comment #59077 (comment) — I was able to reproduce the issue on the debug build. So, let's wait for the latest ad-hoc build to be created. |
|
Sounds good! |
|
By the way, I was also able to reproduce this issue on the Pixel 9 Pro emulator. Need to set to 3-button navigation mode to reproduce. If you want to verify it on the emulator, please make sure it’s in 3-button mode. 
|
amyevans
left a comment
amyevans
left a comment
There was a problem hiding this comment.
Took another pass at the code and it's looking good to me!
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
|
|
Hmm I see in the workflow run that Android built just fine - it's available here: https://ad-hoc-expensify-cash.s3.amazonaws.com/android/59077-hybrid/index.html I've tested on Android and can repro the overlapping navigation bar as mentioned here. |
|
Let me try one more time on my end quickly! |
Yep, it helped! |
|
Thanks, I'm testing it. |
|
@VickyStash Looks good now — all fixed! |
|
@amyevans, everything looks good here now. |
|
Amazing, thank you both! |
|
🚀 Deployed to staging by https://github.com/amyevans in version: 9.1.28-0 🚀
|
|
🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.28-15 🚀
|
| if (hasTeam2025Pricing && subscriptionPlan === CONST.POLICY.TYPE.TEAM) { | ||
| return null; | ||
| } | ||
|
|
| ); | ||
|
|
||
| return ( | ||
| <Modal |
There was a problem hiding this comment.
Not setting a maxHeight for the Modal caused #64948 where the user was not able to scroll the view on certain screen sizes.
8 participants
Explanation of Change
[Collect Pricing Update] Implement new pricing on Settings > Subscription page
Fixed Issues
$ #59007
$ #59005
$ #59006
PROPOSAL: N/A
Tests
You will need to test 4 user scenarios:
Repeat the following test steps for every user case:
Explore all plansbutton. Check that the subscription comparison modal follows the mockups.Upgrade to Control/Downgrade to Collect, make sure it works as expected.Offline tests
N/A
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same, as in the Tests section
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)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
Android: Native
android-old.mp4
android-new.mp4
Android: mWeb Chrome
android-web-new.mp4
android_web-old.mp4
iOS: Native
ios-new.mp4
ios-old.mp4
iOS: mWeb Safari
ios-web-new.mp4
ios-web-old.mp4
MacOS: Chrome / Safari
web-new.mp4
web-old.mp4
MacOS: Desktop
desktop-new.mp4
desktop-old.mp4