Skip to content
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.

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

Feature/remove deprecated networks #1430

Merged
merged 6 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 6 additions & 17 deletions src/components/assets/EvmNativeToken.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand All @@ -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 },
Expand All @@ -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 = () => {
Expand Down Expand Up @@ -263,7 +253,6 @@ export default defineComponent({
isFaucet,
isModalFaucet,
isZkEvm,
isZkyoto,
faucetSethLink,
width,
screenSize,
Expand Down
60 changes: 13 additions & 47 deletions src/components/bridge/BridgeSelection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
{{ $t('bridge.ccipMinatoBridge.remark') }}
</p>
</div>

<div class="column--selection">
<button :disabled="!isEnableEthBridge">
<component
Expand Down Expand Up @@ -117,39 +118,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">
Expand Down Expand Up @@ -225,24 +193,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: {},
Expand All @@ -252,19 +220,18 @@ export default defineComponent({
isZkEvm,
networkNameSubstrate,
isMainnet,
isZkyoto,
isAstarZkEvm,
isAstar,
isH160,
isShibuyaEvm,
} = 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>(() => {
Expand Down Expand Up @@ -292,7 +259,6 @@ export default defineComponent({
cbridgeNetworkName,
layerSwapLink,
zKatanaBridgeUrl,
isZkyoto,
isEnableLzBridge,
celerBridgeEnabled,
layerSwapBridgeEnabled,
Expand Down
7 changes: 1 addition & 6 deletions src/components/bridge/styles/bridge-selection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions src/components/header/mobile/MobileNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -128,7 +127,6 @@ export default defineComponent({
path,
RoutePath,
network,
isZkyoto,
surgeUrl,
socialUrl,
isGovernanceEnabled,
Expand Down
12 changes: 0 additions & 12 deletions src/components/header/modals/SelectNetwork.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/components/header/styles/modal-network-wallet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/sidenav/SidebarDesktop.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -162,7 +162,6 @@ export default defineComponent({
path,
RoutePath,
socialUrl,
isZkyoto,
surgeUrl,
isGovernanceEnabled,
governanceUrl,
Expand Down
2 changes: 0 additions & 2 deletions src/hooks/useNetworkInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -127,7 +126,6 @@ export function useNetworkInfo() {
polkadotJsLink,
isZkEvm,
networkNameSubstrate,
isZkyoto,
isAstarZkEvm,
isAstar,
dappStakingCurrency,
Expand Down
Loading