feat: Subscription size backend integration by MrMuzyk · Pull Request #43484 · Expensify/App

MrMuzyk · 2024-06-11T14:33:48Z

Details

Integrated Subscription Size parts with backend. Data now comes from API and proper API calls are performed when executed

Fixed Issues

$ #38631

Tests

To access this newly created component, paste the following link into the browser

https://dev.new.expensify.com:8082/settings/subscription

or add this effect to InitialSettingsPage.tsx

useEffect(() => {
    Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)
}, [])

Try to change subscription size to lower/higher number
Verify that no errors appear in the JS console

Offline tests

QA Steps

useEffect(() => {
    Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)
}, [])

Try to change subscription size to lower/higher number
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

sub-size-ba-integration.mp4

…scription-size-backend-integration

…p into feat/subscription-size-backend-integration

…scription-size-backend-integration

melvin-bot · 2024-06-11T14:33:54Z

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

mananjadhav · 2024-06-11T16:45:16Z

Reviewing this now. @MrMuzyk can you resolve the conflicts?

src/libs/actions/Subscription.ts

mananjadhav · 2024-06-11T17:42:28Z

Overall looks great, just one question on the optimistic error handling.

mananjadhav · 2024-06-11T19:55:35Z

@MrMuzyk I can see a couple small issues:

After updating the subscription size, when we redirect to settings/subscription the query string canChangeSize=1 isn't removed from the URL.
If I open https://dev.new.expensify.com:8082/settings/subscription/subscription-size?canChangeSize=0, and then manually change value of canChangeSize, 0 to 1 the text input is blank. Ideally it shouldn't be blank right?
Clicking on X (close) for the RBR doesn't do anything.
Setting the same value as the existing userCount, still shows an error message that we can't downgrade the plan.
Going offline to online, shows several API failures with 404 error.

web-subscription-size-change-1.mov

web-subscription-size-change-2.mov

web-subscription-size-change-3.mov

mananjadhav · 2024-06-11T20:03:04Z

Also can you correct the typo:

Integrated Subscription Size parts with backend. Data now comes from API and proper API calls are performed when exectued

Integrated Subscription Size parts with backend. Data now comes from API and proper API calls are performed when executed

…scription-size-backend-integration

MrMuzyk · 2024-06-12T10:40:59Z

@mananjadhav

Rebased and fixed conflicts, added error clear on success and fixed the typo.

Is it a problem? I doesn't affect page behaviour in any way. Everything works correctly and if you navigate to some other route that isn't related to subscription it disappears.
I wasn't able to reproduce that behaviour. Did you do anything special in order to achieve that?

change-to-1.mp4

Did you mean clicking X on error message? Added handler for that
Asked for guidelines on this as Im not sure how it should behave
I couldn't reproduce that as well

offline-mode.mp4

…scription-size-backend-integration

MrMuzyk · 2024-06-13T08:16:30Z

@mananjadhav

We're now displaying special error message in case user tries to proceed without changing current subscription size

MrMuzyk · 2024-06-13T12:03:59Z

There is one issue that became visible after merging with main but is unrelated to my changes. When navigating between the screens content shifts - Im trying to find a cause but the fix might come in next PR

Screen.Recording.2024-06-13.at.14.00.17.mov

MrMuzyk · 2024-06-13T14:01:34Z

Found the cause - had to exclude subscription ROOT screen from FocusTrap. Everything should behave correctly now

mananjadhav

Overall the code changes look fine to me. I'll get started on the checklist and testing.

mananjadhav · 2024-06-13T15:52:01Z

@MrMuzyk @amyevans We're showing all the errors in red as an input error.

But when we enter the subscription size count lesser than the current value we show the error in the RHS as a separate screen. Does make sense to add this also as red error message?

mananjadhav · 2024-06-13T16:06:10Z

Also let's add a FE validation to only allow integers? Although API doesn't accept decimals (2.05, etc.) but FE allows it.

Screen.Recording.2024-06-13.at.9.32.00.PM.mov

mananjadhav · 2024-06-13T16:18:46Z

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

android-subscription-size-change.mov

Android: mWeb Chrome

mweb-chrome-subscription-size-change.mov

iOS: Native

ios-subscription-size-change.mov

iOS: mWeb Safari

mweb-safari-subscription-size-change.mov

MacOS: Chrome / Safari

web-subscription-size-change_rJfsrAd4.mp4

MacOS: Desktop

desktop-subscription-size-change.mov

mananjadhav · 2024-06-13T16:20:33Z

Just final edge cases. @amyevans Can you review in parallel?

amyevans · 2024-06-13T16:46:40Z

@MrMuzyk @amyevans We're showing all the errors in red as an input error.

But when we enter the subscription size count lesser than the current value we show the error in the RHS as a separate screen. Does make sense to add this also as red error message?

Hmm let's get @dannymcclain's input on this one

dannymcclain · 2024-06-13T17:21:44Z

No I don't think we want to use red on that second screen. We use red for validation errors and violations to call your attention to the message, but the text on that screen is isolated and just explaining why you can't do that action. It's informational and there's nothing else competing for it's attention, so we should just leave it as normal text.

We do need to add a period at the end of the first sentence though 🙃

amyevans · 2024-06-13T17:25:42Z

Well I think the suggestion was to totally remove the second screen and move all this text to be an inline error. But that makes sense that we'd treat it differently than a true "error" and leave it as currently implemented 👍

