@0xsquid/react-hooks 7.1.1-wallets-refactor-beta.0 → 7.1.1-xrpl-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (211) hide show
  1. package/dist/core/client/index.d.ts +2 -0
  2. package/dist/core/client/index.js +3 -0
  3. package/dist/core/client/index.js.map +1 -1
  4. package/dist/core/connectors/bitcoin/index.d.ts +8 -0
  5. package/dist/core/connectors/bitcoin/wallets/keplr.d.ts +1 -1
  6. package/dist/core/connectors/bitcoin/wallets/phantom.d.ts +1 -1
  7. package/dist/core/connectors/bitcoin/wallets/unisat.d.ts +1 -1
  8. package/dist/core/connectors/xrpl/CrossMark.d.ts +13 -0
  9. package/dist/core/connectors/xrpl/CrossMark.js +76 -0
  10. package/dist/core/connectors/xrpl/CrossMark.js.map +1 -0
  11. package/dist/core/connectors/xrpl/Xaman.d.ts +16 -0
  12. package/dist/core/connectors/xrpl/Xaman.js +80 -0
  13. package/dist/core/connectors/xrpl/Xaman.js.map +1 -0
  14. package/dist/core/connectors/xrpl/XamanQr.d.ts +15 -0
  15. package/dist/core/connectors/xrpl/XamanQr.js +78 -0
  16. package/dist/core/connectors/xrpl/XamanQr.js.map +1 -0
  17. package/dist/core/connectors/xrpl/XrplMetamaskSnap.d.ts +35 -0
  18. package/dist/core/connectors/xrpl/XrplMetamaskSnap.js +177 -0
  19. package/dist/core/connectors/xrpl/XrplMetamaskSnap.js.map +1 -0
  20. package/dist/core/constants.d.ts +6 -5
  21. package/dist/core/constants.js +16 -5
  22. package/dist/core/constants.js.map +1 -1
  23. package/dist/core/index.d.ts +1 -1
  24. package/dist/core/index.js +1 -1
  25. package/dist/core/index.js.map +1 -1
  26. package/dist/core/multicall3.d.ts +5 -1
  27. package/dist/core/multicall3.js +21 -1
  28. package/dist/core/multicall3.js.map +1 -1
  29. package/dist/core/providers/SolanaProvider.d.ts +15 -10
  30. package/dist/core/providers/SolanaProvider.js.map +1 -1
  31. package/dist/core/providers/SuiProvider.d.ts +0 -1
  32. package/dist/core/providers/SuiProvider.js.map +1 -1
  33. package/dist/core/providers/XrplProvider.d.ts +17 -0
  34. package/dist/core/providers/XrplProvider.js +15 -0
  35. package/dist/core/providers/XrplProvider.js.map +1 -0
  36. package/dist/core/queries/queries-keys.d.ts +9 -1
  37. package/dist/core/queries/queries-keys.js +33 -0
  38. package/dist/core/queries/queries-keys.js.map +1 -1
  39. package/dist/core/types/event.d.ts +7 -0
  40. package/dist/core/types/index.d.ts +2 -1
  41. package/dist/core/types/index.js +2 -1
  42. package/dist/core/types/index.js.map +1 -1
  43. package/dist/core/types/sui.d.ts +2 -3
  44. package/dist/core/types/wallet.d.ts +36 -17
  45. package/dist/core/types/wallet.js +19 -0
  46. package/dist/core/types/wallet.js.map +1 -1
  47. package/dist/core/types/xrpl.d.ts +70 -0
  48. package/dist/core/types/xrpl.js +20 -0
  49. package/dist/core/types/xrpl.js.map +1 -0
  50. package/dist/core/wagmiConfig.js +1 -14
  51. package/dist/core/wagmiConfig.js.map +1 -1
  52. package/dist/core/wallets.d.ts +3 -1
  53. package/dist/core/wallets.js +387 -18
  54. package/dist/core/wallets.js.map +1 -1
  55. package/dist/hooks/index.d.ts +2 -0
  56. package/dist/hooks/index.js +2 -0
  57. package/dist/hooks/index.js.map +1 -1
  58. package/dist/hooks/solana/useSolana.d.ts +9 -2
  59. package/dist/hooks/solana/useSolana.js +84 -61
  60. package/dist/hooks/solana/useSolana.js.map +1 -1
  61. package/dist/hooks/store/useAddressBookStore.d.ts +1 -1
  62. package/dist/hooks/store/useAddressBookStore.js +6 -2
  63. package/dist/hooks/store/useAddressBookStore.js.map +1 -1
  64. package/dist/hooks/store/useWalletStore.d.ts +3 -0
  65. package/dist/hooks/store/useWalletStore.js +1 -5
  66. package/dist/hooks/store/useWalletStore.js.map +1 -1
  67. package/dist/hooks/sui/useSui.js +6 -61
  68. package/dist/hooks/sui/useSui.js.map +1 -1
  69. package/dist/hooks/sui/useSuiWallets.d.ts +3 -0
  70. package/dist/hooks/sui/useSuiWallets.js +37 -18
  71. package/dist/hooks/sui/useSuiWallets.js.map +1 -1
  72. package/dist/hooks/tokens/useAllConnectedWalletBalances.js +11 -0
  73. package/dist/hooks/tokens/useAllConnectedWalletBalances.js.map +1 -1
  74. package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js +13 -2
  75. package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js.map +1 -1
  76. package/dist/hooks/tokens/useBalance.d.ts +1 -0
  77. package/dist/hooks/tokens/useBalance.js +22 -1
  78. package/dist/hooks/tokens/useBalance.js.map +1 -1
  79. package/dist/hooks/tokens/useMultiChainBalance.js +10 -1
  80. package/dist/hooks/tokens/useMultiChainBalance.js.map +1 -1
  81. package/dist/hooks/tokens/useNativeBalance.d.ts +1 -0
  82. package/dist/hooks/tokens/useNativeBalance.js +33 -1
  83. package/dist/hooks/tokens/useNativeBalance.js.map +1 -1
  84. package/dist/hooks/tokens/useNativeTokenForChain.js +3 -1
  85. package/dist/hooks/tokens/useNativeTokenForChain.js.map +1 -1
  86. package/dist/hooks/tokens/useSquidTokens.d.ts +1 -0
  87. package/dist/hooks/tokens/useSquidTokens.js +6 -1
  88. package/dist/hooks/tokens/useSquidTokens.js.map +1 -1
  89. package/dist/hooks/transaction/send/useSendTransaction.d.ts +1 -1
  90. package/dist/hooks/transaction/send/useSendTransaction.js +28 -3
  91. package/dist/hooks/transaction/send/useSendTransaction.js.map +1 -1
  92. package/dist/hooks/transaction/useAllTransactionsStatus.js +7 -0
  93. package/dist/hooks/transaction/useAllTransactionsStatus.js.map +1 -1
  94. package/dist/hooks/transaction/useExecuteTransaction.d.ts +1 -0
  95. package/dist/hooks/transaction/useExecuteTransaction.js +60 -6
  96. package/dist/hooks/transaction/useExecuteTransaction.js.map +1 -1
  97. package/dist/hooks/transaction/useSendTransactionStatus.js +14 -4
  98. package/dist/hooks/transaction/useSendTransactionStatus.js.map +1 -1
  99. package/dist/hooks/wallet/useAutoConnect.js +6 -13
  100. package/dist/hooks/wallet/useAutoConnect.js.map +1 -1
  101. package/dist/hooks/wallet/useMultiChainWallet.d.ts +1 -0
  102. package/dist/hooks/wallet/useMultiChainWallet.js +16 -0
  103. package/dist/hooks/wallet/useMultiChainWallet.js.map +1 -1
  104. package/dist/hooks/wallet/useSigner.d.ts +4 -2
  105. package/dist/hooks/wallet/useSigner.js +26 -2
  106. package/dist/hooks/wallet/useSigner.js.map +1 -1
  107. package/dist/hooks/wallet/useWallet.d.ts +40 -4
  108. package/dist/hooks/wallet/useWallet.js +89 -11
  109. package/dist/hooks/wallet/useWallet.js.map +1 -1
  110. package/dist/hooks/wallet/useWallets.d.ts +31 -1
  111. package/dist/hooks/wallet/useWallets.js +23 -15
  112. package/dist/hooks/wallet/useWallets.js.map +1 -1
  113. package/dist/hooks/xrpl/useXrpl.d.ts +2 -0
  114. package/dist/hooks/xrpl/useXrpl.js +21 -0
  115. package/dist/hooks/xrpl/useXrpl.js.map +1 -0
  116. package/dist/hooks/xrpl/useXrplTrustLine.d.ts +17 -0
  117. package/dist/hooks/xrpl/useXrplTrustLine.js +136 -0
  118. package/dist/hooks/xrpl/useXrplTrustLine.js.map +1 -0
  119. package/dist/hooks/xrpl/useXrplWallets.d.ts +4 -0
  120. package/dist/hooks/xrpl/useXrplWallets.js +46 -0
  121. package/dist/hooks/xrpl/useXrplWallets.js.map +1 -0
  122. package/dist/provider/index.js +4 -6
  123. package/dist/provider/index.js.map +1 -1
  124. package/dist/services/external/rpcService.d.ts +2 -0
  125. package/dist/services/external/rpcService.js +30 -4
  126. package/dist/services/external/rpcService.js.map +1 -1
  127. package/dist/services/external/websocket.d.ts +6 -0
  128. package/dist/services/external/websocket.js +34 -0
  129. package/dist/services/external/websocket.js.map +1 -0
  130. package/dist/services/external/xaman.d.ts +30 -0
  131. package/dist/services/external/xaman.js +46 -0
  132. package/dist/services/external/xaman.js.map +1 -0
  133. package/dist/services/external/xrplRpcClient.d.ts +39 -0
  134. package/dist/services/external/xrplRpcClient.js +167 -0
  135. package/dist/services/external/xrplRpcClient.js.map +1 -0
  136. package/dist/services/index.d.ts +1 -0
  137. package/dist/services/index.js +1 -0
  138. package/dist/services/index.js.map +1 -1
  139. package/dist/services/internal/assetsService.js +5 -0
  140. package/dist/services/internal/assetsService.js.map +1 -1
  141. package/dist/services/internal/bitcoinService.d.ts +3 -0
  142. package/dist/services/internal/bitcoinService.js +31 -0
  143. package/dist/services/internal/bitcoinService.js.map +1 -1
  144. package/dist/services/internal/errorService.js +1 -1
  145. package/dist/services/internal/errorService.js.map +1 -1
  146. package/dist/services/internal/eventService.d.ts +15 -0
  147. package/dist/services/internal/eventService.js +21 -0
  148. package/dist/services/internal/eventService.js.map +1 -1
  149. package/dist/services/internal/evmService.d.ts +7 -8
  150. package/dist/services/internal/evmService.js +12 -29
  151. package/dist/services/internal/evmService.js.map +1 -1
  152. package/dist/services/internal/sendTransaction.d.ts +9 -3
  153. package/dist/services/internal/sendTransaction.js +46 -1
  154. package/dist/services/internal/sendTransaction.js.map +1 -1
  155. package/dist/services/internal/sendTransactionStatus.js +16 -0
  156. package/dist/services/internal/sendTransactionStatus.js.map +1 -1
  157. package/dist/services/internal/solanaService.d.ts +7 -7
  158. package/dist/services/internal/solanaService.js +10 -40
  159. package/dist/services/internal/solanaService.js.map +1 -1
  160. package/dist/services/internal/suiService.d.ts +11 -1
  161. package/dist/services/internal/suiService.js +58 -20
  162. package/dist/services/internal/suiService.js.map +1 -1
  163. package/dist/services/internal/transactionService.js +4 -2
  164. package/dist/services/internal/transactionService.js.map +1 -1
  165. package/dist/services/internal/transactionStatusService.js +2 -1
  166. package/dist/services/internal/transactionStatusService.js.map +1 -1
  167. package/dist/services/internal/walletService.d.ts +30 -18
  168. package/dist/services/internal/walletService.js +78 -127
  169. package/dist/services/internal/walletService.js.map +1 -1
  170. package/dist/services/internal/xrplService.d.ts +17 -0
  171. package/dist/services/internal/xrplService.js +50 -0
  172. package/dist/services/internal/xrplService.js.map +1 -0
  173. package/dist/tests/walletService.test.js +18 -242
  174. package/dist/tests/walletService.test.js.map +1 -1
  175. package/package.json +7 -5
  176. package/dist/core/providers/BitcoinProvider.d.ts +0 -17
  177. package/dist/core/providers/BitcoinProvider.js +0 -15
  178. package/dist/core/providers/BitcoinProvider.js.map +0 -1
  179. package/dist/core/providers/EvmProvider.d.ts +0 -20
  180. package/dist/core/providers/EvmProvider.js +0 -15
  181. package/dist/core/providers/EvmProvider.js.map +0 -1
  182. package/dist/core/types/bitcoin.d.ts +0 -8
  183. package/dist/core/types/bitcoin.js +0 -2
  184. package/dist/core/types/bitcoin.js.map +0 -1
  185. package/dist/core/types/evm.d.ts +0 -2
  186. package/dist/core/types/evm.js +0 -2
  187. package/dist/core/types/evm.js.map +0 -1
  188. package/dist/core/types/solana.d.ts +0 -2
  189. package/dist/core/types/solana.js +0 -2
  190. package/dist/core/types/solana.js.map +0 -1
  191. package/dist/hooks/bitcoin/useBitcoin.d.ts +0 -2
  192. package/dist/hooks/bitcoin/useBitcoin.js +0 -19
  193. package/dist/hooks/bitcoin/useBitcoin.js.map +0 -1
  194. package/dist/hooks/bitcoin/useBitcoinWallets.d.ts +0 -4
  195. package/dist/hooks/bitcoin/useBitcoinWallets.js +0 -10
  196. package/dist/hooks/bitcoin/useBitcoinWallets.js.map +0 -1
  197. package/dist/hooks/evm/useEvm.d.ts +0 -2
  198. package/dist/hooks/evm/useEvm.js +0 -55
  199. package/dist/hooks/evm/useEvm.js.map +0 -1
  200. package/dist/hooks/evm/useEvmWallets.d.ts +0 -7
  201. package/dist/hooks/evm/useEvmWallets.js +0 -16
  202. package/dist/hooks/evm/useEvmWallets.js.map +0 -1
  203. package/dist/hooks/solana/useSolanaWallets.d.ts +0 -4
  204. package/dist/hooks/solana/useSolanaWallets.js +0 -8
  205. package/dist/hooks/solana/useSolanaWallets.js.map +0 -1
  206. package/dist/hooks/wallet/useStandardWallets.d.ts +0 -9
  207. package/dist/hooks/wallet/useStandardWallets.js +0 -26
  208. package/dist/hooks/wallet/useStandardWallets.js.map +0 -1
  209. package/dist/services/internal/walletStandardService.d.ts +0 -17
  210. package/dist/services/internal/walletStandardService.js +0 -126
  211. package/dist/services/internal/walletStandardService.js.map +0 -1
