@blocklet/payment-react 1.16.18 → 1.17.0

package/es/libs/util.js

@@ -105,6 +105,9 @@ export function formatNumber(n, precision = 6, trim = true) {
   return right ? [left, trimEnd(right, "0")].filter(Boolean).join(".") : left;
 }
 export const formatPrice = (price, currency, unit_label, quantity = 1, bn = true, locale = "en") => {
+  if (!currency) {
+    return "";
+  }
   if (price.custom_unit_amount) {
     return `Custom (${currency.symbol})`;
   }
@@ -123,6 +126,9 @@ export const formatPrice = (price, currency, unit_label, quantity = 1, bn = true
   return `${amount} ${currency.symbol}`;
 };
 export const formatPriceAmount = (price, currency, unit_label, quantity = 1, bn = true) => {
+  if (!currency) {
+    return "";
+  }
   const unit = getPriceUintAmountByCurrency(price, currency);
   const amount = bn ? fromUnitToToken(new BN(unit).mul(new BN(quantity)), currency.decimal).toString() : +unit * quantity;
   if (price?.type === "recurring" && price.recurring) {
@@ -174,20 +180,20 @@ export function formatRecurring(recurring, translate = true, separator = "per",
 }
 export function getPriceUintAmountByCurrency(price, currency) {
   const options = getPriceCurrencyOptions(price);
-  const option = options.find((x) => x.currency_id === currency.id);
+  const option = options.find((x) => x.currency_id === currency?.id);
   if (option) {
     if (option.custom_unit_amount) {
       return option.custom_unit_amount.preset || option.custom_unit_amount.presets[0];
     }
     return option.unit_amount;
   }
-  if (price.currency_id === currency.id) {
+  if (price.currency_id === currency?.id) {
     if (price.custom_unit_amount) {
       return price.custom_unit_amount.preset || price.custom_unit_amount.presets[0];
     }
     return price.unit_amount;
   }
-  console.warn(`Currency ${currency.id} not configured for price`, price);
+  console.warn(`Currency ${currency?.id} not configured for price`, price);
   return "0";
 }
 export function getPriceCurrencyOptions(price) {
@@ -204,6 +210,9 @@ export function getPriceCurrencyOptions(price) {
   ];
 }
 export function formatLineItemPricing(item, currency, { trialEnd, trialInDays }, locale = "en") {
+  if (!currency) {
+    return { primary: "", secondary: "", quantity: "" };
+  }
   const price = item.upsell_price || item.price;
   let quantity = t("common.qty", locale, { count: item.quantity });
   if (price.recurring?.usage_type === "metered" || +item.quantity === 1) {

package/lib/libs/util.js

@@ -174,6 +174,9 @@ function formatNumber(n, precision = 6, trim = true) {
   return right ? [left, (0, _trimEnd.default)(right, "0")].filter(Boolean).join(".") : left;
 }
 const formatPrice = (price, currency, unit_label, quantity = 1, bn = true, locale = "en") => {
+  if (!currency) {
+    return "";
+  }
   if (price.custom_unit_amount) {
     return `Custom (${currency.symbol})`;
   }
@@ -193,6 +196,9 @@ const formatPrice = (price, currency, unit_label, quantity = 1, bn = true, local
 };
 exports.formatPrice = formatPrice;
 const formatPriceAmount = (price, currency, unit_label, quantity = 1, bn = true) => {
+  if (!currency) {
+    return "";
+  }
   const unit = getPriceUintAmountByCurrency(price, currency);
   const amount = bn ? (0, _util.fromUnitToToken)(new _util.BN(unit).mul(new _util.BN(quantity)), currency.decimal).toString() : +unit * quantity;
   if (price?.type === "recurring" && price.recurring) {
@@ -247,20 +253,20 @@ function formatRecurring(recurring, translate = true, separator = "per", locale
 }
 function getPriceUintAmountByCurrency(price, currency) {
   const options = getPriceCurrencyOptions(price);
-  const option = options.find(x => x.currency_id === currency.id);
+  const option = options.find(x => x.currency_id === currency?.id);
   if (option) {
     if (option.custom_unit_amount) {
       return option.custom_unit_amount.preset || option.custom_unit_amount.presets[0];
     }
     return option.unit_amount;
   }
-  if (price.currency_id === currency.id) {
+  if (price.currency_id === currency?.id) {
     if (price.custom_unit_amount) {
       return price.custom_unit_amount.preset || price.custom_unit_amount.presets[0];
     }
     return price.unit_amount;
   }
-  console.warn(`Currency ${currency.id} not configured for price`, price);
+  console.warn(`Currency ${currency?.id} not configured for price`, price);
   return "0";
 }
 function getPriceCurrencyOptions(price) {
@@ -278,6 +284,13 @@ function formatLineItemPricing(item, currency, {
   trialEnd,
   trialInDays
 }, locale = "en") {
+  if (!currency) {
+    return {
+      primary: "",
+      secondary: "",
+      quantity: ""
+    };
+  }
   const price = item.upsell_price || item.price;
   let quantity = (0, _locales.t)("common.qty", locale, {
     count: item.quantity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.16.18",
+  "version": "1.17.0",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -92,7 +92,7 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.2",
     "@babel/preset-react": "^7.24.7",
-    "@blocklet/payment-types": "1.16.18",
+    "@blocklet/payment-types": "1.17.0",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -123,5 +123,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "ea644d08efdbfba6034a3ec09eac4d7160bcba66"
+  "gitHead": "b25f7f7c1990a01db3c43dff90eecb65f37bd5d7"
 }

package/src/libs/util.ts

@@ -159,6 +159,9 @@ export const formatPrice = (
   bn: boolean = true,
   locale: string = 'en'
 ) => {
+  if (!currency) {
+    return '';
+  }
   if (price.custom_unit_amount) {
     return `Custom (${currency.symbol})`;
   }
@@ -190,6 +193,9 @@ export const formatPriceAmount = (
   quantity: number = 1,
   bn: boolean = true
 ) => {
+  if (!currency) {
+    return '';
+  }
   const unit = getPriceUintAmountByCurrency(price, currency);
   const amount = bn
     ? fromUnitToToken(new BN(unit).mul(new BN(quantity)), currency.decimal).toString()
@@ -259,7 +265,7 @@ export function formatRecurring(
 
 export function getPriceUintAmountByCurrency(price: TPrice, currency: TPaymentCurrency) {
   const options = getPriceCurrencyOptions(price);
-  const option = options.find((x) => x.currency_id === currency.id);
+  const option = options.find((x) => x.currency_id === currency?.id);
   if (option) {
     if (option.custom_unit_amount) {
       return option.custom_unit_amount.preset || option.custom_unit_amount.presets[0];
@@ -267,14 +273,14 @@ export function getPriceUintAmountByCurrency(price: TPrice, currency: TPaymentCu
     return option.unit_amount;
   }
 
-  if (price.currency_id === currency.id) {
+  if (price.currency_id === currency?.id) {
     if (price.custom_unit_amount) {
       return price.custom_unit_amount.preset || price.custom_unit_amount.presets[0];
     }
     return price.unit_amount;
   }
 
-  console.warn(`Currency ${currency.id} not configured for price`, price);
+  console.warn(`Currency ${currency?.id} not configured for price`, price);
   return '0';
 }
 
@@ -299,6 +305,9 @@ export function formatLineItemPricing(
   { trialEnd, trialInDays }: { trialEnd: number; trialInDays: number },
   locale: string = 'en'
 ): { primary: string; secondary?: string; quantity: string } {
+  if (!currency) {
+    return { primary: '', secondary: '', quantity: '' };
+  }
   const price = item.upsell_price || item.price;
 
   let quantity = t('common.qty', locale, { count: item.quantity });