@MrMuzyk can you add the period to the end of the sentence please?

src/libs/actions/Subscription.ts

amyevans

A few things to address from my perspective as well. Thanks!

src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx

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

amyevans

Looks like @mananjadhav's feedback was addressed and he already completed the checklist, and I'm 👍 on the code and testing, so I think we're all set to merge here!

OSBotify · 2024-06-14T15:49:06Z

✋ 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-06-14T23:17:12Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.4.84-0 🚀

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

OSBotify · 2024-06-17T23:49:25Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.84-3 🚀

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

MrMuzyk added 7 commits June 7, 2024 15:45

feat: subscription size backend integration

dea3afe

Merge branch 'main' of https://github.com/Expensify/App into feat/sub…

2cf3159

…scription-size-backend-integration

feat: draft

ef78c2a

Merge branch 'feat/subscription-size-action' of github.com:MrMuzyk/Ap…

6cbb13c

…p into feat/subscription-size-backend-integration

fix: small corrections

788ecd9

Merge branch 'feat/subscription-size-action' of github.com:MrMuzyk/Ap…

54de1f9

…p into feat/subscription-size-backend-integration

Merge branch 'main' of https://github.com/Expensify/App into feat/sub…

e59bb13

…scription-size-backend-integration

MrMuzyk requested a review from a team as a code owner June 11, 2024 14:33

melvin-bot bot requested review from alitoshmatov and removed request for a team June 11, 2024 14:33

MrMuzyk changed the title ~~Feat/subscription size backend integration~~ feat: Subscription size backend integration Jun 11, 2024

trjExpensify requested review from mananjadhav and removed request for alitoshmatov June 11, 2024 15:30

mananjadhav reviewed Jun 11, 2024

View reviewed changes

src/libs/actions/Subscription.ts Show resolved Hide resolved

MrMuzyk added 2 commits June 12, 2024 09:37

Merge branch 'main' of https://github.com/Expensify/App into feat/sub…

eb32098

…scription-size-backend-integration

fix: cr fixes

ceff8da

MrMuzyk added 2 commits June 13, 2024 09:39

fix: handle same size case

677324e

Merge branch 'main' of https://github.com/Expensify/App into feat/sub…

333f27e

…scription-size-backend-integration

MrMuzyk added 2 commits June 13, 2024 10:54

fix: linter

1de92de

fix: linter

cb43cda

MrMuzyk requested a review from mananjadhav June 13, 2024 12:31

fix: exclude subscription screen from focus trap

4d819c9

mananjadhav reviewed Jun 13, 2024

View reviewed changes

amyevans reviewed Jun 13, 2024

View reviewed changes

src/libs/actions/Subscription.ts Outdated Show resolved Hide resolved

amyevans requested changes Jun 13, 2024

View reviewed changes

src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx Outdated Show resolved Hide resolved

src/pages/settings/Subscription/SubscriptionDetails/index.tsx Outdated Show resolved Hide resolved

MrMuzyk added 2 commits June 14, 2024 10:39

fix: various cr fixes

18d8ea7

fix: linter

be89e44

MrMuzyk requested review from amyevans and mananjadhav June 14, 2024 09:07

amyevans approved these changes Jun 14, 2024

View reviewed changes

amyevans merged commit 8dea433 into Expensify:main Jun 14, 2024

github-actions bot mentioned this pull request Jun 14, 2024

Deploy Checklist: New Expensify 2024-06-14 #43793

Closed

53 tasks

melvin-bot bot mentioned this pull request Jun 17, 2024

[HOLD for payment 2024-06-28] [HOLD for payment 2024-06-24] [Payment card / Subscription] Integrate “Subscription size” screen with backend data and “Subscription details” section #38631

Closed

fedirjh mentioned this pull request Aug 2, 2024

[HOLD for payment 2024-08-01] [$250] Subscription size - Decimal point can be inserted and not removed on the confirmation page #43796

Closed

6 tasks

Conversation

MrMuzyk commented Jun 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 11, 2024

Uh oh!

mananjadhav commented Jun 11, 2024

Uh oh!

Uh oh!

mananjadhav commented Jun 11, 2024

Uh oh!

mananjadhav commented Jun 11, 2024

Uh oh!

mananjadhav commented Jun 11, 2024

Uh oh!

MrMuzyk commented Jun 12, 2024

Uh oh!

MrMuzyk commented Jun 13, 2024

Uh oh!

MrMuzyk commented Jun 13, 2024

Uh oh!

MrMuzyk commented Jun 13, 2024

Uh oh!

mananjadhav left a comment

Choose a reason for hiding this comment

Uh oh!

mananjadhav commented Jun 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mananjadhav commented Jun 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mananjadhav commented Jun 13, 2024 • edited by amyevans Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mananjadhav commented Jun 13, 2024

Uh oh!

amyevans commented Jun 13, 2024

Uh oh!

dannymcclain commented Jun 13, 2024

Uh oh!

amyevans commented Jun 13, 2024

Uh oh!

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jun 14, 2024

Uh oh!

OSBotify commented Jun 14, 2024

Uh oh!

OSBotify commented Jun 17, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MrMuzyk commented Jun 11, 2024 •

edited

Loading

mananjadhav commented Jun 13, 2024 •

edited

Loading

mananjadhav commented Jun 13, 2024 •

edited

Loading

mananjadhav commented Jun 13, 2024 •

edited by amyevans

Loading