@@ -12,6 +12,7 @@ export { useFavoriteTokensStore, type FavoriteToken, } from "./store/useFavorite
12
12
  export { useHistoryStore } from "./store/useHistoryStore";
13
13
  export { useSendTransactionStore } from "./store/useSendTransactionStore";
14
14
  export { useConfigStore, useSquidStore, useSwapRoutePersistStore, useTransactionStore, } from "./store/useSquidStore";
15
+ export { ConnectingWalletStatus } from "./store/useWalletStore";
15
16
  export { useDepositAddress } from "./swap/useDepositAddress";
16
17
  export { useSwap } from "./swap/useSwap";
17
18
  export { useAllConnectedWalletBalances } from "./tokens/useAllConnectedWalletBalances";
@@ -49,3 +50,4 @@ export { useMultiChainWallet } from "./wallet/useMultiChainWallet";
49
50
  export { useSigner } from "./wallet/useSigner";
50
51
  export { useWallet } from "./wallet/useWallet";
51
52
  export { useWallets } from "./wallet/useWallets";
53
+ export { useXrplTrustLine } from "./xrpl/useXrplTrustLine";
@@ -12,6 +12,7 @@ export { useFavoriteTokensStore, } from "./store/useFavoriteTokensStore";
12
12
  export { useHistoryStore } from "./store/useHistoryStore";
