@sodax/wallet-sdk-react 1.5.1-beta → 1.5.3-beta

package/dist/index.cjs

@@ -792,76 +792,48 @@ var InjectiveXService = class _InjectiveXService extends XService {
     return 0n;
   }
 };
-var InjectiveKelprXConnector = class extends XConnector {
-  constructor() {
-    super("INJECTIVE", "Keplr", walletBase.Wallet.Keplr);
-  }
-  getXService() {
-    return InjectiveXService.getInstance();
-  }
-  async connect() {
-    if (!walletCosmos.isCosmosWalletInstalled(walletBase.Wallet.Keplr)) {
-      window.open("https://chrome.google.com/webstore/detail/keplr/dmkamcknogkgcdfhhbddcghachkejeap?hl=en", "_blank");
-      return;
-    }
-    this.getXService().walletStrategy.setWallet(walletBase.Wallet.Keplr);
-    const addresses = await this.getXService().walletStrategy.getAddresses();
-    return {
-      address: addresses?.[0],
-      xChainType: this.xChainType
-    };
-  }
-  async disconnect() {
-  }
-  get icon() {
-    return "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/keplr.svg";
-  }
+var WALLET_ICONS = {
+  metamask: "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/metamask.svg",
+  keplr: "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/keplr.svg",
+  leap: "https://assets.leapwallet.io/logos/leap-cosmos-logo.svg",
+  rabby: "https://raw.githubusercontent.com/RabbyHub/logo/master/symbol.svg",
+  phantom: "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/phantom.svg",
+  "okx-wallet": "https://static.okx.com/cdn/assets/imgs/247/58E63FEA47A2B7D7.png",
+  "trust-wallet": "https://trustwallet.com/assets/images/media/assets/twLogo.svg"
 };
-var InjectiveMetamaskXConnector = class extends XConnector {
-  constructor() {
-    super("INJECTIVE", "MetaMask", walletBase.Wallet.Metamask);
+var InjectiveXConnector = class extends XConnector {
+  constructor(name, wallet) {
+    super("INJECTIVE", name, wallet);
+    this.wallet = wallet;
   }
   getXService() {
     return InjectiveXService.getInstance();
   }
   async connect() {
-    if (!walletBase.isEvmBrowserWallet(walletBase.Wallet.Metamask)) {
-      window.open("https://chromewebstore.google.com/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn?hl=en", "_blank");
-      return;
+    if (walletBase.isCosmosBrowserWallet(this.wallet) && !walletCosmos.isCosmosWalletInstalled(this.wallet)) {
+      return void 0;
     }
-    this.getXService().walletStrategy.setWallet(walletBase.Wallet.Metamask);
-    const addresses = await this.getXService().walletStrategy.getAddresses();
-    const injectiveAddresses = addresses.map(sdkTs.getInjectiveAddress);
+    const walletStrategy = this.getXService().walletStrategy;
+    await walletStrategy.setWallet(this.wallet);
+    const addresses = await walletStrategy.getAddresses();
+    if (!addresses?.length) return void 0;
+    const address = walletBase.isEvmBrowserWallet(this.wallet) ? sdkTs.getInjectiveAddress(addresses[0]) : addresses[0];
     return {
-      address: injectiveAddresses?.[0],
+      address,
       xChainType: this.xChainType
     };
   }
   async disconnect() {
-    await this.getXService().walletStrategy.disconnect();
+    if (walletBase.isEvmBrowserWallet(this.wallet)) {
+      const walletStrategy = this.getXService().walletStrategy;
+      await walletStrategy.setWallet(this.wallet);
+      await walletStrategy.disconnect();
+    }
   }
   get icon() {
-    return "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/metamask.svg";
+    return WALLET_ICONS[this.wallet];
   }
 };
-
-// src/xchains/injective/utils.ts
-var switchEthereumChain = async (chainId) => {
-  const metamaskProvider = window.ethereum;
-  await Promise.race([
-    metamaskProvider.request({
-      method: "wallet_switchEthereumChain",
-      params: [{ chainId: `0x${chainId}` }]
-    }),
-    new Promise(
-      (resolve) => metamaskProvider.on("change", ({ chain }) => {
-        if (chain?.id === chainId) {
-          resolve();
-        }
-      })
-    )
-  ]);
-};
 var SolanaXService = class _SolanaXService extends XService {
   constructor() {
     super("SOLANA");
@@ -1336,16 +1308,18 @@ var initXServices = () => {
         break;
       case "BITCOIN":
         xServices[xChainType] = BitcoinXService.getInstance();
-        xServices[xChainType].setXConnectors([
-          new UnisatXConnector(),
-          new XverseXConnector(),
-          new OKXXConnector()
-        ]);
+        xServices[xChainType].setXConnectors([new UnisatXConnector(), new XverseXConnector(), new OKXXConnector()]);
         break;
       // Injective, Stellar, Icon wallet connectors are supported by sodax wallet-sdk-react sdk.
       case "INJECTIVE":
         xServices[xChainType] = InjectiveXService.getInstance();
-        xServices[xChainType].setXConnectors([new InjectiveMetamaskXConnector(), new InjectiveKelprXConnector()]);
+        xServices[xChainType].setXConnectors([
+          // EVM wallets (auto-detected via EIP-6963)
+          new InjectiveXConnector("MetaMask", walletBase.Wallet.Metamask),
+          // Cosmos wallets (detected via window globals)
+          new InjectiveXConnector("Keplr", walletBase.Wallet.Keplr),
+          new InjectiveXConnector("Leap", walletBase.Wallet.Leap)
+        ]);
         break;
       case "STELLAR":
         xServices[xChainType] = StellarXService.getInstance();
@@ -1747,15 +1721,23 @@ function useEthereumChainId() {
     const walletStrategy = injectiveXService.walletStrategy;
     if (walletStrategy.getWallet() !== walletBase.Wallet.Metamask) return;
     const getEthereumChainId = async () => {
-      const chainId = await walletStrategy.getEthereumChainId();
-      setEthereumChainId(Number.parseInt(chainId));
+      try {
+        const chainId = await walletStrategy.getEthereumChainId();
+        setEthereumChainId(Number.parseInt(chainId));
+      } catch (e) {
+        console.warn("Failed to get Ethereum chain ID:", e);
+      }
     };
     getEthereumChainId();
-    walletStrategy.getStrategy().onChainIdChanged(getEthereumChainId);
+    try {
+      walletStrategy.getStrategy().onChainIdChanged(getEthereumChainId);
+    } catch (e) {
+      console.warn("Failed to subscribe to chain ID changes:", e);
+    }
   }, [injectiveXService?.walletStrategy]);
   return ethereumChainId;
 }
-var switchEthereumChain2 = async () => {
+var switchEthereumChain = async () => {
   const metamaskProvider = window.ethereum;
   return await Promise.race([
     metamaskProvider.request({
@@ -1783,7 +1765,7 @@ var useEvmSwitchChain = (expectedXChainId) => {
   const { switchChain } = wagmi.useSwitchChain();
   const handleSwitchChain = React2.useCallback(() => {
     if (xChainType === "INJECTIVE") {
-      switchEthereumChain2();
+      switchEthereumChain();
     } else {
       switchChain({ chainId: expectedChainId });
     }
@@ -2037,6 +2019,27 @@ var reconnectIcon = async () => {
     });
   }
 };
+var reconnectInjective = async () => {
+  const injectiveConnection = useXWagmiStore.getState().xConnections.INJECTIVE;
+  if (!injectiveConnection) return;
+  const recentXConnectorId = injectiveConnection.xConnectorId;
+  const walletStrategy = InjectiveXService.getInstance().walletStrategy;
+  await walletStrategy.setWallet(recentXConnectorId);
+  const addresses = await walletStrategy.getAddresses();
+  const address = walletBase.isEvmBrowserWallet(recentXConnectorId) ? sdkTs.getInjectiveAddress(addresses?.[0]) : addresses?.[0];
+  useXWagmiStore.setState({
+    xConnections: {
+      ...useXWagmiStore.getState().xConnections,
+      INJECTIVE: {
+        xAccount: {
+          address,
+          xChainType: "INJECTIVE"
+        },
+        xConnectorId: recentXConnectorId
+      }
+    }
+  });
+};
 
 // src/xchains/stellar/actions.ts
 var reconnectStellar = async () => {
@@ -2083,6 +2086,7 @@ var SodaxWalletProvider = ({ children, rpcConfig, options, initialState }) => {
   return /* @__PURE__ */ React2__default.default.createElement(reactQuery.QueryClientProvider, { client: queryClient }, /* @__PURE__ */ React2__default.default.createElement(wagmi.WagmiProvider, { reconnectOnMount: wagmi$1.reconnectOnMount, config: wagmiConfig, initialState }, /* @__PURE__ */ React2__default.default.createElement(dappKit.SuiClientProvider, { networks: { mainnet: { url: client.getFullnodeUrl("mainnet") } }, defaultNetwork: "mainnet" }, /* @__PURE__ */ React2__default.default.createElement(dappKit.WalletProvider, { autoConnect: sui.autoConnect }, /* @__PURE__ */ React2__default.default.createElement(walletAdapterReact.ConnectionProvider, { endpoint: rpcConfig["solana"] ?? "https://api.mainnet-beta.solana.com" }, /* @__PURE__ */ React2__default.default.createElement(walletAdapterReact.WalletProvider, { wallets, autoConnect: solana.autoConnect }, /* @__PURE__ */ React2__default.default.createElement(Hydrate, { rpcConfig }), children))))));
 };
 reconnectIcon();
+reconnectInjective();
 reconnectStellar();
 
 // src/types/index.ts
@@ -2101,8 +2105,7 @@ exports.EvmXConnector = EvmXConnector;
 exports.EvmXService = EvmXService;
 exports.IconHanaXConnector = IconHanaXConnector;
 exports.IconXService = IconXService;
-exports.InjectiveKelprXConnector = InjectiveKelprXConnector;
-exports.InjectiveMetamaskXConnector = InjectiveMetamaskXConnector;
+exports.InjectiveXConnector = InjectiveXConnector;
 exports.InjectiveXService = InjectiveXService;
 exports.OKXXConnector = OKXXConnector;
 exports.STACKS_PROVIDERS = STACKS_PROVIDERS;
@@ -2126,7 +2129,6 @@ exports.getWagmiChainId = getWagmiChainId;
 exports.getXChainType = getXChainType;
 exports.getXService = getXService;
 exports.isNativeToken = isNativeToken;
-exports.switchEthereumChain = switchEthereumChain;
 exports.useBitcoinXConnectors = useBitcoinXConnectors;
 exports.useEvmSwitchChain = useEvmSwitchChain;
 exports.useStacksXConnectors = useStacksXConnectors;