From 5db0181dec8169314bd5414a8e1b2711b30fe530 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Mon, 31 Mar 2025 12:46:56 +0200
Subject: [PATCH 1/9] Change zkEVM RPC endpoint (#1457)

---
 src/config/chainEndpoints.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/chainEndpoints.ts b/src/config/chainEndpoints.ts
index de5ede883..4062ebc02 100644
--- a/src/config/chainEndpoints.ts
+++ b/src/config/chainEndpoints.ts
@@ -130,7 +130,7 @@ export const providerEndpoints: ChainProvider[] = [
     subscan: 'https://astar.subscan.io',
     blockscout: 'https://astar-zkevm.explorer.startale.com',
     evmChainId: '3776',
-    evmEndpoints: ['https://rpc.startale.com/astar-zkevm'],
+    evmEndpoints: ['https://rpc-zkevm.astar.network'],
     faucetEndpoint: '',
     defaultLogo:
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/zkatana-logo.png?raw=true',

From ba7158be3c2c7fe5e6b80933547a6e67a436e405 Mon Sep 17 00:00:00 2001
From: Taegeon Alan Go <tae.gun7784@gmail.com>
Date: Tue, 1 Apr 2025 18:00:24 +0900
Subject: [PATCH 2/9] pin firebase-tools version to 13.35.1 in PR preview
 workflow (#1458)

* pin firebase-tools version to 13.35.1 in PR preview workflow

* pin firebase-tools version to 13.35.1 in staging deployment workflow
---
 .github/workflows/deploy-to-staging.yml    | 1 +
 .github/workflows/pull-request-preview.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/deploy-to-staging.yml b/.github/workflows/deploy-to-staging.yml
index fbd3c780a..0c47905f3 100644
--- a/.github/workflows/deploy-to-staging.yml
+++ b/.github/workflows/deploy-to-staging.yml
@@ -21,3 +21,4 @@ jobs:
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_ASTAR_APPS_STAGING }}'
           channelId: live
           projectId: astar-apps-staging
+          firebaseToolsVersion: 13.35.1
diff --git a/.github/workflows/pull-request-preview.yml b/.github/workflows/pull-request-preview.yml
index baf4544ff..601641efc 100644
--- a/.github/workflows/pull-request-preview.yml
+++ b/.github/workflows/pull-request-preview.yml
@@ -36,6 +36,7 @@ jobs:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_ASTAR_APPS }}'
           projectId: astar-apps
+          firebaseToolsVersion: 13.35.1
   e2etest:
     permissions:
       checks: write