13
13
  export { useSendTransactionStore } from "./store/useSendTransactionStore";
14
14
  export { useConfigStore, useSquidStore, useSwapRoutePersistStore, useTransactionStore, } from "./store/useSquidStore";
15
+ export { ConnectingWalletStatus } from "./store/useWalletStore";
15
16
  export { useDepositAddress } from "./swap/useDepositAddress";
16
17
  export { useSwap } from "./swap/useSwap";
17
18
  export { useAllConnectedWalletBalances } from "./tokens/useAllConnectedWalletBalances";
@@ -49,4 +50,5 @@ export { useMultiChainWallet } from "./wallet/useMultiChainWallet";
49
50
  export { useSigner } from "./wallet/useSigner";
50
51
  export { useWallet } from "./wallet/useWallet";
51
52
  export { useWallets } from "./wallet/useWallets";
53
+ export { useXrplTrustLine } from "./xrpl/useXrplTrustLine";
52
54
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,11 @@
1
- import { Connection } from "@solana/web3.js";
1
+ import { Adapter } from "@solana/wallet-adapter-base";
2
+ import { Connection, PublicKey } from "@solana/web3.js";
2
3
  import { ISolanaContextData } from "../../core/providers/SolanaProvider";
3
- export declare function useSolana(): ISolanaContextData;
4
+ export interface SolanaWalletEvents {
5
+ connect(publicKey: PublicKey): void;
6
+ disconnect(): void;
7
+ accountChanged(publicKey: PublicKey | null): void;
8
+ }
9
+ export type SolanaWalletAdapter = Adapter;
10
+ export declare const useSolana: () => ISolanaContextData;
4
11
  export declare const useSolanaConnection: () => Connection;
