From 403bd627a8dc2fac81cd3509ca160067797d2e67 Mon Sep 17 00:00:00 2001
From: Lukasz Kosiak <lukasz@zilliqa.com>
Date: Thu, 23 Apr 2026 11:08:48 +0200
Subject: [PATCH 1/4] feat: enhance account modal with EVM support and update
 account display logic

---
 .../src/components/Modal/Account.vue          | 19 ++++++++++++++++---
 .../src/store/modules/web3.ts                 | 10 ++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/products/governance-snapshot/src/components/Modal/Account.vue b/products/governance-snapshot/src/components/Modal/Account.vue
index d3d1df404..903feb9dc 100644
--- a/products/governance-snapshot/src/components/Modal/Account.vue
+++ b/products/governance-snapshot/src/components/Modal/Account.vue
@@ -33,7 +33,7 @@
       <h3 class="m-4 mb-0 text-center">Account</h3>
       <div v-if="$auth.isAuthenticated" class="m-4">
         <a
-          :href="_explorer(web3.network.name, web3.account.bech32)"
+          :href="accountExplorerUrl"
           target="_blank"
           class="mb-2 d-block"
         >
@@ -43,8 +43,7 @@
               size="16"
               class="mr-2 ml-n1"
             />
-            <span v-if="web3.name" v-text="_shorten(web3.name)" />
-            <span v-else v-text="_shorten(web3.account.bech32)" />
+            <span v-text="_shorten(accountDisplayAddress)" />
             <Icon name="external-link" class="ml-1" />
           </UiButton>
         </a>
@@ -70,6 +69,20 @@ export default {
       step: null
     };
   },
