@monygroupcorp/micro-web3 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monygroupcorp/micro-web3",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A lean, reusable Web3 toolkit with components for wallet connection, IPFS, and common Web3 UI patterns.",
   "main": "dist/micro-web3.cjs",
   "module": "dist/micro-web3.esm.js",

package/src/components/FloatingWalletButton/FloatingWalletButton.js

@@ -49,30 +49,31 @@ export class FloatingWalletButton extends Component {
             let isConnected = this.walletService.isConnected();
             let address = this.walletService.getAddress();
 
-            // If not connected, try to auto-reconnect to last used wallet
+            // If not connected, check if window.ethereum already has connected accounts
             if (!isConnected && typeof window.ethereum !== 'undefined') {
                 try {
-                    const lastWallet = localStorage.getItem('ms2fun_lastWallet');
-
-                    if (lastWallet) {
-                        // Check if that wallet has accounts (without prompting)
-                        const accounts = await window.ethereum.request({ method: 'eth_accounts' });
-                        const hasAccounts = accounts && accounts.length > 0;
-
-                        // Only try to reconnect if the last wallet has accounts
-                        if (hasAccounts) {
-                            try {
-                                await this.walletService.selectWallet(lastWallet);
-                                await this.walletService.connect();
-                                isConnected = this.walletService.isConnected();
-                                address = this.walletService.getAddress();
-
-                                if (isConnected) {
-                                    console.log('[FloatingWalletButton] Auto-reconnected to', lastWallet);
-                                }
-                            } catch (connectError) {
-                                console.log('[FloatingWalletButton] Auto-reconnect not possible');
+                    // eth_accounts returns already-authorized accounts without prompting
+                    const accounts = await window.ethereum.request({ method: 'eth_accounts' });
+                    const hasAccounts = accounts && accounts.length > 0;
+
+                    if (hasAccounts) {
+                        // Detect which wallet is active
+                        const walletType = this._detectWalletType();
+                        console.log('[FloatingWalletButton] Detected existing connection:', walletType, accounts[0]);
+
+                        try {
+                            await this.walletService.selectWallet(walletType);
+                            await this.walletService.connect();
+                            isConnected = this.walletService.isConnected();
+                            address = this.walletService.getAddress();
+
+                            if (isConnected) {
+                                console.log('[FloatingWalletButton] Auto-connected to existing session:', walletType);
+                                // Update lastWallet for future sessions
+                                localStorage.setItem('ms2fun_lastWallet', walletType);
                             }
+                        } catch (connectError) {
+                            console.log('[FloatingWalletButton] Could not auto-connect:', connectError.message);
                         }
                     }
                 } catch (error) {
@@ -91,6 +92,21 @@ export class FloatingWalletButton extends Component {
         }
     }
 
+    /**
+     * Detect which wallet type is currently active based on provider flags
+     */
+    _detectWalletType() {
+        if (typeof window.ethereum === 'undefined') return 'metamask';
+
+        // Check specific wallet flags (order matters - more specific first)
+        if (window.ethereum.isRabby) return 'rabby';
+        if (window.ethereum.isRainbow) return 'rainbow';
+        if (window.phantom?.ethereum) return 'phantom';
+
+        // Default to metamask for any EIP-1193 provider
+        return 'metamask';
+    }
+
     /**
      * Load wallet info (balance, EXEC tokens, vault benefactor status)
      */