@blocklet/payment-react 1.13.223 → 1.13.225

package/es/util.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { PaymentDetails, PriceCurrency, PriceRecurring, TLineItemExpanded, TPaymentCurrency, TPaymentMethod, TPaymentMethodExpanded, TPrice, TSubscriptionExpanded, TSubscriptionItemExpanded } from '@blocklet/payment-types';
+import type { PaymentDetails, PriceCurrency, PriceRecurring, TLineItemExpanded, TPaymentCurrency, TPaymentCurrencyExpanded, TPaymentMethod, TPaymentMethodExpanded, TPrice, TSubscriptionExpanded, TSubscriptionItemExpanded } from '@blocklet/payment-types';
 export declare const PAYMENT_KIT_DID = "z2qaCNvKMv5GjouKdcDWexv6WqtHbpNPQDnAk";
 export declare const isPaymentKitMounted: () => any;
 export declare const getPrefix: () => any;
@@ -46,9 +46,7 @@ export declare function formatCheckoutHeadlines(items: TLineItemExpanded[], curr
     secondary?: string;
 };
 export declare function formatAmount(amount: string, decimals: number): string;
-export declare function findCurrency(methods: TPaymentMethodExpanded[], currencyId: string): import("sequelize").InferAttributes<import("@blocklet/payment-types").PaymentCurrency, {
-    omit: never;
-}> | null;
+export declare function findCurrency(methods: TPaymentMethodExpanded[], currencyId: string): TPaymentCurrencyExpanded | null;
 export declare function isValidCountry(code: string): boolean;
 export declare function stopEvent(e: React.SyntheticEvent<any>): void;
 export declare function sleep(ms: number): Promise<unknown>;

package/es/util.js

@@ -1,4 +1,5 @@
 import { BN, fromUnitToToken } from "@ocap/util";
+import omit from "lodash/omit";
 import trimEnd from "lodash/trimEnd";
 import numbro from "numbro";
 import { defaultCountries } from "react-international-phone";
@@ -471,7 +472,7 @@ export function findCurrency(methods, currencyId) {
   for (const method of methods) {
     for (const currency of method.payment_currencies) {
       if (currency.id === currencyId) {
-        return currency;
+        return { object: "payment_currency", ...currency, paymentMethod: omit(method, ["payment_currencies"]) };
       }
     }
   }

package/lib/util.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { PaymentDetails, PriceCurrency, PriceRecurring, TLineItemExpanded, TPaymentCurrency, TPaymentMethod, TPaymentMethodExpanded, TPrice, TSubscriptionExpanded, TSubscriptionItemExpanded } from '@blocklet/payment-types';
+import type { PaymentDetails, PriceCurrency, PriceRecurring, TLineItemExpanded, TPaymentCurrency, TPaymentCurrencyExpanded, TPaymentMethod, TPaymentMethodExpanded, TPrice, TSubscriptionExpanded, TSubscriptionItemExpanded } from '@blocklet/payment-types';
 export declare const PAYMENT_KIT_DID = "z2qaCNvKMv5GjouKdcDWexv6WqtHbpNPQDnAk";
 export declare const isPaymentKitMounted: () => any;
 export declare const getPrefix: () => any;
@@ -46,9 +46,7 @@ export declare function formatCheckoutHeadlines(items: TLineItemExpanded[], curr
     secondary?: string;
 };
 export declare function formatAmount(amount: string, decimals: number): string;
-export declare function findCurrency(methods: TPaymentMethodExpanded[], currencyId: string): import("sequelize").InferAttributes<import("@blocklet/payment-types").PaymentCurrency, {
-    omit: never;
-}> | null;
+export declare function findCurrency(methods: TPaymentMethodExpanded[], currencyId: string): TPaymentCurrencyExpanded | null;
 export declare function isValidCountry(code: string): boolean;
 export declare function stopEvent(e: React.SyntheticEvent<any>): void;
 export declare function sleep(ms: number): Promise<unknown>;

package/lib/util.js

@@ -41,6 +41,7 @@ exports.mergeExtraParams = void 0;
 exports.sleep = sleep;
 exports.stopEvent = stopEvent;
 var _util = require("@ocap/util");
+var _omit = _interopRequireDefault(require("lodash/omit"));
 var _trimEnd = _interopRequireDefault(require("lodash/trimEnd"));
 var _numbro = _interopRequireDefault(require("numbro"));
 var _reactInternationalPhone = require("react-international-phone");
@@ -559,7 +560,11 @@ function findCurrency(methods, currencyId) {
   for (const method of methods) {
     for (const currency of method.payment_currencies) {
       if (currency.id === currencyId) {
-        return currency;
+        return {
+          object: "payment_currency",
+          ...currency,
+          paymentMethod: (0, _omit.default)(method, ["payment_currencies"])
+        };
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.13.223",
+  "version": "1.13.225",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -90,7 +90,7 @@
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
-    "@blocklet/payment-types": "1.13.223",
+    "@blocklet/payment-types": "1.13.225",
     "@storybook/addon-essentials": "^7.6.13",
     "@storybook/addon-interactions": "^7.6.13",
     "@storybook/addon-links": "^7.6.13",
@@ -119,5 +119,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "596ab32828f65f124b02c80b1e4ec5745c1167cb"
+  "gitHead": "e5e5f94d4f17d582d7266b063dda56d09ffadf7c"
 }

package/src/util.ts

@@ -6,6 +6,7 @@ import type {
   PriceRecurring,
   TLineItemExpanded,
   TPaymentCurrency,
+  TPaymentCurrencyExpanded,
   TPaymentMethod,
   TPaymentMethodExpanded,
   TPrice,
@@ -13,6 +14,7 @@ import type {
   TSubscriptionItemExpanded,
 } from '@blocklet/payment-types';
 import { BN, fromUnitToToken } from '@ocap/util';
+import omit from 'lodash/omit';
 import trimEnd from 'lodash/trimEnd';
 import numbro from 'numbro';
 import { defaultCountries } from 'react-international-phone';
@@ -623,11 +625,11 @@ export function formatAmount(amount: string, decimals: number) {
   return fromUnitToToken(amount, decimals);
 }
 
-export function findCurrency(methods: TPaymentMethodExpanded[], currencyId: string) {
+export function findCurrency(methods: TPaymentMethodExpanded[], currencyId: string): TPaymentCurrencyExpanded | null {
   for (const method of methods) {
     for (const currency of method.payment_currencies) {
       if (currency.id === currencyId) {
-        return currency;
+        return { object: 'payment_currency', ...currency, paymentMethod: omit(method, ['payment_currencies']) };
       }
     }
   }