@kimafinance/kima-transaction-widget 1.3.10 → 1.3.12

package/dist/index.cjs

@@ -2750,12 +2750,14 @@ function useEvmAllowance() {
   const appkitAccountInfo = (0, import_react79.useAppKitAccount)();
   const sourceChain = (0, import_react_redux5.useSelector)(selectSourceChain);
   const networkOption = (0, import_react_redux5.useSelector)(selectNetworkOption);
-  const { totalFeeUsd, allowanceAmount, decimals } = (0, import_react_redux5.useSelector)(selectServiceFee);
+  const { totalFeeUsd, allowanceAmount, submitAmount, decimals } = (0, import_react_redux5.useSelector)(selectServiceFee);
   const selectedCoin = (0, import_react_redux5.useSelector)(selectSourceCurrency);
   const tokenOptions = (0, import_react_redux5.useSelector)(selectTokenOptions);
   const backendUrl = (0, import_react_redux5.useSelector)(selectBackendUrl);
   const feeDeduct = (0, import_react_redux5.useSelector)(selectFeeDeduct);
-  const allowanceNumber = Number((0, import_ethers6.formatUnits)(allowanceAmount ?? "0", decimals));
+  const allowanceNumber = Number(
+    (0, import_ethers6.formatUnits)(feeDeduct ? submitAmount : allowanceAmount ?? "0", decimals)
+  );
   const amount = (0, import_react_redux5.useSelector)(selectAmount);
   const { pools } = useGetPools_default(backendUrl, networkOption);
   const walletAddress = externalProvider?.signer?.address || appkitAccountInfo?.address;
@@ -2799,7 +2801,7 @@ function useEvmAllowance() {
       });
       return await walletClient.signMessage({
         account: walletAddress,
-        message: `I approve moving ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}`
+        message: `I approve the transfer of ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}.`
       });
     } catch (error) {
       console.error("useEvmAllowance: Error on signing message:", error);
@@ -3057,10 +3059,13 @@ var import_web38 = require("@solana/web3.js");
 var import_ethers7 = require("ethers");
 function useSolanaAllowance() {
   const sourceChain = (0, import_react_redux7.useSelector)(selectSourceChain);
-  const { allowanceAmount, decimals } = (0, import_react_redux7.useSelector)(selectServiceFee);
+  const { allowanceAmount, submitAmount, decimals } = (0, import_react_redux7.useSelector)(selectServiceFee);
+  const feeDeduct = (0, import_react_redux7.useSelector)(selectFeeDeduct);
   const backendUrl = (0, import_react_redux7.useSelector)(selectBackendUrl);
   const networkOption = (0, import_react_redux7.useSelector)(selectNetworkOption);
-  const allowanceNumber = Number((0, import_ethers7.formatUnits)(allowanceAmount ?? "0", decimals));
+  const allowanceNumber = Number(
+    (0, import_ethers7.formatUnits)(feeDeduct ? submitAmount : allowanceAmount ?? "0", decimals)
+  );
   const { externalProvider } = useKimaContext();
   const { connection: internalConnection } = (0, import_wallet_adapter_react3.useConnection)();
   const {
@@ -3110,7 +3115,7 @@ function useSolanaAllowance() {
       return;
     }
     try {
-      const message = `I approve moving ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}`;
+      const message = `I approve the transfer of ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}.`;
       const encodedMessage = new TextEncoder().encode(message);
       const signature = await signMessage(encodedMessage);
       return `0x${Buffer.from(signature).toString("hex")}`;
@@ -3644,11 +3649,14 @@ function useTronAllowance() {
   const sourceChain = (0, import_react_redux11.useSelector)(selectSourceChain);
   const networkOption = (0, import_react_redux11.useSelector)(selectNetworkOption);
   const backendUrl = (0, import_react_redux11.useSelector)(selectBackendUrl);
-  const { allowanceAmount, decimals } = (0, import_react_redux11.useSelector)(selectServiceFee);
+  const { allowanceAmount, submitAmount, decimals } = (0, import_react_redux11.useSelector)(selectServiceFee);
   (0, import_tronwallet_adapter_react_hooks3.useWallet)();
   const selectedCoin = (0, import_react_redux11.useSelector)(selectSourceCurrency);
   const tokenOptions = (0, import_react_redux11.useSelector)(selectTokenOptions);
-  const allowanceNumber = Number((0, import_ethers9.formatUnits)(allowanceAmount ?? "0", decimals));
+  const feeDeduct = (0, import_react_redux11.useSelector)(selectFeeDeduct);
+  const allowanceNumber = Number(
+    (0, import_ethers9.formatUnits)(feeDeduct ? submitAmount : allowanceAmount ?? "0", decimals)
+  );
   const { pools } = useGetPools_default(backendUrl, networkOption);
   const {
     address: internalUserAddress,
@@ -3692,7 +3700,7 @@ function useTronAllowance() {
       return;
     }
     try {
-      const message = `I approve moving ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}`;
+      const message = `I approve the transfer of ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}.`;
       const signedMessage = await signMessage(message);
       return signedMessage;
     } catch (error2) {
@@ -6233,9 +6241,9 @@ var TransferWidget = ({
     if (error === "ApprovalNeeded" /* ApprovalNeeded */) {
       const sig2 = await signMessage?.({
         targetAddress,
-        targetChain: targetChain.name,
+        targetChain: targetChain.shortName,
         originSymbol: sourceCurrency,
-        originChain: sourceChain.name
+        originChain: sourceChain.shortName
       });
       setSignature2(sig2);
       return approve();
@@ -6248,9 +6256,9 @@ var TransferWidget = ({
     if (!sig) {
       sig = await signMessage?.({
         targetAddress,
-        targetChain: targetChain.name,
+        targetChain: targetChain.shortName,
         originSymbol: sourceCurrency,
-        originChain: sourceChain.name
+        originChain: sourceChain.shortName
       });
     }
     const { success, message: submitMessage } = await submitTransaction(sig);