@kimafinance/kima-transaction-widget 1.3.7 → 1.3.9

package/dist/index.js

@@ -2561,11 +2561,12 @@ function useIsWalletReady() {
     checkChainId();
   }, [externalProvider, sourceChain, switchNetwork, walletChainId, isConnected]);
   useEffect(() => {
-    if (isConnected) {
+    if (isConnected && sourceChain.compatibility === "EVM" /* EVM */) {
       console.debug(
         "useIsWalletReady:EVM: Dispatching source address:",
         walletAddress
       );
+      console.log("dispatching evm address: ", walletAddress);
       dispatch(setSourceAddress(walletAddress ?? ""));
     }
   }, [walletAddress, isConnected, dispatch]);
@@ -2822,10 +2823,7 @@ function useEvmAllowance() {
       });
       return await walletClient.signMessage({
         account: walletAddress,
-        message: `Amount: ${allowanceNumber}
-Target Address: ${data.targetAddress}
-Target Chain: ${data.targetChain}
-Target Symbol: ${data.targetSymbol}`
+        message: `I approve moving ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}`
       });
     } catch (error) {
       console.error("useEvmAllowance: Error on signing message:", error);
@@ -3150,13 +3148,10 @@ function useSolanaAllowance() {
       return;
     }
     try {
-      const message = `Amount: ${allowanceNumber}
-Target Address: ${data.targetAddress}
-Target Chain: ${data.targetChain}
-Target Symbol: ${data.targetSymbol}`;
+      const message = `I approve moving ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}`;
       const encodedMessage = new TextEncoder().encode(message);
       const signature = await signMessage(encodedMessage);
-      return signature;
+      return `0x${Buffer.from(signature).toString("hex")}`;
     } catch (error2) {
       console.error("Error signing message:", error2);
       throw error2;
@@ -3741,10 +3736,7 @@ function useTronAllowance() {
       return;
     }
     try {
-      const message = `Amount: ${allowanceNumber}
-Target Address: ${data.targetAddress}
-Target Chain: ${data.targetChain}
-Target Symbol: ${data.targetSymbol}`;
+      const message = `I approve moving ${allowanceNumber} ${data.originSymbol} from ${data.originChain} to ${data.targetAddress} on ${data.targetChain}`;
       const signedMessage = await signMessage(message);
       return signedMessage;
     } catch (error2) {
@@ -3962,7 +3954,7 @@ import React113, { useEffect as useEffect20 } from "react";
 
 // src/components/KimaWidgetWrapper.tsx
 import React112, { useEffect as useEffect19 } from "react";
-import { useDispatch as useDispatch26, useSelector as useSelector38 } from "react-redux";
+import { useDispatch as useDispatch26, useSelector as useSelector39 } from "react-redux";
 
 // src/components/TransactionWidget.tsx
 import React101, { useEffect as useEffect13, useMemo as useMemo13, useState as useState10 } from "react";
@@ -5278,7 +5270,7 @@ var TransactionWidget = ({ theme }) => {
 
 // src/components/TransferWidget.tsx
 import React111, { useEffect as useEffect18, useState as useState14, useRef as useRef7 } from "react";
-import { useDispatch as useDispatch25, useSelector as useSelector37 } from "react-redux";
+import { useDispatch as useDispatch25, useSelector as useSelector38 } from "react-redux";
 
 // src/components/reusable/SingleForm.tsx
 import React103, { useEffect as useEffect15, useMemo as useMemo15, useState as useState12 } from "react";
@@ -6040,6 +6032,7 @@ var useValidateTransaction_default = useValidateTransaction;
 // src/hooks/useSubmitTransaction.tsx
 import { useState as useState13 } from "react";
 import { useDispatch as useDispatch24 } from "react-redux";
+import { useSelector as useSelector37 } from "react-redux";
 var useSubmitTransaction = ({
   amount,
   totalFee,
@@ -6054,7 +6047,8 @@ var useSubmitTransaction = ({
 }) => {
   const dispatch = useDispatch24();
   const [isSubmitting, setSubmitting] = useState13(false);
-  const submitTransaction = async (signature) => {
+  const signature = useSelector37(selectSignature);
+  const submitTransaction = async () => {
     try {
       setSubmitting(true);
       const params = JSON.stringify({
@@ -6200,33 +6194,34 @@ var TransferWidget = ({
   const mainRef = useRef7(null);
   const [formStep, setFormStep] = useState14(0);
   const [warningModalOpen, setWarningModalOpen] = useState14(null);
-  const dAppOption = useSelector37(selectDappOption);
-  const mode = useSelector37(selectMode);
-  const transactionOption = useSelector37(selectTransactionOption);
-  const backendUrl = useSelector37(selectBackendUrl);
-  const sourceAddress = useSelector37(selectSourceAddress);
-  const targetAddress = useSelector37(selectTargetAddress);
-  const sourceChain = useSelector37(selectSourceChain);
-  const targetChain = useSelector37(selectTargetChain);
-  const sourceCurrency = useSelector37(selectSourceCurrency);
-  const targetCurrency = useSelector37(selectTargetCurrency);
-  const amount = useSelector37(selectAmount);
+  const dAppOption = useSelector38(selectDappOption);
+  const mode = useSelector38(selectMode);
+  const transactionOption = useSelector38(selectTransactionOption);
+  const backendUrl = useSelector38(selectBackendUrl);
+  const sourceAddress = useSelector38(selectSourceAddress);
+  const targetAddress = useSelector38(selectTargetAddress);
+  const sourceChain = useSelector38(selectSourceChain);
+  const targetChain = useSelector38(selectTargetChain);
+  const sourceCurrency = useSelector38(selectSourceCurrency);
+  const targetCurrency = useSelector38(selectTargetCurrency);
+  const amount = useSelector38(selectAmount);
   const {
     totalFeeUsd,
     totalFee,
     targetNetworkFee,
     submitAmount,
     decimals: feeDecimals
-  } = useSelector37(selectServiceFee);
-  const compliantOption = useSelector37(selectCompliantOption);
-  const networkOptions3 = useSelector37(selectNetworkOption);
-  const feeDeduct = useSelector37(selectFeeDeduct);
+  } = useSelector38(selectServiceFee);
+  const compliantOption = useSelector38(selectCompliantOption);
+  const networkOptions3 = useSelector38(selectNetworkOption);
+  const feeDeduct = useSelector38(selectFeeDeduct);
   const { keplrHandler, closeHandler } = useKimaContext();
   const [isCancellingApprove, setCancellingApprove] = useState14(false);
   const [isApproving, setApproving] = useState14(false);
   const [isSigning, setSigning] = useState14(false);
-  const pendingTxs = useSelector37(selectPendingTxs);
-  const networks = useSelector37(selectNetworks);
+  const pendingTxs = useSelector38(selectPendingTxs);
+  const networks = useSelector38(selectNetworks);
+  const signature = useSelector38(selectSignature);
   const { width: windowWidth } = useWidth_default();
   const { disconnectWallet } = useDisconnectWallet4();
   const { balance } = useBalance2();
@@ -6282,20 +6277,29 @@ var TransferWidget = ({
       return toast5.error(validationMessage, { icon: /* @__PURE__ */ React111.createElement(Error_default, null) });
     }
     if (error === "ApprovalNeeded" /* ApprovalNeeded */) {
+      const signature2 = await signMessage?.({
+        targetAddress,
+        targetChain: targetChain.name,
+        originSymbol: sourceCurrency,
+        originChain: sourceChain.name
+      });
+      setSignature(signature2);
       return approve();
     }
     if (dAppOption === "LPDrain" /* LPDrain */ || dAppOption === "LPAdd" /* LPAdd */) {
       keplrHandler && keplrHandler(sourceAddress);
       return;
     }
-    const signature = await signMessage?.({
-      targetAddress,
-      targetChain: targetChain.shortName,
-      targetSymbol: targetCurrency
-    });
-    const { success, message: submitMessage } = await submitTransaction(
-      JSON.stringify({ signature })
-    );
+    if (!signature?.length) {
+      const signature2 = await signMessage?.({
+        targetAddress,
+        targetChain: targetChain.name,
+        originSymbol: sourceCurrency,
+        originChain: sourceChain.name
+      });
+      setSignature(signature2);
+    }
+    const { success, message: submitMessage } = await submitTransaction();
     if (!success) return toast5.error(submitMessage, { icon: /* @__PURE__ */ React111.createElement(Error_default, null) });
   };
   const onNext = () => {
@@ -6521,7 +6525,7 @@ var KimaWidgetWrapper = ({
   excludedTargetNetworks = []
 }) => {
   const { kimaBackendUrl } = useKimaContext();
-  const submitted = useSelector38(selectSubmitted);
+  const submitted = useSelector39(selectSubmitted);
   const dispatch = useDispatch26();
   const { setThemeMode, setThemeVariables } = useAppKitTheme();
   const { data: chainData } = useChainData(kimaBackendUrl);
@@ -6597,7 +6601,7 @@ var KimaTransactionWidget = ({
   titleOption,
   paymentTitleOption,
   helpURL = "",
-  compliantOption = true,
+  compliantOption = false,
   transactionOption,
   excludedSourceNetworks = [],
   excludedTargetNetworks = []