@suilend/sui-fe-next 2.0.13 → 2.0.14

package/contexts/WalletContext.jsx

@@ -220,8 +220,7 @@ function Inner(_a) {
     var suiClient = useSettingsContext().suiClient;
     // WalletConnect via @walletconnect/universal-provider
     // Matches the reference implementation: https://github.com/WalletConnect/react-core-up-sui
-    var _f = useState(), wcProvider = _f[0], setWcProvider = _f[1];
-    var _g = useState(), wcSession = _g[0], setWcSession = _g[1];
+    var _f = useState(), wcSession = _f[0], setWcSession = _f[1];
     var sessionAddress = useMemo(function () {
         var _a, _b, _c;
         var raw = (_c = (_b = (_a = wcSession === null || wcSession === void 0 ? void 0 : wcSession.namespaces) === null || _a === void 0 ? void 0 : _a.sui) === null || _b === void 0 ? void 0 : _b.accounts) === null || _c === void 0 ? void 0 : _c[0];
@@ -235,7 +234,6 @@ function Inner(_a) {
                     case 0: return [4 /*yield*/, getWalletConnectProvider()];
                     case 1:
                         provider = _a.sent();
-                        setWcProvider(provider);
                         if (provider.session) {
                             setWcSession(provider.session);
                         }
@@ -357,7 +355,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) {
@@ -371,17 +369,20 @@ function Inner(_a) {
     var disconnectWallet = dAppKit.disconnectWallet;
     var signPersonalMessageRaw = dAppKit.signPersonalMessage;
     var walletConnectSignPersonalMessage = useCallback(function (message) { return __awaiter(_this, void 0, void 0, function () {
-        var res;
+        var provider, res;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!sessionAddress || !wcProvider)
+                    if (!sessionAddress)
                         throw new Error("Wallet not connected");
-                    return [4 /*yield*/, wcProvider.request({
+                    return [4 /*yield*/, getWalletConnectProvider()];
+                case 1:
+                    provider = _a.sent();
+                    return [4 /*yield*/, provider.request({
                             method: WC_SUI_METHODS.SIGN_PERSONAL_MESSAGE,
                             params: { message: message.toString(), address: sessionAddress },
                         }, "sui:mainnet")];
-                case 1:
+                case 2:
                     res = _a.sent();
                     return [2 /*return*/, {
                             signature: res.signature,
@@ -389,19 +390,18 @@ function Inner(_a) {
                         }];
             }
         });
-    }); }, [sessionAddress, wcProvider]);
+    }); }, [sessionAddress]);
     var connectWalletWrapper = useCallback(function (_wallet) { return __awaiter(_this, void 0, void 0, function () {
-        var _a, _b, err_1;
+        var provider, _a, provider, _b, err_1;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    _c.trys.push([0, 12, , 13]);
-                    if (!(_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect)) return [3 /*break*/, 6];
-                    if (!wcProvider)
-                        throw new Error("WalletConnect provider not ready");
-                    // Connect with optionalNamespaces — matches the reference app exactly.
-                    // Methods are declared at connect time, not at init time.
-                    return [4 /*yield*/, wcProvider.connect({
+                    _c.trys.push([0, 14, , 15]);
+                    if (!(_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect)) return [3 /*break*/, 7];
+                    return [4 /*yield*/, getWalletConnectProvider()];
+                case 1:
+                    provider = _c.sent();
+                    return [4 /*yield*/, provider.connect({
                             optionalNamespaces: {
                                 sui: {
                                     methods: [
@@ -414,80 +414,84 @@ function Inner(_a) {
                                 },
                             },
                         })];
-                case 1:
-                    // Connect with optionalNamespaces — matches the reference app exactly.
-                    // Methods are declared at connect time, not at init time.
-                    _c.sent();
-                    _c.label = 2;
                 case 2:
-                    _c.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, disconnectWallet()];
-                case 3:
                     _c.sent();
-                    return [3 /*break*/, 5];
+                    _c.label = 3;
+                case 3:
+                    _c.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, disconnectWallet()];
                 case 4:
-                    _a = _c.sent();
-                    return [3 /*break*/, 5];
+                    _c.sent();
+                    return [3 /*break*/, 6];
                 case 5:
-                    setWcSession(wcProvider.session);
-                    return [2 /*return*/];
+                    _a = _c.sent();
+                    return [3 /*break*/, 6];
                 case 6:
+                    setWcSession(provider.session);
+                    return [2 /*return*/];
+                case 7:
                     if (!_wallet.raw)
                         throw new Error("Missing wallet");
                     return [4 /*yield*/, connectWallet({ wallet: _wallet.raw })];
-                case 7:
-                    _c.sent();
-                    _c.label = 8;
                 case 8:
-                    _c.trys.push([8, 10, , 11]);
-                    return [4 /*yield*/, (wcProvider === null || wcProvider === void 0 ? void 0 : wcProvider.disconnect())];
-                case 9:
                     _c.sent();
-                    return [3 /*break*/, 11];
+                    _c.label = 9;
+                case 9:
+                    _c.trys.push([9, 12, , 13]);
+                    return [4 /*yield*/, getWalletConnectProvider()];
                 case 10:
-                    _b = _c.sent();
-                    return [3 /*break*/, 11];
+                    provider = _c.sent();
+                    return [4 /*yield*/, provider.disconnect()];
                 case 11:
+                    _c.sent();
+                    return [3 /*break*/, 13];
+                case 12:
+                    _b = _c.sent();
+                    return [3 /*break*/, 13];
+                case 13:
                     setWcSession(null);
                     showInfoToast("Connected ".concat(_wallet.name));
                     setIsConnectWalletDropdownOpen(false);
-                    return [3 /*break*/, 13];
-                case 12:
+                    return [3 /*break*/, 15];
+                case 14:
                     err_1 = _c.sent();
                     showErrorToast("Failed to connect ".concat(_wallet.name), err_1);
                     console.error(err_1);
-                    return [3 /*break*/, 13];
-                case 13: return [2 /*return*/];
+                    return [3 /*break*/, 15];
+                case 15: return [2 /*return*/];
             }
         });
-    }); }, [connectWallet, disconnectWallet, wcProvider]);
+    }); }, [connectWallet, disconnectWallet]);
     var disconnectWalletWrapper = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var err_2;
