@0xsquid/react-hooks 6.4.4-beta.4 → 6.4.4-stellar-beta.0

package/dist/hooks/user/useHistory.js

@@ -1,25 +1,26 @@
 import { useCallback, useMemo } from "react";
+import { HistoryTxType, } from "../../core/types/history";
 import { TransactionStatus, } from "../../core/types/transaction";
-import { getBridgeType } from "../../services/internal/transactionStatusService";
+import { formatSwapTxStatusResponseForStorage, simplifyRouteAction, } from "../../services";
+import { getBridgeType, isHistoryTransactionFailed, isHistoryTransactionPending, isHistoryTransactionWarning, } from "../../services/internal/transactionStatusService";
 import { useHistoryStore } from "../store/useHistoryStore";
-export const useHistory = () => {
+export const useHistory = (txType) => {
     const transactions = useHistoryStore((state) => state.transactions);
-    const { persistTransaction, replaceTransactionStatus, removeTransaction, replaceTransactionAtNonce, } = useHistoryStore();
+    const { persistTransaction, replaceTransactionStatus, replaceTransactionAtNonce, } = useHistoryStore();
+    const filteredTransactions = useMemo(() => {
+        if (txType === undefined)
+            return transactions;
+        return transactions.filter((tx) => tx.txType === txType);
+    }, [transactions, txType]);
     const pendingTransactions = useMemo(() => {
-        return transactions.filter((tx) => tx.status === TransactionStatus.INITIAL_LOADING ||
-            tx.status === TransactionStatus.ONGOING ||
-            tx.status === TransactionStatus.PENDING);
-    }, [transactions]);
-    const parseTransaction = (tx) => {
+        return filteredTransactions.filter(isHistoryTransactionPending);
+    }, [filteredTransactions]);
+    const parseSwapTransaction = useCallback((tx) => {
         if (!tx.transactionId || !tx.params.toAddress || !tx.params.fromAddress) {
             return null;
         }
-        const simplifiedActions = tx.estimate?.actions?.map((action) => ({
-            type: action.type,
-            provider: action.provider,
-            data: action.data,
-        })) ?? [];
-        return {
+        const simplifiedActions = tx.estimate?.actions?.map(simplifyRouteAction) ?? [];
+        const swapTxData = {
             fromChain: tx.params.fromChain,
             fromToken: tx.params.fromToken,
             fromAddress: tx.params.fromAddress,
@@ -28,77 +29,74 @@ export const useHistory = () => {
             toToken: tx.params.toToken,
             toAddress: tx.params.toAddress,
             toAmount: tx.estimate.toAmount,
-            toAmountMin: tx.estimate.toAmountMin,
-            exchangeRate: tx.estimate.exchangeRate,
-            aggregatePriceImpact: tx.estimate.aggregatePriceImpact,
             transactionIdForStatus: tx.transactionIdForStatus,
-            fromAmountUSD: tx.estimate.fromAmountUSD,
-            toAmountUSD: tx.estimate.toAmountUSD,
-            toAmountMinUSD: tx.estimate.toAmountMinUSD,
-            slippage: tx.params.slippage,
+            quoteId: tx.quoteId,
             status: tx.status,
             transactionId: tx.transactionId,
             nonce: tx.nonce,
             routeType: tx.routeType,
-            statusResponse: tx.statusResponse,
+            statusResponse: formatSwapTxStatusResponseForStorage(tx.statusResponse),
             sourceTxExplorerUrl: tx.sourceTxExplorerUrl,
             timestamp: tx.timestamp ?? Date.now(),
             bridgeType: getBridgeType(tx.estimate.actions),
             actions: simplifiedActions,
         };
-    };
-    const addTransaction = (tx) => {
-        const simplifiedTx = parseTransaction(tx);
+        return {
+            txType: HistoryTxType.SWAP,
+            data: swapTxData,
+        };
+    }, []);
+    const addSwapTransaction = useCallback((tx) => {
+        const simplifiedTx = parseSwapTransaction(tx);
         if (simplifiedTx) {
             persistTransaction(simplifiedTx);
         }
-    };
-    const replaceNonceTx = (nonce, userAddress, tx) => {
-        const simplifiedTx = parseTransaction(tx);
+    }, [parseSwapTransaction, persistTransaction]);
+    const replaceSwapTransactionStatus = useCallback((params) => {
+        replaceTransactionStatus({
+            txType: HistoryTxType.SWAP,
+            status: params.status,
+            transactionId: params.transactionId,
+            statusResponse: formatSwapTxStatusResponseForStorage(params.statusResponse),
+        });
+    }, [replaceTransactionStatus]);
+    const replaceSwapTransactionNonce = useCallback((nonce, userAddress, tx) => {
+        const simplifiedTx = parseSwapTransaction(tx);
         if (simplifiedTx) {
-            replaceTransactionAtNonce(nonce, userAddress, simplifiedTx);
+            replaceTransactionAtNonce({
+                nonce,
+                fromAddress: userAddress,
+                newTx: simplifiedTx,
+            });
         }
-    };
-    const findHistoryItem = useCallback((transactionID) => {
-        return useHistoryStore
-            .getState()
-            .transactions?.find((th) => th.transactionId === transactionID);
-    }, []);
+    }, [parseSwapTransaction, replaceTransactionAtNonce]);
     const globalStatus = useMemo(() => {
         const statusPriority = [
             {
                 status: TransactionStatus.ERROR,
-                check: (tx) => tx.status === TransactionStatus.ERROR,
+                check: isHistoryTransactionFailed,
             },
             {
                 status: TransactionStatus.WARNING,
-                check: (tx) => tx.status === TransactionStatus.WARNING,
+                check: isHistoryTransactionWarning,
             },
             {
                 status: TransactionStatus.PENDING,
-                check: (tx) => [
-                    TransactionStatus.PENDING,
-                    TransactionStatus.ONGOING,
-                    TransactionStatus.INITIAL_LOADING,
-                ].includes(tx.status),
+                check: isHistoryTransactionPending,
             },
         ];
         for (const { status, check } of statusPriority) {
-            if (transactions.some(check)) {
+            if (filteredTransactions.some(check)) {
                 return status;
             }
         }
         return TransactionStatus.SUCCESS;
-    }, [transactions]);
+    }, [filteredTransactions]);
     return {
-        transactions,
-        addTransaction,
-        replaceTransactionStatus,
-        removeTransaction,
+        addSwapTransaction,
         globalStatus,
-        replaceNonceTx,
-        findHistoryItem,
-        parseTransaction,
+        replaceSwapTransactionNonce,
+        replaceSwapTransactionStatus,
         pendingTransactions,
     };
 };

