diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.tsx index cbda2ff6c0a1..961bb5d46b57 100644 --- 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 index 7fda9c510381..dbb78e538239 100644 --- 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) {