+  computed: {
+    accountDisplayAddress() {
+      if (this.web3.isEVM) {
+        return '0x' + this.web3.account.base16;
+      }
+      return this.web3.account.bech32;
+    },
+    accountExplorerUrl() {
+      if (this.web3.isEVM) {
+        return `https://zilliqa.blockscout.com/address/0x${this.web3.account.base16}`;
+      }
+      return this._explorer(this.web3.network.name, this.web3.account.bech32);
+    }
+  },
   watch: {
     open() {
       this.step = null;
diff --git a/products/governance-snapshot/src/store/modules/web3.ts b/products/governance-snapshot/src/store/modules/web3.ts
index 8b8d4b995..da2ff537b 100644
--- a/products/governance-snapshot/src/store/modules/web3.ts
+++ b/products/governance-snapshot/src/store/modules/web3.ts
@@ -19,13 +19,15 @@ const state = {
     bech32: ''
   },
   name: null,
-  network: config.networks['mainnet']
+  network: config.networks['mainnet'],
+  isEVM: false
 };
 
 const mutations = {
   LOGOUT(_state) {
     Vue.set(_state, 'account', null);
     Vue.set(_state, 'name', null);
+    Vue.set(_state, 'isEVM', false);
     console.debug('LOGOUT');
   },
   LOAD_PROVIDER_REQUEST() {
@@ -57,6 +59,9 @@ const mutations = {
   HANDLE_ACCOUNTS_CHANGED(_state, payload) {
     Vue.set(_state, 'account', payload);
     console.debug('HANDLE_ACCOUNTS_CHANGED', payload);
+  },
+  SET_IS_EVM(_state, value: boolean) {
+    Vue.set(_state, 'isEVM', value);
   }
 };
 
@@ -82,7 +87,8 @@ const actions = {
         const base16 = auth.provider.address.slice(2).toLowerCase();
         const bech32 = toBech32Address('0x' + base16);
         commit('HANDLE_CHAIN_CHANGED', 'mainnet');
-        commit('LOAD_PROVIDER_SUCCESS', { account: { base16, bech32 }, name: bech32 });
+        commit('SET_IS_EVM', true);
+        commit('LOAD_PROVIDER_SUCCESS', { account: { base16, bech32 }, name: '0x' + base16 });
 
         // Subscribe to future account changes (e.g. user switches wallet in MetaMask)
         window['ethereum'].on('accountsChanged', (accounts: string[]) => {

From 781ba00b562d4dc32fa55cb125292de56dfab86d Mon Sep 17 00:00:00 2001
From: Lukasz Kosiak <lukasz@zilliqa.com>
Date: Thu, 23 Apr 2026 11:23:37 +0200
Subject: [PATCH 2/4] feat: add disconnect button to account modal and fix EVM
 wallet logout

- Add Disconnect button to the Account modal (was permanently hidden via v-show="!web3")
- Fix LOGOUT and LOAD_PROVIDER_FAILURE mutations to reset account to empty object instead of null, preventing null-dereference crashes in templates
- Await $auth.logout() before committing LOGOUT to avoid a race condition where account becomes null while isAuthenticated is still true
- Remove unused "Connect wallet" button from the account view and clean up dead step data property and watcher

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../src/components/Modal/Account.vue          | 19 ++++---------------
 .../src/store/modules/web3.ts                 |  6 +++---
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/products/governance-snapshot/src/components/Modal/Account.vue b/products/governance-snapshot/src/components/Modal/Account.vue
index 903feb9dc..853280e08 100644
--- a/products/governance-snapshot/src/components/Modal/Account.vue
+++ b/products/governance-snapshot/src/components/Modal/Account.vue
@@ -1,6 +1,6 @@
 <template>
   <UiModal :open="open" @close="$emit('close')">
-    <div v-if="!web3.account.bech32 || step === 'connect'">
+    <div v-if="!web3.account.bech32">
       <h3 class="m-4 mb-0 text-center">Connect wallet</h3>
       <div class="m-4 mb-5">
         <a
@@ -48,11 +48,10 @@
           </UiButton>
         </a>
         <UiButton
-          v-show="!web3"
-          @click="step = 'connect'"
-          class="button-outline width-full mb-2"
+          @click="handleLogout"
+          class="button-outline width-full text-red mb-2"
         >
-          Connect wallet
+          Disconnect
         </UiButton>
       </div>
     </div>
@@ -64,11 +63,6 @@ import { mapActions } from 'vuex';
 
 export default {
   props: ['open'],
-  data() {
-    return {
-      step: null
-    };
-  },
   computed: {
     accountDisplayAddress() {
       if (this.web3.isEVM) {
@@ -83,11 +77,6 @@ export default {
       return this._explorer(this.web3.network.name, this.web3.account.bech32);
     }
   },
-  watch: {
-    open() {
-      this.step = null;
-    }
-  },
   methods: {
     ...mapActions(['logout']),
     async handleLogout() {
diff --git a/products/governance-snapshot/src/store/modules/web3.ts b/products/governance-snapshot/src/store/modules/web3.ts
index da2ff537b..d17222d71 100644
--- a/products/governance-snapshot/src/store/modules/web3.ts
+++ b/products/governance-snapshot/src/store/modules/web3.ts
@@ -25,7 +25,7 @@ const state = {
 
 const mutations = {
   LOGOUT(_state) {
-    Vue.set(_state, 'account', null);
+    Vue.set(_state, 'account', { base16: '', bech32: '' });
     Vue.set(_state, 'name', null);
     Vue.set(_state, 'isEVM', false);
     console.debug('LOGOUT');
@@ -40,7 +40,7 @@ const mutations = {
     console.debug('LOAD_PROVIDER_SUCCESS');
   },
   LOAD_PROVIDER_FAILURE(_state, payload) {
-    Vue.set(_state, 'account', null);
+    Vue.set(_state, 'account', { base16: '', bech32: '' });
     console.debug('LOAD_PROVIDER_FAILURE', payload);
   },
   HANDLE_CHAIN_CHANGED(_state, net) {
@@ -76,7 +76,7 @@ const actions = {
     }
   },
   logout: async ({ commit }) => {
-    Vue.prototype.$auth.logout();
+    await Vue.prototype.$auth.logout();
     commit('LOGOUT');
   },
   loadProvider: async ({ commit }) => {

From d63b37c10071c59a571e80fb6f295273798824e6 Mon Sep 17 00:00:00 2001
From: Lukasz Kosiak <lukasz@zilliqa.com>
Date: Thu, 23 Apr 2026 12:03:28 +0200
Subject: [PATCH 3/4] fix: ensure logout always clears state and surfaces
 errors to user

Wrap $auth.logout() in try/catch/finally so LOGOUT commit always runs
even if the provider rejects, and dispatch a red notification on failure.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../governance-snapshot/src/store/modules/web3.ts     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/products/governance-snapshot/src/store/modules/web3.ts b/products/governance-snapshot/src/store/modules/web3.ts
index d17222d71..0d04a6f32 100644
--- a/products/governance-snapshot/src/store/modules/web3.ts
+++ b/products/governance-snapshot/src/store/modules/web3.ts
@@ -75,9 +75,14 @@ const actions = {
       await dispatch('loadProvider');
     }
   },
-  logout: async ({ commit }) => {
-    await Vue.prototype.$auth.logout();
-    commit('LOGOUT');
+  logout: async ({ commit, dispatch }) => {
+    try {
+      await Vue.prototype.$auth.logout();
+    } catch (e) {
+      dispatch('notify', ['red', 'Logout failed. Please try again.']);
+    } finally {
+      commit('LOGOUT');
+    }
   },
   loadProvider: async ({ commit }) => {
     commit('LOAD_PROVIDER_REQUEST');

From 08733a9dd929529e5957761da5018373b720ede9 Mon Sep 17 00:00:00 2001
From: Lukasz Kosiak <lukasz@zilliqa.com>
Date: Thu, 23 Apr 2026 12:08:41 +0200
Subject: [PATCH 4/4] docs: document mainnet-only wallet connectivity
 limitation in governance-snapshot README

The governance portal is scheduled for deprecation and testnet will not
be supported. Documents the known limitation that EVM wallet explorer links
are hardcoded to zilliqa.blockscout.com (mainnet).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 products/governance-snapshot/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/products/governance-snapshot/README.md b/products/governance-snapshot/README.md
index bef083e27..47ad8be1b 100644
--- a/products/governance-snapshot/README.md
+++ b/products/governance-snapshot/README.md
@@ -70,6 +70,17 @@ When confirmed, the application ([src/store/modules/app.ts](src/store/modules/ap
 3.  **Authorize**: The address owner calculates the vote intention locally and cryptographically signs it using their private key (managed by the wallet software).
 4.  **Submit**: The signed intent is relayed to a centralized hub for aggregation.
 
+## Wallet Connectivity
+
+The portal supports two wallet types, both of which require **mainnet**. Testnet is not supported and no fix is planned, as this portal is scheduled for deprecation.
+
+| Wallet | Connector ID | Notes |
+|--------|-------------|-------|
+| ZilPay | `zlp` | Native Zilliqa wallet; displays bech32 address; links to the configured network explorer |
+| EVM Wallet (e.g. MetaMask) | `evm` | MetaMask-compatible; displays `0x`-prefixed address; links to [zilliqa.blockscout.com](https://zilliqa.blockscout.com) (mainnet only — hardcoded) |
+
+The EVM wallet block-explorer link is hardcoded to `https://zilliqa.blockscout.com`, so it will always point to mainnet regardless of the connected network. This is a known limitation that will not be addressed before deprecation.
+
 ## Development