package/dist/hooks/user/useHistory.js.map

@@ -1 +1 @@
-{"version":3,"file":"useHistory.js","sourceRoot":"","sources":["../../../src/hooks/user/useHistory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useHistory.js","sourceRoot":"","sources":["../../../src/hooks/user/useHistory.ts"],"names":[],"mappings":"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"}

package/dist/hooks/utils/useUtils.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Returns a debounced value that only updates after the specified delay
+ * @param value - The value to debounce
+ * @param delay - Delay in milliseconds
+ * @returns The debounced value
+ */
+export declare function useDebouncedValue<T>(value: T, delay: number): T;

package/dist/hooks/utils/useUtils.js

@@ -0,0 +1,20 @@
+import { useEffect, useState } from "react";
+/**
+ * Returns a debounced value that only updates after the specified delay
+ * @param value - The value to debounce
+ * @param delay - Delay in milliseconds
+ * @returns The debounced value
+ */
+export function useDebouncedValue(value, delay) {
+    const [debouncedValue, setDebouncedValue] = useState(value);
+    useEffect(() => {
+        const timeoutId = setTimeout(() => {
+            setDebouncedValue(value);
+        }, delay);
+        return () => {
+            clearTimeout(timeoutId);
+        };
+    }, [value, delay]);
+    return debouncedValue;
+}
+//# sourceMappingURL=useUtils.js.map

package/dist/hooks/utils/useUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useUtils.js","sourceRoot":"","sources":["../../../src/hooks/utils/useUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAI,KAAQ,EAAE,KAAa;IAC1D,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5D,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,EAAE,KAAK,CAAC,CAAC;QAEV,OAAO,GAAG,EAAE;YACV,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAEnB,OAAO,cAAc,CAAC;AACxB,CAAC"}

package/dist/hooks/wallet/useEns.d.ts

@@ -11,7 +11,6 @@ export declare function useEnsDataForAddress({ address, options, }: {
     address?: string;
     options?: QueryOptions;
 }): UseQueryResult<EnsData>;
-export declare function useDebouncedValue<T>(value: T, delay: number): T;
 /**
  * Search for ENS names.
  * Returns an exact match if the name is an ENS name, and multiple matches otherwise.

package/dist/hooks/wallet/useEns.js

@@ -1,7 +1,7 @@
 import { useQuery, } from "@tanstack/react-query";
-import { useEffect, useState } from "react";
 import { keys } from "../../core/queries/queries-keys";
 import { EnsService } from "../../services/external/ens";
+import { useDebouncedValue } from "../utils/useUtils";
 /**
  * Returns the ENS data of the given address
  *
@@ -17,18 +17,6 @@ export function useEnsDataForAddress({ address, options, }) {
     });
     return ensQuery;
 }
-export function useDebouncedValue(value, delay) {
-    const [debouncedValue, setDebouncedValue] = useState(value);
-    useEffect(() => {
-        const timeoutId = setTimeout(() => {
-            setDebouncedValue(value);
-        }, delay);
-        return () => {
-            clearTimeout(timeoutId);
-        };
-    }, [value, delay]);
-    return debouncedValue;
-}
 /**
  * Search for ENS names.
  * Returns an exact match if the name is an ENS name, and multiple matches otherwise.

package/dist/hooks/wallet/useEns.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEns.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useEns.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useEns.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useEns.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,GACT,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAOtD;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,EACnC,OAAO,EACP,OAAO,GAIR;IACC,MAAM,QAAQ,GAAG,QAAQ,CACvB,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,EACtC,GAAG,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAC/C;QACE,GAAG,OAAO;QACV,OAAO,EACL,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;YACxB,CAAC,OAAO,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;QAC3D,SAAS,EAAE,QAAQ;KACpB,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,EAC3B,IAAI,EACJ,OAAO,GAAG,IAAI,EACd,OAAO,GAAG,GAAG,GAKd;IACC,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE7E,MAAM,cAAc,GAAG,QAAQ,CAC7B,IAAI,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,EAC/B,GAAG,EAAE;QACH,MAAM,gBAAgB,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;QAExD,OAAO,gBAAgB;YACrB,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC;YACvC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC,EACD;QACE,OAAO,EAAE,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,IAAI,OAAO;QAClD,SAAS,EAAE,QAAQ;KACpB,CACF,CAAC;IAEF,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAE5E;;;GAGG;AACH,SAAS,eAAe,CAAC,OAAe,EAAE;IACxC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAExB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAElC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvC,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE5C,OAAO,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC"}

package/dist/hooks/wallet/useGnosisContext.js

@@ -1,9 +1,8 @@
 import SafeAppsSDK, { TransactionStatus as GnosisTransactionStatus, } from "@safe-global/safe-apps-sdk";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useAccount } from "wagmi";
-import { useSwapRoutePersistStore } from "../store/useSquidStore";
+import { areSameAddress } from "../../services/internal/walletService";
 import { useSwap } from "../swap/useSwap";
-import { useMultiChainWallet } from "./useMultiChainWallet";
 export const useGnosisContext = () => {
     const { connector, isConnected, address } = useAccount();
     const [isGnosisContext, setIsGnosisContext] = useState(false);
@@ -58,19 +57,16 @@ export const useGnosisContext = () => {
     };
 };
 export const useIsSameAddressAndGnosisContext = () => {
-    const { isGnosisContext } = useGnosisContext();
-    const { fromChain } = useSwap();
-    const { connectedAddress: sourceAddress } = useMultiChainWallet(fromChain);
-    const destinationAddress = useSwapRoutePersistStore((store) => store.swapRoute?.destinationAddress?.address);
+    const { isGnosisContext, gnosisAddress: gnosisSourceAddress } = useGnosisContext();
+    const { destinationAddress } = useSwap();
     /**
-     * Check if we are in a Gnosis Safe Context
-     * And if source wallet address = destination address
-     * If destinationAddress is not defined, it means that it's the same from the source
+     * Gnosis Safe addresses are not always the same on all chains
+     * We'll warn the user if they are trying to send to the same address
      */
     const isSameAddressAndGnosisContext = useMemo(() => {
-        const destAddressSameAsSource = sourceAddress === destinationAddress || destinationAddress === undefined;
+        const destAddressSameAsSource = areSameAddress(gnosisSourceAddress, destinationAddress.address);
         return isGnosisContext && destAddressSameAsSource;
-    }, [sourceAddress, destinationAddress, isGnosisContext]);
+    }, [gnosisSourceAddress, destinationAddress.address, isGnosisContext]);
     return {
         isSameAddressAndGnosisContext,
     };

