@suilend/sui-fe-next 2.0.28 → 2.0.30

package/contexts/WalletContext.jsx

@@ -61,13 +61,13 @@ 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";
-import { SUI_DECIMALS, isValidSuiAddress, normalizeSuiAddress, toBase64, } from "@mysten/sui/utils";
+import { SUI_DECIMALS, toBase64 } from "@mysten/sui/utils";
 import { getWallets } from "@wallet-standard/app";
 import BigNumber from "bignumber.js";
 import { useLDClient } from "launchdarkly-react-client-sdk";
 import { useLocalStorage } from "usehooks-ts";
 import { API_URL, formatAddress, isInMsafeApp } from "@suilend/sui-fe";
-import { WC_SUI_METHODS, getWalletConnectModal, getWalletConnectProvider, } from "../lib/connector";
+import { getUniversalConnector } from "../lib/connector";
 import { showErrorToast, showInfoToast } from "../lib/toasts";
 import { useSettingsContext } from "./SettingsContext";
 export var WalletType;
@@ -212,50 +212,34 @@ export var useWalletContext = function () { return useContext(WalletContext); };
 function Inner(_a) {
     var _b;
     var _this = this;
-    var _c, _d;
+    var _c, _d, _e, _f, _g;
     var appName = _a.appName, children = _a.children;
     var router = useRouter();
     var queryParams = (_b = {},
         _b[WalletContextQueryParams.WALLET] = router.query[WalletContextQueryParams.WALLET],
         _b);
-    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 _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.
-    var wcRawAddress = 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];
-        if (!raw)
-            return undefined;
-        return raw.split(":").pop();
-    }, [wcSession]);
-    // Normalised Sui address (zero-padded to 32 bytes) for on-chain use:
-    // transaction sender, RPC queries, etc.
-    var sessionAddress = useMemo(function () {
-        if (!wcRawAddress)
-            return undefined;
-        var normalized = normalizeSuiAddress(wcRawAddress);
-        return isValidSuiAddress(normalized) ? normalized : undefined;
-    }, [wcRawAddress]);
+    var _h = useSettingsContext(), rpc = _h.rpc, suiClient = _h.suiClient;
+    // Only used for wallet connect
+    var _j = useState(), universalConnector = _j[0], setUniversalConnector = _j[1];
+    var _k = useState(), session = _k[0], setSession = _k[1];
+    var sessionAddressWithout0x = (_e = (_d = (_c = session === null || session === void 0 ? void 0 : session.namespaces) === null || _c === void 0 ? void 0 : _c.sui) === null || _d === void 0 ? void 0 : _d.accounts) === null || _e === void 0 ? void 0 : _e[0];
+    var sessionAddress = sessionAddressWithout0x
+        ? sessionAddressWithout0x.split(":").pop()
+        : undefined;
     useEffect(function () {
         (function () { return __awaiter(_this, void 0, void 0, function () {
-            var provider;
+            var connector;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, getWalletConnectProvider()];
+                    case 0: return [4 /*yield*/, getUniversalConnector(rpc.url)];
                     case 1:
-                        provider = _a.sent();
-                        if (provider.session) {
-                            setWcSession(provider.session);
-                        }
+                        connector = _a.sent();
+                        setUniversalConnector(connector);
                         return [2 /*return*/];
                 }
             });
         }); })();
-    }, []);
+    }, [rpc.url]);
     // Impersonated address
     var impersonatedAddress = queryParams[WalletContextQueryParams.WALLET];
     // Wallets
@@ -369,7 +353,7 @@ function Inner(_a) {
         wallets__web,
     ]);
     // Wallet
-    var _g = useState(false), isConnectWalletDropdownOpen = _g[0], setIsConnectWalletDropdownOpen = _g[1];
+    var _l = useState(false), isConnectWalletDropdownOpen = _l[0], setIsConnectWalletDropdownOpen = _l[1];
     var rawWallet = useCurrentWallet();
     var wallet = useMemo(function () {
         if (sessionAddress) {
@@ -383,23 +367,17 @@ 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 provider, res;
+        var res;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!sessionAddress)
+                    if (!sessionAddress || !universalConnector)
                         throw new Error("Wallet not connected");
-                    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(),
-                                account: wcRawAddress !== null && wcRawAddress !== void 0 ? wcRawAddress : sessionAddress,
-                            },
+                    return [4 /*yield*/, universalConnector.request({
+                            method: "sui_signPersonalMessage",
+                            params: { message: message.toString() },
                         }, "sui:mainnet")];
-                case 2:
+                case 1:
                     res = _a.sent();
                     return [2 /*return*/, {
                             signature: res.signature,
@@ -407,122 +385,49 @@ function Inner(_a) {
                         }];
             }
         });
