From 71e9308e0392d8df028c2fb915832f5cf6120f9c Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 23 Dec 2024 15:57:55 +0200
Subject: [PATCH 1/6] remove zKyoto from bridges

---
 src/components/bridge/BridgeSelection.vue | 58 ++++-------------------
 1 file changed, 10 insertions(+), 48 deletions(-)

diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index 41cb00752..1f0c4f6f9 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -40,44 +40,6 @@
             {{ $t('bridge.ccipMinatoBridge.remark') }}
           </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/ethereum.png')"
-                    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">
@@ -225,24 +187,24 @@
 </template>
 <script lang="ts">
 import { cbridgeAppLink } from 'src/c-bridge';
+import {
+  ccipMinatoBridgeEnabled,
+  celerBridgeEnabled,
+  layerSwapBridgeEnabled,
+  layerZeroBridgeEnabled,
+  nativeBridgeEnabled,
+} from 'src/features';
 import { useAccount, useNetworkInfo } from 'src/hooks';
 import { EthBridgeNetworkName } from 'src/modules/zk-evm-bridge';
+import { layerSwapLink, zKatanaBridgeUrl } from 'src/modules/zk-evm-bridge/index';
 import {
   Path as RoutePath,
+  buildCcipBridgePageLink,
   buildEthereumBridgePageLink,
   buildLzBridgePageLink,
-  buildCcipBridgePageLink,
 } from 'src/router/routes';
-import { computed, defineComponent } from 'vue';
-import { layerSwapLink, zKatanaBridgeUrl } from 'src/modules/zk-evm-bridge/index';
-import {
-  celerBridgeEnabled,
-  layerSwapBridgeEnabled,
-  nativeBridgeEnabled,
-  layerZeroBridgeEnabled,
-  ccipMinatoBridgeEnabled,
-} from 'src/features';
 import { navigateInNewTab } from 'src/util-general';
+import { computed, defineComponent } from 'vue';
 
 export default defineComponent({
   components: {},

From 09776df989129075042a465b4ec64431e7ad519a Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:01:29 +0200
Subject: [PATCH 2/6] remove zKyoto from network selection

---
 src/components/header/modals/SelectNetwork.vue       | 12 ------------
 .../header/styles/modal-network-wallet.scss          |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/components/header/modals/SelectNetwork.vue b/src/components/header/modals/SelectNetwork.vue
index b3ffc7e84..7401d7bb5 100644
--- a/src/components/header/modals/SelectNetwork.vue
+++ b/src/components/header/modals/SelectNetwork.vue
@@ -57,18 +57,6 @@
           />
           <span class="text--network">{{ $t('drawer.astarTestnet') }}</span>
         </button>
-        <button
-          class="row--network box--hover--active"
-          :class="selNetworkId === endpointKey.ZKYOTO && 'border--active'"
-          @click="setSelNetwork(endpointKey.ZKYOTO)"
-        >
-          <img
-            class="img--network-logo"
-            :src="require('src/assets/img/chain/astar-zkevm-logo-white.svg')"
-            alt="logo-zkatana"
-          />
-          <span class="text--network">{{ $t('drawer.zkTestnet') }}</span>
-        </button>
       </div>
       <div v-if="!isZkEvm" class="container--advanced">
         <div class="row--title-advanced">
diff --git a/src/components/header/styles/modal-network-wallet.scss b/src/components/header/styles/modal-network-wallet.scss
index 14a9de824..595c74b11 100644
--- a/src/components/header/styles/modal-network-wallet.scss
+++ b/src/components/header/styles/modal-network-wallet.scss
@@ -118,7 +118,7 @@
   display: flex;
   column-gap: 8px;
   display: grid;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: 1fr;
   width: 100%;
   margin-bottom: 20px;
 }

From 0775b4a3f138253005e41a75f4884eb955b14237 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:15:14 +0200
Subject: [PATCH 3/6] remove zKatana code

---
 src/components/bridge/BridgeSelection.vue | 33 -----------------------
 1 file changed, 33 deletions(-)

diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index 1f0c4f6f9..53fcfadae 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -79,39 +79,6 @@
             {{ $t('bridge.bridgeMaintenanceMode') }}
           </p>
         </div>
-        <div v-if="isZkyoto" class="column--selection">
-          <button :disabled="!isEnableEthBridge">
-            <a
-              :href="zKatanaBridgeUrl"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="button--bridge"
-            >
-              <div class="row--logo-bg">
-                <div class="img--logo-bg">
-                  <img
-                    class="img--logo"
-                    :src="require('src/assets/img/ethereum.png')"
-                    alt="ethereum"
-                  />
-                </div>
-              </div>
-              <div class="row--bridge-title">
-                <div class="text--bridge-tag">
-                  <q-chip outline>
-                    {{ $t('bridge.zKatanaBridge.tag') }}
-                  </q-chip>
-                </div>
-                <span class="text--bridge-title">{{ $t('bridge.zKatanaBridge.title') }}</span>
-                <div class="box--text-bridge">
-                  <span class="text--bridge">
-                    {{ $t('bridge.zKatanaBridge.text') }}
-                  </span>
-                </div>
-              </div>
-            </a>
-          </button>
-        </div>
       </div>
       <div class="container--selection">
         <div class="column--selection">

From 7ac7d5bb2525c8cbbf72b5a07435f2b00ef6b7d2 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:15:21 +0200
Subject: [PATCH 4/6] fix hover styles

---
 src/components/bridge/styles/bridge-selection.scss | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/bridge/styles/bridge-selection.scss b/src/components/bridge/styles/bridge-selection.scss
index 2add525ca..25b28116e 100644
--- a/src/components/bridge/styles/bridge-selection.scss
+++ b/src/components/bridge/styles/bridge-selection.scss
@@ -78,7 +78,7 @@
   width: 100%;
 }
 
