payment-kit 1.20.13 → 1.20.14

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

@@ -668,7 +668,9 @@ const getBeneficiaryName = async (beneficiary: PaymentBeneficiary) => {
   return beneficiary.name || (await getUserOrAppInfo(beneficiary.address || ''))?.name || beneficiary.address;
 };
 
-export async function getCrossSellItem(checkoutSession: CheckoutSession) {
+export async function getCrossSellItem(
+  checkoutSession: CheckoutSession
+): Promise<{ error?: string } | (TPriceExpanded & { product: any; error?: string })> {
   // FIXME: perhaps we can support cross sell even if the current session have multiple items
   if (checkoutSession.line_items.length > 1) {
     return { error: 'Cross sell not supported for checkoutSession with multiple line items' };
@@ -2334,8 +2336,12 @@ router.put('/:id/expire', auth, ensureCheckoutSessionOpen, async (req, res) => {
 router.get('/:id/cross-sell', user, ensureCheckoutSessionOpen, async (req, res) => {
   try {
     const checkoutSession = req.doc as CheckoutSession;
+    const skipError = req.query.skipError === 'true';
     const result = await getCrossSellItem(checkoutSession);
-    // @ts-ignore
+
+    if (skipError && result.error) {
+      return res.status(200).json(result);
+    }
     return res.status(result.error ? 400 : 200).json(result);
   } catch (err) {
     logger.error(err);
@@ -2633,6 +2639,10 @@ router.post('/:id/recalculate-promotion', user, ensureCheckoutSessionOpen, async
       return res.status(400).json({ error: 'Coupon no longer valid' });
     }
 
+    const now = dayjs().unix();
+    const trialSetup = getSubscriptionTrialSetup(checkoutSession.subscription_data as any, currency.id);
+    const isTrialing = trialSetup.trialInDays > 0 || trialSetup.trialEnd > now;
+
     // Apply discount with new currency
     const discountResult = await applyDiscountsToLineItems({
       lineItems: expandedItems,
@@ -2640,6 +2650,9 @@ router.post('/:id/recalculate-promotion', user, ensureCheckoutSessionOpen, async
       couponId,
       customerId: customer.id,
       currency,
+      billingContext: {
+        trialing: isTrialing,
+      },
     });
 
     // Check if discount can still be applied with the new currency

package/api/src/routes/coupons.ts

@@ -373,6 +373,13 @@ router.put('/:id', auth, async (req, res) => {
     return res.status(404).json({ error: 'Coupon not found' });
   }
 
+  if (req.body.metadata) {
+    const { error: metadataError } = MetadataSchema.validate(req.body.metadata);
+    if (metadataError) {
+      return res.status(400).json({ error: `metadata invalid: ${metadataError.message}` });
+    }
+  }
+
   if (coupon.locked) {
     const allowedUpdates = pick(value, ['name', 'metadata', 'description']);
     if (Object.keys(allowedUpdates).length === 0) {

package/api/src/routes/credit-grants.ts

@@ -11,6 +11,7 @@ import { CreditGrant, Customer, PaymentCurrency, Price, Subscription } from '../
 import { createCreditGrant } from '../libs/credit-grant';
 import { getMeterPriceIdsFromSubscription } from '../libs/subscription';
 import { blocklet } from '../libs/auth';
+import { formatMetadata } from '../libs/util';
 
 const router = Router();
 const auth = authenticate<CreditGrant>({ component: true, roles: ['owner', 'admin'] });
@@ -264,7 +265,13 @@ router.put('/:id', auth, async (req, res) => {
   if (error) {
     return res.status(400).json({ error: `Credit grant update request invalid: ${error.message}` });
   }
-  await creditGrant.update({ metadata: req.body.metadata });
+  if (req.body.metadata) {
+    const { error: metadataError } = MetadataSchema.validate(req.body.metadata);
+    if (metadataError) {
+      return res.status(400).json({ error: `metadata invalid: ${metadataError.message}` });
+    }
+  }
+  await creditGrant.update({ metadata: formatMetadata(req.body.metadata) });
   return res.json({ success: true });
 });
 

package/api/src/routes/credit-transactions.ts

@@ -3,9 +3,18 @@ import Joi from 'joi';
 
 import { Op } from 'sequelize';
 import { createListParamSchema, getOrder, getWhereFromKvQuery } from '../libs/api';
+import { mergePaginate, type DataSource } from '../libs/pagination';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
-import { CreditTransaction, Customer, CreditGrant, Meter, Subscription, PaymentCurrency } from '../store/models';
+import {
+  CreditTransaction,
+  Customer,
+  CreditGrant,
+  Meter,
+  MeterEvent,
+  Subscription,
+  PaymentCurrency,
+} from '../store/models';
 
 const router = Router();
 const authMine = authenticate<CreditTransaction>({ component: true, roles: ['owner', 'admin'], mine: true });
@@ -27,6 +36,7 @@ const listSchema = createListParamSchema<{
   start?: number;
   end?: number;
   source?: string;
+  include_grants?: boolean;
 }>({
   customer_id: Joi.string().empty(''),
   subscription_id: Joi.string().empty(''),
@@ -35,11 +45,13 @@ const listSchema = createListParamSchema<{
   start: Joi.number().integer().optional(),
   end: Joi.number().integer().optional(),
   source: Joi.string().empty(''),
+  include_grants: Joi.boolean().optional(),
 });
 
 router.get('/', authMine, async (req, res) => {
   try {
     const { page, pageSize, ...query } = await listSchema.validateAsync(req.query, { stripUnknown: true });
+    const includeGrants = !!query.include_grants;
     const where = getWhereFromKvQuery(query.q);
 
     if (query.meter_id) {
@@ -73,6 +85,124 @@ router.get('/', authMine, async (req, res) => {
       };
     }
 
+    if (query.start && query.end) {
+      where.created_at = {
+        [Op.between]: [new Date(query.start * 1000), new Date(query.end * 1000)],
+      };
+    }
+
+    if (includeGrants) {
+      if (!query.customer_id) {
+        return res.status(400).json({
+          error: 'customer_id is required when include_grants=true',
+        });
+      }
+
+      const orderDirection = query.o === 'asc' ? 'ASC' : 'DESC';
+
+      const transactionSource: DataSource<any> = {
+        async count() {
+          const count = await CreditTransaction.count({ where });
+          return count;
+        },
+        async fetch(limit, offset) {
+          const rows = await CreditTransaction.findAll({
+            where,
+            limit,
+            offset,
+            order: [['created_at', orderDirection]],
+            include: [
+              { model: Customer, as: 'customer', attributes: ['id', 'name', 'email', 'did'] },
+              { model: Meter, as: 'meter' },
+              { model: Subscription, as: 'subscription', attributes: ['id', 'description', 'status'], required: false },
+              { model: CreditGrant, as: 'creditGrant', attributes: ['id', 'name', 'currency_id'] },
+              { model: MeterEvent, as: 'meterEvent', attributes: ['id', 'source_data'], required: false },
+            ],
+          });
+          // Transform transactions
+          return rows.map((item: any) => ({
+            ...item.toJSON(),
+            activity_type: 'transaction',
+          }));
+        },
+        meta: { type: 'database' },
+      };
+
+      // Grant where conditions
+      const grantWhere: any = {
+        customer_id: query.customer_id,
+        status: ['granted', 'depleted'],
+      };
+      if (query.start) {
+        grantWhere.created_at = {
+          [Op.gte]: new Date(query.start * 1000),
+        };
+      }
+      if (typeof query.livemode === 'boolean') grantWhere.livemode = query.livemode;
+
+      const grantSource: DataSource<any> = {
+        async count() {
+          const { count } = await CreditGrant.findAndCountAll({ where: grantWhere });
+          return count;
+        },
+        async fetch(limit, offset) {
+          const { rows } = await CreditGrant.findAndCountAll({
+            where: grantWhere,
+            limit,
+            offset,
+            order: [['created_at', orderDirection]],
+            include: [
+              { model: Customer, as: 'customer', attributes: ['id', 'name', 'email', 'did'] },
+              {
+                model: PaymentCurrency,
+                as: 'paymentCurrency',
+                attributes: ['id', 'symbol', 'decimal', 'maximum_precision'],
+              },
+            ],
+          });
+          // Transform grants
+          return rows.map((item: any) => ({
+            ...item.toJSON(),
+            activity_type: 'grant',
+          }));
+        },
+        meta: { type: 'database' },
+      };
+
+      // Define sort function
+      const sortFn = (a: any, b: any) => {
+        const aDate = new Date(a.created_at).getTime();
+        const bDate = new Date(b.created_at).getTime();
+        return query.o === 'asc' ? aDate - bDate : bDate - aDate;
+      };
+
+      // Use mergePaginate
+      const result = await mergePaginate([transactionSource, grantSource], { page, pageSize }, sortFn);
+
+      // Load payment currencies for final result
+      const paymentCurrencies = await PaymentCurrency.findAll({
+        attributes: ['id', 'symbol', 'decimal', 'maximum_precision'],
+        where: { type: 'credit' },
+      });
+
+      const enhancedData = result.data.map((item) => ({
+        ...item,
+        paymentCurrency: paymentCurrencies.find(
+          (x) => x.id === (item.activity_type === 'grant' ? item.currency_id : item.creditGrant?.currency_id)
+        ),
+      }));
+
+      return res.json({
+        count: result.total,
+        list: enhancedData,
+        paging: result.paging,
+        meta: {
+          unified_cash_flow: true,
+          includes: ['transaction', 'grant'],
+        },
+      });
+    }
+
     const { rows: list, count } = await CreditTransaction.findAndCountAll({
       where,
       order: getOrder(query, [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']]),
@@ -97,27 +227,37 @@ router.get('/', authMine, async (req, res) => {
         {
           model: CreditGrant,
           as: 'creditGrant',
-          attributes: ['id', 'name'],
+          attributes: ['id', 'name', 'currency_id'],
+        },
+        {
+          model: MeterEvent,
+          as: 'meterEvent',
+          attributes: ['id', 'source_data'], // Get source_data from related MeterEvent
+          required: false,
         },
       ],
     });
 
     const paymentCurrencies = await PaymentCurrency.findAll({
       attributes: ['id', 'symbol', 'decimal', 'maximum_precision'],
-      where: {
-        type: 'credit',
-      },
+      where: { type: 'credit' },
     });
 
-    const result = list.map((item) => {
-      return {
-        ...item.toJSON(),
-        // @ts-ignore
-        paymentCurrency: paymentCurrencies.find((x) => x.id === item.meter?.currency_id),
-      };
-    });
+    const result = list.map((item) => ({
+      ...item.toJSON(),
+      activity_type: 'transaction',
+      paymentCurrency: paymentCurrencies.find((x) => x.id === (item as any).creditGrant?.currency_id),
+    }));
 
-    return res.json({ count, list: result, paging: { page, pageSize } });
+    return res.json({
+      count,
+      list: result,
+      paging: { page, pageSize },
+      meta: {
+        unified_cash_flow: false,
+        includes: ['transaction'],
+      },
+    });
   } catch (err) {
     logger.error('Error listing credit transactions', err);
     return res.status(400).json({ error: err.message });

package/api/src/routes/invoices.ts

@@ -23,7 +23,15 @@ import { Price } from '../store/models/price';
 import { Product } from '../store/models/product';
 import { Subscription } from '../store/models/subscription';
 import { getReturnStakeInvoices, getStakingInvoices, retryUncollectibleInvoices } from '../libs/invoice';
-import { CheckoutSession, PaymentLink, TInvoiceExpanded, Discount, Coupon, PromotionCode } from '../store/models';
+import {
+  CheckoutSession,
+  PaymentLink,
+  TInvoiceExpanded,
+  Discount,
+  Coupon,
+  PromotionCode,
+  CreditGrant,
+} from '../store/models';
 import { mergePaginate, defaultTimeOrderBy, getCachedOrFetch, DataSource } from '../libs/pagination';
 import logger from '../libs/logger';
 import { returnOverdraftProtectionQueue, returnStakeQueue } from '../queues/subscription';
@@ -678,6 +686,30 @@ router.get('/:id', authPortal, async (req, res) => {
         }
       }
 
+      let relatedCreditGrants: any[] = [];
+      try {
+        relatedCreditGrants = await CreditGrant.findAll({
+          where: {
+            customer_id: doc.customer_id,
+            'metadata.invoice_id': doc.id,
+          } as any,
+          include: [
+            {
+              model: PaymentCurrency,
+              as: 'paymentCurrency',
+              attributes: ['id', 'symbol', 'decimal', 'name', 'type'],
+            },
+          ],
+          order: [['created_at', 'DESC']],
+        });
+      } catch (error) {
+        logger.error('Failed to fetch related credit grants', {
+          error,
+          invoiceId: doc.id,
+          customerId: doc.customer_id,
+        });
+      }
+
       if (doc.metadata?.invoice_id || doc.metadata?.prev_invoice_id) {
         const relatedInvoice = await Invoice.findByPk(doc.metadata.invoice_id || doc.metadata.prev_invoice_id, {
           attributes: ['id', 'number', 'status', 'billing_reason'],
@@ -686,6 +718,7 @@ router.get('/:id', authPortal, async (req, res) => {
           ...json,
           discountDetails,
           relatedInvoice,
+          relatedCreditGrants,
           paymentLink,
           checkoutSession,
         });
@@ -693,6 +726,7 @@ router.get('/:id', authPortal, async (req, res) => {
       return res.json({
         ...json,
         discountDetails,
+        relatedCreditGrants,
         paymentLink,
         checkoutSession,
       });

package/api/src/routes/meter-events.ts

@@ -14,6 +14,32 @@ const router = Router();
 const auth = authenticate<MeterEvent>({ component: true, roles: ['owner', 'admin'] });
 const authMine = authenticate<MeterEvent>({ component: true, roles: ['owner', 'admin'], mine: true });
 
+const SourceDataSchema = Joi.alternatives()
+  .try(
+    Joi.object().pattern(Joi.string().max(40), Joi.string().max(256).allow('')).min(0),
+    Joi.array()
+      .items(
+        Joi.object({
+          key: Joi.string().max(40).required(),
+          label: Joi.alternatives()
+            .try(
+              Joi.string().max(100),
+              Joi.object({
+                zh: Joi.string().max(100).optional(),
+                en: Joi.string().max(100).optional(),
+              })
+            )
+            .required(),
+          value: Joi.string().max(256).allow('').optional(),
+          type: Joi.string().valid('text', 'image', 'url').optional(),
+          url: Joi.string().uri().optional(),
+          group: Joi.string().max(40).optional(),
+        })
+      )
+      .min(0)
+  )
+  .optional();
+
 const meterEventSchema = Joi.object({
   event_name: Joi.string().max(128).required(),
   payload: Joi.object({
@@ -24,6 +50,7 @@ const meterEventSchema = Joi.object({
   timestamp: Joi.number().integer().optional(),
   identifier: Joi.string().max(255).required(),
   metadata: MetadataSchema,
+  source_data: SourceDataSchema,
 });
 
 const listSchema = createListParamSchema<{
@@ -72,12 +99,12 @@ router.get('/', authMine, async (req, res) => {
     }
 
     if (query.start || query.end) {
-      where.created_at = {};
+      where.timestamp = {};
       if (query.start) {
-        where.created_at[Op.gte] = new Date(query.start * 1000);
+        where.timestamp[Op.gte] = Number(query.start);
       }
       if (query.end) {
-        where.created_at[Op.lte] = new Date(query.end * 1000);
+        where.timestamp[Op.lte] = Number(query.end);
       }
     }
 
@@ -259,6 +286,7 @@ router.post('/', auth, async (req, res) => {
       credit_pending: fromTokenToUnit(value, paymentCurrency.decimal).toString(),
       created_via: req.user?.via || 'api',
       metadata: formatMetadata(req.body.metadata),
+      source_data: req.body.source_data,
       timestamp,
     };
 

package/api/src/routes/meters.ts

@@ -156,6 +156,10 @@ router.put('/:id', auth, async (req, res) => {
     };
 
     if (req.body.metadata) {
+      const { error: metadataError } = MetadataSchema.validate(req.body.metadata);
+      if (metadataError) {
+        return res.status(400).json({ error: `metadata invalid: ${metadataError.message}` });
+      }
       updateData.metadata = formatMetadata(req.body.metadata);
     }
 

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

@@ -19,6 +19,7 @@ import { depositVaultQueue } from '../queues/payment';
 import { checkDepositVaultAmount } from '../libs/payment';
 import { getTokenSummaryByDid } from '../integrations/arcblock/stake';
 import { createPaymentLink } from './payment-links';
+import { MetadataSchema } from '../libs/api';
 
 const router = Router();
 
@@ -311,7 +312,7 @@ 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(),
+  metadata: MetadataSchema,
   symbol: Joi.string().empty('').optional(),
 }).unknown(true);
 router.put('/:id', auth, async (req, res) => {

package/api/src/routes/promotion-codes.ts

@@ -8,7 +8,7 @@ import { createIdGenerator, formatMetadata } from '../libs/util';
 import { authenticate } from '../libs/security';
 import { PromotionCode, Coupon, PaymentCurrency } from '../store/models';
 import { getRedemptionData } from '../libs/discount/redemption';
-import { createListParamSchema } from '../libs/api';
+import { createListParamSchema, MetadataSchema } from '../libs/api';
 import logger from '../libs/logger';
 
 const router = Router();
@@ -249,7 +249,7 @@ router.put('/:id', authAdmin, async (req, res) => {
         minimum_amount: Joi.number().positive().optional(),
         minimum_amount_currency: Joi.string().optional(),
       }).optional(),
-      metadata: Joi.object().optional(),
+      metadata: MetadataSchema,
     });
 
     const { error, value } = schema.validate(req.body, {

package/api/src/routes/subscription-items.ts

@@ -139,6 +139,10 @@ router.put('/:id', auth, async (req, res) => {
   }
 
   if (updates.metadata) {
+    const { error: metadataError } = MetadataSchema.validate(updates.metadata);
+    if (metadataError) {
+      return res.status(400).json({ error: `metadata invalid: ${metadataError.message}` });
+    }
     updates.metadata = formatMetadata(updates.metadata);
   }
 

package/api/src/routes/webhook-endpoints.ts

@@ -100,6 +100,10 @@ router.put('/:id', auth, async (req, res) => {
     'enabled_events',
   ]);
   if (updates.metadata) {
+    const { error: metadataError } = MetadataSchema.validate(updates.metadata);
+    if (metadataError) {
+      return res.status(400).json({ error: `metadata invalid: ${metadataError.message}` });
+    }
     updates.metadata = formatMetadata(updates.metadata);
   }
 

package/api/src/store/migrations/20250919-add-source-data.ts

@@ -0,0 +1,20 @@
+import { DataTypes } from 'sequelize';
+import { Migration, safeApplyColumnChanges } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  await safeApplyColumnChanges(context, {
+    meter_events: [
+      {
+        name: 'source_data',
+        field: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
+      },
+    ],
+  });
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.removeColumn('meter_events', 'source_data');
+};

package/api/src/store/models/credit-transaction.ts

@@ -135,6 +135,11 @@ export class CreditTransaction extends Model<
       foreignKey: 'subscription_id',
       as: 'subscription',
     });
+
+    this.belongsTo(models.MeterEvent, {
+      foreignKey: 'source',
+      as: 'meterEvent',
+    });
   }
 
   public static async getUsageSummary({

package/api/src/store/models/meter-event.ts

@@ -14,7 +14,7 @@ import type { LiteralUnion } from 'type-fest';
 import { BN } from '@ocap/util';
 import { createEvent } from '../../libs/audit';
 import { createIdGenerator } from '../../libs/util';
-import { GroupedBN, GroupedStrList, MeterEventPayload, MeterEventStatus } from './types';
+import { GroupedBN, GroupedStrList, MeterEventPayload, MeterEventStatus, SourceData } from './types';
 import { Customer } from './customer';
 import { Subscription, type TSubscription } from './subscription';
 import { Meter, type TMeter } from './meter';
@@ -43,6 +43,7 @@ export class MeterEvent extends Model<InferAttributes<MeterEvent>, InferCreation
   declare credit_consumed: string; // 已消费的credit数量
   declare credit_pending: string; // 待消费的credit数量（债务）
   declare metadata?: Record<string, any>;
+  declare source_data?: SourceData;
 
   // 审计字段
   declare created_by?: string;
@@ -215,18 +216,27 @@ export class MeterEvent extends Model<InferAttributes<MeterEvent>, InferCreation
   }
 
   public static initialize(sequelize: any) {
-    this.init(this.GENESIS_ATTRIBUTES, {
-      sequelize,
-      modelName: 'MeterEvent',
-      tableName: 'meter_events',
-      createdAt: 'created_at',
-      updatedAt: 'updated_at',
-      indexes: [{ fields: ['identifier'], unique: true }, { fields: ['status'] }, { fields: ['event_name'] }],
-      hooks: {
-        afterCreate: (model: MeterEvent, options) =>
-          createEvent('MeterEvent', 'billing.meter_event.created', model, options).catch(console.error),
+    this.init(
+      {
+        ...this.GENESIS_ATTRIBUTES,
+        source_data: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
       },
-    });
+      {
+        sequelize,
+        modelName: 'MeterEvent',
+        tableName: 'meter_events',
+        createdAt: 'created_at',
+        updatedAt: 'updated_at',
+        indexes: [{ fields: ['identifier'], unique: true }, { fields: ['status'] }, { fields: ['event_name'] }],
+        hooks: {
+          afterCreate: (model: MeterEvent, options) =>
+            createEvent('MeterEvent', 'billing.meter_event.created', model, options).catch(console.error),
+        },
+      }
+    );
   }
 
   // 批量处理未处理的事件

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

@@ -817,3 +817,21 @@ export type Restrictions = {
   minimum_amount?: string;
   minimum_amount_currency?: string;
 };
+
+export type LocalizedText = {
+  zh: string;
+  en: string;
+};
+
+export type SimpleSourceData = Record<string, string>;
+
+export type StructuredSourceDataField = {
+  key: string;
+  label: string | LocalizedText;
+  value: string;
+  type?: 'text' | 'image' | 'url';
+  url?: string;
+  group?: string;
+};
+
+export type SourceData = SimpleSourceData | StructuredSourceDataField[];

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.20.13",
+  "version": "1.20.14",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,8 +56,8 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/logger": "^1.16.52-beta-20250912-112002-e3499e9c",
-    "@blocklet/payment-react": "1.20.13",
-    "@blocklet/payment-vendor": "1.20.13",
+    "@blocklet/payment-react": "1.20.14",
+    "@blocklet/payment-vendor": "1.20.14",
     "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/ui-react": "^3.1.41",
     "@blocklet/uploader": "^0.2.11",
@@ -126,7 +126,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.20.13",
+    "@blocklet/payment-types": "1.20.14",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -173,5 +173,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0cbe918549f7d06561b5307fb947bfbbd2250984"
+  "gitHead": "365b60721b7f3a372c472f774cda290d56dad365"
 }

package/src/components/customer/credit-overview.tsx

@@ -324,7 +324,7 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
         )}
         {creditTab === CreditTab.GRANTS && <CreditGrantsList customer_id={customerId} mode={mode} key={creditTab} />}
         {creditTab === CreditTab.TRANSACTIONS && (
-          <CreditTransactionsList customer_id={customerId} mode={mode} key={creditTab} />
+          <CreditTransactionsList customer_id={customerId} mode={mode} key={creditTab} includeGrants />
         )}
       </Box>
       {autoRecharge.open && (