@kimafinance/kima-transaction-widget 1.5.9 → 1.5.10

package/dist/index.cjs

@@ -2232,15 +2232,11 @@ var bigIntChangeDecimals = (inputs) => {
   const valBigInt = BigInt(value);
   if (decimals === newDecimals) return { value: valBigInt, decimals };
   if (decimals > newDecimals) {
-    return {
-      value: valBigInt / BigInt(10 ** (decimals - newDecimals)),
-      decimals: newDecimals
-    };
+    const diff2 = decimals - newDecimals;
+    return { value: valBigInt / 10n ** BigInt(diff2), decimals: newDecimals };
   }
-  return {
-    value: valBigInt * BigInt(10 ** (newDecimals - decimals)),
-    decimals: newDecimals
-  };
+  const diff = newDecimals - decimals;
+  return { value: valBigInt * 10n ** BigInt(diff), decimals: newDecimals };
 };
 var formatBigInt = (inputs) => {
   return formatterFloat.format(bigIntToNumber(inputs));
@@ -6213,6 +6209,24 @@ var ConfirmDetails = ({
     () => 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]);
@@ -6250,7 +6264,7 @@ var ConfirmDetails = ({
       dAppOption === "none" /* None */ && /* @__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(txValues.allowanceAmount),
+          formatBigInt(originChargeAmount),
           " ",
           sourceCurrency
         ] }) })
@@ -6940,7 +6954,7 @@ var TransactionWidget = ({ theme }) => {
   const amount = (0, import_react_redux41.useSelector)(selectAmount);
   const txId = (0, import_react_redux41.useSelector)(selectTxId);
   const dAppOption = (0, import_react_redux41.useSelector)(selectDappOption);
-  const { transactionValues } = (0, import_react_redux41.useSelector)(selectServiceFee);
+  const { transactionValues, totalFee } = (0, import_react_redux41.useSelector)(selectServiceFee);
   const txValues = feeDeduct ? transactionValues.feeFromTarget : transactionValues.feeFromOrigin;
   const transactionOption = (0, import_react_redux41.useSelector)(selectTransactionOption);
   const sourceChain = (0, import_react_redux41.useSelector)(selectSourceChain);
@@ -7112,6 +7126,15 @@ var TransactionWidget = ({ theme }) => {
     }
     return data?.status?.toUpperCase?.() === "Completed" /* COMPLETED */ ? widgetIsSwap ? "Swapped " : "Transferred " : widgetIsSwap ? "Swapping " : "Transfering ";
   }, [mode, data?.status, isEmptyStatus, widgetIsSwap]);
+  const originChargeAmount = (0, import_react53.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 { leftAmt, rightAmt, leftSym, rightSym } = (0, import_react53.useMemo)(() => {
     if (mode === "status" /* status */) {
       if (widgetIsSwap) {
@@ -7132,8 +7155,9 @@ var TransactionWidget = ({ theme }) => {
         rightSym: data?.targetSymbol ?? ""
       };
     }
-    let left = Number(amount) !== 0 ? transactionSourceChain?.shortName === "CC" ? bigIntToNumber(txValues.allowanceAmount).toFixed(2) : formatBigInt(txValues.allowanceAmount) : "";
-    let right = Number(amount) !== 0 ? transactionSourceChain?.shortName === "CC" ? bigIntToNumber(txValues.submitAmount).toFixed(2) : formatBigInt(txValues.submitAmount) : "";
+    const isFiatSrc = (transactionSourceChain?.shortName ?? "") === "CC" || (transactionSourceChain?.shortName ?? "") === "BANK";
+    let left = Number(amount) !== 0 ? isFiatSrc ? bigIntToNumber(originChargeAmount).toFixed(2) : formatBigInt(txValues.allowanceAmount) : "";
+    let right = Number(amount) !== 0 ? isFiatSrc ? bigIntToNumber(txValues.submitAmount).toFixed(2) : formatBigInt(txValues.submitAmount) : "";
     let leftSymbol = sourceSymbol;
     let rightSymbol = targetSymbol;
     if (widgetIsSwap && data && data?.amount != null && data?.amount !== "") {
@@ -7159,7 +7183,8 @@ var TransactionWidget = ({ theme }) => {
     txValues.allowanceAmount,
     txValues.submitAmount,
     sourceSymbol,
-    targetSymbol
+    targetSymbol,
+    originChargeAmount
   ]);
   const resetForm = () => {
     try {
@@ -7494,15 +7519,29 @@ var getFees = async (amount, originChain, originAddress, originSymbol, targetCha
       dex: result.swapInfo.dex,
       slippage: result.swapInfo.slippage
     } : void 0;
+    const sourceFee = toBigintAmount(result.feeOriginGasBigInt);
+    const targetFee = toBigintAmount(result.feeTargetGasBigInt);
+    const kimaFee = toBigintAmount(result.feeKimaProcessingBigInt);
+    const parts = [
+      sourceFee,
+      targetFee,
+      kimaFee,
+      swapFee?.decimals ? swapFee : { value: 0n, decimals: 0 }
+    ].filter((p) => p.decimals !== 0 || p.value !== 0n);
+    const maxDec = parts.reduce((m, a) => Math.max(m, a.decimals), 0);
+    const scaleUp2 = (v, from, to) => to <= from ? v : v * 10n ** BigInt(to - from);
+    const totalScaled = parts.reduce(
+      (acc, a) => acc + scaleUp2(a.value, a.decimals, maxDec),
+      0n
+    );
     const output = {
       feeId: result.feeId,
       peggedTo: result.peggedTo,
       expiration: result.expiration,
-      sourceFee: toBigintAmount(result.feeOriginGasBigInt),
-      targetFee: toBigintAmount(result.feeTargetGasBigInt),
-      kimaFee: toBigintAmount(result.feeKimaProcessingBigInt),
-      totalFee: toBigintAmount(result.feeTotalBigInt),
-      // NEW
+      sourceFee,
+      targetFee,
+      kimaFee,
+      totalFee: { value: totalScaled, decimals: maxDec },
       swapFee,
       swapInfo,
       transactionValues: {
@@ -7527,7 +7566,7 @@ var getFees = async (amount, originChain, originAddress, originSymbol, targetCha
     };
     logger_default.debug("[getFees] response", {
       feeId: output.feeId,
-      totalFiat: result.feeTotalFiat,
+      totalFee: `${output.totalFee.value} @ ${output.totalFee.decimals}dp`,
       hasTargetSide: !!fromTarget,
       hasSwapInfo: !!swapInfo
     });
@@ -7828,7 +7867,8 @@ var useValidateTransaction = (inputs) => {
         message: "Testnet transfers for USD stablecoins are capped to $100 per transaction"
       };
     }
-    if (totalFee <= 0n) {
+    const isFiatSrc = sourceChain === "BANK" || sourceChain === "CC";
+    if (totalFee <= 0n && !isFiatSrc) {
       return {
         error: "ValidationError" /* Error */,
         message: "Fee calculation error"
@@ -8585,7 +8625,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 } = (0, import_react_redux48.useSelector)(selectServiceFee);
+  const { transactionValues, totalFee } = (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({
@@ -8602,9 +8642,18 @@ var FiatWidget = ({ submitCallback }) => {
     dispatch(setCCTransactionId(data?.transactionId));
   }, [dispatch, data, isTransactionIdLoading]);
   const txValues = feeDeduct ? transactionValues.feeFromTarget : transactionValues.feeFromOrigin;
-  const allowanceAmount = (0, import_react57.useMemo)(
-    () => formatBigInt(txValues.allowanceAmount),
-    [txValues]
+  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 [isLoading, setIsLoading] = (0, import_react57.useState)(true);
   const baseUrl = (0, import_react57.useMemo)(
@@ -8617,9 +8666,7 @@ 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);
@@ -8654,7 +8701,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=${allowanceAmount}&currency=${sourceCurrency}&trx_uuid=${data?.transactionId}&scenario=${scenario}&postmessage=true`,
+        src: `${baseUrl}/widgets/kyc?partner=${partnerId}&amount=${chargeAmount}&currency=${sourceCurrency}&trx_uuid=${data?.transactionId}&scenario=${scenario}&postmessage=true`,
         loading: "lazy",
         title: "Credit Card Widget",
         allow: "camera; clipboard-write",