-.column--selection button:not([disabled]) .button--bridge:hover {
+.column--selection :is(button, a):not([disabled]).button--bridge:hover {
   border: 1px solid $astar-blue !important;
   transition: all 0.3s ease 0s;
 }
@@ -206,11 +206,6 @@
     }
   }
 
-  .column--selection button:not([disabled]) .button--bridge:hover {
-    border: 1px solid $astar-blue !important;
-    transition: all 0.3s ease 0s;
-  }
-
   .img--logo-bg {
     background-color: $navy-3;
   }

From 6b8dc7416302ce60425eb3e86545817941e77793 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:51:34 +0200
Subject: [PATCH 5/6] restore native bridge

---
 src/components/bridge/BridgeSelection.vue | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index 53fcfadae..b23a47456 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -41,6 +41,45 @@
           </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/ethereum.png')"
+                    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

From a268cd04009b1aace641e26a02333b4d0790373a Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:01:55 +0200
Subject: [PATCH 6/6] remove zKyoto refs

---
 src/components/assets/EvmNativeToken.vue   | 23 ++++++----------------
 src/components/bridge/BridgeSelection.vue  |  6 ++----
 src/components/header/mobile/MobileNav.vue |  2 --
 src/components/sidenav/SidebarDesktop.vue  |  3 +--
 src/hooks/useNetworkInfo.ts                |  2 --
 5 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/components/assets/EvmNativeToken.vue b/src/components/assets/EvmNativeToken.vue
index 070c15e66..b3410c28f 100644
--- a/src/components/assets/EvmNativeToken.vue
+++ b/src/components/assets/EvmNativeToken.vue
@@ -121,16 +121,6 @@
           </q-tooltip>
         </a>
 
-        <a v-if="isZkyoto" :href="faucetSethLink" target="_blank" rel="noopener noreferrer">
-          <button class="btn btn--icon">
-            <astar-icon-faucet />
-          </button>
-          <span class="text--mobile-menu">{{ $t('assets.faucet') }}</span>
-          <q-tooltip>
-            <span class="text--tooltip">{{ $t('assets.faucet') }}</span>
-          </q-tooltip>
-        </a>
-
         <div v-else-if="isFaucet">
           <button class="btn btn--icon" @click="handleModalFaucet({ isOpen: true })">
             <astar-icon-faucet />
@@ -152,21 +142,21 @@ import { ethers } from 'ethers';
 import { $web3 } from 'src/boot/api';
 import { cbridgeAppLink } from 'src/c-bridge';
 import ModalFaucet from 'src/components/assets/modals/ModalFaucet.vue';
+import Balloon from 'src/components/common/Balloon.vue';
+import { LOCAL_STORAGE } from 'src/config/localStorage';
+import { ccipMinatoBridgeEnabled, layerZeroBridgeEnabled, nativeBridgeEnabled } from 'src/features';
 import { useAccount, useBreakpoints, useFaucet, useNetworkInfo } from 'src/hooks';
 import { faucetSethLink } from 'src/links';
 import { getTokenImage } from 'src/modules/token';
 import {
+  buildCcipBridgePageLink,
   buildEthereumBridgePageLink,
-  buildTransferPageLink,
   buildLzBridgePageLink,
-  buildCcipBridgePageLink,
+  buildTransferPageLink,
 } from 'src/router/routes';
 import { useStore } from 'src/store';
 import { computed, defineComponent, ref, watch, watchEffect } from 'vue';
-import { nativeBridgeEnabled, layerZeroBridgeEnabled, ccipMinatoBridgeEnabled } from 'src/features';
 import CustomRouterLink from '../common/CustomRouterLink.vue';
