@mysten/dapp-kit 0.10.2 → 0.11.0

package/src/constants/walletDefaults.ts

@@ -0,0 +1,17 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import type { WalletWithRequiredFeatures } from '@mysten/wallet-standard';
+
+import { createInMemoryStore } from '../utils/stateStorage.js';
+
+export const SUI_WALLET_NAME = 'Sui Wallet';
+
+export const DEFAULT_STORAGE =
+	typeof window !== 'undefined' && window.localStorage ? localStorage : createInMemoryStore();
+
+export const DEFAULT_STORAGE_KEY = 'sui-dapp-kit:wallet-connection-info';
+
+export const DEFAULT_REQUIRED_FEATURES: (keyof WalletWithRequiredFeatures['features'])[] = [
+	'sui:signTransactionBlock',
+];

package/src/hooks/wallet/useAutoConnectWallet.ts

@@ -4,6 +4,7 @@
 import { useQuery } from '@tanstack/react-query';
 import { useLayoutEffect, useState } from 'react';
 
+import { getWalletUniqueIdentifier } from '../../utils/walletUtils.js';
 import { useConnectWallet } from './useConnectWallet.js';
 import { useCurrentWallet } from './useCurrentWallet.js';
 import { useWallets } from './useWallets.js';
@@ -43,7 +44,9 @@ export function useAutoConnectWallet(): 'disabled' | 'idle' | 'attempted' {
 				return 'attempted';
 			}
 
-			const wallet = wallets.find((wallet) => wallet.name === lastConnectedWalletName);
+			const wallet = wallets.find(
+				(wallet) => getWalletUniqueIdentifier(wallet) === lastConnectedWalletName,
+			);
 			if (wallet) {
 				await connectWallet({
 					wallet,

package/src/utils/stateStorage.ts

@@ -0,0 +1,19 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import type { StateStorage } from 'zustand/middleware';
+
+export function createInMemoryStore(): StateStorage {
+	const store = new Map();
+	return {
+		getItem(key: string) {
+			return store.get(key);
+		},
+		setItem(key: string, value: string) {
+			store.set(key, value);
+		},
+		removeItem(key: string) {
+			store.delete(key);
+		},
+	};
+}

package/src/utils/walletUtils.ts

@@ -30,3 +30,7 @@ export function getRegisteredWallets<AdditionalFeatures extends Wallet['features
 		...suiWallets.filter((wallet) => !preferredWallets.includes(wallet.name)),
 	];
 }
+
+export function getWalletUniqueIdentifier(wallet?: Wallet) {
+	return wallet?.id ?? wallet?.name;
+}

package/src/walletStore.ts

@@ -6,6 +6,8 @@ import { createStore } from 'zustand';
 import type { StateStorage } from 'zustand/middleware';
 import { createJSONStorage, persist } from 'zustand/middleware';
 
+import { getWalletUniqueIdentifier } from './utils/walletUtils.js';
+
 type WalletConnectionStatus = 'disconnected' | 'connecting' | 'connected';
 
 export type WalletActions = {
@@ -56,7 +58,7 @@ export function createWalletStore({
 			(set, get) => ({
 				autoConnectEnabled,
 				wallets,
-				accounts: [],
+				accounts: [] as WalletAccount[],
 				currentWallet: null,
 				currentAccount: null,
 				lastConnectedAccountAddress: null,
@@ -72,7 +74,7 @@ export function createWalletStore({
 						accounts: connectedAccounts,
 						currentWallet: wallet,
 						currentAccount: selectedAccount,
-						lastConnectedWalletName: wallet.name,
+						lastConnectedWalletName: getWalletUniqueIdentifier(wallet),
 						lastConnectedAccountAddress: selectedAccount?.address,
 						connectionStatus: 'connected',
 					}));