fix: small corrections

MrMuzyk · Jun 11, 2024 · 788ecd9 · 788ecd9
1 parent 6cbb13c
commit 788ecd9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/src/pages/settings/Subscription/SubscriptionDetails/index.tsx b/src/pages/settings/Subscription/SubscriptionDetails/index.tsx
@@ -54,7 +54,7 @@ function SubscriptionDetails() {
     };
 
     const onSubscriptionSizePress = () => {
-        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_SIZE);
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_SIZE.getRoute(1));
     };
 
     // This section is only shown when the subscription is annual

diff --git a/src/pages/settings/Subscription/SubscriptionSize/SubscriptionSizePage.tsx b/src/pages/settings/Subscription/SubscriptionSize/SubscriptionSizePage.tsx
@@ -23,8 +23,8 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) {
     const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
     const [subscriptionSizeFormDraft] = useOnyx(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT);
     const {translate} = useLocalize();
-    const CAN_CHANGE_SUBSCRIPTION_SIZE = !!(route.params?.canChangeSize ?? 1);
-    const startFrom = CAN_CHANGE_SUBSCRIPTION_SIZE ? 0 : 1;
+    const canChangeSubscriptionSize = !!(route.params?.canChangeSize ?? 0);
+    const startFrom = canChangeSubscriptionSize ? 0 : 1;
 
     const onFinished = () => {
         Subscription.updateSubscriptionSize(subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0, privateSubscription?.userCount ?? 0);
@@ -55,7 +55,7 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) {
                 onBackButtonPress={onBackButtonPress}
             />
             <SubStep
-                isEditing={CAN_CHANGE_SUBSCRIPTION_SIZE}
+                isEditing={canChangeSubscriptionSize}
                 onNext={nextScreen}
                 onMove={moveTo}
             />

diff --git a/src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx b/src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx
@@ -11,6 +11,7 @@ import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import {getNewSubscriptionRenewalDate} from '@pages/settings/Subscription/SubscriptionSize/utils';
+import * as FormActions from '@userActions/FormActions';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/SubscriptionSizeForm';
@@ -25,12 +26,18 @@ function Confirmation({onNext, isEditing}: ConfirmationProps) {
     const [subscriptionSizeFormDraft] = useOnyx(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT);
     const subscriptionRenewalDate = getNewSubscriptionRenewalDate();
 
-    const CAN_CHANGE_SUBSCRIPTION_SIZE = ((account?.canDowngrade ?? false) || (Number(subscriptionSizeFormDraft) ?? 0) >= (privateSubscription?.userCount ?? 0)) && isEditing;
-    const SUBSCRIPTION_UNTIL = privateSubscription?.endDate ? format(new Date(privateSubscription?.endDate), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT) : '';
+    const isTryingToIncreaseSubscriptionSize = (subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0) > (privateSubscription?.userCount ?? 0);
+    const canChangeSubscriptionSize = (account?.canDowngrade ?? false) || (isTryingToIncreaseSubscriptionSize && isEditing);
+    const newSubscriptionEndDate = privateSubscription?.endDate ? format(new Date(privateSubscription?.endDate), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT) : '';
+
+    const onClosePress = () => {
+        FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);
+        Navigation.goBack();
+    };
 
     return (
         <View style={[styles.flexGrow1]}>
-            {CAN_CHANGE_SUBSCRIPTION_SIZE ? (
+            {canChangeSubscriptionSize ? (
                 <>
                     <Text style={[styles.ph5, styles.pb3]}>{translate('subscription.subscriptionSize.confirmDetails')}</Text>
                     <MenuItemWithTopDescription
@@ -50,13 +57,13 @@ function Confirmation({onNext, isEditing}: ConfirmationProps) {
                     <Text style={[styles.ph5, styles.textNormalThemeText]}>
                         {translate('subscription.subscriptionSize.youAlreadyCommitted', {
                             size: privateSubscription?.userCount ?? 0,
-                            date: SUBSCRIPTION_UNTIL,
+                            date: newSubscriptionEndDate,
                         })}
                     </Text>
                 </>
             )}
             <FixedFooter style={[styles.mtAuto]}>
-                {CAN_CHANGE_SUBSCRIPTION_SIZE ? (
+                {canChangeSubscriptionSize ? (
                     <Button
                         success
                         large
@@ -67,7 +74,7 @@ function Confirmation({onNext, isEditing}: ConfirmationProps) {
                     <Button
                         success
                         large
-                        onPress={() => Navigation.goBack()}
+                        onPress={onClosePress}
                         text={translate('common.close')}
                     />
                 )}

diff --git a/src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx b/src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx
@@ -33,6 +33,7 @@ function Size({onNext}: SizeProps) {
             onSubmit={onNext}
             validate={validate}
             style={[styles.mh5, styles.flexGrow1]}
+            enabledWhenOffline
         >
             <View>
                 <Text style={[styles.textNormalThemeText, styles.mb5]}>{translate('subscription.subscriptionSize.yourSize')}</Text>