@web3auth/modal 10.7.0 → 10.8.1

package/dist/lib.esm/packages/modal/src/vue/solana/composables/useSolanaWallet.js

@@ -1,6 +1,7 @@
 import { Connection } from '@solana/web3.js';
 import { CHAIN_NAMESPACES, SolanaWallet } from '@web3auth/no-modal';
-import { ref, shallowRef, watch } from 'vue';
+import { ref, shallowRef, computed, watch } from 'vue';
+import { useChain } from '../../composables/useChain.js';
 import '@web3auth/no-modal/vue';
 import { useWeb3Auth } from '../../composables/useWeb3Auth.js';
 
@@ -9,12 +10,19 @@ const useSolanaWallet = () => {
     provider,
     web3Auth
   } = useWeb3Auth();
+  const {
+    chainNamespace
+  } = useChain();
   const accounts = ref([]);
   const solanaWallet = shallowRef(null);
   const connection = shallowRef(null);
+  const isSolana = computed(() => chainNamespace.value === CHAIN_NAMESPACES.SOLANA);
   const setupWallet = async () => {
-    var _web3Auth$value, _web3Auth$value2;
-    if (!((_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.currentChain) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chainNamespace) || web3Auth.value.currentChain.chainNamespace !== CHAIN_NAMESPACES.SOLANA) {
+    var _web3Auth$value;
+    if (!isSolana.value) {
+      return;
+    }
+    if (!provider.value) {
       return;
     }
     solanaWallet.value = new SolanaWallet(provider.value);
@@ -22,19 +30,26 @@ const useSolanaWallet = () => {
     if ((result === null || result === void 0 ? void 0 : result.length) > 0) {
       accounts.value = result;
     }
-    connection.value = new Connection((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || (_web3Auth$value2 = _web3Auth$value2.currentChain) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.rpcTarget);
+    if ((_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.currentChain) !== null && _web3Auth$value !== void 0 && _web3Auth$value.rpcTarget) {
+      connection.value = new Connection(web3Auth.value.currentChain.rpcTarget);
+    }
+  };
+  const resetWallet = () => {
+    solanaWallet.value = null;
+    accounts.value = null;
+    connection.value = null;
   };
   if (provider.value && !solanaWallet.value) {
     setupWallet();
   }
-  watch(provider, async newVal => {
-    if (!newVal && solanaWallet.value) {
-      solanaWallet.value = null;
-      accounts.value = null;
-      connection.value = null;
+  watch([provider, chainNamespace], async ([newProvider, newChainNamespace]) => {
+    if (!newProvider || newChainNamespace !== CHAIN_NAMESPACES.SOLANA) {
+      if (solanaWallet.value) {
+        resetWallet();
+      }
       return;
     }
-    if (newVal && !solanaWallet.value) {
+    if (newProvider && !solanaWallet.value) {
       setupWallet();
     }
   }, {

package/dist/lib.esm/packages/modal/src/vue/wagmi/provider.js

@@ -12,11 +12,14 @@ import { useWeb3AuthDisconnect } from '../composables/useWeb3AuthDisconnect.js';
 import { defaultWagmiConfig } from './constants.js';
 
 const WEB3AUTH_CONNECTOR_ID = "web3auth";
+function getWeb3authConnector(config) {
+  return config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
+}
 
 // Helper to initialize connectors for the given wallets
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function setupConnector(provider, config) {
-  let connector = config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
+  let connector = getWeb3authConnector(config);
   if (connector) return connector;
 
   // Create new connector if not already existing
@@ -53,8 +56,15 @@ async function connectWeb3AuthWithWagmi(connector, config) {
     status: "connected"
   }));
 }
-async function disconnectWeb3AuthFromWagmi(config) {
+function resetConnectorState(config) {
   config._internal.connectors.setState(prev => prev.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID));
+  config.connectors.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID);
+}
+async function disconnectWeb3AuthFromWagmi(config) {
+  var _config$storage3, _config$storage4;
+  const connector = getWeb3authConnector(config);
+  await Promise.all([(_config$storage3 = config.storage) === null || _config$storage3 === void 0 ? void 0 : _config$storage3.setItem(`${connector === null || connector === void 0 ? void 0 : connector.id}.disconnected`, true), (_config$storage4 = config.storage) === null || _config$storage4 === void 0 ? void 0 : _config$storage4.removeItem("injected.connected")]);
+  resetConnectorState(config);
   config.setState(state => _objectSpread(_objectSpread({}, state), {}, {
     chainId: state.chainId,
     connections: new Map(),
@@ -80,6 +90,12 @@ const Web3AuthWagmiProvider = defineComponent({
       onDisconnect: async () => {
         log.info("Disconnected from wagmi");
         if (isConnected.value) await disconnect();
+        const connector = getWeb3authConnector(wagmiConfig);
+        // reset wagmi connector state if the provider handles disconnection because of the accountsChanged event
+        // from the connected provider
+        if (connector) {
+          resetConnectorState(wagmiConfig);
+        }
       }
     });
     watch(isConnected, async newIsConnected => {