@blocklet/payment-react 1.26.1 → 1.26.3

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()) {