@kimafinance/kima-transaction-widget 1.3.7 → 1.3.9

package/dist/index.cjs

@@ -2544,11 +2544,12 @@ function useIsWalletReady() {
     checkChainId();
   }, [externalProvider, sourceChain, switchNetwork, walletChainId, isConnected]);
   (0, import_react76.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]);
@@ -2798,10 +2799,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);
@@ -3112,13 +3110,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;
@@ -3697,10 +3692,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) {
@@ -3918,7 +3910,7 @@ var import_react136 = __toESM(require("react"), 1);
 
 // src/components/KimaWidgetWrapper.tsx
 var import_react134 = __toESM(require("react"), 1);
-var import_react_redux52 = require("react-redux");
+var import_react_redux53 = require("react-redux");
 
 // src/components/TransactionWidget.tsx
 var import_react121 = __toESM(require("react"), 1);
@@ -5234,7 +5226,7 @@ var TransactionWidget = ({ theme }) => {
 
 // src/components/TransferWidget.tsx
 var import_react133 = __toESM(require("react"), 1);
-var import_react_redux51 = require("react-redux");
+var import_react_redux52 = require("react-redux");
 
 // src/components/reusable/SingleForm.tsx
 var import_react123 = __toESM(require("react"), 1);
@@ -5996,6 +5988,7 @@ var useValidateTransaction_default = useValidateTransaction;
 // src/hooks/useSubmitTransaction.tsx
 var import_react131 = require("react");
 var import_react_redux50 = require("react-redux");
+var import_react_redux51 = require("react-redux");
 var useSubmitTransaction = ({
   amount,
   totalFee,
@@ -6010,7 +6003,8 @@ var useSubmitTransaction = ({
 }) => {
   const dispatch = (0, import_react_redux50.useDispatch)();
   const [isSubmitting, setSubmitting] = (0, import_react131.useState)(false);
-  const submitTransaction = async (signature) => {
+  const signature = (0, import_react_redux51.useSelector)(selectSignature);
+  const submitTransaction = async () => {
     try {
       setSubmitting(true);
       const params = JSON.stringify({
@@ -6152,37 +6146,38 @@ var TransferWidget = ({
   titleOption,
   paymentTitleOption
 }) => {
-  const dispatch = (0, import_react_redux51.useDispatch)();
+  const dispatch = (0, import_react_redux52.useDispatch)();
   const mainRef = (0, import_react133.useRef)(null);
   const [formStep, setFormStep] = (0, import_react133.useState)(0);
   const [warningModalOpen, setWarningModalOpen] = (0, import_react133.useState)(null);
-  const dAppOption = (0, import_react_redux51.useSelector)(selectDappOption);
-  const mode = (0, import_react_redux51.useSelector)(selectMode);
-  const transactionOption = (0, import_react_redux51.useSelector)(selectTransactionOption);
-  const backendUrl = (0, import_react_redux51.useSelector)(selectBackendUrl);
-  const sourceAddress = (0, import_react_redux51.useSelector)(selectSourceAddress);
-  const targetAddress = (0, import_react_redux51.useSelector)(selectTargetAddress);
-  const sourceChain = (0, import_react_redux51.useSelector)(selectSourceChain);
-  const targetChain = (0, import_react_redux51.useSelector)(selectTargetChain);
-  const sourceCurrency = (0, import_react_redux51.useSelector)(selectSourceCurrency);
-  const targetCurrency = (0, import_react_redux51.useSelector)(selectTargetCurrency);
-  const amount = (0, import_react_redux51.useSelector)(selectAmount);
+  const dAppOption = (0, import_react_redux52.useSelector)(selectDappOption);
+  const mode = (0, import_react_redux52.useSelector)(selectMode);
+  const transactionOption = (0, import_react_redux52.useSelector)(selectTransactionOption);
+  const backendUrl = (0, import_react_redux52.useSelector)(selectBackendUrl);
+  const sourceAddress = (0, import_react_redux52.useSelector)(selectSourceAddress);
+  const targetAddress = (0, import_react_redux52.useSelector)(selectTargetAddress);
+  const sourceChain = (0, import_react_redux52.useSelector)(selectSourceChain);
+  const targetChain = (0, import_react_redux52.useSelector)(selectTargetChain);
+  const sourceCurrency = (0, import_react_redux52.useSelector)(selectSourceCurrency);
+  const targetCurrency = (0, import_react_redux52.useSelector)(selectTargetCurrency);
+  const amount = (0, import_react_redux52.useSelector)(selectAmount);
   const {
     totalFeeUsd,
     totalFee,
     targetNetworkFee,
     submitAmount,
     decimals: feeDecimals
-  } = (0, import_react_redux51.useSelector)(selectServiceFee);
-  const compliantOption = (0, import_react_redux51.useSelector)(selectCompliantOption);
-  const networkOptions3 = (0, import_react_redux51.useSelector)(selectNetworkOption);
-  const feeDeduct = (0, import_react_redux51.useSelector)(selectFeeDeduct);
+  } = (0, import_react_redux52.useSelector)(selectServiceFee);
+  const compliantOption = (0, import_react_redux52.useSelector)(selectCompliantOption);
+  const networkOptions3 = (0, import_react_redux52.useSelector)(selectNetworkOption);
+  const feeDeduct = (0, import_react_redux52.useSelector)(selectFeeDeduct);
   const { keplrHandler, closeHandler } = useKimaContext();
   const [isCancellingApprove, setCancellingApprove] = (0, import_react133.useState)(false);
   const [isApproving, setApproving] = (0, import_react133.useState)(false);
   const [isSigning, setSigning] = (0, import_react133.useState)(false);
-  const pendingTxs = (0, import_react_redux51.useSelector)(selectPendingTxs);
-  const networks = (0, import_react_redux51.useSelector)(selectNetworks);
+  const pendingTxs = (0, import_react_redux52.useSelector)(selectPendingTxs);
+  const networks = (0, import_react_redux52.useSelector)(selectNetworks);
+  const signature = (0, import_react_redux52.useSelector)(selectSignature);
   const { width: windowWidth } = useWidth_default();
   const { disconnectWallet } = useDisconnectWallet4();
   const { balance } = useBalance2();
@@ -6238,20 +6233,29 @@ var TransferWidget = ({
       return import_react_hot_toast5.toast.error(validationMessage, { icon: /* @__PURE__ */ import_react133.default.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 import_react_hot_toast5.toast.error(submitMessage, { icon: /* @__PURE__ */ import_react133.default.createElement(Error_default, null) });
   };
   const onNext = () => {
@@ -6477,8 +6481,8 @@ var KimaWidgetWrapper = ({
   excludedTargetNetworks = []
 }) => {
   const { kimaBackendUrl } = useKimaContext();
-  const submitted = (0, import_react_redux52.useSelector)(selectSubmitted);
-  const dispatch = (0, import_react_redux52.useDispatch)();
+  const submitted = (0, import_react_redux53.useSelector)(selectSubmitted);
+  const dispatch = (0, import_react_redux53.useDispatch)();
   const { setThemeMode, setThemeVariables } = (0, import_react135.useAppKitTheme)();
   const { data: chainData } = useChainData(kimaBackendUrl);
   const { data: envOptions } = useGetEnvOptions({ kimaBackendUrl });
@@ -6544,7 +6548,7 @@ var KimaWidgetWrapper = ({
 var KimaWidgetWrapper_default = KimaWidgetWrapper;
 
 // src/components/KimaTransactionWidget.tsx
-var import_react_redux53 = require("react-redux");
+var import_react_redux54 = require("react-redux");
 var KimaTransactionWidget = ({
   mode,
   txId,
@@ -6553,12 +6557,12 @@ var KimaTransactionWidget = ({
   titleOption,
   paymentTitleOption,
   helpURL = "",
-  compliantOption = true,
+  compliantOption = false,
   transactionOption,
   excludedSourceNetworks = [],
   excludedTargetNetworks = []
 }) => {
-  const dispatch = (0, import_react_redux53.useDispatch)();
+  const dispatch = (0, import_react_redux54.useDispatch)();
   const { kimaBackendUrl } = useKimaContext();
   const { isLoading: isLoadingEnvs } = useGetEnvOptions({
     kimaBackendUrl