-import Balloon from 'src/components/common/Balloon.vue';
-import { LOCAL_STORAGE } from 'src/config/localStorage';
 
 export default defineComponent({
   components: { ModalFaucet, CustomRouterLink, Balloon },
@@ -188,7 +178,7 @@ export default defineComponent({
     const isCcipBalloon = ref<boolean>(false);
     const isBalloonClosing = ref<boolean>(false);
 
-    const { currentNetworkName, nativeTokenSymbol, isZkEvm, isZkyoto, isAstar, isShibuyaEvm } =
+    const { currentNetworkName, nativeTokenSymbol, isZkEvm, isAstar, isShibuyaEvm } =
       useNetworkInfo();
 
     const closeCcipBalloon = () => {
@@ -263,7 +253,6 @@ export default defineComponent({
       isFaucet,
       isModalFaucet,
       isZkEvm,
-      isZkyoto,
       faucetSethLink,
       width,
       screenSize,
diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index b23a47456..ecab93c8e 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -220,7 +220,6 @@ export default defineComponent({
       isZkEvm,
       networkNameSubstrate,
       isMainnet,
-      isZkyoto,
       isAstarZkEvm,
       isAstar,
       isH160,
@@ -228,11 +227,11 @@ export default defineComponent({
     } = useNetworkInfo();
 
     const l1Name = computed<string>(() => {
-      return isZkyoto.value ? EthBridgeNetworkName.Sepolia : EthBridgeNetworkName.Ethereum;
+      return EthBridgeNetworkName.Ethereum;
     });
 
     const l2Name = computed<string>(() => {
-      return isZkyoto.value ? EthBridgeNetworkName.Zkyoto : EthBridgeNetworkName.AstarZk;
+      return EthBridgeNetworkName.AstarZk;
     });
 
     const cbridgeNetworkName = computed<string>(() => {
@@ -260,7 +259,6 @@ export default defineComponent({
       cbridgeNetworkName,
       layerSwapLink,
       zKatanaBridgeUrl,
-      isZkyoto,
       isEnableLzBridge,
       celerBridgeEnabled,
       layerSwapBridgeEnabled,
diff --git a/src/components/header/mobile/MobileNav.vue b/src/components/header/mobile/MobileNav.vue
index 10103ad96..bc5a920f1 100644
--- a/src/components/header/mobile/MobileNav.vue
+++ b/src/components/header/mobile/MobileNav.vue
@@ -114,7 +114,6 @@ export default defineComponent({
     const showNav = ref<boolean>(false);
     const router = useRouter();
     const path = computed(() => router.currentRoute.value.path.split('/')[2]);
-    const { isZkyoto } = useNetworkInfo();
     const { isGovernanceEnabled, governanceUrl } = useGovernance();
 
     const store = useStore();
@@ -128,7 +127,6 @@ export default defineComponent({
       path,
       RoutePath,
       network,
-      isZkyoto,
       surgeUrl,
       socialUrl,
       isGovernanceEnabled,
diff --git a/src/components/sidenav/SidebarDesktop.vue b/src/components/sidenav/SidebarDesktop.vue
index 8a49904c3..370e6fa0a 100644
--- a/src/components/sidenav/SidebarDesktop.vue
+++ b/src/components/sidenav/SidebarDesktop.vue
@@ -125,7 +125,7 @@ export default defineComponent({
   },
   setup() {
     const { isOpen } = useSidebar();
-    const { isZkEvm, isZkyoto } = useNetworkInfo();
+    const { isZkEvm } = useNetworkInfo();
     const { isGovernanceEnabled, governanceUrl } = useGovernance();
 
     const store = useStore();
@@ -162,7 +162,6 @@ export default defineComponent({
       path,
       RoutePath,
       socialUrl,
-      isZkyoto,
       surgeUrl,
       isGovernanceEnabled,
       governanceUrl,
diff --git a/src/hooks/useNetworkInfo.ts b/src/hooks/useNetworkInfo.ts
index f35644518..b2a64d339 100644
--- a/src/hooks/useNetworkInfo.ts
+++ b/src/hooks/useNetworkInfo.ts
@@ -31,7 +31,6 @@ export function useNetworkInfo() {
       currentNetworkIdx.value === endpointKey.ASTAR_ZKEVM
   );
 
-  const isZkyoto = computed<boolean>(() => currentNetworkIdx.value === endpointKey.ZKYOTO);
   const isAstarZkEvm = computed<boolean>(() => currentNetworkIdx.value === endpointKey.ASTAR_ZKEVM);
   const isAstar = computed<boolean>(() => currentNetworkIdx.value === endpointKey.ASTAR);
   const isShibuya = computed<boolean>(() => currentNetworkIdx.value === endpointKey.SHIBUYA);
@@ -127,7 +126,6 @@ export function useNetworkInfo() {
     polkadotJsLink,
     isZkEvm,
     networkNameSubstrate,
-    isZkyoto,
     isAstarZkEvm,
     isAstar,
     dappStakingCurrency,