@kimafinance/kima-transaction-widget 1.3.10 → 1.3.12

package/dist/index.js

@@ -2774,12 +2774,14 @@ function useEvmAllowance() {
   const appkitAccountInfo = useAppKitAccount4();
   const sourceChain = useSelector4(selectSourceChain);
   const networkOption = useSelector4(selectNetworkOption);
-  const { totalFeeUsd, allowanceAmount, decimals } = useSelector4(selectServiceFee);
+  const { totalFeeUsd, allowanceAmount, submitAmount, decimals } = useSelector4(selectServiceFee);
   const selectedCoin = useSelector4(selectSourceCurrency);
   const tokenOptions = useSelector4(selectTokenOptions);
   const backendUrl = useSelector4(selectBackendUrl);
   const feeDeduct = useSelector4(selectFeeDeduct);
-  const allowanceNumber = Number(formatUnits4(allowanceAmount ?? "0", decimals));
+  const allowanceNumber = Number(
+    formatUnits4(feeDeduct ? submitAmount : allowanceAmount ?? "0", decimals)
+  );
   const amount = useSelector4(selectAmount);
   const { pools } = useGetPools_default(backendUrl, networkOption);
   const walletAddress = externalProvider?.signer?.address || appkitAccountInfo?.address;
@@ -2823,7 +2825,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);
@@ -3095,10 +3097,13 @@ import { PublicKey as PublicKey5, Transaction } from "@solana/web3.js";
 import { formatUnits as formatUnits5 } from "ethers";
 function useSolanaAllowance() {
   const sourceChain = useSelector6(selectSourceChain);
-  const { allowanceAmount, decimals } = useSelector6(selectServiceFee);
+  const { allowanceAmount, submitAmount, decimals } = useSelector6(selectServiceFee);
+  const feeDeduct = useSelector6(selectFeeDeduct);
   const backendUrl = useSelector6(selectBackendUrl);
   const networkOption = useSelector6(selectNetworkOption);
-  const allowanceNumber = Number(formatUnits5(allowanceAmount ?? "0", decimals));
+  const allowanceNumber = Number(
+    formatUnits5(feeDeduct ? submitAmount : allowanceAmount ?? "0", decimals)
+  );
   const { externalProvider } = useKimaContext();
   const { connection: internalConnection } = useConnection2();
   const {
@@ -3148,7 +3153,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")}`;
@@ -3688,11 +3693,14 @@ function useTronAllowance() {
   const sourceChain = useSelector9(selectSourceChain);
   const networkOption = useSelector9(selectNetworkOption);
   const backendUrl = useSelector9(selectBackendUrl);
-  const { allowanceAmount, decimals } = useSelector9(selectServiceFee);
+  const { allowanceAmount, submitAmount, decimals } = useSelector9(selectServiceFee);
   useTronWallet();
   const selectedCoin = useSelector9(selectSourceCurrency);
   const tokenOptions = useSelector9(selectTokenOptions);
-  const allowanceNumber = Number(formatUnits7(allowanceAmount ?? "0", decimals));
+  const feeDeduct = useSelector9(selectFeeDeduct);
+  const allowanceNumber = Number(
+    formatUnits7(feeDeduct ? submitAmount : allowanceAmount ?? "0", decimals)
+  );
   const { pools } = useGetPools_default(backendUrl, networkOption);
   const {
     address: internalUserAddress,
@@ -3736,7 +3744,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) {
@@ -6277,9 +6285,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();
@@ -6292,9 +6300,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);