From 6767b8ddcd976e454842edafc0fc3d05cf93a166 Mon Sep 17 00:00:00 2001
From: impelcrypto <impelcrypto@gmail.com>
Date: Mon, 19 May 2025 12:47:43 +0800
Subject: [PATCH 1/2] fix: removed zkEVM switch

---
 src/components/assets/Account.vue | 45 -------------------------------
 1 file changed, 45 deletions(-)

diff --git a/src/components/assets/Account.vue b/src/components/assets/Account.vue
index 1e3489591..e42a2ff9b 100644
--- a/src/components/assets/Account.vue
+++ b/src/components/assets/Account.vue
@@ -12,51 +12,6 @@
             </span>
           </div>
           <div v-else />
-          <div class="wallet-tab__bg">
-            <template v-if="isH160">
-              <template v-if="isZkEvm">
-                <template v-if="currentNetworkIdx === endpointKey.ASTAR_ZKEVM">
-                  <a class="btn" href="/astar/assets"> Astar EVM (L1) </a>
-                  <div class="btn active">Astar zkEVM</div>
-                </template>
-                <template v-if="currentNetworkIdx === endpointKey.ZKYOTO">
-                  <a class="btn" href="/shibuya-testnet/assets"> Shibuya EVM (L1) </a>
-                  <div class="btn active">Astar zKyoto</div>
-                </template>
-              </template>
-
-              <template v-else>
-                <div class="btn active">
-                  {{ currentNetworkName.replace('Network', '') }}
-                  EVM (L1)
-                </div>
-                <a
-                  v-if="currentNetworkIdx === endpointKey.SHIBUYA"
-                  class="btn"
-                  href="/zkyoto-testnet/assets"
-                >
-                  Astar zKyoto
-                </a>
-                <a
-                  v-else-if="currentNetworkIdx === endpointKey.ASTAR"
-                  href="/astar-zkevm/assets"
-                  class="btn"
-                >
-                  Astar zkEVM
-                </a>
-              </template>
-            </template>
-
-            <!-- Native -->
-            <div v-else class="btn active">
-              {{
-                currentNetworkIdx === endpointKey.ZKYOTO
-                  ? 'Astar'
-                  : currentNetworkName.replace('Network', '')
-              }}
-              {{ $t('native') }}
-            </div>
-          </div>
         </div>
 
         <div class="row">

From e338a55f1b536ba04ae898270f8b3e11f064ef44 Mon Sep 17 00:00:00 2001
From: impelcrypto <impelcrypto@gmail.com>
Date: Mon, 19 May 2025 13:01:15 +0800
Subject: [PATCH 2/2] fix: clean up

---
 src/components/assets/Account.vue | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/components/assets/Account.vue b/src/components/assets/Account.vue
index e42a2ff9b..2f76c7952 100644
--- a/src/components/assets/Account.vue
+++ b/src/components/assets/Account.vue
@@ -5,13 +5,31 @@
         <div class="account-bg" :style="{ backgroundImage: `url(${bg})` }" />
 
         <div class="wallet-tab">
-          <div v-if="isLockdropAccount && !isZkEvm" class="row--lockdrop">
+          <div v-if="isLockdropAccount" class="row--lockdrop">
             <span>{{ $t('assets.lockdropAccount') }}</span>
             <span class="text--switch-account" @click="toggleEvmWalletSchema">
               {{ $t(isH160 ? 'assets.switchToNative' : 'assets.switchToEvm') }}
             </span>
           </div>
           <div v-else />
+          <div class="wallet-tab__bg">
+            <div v-if="isH160">
+              <div class="btn active">
+                {{ currentNetworkName.replace('Network', '') }}
+                EVM (L1)
+              </div>
+            </div>
+
+            <!-- Native -->
+            <div v-else class="btn active">
+              {{
+                currentNetworkIdx === endpointKey.ZKYOTO
+                  ? 'Astar'
+                  : currentNetworkName.replace('Network', '')
+              }}
+              {{ $t('native') }}
+            </div>
+          </div>
         </div>
 
         <div class="row">
@@ -173,7 +191,7 @@ export default defineComponent({
     const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);
     const isEthWallet = computed<boolean>(() => store.getters['general/isEthWallet']);
 
-    const { currentNetworkIdx, isZkEvm } = useNetworkInfo();
+    const { currentNetworkIdx } = useNetworkInfo();
 
     const isWalletConnect = computed<boolean>(() => {
       const currentWallet = store.getters['general/currentWallet'];
@@ -216,11 +234,10 @@ export default defineComponent({
     };
 
     watch(
-      [balance, props, currentAccount, ledger, isZkEvm],
+      [balance, props, currentAccount, ledger],
       () => {
         balUsd.value = null;
-        const h160LockedBal =
-          isZkEvm.value || !isH160.value ? '0' : String(ledger?.value?.locked.toString());
+        const h160LockedBal = !isH160.value ? '0' : String(ledger?.value?.locked.toString());
         if (!balance.value || !props.nativeTokenUsd) return;
 
         const bal =
@@ -318,7 +335,6 @@ export default defineComponent({
       isAccountUnification,
       unifiedAccount,
       isAccountUnified,
-      isZkEvm,
       bg,
       currentNetworkIdx,
       currentNetworkName,