Skip to content

Commit

Permalink
fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
MickWang committed Apr 10, 2024
1 parent bbb9ed3 commit 26e0260
Show file tree
Hide file tree
Showing 53 changed files with 988 additions and 893 deletions.
2 changes: 1 addition & 1 deletion components/common/Timer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ let intervalId: ReturnType<typeof setInterval> | undefined = undefined;
const formatTimeDiff = (diff: number): string => {
const day = Math.floor(diff / (1000 * 60 * 60 * 24));
const hours = Math.floor(diff % (1000 * 60 * 60 * 24) / (1000 * 60 * 60));
const hours = Math.floor((diff % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
const seconds = Math.floor((diff % (1000 * 60)) / 1000);
Expand Down
8 changes: 4 additions & 4 deletions components/common/button/Dropdown.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<CommonButton class="dropdown-button" :class="noChevron?'noClick':''">
<CommonButton class="dropdown-button" :class="noChevron ? 'noClick' : ''">
<div v-if="$slots['left-icon']" class="left-icon-container">
<slot name="left-icon" />
</div>
Expand Down Expand Up @@ -46,10 +46,10 @@ defineProps({
}
}
.noClick{
background: transparent !important;
:hover{
.noClick {
background: transparent !important;
:hover {
background: transparent !important;
}
}
</style>
Expand Down
16 changes: 11 additions & 5 deletions components/common/input/TransactionSend.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,17 @@ import { computed, ref, watch } from "vue";
import { LockClosedIcon } from "@heroicons/vue/24/outline";
import { BigNumber } from "ethers";
import useNetworks from "@/composables/useNetworks";
import type { Token, TokenAmount } from "@/types";
import type { BigNumberish } from "ethers";
import type { PropType } from "vue";
import { useNetworkStore } from "@/store/network";
import { decimalToBigNumber, formatTokenPrice, parseTokenAmount, removeSmallAmountPretty } from "@/utils/formatters";
import { ETH_ADDRESS, L2_ETH_TOKEN_ADDRESS } from "~/zksync-web3-nova/src/utils";
import useNetworks from "@/composables/useNetworks";
const { zkSyncNetworks,isCustomNode,defaultNetwork } = useNetworks();
const { zkSyncNetworks } = useNetworks();
// const { selectedNetwork } = storeToRefs(useNetworkStore());
const selectedNetwork = zkSyncNetworks.filter((i:any)=>i.key === "primary")[0];
const selectedNetwork = zkSyncNetworks.filter((i: any) => i.key === "primary")[0];

Check warning on line 115 in components/common/input/TransactionSend.vue

View workflow job for this annotation

GitHub Actions / Build

Unexpected any. Specify a different type
const props = defineProps({
modelValue: {
type: String,
Expand Down Expand Up @@ -161,7 +162,12 @@ const selectedTokenAddress = computed({
});
const selectedToken = computed(() => {
const tokens = props.balances.length ? props.balances : props.tokens;
return tokens.filter((e)=> selectedNetwork.isEthGasToken || (e.address !== ETH_ADDRESS && e.address.toLowerCase() !== L2_ETH_TOKEN_ADDRESS)).find((e) => e.address === props.tokenAddress);
return tokens
.filter(
(e) =>
selectedNetwork.isEthGasToken || (e.address !== ETH_ADDRESS && e.address.toLowerCase() !== L2_ETH_TOKEN_ADDRESS)
)
.find((e) => e.address === props.tokenAddress);
});
const tokenBalance = computed(() => {
if (!props.balances.length || !selectedToken.value) {
Expand Down
19 changes: 13 additions & 6 deletions components/common/input/TransactionWithdraw.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
<template v-else-if="amountError === 'exceeds_decimals'">
Max decimal length for {{ selectedToken?.symbol }} is {{ selectedToken?.decimals }}
</template>

</CommonInputErrorMessage>
<CommonButtonLabel v-else-if="inputted" as="div" variant="light" class="-mb-6 mt-1 text-right text-sm">
{{ totalAmountPrice }}
Expand Down Expand Up @@ -105,10 +104,12 @@ import { computed, ref, watch } from "vue";
import { LockClosedIcon } from "@heroicons/vue/24/outline";
import { BigNumber } from "ethers";
import { storeToRefs } from "pinia";
import type { Token, TokenAmount } from "@/types";
import type { BigNumberish } from "ethers";
import type { PropType } from "vue";
import { useNetworkStore } from "@/store/network";
import { decimalToBigNumber, formatTokenPrice, parseTokenAmount, removeSmallAmountPretty } from "@/utils/formatters";
import { ETH_ADDRESS, L2_ETH_TOKEN_ADDRESS } from "~/zksync-web3-nova/src/utils";
Expand Down Expand Up @@ -150,8 +151,8 @@ const props = defineProps({
},
mergeLimitExceeds: {
type: Boolean,
default: false
}
default: false,
},
});
const emit = defineEmits<{
Expand All @@ -166,7 +167,13 @@ const selectedTokenAddress = computed({
});
const selectedToken = computed(() => {
const tokens = props.balances.length ? props.balances : props.tokens;
return tokens.filter((e)=> selectedNetwork.value.isEthGasToken || (e.address !== ETH_ADDRESS && e.address.toLowerCase() !== L2_ETH_TOKEN_ADDRESS)).find((e) => e.address === props.tokenAddress);
return tokens
.filter(
(e) =>
selectedNetwork.value.isEthGasToken ||
(e.address !== ETH_ADDRESS && e.address.toLowerCase() !== L2_ETH_TOKEN_ADDRESS)
)
.find((e) => e.address === props.tokenAddress);
});
const tokenBalance = computed(() => {
if (!props.balances.length || !selectedToken.value) {
Expand Down Expand Up @@ -223,8 +230,8 @@ const setMaxAmount = () => {
};
const amountError = computed(() => {
if(props.mergeLimitExceeds) {
return 'exceeds_merge_limit'
if (props.mergeLimitExceeds) {
return "exceeds_merge_limit";
}
if (!selectedToken.value) return;
if (tokenBalance.value && totalComputeAmount.value.gt(tokenBalance.value.amount)) {
Expand Down
14 changes: 10 additions & 4 deletions components/destination/DestinationItem.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<template>
<CommonButtonLineWithImg :as="as" :icon="icon" class="destination-item" :class="{ 'disable': disabled }" v-tooltip="disabled&&'Withdrawal from Nova will be enable in April.'">
<CommonButtonLineWithImg
:as="as"
:icon="icon"
class="destination-item"
:class="{ disable: disabled }"
v-tooltip="disabled && 'Withdrawal from Nova will be enable in April.'"
>
<template #image>
<slot name="image">
<CommonImageLoader class="destination-item-icon" :src="iconUrl" />
Expand Down Expand Up @@ -50,18 +56,18 @@ defineProps({
disabled: {
type: Boolean,
default: false,
}
},
});
</script>

<style lang="scss">
.marginLeft{
.marginLeft {
display: inline-block;
position: absolute;
right: 10px;
color: #999a9c;
}
.disable{
.disable {
background: #252628 !important;
color: #999a9c !important;
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion components/header/AccountDropdownButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ import { storeToRefs } from "pinia";
import { useOnboardStore } from "@/store/onboard";
const onboardStore = useOnboardStore();
const { account,walletName } = storeToRefs(onboardStore);
const { account, walletName } = storeToRefs(onboardStore);
</script>
32 changes: 14 additions & 18 deletions components/header/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@
<CommonButton class="hamburger-icon" @click="mobileMainNavigationOpened = true">
<Bars3Icon class="h-6 w-6" aria-hidden="true" />
<transition v-bind="TransitionOpacity()">
<CommonBadge v-if="withdrawalsAvailableForClaiming && withdrawalsAvailableForClaiming.length" class="action-available-badge">
<CommonBadge
v-if="withdrawalsAvailableForClaiming && withdrawalsAvailableForClaiming.length"
class="action-available-badge"
>
{{ withdrawalsAvailableForClaiming.length }}
</CommonBadge>
</transition>
Expand Down Expand Up @@ -104,23 +107,16 @@
</div> -->
<div className="banner" v-if="!route.query.s || route.query.s !== 'okx'">
<a href="https://app.zklink.io/" target="\_blank">
<img
src="/img/banner.svg"
alt=""
className="bannerImg"
/>
<img
src="/img/mobile.svg"
alt=""
className="mobileImg"
/>
<img src="/img/banner.svg" alt="" className="bannerImg" />
<img src="/img/mobile.svg" alt="" className="mobileImg" />
</a>
</div>
</div>
</template>

<script lang="ts" setup>
import { ref } from "vue";
import { computed } from "vue";
import {
ArrowsRightLeftIcon,
Expand All @@ -133,11 +129,11 @@ import {
import { storeToRefs } from "pinia";
import useColorMode from "@/composables/useColorMode";
import useNetworks from "@/composables/useNetworks";
import { useRoute } from "#imports";
import { useOnboardStore } from "@/store/onboard";
import { useZkSyncWithdrawalsStore } from "@/store/zksync/withdrawals";
import useNetworks from "@/composables/useNetworks";
const { defaultNetwork, isMainnet } = useNetworks();
const route = useRoute();
Expand Down Expand Up @@ -217,28 +213,28 @@ const isShowFaucet = computed(() => defaultNetwork.id === 810182);
height: 18px;
}
}
.banner{
.banner {
width: 100%;
text-align: center;
a{
a {
display: inline-block;
width: 100%;
min-width: 0px;
max-width: 700px;
}
.bannerImg{
.bannerImg {
display: inline-block;
width: 100%;
height: 80px;
}
.mobileImg{
.mobileImg {
display: none;
}
@media screen and (max-width: 640px) {
.bannerImg{
.bannerImg {
display: none;
}
.mobileImg{
.mobileImg {
display: none;
display: inline-block;
width: 100%;
Expand Down
4 changes: 4 additions & 0 deletions components/header/MobileMainNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
</template>
<script lang="ts" setup>
import { computed, ref, watch } from "vue";
import {
ArrowsRightLeftIcon,
ArrowsUpDownIcon,
Expand All @@ -116,9 +117,12 @@ import {
WalletIcon,
} from "@heroicons/vue/24/outline";
import { storeToRefs } from "pinia";
import useColorMode from "@/composables/useColorMode";
import useNetworks from "@/composables/useNetworks";
import type { ZkSyncNetwork } from "@/data/networks";
import { useRoute } from "#imports";
import { useNetworkStore } from "@/store/network";
import { useZkSyncWithdrawalsStore } from "@/store/zksync/withdrawals";
Expand Down
4 changes: 2 additions & 2 deletions components/header/NetworkDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<CommonButtonDropdown :toggled="open">
<template #left-icon>
<!-- <IconsEra /> -->
<img class="image-loader-image loaded" :src="selectedNetwork.logoUrl">
<img class="image-loader-image loaded" :src="selectedNetwork.logoUrl" />
</template>
<span>{{ selectedNetwork.l1Network?.name }}</span>
</CommonButtonDropdown>
Expand All @@ -27,7 +27,7 @@
>
<template #left-icon>
<!-- <IconsEra /> -->
<img class="image-loader-image loaded" :src="item.logoUrl">
<img class="image-loader-image loaded" :src="item.logoUrl" />
</template>
<span>{{ item.l1Network?.name }}</span>
<template #right-icon>
Expand Down
56 changes: 29 additions & 27 deletions components/network/NetworkSelectModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,26 @@
<MagnifyingGlassIcon aria-hidden="true" />
</template>
</CommonInputSearch> -->
<div class="-mx-block-padding-1/2 over overflow-auto px-block-padding-1/2">
<div v-for="(group, groupIndex) in arr" :key="groupIndex" class="category">
<!-- <TypographyCategoryLabel size="sm" variant="darker" class="group-category-label">
<div class="over -mx-block-padding-1/2 overflow-auto px-block-padding-1/2">
<div v-for="(group, groupIndex) in arr" :key="groupIndex" class="category">
<!-- <TypographyCategoryLabel size="sm" variant="darker" class="group-category-label">
{{ group.title }}
</TypographyCategoryLabel> -->
<div class="-mx-block-padding-1/4 sm:-mx-block-padding-1/2">
<DestinationItem
v-bind="group"
:key="groupIndex"
:icon="group.key === selectedNetworkKey ? CheckIcon : undefined"
variant="light"
size="sm"
@click="buttonClicked(zkSyncNetwork[groupIndex]);selectedNetworkKey = group.key!"
/>
</div>
<div class="-mx-block-padding-1/4 sm:-mx-block-padding-1/2">
<DestinationItem
v-bind="group"
:key="groupIndex"
:icon="group.key === selectedNetworkKey ? CheckIcon : undefined"
variant="light"
size="sm"
@click="
buttonClicked(zkSyncNetwork[groupIndex]);
selectedNetworkKey = group.key!;
"
/>
</div>
<p v-if="search && !arr.length" class="mt-block-padding-1/2 text-center">
No chains found for "{{ search }}"
</p>
</div>
<p v-if="search && !arr.length" class="mt-block-padding-1/2 text-center">No chains found for "{{ search }}"</p>
<slot name="body-bottom" />
</div>
</Combobox>
Expand All @@ -45,13 +46,14 @@ import { CheckIcon } from "@heroicons/vue/24/outline";
import { storeToRefs } from "pinia";
import useNetworks from "@/composables/useNetworks";
import type { TransactionDestination } from "@/store/destinations";
import { useDestinationsStore } from "@/store/destinations";
import type { ZkSyncNetwork } from "@/data/networks";
import { useNetworkStore } from "@/store/network";
import type { TransactionDestination } from "@/store/destinations";
import { useRoute } from "#app";
import { useDestinationsStore } from "@/store/destinations";
import { useNetworkStore } from "@/store/network";
import { getNetworkUrl } from "@/utils/helpers";
const route = useRoute();
const props = defineProps({
Expand All @@ -75,16 +77,16 @@ const emit = defineEmits<{
}>();
const { zkSyncNetworks } = useNetworks();
const zkSyncNetwork = zkSyncNetworks.filter((e) => !e.hidden)
let arr : any[] = [];
zkSyncNetwork.map((i)=> {
const zkSyncNetwork = zkSyncNetworks.filter((e) => !e.hidden);
let arr: any[] = [];

Check warning on line 81 in components/network/NetworkSelectModal.vue

View workflow job for this annotation

GitHub Actions / Build

Unexpected any. Specify a different type
zkSyncNetwork.map((i) => {
const obj = {
iconUrl: i.logoUrl,
key: i.key,
label: i.l1Network?.name
}
arr.push(obj)
})
label: i.l1Network?.name,
};
arr.push(obj);
});
const { destinations } = storeToRefs(useDestinationsStore());
const { selectedNetwork } = storeToRefs(useNetworkStore());
Expand Down Expand Up @@ -144,7 +146,7 @@ const closeModal = () => {
@apply pt-0;
}
}
.over{
.over {
height: calc(100% - 50px);
}
</style>
2 changes: 1 addition & 1 deletion components/token/TokenLine.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import { storeToRefs } from "pinia";
import type { TokenPrice } from "@/types";
import type { Component, PropType } from "vue";
import { useZkSyncProviderStore } from "@/store/zksync/provider";
import { iconsList } from "@/data/iconlists";
import { useZkSyncProviderStore } from "@/store/zksync/provider";
defineProps({
as: {
Expand Down
Loading

0 comments on commit 26e0260

Please sign in to comment.