payment-kit 1.15.1 → 1.15.3

package/api/src/queues/invoice.ts

@@ -114,7 +114,7 @@ export const handleInvoice = async (job: InvoiceJob) => {
     });
     paymentIntent = await PaymentIntent.findByPk(invoice.payment_intent_id);
     if (paymentIntent && paymentIntent.isImmutable() === false) {
-      await paymentIntent.update({ status: 'requires_capture' });
+      await paymentIntent.update({ status: 'requires_capture', customer_id: invoice.customer_id });
     }
   } else {
     const descriptionMap: any = {

package/api/src/queues/notification.ts

@@ -51,6 +51,10 @@ import {
   SubscriptionWillRenewEmailTemplate,
   SubscriptionWillRenewEmailTemplateOptions,
 } from '../libs/notification/template/subscription-will-renew';
+import {
+  SubscriptionStakeSlashSucceededEmailTemplate,
+  SubscriptionStakeSlashSucceededEmailTemplateOptions,
+} from '../libs/notification/template/subscription-stake-slash-succeeded';
 import createQueue from '../libs/queue';
 import { CheckoutSession, EventType, Invoice, PaymentLink, Refund, Subscription } from '../store/models';
 
@@ -105,6 +109,11 @@ function getNotificationTemplate(job: NotificationQueueJob): BaseEmailTemplate {
   if (job.type === 'customer.reward.succeeded') {
     return new CustomerRewardSucceededEmailTemplate(job.options as CustomerRewardSucceededEmailTemplateOptions);
   }
+  if (job.type === 'subscription.stake.slash.succeeded') {
+    return new SubscriptionStakeSlashSucceededEmailTemplate(
+      job.options as SubscriptionStakeSlashSucceededEmailTemplateOptions
+    );
+  }
 
   throw new Error(`Unknown job type: ${job.type}`);
 }

package/api/src/queues/payment.ts

@@ -33,6 +33,7 @@ import { Price } from '../store/models/price';
 import { Subscription } from '../store/models/subscription';
 import { SubscriptionItem } from '../store/models/subscription-item';
 import type { PaymentError, PaymentSettings } from '../store/models/types';
+import { notificationQueue } from './notification';
 
 type PaymentJob = {
   paymentIntentId: string;
@@ -474,6 +475,22 @@ const handleStakeSlash = async (
     },
   });
   await handlePaymentSucceed(paymentIntent, true);
+  const jobId = `${paymentIntent.id}-${subscription.id}`;
+  const job = await notificationQueue.get(jobId);
+  if (job) {
+    return;
+  }
+  notificationQueue.push({
+    id: jobId,
+    job: {
+      type: 'subscription.stake.slash.succeeded',
+      options: {
+        paymentIntentId: paymentIntent.id,
+        subscriptionId: subscription.id,
+        invoiceId: invoice.id,
+      },
+    },
+  });
 };
 
 export const handlePayment = async (job: PaymentJob) => {

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

@@ -47,7 +47,13 @@ import {
 import { CHECKOUT_SESSION_TTL, formatAmountPrecisionLimit, formatMetadata, getDataObjectFromQuery } from '../libs/util';
 import { invoiceQueue } from '../queues/invoice';
 import { paymentQueue } from '../queues/payment';
-import type { LineItem, SubscriptionData, TPriceExpanded, TProductExpanded } from '../store/models';
+import {
+  Invoice,
+  type LineItem,
+  type SubscriptionData,
+  type TPriceExpanded,
+  type TProductExpanded,
+} from '../store/models';
 import { CheckoutSession } from '../store/models/checkout-session';
 import { Customer } from '../store/models/customer';
 import { PaymentCurrency } from '../store/models/payment-currency';
@@ -814,6 +820,12 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           session: checkoutSession.id,
           items: items.map((x) => x.id),
         });
