@blocklet/payment-react 1.18.30 → 1.18.32

package/src/components/over-due-invoice-payment.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/indent */
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { Button, Typography, Stack, Alert, SxProps } from '@mui/material';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -13,6 +13,7 @@ import type {
   TInvoiceExpanded,
 } from '@blocklet/payment-types';
 import { useRequest } from 'ahooks';
+import pWaitFor from 'p-wait-for';
 import { Dialog } from '@arcblock/ux';
 import { CheckCircle as CheckCircleIcon } from '@mui/icons-material';
 import debounce from 'lodash/debounce';
@@ -113,6 +114,7 @@ function OverdueInvoicePayment({
   const sourceType = subscriptionId ? 'subscription' : 'customer';
   const effectiveCustomerId = customerId || session?.user?.did;
   const sourceId = subscriptionId || effectiveCustomerId;
+  const customerIdRef = useRef(effectiveCustomerId);
   const {
     data = {
       summary: {},
@@ -123,6 +125,11 @@ function OverdueInvoicePayment({
     runAsync: refresh,
   } = useRequest(() => fetchOverdueInvoices({ subscriptionId, customerId: effectiveCustomerId, authToken }), {
     ready: !!subscriptionId || !!effectiveCustomerId,
+    onSuccess: (res) => {
+      if (res.customer?.id && res.customer?.id !== customerIdRef.current) {
+        customerIdRef.current = res.customer?.id;
+      }
+    },
   });
 
   const detailUrl = useMemo(() => {
@@ -163,16 +170,50 @@ function OverdueInvoicePayment({
     }
   );
 
+  const isCrossOriginRequest = isCrossOrigin();
+
   const subscription = useSubscription('events');
+  const waitForInvoiceAllPaid = async () => {
+    let isPaid = false;
+    await pWaitFor(
+      async () => {
+        const res = await refresh();
+        isPaid = res.invoices?.length === 0;
+        return isPaid;
+      },
+      { interval: 2000, timeout: 3 * 60 * 1000 }
+    );
+    return isPaid;
+  };
+
+  const handleConnected = async () => {
+    if (isCrossOriginRequest) {
+      try {
+        const paid = await waitForInvoiceAllPaid();
+        if (successToast) {
+          Toast.close();
+          Toast.success(t('payment.customer.invoice.paySuccess'));
+        }
+        if (paid) {
+          setDialogOpen(false);
+          onPaid(sourceId as string, selectCurrencyId, sourceType as 'subscription' | 'customer');
+        }
+      } catch (err) {
+        console.error('Check payment status failed:', err);
+      }
+    }
+  };
+
   useEffect(() => {
-    if (subscription) {
+    if (subscription && !isCrossOriginRequest) {
       subscription.on('invoice.paid', ({ response }: { response: TInvoiceExpanded }) => {
         const relevantId = subscriptionId || response.customer_id;
         const uniqueKey = `${relevantId}-${response.currency_id}`;
 
         if (
           (subscriptionId && response.subscription_id === subscriptionId) ||
-          (effectiveCustomerId && [data.customer?.id, effectiveCustomerId].includes(response.customer_id))
+          (effectiveCustomerId && effectiveCustomerId === response.customer_id) ||
+          (customerIdRef.current && customerIdRef.current === response.customer_id)
         ) {
           if (!processedCurrencies[uniqueKey]) {
             setProcessedCurrencies((prev) => ({ ...prev, [uniqueKey]: 1 }));
@@ -214,10 +255,11 @@ function OverdueInvoicePayment({
         saveConnect: false,
         action: 'collect-batch',
         prefix: joinURL(getPrefix(), '/api/did'),
-        useSocket: isCrossOrigin() === false,
+        useSocket: !isCrossOriginRequest,
         extraParams,
         onSuccess: () => {
           connect.close();
+          handleConnected();
           setPayLoading(false);
           setPaymentStatus((prev) => ({
             ...prev,

package/src/libs/util.ts

@@ -597,6 +597,19 @@ export function formatPriceDisplay(
   return [amount, then].filter(Boolean).join(' ');
 }
 
+export function hasMultipleRecurringIntervals(items: TLineItemExpanded[]): boolean {
+  const intervals = new Set<string>();
+  for (const item of items) {
+    if (item.price?.recurring?.interval && item.price?.type === 'recurring') {
+      intervals.add(`${item.price.recurring.interval}-${item.price.recurring.interval_count}`);
+      if (intervals.size > 1) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 export function getFreeTrialTime(
   { trialInDays, trialEnd }: { trialInDays: number; trialEnd: number },
   locale: string = 'en'
@@ -685,8 +698,10 @@ export function formatCheckoutHeadlines(
     locale
   );
   const hasMetered = items.some((x) => x.price.type === 'recurring' && x.price.recurring?.usage_type === 'metered');
+  const differentRecurring = hasMultipleRecurringIntervals(items);
   // all recurring
   if (items.every((x) => x.price.type === 'recurring')) {
+    // check if there has different recurring price
     const subscription = [
       hasMetered ? t('payment.checkout.least', locale) : '',
       fromUnitToToken(
@@ -749,7 +764,7 @@ export function formatCheckoutHeadlines(
       action: t('payment.checkout.sub1', locale, { name }),
       amount,
       then: hasMetered ? t('payment.checkout.meteredThen', locale, { recurring }) : recurring,
-      showThen: hasMetered,
+      showThen: hasMetered && !differentRecurring,
       actualAmount,
     };
     return {
@@ -780,7 +795,7 @@ export function formatCheckoutHeadlines(
       hasMetered && Number(subscription) === 0,
       locale
     ),
-    showThen: true,
+    showThen: !differentRecurring,
     actualAmount,
   };
 

package/src/locales/en.tsx

@@ -118,6 +118,7 @@ export default flat({
       next: {
         subscription: 'View subscription',
         invoice: 'View invoice',
+        view: 'View',
       },
       paymentRequired: 'Payment Required',
       staking: {

package/src/locales/zh.tsx

@@ -118,6 +118,7 @@ export default flat({
       next: {
         subscription: '查看订阅',
         invoice: '查看账单',
+        view: '查看',
       },
       paymentRequired: '支付金额',
       staking: {

package/src/payment/form/currency.tsx

@@ -3,7 +3,7 @@ import { Avatar, Card, Radio, Stack, Typography } from '@mui/material';
 import { styled } from '@mui/system';
 
 type Props = {
-  value: number;
+  value: string;
   currencies: TPaymentCurrency[];
   onChange: Function;
 };
@@ -18,13 +18,13 @@ export default function CurrencySelector({ value, currencies, onChange }: Props)
         gap: 12,
         gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))',
       }}>
-      {currencies.map((x, i) => {
-        const selected = i === value;
+      {currencies.map((x) => {
+        const selected = x.id === value;
         return (
           <Card
             key={x.id}
             variant="outlined"
-            onClick={() => onChange(i)}
+            onClick={() => onChange(x.id, (x as any).method?.id)}
             className={selected ? 'cko-payment-card' : 'cko-payment-card-unselect'}>
             <Stack direction="row" alignItems="center" sx={{ position: 'relative' }}>
               <Avatar src={x.logo} alt={x.name} sx={{ width: 40, height: 40, marginRight: '12px' }} />

package/src/payment/form/index.tsx

@@ -4,17 +4,11 @@ import 'react-international-phone/style.css';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 // import { useTheme } from '@arcblock/ux/lib/Theme';
 import Toast from '@arcblock/ux/lib/Toast';
-import type {
-  TCheckoutSession,
-  TCustomer,
-  TInvoice,
-  TPaymentIntent,
-  TPaymentMethodExpanded,
-} from '@blocklet/payment-types';
+import type { TCheckoutSession, TCustomer, TPaymentIntent, TPaymentMethodExpanded } from '@blocklet/payment-types';
 import { Box, Button, CircularProgress, Divider, Fade, FormLabel, Stack, Typography } from '@mui/material';
 import { useMemoizedFn, useSetState } from 'ahooks';
 import pWaitFor from 'p-wait-for';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 import { Controller, useFormContext, useWatch } from 'react-hook-form';
 import { joinURL } from 'ufo';
 import { dispatch } from 'use-bus';
@@ -30,7 +24,6 @@ import {
   formatError,
   formatQuantityInventory,
   getPrefix,
-  getQueryParams,
   getStatementDescriptor,
   isCrossOrigin,
 } from '../../libs/util';
@@ -162,7 +155,6 @@ export default function PaymentForm({
   onError,
   // mode,
   action,
-  currencyId,
   onlyShowBtn,
   isDonation = false,
 }: PageData) {
@@ -215,37 +207,15 @@ export default function PaymentForm({
 
   const currencies = flattenPaymentMethods(paymentMethods);
 
-  const [paymentCurrencyIndex, setPaymentCurrencyIndex] = useState(() => {
-    const query = getQueryParams(window.location.href);
-    const queryCurrencyId = query.currencyId || currencyId;
-    const index = currencies.findIndex((x) => x.id === queryCurrencyId);
-    return index >= 0 ? index : 0;
-  });
-
-  const handleCurrencyChange = (index: number) => {
-    setPaymentCurrencyIndex(index);
-    const selectedCurrencyId = currencies[index]?.id;
-    if (selectedCurrencyId) {
-      saveCurrencyPreference(selectedCurrencyId, session?.user?.did);
-    }
-  };
-
   const onCheckoutComplete = useMemoizedFn(async ({ response }: { response: TCheckoutSession }) => {
     if (response.id === checkoutSession.id && state.paid === false) {
       await handleConnected();
     }
   });
 
-  const onInvoicePaid = useMemoizedFn(async ({ response }: { response: TInvoice }) => {
-    if (response.customer_id === customer?.id && state.customerLimited) {
-      await onAction();
-    }
-  });
-
   useEffect(() => {
     if (subscription) {
       subscription.on('checkout.session.completed', onCheckoutComplete);
-      subscription.on('invoice.paid', onInvoicePaid);
     }
   }, [subscription]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -317,11 +287,6 @@ export default function PaymentForm({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [session?.user, checkoutSession.phone_number_collection?.enabled]);
 
-  useEffect(() => {
-    setValue('payment_method', (currencies[paymentCurrencyIndex] as any)?.method?.id);
-    setValue('payment_currency', currencies[paymentCurrencyIndex]?.id);
-  }, [paymentCurrencyIndex, currencies, setValue]);
-
   const paymentMethod = useWatch({ control, name: 'payment_method' });
 
   // const domSize = useSize(document.body);
@@ -442,6 +407,11 @@ export default function PaymentForm({
               setState({ submitting: false, paying: false });
               onError(err);
             },
+            messages: {
+              title: 'DID Connect',
+              scan: 'Use following methods to complete this payment',
+              confirm: 'Confirm',
+            },
           } as any);
         }
       }
@@ -490,14 +460,14 @@ export default function PaymentForm({
       }
       if (hasDidWallet(session.user)) {
         handleSubmit(onFormSubmit, onFormError)();
-      } else {
-        session.bindWallet(() => {
-          // timeout required because https://github.com/ArcBlock/ux/issues/1241
-          setTimeout(() => {
-            handleSubmit(onFormSubmit, onFormError)();
-          }, 2000);
-        });
+        return;
       }
+      session.bindWallet(() => {
+        // timeout required because https://github.com/ArcBlock/ux/issues/1241
+        setTimeout(() => {
+          handleSubmit(onFormSubmit, onFormError)();
+        }, 2000);
+      });
     } else {
       if (isDonationMode) {
         handleSubmit(onFormSubmit, onFormError)();
@@ -622,11 +592,15 @@ export default function PaymentForm({
                 <Controller
                   name="payment_currency"
                   control={control}
-                  render={() => (
+                  render={({ field }) => (
                     <CurrencySelector
-                      value={paymentCurrencyIndex}
+                      value={field.value}
                       currencies={currencies}
-                      onChange={handleCurrencyChange}
+                      onChange={(id: string, methodId: string) => {
+                        field.onChange(id);
+                        setValue('payment_method', methodId);
+                        saveCurrencyPreference(id, session?.user?.did);
+                      }}
                     />
                   )}
                 />

package/src/payment/form/stripe/form.tsx

@@ -178,10 +178,12 @@ function StripeCheckoutForm({
 
   return (
     <Content onSubmit={handleSubmit}>
-      {(!state.paymentMethod || state.paymentMethod === 'card') && (
+      {(!state.paymentMethod || ['link', 'card'].includes(state.paymentMethod)) && (
         <LinkAuthenticationElement
           options={{
-            defaultEmail: customer.email,
+            defaultValues: {
+              email: customer.email,
+            },
           }}
         />
       )}

package/src/payment/index.tsx

@@ -142,6 +142,16 @@ function PaymentInner({
     },
   });
 
+  useEffect(() => {
+    if (defaultCurrencyId) {
+      methods.setValue('payment_currency', defaultCurrencyId);
+    }
+    if (defaultMethodId) {
+      methods.setValue('payment_method', defaultMethodId);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [defaultCurrencyId, defaultMethodId]);
+
   useEffect(() => {
     if (!isMobileSafari()) {
       return () => {};
@@ -258,7 +268,7 @@ function PaymentInner({
                   // @ts-ignore
                   state.checkoutSession.subscription_data?.min_stake_amount || 0
                 )}
-                showStaking={method.type === 'arcblock'}
+                showStaking={method.type === 'arcblock' && !state.checkoutSession.subscription_data?.no_stake}
                 currency={currency}
                 onUpsell={onUpsell}
                 onDownsell={onDownsell}
@@ -290,6 +300,7 @@ function PaymentInner({
               action={state.checkoutSession.mode}
               invoiceId={state.checkoutSession.invoice_id}
               subscriptionId={state.checkoutSession.subscription_id}
+              subscriptions={state.checkoutSession.subscriptions}
               message={
                 paymentLink?.after_completion?.hosted_confirmation?.custom_message ||
                 t(

package/src/payment/success.tsx

@@ -1,8 +1,9 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { Grow, Link, Stack, Typography } from '@mui/material';
+import { Grow, Link, Stack, Typography, Box, Paper } from '@mui/material';
 import { styled } from '@mui/system';
 import { joinURL } from 'ufo';
 
+import { Button } from '@arcblock/ux';
 import { usePaymentContext } from '../contexts/payment';
 
 type Props = {
@@ -12,20 +13,80 @@ type Props = {
   payee: string;
   invoiceId?: string;
   subscriptionId?: string;
+  subscriptions?: any[];
 };
 
-export default function PaymentSuccess({ mode, message, action, payee, invoiceId, subscriptionId }: Props) {
+export default function PaymentSuccess({
+  mode,
+  message,
+  action,
+  payee,
+  invoiceId,
+  subscriptionId,
+  subscriptions,
+}: Props) {
   const { t } = useLocaleContext();
   const { prefix } = usePaymentContext();
   let next: any = null;
-  if (['subscription', 'setup'].includes(action) && subscriptionId) {
-    next = (
-      <Typography textAlign="center" sx={{ mt: 2 }}>
-        <Link href={joinURL(prefix, `/customer/subscription/${subscriptionId}`)}>
-          {t('payment.checkout.next.subscription', { payee })}
-        </Link>
-      </Typography>
-    );
+  if (['subscription', 'setup'].includes(action)) {
+    if (subscriptions && subscriptions.length > 1) {
+      next = (
+        <Paper
+          elevation={0}
+          sx={{
+            p: 3,
+            backgroundColor: 'grey.50',
+            borderRadius: 2,
+            width: '100%',
+            mt: 2,
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 2,
+          }}>
+          {subscriptions.map((subscription) => (
+            <Box
+              key={subscription.id}
+              sx={{
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+              }}>
+              <Typography
+                variant="body2"
+                sx={{
+                  color: 'text.secondary',
+                  fontWeight: 500,
+                }}>
+                {subscription.description}
+              </Typography>
+              <Box
+                sx={{
+                  flex: 1,
+                  borderBottom: '1px dashed',
+                  borderColor: 'grey.300',
+                  mx: 2,
+                }}
+              />
+              <Button variant="text" color="primary" size="small">
+                <Link
+                  href={joinURL(prefix, `/customer/subscription/${subscription.id}`)}
+                  sx={{ color: 'text.secondary' }}>
+                  {t('payment.checkout.next.view')}
+                </Link>
+              </Button>
+            </Box>
+          ))}
+        </Paper>
+      );
+    } else if (subscriptionId) {
+      next = (
+        <Button variant="outlined" color="primary" sx={{ mt: 2 }}>
+          <Link href={joinURL(prefix, `/customer/subscription/${subscriptionId}`)}>
+            {t('payment.checkout.next.subscription', { payee })}
+          </Link>
+        </Button>
+      );
+    }
   } else if (invoiceId) {
     next = (
       <Typography textAlign="center" sx={{ mt: 2 }}>
@@ -42,7 +103,7 @@ export default function PaymentSuccess({ mode, message, action, payee, invoiceId
         direction="column"
         alignItems="center"
         justifyContent={mode === 'standalone' ? 'center' : 'flex-start'}
-        sx={{ height: mode === 'standalone' ? 360 : 300 }}>
+        sx={{ height: mode === 'standalone' ? 'fit-content' : 300 }}>
         <Div>
           <div className="check-icon">
             <span className="icon-line line-tip" />
@@ -66,6 +127,7 @@ export default function PaymentSuccess({ mode, message, action, payee, invoiceId
 PaymentSuccess.defaultProps = {
   invoiceId: '',
   subscriptionId: '',
+  subscriptions: [],
 };
 
 const Div = styled('div')`

package/src/payment/summary.tsx

@@ -160,6 +160,7 @@ export default function PaymentSummary({
   );
   const headlines = formatCheckoutHeadlines(items, currency, { trialEnd, trialInDays }, locale);
   const staking = showStaking ? getStakingSetup(items, currency, billingThreshold) : '0';
+
   const totalAmount = fromUnitToToken(
     new BN(fromTokenToUnit(headlines.actualAmount, currency?.decimal)).add(new BN(staking)).toString(),
     currency?.decimal