@kimafinance/kima-transaction-widget 1.5.10 → 1.5.12

package/dist/index.cjs

@@ -6197,36 +6197,45 @@ var ConfirmDetails = ({
     ),
     [originNetwork, sourceCurrency, targetNetwork, targetCurrency]
   );
-  const txValues = (0, import_react47.useMemo)(() => {
-    if (isSwap) return transactionValues.feeFromOrigin;
-    return feeDeduct ? transactionValues.feeFromTarget : transactionValues.feeFromOrigin;
-  }, [isSwap, feeDeduct, transactionValues]);
-  const targetDisplayAmount = (0, import_react47.useMemo)(() => {
-    if (isSwap && swapInfo?.amountOutBigInt) return swapInfo.amountOutBigInt;
-    return txValues.submitAmount;
-  }, [isSwap, swapInfo, txValues.submitAmount]);
+  const chargeFeeAtOrigin = !isSwap && feeDeduct;
+  const baseSubmit = (0, import_react47.useMemo)(
+    () => transactionValues.feeFromOrigin.submitAmount,
+    [transactionValues.feeFromOrigin.submitAmount]
+  );
+  const totalFeeInSubmitDec = (0, import_react47.useMemo)(
+    () => bigIntChangeDecimals({
+      ...totalFee,
+      newDecimals: baseSubmit.decimals
+    }),
+    [totalFee, baseSubmit.decimals]
+  );
+  const amountToTransferBig = (0, import_react47.useMemo)(() => {
+    if (isSwap)
+      return { value: baseSubmit.value, decimals: baseSubmit.decimals };
+    const val = chargeFeeAtOrigin ? baseSubmit.value : baseSubmit.value + totalFeeInSubmitDec.value;
+    return { value: val, decimals: baseSubmit.decimals };
+  }, [isSwap, chargeFeeAtOrigin, baseSubmit, totalFeeInSubmitDec]);
+  const targetTransferBig = (0, import_react47.useMemo)(() => {
+    if (isSwap) {
+      if (swapInfo?.amountOutBigInt) return swapInfo.amountOutBigInt;
+      return transactionValues.feeFromOrigin.submitAmount;
+    }
+    const minus = baseSubmit.value - totalFeeInSubmitDec.value;
+    const val = chargeFeeAtOrigin ? minus > 0n ? minus : 0n : baseSubmit.value;
+    return { value: val, decimals: baseSubmit.decimals };
+  }, [
+    isSwap,
+    swapInfo?.amountOutBigInt,
+    transactionValues.feeFromOrigin.submitAmount,
+    baseSubmit.value,
+    baseSubmit.decimals,
+    totalFeeInSubmitDec.value,
+    chargeFeeAtOrigin
+  ]);
   const combinedSwapFees = (0, import_react47.useMemo)(
     () => sumBigAmts([sourceFee, targetFee, swapFee ?? { value: 0n, decimals: 0 }]),
     [sourceFee, targetFee, swapFee]
   );
-  const originChargeAmount = (0, import_react47.useMemo)(() => {
-    if (["CC", "BANK"].includes(originNetwork.shortName)) {
-      const submit = txValues.submitAmount;
-      const feeInSubmitDec = bigIntChangeDecimals({
-        ...totalFee,
-        newDecimals: submit.decimals
-      });
-      const val = feeDeduct ? submit.value : submit.value + feeInSubmitDec.value;
-      return { value: val, decimals: submit.decimals };
-    }
-    return txValues.allowanceAmount;
-  }, [
-    originNetwork.shortName,
-    txValues.submitAmount,
-    txValues.allowanceAmount,
-    totalFee,
-    feeDeduct
-  ]);
   (0, import_react47.useEffect)(() => {
     width === 0 && updateWidth(window.innerWidth);
   }, [width, updateWidth]);
