@blocklet/payment-react 1.26.2 → 1.26.4

package/src/payment/form/index.tsx

@@ -61,6 +61,7 @@ import LoadingButton from '../../components/loading-button';
 import OverdueInvoicePayment from '../../components/over-due-invoice-payment';
 import { saveCurrencyPreference } from '../../libs/currency';
 import ConfirmDialog from '../../components/confirm';
+import ServiceSuspendedDialog from '../../components/service-suspended-dialog';
 import PriceChangeConfirm from '../../components/price-change-confirm';
 import { getFieldValidation, validatePostalCode } from '../../libs/validator';
 
@@ -267,6 +268,7 @@ export default function PaymentForm({
     };
     customer?: TCustomer;
     customerLimited?: boolean;
+    serviceSuspended?: boolean;
     stripePaying: boolean;
     fastCheckoutInfo: FastCheckoutInfo | null;
     creditInsufficientInfo: {
@@ -289,6 +291,7 @@ export default function PaymentForm({
     stripeContext: undefined,
     customer,
     customerLimited: false,
+    serviceSuspended: false,
     stripePaying: false,
     fastCheckoutInfo: null,
     creditInsufficientInfo: null,
@@ -1198,6 +1201,11 @@ export default function PaymentForm({
           shouldToast = false;
           setState({ customerLimited: true });
         }
+
+        if (errorCode === 'STOP_ACCEPTING_ORDERS') {
+          shouldToast = false;
+          setState({ serviceSuspended: true });
+        }
       }
       if (shouldToast) {
         Toast.error(formatError(err));
@@ -1474,6 +1482,9 @@ export default function PaymentForm({
             }}
           />
         )}
+        {state.serviceSuspended && (
+          <ServiceSuspendedDialog open onClose={() => setState({ serviceSuspended: false })} />
+        )}
         {FastCheckoutConfirmDialog}
         {CreditInsufficientDialog}
         {PriceUpdatedDialog}
@@ -1748,6 +1759,7 @@ export default function PaymentForm({
           }}
         />
       )}
+      {state.serviceSuspended && <ServiceSuspendedDialog open onClose={() => setState({ serviceSuspended: false })} />}
       {FastCheckoutConfirmDialog}
       {CreditInsufficientDialog}
       {PriceUpdatedDialog}

package/src/payment/index.tsx

@@ -125,6 +125,19 @@ function PaymentInner({
   }, [paymentMethods]);
 
   const defaultCurrencyId = useMemo(() => {
+    // Keep session currency stable when a promotion is already applied.
+    // Otherwise auto-picking from URL/local preference/no-wallet may switch currency
+    // on refresh and trigger a second recalculate-promotion that removes discount
+    // with `currency_incompatible`.
+    const hasAppliedDiscount = Boolean((state.checkoutSession as any)?.discounts?.length);
+    if (
+      hasAppliedDiscount &&
+      state.checkoutSession.currency_id &&
+      availableCurrencyIds.includes(state.checkoutSession.currency_id)
+    ) {
+      return state.checkoutSession.currency_id;
+    }
+
     // 1. first check url currencyId
     if (query.currencyId && availableCurrencyIds.includes(query.currencyId)) {
       return query.currencyId;
@@ -151,7 +164,7 @@ function PaymentInner({
       return state.checkoutSession.currency_id;
     }
     return availableCurrencyIds?.[0];
-  }, [query.currencyId, availableCurrencyIds, session?.user, state.checkoutSession.currency_id, paymentMethods]);
+  }, [query.currencyId, availableCurrencyIds, session?.user, state.checkoutSession, paymentMethods]);
 
   const defaultMethodId = paymentMethods.find((m) => m.payment_currencies.some((c) => c.id === defaultCurrencyId))?.id;
   const hideSummaryCard = mode.endsWith('-minimal') || !showCheckoutSummary;
@@ -183,14 +196,23 @@ function PaymentInner({
   });
 
   useEffect(() => {
+    const hasAppliedDiscount = Boolean((state.checkoutSession as any)?.discounts?.length);
+    const currentCurrency = methods.getValues('payment_currency');
+    const currentMethod = methods.getValues('payment_method');
+
     if (defaultCurrencyId) {
-      methods.setValue('payment_currency', defaultCurrencyId);
+      // Avoid overriding current currency on refresh when a promotion is already applied.
+      if (!hasAppliedDiscount || !currentCurrency) {
+        methods.setValue('payment_currency', defaultCurrencyId);
+      }
     }
     if (defaultMethodId) {
-      methods.setValue('payment_method', defaultMethodId);
+      if (!hasAppliedDiscount || !currentMethod) {
+        methods.setValue('payment_method', defaultMethodId);
+      }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [defaultCurrencyId, defaultMethodId]);
+  }, [defaultCurrencyId, defaultMethodId, state.checkoutSession.discounts]);
 
   useEffect(() => {
     if (!isMobileSafari()) {