fix: small corrections

Expensify · Jul 2, 2024 · 962f925 · 962f925
1 parent 0ac4188
commit 962f925
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/SubscriptionBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/SubscriptionBillingBanner.tsx
@@ -14,7 +14,7 @@ type SubscriptionBillingBannerProps = Omit<BillingBannerProps, 'titleStyle' | 's
     icon?: IconAsset;
 };
 
-function SubscriptionBillingBanner({title, subtitle, rightIcon, icon, isError, onRightIconPress, rightIconAccessibilityLabel}: SubscriptionBillingBannerProps) {
+function SubscriptionBillingBanner({title, subtitle, rightIcon, icon, isError = false, onRightIconPress, rightIconAccessibilityLabel}: SubscriptionBillingBannerProps) {
     const styles = useThemeStyles();
 
     const iconAsset = icon ?? isError ? Illustrations.CreditCardEyes : Illustrations.CheckmarkCircle;

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -61,7 +61,7 @@ function CardSection() {
     let BillingBanner: React.ReactNode | undefined;
     if (CardSectionUtils.shouldShowPreTrialBillingBanner()) {
         BillingBanner = <PreTrialBillingBanner />;
-    } else if (billingStatus?.title && billingStatus?.subtitle) {
+    } else if (billingStatus) {
         BillingBanner = (
             <SubscriptionBillingBanner
                 title={billingStatus.title}
@@ -110,14 +110,13 @@ function CardSection() {
                 )}
                 {isEmptyObject(defaultCard?.accountData) && <CardSectionDataEmpty />}
             </View>
-            {billingStatus?.isRetryAvailable && (
+            {billingStatus?.isRetryAvailable !== undefined && (
                 <Button
                     text={translate('subscription.cardSection.retryPaymentButton')}
-                    isDisabled={isOffline}
+                    isDisabled={isOffline || !billingStatus?.isRetryAvailable}
                     isLoading={subscriptionRetryBillingStatusPending}
                     onPress={handleRetryPayment}
                     style={[styles.w100, styles.mt5]}
-                    success
                     large
                 />
             )}

diff --git a/src/pages/settings/Subscription/CardSection/utils.ts b/src/pages/settings/Subscription/CardSection/utils.ts
@@ -116,6 +116,7 @@ function getBillingStatus(
                 title: translate('subscription.billingBanner.retryBillingError.title'),
                 subtitle: translate('subscription.billingBanner.retryBillingError.subtitle'),
                 isError: true,
+                isRetryAvailable: false,
             };
 
         default: