miniwallet 0.1.13 → 0.1.15

package/dist/miniwallet.js

@@ -70,18 +70,18 @@ var d = [
 //#endregion
 //#region src/MiniWalletProvider.tsx
 function m({ children: e, chains: n = [] }) {
-	let [s, l] = a(""), [m, h] = a(""), [g, _] = a(0), [v, y] = a(""), [b] = a(null), [x, S] = a({}), C = i(() => n.length > 0 ? n : p, [n]), w = i(() => x[m] ?? null, [x, m]), T = i(() => d.find((e) => e.id === m), [m]), E = i(() => !!s, [s]), D = i(() => C.find((e) => e.id === g) || null, [C, g]), O = i(() => !D || !v || !D?.decimals ? "0" : Number(u(v, D.decimals)).toFixed(3), [v, D]), k = t(async (e) => {
-		let { id: t } = e, n = x[t];
+	let [s, l] = a(""), [m, h] = a(""), [g, _] = a(0), [v, y] = a(""), [b, x] = a(null), [S, C] = a({}), w = i(() => n.length > 0 ? n : p, [n]), T = i(() => S[m] ?? null, [S, m]), E = i(() => d.find((e) => e.id === m), [m]), D = i(() => !!s, [s]), O = i(() => w.find((e) => e.id === g) || null, [w, g]), k = i(() => !O || !v || !O?.decimals ? "0" : Number(u(v, O.decimals)).toFixed(3), [v, O]), A = t(async (e) => {
+		let { id: t } = e, n = S[t];
 		if (!n) {
 			alert("请安装钱包");
 			return;
 		}
 		try {
-			console.log("provider: ", n);
-			let e = await n.request({ method: "eth_requestAccounts" });
-			console.log("accounts: ", e), console.log("provider.chainId: ", n.chainId);
-			let r = parseInt(String(n.chainId ?? "0x0"), 16);
-			l(e[0]), h(t), _(r), localStorage.setItem("miniwallet:lastWalletId", t);
+			x(e), console.log("provider: ", n);
+			let r = await n.request({ method: "eth_requestAccounts" });
+			console.log("accounts: ", r), console.log("provider.chainId: ", n.chainId);
+			let i = parseInt(String(n.chainId ?? "0x0"), 16);
+			l(r[0]), h(t), _(i), localStorage.setItem("miniwallet:lastWalletId", t);
 		} catch (e) {
 			console.log("error: ", e);
 			let t = e, n = t?.code ?? "", r = t?.message ?? "";
@@ -90,14 +90,16 @@ function m({ children: e, chains: n = [] }) {
 				return;
 			}
 			alert(`Connect failed${n && `\n${n}`}${r && `\n${r}`}`);
+		} finally {
+			x(null);
 		}
-	}, [x]), A = t(async () => {
+	}, [S]), j = t(async () => {
 		try {
-			if (!w || !m) {
+			if (!T || !m) {
 				alert("请安装钱包");
 				return;
 			}
-			m !== "okx" && await w.request({
+			m !== "okx" && await T.request({
 				method: "wallet_revokePermissions",
 				params: [{ eth_accounts: {} }]
 			});
@@ -106,13 +108,13 @@ function m({ children: e, chains: n = [] }) {
 		} finally {
 			l(""), h(""), _(0), localStorage.removeItem("miniwallet:lastWalletId");
 		}
-	}, [w, m]), j = t(async (e) => {
-		if (!w) {
+	}, [T, m]), M = t(async (e) => {
+		if (!T) {
 			alert("钱包不存在");
 			return;
 		}
 		try {
-			await w.request({
+			await T.request({
 				method: "wallet_switchEthereumChain",
 				params: [{ chainId: `0x${e.id.toString(16)}` }]
 			}), _(e.id);
@@ -121,10 +123,10 @@ function m({ children: e, chains: n = [] }) {
 			let t = e, n = t?.code ?? "", r = t?.message ?? "";
 			alert(`Switch failed${n && `\n${n}`}${r && `\n${r}`}`);
 		}
-	}, [w]), M = t(async () => {
+	}, [T]), N = t(async () => {
 		try {
-			if (!s || !w) return;
-			let e = await w.request({
+			if (!s || !T) return;
+			let e = await T.request({
 				method: "eth_getBalance",
 				params: [s, "latest"]
 			});
@@ -132,60 +134,60 @@ function m({ children: e, chains: n = [] }) {
 		} catch (e) {
 			console.error("getBalance error: ", e);
 		}
-	}, [s, w]), N = i(() => ({
+	}, [s, T]), P = i(() => ({
 		account: s,
-		balance: O,
-		isConnected: E,
+		balance: k,
+		isConnected: D,
 		connectingWallet: b,
-		selectedChain: D,
-		wallet: T,
-		chains: C,
-		connect: k,
-		switchChain: j,
-		disconnect: A
+		selectedChain: O,
+		wallet: E,
+		chains: w,
+		connect: A,
+		switchChain: M,
+		disconnect: j
 	}), [
 		s,
+		k,
+		D,
+		b,
 		O,
 		E,
-		b,
-		D,
-		T,
-		C,
-		k,
-		j,
-		A
+		w,
+		A,
+		M,
+		j
 	]);
 	return r(() => {
 		let e = ((e) => {
 			let { info: t, provider: n } = e.detail ?? {}, r = f[t?.rdns];
-			!r || !n?.request || S((e) => e[r] === n ? e : {
+			!r || !n?.request || C((e) => e[r] === n ? e : {
 				...e,
 				[r]: n
 			});
 		});
 		return window.addEventListener("eip6963:announceProvider", e), window.dispatchEvent(new Event("eip6963:requestProvider")), () => {
-			window.removeEventListener("eip6963:announceProvider", e), S({});
+			window.removeEventListener("eip6963:announceProvider", e), C({});
 		};
 	}, []), r(() => {
-		g && M();
-	}, [M, g]), r(() => {
-		if (!E || !w?.on) return;
+		g && N();
+	}, [N, g]), r(() => {
+		if (!D || !T?.on) return;
 		let e = (e) => {
 			console.log("ChainChanged chainId: ", e), _(parseInt(e, 16));
 		}, t = (e) => {
 			console.log("AccountsChanged accounts: ", e), l(e[0] ?? "");
 		};
-		return console.log("Listen chainChanged and accountsChanged"), w.on("chainChanged", e), w.on("accountsChanged", t), () => {
-			console.log("RemoveListener chainChanged and accountsChanged"), w.removeListener("chainChanged", e), w.removeListener("accountsChanged", t);
+		return console.log("Listen chainChanged and accountsChanged"), T.on("chainChanged", e), T.on("accountsChanged", t), () => {
+			console.log("RemoveListener chainChanged and accountsChanged"), T.removeListener("chainChanged", e), T.removeListener("accountsChanged", t);
 		};
-	}, [E, w]), r(() => {
+	}, [D, T]), r(() => {
 		if (!s) return;
-		let e = setInterval(M, 1e4);
+		let e = setInterval(N, 1e4);
 		return () => clearInterval(e);
-	}, [s, M]), r(() => {
+	}, [s, N]), r(() => {
 		let e = localStorage.getItem("miniwallet:lastWalletId");
 		if (!e) return;
-		let t = x[e];
+		let t = S[e];
 		if (!t) return;
 		let n = !1;
 		return (async () => {
@@ -200,8 +202,8 @@ function m({ children: e, chains: n = [] }) {
 		})(), () => {
 			n = !0;
 		};
-	}, [x]), /* @__PURE__ */ o(c.Provider, {
-		value: N,
+	}, [S]), /* @__PURE__ */ o(c.Provider, {
+		value: P,
 		children: e
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miniwallet",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "React wallet connect button with multi-wallet support via EIP-6963",
   "type": "module",
   "main": "./dist/miniwallet.js",