diff --git a/src/components/assets/Account.vue b/src/components/assets/Account.vue
index 6816c9e25..315d29f89 100644
--- a/src/components/assets/Account.vue
+++ b/src/components/assets/Account.vue
@@ -13,30 +13,47 @@
           </div>
           <div v-else />
           <div class="wallet-tab__bg">
-            <!-- EVM -->
             <template v-if="isH160">
-              <!-- zkEVM -->
               <template v-if="isZkEvm">
-                <a class="btn" href="/shibuya-testnet/assets"> Shibuya EVM (L1) </a>
-                <div v-if="isZkEvm" class="btn active">Astar zKatana</div>
+                <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.ZKATANA">
+                  <a class="btn" href="/shibuya-testnet/assets"> Shibuya EVM (L1) </a>
+                  <div class="btn active">Astar zKatana</div>
+                </template>
               </template>
 
-              <!-- Astar EVM -->
               <template v-else>
                 <div class="btn active">
                   {{ currentNetworkName.replace('Network', '') }}
                   EVM (L1)
                 </div>
-                <a v-if="currentNetworkIdx === 2" class="btn" href="/zkatana-testnet/assets">
+                <a
+                  v-if="currentNetworkIdx === endpointKey.SHIBUYA"
+                  class="btn"
+                  href="/zkatana-testnet/assets"
+                >
                   Astar zKatana
                 </a>
-                <a v-else-if="currentNetworkIdx !== 1" class="btn" disabled>Astar zkEVM</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 === 4 ? 'Astar' : currentNetworkName.replace('Network', '') }}
+              {{
+                currentNetworkIdx === endpointKey.ZKATANA
+                  ? 'Astar'
+                  : currentNetworkName.replace('Network', '')
+              }}
               {{ $t('native') }}
             </div>
           </div>
