fix: Subscription size - Decimal point can be inserted and not removed on the confirmation page. #44507

Krishna2323 · 2024-06-26T21:20:28Z

Details

Fixed Issues

$ #43796
PROPOSAL: #43796 (comment)

Tests

Note: Subscription Size page is only available on web/mWeb and desktop app

Go to /settings/subscription/subscription-size
Enter a digit and a decimal point
Click Next
Verify decimal points are removed > Confirm
Open click on subscription size verify the input is cleared

Verify that no errors appear in the JS console

Offline tests

Note: Subscription Size page is only available on web/mWeb and desktop app

Go to /settings/subscription/subscription-size
Enter a digit and a decimal point
Click Next
Verify decimal points are removed > Confirm
Open click on subscription size verify the input is cleared

QA Steps

Note: Subscription Size page is only available on web/mWeb and desktop app

Go to /settings/subscription/subscription-size
Enter a digit and a decimal point
Click Next
Verify decimal points are removed > Confirm
Open click on subscription size verify the input is cleared

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

…d on the confirmation page. Signed-off-by: Krishna Gupta <[email protected]>

melvin-bot · 2024-06-26T21:20:33Z

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

fedirjh · 2024-06-26T21:37:10Z

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

+        InteractionManager.runAfterInteractions(() => {
+            FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);
+        });


@Krishna2323 This is not needed; we have already a code for cleaning the draft values when the form is closed.

calling FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM); without interaction manager will show 0 in the input before animation starts.

why do we have to clear the drafvalues here?

If not cleared, we will see value with decimals when we visit the form again.

App/src/components/Form/FormProvider.tsx

