add suggested changes.

Signed-off-by: krishna2323 <[email protected]>
Expensify · Jul 15, 2024 · 08c4a55 · 08c4a55
1 parent 518f36d
commit 08c4a55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.tsx
@@ -1,6 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
-import {InteractionManager} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -31,9 +30,7 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) {
     const onFinished = () => {
         Subscription.updateSubscriptionSize(subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0, privateSubscription?.userCount ?? 0);
         Navigation.goBack();
-        InteractionManager.runAfterInteractions(() => {
-            FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);
-        });
+        FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);
     };
 
     const {componentToRender: SubStep, screenIndex, nextScreen, prevScreen, moveTo} = useSubStep({bodyContent, startFrom, onFinished});

diff --git a/src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx b/src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx
@@ -24,6 +24,7 @@ function Confirmation({onNext, isEditing}: ConfirmationProps) {
     const [subscriptionSizeFormDraft] = useOnyx(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT);
     const subscriptionRenewalDate = getNewSubscriptionRenewalDate();
     const subscriptionSizeDraft = subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0;
+    const subscriptionSize = subscriptionSizeDraft || (privateSubscription?.userCount ?? 0);
 
     const isTryingToIncreaseSubscriptionSize = subscriptionSizeDraft > (privateSubscription?.userCount ?? 0);
     const canChangeSubscriptionSize = (account?.canDowngrade ?? false) || (isTryingToIncreaseSubscriptionSize && isEditing);
@@ -42,7 +43,7 @@ function Confirmation({onNext, isEditing}: ConfirmationProps) {
                     <MenuItemWithTopDescription
                         interactive={false}
                         description={translate('subscription.subscriptionSize.subscriptionSize')}
-                        title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSizeDraft})}
+                        title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSize})}
                     />
                     <MenuItemWithTopDescription
                         interactive={false}