package/dist/hooks/wallet/useGnosisContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGnosisContext.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useGnosisContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useGnosisContext.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useGnosisContext.ts"],"names":[],"mappings":"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"}

package/dist/hooks/wallet/useMultiChainWallet.d.ts

@@ -1,4 +1,5 @@
 import type { ChainData } from "@0xsquid/squid-types";
+import { ChainType } from "@0xsquid/squid-types";
 import { FullAddressData } from "../../core/types/wallet";
 export declare const useMultiChainWallet: (chain: ChainData | undefined) => {
     changeNetworkIfNeeded: import("@tanstack/react-query").UseMutationResult<boolean, any, void, unknown>;
@@ -7,4 +8,7 @@ export declare const useMultiChainWallet: (chain: ChainData | undefined) => {
     connectedAddress: FullAddressData;
     connectedEvmChain: ChainData | undefined;
     evmAddress: string | undefined;
+    isChainTypeConnected: (chainType: ChainType) => boolean;
+    checkNetworkAndSwitch: () => Promise<boolean>;
+    wallet: import("../../core/types/wallet").EvmWallet | import("../../core/types/wallet").CosmosWallet | import("../../core/types/wallet").SolanaWallet | import("../../core/types/wallet").BitcoinWallet | import("../../core/types/wallet").SuiWallet | import("../../core/types/wallet").XrplWallet | import("../../core/types/wallet").StellarWallet | undefined;
 };

package/dist/hooks/wallet/useMultiChainWallet.js

@@ -19,7 +19,9 @@ export const useMultiChainWallet = (chain) => {
     const evmAddress = connectedAddresses[ChainType.EVM];
     const bitcoinAddress = connectedAddresses[ChainType.BTC];
     const solanaAddress = connectedAddresses[ChainType.SOLANA];
-    const xrpAddress = connectedAddresses[ChainType.XRP];
+    const suiAddress = connectedAddresses[ChainType.SUI];
+    const xrplAddress = connectedAddresses[ChainType.XRPL];
+    const stellarAddress = connectedAddresses[ChainType.STELLAR];
     // Cosmos is a special case because the address changes on every chain
     // so we can't use the default cosmos connected address
     const { data: cosmosAddress } = useCosmosForChain(chain);
@@ -77,13 +79,33 @@ export const useMultiChainWallet = (chain) => {
                         chainType: chain.chainType,
                     }),
                 };