@@ -348,6 +365,7 @@ export default defineComponent({
       isModalLockdropWarning,
       isAllowLockdropDispatch,
       isWalletConnect,
+      endpointKey,
       handleModalLockdropWarning,
       getShortenAddress,
       copyAddress,
diff --git a/src/components/assets/Assets.vue b/src/components/assets/Assets.vue
index 397073ecc..a3bcc2acb 100644
--- a/src/components/assets/Assets.vue
+++ b/src/components/assets/Assets.vue
@@ -198,7 +198,7 @@ export default defineComponent({
     );
 
     const handleEvmAssetLoader = (): void => {
-      if (isMainnet.value && isH160.value) {
+      if (isMainnet.value && isH160.value && !isZkEvm.value) {
         const isAssets = evmAssets.value.assets.length > 0;
         store.commit('general/setLoading', !isAssets);
       }
diff --git a/src/components/assets/EvmAssetList.vue b/src/components/assets/EvmAssetList.vue
index cd4d86c94..77f3ca806 100644
--- a/src/components/assets/EvmAssetList.vue
+++ b/src/components/assets/EvmAssetList.vue
@@ -51,6 +51,7 @@ import { useNetworkInfo } from 'src/hooks';
 import { Erc20Token } from 'src/modules/token';
 import { PropType, computed, defineComponent, ref } from 'vue';
 import { useStore } from 'src/store';
+import { LOCAL_STORAGE } from 'src/config/localStorage';
 
 export default defineComponent({
   components: {
@@ -71,8 +72,19 @@ export default defineComponent({
     const symbol = ref<string>('');
     const isSearch = ref<boolean>(false);
     const search = ref<string>('');
-    const { isMainnet } = useNetworkInfo();
-    const isListReady = computed<boolean>(() => !!(!isMainnet.value || props.tokens.length > 0));
+    const { isMainnet, isZkEvm } = useNetworkInfo();
+    const isListReady = computed<boolean>(() => {
+      const importedEvmTokens = localStorage.getItem(LOCAL_STORAGE.EVM_TOKEN_IMPORTS);
+      const tokensData = importedEvmTokens ? JSON.parse(importedEvmTokens) : [];
+      const isImportedTokens = tokensData.length > 0;
+      const baseCondition = !isMainnet.value || props.tokens.length > 0;
+
+      if (isImportedTokens) {
+        return !!baseCondition;
+      } else {
+        return !!(baseCondition || isZkEvm.value);
+      }
+    });
 
     const filteredTokens = computed<Erc20Token[] | []>(() => {
       if (!props.tokens) return [];
@@ -90,6 +102,15 @@ export default defineComponent({
           return isFoundToken ? token : undefined;
         })
         .filter((it) => it !== undefined)
+        .sort((a, b) => {
+          if (a!.symbol < b!.symbol) {
+            return -1;
+          }
+          if (a!.symbol > b!.symbol) {
+            return 1;
+          }
+          return 0;
+        })
         .sort((a, b) => Number(b?.userBalanceUsd) - Number(a?.userBalanceUsd)) as Erc20Token[];
       return result.length > 0 ? result : [];
     });
diff --git a/src/components/assets/ZkAstr.vue b/src/components/assets/ZkAstr.vue
index dab2cb086..bdc8623c5 100644
--- a/src/components/assets/ZkAstr.vue
+++ b/src/components/assets/ZkAstr.vue
@@ -26,7 +26,8 @@
           </button>
           <span class="text--mobile-menu">{{ $t('assets.bridge') }}</span>
           <q-tooltip>
-            <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
+            <!-- <span class="text--tooltip">{{ $t('assets.bridge') }}</span> -->
+            <span class="text--tooltip">Coming soon!</span>
           </q-tooltip>
         </router-link>
 
@@ -36,7 +37,8 @@
           </button>
           <span class="text--mobile-menu">{{ $t('assets.send') }}</span>
           <q-tooltip>
-            <span class="text--tooltip">{{ $t('assets.send') }}</span>
+            <!-- <span class="text--tooltip">{{ $t('assets.send') }}</span> -->
+            <span class="text--tooltip">Coming soon!</span>
           </q-tooltip>
         </router-link>
       </div>
@@ -45,7 +47,6 @@
 </template>
 <script lang="ts">
 import { getUsdBySymbol, truncate } from '@astar-network/astar-sdk-core';
-import TokenBalance from 'src/components/common/TokenBalance.vue';
 import { ASTAR_NATIVE_TOKEN } from 'src/config/chain';
 import { useNetworkInfo } from 'src/hooks';
 import { getTokenImage } from 'src/modules/token';
diff --git a/src/components/assets/styles/account.scss b/src/components/assets/styles/account.scss
index 474bc540b..a02658895 100644
--- a/src/components/assets/styles/account.scss
+++ b/src/components/assets/styles/account.scss
@@ -121,7 +121,7 @@
   // zkEVM
   &.network-3 {
     .text--address {
-      background: linear-gradient(90deg, #226dff 25%, #703ac2 100%);
+      background: linear-gradient(90deg, #0047ff 0%, #00d4ff 98%);
       background-clip: text;
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
@@ -328,7 +328,7 @@
     .wallet-tab {
       .btn {
         &.active {
-          background: linear-gradient(270deg, #226dff 25%, #703ac2 100%);
+          background: linear-gradient(90deg, #0047ff 0%, #00d4ff 98%);
         }
       }
     }
diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index f6d5d1367..baa646d7b 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -143,7 +143,7 @@ export default defineComponent({
     });
 
     const isEnableEthBridge = computed<boolean>(() => {
-      if (!isZkEvm.value || currentNetworkName.value === EthBridgeNetworkName.AstarZk) {
+      if (!isZkEvm.value) {
         return false;
       }
       return true;
diff --git a/src/components/bridge/common/ImportTokenInfo.vue b/src/components/bridge/common/ImportTokenInfo.vue
index 95b0ef6e1..4cce810b7 100644
--- a/src/components/bridge/common/ImportTokenInfo.vue
+++ b/src/components/bridge/common/ImportTokenInfo.vue
@@ -127,7 +127,7 @@
           <span> {{ $t('bridge.tokenInfo.tokenHasBeenAdded') }}</span>
         </span>
         <span v-else-if="isBlackListToken" class="text--error">
-          {{ $t('bridge.tokenInfo.tokenNotSupported') }}
+          {{ $t('bridge.tokenInfo.tokenNotSupported', { network: fromChainName }) }}
         </span>
         <span v-else class="text--error">{{ $t('bridge.tokenInfo.interactCarefully') }}</span>
       </div>
diff --git a/src/components/bridge/ethereum/L1Bridge.vue b/src/components/bridge/ethereum/L1Bridge.vue
index eb9cf0fc8..6f260d5a7 100644
--- a/src/components/bridge/ethereum/L1Bridge.vue
+++ b/src/components/bridge/ethereum/L1Bridge.vue
@@ -23,7 +23,7 @@
           </div>
         </div>
       </div>
-      <div class="row--reverse">
+      <div v-if="isEnabledWithdrawal" class="row--reverse">
         <button
           class="icon--reverse cursor-pointer"
           @click="() => reverseChain(fromChainName, toChainName)"
@@ -31,6 +31,16 @@
           <astar-icon-sync size="20" />
         </button>
       </div>
+      <div v-else class="row--reverse">
+        <button class="icon--reverse" disabled>
+          <astar-icon-sync size="20" />
+        </button>
+        <q-tooltip>
+          <span class="text--tooltip">
+            {{ $t('bridge.disabledWithdrawal', { network: fromChainName }) }}
+          </span>
+        </q-tooltip>
+      </div>
       <div class="box--input-field">
         <div class="box__space-between">
           <span> {{ $t('to') }}</span>
@@ -154,7 +164,7 @@
 import { wait } from '@astar-network/astar-sdk-core';
 import { isHex } from '@polkadot/util';
 import TokenBalance from 'src/components/common/TokenBalance.vue';
-import { useAccount } from 'src/hooks';
+import { useAccount, useNetworkInfo } from 'src/hooks';
 import { EthBridgeNetworkName, ZkToken, zkBridgeIcon } from 'src/modules/zk-evm-bridge';
 import { useStore } from 'src/store';
 import { PropType, defineComponent, watch, ref, computed } from 'vue';
@@ -245,9 +255,11 @@ export default defineComponent({
   },
   setup(props) {
     const { currentAccount } = useAccount();
+    const { isZkatana } = useNetworkInfo();
     const store = useStore();
     const isHandling = ref<boolean>(false);
     const isLoading = computed<boolean>(() => store.getters['general/isLoading']);
+    const isEnabledWithdrawal = computed<boolean>(() => true);
 
     const bridge = async (): Promise<void> => {
       isHandling.value = true;
@@ -292,6 +304,7 @@ export default defineComponent({
       EthBridgeNetworkName,
       isHandling,
       isLoading,
+      isEnabledWithdrawal,
       bridge,
       approve,
     };
diff --git a/src/components/bridge/ethereum/L1History.vue b/src/components/bridge/ethereum/L1History.vue
index 5ef5c6f97..ae832aca9 100644
--- a/src/components/bridge/ethereum/L1History.vue
+++ b/src/components/bridge/ethereum/L1History.vue
@@ -249,7 +249,7 @@ export default defineComponent({
         case EthBridgeNetworkName.Zkatana:
           return blockExplorerUrls[EVM.ZKATANA_TESTNET] + txUrl;
         case EthBridgeNetworkName.AstarZk:
-          return blockExplorerUrls[EVM.SEPOLIA_TESTNET] + txUrl;
+          return blockExplorerUrls[EVM.ASTAR_ZKEVM_MAINNET] + txUrl;
 
         default:
           return blockExplorerUrls[EVM.SEPOLIA_TESTNET] + txUrl;
diff --git a/src/components/common/ModalConnectionTrouble.vue b/src/components/common/ModalConnectionTrouble.vue
index 156767391..90a431386 100644
--- a/src/components/common/ModalConnectionTrouble.vue
+++ b/src/components/common/ModalConnectionTrouble.vue
@@ -110,11 +110,10 @@
 import { truncate, wait } from '@astar-network/astar-sdk-core';
 import { fadeDuration } from '@astar-network/astar-ui';
 import ModalWrapper from 'src/components/common/ModalWrapper.vue';
-import { defineComponent, ref, computed } from 'vue';
-import { docsUrl, polkadotJsUrl, socialUrl } from 'src/links';
 import { useBreakpoints, useNetworkInfo } from 'src/hooks';
-import { endpointKey } from 'src/config/chainEndpoints';
+import { docsUrl, socialUrl } from 'src/links';
 import { useStore } from 'src/store';
+import { defineComponent, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 export default defineComponent({
diff --git a/src/components/header/HeaderComp.vue b/src/components/header/HeaderComp.vue
index 79baa1bdc..cbd0d1d3d 100644
--- a/src/components/header/HeaderComp.vue
+++ b/src/components/header/HeaderComp.vue
@@ -51,26 +51,27 @@ export default defineComponent({
     height: 6rem;
   }
 
+  // Memo: hide the border bottom as we have header message with background color
   // shibuya, zkyoto, local
-  border-image: linear-gradient(90deg, #6c6c6c 25%, #b7b7b7 100%);
-  border-image-slice: 1;
+  /* border-image: linear-gradient(90deg, #6c6c6c 25%, #b7b7b7 100%); */
+  /* border-image-slice: 1; */
 
   // astar native
   &.header__border-0 {
-    border-image: linear-gradient(90deg, #e6007a 25%, #ff9dd1 100%);
-    border-image-slice: 1;
+    /* border-image: linear-gradient(90deg, #e6007a 25%, #ff9dd1 100%); */
+    /* border-image-slice: 1; */
   }
 
   // shiden
   &.header__border-1 {
-    border-image: linear-gradient(90deg, #5928b1 25%, #b092ea 100%);
-    border-image-slice: 1;
+    /* border-image: linear-gradient(90deg, #5928b1 25%, #b092ea 100%); */
+    /* border-image-slice: 1; */
   }
 
   // zkEVM
   &.header__border-3 {
-    border-image: linear-gradient(90deg, #703ac2 25%, #226dff 100%);
-    border-image-slice: 1;
+    /* border-image: linear-gradient(90deg, #703ac2 25%, #226dff 100%); */
+    /* border-image-slice: 1; */
   }
 }
 
diff --git a/src/components/header/YokiBanner.vue b/src/components/header/YokiBanner.vue
new file mode 100644
index 000000000..4b4a42328
--- /dev/null
+++ b/src/components/header/YokiBanner.vue
@@ -0,0 +1,68 @@
+<template>
+  <div>
+    <!-- Memo: add this line later -->
+    <!-- <a href="https://yoki.astar.network/" target="_blank" rel="noopener noreferrer" class="banner"> -->
+    <div class="banner">
+      <span>
+        <span class="text--ledger-users">{{ $t('warning.yoki') }}</span>
+        <span>
+          {{ $t('warning.yokiSignUp') }}
+        </span>
+      </span>
+      <astar-icon-arrow-right />
+      <!-- </a> -->
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { endpointKey } from 'src/config/chainEndpoints';
+
+export default defineComponent({
+  setup() {
+    return { endpointKey };
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+@import 'src/css/quasar.variables.scss';
+
+.banner {
+  color: $gray-2;
+  font-weight: 600;
+  padding: 4px 8px 8px 8px;
+  font-size: 12px;
+  position: relative;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  @media (min-width: $sm) {
+    font-size: 14px;
+    padding: 4px 16px 8px 16px;
+  }
+
+  &.banner {
+    background: linear-gradient(90deg, #0047ff 0%, #00d4ff 98%);
+  }
+}
+
+a.banner {
+  transition: all 0.2s ease;
+  &:hover {
+    filter: brightness(1.1);
+  }
+}
+
+.text--ledger-users {
+  font-weight: 800;
+  padding: 3px 9px;
+  border-radius: 4px;
+  border: 1px solid $gray-2;
+  margin-right: 4px;
+  @media (min-width: $sm) {
+    margin-right: 8px;
+  }
+}
+</style>
diff --git a/src/components/header/modals/SelectAccount.vue b/src/components/header/modals/SelectAccount.vue
index b3513c2ca..f624b06d2 100644
--- a/src/components/header/modals/SelectAccount.vue
+++ b/src/components/header/modals/SelectAccount.vue
@@ -305,6 +305,8 @@ export default defineComponent({
             isLedgerReady.value = true;
             const transport = (ledgerData as any).__internal__app.transport;
             transport.close();
+            localStorage.setItem(LOCAL_STORAGE.IS_LEDGER, isLedger.toString());
+            store.commit('general/setIsLedger', isLedger);
           }
         } catch (error: any) {
           console.error(error);
diff --git a/src/components/header/modals/SelectNetwork.vue b/src/components/header/modals/SelectNetwork.vue
index c16d9b573..e07cb4199 100644
--- a/src/components/header/modals/SelectNetwork.vue
+++ b/src/components/header/modals/SelectNetwork.vue
@@ -13,7 +13,6 @@
 
       <button
         class="card--astar box--hover--active"
-        :disabled="true"
         :class="selNetworkId === endpointKey.ASTAR_ZKEVM && 'border--active'"
         @click="setSelNetwork(endpointKey.ASTAR_ZKEVM)"
       >
diff --git a/src/components/header/styles/modal-network-wallet.scss b/src/components/header/styles/modal-network-wallet.scss
index 067504cbe..14a9de824 100644
--- a/src/components/header/styles/modal-network-wallet.scss
+++ b/src/components/header/styles/modal-network-wallet.scss
@@ -73,7 +73,7 @@
 }
 
 .bottom--zkevm {
-  background: linear-gradient(270deg, #703ac2 26.04%, #226dff 100%);
+  background: linear-gradient(90deg, #0047ff 0%, #00d4ff 98%);
 }
 
 .container--other-networks {
diff --git a/src/config/chain.ts b/src/config/chain.ts
index 90f467773..5cdc0d36f 100644
--- a/src/config/chain.ts
+++ b/src/config/chain.ts
@@ -28,8 +28,7 @@ export type ASTAR_NETWORK_IDX =
   | endpointKey.LOCAL
   | endpointKey.ROCSTAR;
 
-//Todo: add Astar zkEVM
-export type ASTAR_EVM_NETWORK_IDX = 592 | 336 | 81 | 4369 | 692 | 7759;
+export type ASTAR_EVM_NETWORK_IDX = 592 | 336 | 81 | 4369 | 692 | 1261120 | 3776;
 
 export type ASTAR_NATIVE_TOKEN = 'ASTR' | 'SDN' | 'SBY' | 'LOC' | 'RSTR' | 'ETH';
 export const astarMainnetNativeToken: ASTAR_NATIVE_TOKEN[] = ['ASTR', 'SDN'];
diff --git a/src/config/chainEndpoints.ts b/src/config/chainEndpoints.ts
index 8d46363e3..db5c86295 100644
--- a/src/config/chainEndpoints.ts
+++ b/src/config/chainEndpoints.ts
@@ -117,7 +117,6 @@ export const providerEndpoints: ChainProvider[] = [
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/shibuya.png?raw=true',
     xvmErcTransferContract: 'ZdNJsZUK96jGxr8iRfT8xHXUi5iQ7XwL9qbyJkADPdH7C1U',
   },
-  // Memo: It's dummy data. To be updated
   {
     networkAlias: 'astar-zkevm',
     displayName: 'Astar zkEVM Network',
@@ -131,9 +130,9 @@ export const providerEndpoints: ChainProvider[] = [
     key: endpointKey.ASTAR_ZKEVM,
     isStoreEnabled: true,
     subscan: 'https://astar.subscan.io',
-    blockscout: 'https://akiba-explorer.astar.network',
-    evmChainId: '7759',
-    evmEndpoints: ['http://161.35.17.216:8545'],
+    blockscout: 'https://astar-zkevm.explorer.startale.com',
+    evmChainId: '3776',
+    evmEndpoints: ['https://rpc.startale.com/astar-zkevm'],
     faucetEndpoint: '',
     defaultLogo:
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/zkatana-logo.png?raw=true',
@@ -191,7 +190,6 @@ export const providerEndpoints: ChainProvider[] = [
     defaultLogo:
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/shibuya.png?raw=true',
   },
-
   {
     networkAlias: 'rocstar',
     displayName: 'Rocstar',
diff --git a/src/config/web3/abi/zkevm-aggregated-bridge-abi.json b/src/config/web3/abi/zkevm-aggregated-bridge-abi.json
new file mode 100644
index 000000000..435d36b1d
--- /dev/null
+++ b/src/config/web3/abi/zkevm-aggregated-bridge-abi.json
@@ -0,0 +1,981 @@
+[
+  {
+    "inputs": [],
+    "name": "AlreadyClaimed",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "AmountDoesNotMatchMsgValue",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "DestinationNetworkInvalid",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "EtherTransferFailed",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "GasTokenNetworkMustBeZeroOnEther",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "GlobalExitRootInvalid",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidSmtProof",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "MerkleTreeFull",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "MessageFailed",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "MsgValueNotZero",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NativeTokenIsEther",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NoValueInMessagesOnGasTokenNetworks",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotValidAmount",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotValidOwner",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotValidSignature",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotValidSpender",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "OnlyEmergencyState",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "OnlyNotEmergencyState",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "OnlyRollupManager",
+    "type": "error"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "leafType",
+        "type": "uint8"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "originAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "metadata",
+        "type": "bytes"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "depositCount",
+        "type": "uint32"
+      }
+    ],
+    "name": "BridgeEvent",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "globalIndex",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "originAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "ClaimEvent",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [],
+    "name": "EmergencyStateActivated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [],
+    "name": "EmergencyStateDeactivated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "originTokenAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "wrappedTokenAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "metadata",
+        "type": "bytes"
+      }
+    ],
+    "name": "NewWrappedToken",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "WETHToken",
+    "outputs": [
+      {
+        "internalType": "contract TokenWrapped",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "activateEmergencyState",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "forceUpdateGlobalExitRoot",
+        "type": "bool"
+      },
+      {
+        "internalType": "bytes",
+        "name": "permitData",
+        "type": "bytes"
+      }
+    ],
+    "name": "bridgeAsset",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "forceUpdateGlobalExitRoot",
+        "type": "bool"
+      },
+      {
+        "internalType": "bytes",
+        "name": "metadata",
+        "type": "bytes"
+      }
+    ],
+    "name": "bridgeMessage",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amountWETH",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bool",
+        "name": "forceUpdateGlobalExitRoot",
+        "type": "bool"
+      },
+      {
+        "internalType": "bytes",
+        "name": "metadata",
+        "type": "bytes"
+      }
+    ],
+    "name": "bridgeMessageWETH",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "leafHash",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProof",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "uint32",
+        "name": "index",
+        "type": "uint32"
+      }
+    ],
+    "name": "calculateRoot",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originTokenAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      }
+    ],
+    "name": "calculateTokenWrapperAddress",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProofLocalExitRoot",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProofRollupExitRoot",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "uint256",
+        "name": "globalIndex",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "mainnetExitRoot",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "rollupExitRoot",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originTokenAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "metadata",
+        "type": "bytes"
+      }
+    ],
+    "name": "claimAsset",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProofLocalExitRoot",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProofRollupExitRoot",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "uint256",
+        "name": "globalIndex",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "mainnetExitRoot",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "rollupExitRoot",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "metadata",
+        "type": "bytes"
+      }
+    ],
+    "name": "claimMessage",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "claimedBitMap",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "deactivateEmergencyState",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "depositCount",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gasTokenAddress",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gasTokenMetadata",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gasTokenNetwork",
+    "outputs": [
+      {
+        "internalType": "uint32",
+        "name": "",
+        "type": "uint32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint8",
+        "name": "leafType",
+        "type": "uint8"
+      },
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "metadataHash",
+        "type": "bytes32"
+      }
+    ],
+    "name": "getLeafValue",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getRoot",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      }
+    ],
+    "name": "getTokenMetadata",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originTokenAddress",
+        "type": "address"
+      }
+    ],
+    "name": "getTokenWrappedAddress",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "globalExitRootManager",
+    "outputs": [
+      {
+        "internalType": "contract IBasePolygonZkEVMGlobalExitRoot",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "_networkID",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "_gasTokenAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint32",
+        "name": "_gasTokenNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "contract IBasePolygonZkEVMGlobalExitRoot",
+        "name": "_globalExitRootManager",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_polygonRollupManager",
+        "type": "address"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_gasTokenMetadata",
+        "type": "bytes"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "leafIndex",
+        "type": "uint32"
+      },
+      {
+        "internalType": "uint32",
+        "name": "sourceBridgeNetwork",
+        "type": "uint32"
+      }
+    ],
+    "name": "isClaimed",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "isEmergencyState",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "lastUpdatedDepositCount",
+    "outputs": [
+      {
+        "internalType": "uint32",
+        "name": "",
+        "type": "uint32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "networkID",
+    "outputs": [
+      {
+        "internalType": "uint32",
+        "name": "",
+        "type": "uint32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "polygonRollupManager",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originTokenAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
+      },
+      {
+        "internalType": "string",
+        "name": "symbol",
+        "type": "string"
+      },
+      {
+        "internalType": "uint8",
+        "name": "decimals",
+        "type": "uint8"
+      }
+    ],
+    "name": "precalculatedWrapperAddress",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "name": "tokenInfoToWrappedToken",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "updateGlobalExitRoot",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "leafHash",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProof",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "uint32",
+        "name": "index",
+        "type": "uint32"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "root",
+        "type": "bytes32"
+      }
+    ],
+    "name": "verifyMerkleProof",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "wrappedTokenToTokenInfo",
+    "outputs": [
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originTokenAddress",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/src/config/web3/index.ts b/src/config/web3/index.ts
index 3e63cb96d..1545f8e01 100644
--- a/src/config/web3/index.ts
+++ b/src/config/web3/index.ts
@@ -13,6 +13,7 @@ export {
   getTransactionTimestamp,
   checkAllowance,
   getTokenImage,
+  handleCheckProviderChainId,
 } from 'src/config/web3/utils';
 
 export { contractInstance, Staking } from 'src/config/web3/contracts';
@@ -135,7 +136,7 @@ export const nativeCurrency = {
 };
 
 export const rpcUrls = {
-  [EVM.ETHEREUM_MAINNET]: ['https://mainnet-nethermind.blockscout.com/'],
+  [EVM.ETHEREUM_MAINNET]: ['https://eth.public-rpc.com'],
   [EVM.SEPOLIA_TESTNET]: ['https://sepolia-01.astar.network'],
   // [EVM.SEPOLIA_TESTNET]: ['https://eth-sepolia.public.blastapi.io'],
   // [EVM.SEPOLIA_TESTNET]: ['https://rpc.sepolia.online'],
diff --git a/src/config/web3/utils/index.ts b/src/config/web3/utils/index.ts
index 578403199..76d70c5d4 100644
--- a/src/config/web3/utils/index.ts
+++ b/src/config/web3/utils/index.ts
@@ -3,6 +3,7 @@ import axios from 'axios';
 import { ethers } from 'ethers';
 import ABI from 'src/config/abi/ERC20.json';
 import { endpointKey, providerEndpoints } from 'src/config/chainEndpoints';
+import { LOCAL_STORAGE } from 'src/config/localStorage';
 import {
   CHAIN_INFORMATION,
   EVM,
@@ -66,6 +67,7 @@ export const setupNetwork = async ({
             method: 'wallet_switchEthereumChain',
             params: [{ chainId }],
           });
+          return true;
         } catch (error: any) {
           const codeUserRejected = 4001;
           if (error.code !== codeUserRejected) {
@@ -82,14 +84,14 @@ export const setupNetwork = async ({
                   },
                 ],
               });
+              return true;
             } catch (error) {
               console.error(error);
+              return false;
             }
           }
         }
       }
-
-      return true;
     } catch (error) {
       console.error('Failed to setup the network in EVM extension:', error);
       return false;
@@ -341,3 +343,21 @@ export const checkAllowance = async ({
   const allowance = await contract.methods.allowance(senderAddress, contractAddress).call();
   return allowance;
 };
+
+export const handleCheckProviderChainId = async (provider: any): Promise<boolean> => {
+  const pathname = window.location.pathname;
+  const page = pathname.split('/')[2];
+  // Memo: their is a logic to check the network at useL1Bridge.ts
+  if (page === 'bridge') return true;
+
+  const web3 = new Web3(provider);
+  const providerChainId = await web3.eth.net.getId();
+  const storedNetworkIdx = Number(localStorage.getItem(LOCAL_STORAGE.NETWORK_IDX));
+  const selectedChainId = Number(providerEndpoints[storedNetworkIdx].evmChainId);
+
+  if (selectedChainId === providerChainId) {
+    return true;
+  } else {
+    return await setupNetwork({ network: selectedChainId, provider });
+  }
+};
diff --git a/src/hooks/bridge/useImportToken.ts b/src/hooks/bridge/useImportToken.ts
index 069e0d1f9..bdf32d570 100644
--- a/src/hooks/bridge/useImportToken.ts
+++ b/src/hooks/bridge/useImportToken.ts
@@ -64,10 +64,14 @@ export const useImportToken = ({
         decimal,
       });
 
+      const web3 = new Web3();
       const isFromEthChains =
         fromChainId === ZkChainId.Ethereum || fromChainId === ZkChainId.Sepolia;
       const ethereumAddress = isFromEthChains ? tokenAddress : toChainTokenAddress;
-      const logoURI = await getTokenImage({ symbol, address: ethereumAddress });
+      const logoURI = await getTokenImage({
+        symbol,
+        address: web3.utils.toChecksumAddress(ethereumAddress),
+      });
 
       const toChainUserBalance = await getTokenBal({
         address: currentAccount.value,
diff --git a/src/hooks/bridge/useL1Bridge.ts b/src/hooks/bridge/useL1Bridge.ts
index 8f1d67df9..e85f82492 100644
--- a/src/hooks/bridge/useL1Bridge.ts
+++ b/src/hooks/bridge/useL1Bridge.ts
@@ -11,14 +11,16 @@ import {
   EthBridgeContract,
   EthBridgeNetworkName,
   ZkToken,
+  getNetworkId,
 } from 'src/modules/zk-evm-bridge';
 import { useStore } from 'src/store';
 import { container } from 'src/v2/common';
 import { IZkBridgeService } from 'src/v2/services';
 import { Symbols } from 'src/v2/symbols';
-import { computed, onUnmounted, ref, watch, watchEffect } from 'vue';
+import { WatchCallback, computed, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useEthProvider } from '../custom-signature/useEthProvider';
+import { EthereumProvider } from '../types/CustomSignature';
 
 const eth = {
   symbol: 'ETH',
@@ -57,6 +59,7 @@ export const useL1Bridge = () => {
   const isApproved = ref<boolean>(false);
   const isApproving = ref<boolean>(false);
   const isApproveMaxAmount = ref<boolean>(false);
+  const providerChainId = ref<number>(0);
 
   const resetStates = (): void => {
     bridgeAmt.value = '';
@@ -156,7 +159,7 @@ export const useL1Bridge = () => {
       tokens = [eth];
     }
 
-    zkTokens.value = await Promise.all(
+    const balTokens = await Promise.all(
       tokens.map(async (token: ZkToken) => {
         let fromChainBalance = '0';
         fromChainBalance = await getTokenBal({
@@ -171,6 +174,31 @@ export const useL1Bridge = () => {
         };
       })
     );
+
+    const sortedTokens = balTokens
+      .sort((a, b) => {
+        if (a.symbol < b.symbol) {
+          return -1;
+        }
+        if (a.symbol > b.symbol) {
+          return 1;
+        }
+        return 0;
+      })
+      .sort((a, b) => Number(b.fromChainBalance) - Number(a.fromChainBalance));
+
+    const moveEthToFront = (tokens: ZkToken[]): ZkToken[] => {
+      const ethIndex = tokens.findIndex((token) => token.symbol === 'ETH');
+      if (ethIndex > -1) {
+        // Memo: Remove the ETH token from its current position
+        const [ethToken] = tokens.splice(ethIndex, 1);
+        // Memo Add the ETH token to the beginning of the array
+        tokens.unshift(ethToken);
+      }
+      return tokens;
+    };
+
+    zkTokens.value = moveEthToFront(sortedTokens);
   };
 
   const setZkTokens = async (token: ZkToken): Promise<void> => {
@@ -218,11 +246,15 @@ export const useL1Bridge = () => {
   const setErrorMsg = (): void => {
     if (isLoading.value) return;
     const bridgeAmtRef = Number(bridgeAmt.value);
+    const providerChainIdRef = providerChainId.value;
+    const selectedTokenRef = selectedToken.value;
     try {
       if (bridgeAmtRef > fromBridgeBalance.value) {
         errMsg.value = t('warning.insufficientBalance', {
-          token: selectedToken.value.symbol,
+          token: selectedTokenRef.symbol,
         });
+      } else if (providerChainIdRef !== fromChainId.value) {
+        errMsg.value = t('warning.selectedInvalidNetworkInWallet');
       } else {
         errMsg.value = '';
       }
@@ -246,13 +278,34 @@ export const useL1Bridge = () => {
     resetStates();
   };
 
-  const handleNetwork = async (): Promise<void> => {
+  const setProviderChainId: WatchCallback<[number, EthereumProvider | undefined]> = async (
+    [fromChainId, provider],
+    _,
+    registerCleanup
+  ) => {
     try {
-      if (!web3Provider.value || !ethProvider.value) return;
-      const connectedNetwork = await web3Provider.value!.eth.net.getId();
-      if (connectedNetwork !== fromChainId.value) {
-        await setupNetwork({ network: fromChainId.value, provider: ethProvider.value });
+      if (!provider || !web3Provider.value || !ethProvider.value) return;
+      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();
+        providerChainId.value = chainId;
       }
+
+      const handleChainChanged = (chainId: string) => {
+        providerChainId.value = Number(chainId);
+      };
+
+      //subscribe to chainChanged event
+      provider.on('chainChanged', handleChainChanged);
+
+      registerCleanup(() => {
+        // unsubscribe from chainChanged event to prevent memory leak
+        provider.removeListener('chainChanged', handleChainChanged);
+      });
     } catch (error) {
       console.error(error);
     }
@@ -281,6 +334,8 @@ export const useL1Bridge = () => {
       throw Error('Please approve first');
     }
     const zkBridgeService = container.get<IZkBridgeService>(Symbols.ZkBridgeService);
+    const destNetworkId = await getNetworkId(toChainName.value);
+
     const hash = await zkBridgeService.bridgeAsset({
       amount: bridgeAmt.value,
       fromChainName: fromChainName.value,
@@ -288,6 +343,7 @@ export const useL1Bridge = () => {
       senderAddress: currentAccount.value,
       tokenAddress: selectedToken.value.address,
       decimal: selectedToken.value.decimal,
+      destNetworkId,
     });
     await setIsApproved();
     bridgeAmt.value = '';
@@ -295,11 +351,14 @@ export const useL1Bridge = () => {
     return hash;
   };
 
-  watchEffect(setErrorMsg);
+  watch([fromChainId, ethProvider], setProviderChainId, { immediate: true });
+  watch([providerChainId, isLoading, bridgeAmt, selectedToken], setErrorMsg, {
+    immediate: true,
+  });
+
   watch([fromChainName, toChainName, currentAccount, selectedToken], setBridgeBalance, {
     immediate: true,
   });
-  watch([fromChainName], handleNetwork, { immediate: true });
   watch([currentAccount, fromChainName], initZkTokens, { immediate: true });
 
   const debounceDelay = 500;
diff --git a/src/hooks/helper/wallet.ts b/src/hooks/helper/wallet.ts
index 64b79fe50..a98d456a0 100644
--- a/src/hooks/helper/wallet.ts
+++ b/src/hooks/helper/wallet.ts
@@ -309,7 +309,7 @@ const initWcProvider = async (): Promise<typeof WcEthereumProvider> => {
       Number(astar.evmChainId),
       Number(shiden.evmChainId),
       Number(shibuya.evmChainId),
-      // Number(astarZkEvm.evmChainId),
+      Number(astarZkEvm.evmChainId),
       Number(zKatana.evmChainId),
       EVM.SEPOLIA_TESTNET,
     ],
@@ -318,7 +318,7 @@ const initWcProvider = async (): Promise<typeof WcEthereumProvider> => {
       [astar.evmChainId]: astar.evmEndpoints[0],
       [shiden.evmChainId]: shiden.evmEndpoints[0],
       [shibuya.evmChainId]: shibuya.evmEndpoints[0],
-      // [astarZkEvm.evmChainId]: astarZkEvm.evmEndpoints[0],
+      [astarZkEvm.evmChainId]: astarZkEvm.evmEndpoints[0],
       [zKatana.evmChainId]: zKatana.evmEndpoints[0],
       [String(EVM.SEPOLIA_TESTNET)]: String(rpcUrls[EVM.SEPOLIA_TESTNET][0]),
     },
diff --git a/src/hooks/useAppRouter.ts b/src/hooks/useAppRouter.ts
index ef077b684..c6fc6d1fb 100644
--- a/src/hooks/useAppRouter.ts
+++ b/src/hooks/useAppRouter.ts
@@ -1,3 +1,9 @@
+import { getRandomFromArray, wait } from '@astar-network/astar-sdk-core';
+import { web3Enable } from '@polkadot/extension-dapp';
+import { encodeAddress } from '@polkadot/util-crypto';
+import { Polkasafe } from 'polkasafe';
+import { checkIsLightClient } from 'src/config/api/polkadot/connectApi';
+import { ASTAR_CHAIN } from 'src/config/chain';
 import {
   ChainProvider,
   endpointKey,
@@ -5,23 +11,18 @@ import {
   getProviderIndex,
   providerEndpoints,
 } from 'src/config/chainEndpoints';
-import { Path } from 'src/router/routes';
-import { computed, watchEffect } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
 import { LOCAL_STORAGE } from 'src/config/localStorage';
-import { checkIsLightClient } from 'src/config/api/polkadot/connectApi';
-import { getRandomFromArray, wait } from '@astar-network/astar-sdk-core';
-import { ASTAR_CHAIN } from 'src/config/chain';
-import { container } from 'src/v2/common';
-import { Polkasafe } from 'polkasafe';
-import { Symbols } from 'src/v2/symbols';
-import { encodeAddress } from '@polkadot/util-crypto';
-import { web3Enable } from '@polkadot/extension-dapp';
+import { SupportWallet } from 'src/config/wallets';
 import { useNetworkInfo } from 'src/hooks/useNetworkInfo';
+import { Path } from 'src/router/routes';
 import { useStore } from 'src/store';
+import { container } from 'src/v2/common';
+import { Symbols } from 'src/v2/symbols';
+import { computed, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import { handleAddDefaultTokens } from './../modules/zk-evm-bridge/l1-bridge/index';
 import { useAccount } from './useAccount';
-import { SupportWallet } from 'src/config/wallets';
 
 const { NETWORK_IDX, SELECTED_ENDPOINT, SELECTED_ADDRESS, SELECTED_WALLET, MULTISIG } =
   LOCAL_STORAGE;
@@ -147,4 +148,5 @@ export function useAppRouter() {
   watchEffect(handleInputNetworkParam);
   watchEffect(handleInvalidStorage);
   watchEffect(initializePolkasafeClient);
+  watchEffect(handleAddDefaultTokens);
 }
diff --git a/src/hooks/useConnectWallet.ts b/src/hooks/useConnectWallet.ts
index e541950b4..99a57ebaf 100644
--- a/src/hooks/useConnectWallet.ts
+++ b/src/hooks/useConnectWallet.ts
@@ -15,7 +15,7 @@ import {
   supportEvmWalletObj,
   supportWalletObj,
 } from 'src/config/wallets';
-import { getChainId, setupNetwork } from 'src/config/web3';
+import { getChainId, handleCheckProviderChainId, setupNetwork } from 'src/config/web3';
 import { ETHEREUM_EXTENSION, useAccount, useNetworkInfo } from 'src/hooks';
 import { useEvmAccount } from 'src/hooks/custom-signature/useEvmAccount';
 import {
@@ -314,7 +314,6 @@ export const useConnectWallet = () => {
     const isWalletConnect = wallet === SupportWallet.WalletConnect;
     // Memo: WalletConnect does not have an address before scanning the QR code (when the user switch the network with selecting WalletConnect)
     const isNoAddress = !address && !isWalletConnect;
-
     if (
       currentRouter.value === undefined ||
       isNoAddress ||
@@ -399,6 +398,23 @@ export const useConnectWallet = () => {
 
   watch([currentNetworkChain], handleCheckLedgerEnvironment);
 
+  // Memo: check the EVM wallet's connected chainId when users switch the page
+  watch(
+    [currentRouter, selectedWallet, isH160],
+    async () => {
+      if (!selectedWallet.value || !isH160.value) return;
+      const provider = getEvmProvider(selectedWallet.value as SupportWallet);
+      const resultCheckProvider = await handleCheckProviderChainId(provider);
+      if (!resultCheckProvider) {
+        store.dispatch('general/showAlertMsg', {
+          msg: t('wallet.switchWalletConnectNetwork', { network: currentNetworkName.value }),
+          alertType: 'error',
+        });
+      }
+    },
+    { immediate: false }
+  );
+
   return {
     WalletModalOption,
     currentNetworkStatus,
diff --git a/src/hooks/useNetworkInfo.ts b/src/hooks/useNetworkInfo.ts
index 33c9186a1..9933f8d0e 100644
--- a/src/hooks/useNetworkInfo.ts
+++ b/src/hooks/useNetworkInfo.ts
@@ -31,6 +31,7 @@ export function useNetworkInfo() {
   );
 
   const isZkatana = computed<boolean>(() => currentNetworkIdx.value === endpointKey.ZKATANA);
+  const isAstarZkEvm = computed<boolean>(() => currentNetworkIdx.value === endpointKey.ASTAR_ZKEVM);
 
   const currentNetworkChain = computed<ASTAR_CHAIN>(() => {
     if (isZkEvm.value) {
@@ -116,5 +117,6 @@ export function useNetworkInfo() {
     networkNameSubstrate,
     isAllowLockdropDispatch,
     isZkatana,
+    isAstarZkEvm,
   };
 }
diff --git a/src/hooks/usePrice.ts b/src/hooks/usePrice.ts
index 974b1c759..66b84430d 100644
--- a/src/hooks/usePrice.ts
+++ b/src/hooks/usePrice.ts
@@ -11,13 +11,14 @@ export function usePrice() {
     return chainInfo ? chainInfo.tokenSymbol : '';
   });
 
-  const { isMainnet } = useNetworkInfo();
+  const { isMainnet, isAstarZkEvm } = useNetworkInfo();
   watchEffect(async () => {
     const tokenSymbolRef = tokenSymbol.value;
     if (!tokenSymbolRef) return;
     try {
       if (isMainnet.value) {
-        nativeTokenUsd.value = await getUsdBySymbol(tokenSymbolRef);
+        const nativeToken = isAstarZkEvm.value ? 'ETH' : tokenSymbolRef;
+        nativeTokenUsd.value = await getUsdBySymbol(nativeToken);
       }
     } catch (error: any) {
       console.error(error.message);
diff --git a/src/hooks/wallet/useLedger.ts b/src/hooks/wallet/useLedger.ts
index 60c3fd475..2c3113118 100644
--- a/src/hooks/wallet/useLedger.ts
+++ b/src/hooks/wallet/useLedger.ts
@@ -19,7 +19,10 @@ export const useLedger = () => {
 
   const store = useStore();
   const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);
-  const isLedger = computed<boolean>(() => store.getters['general/isLedger']);
+  const isLedger = computed<boolean>(() => {
+    const isLedger = store.getters['general/isLedger'];
+    return !isH160.value && isLedger;
+  });
 
   const handleReset = (): void => {
     isLedgerNanoS.value = false;
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 073275ba4..3a45ed24c 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -74,6 +74,8 @@ export default {
     ledgerUsers: 'Ledger Users',
     ledgerUsersImportantInformation:
       'Important information regarding the upcoming transition to dApp Staking V3. Check out the details',
+    yoki: 'Yoki Origins',
+    yokiSignUp: 'Astar zkEVM launch campaign is coming soon!',
   },
   toast: {
     transactionFailed: 'Transaction failed with error: {message}',
@@ -975,6 +977,7 @@ export default {
     completed: 'Completed',
     inProgress: 'In Progress',
     approvalMaxAmount: 'Approve Max Amount (option)',
+    disabledWithdrawal: 'Bridge to {network} is temporarily disabled',
     ethereumBridge: {
       title: 'Ethereum Bridge',
       text: 'Bridge assets between {l1} and {l2}',
@@ -1003,7 +1006,7 @@ export default {
       fromChainBal: 'From Chain Balance',
       destChainBal: 'Destination Chain Balance',
       tokenHasBeenAdded: 'The token has been added already',
-      tokenNotSupported: "This token isn't supported on zkEVM",
+      tokenNotSupported: "This token isn't supported bridging from {network}",
       interactCarefully: 'Interact carefully with new or suspicious tokens',
     },
   },
diff --git a/src/layouts/DashboardLayout.vue b/src/layouts/DashboardLayout.vue
index af51ce0c5..d8324b673 100644
--- a/src/layouts/DashboardLayout.vue
+++ b/src/layouts/DashboardLayout.vue
@@ -5,7 +5,8 @@
     </template>
     <div class="wrapper--dashboard-layout__inner">
       <portal-header />
-      <claim-warning-banner :network="currentNetworkIdx" />
+      <yoki-banner v-if="isZkEvm" />
+      <claim-warning-banner v-else :network="currentNetworkIdx" />
       <main id="assets-top" class="wrapper--main">
         <div class="wrapper--components">
           <div class="page-bg" :style="{ backgroundImage: `url(${bg})` }" />
@@ -19,22 +20,25 @@
 
 <script lang="ts">
 import { defineComponent, watchEffect, computed } from 'vue';
-import { useBreakpoints, useGasPrice } from 'src/hooks';
+import { useBreakpoints, useGasPrice, useNetworkInfo } from 'src/hooks';
 import PortalHeader from 'src/components/header/Header.vue';
 import SidebarDesktop from 'components/sidenav/SidebarDesktop.vue';
 import { useQuasar } from 'quasar';
 import { LOCAL_STORAGE } from 'src/config/localStorage';
 import { useStore } from 'src/store';
 import ClaimWarningBanner from 'src/components/header/ClaimWarningBanner.vue';
+import YokiBanner from 'src/components/header/YokiBanner.vue';
 
 export default defineComponent({
   components: {
     PortalHeader,
     SidebarDesktop,
     ClaimWarningBanner,
+    YokiBanner,
   },
   setup() {
     const store = useStore();
+    const { isZkEvm } = useNetworkInfo();
     const { width, screenSize } = useBreakpoints();
     const storedThemeColor = localStorage.getItem(LOCAL_STORAGE.THEME_COLOR);
     const isDark = storedThemeColor
@@ -70,6 +74,7 @@ export default defineComponent({
       screenSize,
       currentNetworkIdx,
       bg,
+      isZkEvm,
     };
   },
 });
diff --git a/src/modules/toast/index.ts b/src/modules/toast/index.ts
index 492389736..987d0477f 100644
--- a/src/modules/toast/index.ts
+++ b/src/modules/toast/index.ts
@@ -8,3 +8,4 @@ export enum AlertMsg {
 }
 
 export const REQUIRED_MINIMUM_BALANCE: number = 0.05;
+export const REQUIRED_MINIMUM_BALANCE_ETH: number = 0.0005;
diff --git a/src/modules/zk-evm-bridge/index.ts b/src/modules/zk-evm-bridge/index.ts
index cf883e997..801006f67 100644
--- a/src/modules/zk-evm-bridge/index.ts
+++ b/src/modules/zk-evm-bridge/index.ts
@@ -1 +1,2 @@
 export * from './l1-bridge';
+export * from './tokens';
diff --git a/src/modules/zk-evm-bridge/l1-bridge/index.ts b/src/modules/zk-evm-bridge/l1-bridge/index.ts
index f5ab274aa..9e2137556 100644
--- a/src/modules/zk-evm-bridge/l1-bridge/index.ts
+++ b/src/modules/zk-evm-bridge/l1-bridge/index.ts
@@ -1,12 +1,14 @@
 import ABI_ZK_EVM_BRIDGE from 'src/config/web3/abi/zkevm-bridge-abi.json';
+import ABI_ZK_EVM_AGGREGATED_BRIDGE from 'src/config/web3/abi/zkevm-aggregated-bridge-abi.json';
 export * from './utils';
 
+// Todo: combine to one abi after zKatana has been migrated
 export const ZK_EVM_BRIDGE_ABI = ABI_ZK_EVM_BRIDGE;
+export const ZK_EVM_AGGREGATED_BRIDGE_ABI = ABI_ZK_EVM_AGGREGATED_BRIDGE;
 
-// Todo: update to https
 export const zkEvmApi = {
   testnet: 'https://bridge-api.zkatana.gelato.digital',
-  mainnet: 'https://akiba-bridge-api.astar.network',
+  mainnet: 'https://bridge-api.astar-zkevm.gelato.digital',
 };
 
 export enum EthBridgeNetworkName {
@@ -21,15 +23,14 @@ export enum ZkChainId {
   'Sepolia' = 11155111,
   'Zkatana' = 1261120,
   'Ethereum' = 1,
-  'AstarZk' = 9999999, // Todo: update
+  'AstarZk' = 3776,
 }
 
-// Todo: check mainnet contract
 export const EthBridgeContract = {
   [EthBridgeNetworkName.Sepolia]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
-  [EthBridgeNetworkName.Ethereum]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
+  [EthBridgeNetworkName.Ethereum]: '0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe',
   [EthBridgeNetworkName.Zkatana]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
-  [EthBridgeNetworkName.AstarZk]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
+  [EthBridgeNetworkName.AstarZk]: '0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe',
 };
 
 export const EthBridgeChainId = {
@@ -43,7 +44,7 @@ export const EthBridgeChainIdToName = {
   [ZkChainId.Sepolia]: EthBridgeNetworkName.Sepolia,
   [ZkChainId.Ethereum]: EthBridgeNetworkName.Ethereum,
   [ZkChainId.Zkatana]: EthBridgeNetworkName.Zkatana,
-  [ZkChainId.AstarZk]: EthBridgeNetworkName.AstarZk, // Todo: update
+  [ZkChainId.AstarZk]: EthBridgeNetworkName.AstarZk,
 };
 
 export const zkBridgeIcon = {
@@ -78,7 +79,8 @@ export interface BridgeHistory {
 
 export enum ZkNetworkId {
   L1 = 0,
-  L2 = 1,
+  L2_Testnet = 1,
+  L2_Mainnet = 2,
 }
 
 export interface ZkToken {
@@ -91,12 +93,3 @@ export interface ZkToken {
   toChainBalance?: number;
   image?: string;
 }
-
-// Ref: https://github.com/0xPolygonHermez/zkevm-bridge-ui/blob/7c84791d06770569d316f27d62c3989bef81be58/src/constants.ts#L73
-export const TOKEN_BLACKLIST = [
-  // WETH
-  // '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-  // '0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6',
-  // '0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9',
-  '',
-];
diff --git a/src/modules/zk-evm-bridge/l1-bridge/utils.ts b/src/modules/zk-evm-bridge/l1-bridge/utils.ts
index ef2a927f8..8cce6db56 100644
--- a/src/modules/zk-evm-bridge/l1-bridge/utils.ts
+++ b/src/modules/zk-evm-bridge/l1-bridge/utils.ts
@@ -9,9 +9,11 @@ import {
   EthBridgeContract,
   EthBridgeNetworkName,
   ZK_EVM_BRIDGE_ABI,
+  ZK_EVM_AGGREGATED_BRIDGE_ABI,
   ZkChainId,
   ZkNetworkId,
   zkEvmApi,
+  DEFAULT_TOKENS,
 } from 'src/modules/zk-evm-bridge';
 
 import { buildWeb3Instance } from 'src/config/web3';
@@ -21,32 +23,33 @@ import { astarNativeTokenErcAddr } from 'src/modules/xcm';
 type MerkleProof = {
   main_exit_root: string;
   merkle_proof: string[];
-  rollup_merkle_proof: string[];
+  // Todo: remove '?'
+  rollup_merkle_proof?: string[];
   rollup_exit_root: string;
 };
 
+export const getNetworkId = async (chainName: EthBridgeNetworkName) => {
+  const chainId = EthBridgeChainId[chainName];
+  const web3 = buildWeb3Instance(chainId);
+  if (!web3) throw Error('Failed creating Web3 instance');
+
+  const contractAddress = EthBridgeContract[chainName];
+  const isAggregateContract = contractAddress === EthBridgeContract[EthBridgeNetworkName.Ethereum];
+
+  const abi = isAggregateContract ? ZK_EVM_AGGREGATED_BRIDGE_ABI : ZK_EVM_BRIDGE_ABI;
+  const contract = new web3.eth.Contract(abi as AbiItem[], contractAddress);
+  return await contract.methods.networkID().call();
+};
+
 export const checkIsL1 = (zkNetwork: ZkNetworkId): boolean => {
   return zkNetwork === ZkNetworkId.L1;
 };
 
-const getMainOrTestNet = (): 'mainnet' | 'testnet' => {
+export const getMainOrTestNet = (): 'mainnet' | 'testnet' => {
   const networkIdxStore = String(localStorage.getItem(LOCAL_STORAGE.NETWORK_IDX));
   return networkIdxStore === String(endpointKey.ASTAR_ZKEVM) ? 'mainnet' : 'testnet';
 };
 
-export const getContractFromNetId = (zkNetwork: ZkNetworkId): string => {
-  const network = getMainOrTestNet();
-  if (network === 'mainnet') {
-    return zkNetwork === ZkNetworkId.L1
-      ? EthBridgeContract[EthBridgeNetworkName.Ethereum]
-      : EthBridgeContract[EthBridgeNetworkName.AstarZk];
-  } else {
-    return zkNetwork === ZkNetworkId.L1
-      ? EthBridgeContract[EthBridgeNetworkName.Sepolia]
-      : EthBridgeContract[EthBridgeNetworkName.Zkatana];
-  }
-};
-
 export const getChainIdFromNetId = (zkNetwork: ZkNetworkId): ZkChainId => {
   const network = getMainOrTestNet();
   if (network === 'mainnet') {
@@ -113,16 +116,17 @@ export const getBridgedTokenAddress = async ({
   const fromChainName = EthBridgeChainIdToName[srcChainId];
   const fromChainWeb3 = buildWeb3Instance(srcChainId) as Web3;
   const toChainContractAddress = EthBridgeContract[fromChainName];
+
+  const isAggregateContract =
+    toChainContractAddress === EthBridgeContract[EthBridgeNetworkName.Ethereum];
+
+  const abi = isAggregateContract ? ZK_EVM_AGGREGATED_BRIDGE_ABI : ZK_EVM_BRIDGE_ABI;
   const fromChainContract = new fromChainWeb3.eth.Contract(
-    ZK_EVM_BRIDGE_ABI as AbiItem[],
+    abi as AbiItem[],
     toChainContractAddress
   );
 
-  const networkId =
-    fromChainName === EthBridgeNetworkName.Ethereum ||
-    fromChainName === EthBridgeNetworkName.Sepolia
-      ? ZkNetworkId.L1
-      : ZkNetworkId.L2;
+  const networkId = await getNetworkId(fromChainName);
 
   // Memo: check if the bridge token is wrapped token
   const data = await fromChainContract.methods.wrappedTokenToTokenInfo(tokenAddress).call();
@@ -141,5 +145,23 @@ export const getBridgedTokenAddress = async ({
 };
 
 export const getShortNetworkName = (network: string) => {
-  return network.replace('zkEVM', '').replace('Testnet', '');
+  return network.replace('Testnet', '');
+};
+
+// Memo: add default tokens to Astar zkEVM assets
+export const handleAddDefaultTokens = (): void => {
+  try {
+    const importedEvmTokens = localStorage.getItem(LOCAL_STORAGE.EVM_TOKEN_IMPORTS);
+    const tokensData = importedEvmTokens ? JSON.parse(importedEvmTokens) : [];
+    const mergedArray = [...DEFAULT_TOKENS, ...tokensData];
+    const seen = new Set();
+    const updatedTokens = mergedArray.filter((token: any) => {
+      const duplicate = seen.has(`${token.srcChainId}-${token.address}`);
+      seen.add(`${token.srcChainId}-${token.address}`);
+      return !duplicate;
+    });
+    localStorage.setItem(LOCAL_STORAGE.EVM_TOKEN_IMPORTS, JSON.stringify(updatedTokens));
+  } catch (error) {
+    console.error(error);
+  }
 };
diff --git a/src/modules/zk-evm-bridge/tokens.ts b/src/modules/zk-evm-bridge/tokens.ts
new file mode 100644
index 000000000..14d5f7066
--- /dev/null
+++ b/src/modules/zk-evm-bridge/tokens.ts
@@ -0,0 +1,198 @@
+export const TOKEN_BLACKLIST = [
+  // WETH (Ethereum)
+  '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+  // WETH (Astar zkEVM)
+  '0xE9CC37904875B459Fa5D0FE37680d36F1ED55e38',
+];
+
+export const DEFAULT_TOKENS = [
+  {
+    srcChainId: 1,
+    address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+    decimal: '6',
+    symbol: 'USDT',
+    name: 'Tether USD',
+    image: 'https://assets.coingecko.com/coins/images/325/large/Tether-logo.png?1598003707',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0x1E4a5963aBFD975d8c9021ce480b42188849D41d',
+    bridgedChainId: 3776,
+  },
+  {
+    srcChainId: 3776,
+    address: '0x1E4a5963aBFD975d8c9021ce480b42188849D41d',
+    decimal: '6',
+    symbol: 'USDT',
+    name: 'Tether USD',
+    image: 'https://assets.coingecko.com/coins/images/325/large/Tether-logo.png?1598003707',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+    bridgedChainId: 1,
+  },
+  {
+    srcChainId: 1,
+    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    decimal: '6',
+    symbol: 'USDC',
+    name: 'USD Coin',
+    image:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xA8CE8aee21bC2A48a5EF670afCc9274C7bbbC035',
+    bridgedChainId: 3776,
+  },
+  {
+    srcChainId: 3776,
+    address: '0xA8CE8aee21bC2A48a5EF670afCc9274C7bbbC035',
+    decimal: '6',
+    symbol: 'USDC',
+    name: 'USD Coin',
+    image:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    bridgedChainId: 1,
+  },
+  {
+    srcChainId: 1,
+    address: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+    decimal: '18',
+    symbol: 'wstETH',
+    name: 'Wrapped liquid staked Ether 2.0',
+    image: 'https://assets.coingecko.com/coins/images/18834/standard/wstETH.png?1696518295',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9',
+    bridgedChainId: 3776,
+  },
+  {
+    srcChainId: 3776,
+    address: '0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9',
+    decimal: '18',
+    symbol: 'wstETH',
+    name: 'Wrapped liquid staked Ether 2.0',
+    image: 'https://assets.coingecko.com/coins/images/18834/standard/wstETH.png?1696518295',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+    bridgedChainId: 1,
+  },
+  {
+    srcChainId: 1,
+    address: '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee',
+    decimal: '18',
+    symbol: 'weETH',
+    name: 'Wrapped eETH',
+    image: 'https://assets.coingecko.com/coins/images/33033/standard/weETH.png?1701438396',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xcD68DFf4415358c35a28f96Fd5bF7083B22De1D6',
+    bridgedChainId: 3776,
+  },
+  {
+    srcChainId: 3776,
+    address: '0xcD68DFf4415358c35a28f96Fd5bF7083B22De1D6',
+    decimal: '18',
+    symbol: 'weETH',
+    name: 'Wrapped eETH',
+    image: 'https://assets.coingecko.com/coins/images/33033/standard/weETH.png?1701438396',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee',
+    bridgedChainId: 1,
+  },
+
+  {
+    srcChainId: 1,
+    address: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+    decimal: '8',
+    symbol: 'WBTC',
+    name: 'Wrapped BTC',
+    image:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xEA034fb02eB1808C2cc3adbC15f447B93CbE08e1',
+    bridgedChainId: 3776,
+  },
+  {
+    srcChainId: 3776,
+    address: '0xEA034fb02eB1808C2cc3adbC15f447B93CbE08e1',
+    decimal: '8',
+    symbol: 'WBTC',
+    name: 'Wrapped BTC',
+    image:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+    bridgedChainId: 1,
+  },
+  {
+    srcChainId: 1,
+    address: '0x6b175474e89094c44da98b954eedeac495271d0f',
+    decimal: '18',
+    symbol: 'DAI',
+    name: 'Dai Stablecoin',
+    image:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xC5015b9d9161Dca7e18e32f6f25C4aD850731Fd4',
+    bridgedChainId: 3776,
+  },
+  {
+    srcChainId: 3776,
+    address: '0xC5015b9d9161Dca7e18e32f6f25C4aD850731Fd4',
+    decimal: '18',
+    symbol: 'DAI',
+    name: 'Dai Stablecoin',
+    image:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
+    bridgedChainId: 1,
+  },
+  {
+    srcChainId: 1,
+    address: '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
+    decimal: '18',
+    symbol: 'MATIC',
+    name: 'Matic Token',
+    image: 'https://assets.coingecko.com/coins/images/4713/standard/polygon.png?1698233745',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0xa2036f0538221a77A3937F1379699f44945018d0',
+    bridgedChainId: 3776,
+  },
+  {
+    srcChainId: 3776,
+    address: '0xa2036f0538221a77A3937F1379699f44945018d0',
+    decimal: '18',
+    symbol: 'MATIC',
+    name: 'Matic Token',
+    image: 'https://assets.coingecko.com/coins/images/4713/standard/polygon.png?1698233745',
+    isWrappedToken: false,
+    isXC20: false,
+    wrapUrl: null,
+    bridgedTokenAddress: '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
+    bridgedChainId: 1,
+  },
+];
diff --git a/src/staking-v3/components/my-staking/MyStaking.vue b/src/staking-v3/components/my-staking/MyStaking.vue
index 28789a9b6..aafb7f265 100644
--- a/src/staking-v3/components/my-staking/MyStaking.vue
+++ b/src/staking-v3/components/my-staking/MyStaking.vue
@@ -168,7 +168,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, PropType, ref, watch } from 'vue';
+import { defineComponent, computed, PropType, ref, watchEffect } from 'vue';
 import { useAprV3, useDappStaking, useDappStakingNavigation } from '../../hooks';
 import MyStakingCard from './MyStakingCard.vue';
 import TokenBalanceNative from 'src/components/common/TokenBalanceNative.vue';
@@ -262,7 +262,7 @@ export default defineComponent({
       setShowUnlockModal(true);
     };
 
-    watch([rewards], setBonus);
+    watchEffect(setBonus);
 
     return {
       rewards,
diff --git a/src/v2/repositories/implementations/ZkBridgeRepository.ts b/src/v2/repositories/implementations/ZkBridgeRepository.ts
index b720e3281..856096eff 100644
--- a/src/v2/repositories/implementations/ZkBridgeRepository.ts
+++ b/src/v2/repositories/implementations/ZkBridgeRepository.ts
@@ -6,9 +6,9 @@ import {
   EthBridgeContract,
   EthBridgeNetworkName,
   ZK_EVM_BRIDGE_ABI,
-  ZkNetworkId,
+  ZK_EVM_AGGREGATED_BRIDGE_ABI,
   fetchMerkleProof,
-  getContractFromNetId,
+  getMainOrTestNet,
 } from 'src/modules/zk-evm-bridge';
 import { ParamBridgeAsset, ParamClaim } from 'src/v2/services';
 import Web3 from 'web3';
@@ -39,6 +39,7 @@ export class ZkBridgeRepository implements IZkBridgeRepository {
       data,
     };
   }
+
   public async getBridgeAssetData({
     param,
     web3,
@@ -46,27 +47,26 @@ export class ZkBridgeRepository implements IZkBridgeRepository {
     param: ParamBridgeAsset;
     web3: Web3;
   }): Promise<TransactionConfig> {
-    const contractAddress = EthBridgeContract[param.fromChainName];
-    // ABI: https://github.com/0xPolygonHermez/zkevm-bridge-ui/blob/7c84791d06770569d316f27d62c3989bef81be58/abis/bridge.json
-    const contract = new web3.eth.Contract(ZK_EVM_BRIDGE_ABI as AbiItem[], contractAddress);
+    if (param.destNetworkId === undefined || param.destNetworkId === null) {
+      throw Error('destNetworkId is not set');
+    }
 
-    const isToL1 =
-      param.toChainName === EthBridgeNetworkName.Ethereum ||
-      param.toChainName === EthBridgeNetworkName.Sepolia;
+    const contractAddress = EthBridgeContract[param.fromChainName];
+    const isAggregateContract =
+      contractAddress === EthBridgeContract[EthBridgeNetworkName.Ethereum];
 
+    const abi = isAggregateContract ? ZK_EVM_AGGREGATED_BRIDGE_ABI : ZK_EVM_BRIDGE_ABI;
+    // ABI: https://github.com/0xPolygonHermez/zkevm-bridge-ui/blob/7c84791d06770569d316f27d62c3989bef81be58/abis/bridge.json
+    const contract = new web3.eth.Contract(abi as AbiItem[], contractAddress);
     const isNativeToken = param.tokenAddress === astarNativeTokenErcAddr;
-
-    // Todo: Ask if `0` is L1 and `1` is L1
-    const destinationNetwork = isToL1 ? ZkNetworkId.L1 : ZkNetworkId.L2;
     const destinationAddress = param.senderAddress;
     const amount = ethers.utils.parseUnits(String(param.amount), param.decimal).toString();
-    // Todo: Ask if we need to care about `forceUpdateGlobalExitRoot` and `permitData`
     const forceUpdateGlobalExitRoot = true;
     const permitData = '0x';
 
     const data = contract.methods
       .bridgeAsset(
-        destinationNetwork,
+        param.destNetworkId,
         destinationAddress,
         amount,
         param.tokenAddress,
@@ -92,33 +92,69 @@ export class ZkBridgeRepository implements IZkBridgeRepository {
   }): Promise<TransactionConfig> {
     const { deposit_cnt, orig_net, orig_addr, dest_net, dest_addr, amount, metadata, network_id } =
       param.withdrawal;
-    const { main_exit_root, merkle_proof, rollup_exit_root } = await fetchMerkleProof(
-      deposit_cnt,
-      Number(network_id)
-    );
 
-    const contractAddress = getContractFromNetId(network_id);
-    const contract = new web3.eth.Contract(ZK_EVM_BRIDGE_ABI as AbiItem[], contractAddress);
+    const network = getMainOrTestNet();
+    const contractAddress =
+      network === 'mainnet'
+        ? EthBridgeContract[EthBridgeNetworkName.Ethereum]
+        : EthBridgeContract[EthBridgeNetworkName.Sepolia];
 
-    const data = contract.methods
-      .claimAsset(
-        merkle_proof,
-        Number(deposit_cnt),
-        main_exit_root,
-        rollup_exit_root,
-        orig_net,
-        orig_addr,
-        dest_net,
-        dest_addr,
-        amount,
-        metadata
-      )
-      .encodeABI();
+    const isAggregateContract =
+      contractAddress === EthBridgeContract[EthBridgeNetworkName.Ethereum];
+    const abi = isAggregateContract ? ZK_EVM_AGGREGATED_BRIDGE_ABI : ZK_EVM_BRIDGE_ABI;
+    const contract = new web3.eth.Contract(abi as AbiItem[], contractAddress);
 
-    return {
-      from: param.senderAddress,
-      to: contractAddress,
-      data,
-    };
+    // Todo: remove when zKatana has been migrated to zKyoto
+    if (isAggregateContract) {
+      const { main_exit_root, merkle_proof, rollup_exit_root, rollup_merkle_proof } =
+        await fetchMerkleProof(deposit_cnt, Number(network_id));
+
+      const data = contract.methods
+        .claimAsset(
+          merkle_proof,
+          rollup_merkle_proof,
+          Number(param.withdrawal.global_index),
+          main_exit_root,
+          rollup_exit_root,
+          orig_net,
+          orig_addr,
+          dest_net,
+          dest_addr,
+          amount,
+          metadata
+        )
+        .encodeABI();
+
+      return {
+        from: param.senderAddress,
+        to: contractAddress,
+        data,
+      };
+    } else {
+      const { main_exit_root, merkle_proof, rollup_exit_root } = await fetchMerkleProof(
+        deposit_cnt,
+        Number(network_id)
+      );
+      const data = contract.methods
+        .claimAsset(
+          merkle_proof,
+          Number(deposit_cnt),
+          main_exit_root,
+          rollup_exit_root,
+          orig_net,
+          orig_addr,
+          dest_net,
+          dest_addr,
+          amount,
+          metadata
+        )
+        .encodeABI();
+
+      return {
+        from: param.senderAddress,
+        to: contractAddress,
+        data,
+      };
+    }
   }
 }
diff --git a/src/v2/services/IZkBridgeService.ts b/src/v2/services/IZkBridgeService.ts
index 90c9acf92..59781a6ee 100644
--- a/src/v2/services/IZkBridgeService.ts
+++ b/src/v2/services/IZkBridgeService.ts
@@ -12,6 +12,7 @@ export interface ParamBridgeAsset {
   amount: string | BigNumber;
   fromChainName: EthBridgeNetworkName;
   toChainName: EthBridgeNetworkName;
+  destNetworkId?: number;
   tokenAddress: string;
   decimal: number;
 }
diff --git a/src/v2/services/implementations/AssetsService.ts b/src/v2/services/implementations/AssetsService.ts
index 0e096bf64..b2d2bc5ec 100644
--- a/src/v2/services/implementations/AssetsService.ts
+++ b/src/v2/services/implementations/AssetsService.ts
@@ -1,9 +1,17 @@
+import { ethers } from 'ethers';
 import { inject, injectable } from 'inversify';
+import { endpointKey } from 'src/config/chainEndpoints';
+import { LOCAL_STORAGE } from 'src/config/localStorage';
 import { getEvmProvider } from 'src/hooks/helper/wallet';
+import {
+  AlertMsg,
+  REQUIRED_MINIMUM_BALANCE,
+  REQUIRED_MINIMUM_BALANCE_ETH,
+} from 'src/modules/toast/index';
+import { astarNativeTokenErcAddr } from 'src/modules/xcm';
 import { IEventAggregator } from 'src/v2/messaging';
 import { IAssetsRepository } from 'src/v2/repositories/IAssetsRepository';
 import { IAssetsService, IWalletService } from 'src/v2/services';
-import { AlertMsg, REQUIRED_MINIMUM_BALANCE } from 'src/modules/toast/index';
 import {
   ParamAssetTransfer,
   ParamEvmTransfer,
@@ -11,7 +19,6 @@ import {
 } from 'src/v2/services/IAssetsService';
 import { Symbols } from 'src/v2/symbols';
 import Web3 from 'web3';
-import { ethers } from 'ethers';
 
 @injectable()
 export class AssetsService implements IAssetsService {
@@ -53,7 +60,15 @@ export class AssetsService implements IAssetsService {
 
     const balWei = await web3.eth.getBalance(param.senderAddress);
     const useableBalance = Number(ethers.utils.formatEther(balWei));
-    const isBalanceEnough = useableBalance - Number(param.amount) > REQUIRED_MINIMUM_BALANCE;
+    const amount = param.contractAddress === astarNativeTokenErcAddr ? Number(param.amount) : 0;
+    const networkIdxStore = String(localStorage.getItem(LOCAL_STORAGE.NETWORK_IDX));
+
+    const minBal =
+      Number(networkIdxStore) === endpointKey.ASTAR_ZKEVM
+        ? REQUIRED_MINIMUM_BALANCE_ETH
+        : REQUIRED_MINIMUM_BALANCE;
+
+    const isBalanceEnough = useableBalance - amount > minBal;
     if (isBalanceEnough) {
       const rawTx = await this.AssetsRepository.getEvmTransferData({
         param,
diff --git a/src/v2/services/implementations/MetamaskWalletService.ts b/src/v2/services/implementations/MetamaskWalletService.ts
index c206706ce..2b8b1eb26 100644
--- a/src/v2/services/implementations/MetamaskWalletService.ts
+++ b/src/v2/services/implementations/MetamaskWalletService.ts
@@ -1,9 +1,14 @@
-import { ethers } from 'ethers';
 import { TypedDataDomain, TypedDataField } from '@ethersproject/abstract-signer';
+import { ethers } from 'ethers';
 import { inject, injectable } from 'inversify';
+import { handleCheckProviderChainId } from 'src/config/web3';
+import lockdropDispatchAbi from 'src/config/web3/abi/dispatch-lockdrop.json';
+import * as utils from 'src/hooks/custom-signature/utils';
 import { getEvmProvider } from 'src/hooks/helper/wallet';
 import { EthereumProvider } from 'src/hooks/types/CustomSignature';
 import { getEvmExplorerUrl } from 'src/links';
+import { getRawEvmTransaction } from 'src/modules/evm';
+import { evmPrecompiledContract } from 'src/modules/precompiled';
 import { AlertMsg, REQUIRED_MINIMUM_BALANCE } from 'src/modules/toast';
 import { Guard } from 'src/v2/common';
 import { BusyMessage, ExtrinsicStatusMessage, IEventAggregator } from 'src/v2/messaging';
@@ -17,10 +22,6 @@ import {
 import { WalletService } from 'src/v2/services/implementations';
 import { Symbols } from 'src/v2/symbols';
 import Web3 from 'web3';
-import { getRawEvmTransaction } from 'src/modules/evm';
-import * as utils from 'src/hooks/custom-signature/utils';
-import lockdropDispatchAbi from 'src/config/web3/abi/dispatch-lockdrop.json';
-import { evmPrecompiledContract } from 'src/modules/precompiled';
 import { AbiItem } from 'web3-utils';
 
 @injectable()
@@ -165,6 +166,10 @@ export class MetamaskWalletService extends WalletService implements IWalletServi
   }: ParamSendEvmTransaction): Promise<string> {
     try {
       const web3 = new Web3(this.provider as any);
+      const resultCheckProvider = await handleCheckProviderChainId(this.provider);
+      if (!resultCheckProvider) {
+        throw Error('Please connect to the correct network in your wallet');
+      }
       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.
diff --git a/src/v2/services/implementations/XcmEvmService.ts b/src/v2/services/implementations/XcmEvmService.ts
index d84c66884..2531a8c89 100644
--- a/src/v2/services/implementations/XcmEvmService.ts
+++ b/src/v2/services/implementations/XcmEvmService.ts
@@ -1,14 +1,20 @@
+import {
+  getPubkeyFromSS58Addr,
+  isValidAddressPolkadotAddress,
+  isValidEvmAddress,
+} from '@astar-network/astar-sdk-core';
 import { BN } from '@polkadot/util';
 import { ethers } from 'ethers';
 import { inject, injectable } from 'inversify';
+import { handleCheckProviderChainId } from 'src/config/web3';
 import xcmContractAbi from 'src/config/web3/abi/xcm-abi.json';
 import moonbeamWithdrawalAbi from 'src/config/web3/abi/xcm-moonbeam-withdrawal-abi.json';
-import {
-  isValidAddressPolkadotAddress,
-  getPubkeyFromSS58Addr,
-  isValidEvmAddress,
-} from '@astar-network/astar-sdk-core';
 import { getEvmProvider } from 'src/hooks/helper/wallet';
+import { EthereumProvider } from 'src/hooks/types/CustomSignature';
+import { getEvmExplorerUrl } from 'src/links';
+import { getRawEvmTransaction } from 'src/modules/evm';
+import { evmPrecompiledContract } from 'src/modules/precompiled';
+import { AlertMsg } from 'src/modules/toast';
 import { relaychainParaId, xcmChainObj } from 'src/modules/xcm';
 import { Guard } from 'src/v2/common';
 import { BusyMessage, ExtrinsicStatusMessage, IEventAggregator } from 'src/v2/messaging';
@@ -17,18 +23,23 @@ import { IGasPriceProvider, IXcmEvmService, TransferParam } from 'src/v2/service
 import { Symbols } from 'src/v2/symbols';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
-import { AlertMsg } from 'src/modules/toast';
-import { getEvmExplorerUrl } from 'src/links';
-import { evmPrecompiledContract } from 'src/modules/precompiled';
-import { getRawEvmTransaction } from 'src/modules/evm';
 
 @injectable()
 export class XcmEvmService implements IXcmEvmService {
+  private provider!: EthereumProvider;
   constructor(
     @inject(Symbols.EventAggregator) private eventAggregator: IEventAggregator,
     @inject(Symbols.GasPriceProvider) private gasPriceProvider: IGasPriceProvider,
     @inject(Symbols.CurrentWallet) private currentWallet: string
-  ) {}
+  ) {
+    const ethProvider = getEvmProvider(currentWallet as any);
+
+    if (ethProvider) {
+      this.provider = ethProvider;
+    } else {
+      Guard.ThrowIfUndefined('provider', this.provider);
+    }
+  }
 
   public async transfer({
     from,
@@ -54,6 +65,11 @@ export class XcmEvmService implements IXcmEvmService {
       throw Error('Invalid destination address');
     }
 
+    const resultCheckProvider = await handleCheckProviderChainId(this.provider);
+    if (!resultCheckProvider) {
+      throw Error('Please connect to the correct network in your wallet');
+    }
+
     return new Promise<void>(async (resolve, reject) => {
       this.eventAggregator.publish(new BusyMessage(true));
 
diff --git a/src/v2/services/implementations/ZkBridgeService.ts b/src/v2/services/implementations/ZkBridgeService.ts
index fdf5546d4..4e81cdbd8 100644
--- a/src/v2/services/implementations/ZkBridgeService.ts
+++ b/src/v2/services/implementations/ZkBridgeService.ts
@@ -87,6 +87,7 @@ export class ZkBridgeService implements IZkBridgeService {
       param,
       web3,
     });
+
     const transactionHash = await this.wallet.sendEvmTransaction({
       from: String(rawTx.from),
       to: String(rawTx.to),