Skip to content

hotfix: removed zkEVM links #1462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 16, 2025
Merged

hotfix: removed zkEVM links #1462

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4646633
feat: removed zkEVM links
impelcrypto Apr 15, 2025
8cbcc10
feat: updated Astar button
impelcrypto Apr 15, 2025
199568c
fix: rollback
impelcrypto Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 1 addition & 29 deletions src/components/assets/EvmNativeToken.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down Expand Up @@ -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,
Expand All @@ -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 },
Expand Down Expand Up @@ -242,7 +217,6 @@ export default defineComponent({
const {
currentNetworkName,
nativeTokenSymbol,
isZkEvm,
isAstar,
isShibuyaEvm,
isAstarEvm,
Expand All @@ -268,7 +242,6 @@ export default defineComponent({
getTokenImage({
isNativeToken: true,
symbol: nativeTokenSymbol.value,
isZkEvm: isZkEvm.value,
})
);

Expand Down Expand Up @@ -349,7 +322,6 @@ export default defineComponent({
cbridgeAppLink,
isFaucet,
isModalFaucet,
isZkEvm,
faucetSethLink,
width,
screenSize,
Expand Down
110 changes: 1 addition & 109 deletions src/components/bridge/BridgeSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions src/components/header/modals/ModalNetworkWallet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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: {
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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;
});
Expand Down Expand Up @@ -455,7 +445,6 @@ export default defineComponent({
endpointKey,
isSelectLightClient,
isLightClientExtension,
isZkEvm,
isDisabled,
SupportWallet,
WalletModalOption,
Expand Down
23 changes: 2 additions & 21 deletions src/components/header/modals/SelectNetwork.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,6 @@
<span class="text--title">{{ $t('drawer.astarL1') }}</span>
<div class="line--bottom-bg bottom--l1" />
</button>

<button
:disabled="true"
class="card--astar box--hover--active"
:class="selNetworkId === endpointKey.ASTAR_ZKEVM && 'border--active'"
@click="setSelNetwork(endpointKey.ASTAR_ZKEVM)"
>
<img
class="img--astar"
:src="require('src/assets/img/chain/zkatana-logo.png')"
alt="logo-astar-zkevm"
/>
<span class="text--title">{{ $t('drawer.astarZkL2') }}</span>
<div class="line--bottom-bg bottom--zkevm" />
</button>
</div>

<div class="container--other-networks">
Expand Down Expand Up @@ -59,7 +44,7 @@
<span class="text--network">{{ $t('drawer.astarTestnet') }}</span>
</button>
</div>
<div v-if="!isZkEvm" class="container--advanced">
<div class="container--advanced">
<div class="row--title-advanced">
<span class="text--network">{{ $t('drawer.advanced') }}</span>
<button
Expand Down Expand Up @@ -87,7 +72,7 @@
<div class="title--endpoint">
<span class="text--network">
{{ providerEndpoints[selNetworkId].displayName.replace('Network', '') }}
{{ isZkEvm ? 'RPC' : 'Endpoint' }}
Endpoint
</span>
</div>
<div>
Expand Down Expand Up @@ -233,10 +218,6 @@ export default defineComponent({
type: Function,
required: true,
},
isZkEvm: {
type: Boolean,
required: true,
},
isSelectLightClient: {
type: Boolean,
required: true,
Expand Down
6 changes: 0 additions & 6 deletions src/components/header/modals/SelectWallet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -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()"
>
Expand Down Expand Up @@ -165,10 +163,6 @@ export default defineComponent({
type: Boolean,
required: true,
},
isZkEvm: {
type: Boolean,
required: true,
},
selectedWallet: {
type: String as PropType<SupportWallet>,
required: true,
Expand Down
14 changes: 12 additions & 2 deletions src/hooks/useAppRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { handleAddDefaultTokens } from './../modules/zk-evm-bridge/l1-bridge/ind
import { useAccount } from './useAccount';
import { checkIsNativeWallet } from './helper/wallet';
import { PolkasafeWrapper } from 'src/types/polkasafe';
import { buildNetworkUrl } from 'src/router/utils';

const { NETWORK_IDX, SELECTED_ENDPOINT, SELECTED_ADDRESS, SELECTED_WALLET, MULTISIG } =
LOCAL_STORAGE;
Expand Down Expand Up @@ -54,14 +55,21 @@ export function useAppRouter() {
};

// Memo: reload the app if local storage is invalid
const handleInvalidStorage = (): void => {
const handleInvalidStorage = async (): Promise<void> => {
const storedAddress = localStorage.getItem(SELECTED_ADDRESS);
const storedWallet = localStorage.getItem(SELECTED_WALLET);
const isWalletConnect = storedWallet === SupportWallet.WalletConnect;
const invalidCondition =
(storedAddress && !storedWallet) || (!isWalletConnect && storedWallet && !storedAddress);

invalidCondition && handleResetAccount();

if (isZkEvm.value) {
Copy link
Contributor

@gtg7784 gtg7784 Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for existing user who selected zkEVM before, am i correct?

Copy link
Contributor Author

@impelcrypto impelcrypto Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

const network = providerEndpoints[endpointKey.ASTAR].networkAlias;
const url = buildNetworkUrl(network);
await wait(1000);
window.open(url, '_self');
}
};

const handleCheckWalletType = (): void => {
Expand Down Expand Up @@ -158,7 +166,9 @@ export function useAppRouter() {
};

watchEffect(handleInputNetworkParam);
watchEffect(handleInvalidStorage);
watchEffect(async () => {
handleInvalidStorage();
});
watchEffect(initializePolkasafeClient);
watchEffect(handleAddDefaultTokens);
watchEffect(handleCheckWalletType);
Expand Down
Loading
Loading