@trustware/sdk-staging 1.1.12-staging.2 → 1.1.12-staging.3

package/dist/index.cjs

@@ -514,7 +514,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.12-staging.2";
+    SDK_VERSION = "1.1.12-staging.3";
     API_ROOT = "https://bv-staging-api.trustware.io";
     GTM_ID = "GTM-TZDGNCXB";
     API_PREFIX = "/api";
@@ -5679,6 +5679,15 @@ function isNativeTokenAddress(address, chainType) {
   if (!chainType) return false;
   return normalizeAddress2(address, chainType) === normalizeAddress2(getNativeTokenAddress2(chainType), chainType);
 }
+function isEvmAddress2(value) {
+  return !!value && EVM_ADDRESS_RE.test(value);
+}
+function needsErc20Approval(tokenAddress, chainType) {
+  if (!isEvmAddress2(tokenAddress)) return false;
+  const normalizedType = normalizeChainType2(chainType ?? void 0);
+  if (normalizedType && NON_EVM_CHAIN_TYPES.has(normalizedType)) return false;
+  return !isNativeTokenAddress(tokenAddress, chainType) && !isZeroAddrLike(tokenAddress, chainType);
+}
 function canonicalTokenAddressForChain(chain, address, chainTokens = []) {
   const chainType = normalizeChainType2(chain);
   const rawAddress = (address ?? "").trim();
@@ -5701,7 +5710,7 @@ function canonicalTokenAddressForChain(chain, address, chainTokens = []) {
   }
   return lowerAddress;
 }
-var NATIVE_EVM2, NATIVE_SOLANA2, CHAIN_TYPE_ALIASES2, SEI_EVM_CHAIN_ID, SEI_COSMOS_CHAIN_ID;
+var NATIVE_EVM2, NATIVE_SOLANA2, CHAIN_TYPE_ALIASES2, SEI_EVM_CHAIN_ID, SEI_COSMOS_CHAIN_ID, EVM_ADDRESS_RE, NON_EVM_CHAIN_TYPES;
 var init_chainHelpers = __esm({
   "src/widget/helpers/chainHelpers.ts"() {
     "use strict";
@@ -5717,6 +5726,8 @@ var init_chainHelpers = __esm({
     };
     SEI_EVM_CHAIN_ID = "1329";
     SEI_COSMOS_CHAIN_ID = "pacific-1";
+    EVM_ADDRESS_RE = /^0x[0-9a-fA-F]{40}$/;
+    NON_EVM_CHAIN_TYPES = /* @__PURE__ */ new Set(["solana", "bitcoin", "btc"]);
   }
 });
 
@@ -33841,8 +33852,7 @@ function useSwapExecution(fromChain) {
         return;
       }
       const chainType = normalizeChainType2(fromChain);
-      const isNative = !fromTokenAddress || isNativeTokenAddress(fromTokenAddress, chainType) || isZeroAddrLike(fromTokenAddress, chainType);
-      if (isNative) {
+      if (!needsErc20Approval(fromTokenAddress, chainType)) {
         setState((p) => ({ ...p, allowanceStatus: "sufficient" }));
         return;
       }
@@ -33856,7 +33866,7 @@ function useSwapExecution(fromChain) {
           BigInt(a.amount || "0"),
           amountWei
         );
-        if (!token || !a.spender) return [];
+        if (!isEvmAddress2(token) || !isEvmAddress2(a.spender)) return [];
         return [
           {
             chainId: a.chainId || chainIdStr,
@@ -34004,7 +34014,8 @@ function useSwapExecution(fromChain) {
         const requiredApprovals = plannedApprovals.length ? plannedApprovals.flatMap((a, index) => {
           const token = a.tokenAddress ?? fromTokenAddress;
           const approvalSpender = a.spender;
-          if (!token || !approvalSpender) return [];
+          if (!isEvmAddress2(token) || !isEvmAddress2(approvalSpender))
+            return [];
           const amountWei = requiredApprovalAmount(
             BigInt(a.amount || "0"),
             fromAmountWei
@@ -34027,7 +34038,8 @@ function useSwapExecution(fromChain) {
             chainId: chainIdStr
           }
         ] : [];
-        const ownsApprovals = !isNative && !!walletAddress && !!chainIdStr;
+        const coversEveryPlannedApproval = plannedApprovals.length === 0 || requiredApprovals.length === plannedApprovals.length;
+        const ownsApprovals = coversEveryPlannedApproval && needsErc20Approval(fromTokenAddress, chainType) && !!walletAddress && !!chainIdStr;
         const activeAddress = ownsApprovals ? await requireActiveAddress(wallet, walletAddress) : void 0;
         for (const required of requiredApprovals) {
           if (!ownsApprovals) break;
@@ -36208,6 +36220,10 @@ function SwapMode({
   }, [lockDestToken, fromToken, fromChain, toToken, toChain, route, emitEvent]);
   const fromChainType = normalizeChainType2(fromChain);
   const toChainType = normalizeChainType2(toChain);
+  const canSetMaxApproval = needsErc20Approval(
+    fromToken?.address,
+    fromChainType
+  );
   const needsDestAddress = !!fromChainType && !!toChainType && fromChainType !== toChainType;
   const isValidDestAddress = !needsDestAddress || validateDestAddress(destAddress, toChainType ?? "");
   const handleReview = (0, import_react50.useCallback)(async () => {
@@ -38428,7 +38444,7 @@ function SwapMode({
                               }
                             )
                           ] }),
-                          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("div", { style: { marginBottom: spacing[4] }, children: /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
+                          canSetMaxApproval && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("div", { style: { marginBottom: spacing[4] }, children: /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
                             "div",
                             {
                               style: {