payment-kit 1.19.8 → 1.19.10

package/api/src/routes/connect/shared.ts

@@ -13,14 +13,14 @@ import { encodeApproveItx } from '../../integrations/ethereum/token';
 import { blocklet, ethWallet, wallet } from '../../libs/auth';
 import logger from '../../libs/logger';
 import { getGasPayerExtra, getTokenLimitsForDelegation } from '../../libs/payment';
-import { 
-  getCheckoutAmount, 
-  getCheckoutSessionSubscriptionIds, 
-  getFastCheckoutAmount, 
-  getStatementDescriptor, 
-  getSubscriptionCreateSetup, 
+import {
+  getCheckoutAmount,
+  getCheckoutSessionSubscriptionIds,
+  getFastCheckoutAmount,
+  getStatementDescriptor,
+  getSubscriptionCreateSetup,
   isDonationCheckoutSession,
-  getSubscriptionLineItems
+  getSubscriptionLineItems,
 } from '../../libs/session';
 import {
   expandSubscriptionItems,
@@ -68,7 +68,11 @@ export async function ensureCheckoutSession(checkoutSessionId: string) {
   return checkoutSession;
 }
 
-export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: string, skipCustomer?: boolean): Promise<Result> {
+export async function ensurePaymentIntent(
+  checkoutSessionId: string,
+  userDid?: string,
+  skipCustomer?: boolean
+): Promise<Result> {
   const checkoutSession = await ensureCheckoutSession(checkoutSessionId);
 
   let paymentCurrencyId;
@@ -100,11 +104,8 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
   let primarySubscription: Subscription | null = null;
   if (subscriptionIds.length > 0) {
     // @ts-ignore
-    subscriptions = await Promise.all(
-      subscriptionIds.filter(Boolean) 
-        .map(id => Subscription.findByPk(id))
-    );
-    
+    subscriptions = await Promise.all(subscriptionIds.filter(Boolean).map((id) => Subscription.findByPk(id)));
+
     subscriptions = subscriptions.filter(Boolean);
     for (const subscription of subscriptions) {
       if (subscription && subscription.status !== 'incomplete') {
@@ -119,81 +120,69 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
     }
   }
   let customer = null;
-  
+
   if (!skipCustomer) {
-  // 检查是否为打赏场景
-  const isDonation = isDonationCheckoutSession(checkoutSession);  
-  
-  // if donation, create customer if not exists
-  if (isDonation && !checkoutSession.customer_id && userDid) {
-    customer = await Customer.findByPkOrDid(userDid);
-    if (!customer) {
-      const { user } = await blocklet.getUser(userDid);
-      if (user) {
-        customer = await Customer.create({
-          did: userDid,
-          email: user.email,
-          name: user.fullName || userDid,
-          description: user.remark,
-          metadata: { fromDonation: true },
-          livemode: checkoutSession.livemode,
-          phone: user.phone,
-          address: Customer.formatAddressFromUser(user),
-          delinquent: false,
-          balance: '0',
-          next_invoice_sequence: 1,
-          invoice_prefix: Customer.getInvoicePrefix(),
-        });
-        logger.info('Customer created for donation', { userDid, customerId: customer.id });
-      } else {
-        customer = await Customer.create({
-          did: userDid,
-          email: '',
-          name: 'anonymous',
-          description: 'Anonymous customer',
-          metadata: { fromDonation: true, anonymous: true },
-          livemode: checkoutSession.livemode,
-          phone:'',
-          delinquent: false,
-          balance: '0',
-          next_invoice_sequence: 1,
-          invoice_prefix: Customer.getInvoicePrefix(),
-        });
+    // 检查是否为打赏场景
+    const isDonation = isDonationCheckoutSession(checkoutSession);
+
+    // if donation, create customer if not exists
+    if (isDonation && !checkoutSession.customer_id && userDid) {
+      customer = await Customer.findByPkOrDid(userDid);
+      if (!customer) {
+        const { user } = await blocklet.getUser(userDid);
+        if (user) {
+          customer = await Customer.create({
+            did: userDid,
+            email: user.email,
+            name: user.fullName || userDid,
+            description: user.remark,
+            metadata: { fromDonation: true },
+            livemode: checkoutSession.livemode,
+            phone: user.phone,
+            address: Customer.formatAddressFromUser(user),
+            delinquent: false,
+            balance: '0',
+            next_invoice_sequence: 1,
+            invoice_prefix: Customer.getInvoicePrefix(),
+          });
+          logger.info('Customer created for donation', { userDid, customerId: customer.id });
+        } else {
+          customer = await Customer.create({
+            did: userDid,
+            email: '',
+            name: 'anonymous',
+            description: 'Anonymous customer',
+            metadata: { fromDonation: true, anonymous: true },
+            livemode: checkoutSession.livemode,
+            phone: '',
+            delinquent: false,
+            balance: '0',
+            next_invoice_sequence: 1,
+            invoice_prefix: Customer.getInvoicePrefix(),
+          });
+        }
       }
-    }
-    
-    if (customer) {
-      await checkoutSession.update({ customer_id: customer.id, customer_did: customer.did });
-      if (paymentIntent) {
-        await paymentIntent.update({ customer_id: customer.id });
+
+      if (customer) {
+        await checkoutSession.update({ customer_id: customer.id, customer_did: customer.did });
+        if (paymentIntent) {
+          await paymentIntent.update({ customer_id: customer.id });
+        }
+        logger.info('Customer associated with donation', {
+          userDid,
+          customerId: customer.id,
+          checkoutSessionId: checkoutSession.id,
+          paymentIntentId: paymentIntent?.id,
+        });
       }
-      logger.info('Customer associated with donation', { 
-        userDid, 
-        customerId: customer.id,
-        checkoutSessionId: checkoutSession.id,
-        paymentIntentId: paymentIntent?.id
-      });
-    }
-  } else {
-    // 非打赏场景或已有客户ID的情况
-    customer = await Customer.findByPk(checkoutSession.customer_id);
-  }
-  if (!customer) {
-    throw new Error('Customer not found');
-  }
-  
-  if (userDid && !isDonation) {
-    const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    if (!user) {
-      throw new Error('Seems you have not connected to this app before');
+    } else {
+      // 非打赏场景或已有客户ID的情况
+      customer = await Customer.findByPk(checkoutSession.customer_id);
     }
-
-    if (customer.did !== user.did) {
-      throw new Error('This is not your payment intent');
+    if (!customer) {
+      throw new Error('Customer not found');
     }
   }
-  }
-
 
   const [paymentMethod, paymentCurrency] = await Promise.all([
     PaymentMethod.findByPk(paymentMethodId),
@@ -223,7 +212,7 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
   };
 }
 
-export async function ensureSetupIntent(checkoutSessionId: string, userDid?: string) {
+export async function ensureSetupIntent(checkoutSessionId: string) {
   const checkoutSession = await ensureCheckoutSession(checkoutSessionId);
 
   if (!checkoutSession.setup_intent_id) {
@@ -256,16 +245,6 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
   if (!customer) {
     throw new Error('Customer not found for checkoutSession');
   }
-  if (userDid) {
-    const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    if (!user) {
-      throw new Error('Seems you have not connected to this app before');
-    }
-
-    if (customer.did !== user.did) {
-      throw new Error('This is not your setupIntent');
-    }
-  }
 
   const [paymentMethod, paymentCurrency] = await Promise.all([
     PaymentMethod.findByPk(subscription.default_payment_method_id),
@@ -344,8 +323,13 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
 export async function ensureSubscriptionDelegation(subscriptionId: string) {
   const subscription = (await Subscription.findOne({
     where: { id: subscriptionId },
-    include: [{ model: PaymentCurrency, as: 'paymentCurrency' }, { model: PaymentMethod, as: 'paymentMethod' }],
-  })) as (Subscription & { paymentCurrency: PaymentCurrency; paymentMethod: PaymentMethod; items?: TLineItemExpanded[] }) | null;
+    include: [
+      { model: PaymentCurrency, as: 'paymentCurrency' },
+      { model: PaymentMethod, as: 'paymentMethod' },
+    ],
+  })) as
+    | (Subscription & { paymentCurrency: PaymentCurrency; paymentMethod: PaymentMethod; items?: TLineItemExpanded[] })
+    | null;
   if (!subscription) {
     throw new Error('Subscription not found');
   }
@@ -380,7 +364,6 @@ export async function ensureInvoiceForCheckout({
   subscriptions,
   lineItems,
 }: Args): Promise<{ invoice: Invoice | null; items: InvoiceItem[] }> {
-
   const isGroupInvoice = subscriptions && subscriptions.length > 1;
   // invoices are optional when checkout session is in payment mode
   if (checkoutSession.mode === 'payment' && !checkoutSession.invoice_creation?.enabled) {
@@ -426,9 +409,7 @@ export async function ensureInvoiceForCheckout({
         client.invoices
           .voidInvoice(invoice.metadata.stripe_id)
           .then(() => {
-            logger.info(
-              `Invoice marked void on stripe for checkout session ${checkoutSession.id}: ${existingInvoice}`
-            );
+            logger.info(`Invoice marked void on stripe for checkout session ${checkoutSession.id}: ${existingInvoice}`);
           })
           .catch((err) => {
             logger.error(
@@ -441,16 +422,16 @@ export async function ensureInvoiceForCheckout({
   }
 
   const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
-  
+
   const metadata = {
     ...(checkoutSession.invoice_creation?.invoice_data?.metadata || {}),
   };
-  
+
   if (isGroupInvoice) {
-    metadata.subscription_ids = subscriptions.map(sub => sub.id);
+    metadata.subscription_ids = subscriptions.map((sub) => sub.id);
     metadata.is_group_invoice = true;
   }
-  
+
   const trialInDays = Number(checkoutSession.subscription_data?.trial_period_days || 0);
   const trialEnd = Number(checkoutSession.subscription_data?.trial_end || 0);
   const now = dayjs().unix();
@@ -507,14 +488,13 @@ export async function ensureInvoiceForCheckout({
   return { invoice, items };
 }
 
-
 export async function ensureInvoicesForSubscriptions({
   checkoutSession,
   customer,
   subscriptions,
   invoiceProps,
-}: Omit<Args, 'subscription'> & { subscriptions: Subscription[]; invoiceProps?: Partial<TInvoice> }): Promise<{ 
-  invoices: Invoice[]; 
+}: Omit<Args, 'subscription'> & { subscriptions: Subscription[]; invoiceProps?: Partial<TInvoice> }): Promise<{
+  invoices: Invoice[];
 }> {
   if (!subscriptions?.length) {
     logger.warn('No subscriptions provided for invoice creation');
@@ -523,15 +503,16 @@ export async function ensureInvoicesForSubscriptions({
 
   const lineItems = await Price.expand(checkoutSession.line_items, { product: true });
 
-  const primarySubscription = (subscriptions.find((x) => x.metadata.is_primary_subscription) || subscriptions[0]) as Subscription;
+  const primarySubscription = (subscriptions.find((x) => x.metadata.is_primary_subscription) ||
+    subscriptions[0]) as Subscription;
   const invoices = await Promise.all(
     subscriptions.map(async (subscription) => {
       const subItems = await getSubscriptionLineItems(subscription, lineItems, primarySubscription);
-      const { invoice } = await ensureInvoiceForCheckout({ 
-        checkoutSession, 
-        customer, 
-        subscription, 
-        subscriptions, 
+      const { invoice } = await ensureInvoiceForCheckout({
+        checkoutSession,
+        customer,
+        subscription,
+        subscriptions,
         lineItems: subItems,
         props: invoiceProps,
       });
@@ -540,10 +521,10 @@ export async function ensureInvoicesForSubscriptions({
   );
 
   const createdInvoices = invoices.filter(Boolean);
-  
+
   logger.info(`Created ${createdInvoices.length} invoices for subscriptions`, {
     checkoutSessionId: checkoutSession.id,
-    invoiceIds: createdInvoices.map(inv => inv?.id)
+    invoiceIds: createdInvoices.map((inv) => inv?.id),
   });
 
   return { invoices: createdInvoices as Invoice[] };
@@ -625,7 +606,7 @@ export async function ensureSubscriptionRecharge(subscriptionId: string) {
     paymentMethod: paymentMethod as PaymentMethod,
     receiverAddress,
     subscription,
-    customer
+    customer,
   };
 }
 
@@ -715,7 +696,7 @@ export async function getDelegationTxClaim({
     billingThreshold,
     paymentMethod,
     paymentCurrency,
-    requiredStake
+    requiredStake,
   });
   if (mode === 'delegation') {
     tokenRequirements = [];
@@ -788,7 +769,11 @@ export async function getDelegationTxClaim({
   throw new Error(`getDelegationTxClaim: Payment method ${paymentMethod.type} not supported`);
 }
 
-export function getStakeAmount(subscription: Subscription, paymentCurrency: PaymentCurrency, items: TLineItemExpanded[]) {
+export function getStakeAmount(
+  subscription: Subscription,
+  paymentCurrency: PaymentCurrency,
+  items: TLineItemExpanded[]
+) {
   const billingThreshold = Number(subscription.billing_thresholds?.amount_gte || 0);
   const minStakeAmount = Number(subscription.billing_thresholds?.stake_gte || 0);
   const threshold = fromTokenToUnit(Math.max(billingThreshold, minStakeAmount), paymentCurrency.decimal);
@@ -816,29 +801,29 @@ export async function getStakeTxClaim({
 }) {
   let billingThreshold = Number(subscription.billing_thresholds?.amount_gte || 0);
   let minStakeAmount = Number(subscription.billing_thresholds?.stake_gte || 0);
-  
+
   const hasGrouping = subscriptions && subscriptions.length > 1;
   if (hasGrouping) {
-    const primarySubscription = subscriptions[0] as Subscription; 
+    const primarySubscription = subscriptions[0] as Subscription;
     // use the settings of the primary subscription, not the scattered staking
     billingThreshold = Number(primarySubscription.billing_thresholds?.amount_gte || 0);
     minStakeAmount = Number(primarySubscription.billing_thresholds?.stake_gte || 0);
-    
+
     logger.info('Using primary subscription for staking', {
       primarySubscriptionId: primarySubscription.id,
       billingThreshold,
       minStakeAmount,
-      allSubscriptionIds: subscriptions.map(s => s.id)
+      allSubscriptionIds: subscriptions.map((s) => s.id),
     });
   }
-  
+
   const threshold = fromTokenToUnit(Math.max(billingThreshold, minStakeAmount), paymentCurrency.decimal);
   const staking = getSubscriptionStakeSetup(items, paymentCurrency.id, threshold.toString());
   const amount = staking.licensed.add(staking.metered).toString();
-  
+
   logger.info('getStakeTxClaim', {
     subscriptionId: subscription.id,
-    allSubscriptions: subscriptions?.map(s => s.id) || [],
+    allSubscriptions: subscriptions?.map((s) => s.id) || [],
     billingThreshold,
     minStakeAmount,
     threshold: threshold.toString(),
@@ -849,11 +834,9 @@ export async function getStakeTxClaim({
   if (paymentMethod.type === 'arcblock') {
     // create staking data
     const client = paymentMethod.getOcapClient();
-    
-    const stakeId = hasGrouping 
-      ? `stake-group-${subscription.id}` 
-      : subscription.id;
-      
+
+    const stakeId = hasGrouping ? `stake-group-${subscription.id}` : subscription.id;
+
     const address = await getCustomerStakeAddress(userDid, stakeId);
     const { state } = await client.getStakeState({ address });
     const data = {
@@ -862,10 +845,12 @@ export async function getStakeTxClaim({
         {
           appId: wallet.address,
           subscriptionId: subscription.id,
-          ...(hasGrouping ? {
-            subscriptionGroup: true,
-            subscriptionIds: subscriptions.map(s => s.id)
-          } : {})
+          ...(hasGrouping
+            ? {
+                subscriptionGroup: true,
+                subscriptionIds: subscriptions.map((s) => s.id),
+              }
+            : {}),
         },
         JSON.parse(state?.data?.value || '{}')
       ),
@@ -902,11 +887,13 @@ export async function getStakeTxClaim({
       meta: {
         purpose: 'staking',
         address,
-        ...(hasGrouping ? {
-          subscriptionGroup: true,
-          primarySubscriptionId: subscription.id,
-          allSubscriptionIds: subscriptions.map(s => s.id)
-        } : {})
+        ...(hasGrouping
+          ? {
+              subscriptionGroup: true,
+              primarySubscriptionId: subscription.id,
+              allSubscriptionIds: subscriptions.map((s) => s.id),
+            }
+          : {}),
       },
       chainInfo: {
         host: paymentMethod.settings?.arcblock?.api_host as string,
@@ -1015,7 +1002,7 @@ export async function getTokenRequirements({
   paymentCurrency,
   trialing = false,
   billingThreshold = 0,
-  requiredStake
+  requiredStake,
 }: TokenRequirementArgs) {
   const tokenRequirements = [];
   let amount = getFastCheckoutAmount(items, mode, paymentCurrency.id, !!trialing);
@@ -1197,7 +1184,7 @@ export async function ensureReStakeContext(subscriptionId: string) {
   };
 }
 export async function ensureSubscriptionForCollectBatch(
-  subscriptionId?: string, 
+  subscriptionId?: string,
   currencyId?: string,
   customerId?: string
 ) {
@@ -1258,13 +1245,13 @@ export async function ensureSubscriptionForOverdraftProtection(subscriptionId: s
   if (!subscription) {
     throw new Error(`Subscription ${subscriptionId} not found when prepare SubGuard`);
   }
-    // @ts-ignore
+  // @ts-ignore
   subscription.items = await expandSubscriptionItems(subscription.id);
   const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
   if (!paymentCurrency) {
     throw new Error(`PaymentCurrency ${subscription.currency_id} not found when prepare SubGuard`);
   }
-  
+
   const paymentMethod = await PaymentMethod.findByPk(paymentCurrency.payment_method_id);
 
   if (!paymentMethod) {
@@ -1288,7 +1275,6 @@ export async function ensureSubscriptionForOverdraftProtection(subscriptionId: s
   };
 }
 
-
 async function executeSingleTransaction(
   client: any,
   claim: any,
@@ -1323,13 +1309,12 @@ export async function executeOcapTransactions(
 ) {
   const client = paymentMethod.getOcapClient();
   logger.info('start executeOcapTransactions', { userDid, claims });
-  
-  const delegation = claims.find(x => x.type === 'signature' && x.meta?.purpose === 'delegation');
-  const staking = claims.find(x => x.type === 'prepareTx' && x.meta?.purpose === 'staking');
-  
-  const stakingAmount = staking?.requirement?.tokens?.find(
-    (x: any) => x?.address === paymentCurrencyContract
-  )?.value || '0';
+
+  const delegation = claims.find((x) => x.type === 'signature' && x.meta?.purpose === 'delegation');
+  const staking = claims.find((x) => x.type === 'prepareTx' && x.meta?.purpose === 'staking');
+
+  const stakingAmount =
+    staking?.requirement?.tokens?.find((x: any) => x?.address === paymentCurrencyContract)?.value || '0';
 
   try {
     const getHeaders = (index: number): Record<string, string> => {
@@ -1341,17 +1326,17 @@ export async function executeOcapTransactions(
         const req = requestSource[headerIndex];
         return req ? client.pickGasPayerHeaders(req) : {};
       }
-      
+
       if (requestSource && typeof requestSource === 'object') {
         return client.pickGasPayerHeaders(requestSource);
       }
-      
+
       return {};
     };
 
     const transactions = [
       { claim: delegation, type: 'Delegate' },
-      { claim: staking, type: 'Stake' }
+      { claim: staking, type: 'Stake' },
     ];
 
     const txHashes = [];
@@ -1377,7 +1362,7 @@ export async function executeOcapTransactions(
       type: 'delegate',
       staking: {
         tx_hash: stakingTxHash,
-        address:  await getCustomerStakeAddress(userDid, nonce || subscriptionId || ''),
+        address: await getCustomerStakeAddress(userDid, nonce || subscriptionId || ''),
       },
       stakingAmount,
     };
@@ -1413,7 +1398,7 @@ export async function updateStripeSubscriptionAfterChangePayment(setupIntent: Se
     const toMethod = await PaymentMethod.findByPk(toMethodId);
     if (toMethod?.type === 'stripe') {
       // resume stripe
-      const client =  toMethod?.getStripeClient();
+      const client = toMethod?.getStripeClient();
       const stripeSubscriptionId = subscription.payment_details?.stripe?.subscription_id as string;
       if (client && stripeSubscriptionId) {
         const stripeSubscription = await client.subscriptions.retrieve(stripeSubscriptionId);
@@ -1443,7 +1428,7 @@ export async function returnStakeForCanceledSubscription(subscriptionId: string)
     if (subscription.status !== 'canceled') {
       throw new Error(`Subscription ${subscriptionId} is not canceled`);
     }
-  
+
     if (!subscription.payment_details?.arcblock?.staking?.tx_hash) {
       throw new Error(`No staking transaction found in subscription ${subscriptionId}`);
     }
@@ -1455,4 +1440,4 @@ export async function returnStakeForCanceledSubscription(subscriptionId: string)
   } catch (err) {
     logger.error('returnStakeForCanceledSubscription failed', { error: err, subscriptionId });
   }
-}
+}

package/api/src/routes/connect/subscribe.ts

@@ -1,3 +1,4 @@
+import pAll from 'p-all';
 import { broadcastEvmTransaction, executeEvmTransaction, waitForEvmTxConfirm } from '../../integrations/ethereum/tx';
 import type { CallbackArgs } from '../../libs/auth';
 import dayjs from '../../libs/dayjs';
@@ -19,13 +20,24 @@ import {
 } from './shared';
 import { ensureStakeInvoice } from '../../libs/invoice';
 import { EVM_CHAIN_TYPES } from '../../libs/constants';
+import { updateDataConcurrency } from '../../libs/env';
 
 const updateInvoices = async (invoices: Invoice[], update: Partial<Invoice>) => {
-  await Promise.all(invoices.map((invoice) => invoice.update(update)));
+  await pAll(
+    invoices.map((invoice) => async () => {
+      await invoice.update(update);
+    }),
+    { concurrency: updateDataConcurrency }
+  );
 };
 
 const updateSubscriptions = async (subscriptions: Subscription[], update: Partial<Subscription>) => {
-  await Promise.all(subscriptions.map((subscription) => subscription.update(update)));
+  await pAll(
+    subscriptions.map((subscription) => async () => {
+      await subscription.update(update);
+    }),
+    { concurrency: updateDataConcurrency }
+  );
 };
 
 export default {
@@ -46,7 +58,6 @@ export default {
       paymentMethod,
       paymentCurrency,
       subscriptions,
-      customer,
       subscription: primarySubscription,
     } = await ensurePaymentIntent(checkoutSessionId, connectedDid || sessionUserDid || userDid);
     if (!subscriptions || subscriptions.length === 0) {
@@ -71,7 +82,7 @@ export default {
       const delegation = await isDelegationSufficientForPayment({
         paymentMethod,
         paymentCurrency,
-        userDid: customer.did,
+        userDid,
         amount: fastCheckoutAmount,
       });
 
@@ -208,8 +219,11 @@ export default {
         }
       }
 
-      await Promise.all(
-        subscriptions.map((subscription) => addSubscriptionJob(subscription, 'cycle', false, subscription.trial_end))
+      await pAll(
+        subscriptions.map((subscription) => async () => {
+          await addSubscriptionJob(subscription, 'cycle', false, subscription.trial_end);
+        }),
+        { concurrency: updateDataConcurrency }
       );
 
       logger.info('CheckoutSession updated with multiple subscriptions', {
@@ -233,6 +247,7 @@ export default {
       paymentCurrency,
       userDid,
       amount: fastCheckoutAmount,
+      skipUserCheck: true,
     });
 
     if (tokenBalanceCheck.sufficient === false) {

package/api/src/routes/meters.ts

@@ -151,6 +151,7 @@ router.put('/:id', auth, async (req, res) => {
 
     const updateData: any = {
       ...pick(req.body, ['name', 'description', 'status']),
+      unit: req.body.unit || meter.unit,
       updated_by: req.user?.did,
     };
 

package/api/src/routes/payment-currencies.ts

@@ -306,6 +306,8 @@ const updateCurrencySchema = Joi.object({
   name: Joi.string().empty('').max(32).optional(),
   description: Joi.string().empty('').max(255).optional(),
   logo: Joi.string().empty('').optional(),
+  metadata: Joi.object().optional(),
+  symbol: Joi.string().empty('').optional(),
 }).unknown(true);
 router.put('/:id', auth, async (req, res) => {
   const { id } = req.params;
@@ -329,11 +331,18 @@ router.put('/:id', auth, async (req, res) => {
     return res.status(400).json({ error: 'Payment method not found' });
   }
 
-  const updatedCurrency = await currency.update({
+  const updates: Partial<TPaymentCurrency> = {
     name: raw.name || currency.name,
     description: raw.description || currency.description,
     logo: raw.logo || method.logo,
-  });
+    metadata: raw.metadata || currency.metadata,
+  };
+
+  if (currency.type === 'credit') {
+    updates.symbol = raw.symbol || currency.symbol;
+  }
+
+  const updatedCurrency = await currency.update(updates);
   return res.json(updatedCurrency);
 });