@@ -1,81 +1,104 @@
1
1
  import { ChainType } from "@0xsquid/squid-types";
2
+ import { PhantomWalletAdapter } from "@solana/wallet-adapter-phantom";
2
3
  import { Connection } from "@solana/web3.js";
3
4
  import { useMutation } from "@tanstack/react-query";
4
- import { useCallback, useEffect, useRef } from "react";
5
+ import { useCallback, useEffect, useMemo, useRef } from "react";
5
6
  import { SOLANA_RPC_URL } from "../../core/constants";
6
- import { RecentWalletStorage } from "../../services";
7
+ import { getWalletWindowProvider } from "../../services/internal/walletService";
8
+ import { useClient } from "../client/useClient";
7
9
  import { useWalletStore } from "../store/useWalletStore";
8
- import { useSolanaWallets } from "./useSolanaWallets";
9
- export function useSolana() {
10
- const disconnectWallet = useWalletStore((store) => store.disconnectWallet);
11
- const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
12
- const { wallets } = useSolanaWallets();
13
- const connectedSolanaWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SOLANA]);
10
+ export const useSolana = () => {
11
+ // Get current Solana wallet state from global store
12
+ const solanaWalletState = useWalletStore((state) => state.connectedWalletsByChainType[ChainType.SOLANA]);
13
+ const solanaAddress = solanaWalletState.address;
14
+ const isConnected = !!solanaAddress;
15
+ const solanaConnectedWallet = solanaWalletState.wallet;
16
+ const { clientWindow, isClient } = useClient();
17
+ const window = clientWindow;
18
+ const { setConnectedWallet, disconnectWallet } = useWalletStore();
19
+ // Safely access wallet provider from window object
20
+ const solanaWalletObject = useMemo(() => {
21
+ if (isClient && solanaConnectedWallet?.windowFlag) {
22
+ return getWalletWindowProvider(window, solanaConnectedWallet, ChainType.SOLANA);
23
+ }
24
+ return undefined;
25
+ }, [solanaConnectedWallet, isClient, window]);
14
26
  const connectSolana = useMutation(async ({ wallet, }) => {
15
- try {
16
- // try to connect silently first
17
- await wallet.connector.autoConnect();
27
+ const selectedWallet = wallet ?? solanaConnectedWallet;
28
+ if (!selectedWallet) {
29
+ return undefined;
30
+ }
31
+ const walletObject = getWalletWindowProvider(window, selectedWallet, ChainType.SOLANA);
32
+ if (!walletObject) {
33
+ return undefined;
18
34
  }
19
- catch {
20
- // if auto-connect fails (e.g. not authorized yet)
21
- // fallback to connect via popup
22
- await wallet.connector.connect();
35
+ const response = await walletObject.connect();
36
+ const address = response.publicKey.toString();
37
+ if (address) {
38
+ setConnectedWallet(ChainType.SOLANA, {
39
+ wallet: selectedWallet,
40
+ address,
41
+ });
42
+ return address;
23
43
  }
24
- const address = wallet.connector.wallet.accounts[0].address;
25
- return {
26
- wallet,
27
- address,
28
- };
44
+ return undefined;
29
45
  });
30
- const disconnectSolana = useCallback(async () => {
31
- await connectedSolanaWallet.wallet?.connector.disconnect();
32
- }, [connectedSolanaWallet.wallet?.connector]);
33
- const autoConnectSolana = useCallback(async () => {
34
- const recentSolanaWalletId = RecentWalletStorage.get(ChainType.SOLANA);
35
- const recentSolanaWallet = wallets.find((w) => w.connectorId === recentSolanaWalletId);
36
- if (!recentSolanaWallet) {
37
- return;
46
+ // Clear wallet connection data
47
+ const clearData = useCallback(() => {
48
+ disconnectWallet(ChainType.SOLANA);
49
+ }, [disconnectWallet]);
50
+ // Handle wallet account changes (e.g., user switches accounts)
51
+ const handleAccountChange = useCallback((_publicKey) => {
52
+ let publicKey = _publicKey?.toString();
53
+ // Inconsistent behavior on different wallets
54
+ // Try to parse response to handle both PublicKey and { publicKey: PublicKey }
55
+ const parsedPublicKey = _publicKey?.publicKey;
56
+ if (typeof parsedPublicKey === "string") {
57
+ publicKey = parsedPublicKey;
58
+ }
59
+ if (publicKey && solanaConnectedWallet) {
60
+ setConnectedWallet(ChainType.SOLANA, {
61
+ wallet: solanaConnectedWallet,
62
+ address: publicKey,
63
+ });
64
+ }
65
+ else {
66
+ clearData();
38
67
  }
39
- await recentSolanaWallet.connector.autoConnect();
40
- const [account] = recentSolanaWallet.connector.wallet.accounts;
41
- setConnectedWallet(ChainType.SOLANA, {
42
- wallet: recentSolanaWallet,
43
- address: account.address,
44
- });
45
- // eslint-disable-next-line react-hooks/exhaustive-deps
46
- }, [wallets.map((w) => w.connectorId)]);
68
+ }, [clearData, setConnectedWallet, solanaConnectedWallet]);
69
+ // Set up event listeners for wallet account changes
47
70
  useEffect(() => {
48
- const wallet = connectedSolanaWallet.wallet;
49
- if (!wallet) {
50
- return;
71
+ if (solanaWalletObject) {
72
+ solanaWalletObject.on("connect", handleAccountChange);
73
+ return () => {
74
+ solanaWalletObject.off("connect", handleAccountChange);
75
+ };
51
76
  }
52
- function onConnect(newAddress) {
53
- if (wallet) {
54
- setConnectedWallet(ChainType.SOLANA, {
55
- wallet,
56
- address: newAddress.toString(),
57
- });
58
- }
77
+ }, [solanaWalletObject, handleAccountChange]);
78
+ const signer = useMemo(() => {
79
+ if (!solanaWalletObject || !solanaAddress) {
80
+ return undefined;
59
81
  }
60
- function onDisconnect() {
61
- disconnectWallet(ChainType.SOLANA);
82
+ if (solanaConnectedWallet?.name.toLowerCase() === "phantom" ||
83
+ "isPhantom" in solanaWalletObject) {
84
+ const phantomAdapter = new PhantomWalletAdapter();
85
+ if (!phantomAdapter.connected && solanaAddress) {
86
+ phantomAdapter.connect().catch(console.error);
87
+ }
88
+ return phantomAdapter;
62
89
  }
63
- wallet.connector.on("connect", onConnect);
64
- wallet.connector.on("disconnect", onDisconnect);
65
- return () => {
66
- wallet.connector.off("connect", onConnect);
67
- wallet.connector.off("disconnect", onDisconnect);
68
- };
69
- }, [disconnectWallet, setConnectedWallet, connectedSolanaWallet.wallet]);
90
+ return solanaWalletObject;
91
+ }, [solanaWalletObject, solanaAddress, solanaConnectedWallet]);
70
92
  return {
71
93
  connectSolana,
72
- disconnectSolana,
73
- autoConnectSolana,
74
- isConnected: !!connectedSolanaWallet.wallet,
75
- signer: connectedSolanaWallet.wallet?.connector,
76
- wallets,
94
+ isConnected,
95
+ clearData,
96
+ solanaWalletObject,
97
+ solanaAddress,
98
+ signer,
99
+ wallet: solanaConnectedWallet,
77
100
  };
78
- }
101
+ };
79
102
  export const useSolanaConnection = () => {
80
103
  const connectionRef = useRef(new Connection(SOLANA_RPC_URL));
81
104
  return connectionRef.current;
@@ -1 +1 @@
1
- {"version":3,"file":"useSolana.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolana.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useSolana.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolana.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { AddressWithEns } from "../../core/types/wallet";
2
2
  interface AddressBookStore {
3
3
  addressBook: AddressWithEns[];
4
4
  add(addressData: AddressWithEns): void;
5
- remove(address: string): void;
5
+ remove(addressData: Pick<AddressWithEns, "address" | "chainType">): void;
6
6
  }
7
7
  export declare const useAddressBookStore: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<AddressBookStore>, "persist"> & {
8
8
  persist: {
@@ -5,7 +5,10 @@ export const useAddressBookStore = create(persist((set) => ({
5
5
  addressBook: [],
6
6
  add: (newAddressData) => {
7
7
  set((state) => {
8
- const alreadyExists = state.addressBook.some((savedAddress) => areSameAddress(savedAddress.address, newAddressData.address));
8
+ const alreadyExists = state.addressBook.some((savedAddress) => {
9
+ return (savedAddress.chainType === newAddressData.chainType &&
10
+ areSameAddress(savedAddress.address, newAddressData.address));
11
+ });
9
12
  if (alreadyExists)
10
13
  return state;
11
14
  return {
@@ -16,7 +19,8 @@ export const useAddressBookStore = create(persist((set) => ({
16
19
  remove: (addressToRemove) => {
17
20
  set((state) => {
18
21
  return {
19
- addressBook: state.addressBook.filter((savedAddress) => !areSameAddress(savedAddress.address, addressToRemove)),
22
+ addressBook: state.addressBook.filter((savedAddress) => savedAddress.chainType !== addressToRemove.chainType ||
23
+ !areSameAddress(savedAddress.address, addressToRemove.address)),
20
24
  };
21
25
  });
22
26
  },
@@ -1 +1 @@
1
- {"version":3,"file":"useAddressBookStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useAddressBookStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQhD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CACvC,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,WAAW,EAAE,EAAE;IACf,GAAG,EAAE,CAAC,cAA8B,EAAE,EAAE;QACtC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAC5D,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAC7D,CAAC;YAEF,IAAI,aAAa;gBAAE,OAAO,KAAK,CAAC;YAEhC,OAAO;gBACL,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC;aACpD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,CAAC,eAAuB,EAAE,EAAE;QAClC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,OAAO;gBACL,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CACnC,CAAC,YAAY,EAAE,EAAE,CACf,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,CACzD;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,EACF;IACE,IAAI,EAAE,yBAAyB;CAChC,CACF,CACF,CAAC"}
1
+ {"version":3,"file":"useAddressBookStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useAddressBookStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQhD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CACvC,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,WAAW,EAAE,EAAE;IACf,GAAG,EAAE,CAAC,cAAc,EAAE,EAAE;QACtB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;gBAC5D,OAAO,CACL,YAAY,CAAC,SAAS,KAAK,cAAc,CAAC,SAAS;oBACnD,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAC7D,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,aAAa;gBAAE,OAAO,KAAK,CAAC;YAEhC,OAAO;gBACL,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC;aACpD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,CAAC,eAAe,EAAE,EAAE;QAC1B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,OAAO;gBACL,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CACnC,CAAC,YAAY,EAAE,EAAE,CACf,YAAY,CAAC,SAAS,KAAK,eAAe,CAAC,SAAS;oBACpD,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CACjE;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,EACF;IACE,IAAI,EAAE,yBAAyB;CAChC,CACF,CACF,CAAC"}
@@ -9,6 +9,9 @@ export declare enum ConnectingWalletStatus {
9
9
  export interface ConnectingWalletState {
10
10
  wallet: Wallet | undefined;
11
11
  status: ConnectingWalletStatus;
12
+ qrData?: {
13
+ matrix: boolean[][];
14
+ };
12
15
  }
13
16
  interface WalletState {
14
17
  connectedWalletsByChainType: {
@@ -1,6 +1,5 @@
1
1
  import { ChainType } from "@0xsquid/squid-types";
2
2
  import { create } from "zustand";
3
- import { isEmptyObject, RecentWalletStorage } from "../../services";
4
3
  export var ConnectingWalletStatus;
5
4
  (function (ConnectingWalletStatus) {
6
5
  ConnectingWalletStatus[ConnectingWalletStatus["IDLE"] = 0] = "IDLE";
@@ -21,7 +20,6 @@ const initialWalletState = {
21
20
  export const useWalletStore = create((set) => ({
22
21
  ...initialWalletState,
23
22
  setConnectedWallet: (chainType, connectedWalletState) => set((state) => {
24
- RecentWalletStorage.set(chainType, connectedWalletState.wallet.connectorId);
25
23
  return {
26
24
  connectedWalletsByChainType: {
27
25
  ...state.connectedWalletsByChainType,
@@ -31,10 +29,8 @@ export const useWalletStore = create((set) => ({
31
29
  }),
32
30
  setConnectingWallet: (state) => set({ connectingWalletState: state }),
33
31
  disconnectWallet: (chainType) => set((state) => {
34
- if (isEmptyObject(state.connectedWalletsByChainType[chainType])) {
32
+ if (!state.connectedWalletsByChainType[chainType])
35
33
  return state;
36
- }
37
- RecentWalletStorage.remove(chainType);
38
34
  return {
39
35
  connectedWalletsByChainType: {
40
36
  ...state.connectedWalletsByChainType,
@@ -1 +1 @@
1
- {"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEpE,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;AACV,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC;AAcD,MAAM,kBAAkB,GAAgB;IACtC,uDAAuD;IACvD,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,GAAG;QACN,CAAC,SAAS,CAAC,EAAE,EAAE;KAChB,CAAC,EACF,EAAgD,CACjD;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CASlC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACV,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,EAAE,CACtD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,mBAAmB,CAAC,GAAG,CACrB,SAAS,EACT,oBAAoB,CAAC,MAAM,CAAC,WAAW,CACxC,CAAC;QAEF,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,oBAAoB;aAClC;SACF,CAAC;IACJ,CAAC,CAAC;IACJ,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,aAAa,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC,EAAE;YAC/D,OAAO,KAAK,CAAC;SACd;QAED,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEtC,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE;aAChB;SACF,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;AACV,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC;AAiBD,MAAM,kBAAkB,GAAgB;IACtC,uDAAuD;IACvD,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,GAAG;QACN,CAAC,SAAS,CAAC,EAAE,EAAE;KAChB,CAAC,EACF,EAAgD,CACjD;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CASlC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACV,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,EAAE,CACtD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,oBAAoB;aAClC;SACF,CAAC;IACJ,CAAC,CAAC;IACJ,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC;YAAE,OAAO,KAAK,CAAC;QAEhE,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE;aAChB;SACF,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,CAAC,CAAC"}
@@ -1,82 +1,27 @@
1
1
  import { ChainType } from "@0xsquid/squid-types";
2
2
  import { useMutation } from "@tanstack/react-query";
3
- import { useCallback, useEffect } from "react";
4
- import { RecentWalletStorage } from "../../services";
3
+ import { useCallback } from "react";
5
4
  import { useWalletStore } from "../store/useWalletStore";
6
5
  import { useSuiWallets } from "./useSuiWallets";
7
6
  export function useSui() {
8
7
  const { wallets } = useSuiWallets();
9
8
  const connectedSuiWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SUI]);
10
- const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
11
- const disconnectWallet = useWalletStore((store) => store.disconnectWallet);
12
9
  const connectSui = useMutation(async ({ wallet, }) => {
13
- let account;
14
- try {
15
- // try to connect silently first
16
- account = await wallet.connector.connect({ silent: true });
17
- }
18
- catch {
19
- // if auto-connect fails (e.g. not authorized yet)
20
- // fallback to connect via popup
21
- account = await wallet.connector.connect();
22
- }
10
+ const { account } = await wallet.connector().connect();
23
11
  return {
24
12
  wallet,
25
- address: account.account.address,
26
- account: account.account,
13
+ address: account.address,
14
+ account,
27
15
  };
28
16
  });
29
17
  const disconnectSui = useCallback(async () => {
30
- await connectedSuiWallet.wallet?.connector.disconnect();
18
+ await connectedSuiWallet.wallet?.connector().disconnect();
31
19
  }, [connectedSuiWallet.wallet]);
32
- const autoConnectSui = useCallback(async () => {
33
- const recentSuiWalletId = RecentWalletStorage.get(ChainType.SUI);
34
- const recentSuiWallet = wallets.find((w) => w.connectorId === recentSuiWalletId);
35
- if (!recentSuiWallet) {
36
- return;
37
- }
38
- const { account } = await recentSuiWallet.connector.connect({
39
- silent: true,
40
- });
41
- setConnectedWallet(ChainType.SUI, {
42
- wallet: recentSuiWallet,
43
- address: account.address,
44
- account,
45
- });
46
- // eslint-disable-next-line react-hooks/exhaustive-deps
47
- }, [wallets.map((w) => w.connectorId)]);
48
- useEffect(() => {
49
- const wallet = connectedSuiWallet.wallet;
50
- if (!wallet) {
51
- return;
52
- }
53
- function onAccountsChanged({ accounts = [], }) {
54
- if (!wallet) {
55
- return;
56
- }
57
- const [account] = accounts;
58
- if (account) {
59
- setConnectedWallet(ChainType.SUI, {
60
- wallet: wallet,
61
- address: account.address,
62
- account: account,
63
- });
64
- }
65
- else {
66
- disconnectWallet(ChainType.SUI);
67
- }
68
- }
69
- const removeListener = wallet.connector.on("change", onAccountsChanged);
70
- return () => {
71
- removeListener();
72
- };
73
- }, [disconnectWallet, setConnectedWallet, connectedSuiWallet.wallet]);
74
20
  return {
75
21
  connectSui,
76
22
  disconnectSui,
77
- autoConnectSui,
78
23
  isConnected: !!connectedSuiWallet.wallet,
79
- signer: connectedSuiWallet.wallet?.connector,
24
+ signer: connectedSuiWallet.wallet?.connector(),
80
25
  wallets,
81
26
  };
82
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,MAAM;IACpB,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;IACpC,MAAM,kBAAkB,GAAG,cAAc,CACvC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,GAAG,CAAC,CAC5D,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC5B,KAAK,EAAE,EACL,MAAM,GAGP,EAA+C,EAAE;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvD,OAAO;YACL,MAAM;YACN,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO;SACR,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC3C,MAAM,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;IAC5D,CAAC,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhC,OAAO;QACL,UAAU;QACV,aAAa;QACb,WAAW,EAAE,CAAC,CAAC,kBAAkB,CAAC,MAAM;QACxC,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE;QAC9C,OAAO;KACR,CAAC;AACJ,CAAC"}
@@ -1,4 +1,7 @@
1
1
  import { SuiWallet } from "../../core/types/wallet";
2
+ /**
3
+ * Returns the list of registered Sui wallets
4
+ */
2
5
  export declare function useSuiWallets(): {
3
6
  wallets: SuiWallet[];
4
7
  };
@@ -1,23 +1,42 @@
1
1
  import { SlushWallet } from "@mysten/slush-wallet";
2
+ import { getWallets as getWalletsApi, } from "@mysten/wallet-standard";
3
+ import { useCallback, useEffect, useRef, useState } from "react";
2
4
  import { filterSuiWallets, slushWebWalletData, } from "../../services/internal/suiService";
3
- import { useStandardWallets } from "../wallet/useStandardWallets";
4
- function getExtraWallets() {
5
- const slushWebWallet = new SlushWallet({
6
- name: "Squid",
7
- chain: "sui:mainnet",
8
- metadata: {
9
- enabled: true,
10
- icon: slushWebWalletData.icon,
11
- id: slushWebWalletData.id,
12
- walletName: slushWebWalletData.name,
13
- },
14
- });
15
- return [slushWebWallet];
16
- }
5
+ /**
6
+ * Returns the list of registered Sui wallets
7
+ */
17
8
  export function useSuiWallets() {
18
- return useStandardWallets({
19
- filterWallets: filterSuiWallets,
20
- getExtraWallets,
21
- });
9
+ const isInitializedRef = useRef(false);
10
+ const [wallets, setWallets] = useState([]);
11
+ const setRegisteredWallets = useCallback((standardWallets) => {
12
+ setWallets(filterSuiWallets(standardWallets));
13
+ }, []);
14
+ useEffect(() => {
15
+ const walletsApi = getWalletsApi();
16
+ const removeOnRegisterListener = walletsApi.on("register", (wallet) => {
17
+ setRegisteredWallets([wallet]);
18
+ });
19
+ if (!isInitializedRef.current) {
20
+ const slushWebWallet = new SlushWallet({
21
+ name: "Squid",
22
+ chain: "sui:mainnet",
23
+ metadata: {
24
+ enabled: true,
25
+ icon: slushWebWalletData.icon,
26
+ id: slushWebWalletData.id,
27
+ walletName: slushWebWalletData.name,
28
+ },
29
+ });
30
+ walletsApi.register(slushWebWallet);
31
+ setRegisteredWallets(walletsApi.get());
32
+ isInitializedRef.current = true;
33
+ }
34
+ return () => {
35
+ removeOnRegisterListener();
36
+ };
37
+ }, [setRegisteredWallets]);
38
+ return {
39
+ wallets,
40
+ };
22
41
  }
23
42
  //# sourceMappingURL=useSuiWallets.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useSuiWallets.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSuiWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EACL,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,SAAS,eAAe;IACtB,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;QACrC,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE;YACR,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,kBAAkB,CAAC,IAAI;YAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;YACzB,UAAU,EAAE,kBAAkB,CAAC,IAAI;SACpC;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,aAAa;IAG3B,OAAO,kBAAkB,CAAY;QACnC,aAAa,EAAE,gBAAgB;QAC/B,eAAe;KAChB,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"useSuiWallets.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSuiWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EACL,UAAU,IAAI,aAAa,GAE5B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjE,OAAO,EACL,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,aAAa;IAG3B,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAc,EAAE,CAAC,CAAC;IAExD,MAAM,oBAAoB,GAAG,WAAW,CACtC,CAAC,eAA0C,EAAE,EAAE;QAC7C,UAAU,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChD,CAAC,EACD,EAAE,CACH,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;QAEnC,MAAM,wBAAwB,GAAG,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACpE,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC7B,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;gBACrC,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,aAAa;gBACpB,QAAQ,EAAE;oBACR,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,kBAAkB,CAAC,IAAI;oBAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;oBACzB,UAAU,EAAE,kBAAkB,CAAC,IAAI;iBACpC;aACF,CAAC,CAAC;YAEH,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACpC,oBAAoB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;YACvC,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAC;SACjC;QAED,OAAO,GAAG,EAAE;YACV,wBAAwB,EAAE,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE3B,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC"}
@@ -57,6 +57,15 @@ export const useAllConnectedWalletBalances = ({ direction, queryOptions = {
57
57
  enabled: Boolean(connectedAddresses?.[ChainType.SUI]),
58
58
  },
59
59
  });
60
+ const xrplBalancesQuery = useAllTokensWithBalanceForChainType({
61
+ chainType: ChainType.XRPL,
62
+ address: connectedAddresses?.[ChainType.XRPL],
63
+ direction,
64
+ queryOptions: {
65
+ ...queryOptions,
66
+ enabled: Boolean(connectedAddresses?.[ChainType.XRPL]),
67
+ },
68
+ });
60
69
  // Create a map of chain type to balance query results
61
70
  const balanceQueries = useMemo(() => ({
62
71
  [ChainType.EVM]: evmBalancesQuery,
@@ -64,12 +73,14 @@ export const useAllConnectedWalletBalances = ({ direction, queryOptions = {
64
73
  [ChainType.BTC]: bitcoinBalancesQuery,
65
74
  [ChainType.SOLANA]: solanaBalancesQuery,
66
75
  [ChainType.SUI]: suiBalancesQuery,
76
+ [ChainType.XRPL]: xrplBalancesQuery,
67
77
  }), [
68
78
  evmBalancesQuery,
69
79
  cosmosBalancesQuery,
70
80
  bitcoinBalancesQuery,
71
81
  solanaBalancesQuery,
72
82
  suiBalancesQuery,
83
+ xrplBalancesQuery,
73
84
  ]);
74
85
  // Combine all tokens from different chains
75
86
  const allTokens = useMemo(() => Object.values(balanceQueries).flatMap((query) => query.data?.tokens ?? []), [balanceQueries]);
@@ -1 +1 @@
1
- {"version":3,"file":"useAllConnectedWalletBalances.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllConnectedWalletBalances.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useAllConnectedWalletBalances.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllConnectedWalletBalances.ts"],"names":[],"mappings":"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"}