hotfix: merge to the main branch

.github/workflows/deploy-to-staging.yml

@@ -21,3 +21,4 @@ jobs:
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_ASTAR_APPS_STAGING }}'
           channelId: live
           projectId: astar-apps-staging
+          firebaseToolsVersion: 13.35.1

.github/workflows/pull-request-preview.yml

@@ -36,6 +36,7 @@ jobs:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_ASTAR_APPS }}'
           projectId: astar-apps
+          firebaseToolsVersion: 13.35.1
   e2etest:
     permissions:
       checks: write

src/components/assets/EvmNativeToken.vue

@@ -124,30 +124,6 @@
           />
         </div>
 
-        <custom-router-link
-          v-if="isAstar"
-          :to="buildLzBridgePageLink()"
-          :is-disabled="!layerZeroBridgeEnabled"
-        >
-          <button class="btn btn--icon"><astar-icon-bridge /></button>
-          <span class="text--mobile-menu">{{ $t('assets.bridgeToZkEvm') }}</span>
-          <q-tooltip>
-            <span class="text--tooltip">{{ $t('assets.bridgeToZkEvm') }}</span>
-          </q-tooltip>
-        </custom-router-link>
-
-        <custom-router-link
-          v-if="isZkEvm"
-          :to="buildEthereumBridgePageLink()"
-          :is-disabled="!nativeBridgeEnabled"
-        >
-          <button class="btn btn--icon"><astar-icon-bridge /></button>
-          <span class="text--mobile-menu">{{ $t('assets.bridge') }}</span>
-          <q-tooltip>
-            <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
-          </q-tooltip>
-        </custom-router-link>
-
         <!-- Only SDN is able to bridge via cBridge at this moment -->
         <!-- <a
           v-if="nativeTokenSymbol === 'SDN'"