+        const invoice = await Invoice.findByPk(subscription?.latest_invoice_id);
+        if (invoice && invoice.customer_id !== customer.id) {
+          invoice.update({
+            customer_id: customer.id,
+          });
+        }
       } else {
         const recoveredFromId = checkoutSession.subscription_data?.recovered_from || '';
         const recoveredFrom = recoveredFromId ? await Subscription.findByPk(recoveredFromId) : null;

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

@@ -47,7 +47,7 @@ router.get('/', auth, async (req, res) => {
   if (query.end) {
     where.timestamp[Op.lt] = query.end;
   } else {
-    where.timestamp[Op.lt] = dayjs().startOf('day').unix();
+    where.timestamp[Op.lt] = dayjs().endOf('day').unix();
   }
 
   try {
@@ -90,7 +90,7 @@ async function getCurrencyLinks(livemode: boolean) {
   });
 
   return items.reduce((acc, item: any) => {
-    if (item.payment_method.type === 'arcblock') {
+    if (item.payment_method?.type === 'arcblock') {
       acc[item.id] = joinURL(
         item.payment_method.settings.arcblock?.explorer_host,
         'accounts',
@@ -98,7 +98,7 @@ async function getCurrencyLinks(livemode: boolean) {
         'tokens'
       );
     }
-    if (item.payment_method.type === 'ethereum') {
+    if (item.payment_method?.type === 'ethereum') {
       acc[item.id] = joinURL(item.payment_method.settings.ethereum?.explorer_host, 'address', ethWallet.address);
     }
     return acc;

package/api/src/routes/subscriptions.ts

@@ -223,6 +223,7 @@ router.get('/:id', authPortal, async (req, res) => {
 });
 
 const CommentSchema = Joi.string().max(200).empty('').optional();
+const SlashStakeSchema = Joi.string().max(200).required();
 
 router.put('/:id/cancel', authPortal, async (req, res) => {
   const { error: commentError } = CommentSchema.validate(req.body?.comment);
@@ -230,6 +231,15 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
     return res.status(400).json({ error: `comment invalid: ${commentError.message}` });
   }
 
+  const slashStake = req.body?.requestByAdmin && req.body?.staking === 'slash';
+
+  if (slashStake) {
+    const { error: slashReasonError } = SlashStakeSchema.validate(req.body?.slashReason);
+    if (slashReasonError) {
+      return res.status(400).json({ error: `slash reason invalid: ${slashReasonError.message}` });
+    }
+  }
+
   const subscription = await Subscription.findByPk(req.params.id);
   logger.info('subscription cancel request', { ...req.params, ...req.body });
 
@@ -248,6 +258,7 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
     comment = '',
     reason = 'payment_disputed',
     staking = 'none',
+    slashReason = 'admin slash',
   } = req.body;
   if (at === 'custom' && dayjs(time).unix() < dayjs().unix()) {
     return res.status(400).json({ error: 'cancel at must be a future timestamp' });
@@ -258,15 +269,16 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
   if ((requestByAdmin && staking === 'proration') || req.body?.cancel_from === 'customer') {
     canReturnStake = true;
   }
-  const slashStake = requestByAdmin && staking === 'slash';
+  const haveStake = !!subscription.payment_details?.arcblock?.staking?.tx_hash;
   // update cancel at
   const updates: Partial<Subscription> = {
     cancelation_details: {
       comment: comment || `Requested by ${req.user?.role}:${req.user?.did}`,
       reason: reason || 'payment_disputed',
       feedback: feedback || 'other',
-      return_stake: canReturnStake,
-      slash_stake: slashStake,
+      return_stake: canReturnStake && haveStake,
+      slash_stake: slashStake && haveStake,
+      slash_reason: slashReason,
     },
   };
   const now = dayjs().unix() + 3;
@@ -278,8 +290,9 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
       reason: 'cancellation_requested',
       feedback,
       comment,
-      return_stake: canReturnStake,
-      slash_stake: slashStake,
+      return_stake: canReturnStake && haveStake,
+      slash_stake: slashStake && haveStake,
+      slash_reason: slashReason,
     };
     updates.canceled_at = now;
     if (inTrialing) {
@@ -1215,7 +1228,9 @@ router.get('/:id/proration', authPortal, async (req, res) => {
 
     const anchor = req.query.time ? dayjs(req.query.time as any).unix() : dayjs().unix();
     const result = await getSubscriptionRefundSetup(subscription, anchor);
-
+    if (result.total === '0') {
+      return res.json(null);
+    }
     return res.json({
       total: result.total,
       latest: invoice?.total,
@@ -1611,6 +1626,10 @@ router.get('/:id/upcoming', authPortal, async (req, res) => {
 
 // slash stake
 router.put('/:id/slash-stake', auth, async (req, res) => {
+  const { error: slashReasonError } = SlashStakeSchema.validate(req.body?.slashReason);
+  if (slashReasonError) {
+    return res.status(400).json({ error: `slash reason invalid: ${slashReasonError.message}` });
+  }
   const subscription = await Subscription.findByPk(req.params.id);
   if (!subscription) {
     return res.status(404).json({ error: 'Subscription not found' });
@@ -1636,6 +1655,7 @@ router.put('/:id/slash-stake', auth, async (req, res) => {
       cancelation_details: {
         ...subscription.cancelation_details,
         slash_stake: true,
+        slash_reason: req.body.slashReason,
       },
     });
     const result = await slashStakeQueue.pushAndWait({

package/api/src/store/migrations/20240905-index.ts

@@ -0,0 +1,100 @@
+import type { Migration } from '../migrate';
+
+export const up: Migration = async ({ context: queryInterface }) => {
+  try {
+    await queryInterface.addIndex('subscriptions', ['current_period_start', 'current_period_end'], {
+      name: 'idx_subscription_period',
+    });
+    await queryInterface.addIndex('subscriptions', ['status'], {
+      name: 'idx_subscription_status',
+    });
+
+    await queryInterface.addIndex('subscription_items', ['subscription_id', 'price_id'], {
+      name: 'idx_subscription_item_subscription_id_price_id',
+    });
+
+    await queryInterface.addIndex('invoices', ['status', 'collection_method'], {
+      name: 'idx_invoice_status_collection',
+    });
+    await queryInterface.addIndex('invoices', ['subscription_id'], {
+      name: 'idx_invoice_subscription_id',
+    });
+    await queryInterface.addIndex('invoices', ['currency_id'], {
+      name: 'idx_invoice_currency_id',
+    });
+    await queryInterface.addIndex('invoices', ['customer_id'], {
+      name: 'idx_invoice_customer_id',
+    });
+
+    await queryInterface.addIndex('payment_intents', ['invoice_id'], {
+      name: 'idx_payment_intent_invoice_id',
+    });
+    await queryInterface.addIndex('payment_intents', ['customer_id'], {
+      name: 'idx_payment_intent_customer_id',
+    });
+    await queryInterface.addIndex('payment_intents', ['currency_id'], {
+      name: 'idx_payment_intent_currency_id',
+    });
+    await queryInterface.addIndex('payment_intents', ['status', 'updated_at'], {
+      name: 'idx_payment_intent_status_updated_at',
+    });
+
+    await queryInterface.addIndex('webhook_attempts', ['webhook_endpoint_id'], {
+      name: 'idx_webhook_attempts_webhook_endpoint_id',
+    });
+    await queryInterface.addIndex('webhook_attempts', ['event_id'], {
+      name: 'idx_webhook_attempts_event_id',
+    });
+
+    await queryInterface.addIndex('usage_records', ['subscription_item_id', 'timestamp'], {
+      name: 'idx_usage_records_subscription_item_id_timestamp',
+    });
+
+    await queryInterface.addIndex('webhook_endpoints', ['status', 'livemode'], {
+      name: 'idx_webhook_endpoint_status_livemode',
+    });
+
+    await queryInterface.addIndex('payment_stats', ['timestamp', 'currency_id'], {
+      name: 'idx_payment_stats_timestamp_currency_id',
+    });
+
+    await queryInterface.addIndex('payouts', ['updated_at', 'status'], {
+      name: 'idx_payouts_updated_at_status',
+    });
+
+    await queryInterface.addIndex('refunds', ['status', 'type', 'updated_at'], {
+      name: 'idx_refunds_status_type_updated_at',
+    });
+    await queryInterface.addIndex('refunds', ['subscription_id', 'type'], {
+      name: 'idx_refunds_subscription_id_type',
+    });
+    await queryInterface.addIndex('refunds', ['payment_intent_id', 'type'], {
+      name: 'idx_refunds_payment_intent_id_type',
+    });
+  } catch (error) {
+    console.error('Failed to create indexes', error);
+    throw error;
+  }
+};
+export const down: Migration = async ({ context: queryInterface }) => {
+  await queryInterface.removeIndex('subscriptions', 'idx_subscription_period');
+  await queryInterface.removeIndex('subscriptions', 'idx_subscription_status');
+  await queryInterface.removeIndex('subscription_items', 'idx_subscription_item_subscription_id_price_id');
+  await queryInterface.removeIndex('invoices', 'idx_invoice_status_collection');
+  await queryInterface.removeIndex('invoices', 'idx_invoice_subscription_id');
+  await queryInterface.removeIndex('invoices', 'idx_invoice_currency_id');
+  await queryInterface.removeIndex('invoices', 'idx_invoice_customer_id');
+  await queryInterface.removeIndex('payment_intents', 'idx_payment_intent_invoice_id');
+  await queryInterface.removeIndex('payment_intents', 'idx_payment_intent_customer_id');
+  await queryInterface.removeIndex('payment_intents', 'idx_payment_intent_currency_id');
+  await queryInterface.removeIndex('payment_intents', 'idx_payment_intent_status_updated_at');
+  await queryInterface.removeIndex('webhook_attempts', 'idx_webhook_attempts_webhook_endpoint_id');
+  await queryInterface.removeIndex('webhook_attempts', 'idx_webhook_attempts_event_id');
+  await queryInterface.removeIndex('usage_records', 'idx_usage_records_subscription_item_id_timestamp');
+  await queryInterface.removeIndex('webhook_endpoints', 'idx_webhook_endpoint_status_livemode');
+  await queryInterface.removeIndex('payment_stats', 'idx_payment_stats_timestamp_currency_id');
+  await queryInterface.removeIndex('payouts', 'idx_payouts_updated_at_status');
+  await queryInterface.removeIndex('refunds', 'idx_refunds_status_type_updated_at');
+  await queryInterface.removeIndex('refunds', 'idx_refunds_subscription_id_type');
+  await queryInterface.removeIndex('refunds', 'idx_refunds_payment_intent_id_type');
+};

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

@@ -63,6 +63,7 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
     reason: LiteralUnion<'cancellation_requested' | 'payment_disputed' | 'payment_failed' | 'stake_revoked', string>;
     return_stake?: boolean;
     slash_stake?: boolean;
+    slash_reason?: string;
   };
 
   declare billing_cycle_anchor: number;

package/api/tests/libs/payment.spec.ts

@@ -0,0 +1,168 @@
+import { getPaymentAmountForCycleSubscription } from '../../src/libs/payment';
+import { SubscriptionItem, Price, UsageRecord } from '../../src/store/models'; // 假设这些模型在 models 文件中
+import { getSubscriptionCycleSetup, getSubscriptionCycleAmount } from '../../src/libs/subscription'; // 假设这些工具函数在 utils 文件中
+
+jest.mock('../../src/store/models');
+jest.mock('../../src/libs/subscription');
+
+describe('getPaymentAmountForCycleSubscription', () => {
+  const subscription = {
+    id: 'sub_123456789012345678901234',
+    livemode: true,
+    currency_id: 'tba',
+    customer_id: 'cus_123456789012345678',
+    current_period_end: 1627689600,
+    current_period_start: 1625097600,
+    default_payment_method_id: 'pm_123456789012345678901234',
+    description: 'Test subscription',
+    latest_invoice_id: 'in_123456789012345678901234',
+    metadata: { key: 'value' },
+    pending_setup_intent: 'seti_123456789012345678901234',
+    pending_update: {
+      billing_cycle_anchor: 1627689600,
+      expires_at: 1627689600,
+      subscription_items: [],
+      trial_end: 1627689600,
+    },
+    status: 'active',
+    cancel_at_period_end: false,
+    cancel_at: 1627689600,
+    canceled_at: 1627689600,
+    cancelation_details: {
+      comment: 'Customer requested cancellation',
+      feedback: 'too_expensive',
+      reason: 'cancellation_requested',
+      return_stake: true,
+      slash_stake: false,
+    },
+    billing_cycle_anchor: 1625097600,
+    billing_thresholds: {
+      amount_gte: 1000,
+      stake_gte: 100,
+      reset_billing_cycle_anchor: true,
+    },
+    collection_method: 'charge_automatically',
+    days_until_due: 30,
+    days_until_cancel: 7,
+    discount_id: 'di_123456789012345678901234',
+    next_pending_invoice_item_invoice: 1627689600,
+    pause_collection: {
+      behavior: 'keep_as_draft',
+      resumes_at: 1627689600,
+    },
+    payment_settings: {
+      payment_method_options: {
+        card: {
+          request_three_d_secure: 'any',
+        },
+      },
+      payment_method_types: ['card'],
+    },
+    pending_invoice_item_interval: {
+      interval: 'month',
+      interval_count: 1,
+    },
+    schedule_id: 'sch_123456789012345678901234',
+    ended_at: 1627689600,
+    start_date: 1625097600,
+    trial_end: 1627689600,
+    trial_start: 1625097600,
+    trial_settings: {
+      end_behavior: {
+        missing_payment_method: 'cancel',
+      },
+    },
+    payment_details: {
+      tx_hash: '0x1234567890abcdef',
+    },
+    proration_behavior: 'always_invoice',
+    payment_behavior: 'allow_incomplete',
+    service_actions: [
+      {
+        action: 'activate',
+        service: 'service_1',
+      },
+    ],
+    _from: 'sub_098765432109876543210987',
+    created_at: new Date(),
+    updated_at: new Date(),
+  };
+
+  const paymentCurrency = {
+    id: 'usd',
+    decimal: 18,
+    symbol: 'TBA',
+  };
+
+  const subscriptionItems = [
+    { id: 'item_1', price_id: 'price_1', quantity: 1 },
+    { id: 'item_2', price_id: 'price_2', quantity: 2 },
+  ];
+
+  const expandedItems = [
+    {
+      id: 'item_1',
+      // @ts-ignore
+      price: new Price({
+        id: 'price_1',
+        active: true,
+        product_id: 'prod_1',
+        livemode: false,
+        type: 'recurring',
+        unit_amount: '100000000000000000',
+        currency_id: 'tba',
+        recurring: {
+          usage_type: 'licensed',
+          interval: 'month',
+          interval_count: 1,
+        },
+      }),
+      quantity: 1,
+    },
+    {
+      id: 'item_2',
+      // @ts-ignore
+      price: new Price({
+        id: 'price_2',
+        active: true,
+        product_id: 'prod_2',
+        livemode: false,
+        type: 'recurring',
+        currency_id: 'tba',
+        unit_amount: '100000000000000000',
+        recurring: {
+          usage_type: 'metered',
+          interval: 'month',
+          interval_count: 1,
+          aggregate_usage: 'sum',
+        },
+      }),
+      quantity: 2,
+    },
+  ];
+
+  beforeEach(() => {
+    (SubscriptionItem.findAll as jest.Mock).mockResolvedValue(subscriptionItems);
+    (Price.expand as jest.Mock).mockResolvedValue(expandedItems);
+    (UsageRecord.getSummary as jest.Mock).mockResolvedValue(10);
+    (getSubscriptionCycleSetup as jest.Mock).mockReturnValue({
+      period: { start: 1625097600, end: 1627689600 },
+      cycle: 2592000,
+    });
+    (getSubscriptionCycleAmount as jest.Mock).mockReturnValue({ total: '100000000000000000' });
+  });
+
+  it('should return the total amount for the subscription cycle', async () => {
+    // @ts-ignore
+    const result = await getPaymentAmountForCycleSubscription(subscription, paymentCurrency);
+    expect(result).toBe(0.1);
+  });
+
+  it('should return 0 if there are no subscription items', async () => {
+    (SubscriptionItem.findAll as jest.Mock).mockResolvedValue([]);
+    (Price.expand as jest.Mock).mockResolvedValue([]); // 确保 Price.expand 返回空数组
+    // @ts-ignore
+    const result = await getPaymentAmountForCycleSubscription(subscription, paymentCurrency);
+    expect(result).toBe(0);
+  });
+});

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.15.1
+version: 1.15.3
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.1",
+  "version": "1.15.3",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -45,17 +45,18 @@
     "@abtnode/cron": "1.16.30",
     "@arcblock/did": "^1.18.135",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.10.25",
+    "@arcblock/did-connect": "^2.10.30",
     "@arcblock/did-util": "^1.18.135",
     "@arcblock/jwt": "^1.18.135",
-    "@arcblock/ux": "2.10.24",
+    "@arcblock/ux": "2.10.28",
     "@arcblock/validator": "^1.18.135",
     "@blocklet/js-sdk": "1.16.30",
     "@blocklet/logger": "1.16.30",
-    "@blocklet/payment-react": "1.15.1",
+    "@blocklet/payment-react": "1.15.3",
     "@blocklet/sdk": "1.16.30",
-    "@blocklet/ui-react": "^2.10.25",
-    "@blocklet/uploader": "^0.1.27",
+    "@blocklet/ui-react": "^2.10.30",
+    "@blocklet/uploader": "^0.1.29",
+    "@blocklet/xss": "^0.1.5",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
@@ -83,7 +84,6 @@
     "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "express-history-api-fallback": "^2.2.1",
-    "express-xss-sanitizer": "^1.2.0",
     "fastq": "^1.17.1",
     "flat": "^5.0.2",
     "google-libphonenumber": "^3.2.38",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.30",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.1",
+    "@blocklet/payment-types": "1.15.3",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -144,7 +144,7 @@
     "typescript": "^4.9.5",
     "vite": "^5.3.5",
     "vite-node": "^2.0.4",
-    "vite-plugin-blocklet": "^0.9.3",
+    "vite-plugin-blocklet": "^0.9.4",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "ff06b03c0e25d6c4d9ea8f5495592c4f5c20829b"
+  "gitHead": "e9841f27db3993526f7871e2a0118d89c6958470"
 }

package/src/components/balance-list.tsx

@@ -29,14 +29,14 @@ export default function BalanceList(props: Props) {
         return (
           <Stack
             key={currencyId}
-            sx={{ width: '100%', maxWidth: '200px' }}
+            sx={{ width: '100%', maxWidth: '280px' }}
             direction="row"
             spacing={1}
             alignItems="center">
             {props?.showLogo && (
               <Avatar src={currency.logo} alt={currency.symbol} style={{ width: '18px', height: '18px' }} />
             )}
-            <Typography sx={{ width: '32px' }} color="text.secondary">
+            <Typography sx={{ width: '32px', minWidth: 100 }} color="text.secondary">
               {currency.symbol}
             </Typography>
             <Typography sx={{ flex: 1, textAlign: 'right' }} color="text.primary">

package/src/components/invoice/list.tsx

@@ -148,7 +148,7 @@ export default function InvoiceList({
     {
       label: t('common.status'),
       name: 'status',
-      width: 60,
+      width: 80,
       options: {
         customBodyRenderLite: (_: string, index: number) => {
           const item = data.list[index] as TInvoiceExpanded;
@@ -229,7 +229,7 @@ export default function InvoiceList({
     columns.splice(3, 0, {
       label: t('common.customer'),
       name: 'customer_id',
-      width: 60,
+      width: 80,
       options: {
         customBodyRenderLite: (_: string, index: number) => {
           const item = data.list[index] as TInvoiceExpanded;

package/src/components/invoice/table.tsx

@@ -35,7 +35,7 @@ type InvoiceSummaryItem = {
 };
 
 export function getAppliedBalance(invoice: TInvoiceExpanded) {
-  if (invoice.paymentMethod.type === 'stripe') {
+  if (invoice.paymentMethod?.type === 'stripe') {
     const starting = toBN(invoice.starting_balance || '0');
     const ending = toBN(invoice.ending_balance || '0');
     return ending.sub(starting).toString();

package/src/components/payment-intent/list.tsx

@@ -138,7 +138,7 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
     {
       label: t('common.status'),
       name: 'status',
-      width: 60,
+      width: 80,
       options: {
         customBodyRenderLite: (_: string, index: number) => {
           const item = data.list[index] as TPaymentIntentExpanded;

package/src/components/payouts/list.tsx

@@ -130,7 +130,7 @@ export default function PayoutList({ customer_id, payment_intent_id, status, fea
     {
       label: t('common.status'),
       name: 'status',
-      width: 60,
+      width: 80,
       options: {
         customBodyRenderLite: (_: string, index: number) => {
           const item = data.list[index] as TPayoutExpanded;

package/src/components/refund/list.tsx

@@ -151,7 +151,7 @@ export default function RefundList({
     {
       label: t('common.status'),
       name: 'status',
-      width: 60,
+      width: 80,
       options: {
         filter: true,
         customBodyRenderLite: (_: string, index: number) => {
@@ -167,7 +167,7 @@ export default function RefundList({
     {
       label: t('common.type'),
       name: 'type',
-      width: 60,
+      width: 80,
       options: {
         filter: true,
         customBodyRenderLite: (_: string, index: number) => {