miniwallet 0.1.8 → 0.1.9

package/dist/miniwallet.js

@@ -83,7 +83,7 @@ function MiniWalletProvider({ children, chains = [] }) {
 	const [selectedWalletId, setSelectedWalletId] = useState("");
 	const [selectedChainId, setSelectedChainId] = useState(0);
 	const [balanceValue, setBalanceValue] = useState("");
-	const [connectingWallet, setConnectingWallet] = useState(null);
+	const [connectingWallet] = useState(null);
 	const eip6963ProvidersRef = useRef({});
 	const [providersVersion, setProvidersVersion] = useState(0);
 	const chainsList = useMemo(() => {
@@ -107,14 +107,13 @@ function MiniWalletProvider({ children, chains = [] }) {
 	}, [balanceValue, selectedChain]);
 	const connect = useCallback(async (w) => {
 		const { id } = w;
+		console.log("eip6963Providers: ", eip6963ProvidersRef.current);
+		const provider = eip6963ProvidersRef.current[id];
+		if (!provider || typeof provider.request !== "function") {
+			alert("请安装钱包");
+			return;
+		}
 		try {
-			console.log("eip6963Providers: ", eip6963ProvidersRef.current);
-			const provider = eip6963ProvidersRef.current[id];
-			if (!provider || typeof provider.request !== "function") {
-				alert("请安装钱包");
-				return;
-			}
-			setConnectingWallet(w);
 			console.log("provider: ", provider);
 			const accounts = await provider.request({ method: "eth_requestAccounts" });
 			console.log("accounts: ", accounts);
@@ -124,7 +123,6 @@ function MiniWalletProvider({ children, chains = [] }) {
 			setSelectedWalletId(id);
 			setSelectedChainId(chainId);
 			localStorage.setItem("miniwallet:lastWalletId", id);
-			setConnectingWallet(null);
 		} catch (error) {
 			console.log("error: ", error);
 			const e = error;
@@ -135,7 +133,6 @@ function MiniWalletProvider({ children, chains = [] }) {
 				return;
 			}
 			alert(`Connect failed${errCode && `\n${errCode}`}${errMsg && `\n${errMsg}`}`);
-			setConnectingWallet(null);
 		}
 	}, []);
 	const disconnect = useCallback(async () => {
@@ -295,9 +292,8 @@ var disconnect_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalon
 //#endregion
 //#region src/MiniWalletButton.tsx
 function MiniWalletButton({ label = "Connect Wallet" }) {
-	const { account, balance, isConnected, connectingWallet, selectedChain, wallet, switchChain, chains, connect, disconnect } = useMiniWallet();
+	const { account, balance, isConnected, selectedChain, wallet, switchChain, chains, connect, disconnect } = useMiniWallet();
 	const [modalOpen, setModalOpen] = useState(false);
-	const [isConnectCalled, setIsConnectCalled] = useState(false);
 	const [accountModalOpen, setAccountModalOpen] = useState(false);
 	const [copyLabel, setCopyLabel] = useState("复制地址");
 	const accountText = useMemo(() => {
@@ -322,11 +318,8 @@ function MiniWalletButton({ label = "Connect Wallet" }) {
 		}
 	}, [account]);
 	useEffect(() => {
-		if (!connectingWallet) {
-			setModalOpen(false);
-			setAccountModalOpen(false);
-		}
-	}, [connectingWallet]);
+		if (isConnected) setModalOpen(false);
+	}, [isConnected]);
 	return isConnected ? /* @__PURE__ */ jsxs("section", {
 		className: "inline-flex items-center justify-center text-center",
 		children: [
@@ -441,10 +434,7 @@ function MiniWalletButton({ label = "Connect Wallet" }) {
 					type: "button",
 					"aria-label": "Close",
 					className: "cursor-pointer rounded-full p-1 hover:bg-gray-100",
-					onClick: () => {
-						setIsConnectCalled(false);
-						closeModal();
-					},
+					onClick: closeModal,
 					children: /* @__PURE__ */ jsxs("svg", {
 						xmlns: "http://www.w3.org/2000/svg",
 						viewBox: "0 0 24 24",
@@ -455,32 +445,11 @@ function MiniWalletButton({ label = "Connect Wallet" }) {
 						children: [/* @__PURE__ */ jsx("path", { d: "M18 6 6 18" }), /* @__PURE__ */ jsx("path", { d: "m6 6 12 12" })]
 					})
 				})]
-			}), /* @__PURE__ */ jsxs("div", {
+			}), /* @__PURE__ */ jsx("div", {
 				className: "relative w-full space-y-4",
-				children: [isConnectCalled && connectingWallet && /* @__PURE__ */ jsxs("div", {
-					className: "absolute inset-0 mb-0 flex flex-col items-center justify-center rounded-xl bg-[rgba(255,255,255,0.9)] text-black",
-					children: [
-						/* @__PURE__ */ jsxs("div", { children: [
-							"正在连接",
-							connectingWallet.name,
-							"..."
-						] }),
-						/* @__PURE__ */ jsx("div", {
-							className: "my-1.5 text-xs",
-							children: "请在扩展中确认连接"
-						}),
-						/* @__PURE__ */ jsx("img", {
-							src: "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!DOCTYPE%20svg%20PUBLIC%20'-//W3C//DTD%20SVG%201.1//EN'%20'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3e%3csvg%20t='1783646544006'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='78324'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='32'%20height='32'%3e%3cpath%20d='M512%20907c-24.852%200-45-20.148-45-45s20.148-45%2045-45c168.446%200%20305-136.554%20305-305S680.446%20207%20512%20207%20207%20343.554%20207%20512c0%2024.852-20.148%2045-45%2045S117%20536.852%20117%20512c0-218.152%20176.848-395%20395-395S907%20293.848%20907%20512%20730.152%20907%20512%20907z'%20fill='%23444444'%20p-id='78325'%3e%3c/path%3e%3c/svg%3e",
-							alt: "spin",
-							className: "h-8 w-8 animate-[spin_2s_linear_infinite]"
-						})
-					]
-				}), WALLETS.map((w) => /* @__PURE__ */ jsxs("button", {
+				children: WALLETS.map((w) => /* @__PURE__ */ jsxs("button", {
 					type: "button",
-					onClick: () => {
-						setIsConnectCalled(true);
-						connect(w);
-					},
+					onClick: () => connect(w),
 					className: "flex w-full cursor-pointer items-center gap-2 rounded-xl border border-gray-300 px-4 py-2 hover:bg-gray-100",
 					children: [/* @__PURE__ */ jsx("img", {
 						src: w.icon,
@@ -497,7 +466,7 @@ function MiniWalletButton({ label = "Connect Wallet" }) {
 							]
 						})]
 					})]
-				}, w.id))]
+				}, w.id))
 			})]
 		})
 	})] });

package/package.json

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