+        var provider, err_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 5, , 6]);
-                    if (!sessionAddress) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (wcProvider === null || wcProvider === void 0 ? void 0 : wcProvider.disconnect())];
+                    _a.trys.push([0, 6, , 7]);
+                    if (!sessionAddress) return [3 /*break*/, 3];
+                    return [4 /*yield*/, getWalletConnectProvider()];
                 case 1:
+                    provider = _a.sent();
+                    return [4 /*yield*/, provider.disconnect()];
+                case 2:
                     _a.sent();
                     setWcSession(null);
-                    return [3 /*break*/, 4];
-                case 2: return [4 /*yield*/, disconnectWallet()];
-                case 3:
+                    return [3 /*break*/, 5];
+                case 3: return [4 /*yield*/, disconnectWallet()];
+                case 4:
                     _a.sent();
                     showInfoToast("Disconnected wallet");
-                    _a.label = 4;
-                case 4: return [3 /*break*/, 6];
-                case 5:
+                    _a.label = 5;
+                case 5: return [3 /*break*/, 7];
+                case 6:
                     err_2 = _a.sent();
                     showErrorToast("Failed to disconnect wallet", err_2);
                     console.error(err_2);
-                    return [3 /*break*/, 6];
-                case 6: return [2 /*return*/];
+                    return [3 /*break*/, 7];
+                case 7: return [2 /*return*/];
             }
         });
-    }); }, [sessionAddress, wcProvider, disconnectWallet]);
+    }); }, [sessionAddress, disconnectWallet]);
     // Accounts
     var walletConnection = useWalletConnection();
     var accountsRes = useMemo(function () { var _a, _b; return (_b = (_a = walletConnection.wallet) === null || _a === void 0 ? void 0 : _a.accounts) !== null && _b !== void 0 ? _b : []; }, [(_c = walletConnection.wallet) === null || _c === void 0 ? void 0 : _c.accounts]);