-            case ChainType.XRP:
-                if (!xrpAddress)
+            case ChainType.SUI:
+                if (!suiAddress)
                     return {};
                 return {
-                    address: xrpAddress,
+                    address: suiAddress,
                     formatted: formatHash({
-                        hash: xrpAddress,
+                        hash: suiAddress,
+                        chainType: chain.chainType,
+                    }),
+                };
+            case ChainType.XRPL:
+                if (!xrplAddress)
+                    return {};
+                return {
+                    address: xrplAddress,
+                    formatted: formatHash({
+                        hash: xrplAddress,
+                        chainType: chain.chainType,
+                    }),
+                };
+            case ChainType.STELLAR:
+                if (!stellarAddress)
+                    return {};
+                return {
+                    address: stellarAddress,
+                    formatted: formatHash({
+                        hash: stellarAddress,
                         chainType: chain.chainType,
                     }),
                 };
@@ -95,7 +117,9 @@ export const useMultiChainWallet = (chain) => {
         cosmosAddress,
         bitcoinAddress,
         solanaAddress,
-        xrpAddress,
+        suiAddress,
+        xrplAddress,
+        stellarAddress,
     ]);
     /**
      * Change current network for desired chain
@@ -163,6 +187,26 @@ export const useMultiChainWallet = (chain) => {
         }
         return true;
     }, [isChainTypeConnected, currentEvmChain, chain]);
+    const checkNetworkAndSwitch = useCallback(async () => {
+        if (!networkConnectedOnRightChain) {
+            try {
+                await changeNetworkIfNeeded.mutateAsync();
+                // Metamask is not popping the second modal if we don't wait a bit
+                // TODO: This is something that might be fixed by wagmiv2
+                await new Promise((resolve) => {
+                    setTimeout(resolve, 100);
+                });
+                return true;
+            }
+            catch (error) {
+                return false;
+            }
+        }
+        return true;
+    }, [networkConnectedOnRightChain, changeNetworkIfNeeded]);
+    const wallet = chain
+        ? connectedWalletsByChainType[chain.chainType].wallet
+        : undefined;
     return {
         changeNetworkIfNeeded,
         networkConnected,
@@ -170,6 +214,9 @@ export const useMultiChainWallet = (chain) => {
         connectedAddress,
         connectedEvmChain,
         evmAddress,
+        isChainTypeConnected,
+        checkNetworkAndSwitch,
+        wallet,
     };
 };
 //# sourceMappingURL=useMultiChainWallet.js.map

package/dist/hooks/wallet/useMultiChainWallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMultiChainWallet.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useMultiChainWallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useMultiChainWallet.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useMultiChainWallet.ts"],"names":[],"mappings":"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"}

package/dist/hooks/wallet/useSigner.d.ts

@@ -1,12 +1,15 @@
+import { ChainData } from "@0xsquid/squid-types";
+import { type JsonRpcSigner } from "ethers";
 import { type BitcoinConnector } from "../../core/connectors/bitcoin";
-export declare function useEthersSigner({ chainId }?: {
-    chainId?: number;
-}): import("ethers").JsonRpcSigner | undefined;
-export declare const useSigner: () => {
+export declare const useSigner: ({ chain }: {
+    chain: ChainData | undefined;
+}) => {
     isSignerReady: boolean;
-    evmSigner: import("ethers").JsonRpcSigner | undefined;
+    evmSigner: JsonRpcSigner | undefined;
     cosmosSigner: import("@cosmjs/proto-signing").OfflineSigner | undefined;
     bitcoinSigner: BitcoinConnector | undefined;
     solanaSigner: import("@solana/wallet-adapter-base").Adapter | undefined;
-    xrpSigner: import("../../core/types/wallet").XrpConnector | undefined;
+    suiSigner: import("../../core/types/sui").SuiConnector | undefined;
+    xrplSigner: import("../../core/types/xrpl").XrplConnector | undefined;
+    stellarSigner: import("../../core/types/stellar").StellarConnector | undefined;
 };

package/dist/hooks/wallet/useSigner.js

@@ -1,27 +1,33 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { useMemo } from "react";
 import { useAccount, useWalletClient } from "wagmi";
-import { PhantomConnector, UnisatConnector, } from "../../core/connectors/bitcoin";
-import { useCosmosContext } from "../../core/providers/CosmosProvider";
+import { KeplrConnector, PhantomConnector, UnisatConnector, } from "../../core/connectors/bitcoin";
 import { useSolanaContext } from "../../core/providers/SolanaProvider";
+import { useStellarContext } from "../../core/providers/StellarProvider";
+import { useSuiContext } from "../../core/providers/SuiProvider";
+import { useXrplContext } from "../../core/providers/XrplProvider";
 import { clientToSigner } from "../../core/wagmiConfig";
-import { useSwap } from "../swap/useSwap";
-import { useXrp } from "../xrp/useXrp";
+import { useCosmosSigner } from "../cosmos/useCosmos";
 import { useWallet } from "./useWallet";
-export function useEthersSigner({ chainId } = {}) {
+function useEvmSigner({ chainId }) {
     const { connector } = useAccount();
     const { data: client } = useWalletClient({ chainId, connector });
-    return useMemo(() => (client ? clientToSigner(client) : undefined), [client]);
+    const signer = useMemo(() => (client ? clientToSigner(client) : undefined), [client]);
+    return { signer };
 }
-export const useSigner = () => {
-    const { fromChain } = useSwap();
-    const evmSigner = useEthersSigner({ chainId: Number(fromChain?.chainId) });
-    const { cosmosSigner } = useCosmosContext();
+export const useSigner = ({ chain }) => {
+    const evmChainId = chain?.chainType === ChainType.EVM ? Number(chain.chainId) : undefined;
+    // EVM and Cosmos need a different signer for each chain
+    // This is not the case for Solana or Bitcoin as there's only one chain in those ecosystems
+    const { signer: evmSigner } = useEvmSigner({ chainId: evmChainId });
+    const { signer: cosmosSigner } = useCosmosSigner({ chain });
     const { signer: solanaSigner } = useSolanaContext();
-    const { signer: xrpSigner } = useXrp();
+    const { signer: suiSigner } = useSuiContext();
+    const { signer: xrplSigner } = useXrplContext();
+    const { signer: stellarSigner } = useStellarContext();
     const { connectedWalletsByChainType } = useWallet();
-    const connectedSourceWallet = fromChain?.chainType
-        ? connectedWalletsByChainType[fromChain.chainType]
+    const connectedSourceWallet = chain?.chainType
+        ? connectedWalletsByChainType[chain.chainType]
         : undefined;
     const bitcoinSigner = useMemo(() => {
         switch (connectedSourceWallet?.wallet?.connectorId) {
@@ -31,17 +37,22 @@ export const useSigner = () => {
             case "phantom": {
                 return new PhantomConnector();
             }
+            case "keplr": {
+                return new KeplrConnector();
+            }
         }
     }, [connectedSourceWallet?.wallet?.connectorId]);
     const isEvmSignerReady = !!evmSigner;
-    const isCosmosSignerReady = !!cosmosSigner;
     const isSolanaSignerReady = !!solanaSigner;
+    const isCosmosSignerReady = !!cosmosSigner;
     const isBitcoinSignerReady = !!bitcoinSigner;
-    const isXrpSignerReady = !!xrpSigner;
+    const isSuiSignerReady = !!suiSigner;
+    const isXrplSignerReady = !!xrplSigner;
+    const isStellarSignerReady = !!stellarSigner;
     const isSignerReady = useMemo(() => {
-        if (!fromChain?.chainType)
+        if (!chain?.chainType)
             return false;
-        switch (fromChain.chainType) {
+        switch (chain.chainType) {
             case ChainType.EVM:
                 return isEvmSignerReady;
             case ChainType.COSMOS:
@@ -50,16 +61,22 @@ export const useSigner = () => {
                 return isBitcoinSignerReady;
             case ChainType.SOLANA:
                 return isSolanaSignerReady;
-            case ChainType.XRP:
-                return isXrpSignerReady;
+            case ChainType.SUI:
+                return isSuiSignerReady;
+            case ChainType.XRPL:
+                return isXrplSignerReady;
+            case ChainType.STELLAR:
+                return isStellarSignerReady;
         }
     }, [
-        fromChain?.chainType,
+        chain?.chainType,
         isEvmSignerReady,
         isCosmosSignerReady,
         isBitcoinSignerReady,
         isSolanaSignerReady,
-        isXrpSignerReady,
+        isSuiSignerReady,
+        isXrplSignerReady,
+        isStellarSignerReady,
     ]);
     return {
         isSignerReady,
@@ -67,7 +84,9 @@ export const useSigner = () => {
         cosmosSigner,
         bitcoinSigner,
         solanaSigner,
-        xrpSigner,
+        suiSigner,
+        xrplSigner,
+        stellarSigner,
     };
 };
 //# sourceMappingURL=useSigner.js.map

package/dist/hooks/wallet/useSigner.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSigner.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useSigner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useSigner.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useSigner.ts"],"names":[],"mappings":"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"}