payment-kit 1.18.32 → 1.18.34

package/api/src/integrations/stripe/handlers/setup-intent.ts

@@ -3,6 +3,7 @@ import type Stripe from 'stripe';
 import logger from '../../../libs/logger';
 import { CheckoutSession, Lock, SetupIntent, Subscription, TEventExpanded } from '../../../store/models';
 import { updateGroupSubscriptionsPaymentMethod } from '../resource';
+import { getCheckoutSessionSubscriptionIds } from '../../../libs/session';
 
 async function handleSubscriptionOnSetupSucceeded(event: TEventExpanded, stripeIntentId: string) {
   const subscription = await Subscription.findOne({
@@ -22,8 +23,18 @@ async function handleSubscriptionOnSetupSucceeded(event: TEventExpanded, stripeI
 
     const checkoutSession = await CheckoutSession.findBySubscriptionId(subscription.id);
     if (checkoutSession && checkoutSession.status === 'open') {
-      await checkoutSession.update({ status: 'complete', payment_status: 'no_payment_required' });
-      logger.info('checkout session become complete on stripe intent succeeded', checkoutSession.id);
+      const subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
+      if (subscriptionIds.length <= 1) {
+        const updates: Partial<CheckoutSession> = {
+          status: 'complete',
+          payment_status: 'no_payment_required',
+        };
+        if (checkoutSession.subscription_id) {
+          updates.success_subscription_count = 1;
+        }
+        await checkoutSession.update(updates);
+        logger.info('checkout session become complete on stripe intent succeeded', checkoutSession.id);
+      }
     }
 
     return;

package/api/src/integrations/stripe/handlers/subscription.ts

@@ -5,6 +5,7 @@ import logger from '../../../libs/logger';
 import { finalizeStripeSubscriptionUpdate } from '../../../libs/subscription';
 import { CheckoutSession, PaymentMethod, Subscription, TEventExpanded } from '../../../store/models';
 import { getCheckoutSessionSubscriptionIds } from '../../../libs/session';
+import { createEvent } from '../../../libs/audit';
 
 export async function handleStripeSubscriptionSucceed(subscription: Subscription, status: string) {
   if (!subscription.payment_details?.stripe?.subscription_id) {
@@ -17,6 +18,20 @@ export async function handleStripeSubscriptionSucceed(subscription: Subscription
   const result: any = await client.subscriptions.retrieve(subscription.payment_details.stripe.subscription_id, {
     expand: ['latest_invoice.payment_intent', 'pending_setup_intent'],
   });
+  const checkoutSession = await CheckoutSession.findBySubscriptionId(subscription.id);
+  let subscriptionIds: string[] = [subscription.id];
+  if (checkoutSession) {
+    subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
+  }
+  const isMultipleSubscriptions = subscriptionIds.length > 1 && checkoutSession?.enable_subscription_grouping;
+  // if not multiple subscriptions, check if setup is done
+  if (!isMultipleSubscriptions && result.pending_setup_intent && result.pending_setup_intent.status !== 'succeeded') {
+    logger.warn('subscription can not active because stripe setup not done', {
+      id: subscription.id,
+      status: result.pending_setup_intent.status,
+    });
+    return;
+  }
   const paymentIntent = result.latest_invoice?.payment_intent;
   const paymentIntentStatus = typeof paymentIntent === 'string' ? paymentIntent : paymentIntent?.status;
   if (result.latest_invoice?.payment_intent && paymentIntentStatus !== 'succeeded') {
@@ -28,13 +43,16 @@ export async function handleStripeSubscriptionSucceed(subscription: Subscription
   }
 
   await subscription.update({ status });
+  if (subscription.trial_end && subscription.trial_end > Date.now() / 1000 && subscription.status === 'trialing') {
+    createEvent('Subscription', 'customer.subscription.trial_start', subscription).catch(console.error);
+  } else if (subscription.status === 'active') {
+    createEvent('Subscription', 'customer.subscription.started', subscription).catch(console.error);
+  }
   logger.info('subscription become active on stripe event', { id: subscription.id, status: subscription.status });
 
-  const checkoutSession = await CheckoutSession.findBySubscriptionId(subscription.id);
   if (checkoutSession && checkoutSession.status === 'open') {
     await checkoutSession.increment('success_subscription_count', { by: 1 });
     await checkoutSession.reload();
-    const subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
     if (checkoutSession.success_subscription_count === subscriptionIds.length) {
       await checkoutSession.update({
         status: 'complete',

package/api/src/libs/notification/template/subscription-succeeded.ts

@@ -87,7 +87,7 @@ export class SubscriptionSucceededEmailTemplate
 
         return Boolean(
           ['disabled', 'minted', 'sent', 'error'].includes(checkoutSession?.nft_mint_status as string) &&
-            (invoice?.payment_intent_id || (invoice && +invoice.total === 0))
+            (invoice?.payment_intent_id || (invoice && +invoice.amount_remaining === 0))
         );
       },
       { timeout: 1000 * 10, interval: 1000 }

package/api/src/libs/session.ts

@@ -773,7 +773,7 @@ async function createOrUpdateSubscription(params: {
               notification_settings: checkoutSession.subscription_data.notification_settings,
             }
           : {}),
-        ...omit(checkoutSession.metadata || {}, ['days_until_due', 'days_until_cancel']),
+        ...omit(checkoutSession.metadata || {}, ['days_until_due', 'days_until_cancel', 'page_info']),
         ...(itemsSubscriptionData.metadata || {}),
         ...metadata,
       };

package/api/src/routes/checkout-sessions.ts

@@ -598,6 +598,7 @@ async function processSubscriptionFastCheckout({
   lineItems,
   trialEnd,
   now,
+  executePayment = true,
 }: {
   checkoutSession: CheckoutSession;
   customer: Customer;
@@ -608,6 +609,7 @@ async function processSubscriptionFastCheckout({
   lineItems: TLineItemExpanded[];
   trialEnd: number;
   now: number;
+  executePayment?: boolean;
 }): Promise<{
   success: boolean;
   invoices?: Invoice[];
@@ -651,38 +653,42 @@ async function processSubscriptionFastCheckout({
       subscriptionIds: subscriptions.map((s) => s.id),
     });
 
-    // Update payment settings for all subscriptions
-    await Promise.all(subscriptions.map((sub) => sub.update({ payment_settings: paymentSettings })));
+    if (executePayment) {
+      // Update payment settings for all subscriptions
+      await Promise.all(subscriptions.map((sub) => sub.update({ payment_settings: paymentSettings })));
 
-    // Create invoices for all subscriptions
-    const { invoices } = await ensureInvoicesForSubscriptions({
-      checkoutSession,
-      customer,
-      subscriptions,
-    });
-
-    // Update invoice settings and push to queue
-    await Promise.all(
-      invoices.map(async (invoice) => {
-        if (invoice) {
-          await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
-          invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
-        }
-      })
-    );
-
-    // Add subscription cycle jobs
-    await Promise.all(subscriptions.map((sub) => addSubscriptionJob(sub, 'cycle', false, sub.trial_end)));
+      // Create invoices for all subscriptions
+      const { invoices } = await ensureInvoicesForSubscriptions({
+        checkoutSession,
+        customer,
+        subscriptions,
+      });
+      // Update invoice settings and push to queue
+      await Promise.all(
+        invoices.map(async (invoice) => {
+          if (invoice) {
+            await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
+            invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
+          }
+        })
+      );
 
-    logger.info('Created and queued invoices for fast checkout with subscriptions', {
-      checkoutSessionId: checkoutSession.id,
-      subscriptionIds: subscriptions.map((s) => s.id),
-      invoiceIds: invoices.map((inv) => inv.id),
-    });
+      // Add subscription cycle jobs
+      await Promise.all(subscriptions.map((sub) => addSubscriptionJob(sub, 'cycle', false, sub.trial_end)));
 
+      logger.info('Created and queued invoices for fast checkout with subscriptions', {
+        checkoutSessionId: checkoutSession.id,
+        subscriptionIds: subscriptions.map((s) => s.id),
+        invoiceIds: invoices.map((inv) => inv.id),
+      });
+      return {
+        success: true,
+        invoices,
+      };
+    }
     return {
       success: true,
-      invoices,
+      invoices: [],
     };
   } catch (error) {
     logger.error('Error processing subscription fast checkout', {
@@ -1217,6 +1223,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
 
     const isPayment = checkoutSession.mode === 'payment';
     let canFastPay = isPayment && canPayWithDelegation(paymentIntent?.beneficiaries || []);
+    let fastPayInfo = null;
     let delegation: SufficientForPaymentResult | null = null;
     if (isPayment && paymentIntent && canFastPay) {
       // if we can complete purchase without any wallet interaction
@@ -1226,24 +1233,12 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
         userDid: customer.did,
         amount: fastCheckoutAmount,
       });
-      if (balance.sufficient) {
-        logger.info(`CheckoutSession ${checkoutSession.id} will pay from balance ${paymentIntent?.id}`);
-      }
-      if (delegation.sufficient) {
-        logger.info(`CheckoutSession ${checkoutSession.id} will pay from delegation ${paymentIntent?.id}`);
-      }
       if (balance.sufficient || delegation.sufficient) {
-        await paymentIntent.update({ status: 'requires_capture' });
-        const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, paymentIntent });
-        if (invoice) {
-          await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
-          invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
-        } else {
-          paymentQueue.push({
-            id: paymentIntent.id,
-            job: { paymentIntentId: paymentIntent.id, paymentSettings, retryOnError: false },
-          });
-        }
+        fastPayInfo = {
+          type: balance.sufficient ? 'balance' : 'delegation',
+          amount: fastCheckoutAmount,
+          payer: customer.did,
+        };
       }
     } else if (
       paymentMethod.type === 'arcblock' &&
@@ -1261,6 +1256,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
         lineItems,
         trialEnd,
         now,
+        executePayment: false,
       });
 
       if (!result.success) {
@@ -1272,6 +1268,11 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           sufficient: true,
         };
         canFastPay = true;
+        fastPayInfo = {
+          type: 'delegation',
+          amount: fastCheckoutAmount,
+          payer: customer.did,
+        };
       }
     }
 
@@ -1403,6 +1404,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       customer,
       delegation: canFastPay ? delegation : null,
       balance: canFastPay ? balance : null,
+      fastPayInfo,
     });
   } catch (err) {
     logger.error('Error submitting checkout session', {
@@ -1480,6 +1482,192 @@ router.put('/:id/donate-submit', ensureCheckoutSessionOpen, async (req, res) =>
   }
 });
 
+router.post('/:id/fast-checkout-confirm', user, ensureCheckoutSessionOpen, async (req, res) => {
+  try {
+    if (!req.user) {
+      return res.status(403).json({ code: 'REQUIRE_LOGIN', error: 'Please login to continue' });
+    }
+
+    const checkoutSession = req.doc as CheckoutSession;
+
+    if (checkoutSession.line_items) {
+      try {
+        await validateInventory(checkoutSession.line_items);
+      } catch (err) {
+        logger.error('validateInventory failed', {
+          error: err,
+          line_items: checkoutSession.line_items,
+          checkoutSessionId: checkoutSession.id,
+        });
+        return res.status(400).json({ error: err.message });
+      }
+    }
+    // validate cross sell
+    if (checkoutSession.cross_sell_behavior === 'required') {
+      if (checkoutSession.line_items.some((x) => x.cross_sell) === false) {
+        const result = await getCrossSellItem(checkoutSession);
+        // @ts-ignore
+        if (result.id) {
+          return res
+            .status(400)
+            .json({ code: 'REQUIRE_CROSS_SELL', error: 'Please select cross sell product to continue' });
+        }
+      }
+    }
+
+    const paymentCurrency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
+    if (!paymentCurrency) {
+      return res.status(400).json({ error: 'Payment currency not found' });
+    }
+
+    const paymentMethod = await PaymentMethod.findByPk(paymentCurrency.payment_method_id);
+    if (!paymentMethod) {
+      return res.status(400).json({ error: 'Payment method not found' });
+    }
+
+    if (paymentMethod.type !== 'arcblock') {
+      return res.status(400).json({ error: 'Payment method not supported for fast checkout' });
+    }
+
+    const customer = await Customer.findByPkOrDid(req.user.did);
+    if (!customer) {
+      return res.status(400).json({ error: '' });
+    }
+
+    // check if customer can make new purchase
+    const canMakeNewPurchase = await customer.canMakeNewPurchase(checkoutSession.invoice_id);
+    if (!canMakeNewPurchase) {
+      return res.status(403).json({
+        code: 'CUSTOMER_LIMITED',
+        error: 'Customer can not make new purchase, maybe you have unpaid invoices from previous purchases',
+      });
+    }
+
+    const { lineItems, trialInDays, trialEnd, now } = await calculateAndUpdateAmount(
+      checkoutSession,
+      paymentCurrency.id,
+      true
+    );
+
+    let paymentIntent: PaymentIntent | null = null;
+    if (checkoutSession.mode === 'payment') {
+      const result = await createOrUpdatePaymentIntent(
+        checkoutSession,
+        paymentMethod,
+        paymentCurrency,
+        lineItems,
+        customer.id,
+        customer.email
+      );
+      paymentIntent = result.paymentIntent;
+    }
+
+    const fastCheckoutAmount = getFastCheckoutAmount(
+      lineItems,
+      checkoutSession.mode,
+      paymentCurrency.id,
+      trialInDays > 0 || trialEnd > now
+    );
+
+    const paymentSettings = {
+      payment_method_types: checkoutSession.payment_method_types,
+      payment_method_options: {
+        [paymentMethod.type]: { payer: customer.did },
+      },
+    };
+    const balance = isCreditSufficientForPayment({
+      paymentMethod,
+      paymentCurrency,
+      customer,
+      amount: fastCheckoutAmount,
+    });
+
+    const isPayment = checkoutSession.mode === 'payment';
+    let fastPaid = false;
+    let canFastPay = isPayment && canPayWithDelegation(paymentIntent?.beneficiaries || []);
+    let delegation: SufficientForPaymentResult | null = null;
+    if (isPayment && paymentIntent && canFastPay) {
+      // if we can complete purchase without any wallet interaction
+      delegation = await isDelegationSufficientForPayment({
+        paymentMethod,
+        paymentCurrency,
+        userDid: customer.did,
+        amount: fastCheckoutAmount,
+      });
+      if (balance.sufficient) {
+        logger.info(`CheckoutSession ${checkoutSession.id} will pay from balance ${paymentIntent?.id}`);
+      }
+      if (delegation.sufficient) {
+        logger.info(`CheckoutSession ${checkoutSession.id} will pay from delegation ${paymentIntent?.id}`);
+      }
+      if (balance.sufficient || delegation.sufficient) {
+        fastPaid = true;
+        await paymentIntent.update({ status: 'requires_capture' });
+        const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, paymentIntent });
+        if (invoice) {
+          await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
+          invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
+        } else {
+          paymentQueue.push({
+            id: paymentIntent.id,
+            job: { paymentIntentId: paymentIntent.id, paymentSettings, retryOnError: false },
+          });
+        }
+      }
+    } else if (
+      paymentMethod.type === 'arcblock' &&
+      checkoutSession.mode === 'subscription' &&
+      checkoutSession.subscription_data?.no_stake
+    ) {
+      const subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
+      const subscriptions = await Subscription.findAll({ where: { id: subscriptionIds } });
+      // if we can complete purchase without any wallet interaction
+      const result = await processSubscriptionFastCheckout({
+        checkoutSession,
+        customer,
+        subscriptions,
+        paymentMethod,
+        paymentCurrency,
+        paymentSettings,
+        lineItems,
+        trialEnd,
+        now,
+      });
+      if (!result.success) {
+        logger.warn(`Fast checkout processing failed: ${result.message}`, {
+          checkoutSessionId: checkoutSession.id,
+        });
+      } else {
+        fastPaid = true;
+        delegation = {
+          sufficient: true,
+        };
+        canFastPay = true;
+      }
+    }
+
+    logger.info('Checkout session submitted successfully', {
+      sessionId: req.params.id,
+      paymentIntentId: paymentIntent?.id,
+      customerId: customer?.id,
+    });
+
+    return res.json({
+      paymentIntent,
+      checkoutSession,
+      customer,
+      fastPaid,
+    });
+  } catch (err) {
+    logger.error('Error confirming fast checkout', {
+      sessionId: req.params.id,
+      error: err.message,
+      stack: err.stack,
+    });
+    res.status(500).json({ code: err.code, error: err.message });
+  }
+});
+
 // upsell
 router.put('/:id/upsell', user, ensureCheckoutSessionOpen, async (req, res) => {
   try {

package/api/src/routes/subscriptions.ts

@@ -2032,21 +2032,30 @@ router.post('/:id/overdraft-protection', authPortal, async (req, res) => {
     if (overdraftProtectionError) {
       return res.status(400).json({ error: `Overdraft protection invalid: ${overdraftProtectionError.message}` });
     }
+
     const subscription = await Subscription.findByPk(req.params.id);
     if (!subscription) {
       return res.status(404).json({ error: 'Subscription not found' });
     }
+    const previousOverdraftProtection = {
+      enabled: subscription.overdraft_protection?.enabled || false,
+      payment_method_id: subscription.overdraft_protection?.payment_method_id || null,
+      payment_details: subscription.overdraft_protection?.payment_details || null,
+    };
     const customer = await Customer.findByPkOrDid(req.user?.did as string);
     if (!customer) {
       return res.status(404).json({ error: 'Customer not found' });
     }
-    const { remaining, used } = await isSubscriptionOverdraftProtectionEnabled(subscription);
+    const { remaining, used, unused } = await isSubscriptionOverdraftProtectionEnabled(subscription);
+    if (unused === '0' && !amount && enabled) {
+      return res.status(400).json({ error: 'Please add stake to enable SubGuard™' });
+    }
     if (returnStake && remaining !== '0' && !enabled) {
       // disable overdraft protection
       await subscription.update({
         // @ts-ignore
         overdraft_protection: {
-          ...(subscription.overdraft_protection || {}),
+          ...previousOverdraftProtection,
           enabled: false,
         },
       });
@@ -2077,7 +2086,7 @@ router.post('/:id/overdraft-protection', authPortal, async (req, res) => {
     await subscription.update({
       // @ts-ignore
       overdraft_protection: {
-        ...subscription.overdraft_protection,
+        ...previousOverdraftProtection,
         enabled,
       },
     });

package/api/src/store/models/subscription.ts

@@ -320,11 +320,11 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
         overdraft_protection: {
           type: DataTypes.JSON,
           allowNull: true,
-          defaultValue: JSON.stringify({
+          defaultValue: {
             enabled: false,
             payment_method_id: null,
             payment_details: null,
-          }),
+          },
         },
       },
       {

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.18.32
+version: 1.18.34
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.32",
+  "version": "1.18.34",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -45,29 +45,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.42",
-    "@arcblock/did": "^1.20.1",
+    "@arcblock/did": "^1.20.2",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.13.7",
-    "@arcblock/did-util": "^1.20.1",
-    "@arcblock/jwt": "^1.20.1",
-    "@arcblock/ux": "^2.13.7",
-    "@arcblock/validator": "^1.20.1",
+    "@arcblock/did-connect": "^2.13.12",
+    "@arcblock/did-util": "^1.20.2",
+    "@arcblock/jwt": "^1.20.2",
+    "@arcblock/ux": "^2.13.12",
+    "@arcblock/validator": "^1.20.2",
     "@blocklet/js-sdk": "^1.16.42",
     "@blocklet/logger": "^1.16.42",
-    "@blocklet/payment-react": "1.18.32",
+    "@blocklet/payment-react": "1.18.34",
     "@blocklet/sdk": "^1.16.42",
-    "@blocklet/ui-react": "^2.13.7",
+    "@blocklet/ui-react": "^2.13.12",
     "@blocklet/uploader": "^0.1.83",
     "@blocklet/xss": "^0.1.32",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.20.1",
-    "@ocap/client": "^1.20.1",
-    "@ocap/mcrypto": "^1.20.1",
-    "@ocap/util": "^1.20.1",
-    "@ocap/wallet": "^1.20.1",
+    "@ocap/asset": "^1.20.2",
+    "@ocap/client": "^1.20.2",
+    "@ocap/mcrypto": "^1.20.2",
+    "@ocap/util": "^1.20.2",
+    "@ocap/wallet": "^1.20.2",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -122,7 +122,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.42",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.32",
+    "@blocklet/payment-types": "1.18.34",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -168,5 +168,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "308c14c824572267bae2ee3ec7fab5e841dd625f"
+  "gitHead": "0ddb7c08956891409919c8027b56b77eba1726d4"
 }

package/scripts/sdk.js

@@ -69,6 +69,14 @@ const checkoutModule = {
       subscription_data: {
         no_stake: true,
       },
+      metadata: {
+        page_info: {
+          form_purpose_description: {
+            en: 'Information collected helps us process your payment and deliver our services.',
+            zh: '收集的信息帮助我们处理您的付款并提供服务。',
+          },
+        },
+      },
     });
     console.log('createBatchSubscription', checkoutSession);
     return checkoutSession;

package/src/components/price/form.tsx

@@ -467,6 +467,7 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
                             <option value="day">{t('common.days')}</option>
                             <option value="week">{t('common.weeks')}</option>
                             <option value="month">{t('common.months')}</option>
+                            <option value="year">{t('common.years')}</option>
                           </select>
                         </InputAdornment>
                       ),

package/src/components/subscription/portal/actions.tsx

@@ -241,8 +241,14 @@ export function SubscriptionActionsInner({
       containerEl: undefined as unknown as Element,
       saveConnect: false,
       action: 'delegation',
+      locale: locale as 'en' | 'zh',
       prefix: joinURL(getPrefix(), '/api/did'),
       extraParams: { subscriptionId: subscription.id, sessionUserDid: session.user.did },
+      messages: {
+        scan: t('common.connect.defaultScan'),
+        title: t('customer.delegation.title'),
+        confirm: t('common.connect.confirm'),
+      } as any,
       onSuccess: () => {
         connect.close();
         Toast.success(t('customer.delegation.success'));
@@ -287,9 +293,15 @@ export function SubscriptionActionsInner({
         connect.open({
           containerEl: undefined as unknown as Element,
           saveConnect: false,
+          locale: locale as 'en' | 'zh',
           action: 'overdraft-protection',
           prefix: joinURL(getPrefix(), '/api/did'),
           extraParams: { subscriptionId: subscription.id, amount, sessionUserDid: session.user.did },
+          messages: {
+            scan: t('common.connect.defaultScan'),
+            title: t('customer.overdraftProtection.title'),
+            confirm: t('common.connect.confirm'),
+          } as any,
           onSuccess: () => {
             connect.close();
             Toast.success(t('customer.overdraftProtection.settingSuccess'));

package/src/pages/customer/invoice/detail.tsx

@@ -66,6 +66,7 @@ export default function CustomerInvoiceDetail() {
     connect.open({
       action: 'collect',
       saveConnect: false,
+      locale: locale as 'en' | 'zh',
       messages: {
         scan: '',
         title: t(`payment.customer.invoice.${action || 'pay'}`),

package/src/pages/customer/invoice/past-due.tsx

@@ -28,7 +28,7 @@ const fetchData = (): Promise<TCustomerExpanded> => {
 };
 
 export default function CustomerInvoicePastDue() {
-  const { t } = useLocaleContext();
+  const { t, locale } = useLocaleContext();
   const { events } = useSessionContext();
   const { connect, session } = usePaymentContext();
   const [params] = useSearchParams();
@@ -67,8 +67,14 @@ export default function CustomerInvoicePastDue() {
         containerEl: undefined as unknown as Element,
         saveConnect: false,
         action: 'collect-batch',
+        locale: locale as 'en' | 'zh',
         prefix: joinURL(getPrefix(), '/api/did'),
         extraParams: { subscriptionId, currencyId },
+        messages: {
+          scan: t('common.connect.defaultScan'),
+          title: t('payment.customer.invoice.payBatch'),
+          confirm: t('common.connect.confirm'),
+        } as any,
         onSuccess: () => {
           connect.close();
         },

package/src/pages/customer/recharge/account.tsx

@@ -225,12 +225,18 @@ export default function BalanceRechargePage() {
       containerEl: undefined as unknown as Element,
       saveConnect: false,
       action: 'recharge-account',
+      locale: locale as 'en' | 'zh',
       prefix: joinURL(getPrefix(), '/api/did'),
       extraParams: {
         customerDid: session?.user?.did,
         currencyId: currency.id,
         amount: Number(amount),
       },
+      messages: {
+        scan: t('common.connect.defaultScan'),
+        title: t('customer.recharge.title'),
+        confirm: t('common.connect.confirm'),
+      } as any,
       onSuccess: () => {
         connect.close();
         Toast.success(t('customer.recharge.success'));

package/src/pages/customer/recharge/subscription.tsx

@@ -163,8 +163,14 @@ export default function RechargePage() {
       containerEl: undefined as unknown as Element,
       saveConnect: false,
       action: 'recharge',
+      locale: locale as 'en' | 'zh',
       prefix: joinURL(getPrefix(), '/api/did'),
       extraParams: { subscriptionId, amount: Number(amount) },
+      messages: {
+        scan: t('common.connect.defaultScan'),
+        title: t('customer.recharge.title'),
+        confirm: t('common.connect.confirm'),
+      } as any,
       onSuccess: () => {
         connect.close();
         Toast.success(t('customer.recharge.success'));

package/src/pages/customer/subscription/change-payment.tsx

@@ -75,7 +75,7 @@ const waitForCheckoutComplete = async (sessionId: string) => {
 };
 
 function CustomerSubscriptionChangePayment({ subscription, customer, onComplete }: Props) {
-  const { t } = useLocaleContext();
+  const { t, locale } = useLocaleContext();
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const { settings, connect } = usePaymentContext();
@@ -159,11 +159,17 @@ function CustomerSubscriptionChangePayment({ subscription, customer, onComplete
           await handleConnected();
         } else {
           connect.open({
+            locale: locale as 'en' | 'zh',
             containerEl: undefined as unknown as Element,
             action: 'change-payment',
             prefix: joinURL(getPrefix(), '/api/did'),
             saveConnect: false,
             extraParams: { subscriptionId: subscription.id },
+            messages: {
+              scan: t('common.connect.defaultScan'),
+              title: t('payment.customer.changePayment.title'),
+              confirm: t('common.connect.confirm'),
+            } as any,
             onSuccess: async () => {
               connect.close();
               await handleConnected();

package/src/pages/customer/subscription/change-plan.tsx

@@ -152,6 +152,7 @@ export default function CustomerSubscriptionChangePlan() {
         try {
           setState({ paying: true });
           connect.open({
+            locale: locale as 'en' | 'zh',
             action: result.data.connectAction,
             saveConnect: false,
             messages: {

package/src/pages/customer/subscription/detail.tsx

@@ -79,7 +79,7 @@ export default function CustomerSubscriptionDetail() {
     loading: overdraftProtectionLoading,
     run: refreshOverdraftProtection,
   } = useRequest(() => fetchOverdraftProtection(id), {
-    ready: ['active', 'trialing', 'past_due'].includes(data?.status || ''),
+    ready: ['active', 'trialing', 'past_due'].includes(data?.status || '') && data?.paymentMethod?.type === 'arcblock',
   });
 
   const {