@@ -205,7 +181,6 @@ import { useAccount, useBreakpoints, useFaucet, useNetworkInfo } from 'src/hooks
 import { faucetSethLink } from 'src/links';
 import { getTokenImage } from 'src/modules/token';
 import {
-  buildCcipBridgePageLink,
   buildEthereumBridgePageLink,
   buildLzBridgePageLink,
   buildTransferPageLink,
@@ -214,7 +189,7 @@ import { useStore } from 'src/store';
 import { computed, defineComponent, ref, watch, watchEffect } from 'vue';
 
 import CustomRouterLink from '../common/CustomRouterLink.vue';
-import { CcipNetworkName, CcipNetworkParam } from 'src/modules/ccip-bridge';
+import { CcipNetworkName } from 'src/modules/ccip-bridge';
 
 export default defineComponent({
   components: { ModalFaucet, CustomRouterLink, Balloon },
@@ -242,7 +217,6 @@ export default defineComponent({
     const {
       currentNetworkName,
       nativeTokenSymbol,
-      isZkEvm,
       isAstar,
       isShibuyaEvm,
       isAstarEvm,
@@ -268,7 +242,6 @@ export default defineComponent({
       getTokenImage({
         isNativeToken: true,
         symbol: nativeTokenSymbol.value,
-        isZkEvm: isZkEvm.value,
       })
     );
 
@@ -349,7 +322,6 @@ export default defineComponent({
       cbridgeAppLink,
       isFaucet,
       isModalFaucet,
-      isZkEvm,
       faucetSethLink,
       width,
       screenSize,

src/components/bridge/BridgeSelection.vue

@@ -52,7 +52,7 @@
             </component>
           </button>
           <p v-if="!isAstarEvm && !isShibuyaEvm" class="text--bridge-details">
-            {{ $t('bridge.ccipSoneiumBridge.remark') }}
+            {{ $t('bridge.ccipAstrBridge.remark') }}
           </p>
         </div>
 
@@ -157,114 +157,6 @@
             {{ $t('bridge.celerBridge.warning') }}
           </p>
         </div>
-        <div class="column--selection">
-          <button :disabled="!isEnableEthBridge">
-            <component
-              :is="isEnableEthBridge ? 'router-link' : 'div'"
-              :to="buildEthereumBridgePageLink()"
-              class="button--bridge"
-            >
-              <div class="row--logo-bg">
-                <div class="img--logo-bg">
-                  <img
-                    class="img--logo"
-                    :src="require('src/assets/img/chain/ethereum-gray.svg')"
-                    alt="ethereum"
-                  />
-                </div>
-              </div>
-              <div class="row--bridge-title">
-                <div class="text--bridge-tag">
-                  <q-chip outline>
-                    {{ $t('bridge.ethereumBridge.tag') }}
-                  </q-chip>
-                </div>
-                <span class="text--bridge-title">{{ $t('bridge.ethereumBridge.title') }}</span>
-                <div class="box--text-bridge">
-                  <span class="text--bridge">
-                    {{ $t('bridge.ethereumBridge.text', { l1: l1Name, l2: l2Name }) }}
-                  </span>
-                </div>
-              </div>
-            </component>
-          </button>
-          <p v-if="!isZkEvm" class="text--bridge-details">
-            {{ $t('bridge.ethereumBridge.remark') }}
-          </p>
-          <p v-if="!nativeBridgeEnabled" class="text--bridge-details">
-            {{ $t('bridge.bridgeMaintenanceMode') }}
-          </p>
-        </div>
-
-        <div class="column--selection">
-          <button :disabled="!isEnableLzBridge || !layerZeroBridgeEnabled">
-            <component
-              :is="isEnableLzBridge && layerZeroBridgeEnabled ? 'router-link' : 'div'"
-              :to="buildLzBridgePageLink()"
-              class="button--bridge"
-            >
-              <div class="row--logo-bg">
-                <div class="img--logo-bg">
-                  <img
-                    class="img--logo"
-                    :src="require('src/assets/img/layerzero_bridge_logo.svg')"
-                    alt="astar-bridge"
-                  />
-                </div>
-              </div>
-              <div class="row--bridge-title">
-                <div class="text--bridge-tag">
-                  <q-chip outline>
-                    {{ $t('bridge.astarBridge.tag') }}
-                  </q-chip>
-                </div>
-                <span class="text--bridge-title">{{ $t('bridge.astarBridge.title') }}</span>
-                <div class="box--text-bridge">
-                  <span class="text--bridge">
-                    {{ $t('bridge.astarBridge.text') }}
-                  </span>
-                </div>
-              </div>
-            </component>
-          </button>
-          <p v-if="!isEnableLzBridge" class="text--bridge-details">
-            {{ $t('bridge.astarBridge.remark') }}
-          </p>
-          <p v-if="!layerZeroBridgeEnabled" class="text--bridge-details">
-            {{ $t('bridge.bridgeMaintenanceMode') }}
-          </p>
-        </div>
-
-        <div class="column--selection">
-          <button
-            :disabled="!layerSwapBridgeEnabled"
-            class="button--bridge"
-            @click="navigateInNewTab(layerSwapLink)"
-          >
-            <div class="row--logo-bg">
-              <div class="img--logo-bg">
-                <img
-                  class="img--logo"
-                  :src="require('src/assets/img/layerswap_logo.svg')"
-                  alt="layer-swap"
-                />
-              </div>
-            </div>
-            <div class="row--bridge-title">
-              <div class="text--bridge-tag">
-                <q-chip outline>
-                  {{ $t('bridge.layerSwap.tag') }}
-                </q-chip>
-              </div>
-              <span class="text--bridge-title">{{ $t('bridge.layerSwap.title') }}</span>
-              <div class="box--text-bridge">
-                <span class="text--bridge">
-                  {{ $t('bridge.layerSwap.text') }}
-                </span>
-              </div>
-            </div>
-          </button>
-        </div>
       </div>
     </div>
   </div>

src/components/header/modals/ModalNetworkWallet.vue

@@ -21,7 +21,6 @@
               :set-custom-endpoint="setCustomEndpoint"
               :set-is-network="setIsNetwork"
               :check-is-checked-endpoint="checkIsCheckedEndpoint"
-              :is-zk-evm="isZkEvm"
               :is-select-light-client="isSelectLightClient"
               :is-light-client-extension="isLightClientExtension"
               :is-disabled="isDisabled"
@@ -59,7 +58,6 @@
               :selected-wallet="(selectedWallet as SupportWallet)"
               :select-network="selectNetwork"
               :sel-network-id="selNetworkId"
-              :is-zk-evm="isZkEvm"
               :is-animated-in="isAnimatedIn"
             />
           </div>
@@ -87,7 +85,6 @@ import SelectAccount from './SelectAccount.vue';
 import SelectMultisigAccount from './SelectMultisigAccount.vue';
 import SelectNetwork from './SelectNetwork.vue';
 import SelectWallet from './SelectWallet.vue';
-import Ads from './Ads.vue';
 
 export default defineComponent({
   components: {
@@ -182,10 +179,6 @@ export default defineComponent({
 
     const isLightClientExtension = computed<boolean>(() => checkIsSubstrateConnectInstalled());
     const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);
-    const isZkEvm = computed<boolean>(
-      () =>
-        selNetworkId.value === endpointKey.ASTAR_ZKEVM || selNetworkId.value === endpointKey.ZKYOTO
-    );
 
     const setInitialCustomEndpoint = (): string => {
       const selectedEndpointStored = String(localStorage.getItem(SELECTED_ENDPOINT));
@@ -298,9 +291,6 @@ export default defineComponent({
       if (selNetworkId.value === endpointKey.CUSTOM && !customEndpoint.value) {
         return true;
       }
-      if (isZkEvm.value && !isH160.value) {
-        return true;
-      }
 
       return false;
     });
@@ -455,7 +445,6 @@ export default defineComponent({
       endpointKey,
       isSelectLightClient,
       isLightClientExtension,
-      isZkEvm,
       isDisabled,
       SupportWallet,
       WalletModalOption,

src/components/header/modals/SelectNetwork.vue

@@ -10,20 +10,6 @@
         <span class="text--title">{{ $t('drawer.astarL1') }}</span>
         <div class="line--bottom-bg bottom--l1" />
       </button>
-
-      <button
-        class="card--astar box--hover--active"
-        :class="selNetworkId === endpointKey.ASTAR_ZKEVM && 'border--active'"
-        @click="setSelNetwork(endpointKey.ASTAR_ZKEVM)"
-      >
-        <img
-          class="img--astar"
-          :src="require('src/assets/img/chain/zkatana-logo.png')"
-          alt="logo-astar-zkevm"
-        />
-        <span class="text--title">{{ $t('drawer.astarZkL2') }}</span>
-        <div class="line--bottom-bg bottom--zkevm" />
-      </button>
     </div>
 
     <div class="container--other-networks">
@@ -58,7 +44,7 @@
           <span class="text--network">{{ $t('drawer.astarTestnet') }}</span>
         </button>
       </div>
-      <div v-if="!isZkEvm" class="container--advanced">
+      <div class="container--advanced">
         <div class="row--title-advanced">
           <span class="text--network">{{ $t('drawer.advanced') }}</span>
           <button
@@ -86,7 +72,7 @@
                 <div class="title--endpoint">
                   <span class="text--network">
                     {{ providerEndpoints[selNetworkId].displayName.replace('Network', '') }}
-                    {{ isZkEvm ? 'RPC' : 'Endpoint' }}
+                    Endpoint
                   </span>
                 </div>
                 <div>
@@ -232,10 +218,6 @@ export default defineComponent({
       type: Function,
       required: true,
     },
-    isZkEvm: {
-      type: Boolean,
-      required: true,
-    },
     isSelectLightClient: {
       type: Boolean,
       required: true,

src/components/header/modals/SelectWallet.vue

@@ -42,7 +42,6 @@
             v-for="(wallet, index) in nativeWallets"
             :key="index"
             :data-testid="wallet.name"
-            :disabled="isZkEvm"
             class="box__row--wallet box--hover--active"
             :class="currentWallet === wallet.source && 'border--active'"
             @click="setSubstrateWalletModal(wallet.source)"
@@ -59,7 +58,6 @@
           <button
             v-if="isEnablePolkasafe"
             class="box__row--wallet box--hover--active"
-            :disabled="isZkEvm"
             :class="currentWallet === SupportMultisig.Polkasafe && 'border--active'"
             @click="setPolkasafeModal()"
           >
@@ -165,10 +163,6 @@ export default defineComponent({
       type: Boolean,
       required: true,
     },
-    isZkEvm: {
-      type: Boolean,
-      required: true,
-    },
     selectedWallet: {
       type: String as PropType<SupportWallet>,
       required: true,

src/config/chainEndpoints.ts

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

src/features.ts

@@ -1,8 +1,8 @@
 import { CcipNetworkName } from './modules/ccip-bridge';
 
 // Bridges
-export const nativeBridgeEnabled = true;
-export const layerZeroBridgeEnabled = true;
+export const nativeBridgeEnabled = false;
+export const layerZeroBridgeEnabled = false;
 export const layerSwapBridgeEnabled = false;
 export const celerBridgeEnabled = true;
 export const omniBridgeEnabled = true;