@@ -651,7 +655,7 @@ function Inner(_a) {
         });
     }); }, [suiClient]);
     var signExecuteAndWaitForTransaction = useCallback(function (transaction, onSetGasBudget, onSign, onExecute) { return __awaiter(_this, void 0, void 0, function () {
-        var _address, txBytes, txBase64, params, res_1, signAndExecErr_1, signRes, execRes, usedSignOnly, signedTransaction, res1, err_5, message, res, digest, err_6;
+        var _address, provider, txBytes, txBase64, params, res_1, signAndExecErr_1, signRes, execRes, usedSignOnly, signedTransaction, res1, err_5, message, res, digest, err_6;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -664,7 +668,7 @@ function Inner(_a) {
                     }
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 20, , 21]);
+                    _a.trys.push([1, 21, , 22]);
                     // Gas budget
                     if (gasBudget !== "")
                         transaction.setGasBudget(+new BigNumber(gasBudget)
@@ -673,59 +677,60 @@ function Inner(_a) {
                     onSetGasBudget === null || onSetGasBudget === void 0 ? void 0 : onSetGasBudget(transaction);
                     // Log
                     console.log("[WalletContext] signExecuteAndWaitForTransaction - transaction.getData():", transaction.getData());
-                    if (!(sessionAddress && wcProvider)) return [3 /*break*/, 11];
-                    // WalletConnect path — uses @walletconnect/universal-provider directly,
-                    // matching the reference app: https://github.com/WalletConnect/react-core-up-sui
+                    if (!sessionAddress) return [3 /*break*/, 12];
+                    return [4 /*yield*/, getWalletConnectProvider()];
+                case 2:
+                    provider = _a.sent();
                     transaction.setSender(sessionAddress);
                     return [4 /*yield*/, transaction.build({ client: suiClient })];
-                case 2:
+                case 3:
                     txBytes = _a.sent();
                     txBase64 = toBase64(txBytes);
                     params = {
                         transaction: txBase64,
                         address: sessionAddress,
                     };
-                    _a.label = 3;
-                case 3:
-                    _a.trys.push([3, 6, , 7]);
+                    _a.label = 4;
+                case 4:
+                    _a.trys.push([4, 7, , 8]);
                     console.log("[WalletContext] WalletConnect — trying sui_signAndExecuteTransaction");
-                    return [4 /*yield*/, wcProvider.request({
+                    return [4 /*yield*/, provider.request({
                             method: WC_SUI_METHODS.SIGN_AND_EXECUTE_TRANSACTION,
                             params: params,
                         }, "sui:mainnet")];
-                case 4:
+                case 5:
                     res_1 = _a.sent();
                     console.log("[WalletContext] WalletConnect — sui_signAndExecuteTransaction succeeded, digest:", res_1.digest);
                     return [4 /*yield*/, waitForTransactionWithCheck(res_1.digest)];
-                case 5: return [2 /*return*/, _a.sent()];
-                case 6:
+                case 6: return [2 /*return*/, _a.sent()];
+                case 7:
                     signAndExecErr_1 = _a.sent();
                     console.warn("[WalletContext] WalletConnect — sui_signAndExecuteTransaction failed:", signAndExecErr_1);
-                    return [3 /*break*/, 7];
-                case 7:
+                    return [3 /*break*/, 8];
+                case 8:
                     // Fallback: sign-only, then dApp-side execute
                     console.log("[WalletContext] WalletConnect — trying sui_signTransaction (sign-only fallback)");
-                    return [4 /*yield*/, wcProvider.request({ method: WC_SUI_METHODS.SIGN_TRANSACTION, params: params }, "sui:mainnet")];
-                case 8:
+                    return [4 /*yield*/, provider.request({ method: WC_SUI_METHODS.SIGN_TRANSACTION, params: params }, "sui:mainnet")];
+                case 9:
                     signRes = _a.sent();
                     console.log("[WalletContext] WalletConnect — sui_signTransaction succeeded, executing on-chain");
                     return [4 /*yield*/, suiClient.executeTransactionBlock({
                             transactionBlock: signRes.transactionBytes,
                             signature: signRes.signature,
                         })];
-                case 9:
+                case 10:
                     execRes = _a.sent();
                     return [4 /*yield*/, waitForTransactionWithCheck(execRes.digest)];
-                case 10: return [2 /*return*/, _a.sent()];
-                case 11:
-                    usedSignOnly = false;
-                    _a.label = 12;
+                case 11: return [2 /*return*/, _a.sent()];
                 case 12:
-                    _a.trys.push([12, 16, , 17]);
+                    usedSignOnly = false;
+                    _a.label = 13;
+                case 13:
+                    _a.trys.push([13, 17, , 18]);
                     return [4 /*yield*/, dAppKit.signTransaction({
                             transaction: transaction,
                         })];
-                case 13:
+                case 14:
                     signedTransaction = _a.sent();
                     usedSignOnly = true;
                     onSign === null || onSign === void 0 ? void 0 : onSign(signedTransaction);
@@ -733,12 +738,12 @@ function Inner(_a) {
                             transactionBlock: signedTransaction.bytes,
                             signature: signedTransaction.signature,
                         })];
-                case 14:
+                case 15:
                     res1 = _a.sent();
                     onExecute === null || onExecute === void 0 ? void 0 : onExecute(res1);
                     return [4 /*yield*/, waitForTransactionWithCheck(res1.digest)];
-                case 15: return [2 /*return*/, _a.sent()];
-                case 16:
+                case 16: return [2 /*return*/, _a.sent()];
+                case 17:
                     err_5 = _a.sent();
                     if (usedSignOnly)
                         throw err_5;
@@ -746,26 +751,25 @@ function Inner(_a) {
                     if (!message.includes("does not support"))
                         throw err_5;
                     console.warn("[WalletContext] Wallet does not support sign-only, falling back to signAndExecuteTransaction");
-                    return [3 /*break*/, 17];
-                case 17: return [4 /*yield*/, dAppKit.signAndExecuteTransaction({
+                    return [3 /*break*/, 18];
+                case 18: return [4 /*yield*/, dAppKit.signAndExecuteTransaction({
                         transaction: transaction,
                     })];
-                case 18:
+                case 19:
                     res = _a.sent();
                     digest = res.$kind === "Transaction"
                         ? res.Transaction.digest
                         : res.FailedTransaction.digest;
                     return [4 /*yield*/, waitForTransactionWithCheck(digest)];
-                case 19: return [2 /*return*/, _a.sent()];
-                case 20:
+                case 20: return [2 /*return*/, _a.sent()];
+                case 21:
                     err_6 = _a.sent();
                     console.error(err_6);
                     throw err_6;
-                case 21: return [2 /*return*/];
+                case 22: return [2 /*return*/];
             }
         });
     }); }, [
-        wcProvider,
         sessionAddress,
         gasBudget,
         impersonatedAddress,
@@ -776,7 +780,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.13","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","@walletconnect/universal-provider":"2.21.1","@tanstack/react-query":"^5.60.2","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.14","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","@walletconnect/universal-provider":"2.21.1","@tanstack/react-query":"^5.60.2","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"}}