@@ -6261,15 +6270,15 @@ var ConfirmDetails = ({
       ] })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime66.jsx)("div", { className: "detail-item amount", children: /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("span", { className: "amount-container", children: [
-      dAppOption === "none" /* None */ && /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("div", { className: "amount-details", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("div", { className: "amount-details", children: [
         /* @__PURE__ */ (0, import_jsx_runtime66.jsx)("span", { children: "Amount to Transfer" }),
         /* @__PURE__ */ (0, import_jsx_runtime66.jsx)("div", { className: "coin-details", children: /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("p", { children: [
-          formatBigInt(originChargeAmount),
+          formatBigInt(amountToTransferBig),
           " ",
           sourceCurrency
         ] }) })
       ] }),
-      dAppOption === "none" /* None */ && /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("div", { className: "amount-details", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("div", { className: "amount-details", children: [
         /* @__PURE__ */ (0, import_jsx_runtime66.jsx)("span", { children: "Total Fees" }),
         /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(
           "div",
@@ -6347,7 +6356,7 @@ var ConfirmDetails = ({
       /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("div", { className: "amount-details", children: [
         /* @__PURE__ */ (0, import_jsx_runtime66.jsx)("span", { children: "Target Transfer Amount" }),
         /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("span", { className: "service-fee", children: [
-          formatBigInt(targetDisplayAmount),
+          formatBigInt(targetTransferBig),
           " ",
           targetCurrency
         ] })
@@ -8625,7 +8634,7 @@ var FiatWidget = ({ submitCallback }) => {
   const networkOption = (0, import_react_redux48.useSelector)(selectNetworkOption);
   const sourceCurrency = (0, import_react_redux48.useSelector)(selectSourceCurrency);
   const sourceChain = (0, import_react_redux48.useSelector)(selectSourceChain);
-  const { transactionValues, totalFee } = (0, import_react_redux48.useSelector)(selectServiceFee);
+  const { transactionValues } = (0, import_react_redux48.useSelector)(selectServiceFee);
   const ccTransactionIdSeedRef = (0, import_react57.useRef)((0, import_uuid.v4)());
   const ccTransactionSubmittedRef = (0, import_react57.useRef)(false);
   const { data: envOptions, isLoading: isEnvLoading } = useGetEnvOptions({
@@ -8642,18 +8651,9 @@ var FiatWidget = ({ submitCallback }) => {
     dispatch(setCCTransactionId(data?.transactionId));
   }, [dispatch, data, isTransactionIdLoading]);
   const txValues = feeDeduct ? transactionValues.feeFromTarget : transactionValues.feeFromOrigin;
-  const chargeAmountBig = (0, import_react57.useMemo)(() => {
-    const submit = txValues.submitAmount;
-    const feeInSubmitDec = bigIntChangeDecimals({
-      ...totalFee,
-      newDecimals: submit.decimals
-    });
-    const val = feeDeduct ? submit.value : submit.value + feeInSubmitDec.value;
-    return { value: val, decimals: submit.decimals };
-  }, [txValues.submitAmount, totalFee, feeDeduct]);
-  const chargeAmount = (0, import_react57.useMemo)(
-    () => formatBigInt(chargeAmountBig),
-    [chargeAmountBig]
+  const allowanceAmount = (0, import_react57.useMemo)(
+    () => formatBigInt(txValues.allowanceAmount),
+    [txValues]
   );
   const [isLoading, setIsLoading] = (0, import_react57.useState)(true);
   const baseUrl = (0, import_react57.useMemo)(
@@ -8666,7 +8666,9 @@ var FiatWidget = ({ submitCallback }) => {
   );
   (0, import_react57.useEffect)(() => {
     const handleMessage = (event) => {
-      if (event.origin !== baseUrl) return;
+      if (event.origin !== baseUrl) {
+        return;
+      }
       logger_default.info("postMessage: new message: ", event);
       if (event.data.type === "isCompleted") {
         logger_default.info("cc widget isCompleted", ccTransactionSubmittedRef.current);
@@ -8701,7 +8703,7 @@ var FiatWidget = ({ submitCallback }) => {
       {
         width: isLoading || isTransactionIdLoading || ccTransactionStatus === "success" || error ? 0 : "100%",
         height: isLoading || isTransactionIdLoading || ccTransactionStatus === "success" || error ? 0 : "100%",
-        src: `${baseUrl}/widgets/kyc?partner=${partnerId}&amount=${chargeAmount}&currency=${sourceCurrency}&trx_uuid=${data?.transactionId}&scenario=${scenario}&postmessage=true`,
+        src: `${baseUrl}/widgets/kyc?partner=${partnerId}&amount=${allowanceAmount}&currency=${sourceCurrency}&trx_uuid=${data?.transactionId}&scenario=${scenario}&postmessage=true`,
         loading: "lazy",
         title: "Credit Card Widget",
         allow: "camera; clipboard-write",