@suilend/sui-fe-next 2.0.27 → 2.0.28

package/contexts/WalletContext.jsx

@@ -57,7 +57,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 var _a, _b;
 import { useRouter } from "next/router";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, } from "react";
-import { createDAppKit } from "@mysten/dapp-kit-core";
+import { createDAppKit, getWalletUniqueIdentifier, } from "@mysten/dapp-kit-core";
 import { DAppKitProvider, useCurrentAccount, useCurrentWallet, useDAppKit, useWalletConnection, useWallets, } from "@mysten/dapp-kit-react";
 import { SuiJsonRpcClient, } from "@mysten/sui/jsonRpc";
 import { Transaction } from "@mysten/sui/transactions";
@@ -212,16 +212,16 @@ export var useWalletContext = function () { return useContext(WalletContext); };
 function Inner(_a) {
     var _b;
     var _this = this;
-    var _c, _d, _e;
+    var _c, _d;
     var appName = _a.appName, children = _a.children;
     var router = useRouter();
     var queryParams = (_b = {},
         _b[WalletContextQueryParams.WALLET] = router.query[WalletContextQueryParams.WALLET],
         _b);
-    var _f = useSettingsContext(), rpc = _f.rpc, suiClient = _f.suiClient;
+    var _e = useSettingsContext(), rpc = _e.rpc, suiClient = _e.suiClient;
     // WalletConnect via @walletconnect/universal-provider
     // Matches the reference implementation: https://github.com/WalletConnect/react-core-up-sui
-    var _g = useState(), wcSession = _g[0], setWcSession = _g[1];
+    var _f = useState(), wcSession = _f[0], setWcSession = _f[1];
     // Raw address as returned by the wallet (e.g. Fireblocks returns an
     // EVM-length address). We must send this back in WalletConnect request
     // params so the wallet recognises it as its own account.
@@ -369,7 +369,7 @@ function Inner(_a) {
         wallets__web,
     ]);
     // Wallet
-    var _h = useState(false), isConnectWalletDropdownOpen = _h[0], setIsConnectWalletDropdownOpen = _h[1];
+    var _g = useState(false), isConnectWalletDropdownOpen = _g[0], setIsConnectWalletDropdownOpen = _g[1];
     var rawWallet = useCurrentWallet();
     var wallet = useMemo(function () {
         if (sessionAddress) {
@@ -489,7 +489,6 @@ function Inner(_a) {
             }
         });
     }); }, [rpc.url, connectWallet, disconnectWallet]);