-    }); }, [sessionAddress, wcRawAddress]);
-    var connectWalletWrapper = useCallback(function (_wallet) { return __awaiter(_this, void 0, void 0, function () {
-        var provider, modal, _a, provider, _b, err_1;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    _c.trys.push([0, 17, , 18]);
-                    if (!(_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect)) return [3 /*break*/, 10];
-                    return [4 /*yield*/, getWalletConnectProvider()];
-                case 1:
-                    provider = _c.sent();
-                    return [4 /*yield*/, getWalletConnectModal(rpc.url)];
-                case 2:
-                    modal = _c.sent();
-                    modal.open();
-                    _c.label = 3;
-                case 3:
-                    _c.trys.push([3, , 5, 6]);
-                    return [4 /*yield*/, provider.connect({
-                            namespaces: {
-                                sui: {
-                                    methods: [
-                                        WC_SUI_METHODS.SIGN_TRANSACTION,
-                                        WC_SUI_METHODS.SIGN_AND_EXECUTE_TRANSACTION,
-                                        WC_SUI_METHODS.SIGN_PERSONAL_MESSAGE,
-                                    ],
-                                    chains: ["sui:mainnet"],
-                                    events: [],
-                                },
-                            },
-                        })];
-                case 4:
-                    _c.sent();
-                    return [3 /*break*/, 6];
-                case 5:
-                    modal.close();
-                    return [7 /*endfinally*/];
-                case 6:
-                    _c.trys.push([6, 8, , 9]);
-                    return [4 /*yield*/, disconnectWallet()];
-                case 7:
-                    _c.sent();
-                    return [3 /*break*/, 9];
-                case 8:
-                    _a = _c.sent();
-                    return [3 /*break*/, 9];
-                case 9:
-                    setWcSession(provider.session);
-                    return [2 /*return*/];
-                case 10:
-                    if (!_wallet.raw)
-                        throw new Error("Missing wallet");
-                    return [4 /*yield*/, connectWallet({ wallet: _wallet.raw })];
-                case 11:
-                    _c.sent();
-                    _c.label = 12;
-                case 12:
-                    _c.trys.push([12, 15, , 16]);
-                    return [4 /*yield*/, getWalletConnectProvider()];
-                case 13:
-                    provider = _c.sent();
-                    return [4 /*yield*/, provider.disconnect()];
-                case 14:
-                    _c.sent();
-                    return [3 /*break*/, 16];
-                case 15:
-                    _b = _c.sent();
-                    return [3 /*break*/, 16];
-                case 16:
-                    setWcSession(null);
-                    showInfoToast("Connected ".concat(_wallet.name));
-                    setIsConnectWalletDropdownOpen(false);
-                    return [3 /*break*/, 18];
-                case 17:
-                    err_1 = _c.sent();
-                    showErrorToast("Failed to connect ".concat(_wallet.name), err_1);
-                    console.error(err_1);
-                    return [3 /*break*/, 18];
-                case 18: return [2 /*return*/];
+    }); }, [sessionAddress, universalConnector]);
+    var connectWalletWrapper = useCallback(function (_wallet) {
+        try {
+            if (_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect) {
+                universalConnector.connect().then(function (res) {
+                    disconnectWallet();
+                    setSession(res.session);
+                });
+                return;
             }
-        });
-    }); }, [rpc.url, connectWallet, disconnectWallet]);
-    var disconnectWalletWrapper = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var provider, err_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _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*/, 5];
-                case 3: return [4 /*yield*/, disconnectWallet()];
-                case 4:
-                    _a.sent();
-                    showInfoToast("Disconnected wallet");
-                    _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*/, 7];
-                case 7: return [2 /*return*/];
+            if (!_wallet.raw)
+                throw new Error("Missing wallet");
+            connectWallet({ wallet: _wallet.raw });
+            universalConnector.disconnect();
+            setSession(null);
+            showInfoToast("Connected ".concat(_wallet.name));
+            setIsConnectWalletDropdownOpen(false);
+        }
+        catch (err) {
+            showErrorToast("Failed to connect ".concat(_wallet.name), err);
+            console.error(err);
+        }
+    }, [connectWallet, disconnectWallet, universalConnector]);
+    var disconnectWalletWrapper = useCallback(function () {
+        try {
+            if (sessionAddress) {
+                universalConnector.disconnect();
+                setSession(null);
             }
-        });
-    }); }, [sessionAddress, disconnectWallet]);
+            else {
+                disconnectWallet();
+                showInfoToast("Disconnected wallet");
+            }
+        }
+        catch (err) {
+            showErrorToast("Failed to disconnect wallet", err);
+            console.error(err);
+        }
+    }, [sessionAddress, universalConnector, 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]);
-    var accountRes = (_d = useCurrentAccount()) !== null && _d !== void 0 ? _d : undefined;
+    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 : []; }, [(_f = walletConnection.wallet) === null || _f === void 0 ? void 0 : _f.accounts]);
+    var accountRes = (_g = useCurrentAccount()) !== null && _g !== void 0 ? _g : undefined;
     var walletConnectAccount = useMemo(function () {
         return sessionAddress
             ? {
@@ -597,7 +502,7 @@ function Inner(_a) {
         if (!(wallet === null || wallet === void 0 ? void 0 : wallet.name))
             return;
         (function () { return __awaiter(_this, void 0, void 0, function () {
-            var err_3;
+            var err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -617,8 +522,8 @@ function Inner(_a) {
                         _a.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        err_3 = _a.sent();
-                        console.error(err_3);
+                        err_1 = _a.sent();
+                        console.error(err_1);
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
@@ -633,7 +538,7 @@ function Inner(_a) {
             args_1[_i - 1] = arguments[_i];
         }
         return __awaiter(_this, __spreadArray([transaction_1], args_1, true), void 0, function (transaction, setGasBudget) {
-            var _address, _transaction, inspectResults, err_4;
+            var _address, _transaction, inspectResults, err_2;
             if (setGasBudget === void 0) { setGasBudget = true; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -659,43 +564,20 @@ function Inner(_a) {
                             throw new Error(inspectResults.error);
                         return [2 /*return*/, inspectResults];
                     case 3:
-                        err_4 = _a.sent();
+                        err_2 = _a.sent();
                         // _transaction.getData().inputs.filter(input=>!!input.Object).map(input=>input.)
-                        console.error(err_4);
-                        throw err_4;
+                        console.error(err_2);
+                        throw err_2;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     }, [impersonatedAddress, account === null || account === void 0 ? void 0 : account.address, gasBudget, suiClient]);
-    var waitForTransactionWithCheck = useCallback(function (digest) { return __awaiter(_this, void 0, void 0, function () {
-        var res;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, suiClient.waitForTransaction({
-                        digest: digest,
-                        options: {
-                            showBalanceChanges: true,
-                            showEffects: true,
-                            showEvents: true,
-                            showObjectChanges: true,
-                        },
-                    })];
-                case 1:
-                    res = _c.sent();
-                    if (((_a = res.effects) === null || _a === void 0 ? void 0 : _a.status) !== undefined &&
-                        res.effects.status.status === "failure")
-                        throw new Error((_b = res.effects.status.error) !== null && _b !== void 0 ? _b : "Transaction failed");
-                    return [2 /*return*/, res];
-            }
-        });
-    }); }, [suiClient]);
     var signExecuteAndWaitForTransaction = useCallback(function (transaction, onSetGasBudget, onSign, onExecute) { return __awaiter(_this, void 0, void 0, function () {
-        var _address, provider_1, txBytes, txBase64, wcAddress, params, topic, signClient, pingErr_1, debugHandler, pendingBefore, wcRequest, methods, signRes, execDigest, _i, methods_1, method, res_1, err_5, execRes, msafeWallet, msafeFeature, msafeAccount, usedSignOnly, signedTransaction, res1, err_6, message, res, digest, err_7;
-        var _a, _b, _c, _d, _e;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var _address, txBytes, res, signedTransaction_1, res1_1, res2_1, msafeWallet, msafeFeature, msafeAccount, signedTransaction, res1, res2, err_3;
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     _address = impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address;
                     if (_address) {
@@ -704,9 +586,9 @@ function Inner(_a) {
                         }
                         catch (err) { }
                     }
-                    _f.label = 1;
+                    _e.label = 1;
                 case 1:
-                    _f.trys.push([1, 33, , 34]);
+                    _e.trys.push([1, 13, , 14]);
                     // Gas budget
                     if (gasBudget !== "")
                         transaction.setGasBudget(+new BigNumber(gasBudget)
@@ -715,135 +597,54 @@ function Inner(_a) {
                     onSetGasBudget === null || onSetGasBudget === void 0 ? void 0 : onSetGasBudget(transaction);
                     // Log
                     console.log("[WalletContext] signExecuteAndWaitForTransaction - transaction.getData():", transaction.getData());
-                    if (!sessionAddress) return [3 /*break*/, 21];
-                    return [4 /*yield*/, getWalletConnectProvider()];
-                case 2:
-                    provider_1 = _f.sent();
+                    if (!(sessionAddress && universalConnector)) return [3 /*break*/, 6];
                     transaction.setSender(sessionAddress);
                     return [4 /*yield*/, transaction.build({ client: suiClient })];
+                case 2:
+                    txBytes = _e.sent();
+                    return [4 /*yield*/, universalConnector.request({
+                            method: "sui_signTransaction",
+                            params: {
+                                transaction: toBase64(txBytes),
+                                address: sessionAddress,
+                            },
+                        }, "sui:mainnet")];
                 case 3:
-                    txBytes = _f.sent();
-                    txBase64 = toBase64(txBytes);
-                    wcAddress = wcRawAddress !== null && wcRawAddress !== void 0 ? wcRawAddress : sessionAddress;
-                    params = {
-                        transaction: txBase64,
-                        account: wcAddress,
+                    res = _e.sent();
+                    signedTransaction_1 = {
+                        bytes: res.transactionBytes,
+                        signature: res.signature,
                     };
-                    topic = (_a = provider_1.session) === null || _a === void 0 ? void 0 : _a.topic;
-                    console.log("[WalletContext] WalletConnect — session topic:", topic);
-                    console.log("[WalletContext] WalletConnect — session namespaces:", JSON.stringify((_b = provider_1.session) === null || _b === void 0 ? void 0 : _b.namespaces));
-                    console.log("[WalletContext] WalletConnect — request params:", params);
-                    if (!topic)
-                        throw new Error("WalletConnect session not found");
-                    signClient = provider_1.client;
-                    // Debug: full session dump
-                    console.log("[WalletContext] WalletConnect — full session:", JSON.stringify(provider_1.session, null, 2));
-                    console.log("[WalletContext] WalletConnect — relay connected:", signClient.core.relayer.connected);
-                    _f.label = 4;
+                    onSign === null || onSign === void 0 ? void 0 : onSign(signedTransaction_1);
+                    return [4 /*yield*/, suiClient.executeTransactionBlock({
+                            transactionBlock: signedTransaction_1.bytes,
+                            signature: signedTransaction_1.signature,
+                        })];
                 case 4:
-                    _f.trys.push([4, 6, , 7]);
-                    return [4 /*yield*/, signClient.ping({ topic: topic })];
+                    res1_1 = _e.sent();
+                    onExecute === null || onExecute === void 0 ? void 0 : onExecute(res1_1);
+                    return [4 /*yield*/, suiClient.waitForTransaction({
+                            digest: res1_1.digest,
+                            options: {
+                                showBalanceChanges: true,
+                                showEffects: true,
+                                showEvents: true,
+                                showObjectChanges: true,
+                            },
+                        })];
                 case 5:
-                    _f.sent();
-                    console.log("[WalletContext] WalletConnect — ping succeeded (peer is alive)");
-                    return [3 /*break*/, 7];
+                    res2_1 = _e.sent();
+                    if (((_a = res2_1.effects) === null || _a === void 0 ? void 0 : _a.status) !== undefined &&
+                        res2_1.effects.status.status === "failure")
+                        throw new Error((_b = res2_1.effects.status.error) !== null && _b !== void 0 ? _b : "Transaction failed");
+                    return [2 /*return*/, res2_1];
                 case 6:
-                    pingErr_1 = _f.sent();
-                    console.error("[WalletContext] WalletConnect — ping FAILED (peer may be offline):", pingErr_1);
-                    return [3 /*break*/, 7];
-                case 7:
-                    debugHandler = function (event) {
-                        console.log("[WalletContext] WalletConnect — relay message received:", event);
-                    };
-                    signClient.core.relayer.on("message", debugHandler);
-                    pendingBefore = (_e = (_d = (_c = signClient.pendingRequest).getAll) === null || _d === void 0 ? void 0 : _d.call(_c)) !== null && _e !== void 0 ? _e : [];
-                    console.log("[WalletContext] WalletConnect — pending requests before:", Array.isArray(pendingBefore) ? pendingBefore.length : pendingBefore);
-                    wcRequest = function (method, requestParams, timeoutMs) {
-                        if (timeoutMs === void 0) { timeoutMs = 15000; }
-                        return new Promise(function (resolve, reject) {
-                            var timer = setTimeout(function () {
-                                reject(new Error("WalletConnect request \"".concat(method, "\" timed out after ").concat(timeoutMs / 1000, "s \u2014 the wallet did not respond. ") +
-                                    "This usually means the wallet does not support this method."));
-                            }, timeoutMs);
-                            console.log("[WalletContext] WalletConnect \u2014 sending request:", JSON.stringify({
-                                method: method,
-                                params: requestParams,
-                                chainId: "sui:mainnet",
-                            }));
-                            provider_1
-                                .request({ method: method, params: requestParams }, "sui:mainnet")
-                                .then(function (res) {
-                                clearTimeout(timer);
-                                resolve(res);
-                            })
-                                .catch(function (err) {
-                                clearTimeout(timer);
-                                reject(err);
-                            });
-                        });
-                    };
-                    methods = [
-                        WC_SUI_METHODS.SIGN_TRANSACTION,
-                        WC_SUI_METHODS.SIGN_AND_EXECUTE_TRANSACTION,
-                    ];
-                    signRes = null;
-                    execDigest = null;
-                    _i = 0, methods_1 = methods;
-                    _f.label = 8;
-                case 8:
-                    if (!(_i < methods_1.length)) return [3 /*break*/, 16];
-                    method = methods_1[_i];
-                    _f.label = 9;
-                case 9:
-                    _f.trys.push([9, 14, , 15]);
-                    console.log("[WalletContext] WalletConnect \u2014 trying ".concat(method));
-                    if (!(method === WC_SUI_METHODS.SIGN_TRANSACTION)) return [3 /*break*/, 11];
-                    return [4 /*yield*/, wcRequest(method, params)];
-                case 10:
-                    signRes = _f.sent();
-                    console.log("[WalletContext] WalletConnect \u2014 ".concat(method, " succeeded"));
-                    return [3 /*break*/, 16];
-                case 11: return [4 /*yield*/, wcRequest(method, params)];
-                case 12:
-                    res_1 = _f.sent();
-                    console.log("[WalletContext] WalletConnect \u2014 ".concat(method, " succeeded, digest:"), res_1.digest);
-                    execDigest = res_1.digest;
-                    return [3 /*break*/, 16];
-                case 13: return [3 /*break*/, 15];
-                case 14:
-                    err_5 = _f.sent();
-                    console.warn("[WalletContext] WalletConnect \u2014 ".concat(method, " failed:"), err_5);
-                    return [3 /*break*/, 15];
-                case 15:
-                    _i++;
-                    return [3 /*break*/, 8];
-                case 16:
-                    // Cleanup debug listener
-                    signClient.core.relayer.off("message", debugHandler);
-                    if (!execDigest) return [3 /*break*/, 18];
-                    return [4 /*yield*/, waitForTransactionWithCheck(execDigest)];
-                case 17: return [2 /*return*/, _f.sent()];
-                case 18:
-                    if (!signRes) {
-                        throw new Error("WalletConnect: wallet did not respond to any signing method. " +
-                            "Check that the wallet supports Sui transactions and that the session is active.");
-                    }
-                    console.log("[WalletContext] WalletConnect — executing signed transaction on-chain");
-                    return [4 /*yield*/, suiClient.executeTransactionBlock({
-                            transactionBlock: signRes.transactionBytes,
-                            signature: signRes.signature,
-                        })];
-                case 19:
-                    execRes = _f.sent();
-                    return [4 /*yield*/, waitForTransactionWithCheck(execRes.digest)];
-                case 20: return [2 /*return*/, _f.sent()];
-                case 21:
-                    if (!isInMsafeApp()) return [3 /*break*/, 24];
+                    if (!isInMsafeApp()) return [3 /*break*/, 9];
                     msafeWallet = getWallets()
                         .get()
                         .find(function (w) { return w.name === WalletName.MSAFE_WALLET; });
                     msafeFeature = msafeWallet === null || msafeWallet === void 0 ? void 0 : msafeWallet.features["sui:signAndExecuteTransactionBlock"];
-                    if (!(msafeFeature && account)) return [3 /*break*/, 23];
+                    if (!(msafeFeature && account)) return [3 /*break*/, 8];
                     msafeAccount = msafeWallet.accounts.find(function (a) { return a.address === account.address; });
                     if (!msafeAccount)
                         throw new Error("MSafe account not found");
@@ -852,73 +653,57 @@ function Inner(_a) {
                             account: msafeAccount,
                             chain: "sui:mainnet",
                         })];
-                case 22:
-                    _f.sent();
-                    // MSafe proposes the transaction to the multisig queue;
-                    // the promise never resolves (only rejects on cancel).
-                    // If we reach here the proposal was accepted.
+                case 7:
+                    _e.sent();
                     throw new Error("Unreachable");
-                case 23: throw new Error("MSafe wallet not found. Please reload the page inside MSafe.");
-                case 24:
-                    usedSignOnly = false;
-                    _f.label = 25;
-                case 25:
-                    _f.trys.push([25, 29, , 30]);
-                    return [4 /*yield*/, dAppKit.signTransaction({
-                            transaction: transaction,
-                        })];
-                case 26:
-                    signedTransaction = _f.sent();
-                    usedSignOnly = true;
+                case 8: throw new Error("MSafe wallet not found. Please reload the page inside MSafe.");
+                case 9: return [4 /*yield*/, dAppKit.signTransaction({
+                        transaction: transaction,
+                    })];
+                case 10:
+                    signedTransaction = _e.sent();
                     onSign === null || onSign === void 0 ? void 0 : onSign(signedTransaction);
                     return [4 /*yield*/, suiClient.executeTransactionBlock({
                             transactionBlock: signedTransaction.bytes,
                             signature: signedTransaction.signature,
                         })];
-                case 27:
-                    res1 = _f.sent();
+                case 11:
+                    res1 = _e.sent();
                     onExecute === null || onExecute === void 0 ? void 0 : onExecute(res1);
-                    return [4 /*yield*/, waitForTransactionWithCheck(res1.digest)];
-                case 28: return [2 /*return*/, _f.sent()];
-                case 29:
-                    err_6 = _f.sent();
-                    if (usedSignOnly)
-                        throw err_6;
-                    message = err_6 instanceof Error ? err_6.message : String(err_6);
-                    if (!message.includes("does not support"))
-                        throw err_6;
-                    console.warn("[WalletContext] Wallet does not support sign-only, falling back to signAndExecuteTransaction");
-                    return [3 /*break*/, 30];
-                case 30: return [4 /*yield*/, dAppKit.signAndExecuteTransaction({
-                        transaction: transaction,
-                    })];
-                case 31:
-                    res = _f.sent();
-                    digest = res.$kind === "Transaction"
-                        ? res.Transaction.digest
-                        : res.FailedTransaction.digest;
-                    return [4 /*yield*/, waitForTransactionWithCheck(digest)];
-                case 32: return [2 /*return*/, _f.sent()];
-                case 33:
-                    err_7 = _f.sent();
-                    console.error(err_7);
-                    throw err_7;
-                case 34: return [2 /*return*/];
+                    return [4 /*yield*/, suiClient.waitForTransaction({
+                            digest: res1.digest,
+                            options: {
+                                showBalanceChanges: true,
+                                showEffects: true,
+                                showEvents: true,
+                                showObjectChanges: true,
+                            },
+                        })];
+                case 12:
+                    res2 = _e.sent();
+                    if (((_c = res2.effects) === null || _c === void 0 ? void 0 : _c.status) !== undefined &&
+                        res2.effects.status.status === "failure")
+                        throw new Error((_d = res2.effects.status.error) !== null && _d !== void 0 ? _d : "Transaction failed");
+                    return [2 /*return*/, res2];
+                case 13:
+                    err_3 = _e.sent();
+                    console.error(err_3);
+                    throw err_3;
+                case 14: return [2 /*return*/];
             }
         });
     }); }, [
+        universalConnector,
         sessionAddress,
-        wcRawAddress,
         gasBudget,
         impersonatedAddress,
         account,
         dryRunTransaction,
         suiClient,
         dAppKit,
-        waitForTransactionWithCheck,
     ]);
     // Using Ledger
-    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];
+    var _m = useLocalStorage("isUsingLedger-".concat(impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address), false), isUsingLedger = _m[0], setIsUsingLedger = _m[1];
     // Context
     var contextValue = useMemo(function () {
         return {