Lines 243 to 244 in e24cf4d

} else if (inputProps.shouldSaveDraft && draftValues?.[inputID] !== undefined && inputValues[inputID] === undefined) {

inputValues[inputID] = draftValues[inputID];

If not cleared, we will see value with decimals when we visit the form again.

@Krishna2323 could you please share steps to replicate this bug?

@Krishna2323 Here is the diff code

diff --git a/src/libs/actions/Subscription.ts b/src/libs/actions/Subscription.ts index beed2b1b29..4bd52bc8e8 100644 --- a/src/libs/actions/Subscription.ts +++ b/src/libs/actions/Subscription.ts @@ -7,6 +7,7 @@ import CONST from '@src/CONST'; import type {FeedbackSurveyOptionID, SubscriptionType} from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {OnyxData} from '@src/types/onyx/Request'; +import INPUT_IDS from '@src/types/form/SubscriptionSizeForm'; /** * Fetches data when the user opens the SubscriptionSettingsPage @@ -190,6 +191,11 @@ function updateSubscriptionSize(newSubscriptionSize: number, currentSubscription }, }, }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT, + value: null, + }, ], successData: [ { @@ -217,6 +223,13 @@ function updateSubscriptionSize(newSubscriptionSize: number, currentSubscription }, }, }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT, + value: { + [INPUT_IDS.SUBSCRIPTION_SIZE]: String(newSubscriptionSize), + }, + }, ], };

Friendly bump @Krishna2323.

@fedirjh, I will update in few moments, I still think this won't work correctly, in offline mode the input won't be cleared and if we clear it in optimistic data, the transition issue will occur but I will test and let you know.

@fedirjh, the subscription size is cleared before the animation happens, its hard to catch on web but I think it can cause regression on slower mWeb/native devices.

web_chrome.mp4

@Krishna2323 I see your point, it's not really that noticeable. I am still against using the InteractionManager.runAfterInteractions for web because it just uses setTimout under the hood and it looks hacky. One final try is to fall back to privateSubscription.userCount when the form draft is cleared; I will suggest the changes shortly.

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

Signed-off-by: Krishna Gupta <[email protected]>

fedirjh · 2024-07-01T00:44:52Z

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: mWeb Chrome

CleanShot.2024-07-01.at.01.41.30.mp4

iOS: Native

iOS: mWeb Safari

CleanShot.2024-07-01.at.01.23.36.mp4

MacOS: Chrome / Safari

CleanShot.2024-07-01.at.01.17.25.mp4

MacOS: Desktop

CleanShot.2024-07-01.at.01.43.45.mp4

fedirjh

Let's avoid the using InteractionManager.runAfterInteractions per https://github.com/Expensify/App/pull/44507/files#r1674425940

fedirjh · 2024-07-11T17:49:00Z

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

+        InteractionManager.runAfterInteractions(() => {
+            FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);
+        });


Suggested change

InteractionManager.runAfterInteractions(() => {

FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);

});

FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);

fedirjh · 2024-07-11T17:49:34Z

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

@@ -23,8 +23,9 @@ function Confirmation({onNext, isEditing}: ConfirmationProps) {
    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
    const [subscriptionSizeFormDraft] = useOnyx(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT);
    const subscriptionRenewalDate = getNewSubscriptionRenewalDate();
+    const subscriptionSizeDraft = subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0;


Suggested change

const subscriptionSizeDraft = subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0;

const subscriptionSizeDraft = subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0;

const subscriptionSize = subscriptionSizeDraft || (privateSubscription?.userCount ?? 0);

fedirjh · 2024-07-11T17:49:52Z

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

@@ -41,7 +42,7 @@ function Confirmation({onNext, isEditing}: ConfirmationProps) {
                    <MenuItemWithTopDescription
                        interactive={false}
                        description={translate('subscription.subscriptionSize.subscriptionSize')}
-                        title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSizeFormDraft ? subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE] : 0})}
+                        title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSizeDraft})}


Suggested change

title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSizeDraft})}

title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSize})}

Signed-off-by: krishna2323 <[email protected]>

Krishna2323 · 2024-07-15T08:06:50Z

@fedirjh, changes works well, thanks for the help🙏🏻, code updated.

fedirjh

Looks good and tests well

Krishna2323 · 2024-07-17T18:04:14Z

@AndrewGable bump for a review.

OSBotify · 2024-07-22T07:52:24Z

✋ 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-07-23T08:35:35Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.0.11-0 🚀

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

OSBotify · 2024-07-24T00:15:53Z

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.0.11-2 🚀

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

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

OSBotify · 2024-07-25T03:13:54Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.11-5 🚀

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

OSBotify · 2024-07-26T05:13:04Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.12-0 🚀

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

fix: Subscription size - Decimal point can be inserted and not remove…

7b25554

…d on the confirmation page. Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 requested a review from a team as a code owner June 26, 2024 21:20

melvin-bot bot requested review from fedirjh and removed request for a team June 26, 2024 21:20

fedirjh suggested changes Jun 26, 2024

View reviewed changes

minor updated.

518d99c

Signed-off-by: Krishna Gupta <[email protected]>

fedirjh suggested changes Jul 11, 2024

View reviewed changes

Krishna2323 added 2 commits July 15, 2024 13:16

Merge branch 'Expensify:main' into krishnna2323/issue/43796

518f36d

add suggested changes.

08c4a55

Signed-off-by: krishna2323 <[email protected]>

fedirjh approved these changes Jul 15, 2024

View reviewed changes

melvin-bot bot requested a review from AndrewGable July 15, 2024 13:33

AndrewGable approved these changes Jul 22, 2024

View reviewed changes

AndrewGable merged commit eec4d6a into Expensify:main Jul 22, 2024
15 checks passed

github-actions bot mentioned this pull request Jul 23, 2024

Deploy Checklist: New Expensify 2024-07-23 #45991

Closed

95 tasks

melvin-bot bot mentioned this pull request Jul 25, 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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Subscription size - Decimal point can be inserted and not removed on the confirmation page. #44507

fix: Subscription size - Decimal point can be inserted and not removed on the confirmation page. #44507

Krishna2323 commented Jun 26, 2024 •

edited

Loading

melvin-bot bot commented Jun 26, 2024

fedirjh Jun 26, 2024

Krishna2323 Jun 26, 2024

fedirjh Jun 26, 2024

Krishna2323 Jun 26, 2024 •

edited

Loading

fedirjh Jul 1, 2024

fedirjh Jul 9, 2024

fedirjh Jul 10, 2024

Krishna2323 Jul 10, 2024

Krishna2323 Jul 10, 2024

fedirjh Jul 11, 2024

fedirjh commented Jul 1, 2024 •

edited

Loading

fedirjh left a comment

fedirjh Jul 11, 2024

fedirjh Jul 11, 2024

fedirjh Jul 11, 2024

Krishna2323 commented Jul 15, 2024

fedirjh left a comment

Krishna2323 commented Jul 17, 2024

OSBotify commented Jul 22, 2024

OSBotify commented Jul 23, 2024

OSBotify commented Jul 24, 2024

OSBotify commented Jul 25, 2024

OSBotify commented Jul 26, 2024

	} else if (inputProps.shouldSaveDraft && draftValues?.[inputID] !== undefined && inputValues[inputID] === undefined) {
	inputValues[inputID] = draftValues[inputID];

	const subscriptionSizeDraft = subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0;
	const subscriptionSizeDraft = subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0;
	const subscriptionSize = subscriptionSizeDraft \|\| (privateSubscription?.userCount ?? 0);

	title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSizeDraft})}
	title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSize})}

fix: Subscription size - Decimal point can be inserted and not removed on the confirmation page. #44507

fix: Subscription size - Decimal point can be inserted and not removed on the confirmation page. #44507

Conversation

Krishna2323 commented Jun 26, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Krishna2323 Jun 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fedirjh commented Jul 1, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

fedirjh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Krishna2323 commented Jul 15, 2024

fedirjh left a comment

Choose a reason for hiding this comment

Krishna2323 commented Jul 17, 2024

OSBotify commented Jul 22, 2024

OSBotify commented Jul 23, 2024

OSBotify commented Jul 24, 2024

OSBotify commented Jul 25, 2024

OSBotify commented Jul 26, 2024

Krishna2323 commented Jun 26, 2024 •

edited

Loading

Krishna2323 Jun 26, 2024 •

edited

Loading

fedirjh commented Jul 1, 2024 •

edited

Loading