-    var PREFERRED_ACCOUNT_KEY = "suilend:preferred-account-address";
     var disconnectWalletWrapper = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
         var provider, err_2;
         return __generator(this, function (_a) {
@@ -510,12 +509,7 @@ function Inner(_a) {
                     _a.sent();
                     showInfoToast("Disconnected wallet");
                     _a.label = 5;
-                case 5:
-                    try {
-                        localStorage.removeItem(PREFERRED_ACCOUNT_KEY);
-                    }
-                    catch (_b) { }
-                    return [3 /*break*/, 7];
+                case 5: return [3 /*break*/, 7];
                 case 6:
                     err_2 = _a.sent();
                     showErrorToast("Failed to disconnect wallet", err_2);
@@ -546,18 +540,24 @@ function Inner(_a) {
             ? walletConnectSignPersonalMessage
             : function (message) { return signPersonalMessageRaw({ message: message }); };
     }, [sessionAddress, walletConnectSignPersonalMessage, signPersonalMessageRaw]);
+    var DAPP_KIT_STORAGE_KEY = "mysten-dapp-kit:selected-wallet-and-address";
     var switchAccountWrapper = useCallback(function (_account, addressNameServiceName) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         var accountLabel = (_b = (_a = _account === null || _account === void 0 ? void 0 : _account.label) !== null && _a !== void 0 ? _a : addressNameServiceName) !== null && _b !== void 0 ? _b : formatAddress(_account.address);
         try {
             var matchingAccount = (_c = walletConnection.wallet) === null || _c === void 0 ? void 0 : _c.accounts.find(function (a) { return a.address === _account.address; });
             if (!matchingAccount)
                 throw new Error("Account not found");
             dAppKit.switchAccount({ account: matchingAccount });
+            // Persist to dapp-kit's own storage key so autoconnect restores
+            // the correct account on page reload.
             try {
-                localStorage.setItem(PREFERRED_ACCOUNT_KEY, _account.address);
+                var walletId = getWalletUniqueIdentifier(matchingAccount);
+                var intents = (_d = walletConnection.supportedIntents) !== null && _d !== void 0 ? _d : [];
+                var storageValue = "".concat(walletId.replace(":", "_"), ":").concat(matchingAccount.address, ":").concat(intents.join(","), ":");
+                localStorage.setItem(DAPP_KIT_STORAGE_KEY, storageValue);
             }
-            catch (_d) { }
+            catch (_e) { }
             showInfoToast("Switched to ".concat(accountLabel), {
                 description: (_account === null || _account === void 0 ? void 0 : _account.label)
                     ? (addressNameServiceName !== null && addressNameServiceName !== void 0 ? addressNameServiceName : formatAddress(_account.address))
@@ -568,24 +568,7 @@ function Inner(_a) {
             showErrorToast("Failed to switch to ".concat(accountLabel), err);
             console.error(err);
         }
-    }, [dAppKit, (_e = walletConnection.wallet) === null || _e === void 0 ? void 0 : _e.accounts]);
-    // After autoconnect restores the wallet, check if the user had previously
-    // selected a different account and switch to it.
-    var hasRestoredPreferredAccount = useRef(false);
-    useEffect(function () {
-        if (hasRestoredPreferredAccount.current)
-            return;
-        if (!walletConnection.wallet || !accountRes)
-            return;
-        var preferred = localStorage.getItem(PREFERRED_ACCOUNT_KEY);
-        if (!preferred || preferred === accountRes.address)
-            return;
-        var match = walletConnection.wallet.accounts.find(function (a) { return a.address === preferred; });
-        if (!match)
-            return;
-        hasRestoredPreferredAccount.current = true;
-        dAppKit.switchAccount({ account: match });
-    }, [walletConnection.wallet, accountRes, dAppKit]);
+    }, [dAppKit, walletConnection]);
     // LaunchDarkly
     var ldClient = useLDClient();
     var ldKeyRef = useRef(undefined);
@@ -935,7 +918,7 @@ function Inner(_a) {
         waitForTransactionWithCheck,
     ]);
     // Using Ledger
-    var _j = useLocalStorage("isUsingLedger-".concat(impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address), false), isUsingLedger = _j[0], setIsUsingLedger = _j[1];
+    var _h = useLocalStorage("isUsingLedger-".concat(impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address), false), isUsingLedger = _h[0], setIsUsingLedger = _h[1];
     // Context
     var contextValue = useMemo(function () {
         return {

package/package.json

@@ -1 +1 @@
-{"name":"@suilend/sui-fe-next","version":"2.0.27","private":false,"description":"A collection of TypeScript frontend components and hooks","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./contexts/WalletContext":"./contexts/WalletContext.jsx","./contexts/SettingsContext":"./contexts/SettingsContext.jsx","./contexts":"./contexts/index.js","./fetchers":"./fetchers/index.js","./fetchers/useFetchBalances":"./fetchers/useFetchBalances.js","./hooks/useRefreshOnBalancesChange":"./hooks/useRefreshOnBalancesChange.js","./hooks/useLedgerHashDialog":"./hooks/useLedgerHashDialog.js","./hooks/useIsAndroid":"./hooks/useIsAndroid.jsx","./hooks/useCoinMetadataMap":"./hooks/useCoinMetadataMap.js","./hooks":"./hooks/index.js","./hooks/useIsTouchscreen":"./hooks/useIsTouchscreen.jsx","./hooks/useIsiOS":"./hooks/useIsiOS.jsx","./hooks/keypair":"./hooks/keypair.js","./lib/track":"./lib/track.js","./lib":"./lib/index.js","./lib/router":"./lib/router.js","./lib/toasts":"./lib/toasts.jsx","./lib/connector":"./lib/connector.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix src/","prettier":"prettier --write src/","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/suilend/sui-fe.git"},"bugs":{"url":"https://github.com/suilend/sui-fe/issues"},"dependencies":{"@reown/appkit":"1.8.2","@tanstack/react-query":"^5.60.2","@wallet-standard/app":"^1.1.0","@walletconnect/universal-provider":"2.21.1","bignumber.js":"^9.1.2","launchdarkly-react-client-sdk":"^3.6.0","lodash":"^4.17.21","mixpanel-browser":"^2.72.0","next":"^15.0.3","react":"18.3.1","react-dom":"18.3.1","react-responsive":"^10.0.0","sonner":"1.4.41","swr":"^2.2.5","tailwind-merge":"^2.5.4","usehooks-ts":"^3.1.1"},"devDependencies":{"@tsconfig/next":"^2.0.3","@types/lodash":"^4.17.13","@types/node":"^22.9.0","@types/react":"^18.3.12","@types/react-dom":"^18.3.1","@typescript-eslint/eslint-plugin":"^8.14.0","@typescript-eslint/parser":"^8.14.0","eslint":"^9.14.0","eslint-config-next":"^15.0.3","eslint-config-prettier":"^9.1.0","eslint-plugin-import":"^2.31.0","eslint-plugin-prettier":"^5.2.1","prettier":"^3.3.3","ts-node":"^10.9.2","typescript":"^5.6.3"},"peerDependencies":{"@mysten/dapp-kit-core":"1.0.3","@mysten/dapp-kit-react":"1.0.1","@mysten/sui":"2.3.1","@mysten/wallet-standard":"0.20.0","@suilend/sui-fe":"^2.0.10"}}
+{"name":"@suilend/sui-fe-next","version":"2.0.28","private":false,"description":"A collection of TypeScript frontend components and hooks","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./contexts/WalletContext":"./contexts/WalletContext.jsx","./contexts/SettingsContext":"./contexts/SettingsContext.jsx","./contexts":"./contexts/index.js","./fetchers":"./fetchers/index.js","./fetchers/useFetchBalances":"./fetchers/useFetchBalances.js","./hooks/useRefreshOnBalancesChange":"./hooks/useRefreshOnBalancesChange.js","./hooks/useLedgerHashDialog":"./hooks/useLedgerHashDialog.js","./hooks/useIsAndroid":"./hooks/useIsAndroid.jsx","./hooks/useCoinMetadataMap":"./hooks/useCoinMetadataMap.js","./hooks":"./hooks/index.js","./hooks/useIsTouchscreen":"./hooks/useIsTouchscreen.jsx","./hooks/useIsiOS":"./hooks/useIsiOS.jsx","./hooks/keypair":"./hooks/keypair.js","./lib/track":"./lib/track.js","./lib":"./lib/index.js","./lib/router":"./lib/router.js","./lib/toasts":"./lib/toasts.jsx","./lib/connector":"./lib/connector.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix src/","prettier":"prettier --write src/","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/suilend/sui-fe.git"},"bugs":{"url":"https://github.com/suilend/sui-fe/issues"},"dependencies":{"@reown/appkit":"1.8.2","@tanstack/react-query":"^5.60.2","@wallet-standard/app":"^1.1.0","@walletconnect/universal-provider":"2.21.1","bignumber.js":"^9.1.2","launchdarkly-react-client-sdk":"^3.6.0","lodash":"^4.17.21","mixpanel-browser":"^2.72.0","next":"^15.0.3","react":"18.3.1","react-dom":"18.3.1","react-responsive":"^10.0.0","sonner":"1.4.41","swr":"^2.2.5","tailwind-merge":"^2.5.4","usehooks-ts":"^3.1.1"},"devDependencies":{"@tsconfig/next":"^2.0.3","@types/lodash":"^4.17.13","@types/node":"^22.9.0","@types/react":"^18.3.12","@types/react-dom":"^18.3.1","@typescript-eslint/eslint-plugin":"^8.14.0","@typescript-eslint/parser":"^8.14.0","eslint":"^9.14.0","eslint-config-next":"^15.0.3","eslint-config-prettier":"^9.1.0","eslint-plugin-import":"^2.31.0","eslint-plugin-prettier":"^5.2.1","prettier":"^3.3.3","ts-node":"^10.9.2","typescript":"^5.6.3"},"peerDependencies":{"@mysten/dapp-kit-core":"1.0.3","@mysten/dapp-kit-react":"1.0.1","@mysten/sui":"2.3.1","@mysten/wallet-standard":"0.20.0","@suilend/sui-fe":"^2.0.10"}}