From 02fce096f72fc2bb96fc2a4444efaa62205e1dd1 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Tue, 8 Apr 2025 11:09:40 +0200
Subject: [PATCH 3/9] Enable unstake from unregistered (#1461)

---
 src/staking-v3/components/my-staking/MyDapps.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/staking-v3/components/my-staking/MyDapps.vue b/src/staking-v3/components/my-staking/MyDapps.vue
index 82bb8afb5..5b2aafe0d 100644
--- a/src/staking-v3/components/my-staking/MyDapps.vue
+++ b/src/staking-v3/components/my-staking/MyDapps.vue
@@ -37,7 +37,6 @@
           {{ $t('stakingV3.unregisteredDappInfo', { days: constants?.unlockingPeriod ?? '--' }) }}
         </span>
         <astar-button
-          :disabled="true"
           class="btn--unregistered-dapp"
           @click="unstakeFromUnregistered(key, getDappName(key))"
         >

From 2f178d4057c575734af9a4b98c65e956e361add6 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Thu, 10 Apr 2025 10:45:42 +0200
Subject: [PATCH 4/9] Disable zk bridges and network selection (#1456)

* Disable zk bridges and network selection

* Hide network disabled comments
---
 src/components/bridge/BridgeSelection.vue      | 8 ++++----
 src/components/header/modals/SelectNetwork.vue | 1 +
 src/features.ts                                | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index f41c9b016..12ac5fe61 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -191,9 +191,9 @@
           <p v-if="!isZkEvm" class="text--bridge-details">
             {{ $t('bridge.ethereumBridge.remark') }}
           </p>
-          <p v-if="!nativeBridgeEnabled" class="text--bridge-details">
+          <!-- <p v-if="!nativeBridgeEnabled" class="text--bridge-details">
             {{ $t('bridge.bridgeMaintenanceMode') }}
-          </p>
+          </p> -->
         </div>
 
         <div class="column--selection">
@@ -230,9 +230,9 @@
           <p v-if="!isEnableLzBridge" class="text--bridge-details">
             {{ $t('bridge.astarBridge.remark') }}
           </p>
-          <p v-if="!layerZeroBridgeEnabled" class="text--bridge-details">
+          <!-- <p v-if="!layerZeroBridgeEnabled" class="text--bridge-details">
             {{ $t('bridge.bridgeMaintenanceMode') }}
-          </p>
+          </p> -->
         </div>
 
         <div class="column--selection">
diff --git a/src/components/header/modals/SelectNetwork.vue b/src/components/header/modals/SelectNetwork.vue
index 7401d7bb5..0bdcc95c7 100644
--- a/src/components/header/modals/SelectNetwork.vue
+++ b/src/components/header/modals/SelectNetwork.vue
@@ -12,6 +12,7 @@
       </button>
 
       <button
+        :disabled="true"
         class="card--astar box--hover--active"
         :class="selNetworkId === endpointKey.ASTAR_ZKEVM && 'border--active'"
         @click="setSelNetwork(endpointKey.ASTAR_ZKEVM)"
diff --git a/src/features.ts b/src/features.ts
index ac4a87f18..207aba319 100644
--- a/src/features.ts
+++ b/src/features.ts
@@ -1,8 +1,8 @@
 import { CcipNetworkName } from './modules/ccip-bridge';
 
 // Bridges
-export const nativeBridgeEnabled = true;
-export const layerZeroBridgeEnabled = true;
+export const nativeBridgeEnabled = false;
+export const layerZeroBridgeEnabled = false;
 export const layerSwapBridgeEnabled = false;
 export const celerBridgeEnabled = true;
 export const omniBridgeEnabled = true;

From ea934fae76179cc38ad8130175d52f198c1792a5 Mon Sep 17 00:00:00 2001
From: Roy <92044428+impelcrypto@users.noreply.github.com>
Date: Wed, 16 Apr 2025 10:36:58 +0800
Subject: [PATCH 5/9] hotfix: removed zkEVM links (#1462)

* feat: removed zkEVM links

* feat: updated Astar button

* fix: rollback
---
 src/components/assets/EvmNativeToken.vue      |  30 +----
 src/components/bridge/BridgeSelection.vue     | 110 +-----------------
 .../header/modals/ModalNetworkWallet.vue      |  11 --
 .../header/modals/SelectNetwork.vue           |  23 +---
 src/components/header/modals/SelectWallet.vue |   6 -
 src/hooks/useAppRouter.ts                     |  14 ++-
 src/i18n/en-US/index.ts                       |  26 -----
 src/modules/token/utils/index.ts              |   8 +-
 8 files changed, 17 insertions(+), 211 deletions(-)

diff --git a/src/components/assets/EvmNativeToken.vue b/src/components/assets/EvmNativeToken.vue
index b35c6da78..f014edd66 100644
--- a/src/components/assets/EvmNativeToken.vue
+++ b/src/components/assets/EvmNativeToken.vue
@@ -124,30 +124,6 @@
           />
         </div>
 
-        <custom-router-link
-          v-if="isAstar"
-          :to="buildLzBridgePageLink()"
-          :is-disabled="!layerZeroBridgeEnabled"
-        >
-          <button class="btn btn--icon"><astar-icon-bridge /></button>
-          <span class="text--mobile-menu">{{ $t('assets.bridgeToZkEvm') }}</span>
-          <q-tooltip>
-            <span class="text--tooltip">{{ $t('assets.bridgeToZkEvm') }}</span>
-          </q-tooltip>
-        </custom-router-link>
-
-        <custom-router-link
-          v-if="isZkEvm"
-          :to="buildEthereumBridgePageLink()"
-          :is-disabled="!nativeBridgeEnabled"
-        >
-          <button class="btn btn--icon"><astar-icon-bridge /></button>
-          <span class="text--mobile-menu">{{ $t('assets.bridge') }}</span>
-          <q-tooltip>
-            <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
-          </q-tooltip>
-        </custom-router-link>
-
         <!-- Only SDN is able to bridge via cBridge at this moment -->
         <!-- <a
           v-if="nativeTokenSymbol === 'SDN'"
@@ -205,7 +181,6 @@ import { useAccount, useBreakpoints, useFaucet, useNetworkInfo } from 'src/hooks
 import { faucetSethLink } from 'src/links';
 import { getTokenImage } from 'src/modules/token';
 import {
-  buildCcipBridgePageLink,
   buildEthereumBridgePageLink,
   buildLzBridgePageLink,
   buildTransferPageLink,
@@ -214,7 +189,7 @@ import { useStore } from 'src/store';
 import { computed, defineComponent, ref, watch, watchEffect } from 'vue';
 
 import CustomRouterLink from '../common/CustomRouterLink.vue';
-import { CcipNetworkName, CcipNetworkParam } from 'src/modules/ccip-bridge';
+import { CcipNetworkName } from 'src/modules/ccip-bridge';
 
 export default defineComponent({
   components: { ModalFaucet, CustomRouterLink, Balloon },
@@ -242,7 +217,6 @@ export default defineComponent({
     const {
       currentNetworkName,
       nativeTokenSymbol,
-      isZkEvm,
       isAstar,
       isShibuyaEvm,
       isAstarEvm,
@@ -268,7 +242,6 @@ export default defineComponent({
       getTokenImage({
         isNativeToken: true,
         symbol: nativeTokenSymbol.value,
-        isZkEvm: isZkEvm.value,
       })
     );
 
@@ -349,7 +322,6 @@ export default defineComponent({
       cbridgeAppLink,
       isFaucet,
       isModalFaucet,
-      isZkEvm,
       faucetSethLink,
       width,
       screenSize,
diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index 12ac5fe61..2e66d3f89 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -52,7 +52,7 @@
             </component>
           </button>
           <p v-if="!isAstarEvm && !isShibuyaEvm" class="text--bridge-details">
-            {{ $t('bridge.ccipSoneiumBridge.remark') }}
+            {{ $t('bridge.ccipAstrBridge.remark') }}
           </p>
         </div>
 
@@ -157,114 +157,6 @@
             {{ $t('bridge.celerBridge.warning') }}
           </p>
         </div>
-        <div class="column--selection">
-          <button :disabled="!isEnableEthBridge">
-            <component
-              :is="isEnableEthBridge ? 'router-link' : 'div'"
-              :to="buildEthereumBridgePageLink()"
-              class="button--bridge"
-            >
-              <div class="row--logo-bg">
-                <div class="img--logo-bg">
-                  <img
-                    class="img--logo"
-                    :src="require('src/assets/img/chain/ethereum-gray.svg')"
-                    alt="ethereum"
-                  />
-                </div>
-              </div>
-              <div class="row--bridge-title">
-                <div class="text--bridge-tag">
-                  <q-chip outline>
-                    {{ $t('bridge.ethereumBridge.tag') }}
-                  </q-chip>
-                </div>
-                <span class="text--bridge-title">{{ $t('bridge.ethereumBridge.title') }}</span>
-                <div class="box--text-bridge">
-                  <span class="text--bridge">
-                    {{ $t('bridge.ethereumBridge.text', { l1: l1Name, l2: l2Name }) }}
-                  </span>
-                </div>
-              </div>
-            </component>
-          </button>
-          <p v-if="!isZkEvm" class="text--bridge-details">
-            {{ $t('bridge.ethereumBridge.remark') }}
-          </p>
-          <!-- <p v-if="!nativeBridgeEnabled" class="text--bridge-details">
-            {{ $t('bridge.bridgeMaintenanceMode') }}
-          </p> -->
-        </div>
-
-        <div class="column--selection">
-          <button :disabled="!isEnableLzBridge || !layerZeroBridgeEnabled">
-            <component
-              :is="isEnableLzBridge && layerZeroBridgeEnabled ? 'router-link' : 'div'"
-              :to="buildLzBridgePageLink()"
-              class="button--bridge"
-            >
-              <div class="row--logo-bg">
-                <div class="img--logo-bg">
-                  <img
-                    class="img--logo"
-                    :src="require('src/assets/img/layerzero_bridge_logo.svg')"
-                    alt="astar-bridge"
-                  />
-                </div>
-              </div>
-              <div class="row--bridge-title">
-                <div class="text--bridge-tag">
-                  <q-chip outline>
-                    {{ $t('bridge.astarBridge.tag') }}
-                  </q-chip>
-                </div>
-                <span class="text--bridge-title">{{ $t('bridge.astarBridge.title') }}</span>
-                <div class="box--text-bridge">
-                  <span class="text--bridge">
-                    {{ $t('bridge.astarBridge.text') }}
-                  </span>
-                </div>
-              </div>
-            </component>
-          </button>
-          <p v-if="!isEnableLzBridge" class="text--bridge-details">
-            {{ $t('bridge.astarBridge.remark') }}
-          </p>
-          <!-- <p v-if="!layerZeroBridgeEnabled" class="text--bridge-details">
-            {{ $t('bridge.bridgeMaintenanceMode') }}
-          </p> -->
-        </div>
-
-        <div class="column--selection">
-          <button
-            :disabled="!layerSwapBridgeEnabled"
-            class="button--bridge"
-            @click="navigateInNewTab(layerSwapLink)"
-          >
-            <div class="row--logo-bg">
-              <div class="img--logo-bg">
-                <img
-                  class="img--logo"
-                  :src="require('src/assets/img/layerswap_logo.svg')"
-                  alt="layer-swap"
-                />
-              </div>
-            </div>
-            <div class="row--bridge-title">
-              <div class="text--bridge-tag">
-                <q-chip outline>
-                  {{ $t('bridge.layerSwap.tag') }}
-                </q-chip>
-              </div>
-              <span class="text--bridge-title">{{ $t('bridge.layerSwap.title') }}</span>
-              <div class="box--text-bridge">
-                <span class="text--bridge">
-                  {{ $t('bridge.layerSwap.text') }}
-                </span>
-              </div>
-            </div>
-          </button>
-        </div>
       </div>
     </div>
   </div>
diff --git a/src/components/header/modals/ModalNetworkWallet.vue b/src/components/header/modals/ModalNetworkWallet.vue
index 181caa521..68772fa1d 100644
--- a/src/components/header/modals/ModalNetworkWallet.vue
+++ b/src/components/header/modals/ModalNetworkWallet.vue
@@ -21,7 +21,6 @@
               :set-custom-endpoint="setCustomEndpoint"
               :set-is-network="setIsNetwork"
               :check-is-checked-endpoint="checkIsCheckedEndpoint"
-              :is-zk-evm="isZkEvm"
               :is-select-light-client="isSelectLightClient"
               :is-light-client-extension="isLightClientExtension"
               :is-disabled="isDisabled"
@@ -59,7 +58,6 @@
               :selected-wallet="(selectedWallet as SupportWallet)"
               :select-network="selectNetwork"
               :sel-network-id="selNetworkId"
-              :is-zk-evm="isZkEvm"
               :is-animated-in="isAnimatedIn"
             />
           </div>
@@ -87,7 +85,6 @@ import SelectAccount from './SelectAccount.vue';
 import SelectMultisigAccount from './SelectMultisigAccount.vue';
 import SelectNetwork from './SelectNetwork.vue';
 import SelectWallet from './SelectWallet.vue';
-import Ads from './Ads.vue';
 
 export default defineComponent({
   components: {
@@ -182,10 +179,6 @@ export default defineComponent({
 
     const isLightClientExtension = computed<boolean>(() => checkIsSubstrateConnectInstalled());
     const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);
-    const isZkEvm = computed<boolean>(
-      () =>
-        selNetworkId.value === endpointKey.ASTAR_ZKEVM || selNetworkId.value === endpointKey.ZKYOTO
-    );
 
     const setInitialCustomEndpoint = (): string => {
       const selectedEndpointStored = String(localStorage.getItem(SELECTED_ENDPOINT));
@@ -298,9 +291,6 @@ export default defineComponent({
       if (selNetworkId.value === endpointKey.CUSTOM && !customEndpoint.value) {
         return true;
       }
-      if (isZkEvm.value && !isH160.value) {
-        return true;
-      }
 
       return false;
     });
@@ -455,7 +445,6 @@ export default defineComponent({
       endpointKey,
       isSelectLightClient,
       isLightClientExtension,
-      isZkEvm,
       isDisabled,
       SupportWallet,
       WalletModalOption,
diff --git a/src/components/header/modals/SelectNetwork.vue b/src/components/header/modals/SelectNetwork.vue
index 0bdcc95c7..d0081faf9 100644
--- a/src/components/header/modals/SelectNetwork.vue
+++ b/src/components/header/modals/SelectNetwork.vue
@@ -10,21 +10,6 @@
         <span class="text--title">{{ $t('drawer.astarL1') }}</span>
         <div class="line--bottom-bg bottom--l1" />
       </button>
-
-      <button
-        :disabled="true"
-        class="card--astar box--hover--active"
-        :class="selNetworkId === endpointKey.ASTAR_ZKEVM && 'border--active'"
-        @click="setSelNetwork(endpointKey.ASTAR_ZKEVM)"
-      >
-        <img
-          class="img--astar"
-          :src="require('src/assets/img/chain/zkatana-logo.png')"
-          alt="logo-astar-zkevm"
-        />
-        <span class="text--title">{{ $t('drawer.astarZkL2') }}</span>
-        <div class="line--bottom-bg bottom--zkevm" />
-      </button>
     </div>
 
     <div class="container--other-networks">
@@ -59,7 +44,7 @@
           <span class="text--network">{{ $t('drawer.astarTestnet') }}</span>
         </button>
       </div>
-      <div v-if="!isZkEvm" class="container--advanced">
+      <div class="container--advanced">
         <div class="row--title-advanced">
           <span class="text--network">{{ $t('drawer.advanced') }}</span>
           <button
@@ -87,7 +72,7 @@
                 <div class="title--endpoint">
                   <span class="text--network">
                     {{ providerEndpoints[selNetworkId].displayName.replace('Network', '') }}
-                    {{ isZkEvm ? 'RPC' : 'Endpoint' }}
+                    Endpoint
                   </span>
                 </div>
                 <div>
@@ -233,10 +218,6 @@ export default defineComponent({
       type: Function,
       required: true,
     },
-    isZkEvm: {
-      type: Boolean,
-      required: true,
-    },
     isSelectLightClient: {
       type: Boolean,
       required: true,
diff --git a/src/components/header/modals/SelectWallet.vue b/src/components/header/modals/SelectWallet.vue
index 6473b2871..b0a0470b9 100644
--- a/src/components/header/modals/SelectWallet.vue
+++ b/src/components/header/modals/SelectWallet.vue
@@ -42,7 +42,6 @@
             v-for="(wallet, index) in nativeWallets"
             :key="index"
             :data-testid="wallet.name"
-            :disabled="isZkEvm"
             class="box__row--wallet box--hover--active"
             :class="currentWallet === wallet.source && 'border--active'"
             @click="setSubstrateWalletModal(wallet.source)"
@@ -59,7 +58,6 @@
           <button
             v-if="isEnablePolkasafe"
             class="box__row--wallet box--hover--active"
-            :disabled="isZkEvm"
             :class="currentWallet === SupportMultisig.Polkasafe && 'border--active'"
             @click="setPolkasafeModal()"
           >
@@ -165,10 +163,6 @@ export default defineComponent({
       type: Boolean,
       required: true,
     },
-    isZkEvm: {
-      type: Boolean,
-      required: true,
-    },
     selectedWallet: {
       type: String as PropType<SupportWallet>,
       required: true,
diff --git a/src/hooks/useAppRouter.ts b/src/hooks/useAppRouter.ts
index a87530d9b..50e01775f 100644
--- a/src/hooks/useAppRouter.ts
+++ b/src/hooks/useAppRouter.ts
@@ -24,6 +24,7 @@ import { handleAddDefaultTokens } from './../modules/zk-evm-bridge/l1-bridge/ind
 import { useAccount } from './useAccount';
 import { checkIsNativeWallet } from './helper/wallet';
 import { PolkasafeWrapper } from 'src/types/polkasafe';
+import { buildNetworkUrl } from 'src/router/utils';
 
 const { NETWORK_IDX, SELECTED_ENDPOINT, SELECTED_ADDRESS, SELECTED_WALLET, MULTISIG } =
   LOCAL_STORAGE;
@@ -54,7 +55,7 @@ export function useAppRouter() {
   };
 
   // Memo: reload the app if local storage is invalid
-  const handleInvalidStorage = (): void => {
+  const handleInvalidStorage = async (): Promise<void> => {
     const storedAddress = localStorage.getItem(SELECTED_ADDRESS);
     const storedWallet = localStorage.getItem(SELECTED_WALLET);
     const isWalletConnect = storedWallet === SupportWallet.WalletConnect;
@@ -62,6 +63,13 @@ export function useAppRouter() {
       (storedAddress && !storedWallet) || (!isWalletConnect && storedWallet && !storedAddress);
 
     invalidCondition && handleResetAccount();
+
+    if (isZkEvm.value) {
+      const network = providerEndpoints[endpointKey.ASTAR].networkAlias;
+      const url = buildNetworkUrl(network);
+      await wait(1000);
+      window.open(url, '_self');
+    }
   };
 
   const handleCheckWalletType = (): void => {
@@ -158,7 +166,9 @@ export function useAppRouter() {
   };
 
   watchEffect(handleInputNetworkParam);
-  watchEffect(handleInvalidStorage);
+  watchEffect(async () => {
+    handleInvalidStorage();
+  });
   watchEffect(initializePolkasafeClient);
   watchEffect(handleAddDefaultTokens);
   watchEffect(handleCheckWalletType);
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 88823e56e..039ff1505 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -497,7 +497,6 @@ export default {
     bridge: 'Bridge',
     bridgeToSoneium: 'Bridge to Soneium',
     bridgeToEthereum: 'Bridge to Ethereum',
-    bridgeToZkEvm: 'Bridge to zkEVM',
     swap: 'Swap',
     manage: 'Manage',
     xcm: 'XCM',
@@ -1088,18 +1087,6 @@ export default {
     disabledWithdrawal: 'Bridge to {network} is disabled.',
     thirdPartyBridge: '3rd Party Bridge',
     bridgeMaintenanceMode: 'Bridge is currently under maintenance mode. Please come back later.',
-    ethereumBridge: {
-      title: 'Native Bridge',
-      tag: 'ERC20',
-      text: 'Transfer assets between {l1} and {l2}.',
-      remark: 'Available on Astar zkEVM. Switch the network to use it.',
-      learn: '(learn more)',
-    },
-    zKatanaBridge: {
-      title: 'zKatana Bridge',
-      tag: 'ERC20',
-      text: 'Transfer assets between Sepolia and zKatana testnet.',
-    },
     ccipSbyBridge: {
       title: 'SBY Bridge',
       tag: 'SBY',
@@ -1112,12 +1099,6 @@ export default {
       text: 'Transfer ASTR between Astar EVM, Soneium and Ethereum. Powered by CCIP.',
       remark: 'Available on Astar EVM. Switch the network to use it.',
     },
-    astarBridge: {
-      title: 'LayerZero',
-      tag: 'ASTR',
-      text: 'Transfer assets between Astar EVM and Astar zkEVM.',
-      remark: 'Available on Astar zkEVM and Astar EVM. Switch the network to use it.',
-    },
     stargateBridge: {
       title: 'Stargate Bridge',
       tag: 'ERC20',
@@ -1129,18 +1110,11 @@ export default {
       text: '3rd Party Bridge. Transfer assets between Ethereum or L2s and {cbridgeNetworkName} EVM.',
       warning: 'Celer Team announced to not access to cbridge, please do not use it.',
     },
-    layerSwap: {
-      title: 'Layerswap',
-      tag: 'ETH',
-      text: '3rd Party Bridge. Fast and reliable crypto transfers across networks to Astar zkEVM.',
-    },
     astarEvmBridge: {
       title: 'EVM Bridge',
       text: 'Transfer assets between EVM and native network.',
     },
     warning32blocks: 'It could take around 10~20mins or more to finalize',
-    warningLzWithdrawal:
-      'It could take approximately 6 hours to finalize the bridge transaction from Astar zkEVM to Astar EVM',
     warningCcipTime: 'It could take approximately {time} mins to finalize the bridge transaction',
     warning2steps:
       'Bridging to L1 (Ethereum) involves 2 steps, and it requires users to make a claim on the L1 network (available in Recent History)',
diff --git a/src/modules/token/utils/index.ts b/src/modules/token/utils/index.ts
index 1c42b2c66..69157de19 100644
--- a/src/modules/token/utils/index.ts
+++ b/src/modules/token/utils/index.ts
@@ -12,19 +12,13 @@ export const getTokenImage = ({
   isNativeToken,
   symbol,
   iconUrl,
-  isZkEvm,
 }: {
   isNativeToken: boolean;
   symbol: string;
   iconUrl?: string;
-  isZkEvm?: boolean;
 }): string => {
   if (isNativeToken) {
-    return isZkEvm
-      ? require('assets/img/ethereum.png')
-      : symbol === 'SDN'
-      ? 'icons/sdn-token.png'
-      : 'icons/astar.png';
+    return symbol === 'SDN' ? 'icons/sdn-token.png' : 'icons/astar.png';
   } else {
     return iconUrl || 'custom-token';
   }

From c1ec389e7c153e2f3e2f23e7eaadcbe8b90cd779 Mon Sep 17 00:00:00 2001
From: Roy <92044428+impelcrypto@users.noreply.github.com>
Date: Wed, 30 Apr 2025 14:52:42 +0800
Subject: [PATCH 6/9] fix: removed unnecessary line (#1464)

---
 src/hooks/bridge/useCcipBridge.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/bridge/useCcipBridge.ts b/src/hooks/bridge/useCcipBridge.ts
index eb6c43421..529bb26bc 100644
--- a/src/hooks/bridge/useCcipBridge.ts
+++ b/src/hooks/bridge/useCcipBridge.ts
@@ -242,7 +242,6 @@ export const useCcipBridge = () => {
       const chainId = await web3Provider.value.eth.getChainId();
       providerChainId.value = chainId;
 
-      providerChainId.value = await web3Provider.value!.eth.net.getId();
       if (providerChainId.value !== fromChainId) {
         await setupNetwork({ network: fromChainId, provider: ethProvider.value });
         const chainId = await web3Provider.value.eth.getChainId();

From 0f5d39b83b45f2cbda7c247ee753ff90964d4a37 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Wed, 7 May 2025 09:03:34 +0200
Subject: [PATCH 7/9] Fix for available staking balance when user has tokens
 locked in governance (#1466)

---
 src/staking-v3/hooks/useVote.ts | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/staking-v3/hooks/useVote.ts b/src/staking-v3/hooks/useVote.ts
index 77f7f0735..a7bff4eb8 100644
--- a/src/staking-v3/hooks/useVote.ts
+++ b/src/staking-v3/hooks/useVote.ts
@@ -27,7 +27,8 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
   const dAppToMoveFromAddress = ref<string>(dappToMoveTokensFromAddress ?? '');
   let remainingLockedTokensInitial = BigInt(0);
 
-  const locked = computed<bigint>(() => ledger?.value?.locked ?? BigInt(0));
+  const lockedInDappStaking = computed<bigint>(() => ledger?.value?.locked ?? BigInt(0));
+  const locked = computed<bigint>(() => max(lockedInDappStaking.value, lockedInDemocracy.value));
 
   const totalStakeAmount = computed<bigint>(() =>
     ethers.utils
@@ -70,8 +71,7 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
       ? availableToMove.value
       : BigInt(useableBalance.value) +
         max(remainingLockedTokensInitial, BigInt(0)) +
-        availableToMove.value +
-        lockedInDemocracy.value
+        availableToMove.value
   );
 
   const availableToVoteDisplay = computed<bigint>(() => {
@@ -80,14 +80,8 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
     }
 
     return remainingLockedTokens.value >= BigInt(0)
-      ? BigInt(useableBalance.value) +
-          lockedInDemocracy.value +
-          remainingLockedTokens.value +
-          availableToMove.value
-      : BigInt(useableBalance.value) +
-          lockedInDemocracy.value -
-          abs(remainingLockedTokens.value) +
-          availableToMove.value;
+      ? BigInt(useableBalance.value) + remainingLockedTokens.value + availableToMove.value
+      : BigInt(useableBalance.value) - abs(remainingLockedTokens.value) + availableToMove.value;
   });
 
   const amountToUnstake = computed<bigint>(() =>

From 5a40065940370c6711c248d35aa630adf4ff6934 Mon Sep 17 00:00:00 2001
From: impelcrypto <impelcrypto@gmail.com>
Date: Fri, 20 Jun 2025 23:49:02 +0800
Subject: [PATCH 8/9] fix: added extra 20% to the gaslimit

---
 src/v2/services/implementations/MetamaskWalletService.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/v2/services/implementations/MetamaskWalletService.ts b/src/v2/services/implementations/MetamaskWalletService.ts
index a7a39be18..7f9e3a15e 100644
--- a/src/v2/services/implementations/MetamaskWalletService.ts
+++ b/src/v2/services/implementations/MetamaskWalletService.ts
@@ -169,6 +169,7 @@ export class MetamaskWalletService extends WalletService implements IWalletServi
     successMessage,
     failureMessage,
   }: ParamSendEvmTransaction): Promise<string> {
+    console.log('sendEvmTransaction');
     try {
       const web3 = new Web3(this.provider as any);
       const resultCheckProvider = await handleCheckProviderChainId(this.provider);
@@ -178,10 +179,13 @@ export class MetamaskWalletService extends WalletService implements IWalletServi
       const rawTx = await getRawEvmTransaction(web3, from, to, data, value);
 
       // Memo: passing this variable (estimatedGas) to `sendTransaction({gas: estimatedGas})` causes an error when sending `withdrawal` transactions.
-      // the function goes the catch statement if something goes wrong while getting the estimatedGas. This way, the UI prevents sending invalid transactions which could cause loss of assets.
+      // 20/6/2025: Tested with `withdrawal` transaction on Shibuya and it works fine.
       const estimatedGas = await web3.eth.estimateGas(rawTx);
+      const estimatedGasBigInt = BigInt(estimatedGas);
+      // Memo: Adding 20% to the estimated gas to avoid out of gas errors
+      const gasLimit = estimatedGasBigInt + estimatedGasBigInt / BigInt(5);
       const transactionHash = await web3.eth
-        .sendTransaction({ ...rawTx })
+        .sendTransaction({ ...rawTx, gas: gasLimit.toString() })
         .once('transactionHash', (transactionHash) => {
           this.eventAggregator.publish(new BusyMessage(true));
         })

From dc1b3b065342dfd4ab31276ccfaa35d5a1438389 Mon Sep 17 00:00:00 2001
From: impelcrypto <impelcrypto@gmail.com>
Date: Fri, 20 Jun 2025 23:52:43 +0800
Subject: [PATCH 9/9] fix: clean up

---
 src/v2/services/implementations/MetamaskWalletService.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/v2/services/implementations/MetamaskWalletService.ts b/src/v2/services/implementations/MetamaskWalletService.ts
index 7f9e3a15e..1d7b3b7c0 100644
--- a/src/v2/services/implementations/MetamaskWalletService.ts
+++ b/src/v2/services/implementations/MetamaskWalletService.ts
@@ -169,7 +169,6 @@ export class MetamaskWalletService extends WalletService implements IWalletServi
     successMessage,
     failureMessage,
   }: ParamSendEvmTransaction): Promise<string> {
-    console.log('sendEvmTransaction');
     try {
       const web3 = new Web3(this.provider as any);
       const resultCheckProvider = await handleCheckProviderChainId(this.provider);