From 966768d1f1338cc073863280b70a8066e72f5141 Mon Sep 17 00:00:00 2001 From: Lukasz Kosiak <103423117+lukozill@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:14:48 +0100 Subject: [PATCH] APT-1653: ZQ2 protomainnet connected #738 * zq2 protomainnet connected * staging set to protomainnet --------- Co-authored-by: Lukasz Kosiak --- products/zillion/README.md | 1 - products/zillion/cd/base/configmap.yaml | 10 +- .../cd/overlays/production/kustomization.yaml | 10 +- .../cd/overlays/staging/kustomization.yaml | 58 ++++++ products/zillion/public/config.js | 24 ++- .../contract-calls/complete-withdraw.tsx | 3 +- .../components/contract-calls/swap-deleg.tsx | 3 +- .../contract-calls/update-commission-rate.tsx | 3 +- .../update-receiver-address.tsx | 3 +- .../contract-calls/withdraw-comm.tsx | 3 +- .../contract-calls/withdraw-stake.tsx | 1 + products/zillion/src/components/dashboard.tsx | 44 ++--- products/zillion/src/components/explorer.tsx | 33 ++-- products/zillion/src/components/home.tsx | 67 +++---- .../src/components/landing-stats-table.tsx | 6 + products/zillion/src/components/ssn-table.tsx | 5 + .../src/components/wallet-keystore.tsx | 2 +- products/zillion/src/index.tsx | 8 +- products/zillion/src/saga/stakingSaga.ts | 181 +++++++++++------- products/zillion/src/saga/userSaga.ts | 30 ++- products/zillion/src/setupTests.ts | 5 - products/zillion/src/store/blockchainSlice.ts | 13 +- products/zillion/src/util/api-randomizer.ts | 80 -------- products/zillion/src/util/calculator.ts | 15 +- products/zillion/src/util/config-helper.ts | 64 +++++++ .../zillion/src/util/config-json-helper.ts | 44 +++-- products/zillion/src/util/enum.ts | 14 +- .../zillion/src/util/reward-calculator.ts | 16 +- .../zillion/src/util/use-local-storage.ts | 10 +- products/zillion/src/util/utils.ts | 59 ++---- products/zillion/src/zilliqa-api.ts | 47 +++-- 31 files changed, 457 insertions(+), 405 deletions(-) delete mode 100644 products/zillion/src/setupTests.ts delete mode 100644 products/zillion/src/util/api-randomizer.ts create mode 100644 products/zillion/src/util/config-helper.ts diff --git a/products/zillion/README.md b/products/zillion/README.md index 895ce7f6a..04699ebfb 100644 --- a/products/zillion/README.md +++ b/products/zillion/README.md @@ -39,7 +39,6 @@ ] } }, - blockchain_explorer_config: "viewblock", refresh_rate_config: 3000, api_max_retry_attempt: 10, environment_config: "dev" diff --git a/products/zillion/cd/base/configmap.yaml b/products/zillion/cd/base/configmap.yaml index 45d93c5bb..289d31a70 100644 --- a/products/zillion/cd/base/configmap.yaml +++ b/products/zillion/cd/base/configmap.yaml @@ -29,6 +29,15 @@ data: "https://staking-zil.kucoin.com/api", ] }, + zq2_protomainnet: { + proxy: "0x62A9d5D611CDCaE8D78005F31635898330e06B93", + impl: "0xa7C67D49C82c7dc1B73D231640B2e4d0661D37c1", + blockchain: "https://api.zq2-protomainnet.zilliqa.com", + node_status: "https://staking-viewer.zilliqa.com", + api_list : [ + "https://api.zq2-protomainnet.zilliqa.com", + ] + }, isolated_server: { proxy: "0x0578B8e9D9c2493D4a2E98f364c7ed311F7a0d71", impl: "", @@ -39,7 +48,6 @@ data: ] } }, - blockchain_explorer_config: "viewblock", refresh_rate_config: 10000, api_max_retry_attempt: 10, environment_config: "stage" diff --git a/products/zillion/cd/overlays/production/kustomization.yaml b/products/zillion/cd/overlays/production/kustomization.yaml index c98e595af..8d5343583 100644 --- a/products/zillion/cd/overlays/production/kustomization.yaml +++ b/products/zillion/cd/overlays/production/kustomization.yaml @@ -58,6 +58,15 @@ patches: "https://staking-zil.kucoin.com/api", ] }, + zq2_protomainnet: { + proxy: "0x62A9d5D611CDCaE8D78005F31635898330e06B93", + impl: "0xa7C67D49C82c7dc1B73D231640B2e4d0661D37c1", + blockchain: "https://api.zq2-protomainnet.zilliqa.com", + node_status: "https://staking-viewer.zilliqa.com", + api_list : [ + "https://api.zq2-protomainnet.zilliqa.com", + ] + }, isolated_server: { proxy: "0x0578B8e9D9c2493D4a2E98f364c7ed311F7a0d71", impl: "", @@ -68,7 +77,6 @@ patches: ] } }, - blockchain_explorer_config: "viewblock", refresh_rate_config: 300000, api_max_retry_attempt: 10, environment_config: "prod" diff --git a/products/zillion/cd/overlays/staging/kustomization.yaml b/products/zillion/cd/overlays/staging/kustomization.yaml index 114c9ee8f..230dce0f3 100644 --- a/products/zillion/cd/overlays/staging/kustomization.yaml +++ b/products/zillion/cd/overlays/staging/kustomization.yaml @@ -21,4 +21,62 @@ patches: kubernetes.io/ingress.global-static-ip-name: zillion-zilstg-dev networking.gke.io/managed-certificates: zillion +- target: + kind: ConfigMap + name: zillion-config + patch: |- + - op: replace + path: "/data/config.js" + value: | + window['config'] = { + networks_config: { + testnet: { + proxy: "", + impl: "", + blockchain: "https://dev-api.zilliqa.com", + node_status: "https://testnet-viewer.zilliqa.com", + api_list: [ + "https://bumblebee-api.zilliqa.network", + "https://dev-api.zilliqa.com", + ] + }, + mainnet: { + proxy: "0x62A9d5D611CDCaE8D78005F31635898330e06B93", + impl: "0xa7C67D49C82c7dc1B73D231640B2e4d0661D37c1", + blockchain: "https://api.zilliqa.com", + node_status: "https://staking-viewer.zilliqa.com", + api_list : [ + "https://api.zilliqa.com", + "https://ssn-zilliqa.cex.io/api", + "https://ssn.ignitedao.io/api", + "https://ssn.zillet.io", + "https://zil-staking.ezil.me/api", + "https://staking-zil.kucoin.com/api", + ] + }, + zq2_protomainnet: { + proxy: "0x62A9d5D611CDCaE8D78005F31635898330e06B93", + impl: "0xa7C67D49C82c7dc1B73D231640B2e4d0661D37c1", + blockchain: "https://api.zq2-protomainnet.zilliqa.com", + node_status: "https://staking-viewer.zilliqa.com", + api_list : [ + "https://api.zq2-protomainnet.zilliqa.com", + ] + }, + isolated_server: { + proxy: "0x0578B8e9D9c2493D4a2E98f364c7ed311F7a0d71", + impl: "", + blockchain: "https://zilliqa-isolated-server.zilliqa.com", + node_status: "", + api_list : [ + "https://zilliqa-isolated-server.zilliqa.com" + ] + } + }, + refresh_rate_config: 300000, + api_max_retry_attempt: 10, + environment_config: "stage_zq2_protomainnet" + } + + namespace: zillion-stg diff --git a/products/zillion/public/config.js b/products/zillion/public/config.js index 2799856d3..d93c329c0 100644 --- a/products/zillion/public/config.js +++ b/products/zillion/public/config.js @@ -1,7 +1,4 @@ /* config file - * - * blockchain_explorer_config: [viewblock (default) | devex] - * - domain link to blockchain explorer * * node_status * - link to staking viewer @@ -45,18 +42,26 @@ window['config'] = { ] }, mainnet: { - proxy: "", - impl: "", + proxy: "0x62A9d5D611CDCaE8D78005F31635898330e06B93", + impl: "0xa7C67D49C82c7dc1B73D231640B2e4d0661D37c1", blockchain: "https://api.zilliqa.com", node_status: "https://staking-viewer.zilliqa.com", api_list : [ - "https://ssn.zillacracy.com/api", + "https://api.zilliqa.com", "https://ssn-zilliqa.cex.io/api", + // "https://ssn.ignitedao.io/api", "https://ssn.zillet.io", "https://zil-staking.ezil.me/api", "https://staking-zil.kucoin.com/api", - "https://stakingseed-api.seed.zilliqa.com", - "https://api.zilliqa.com", + ] + }, + zq2_protomainnet: { + proxy: "0x62A9d5D611CDCaE8D78005F31635898330e06B93", + impl: "0xa7C67D49C82c7dc1B73D231640B2e4d0661D37c1", + blockchain: "https://api.zq2-protomainnet.zilliqa.com", + node_status: "https://staking-viewer.zilliqa.com", + api_list : [ + "https://api.zq2-protomainnet.zilliqa.com", ] }, isolated_server: { @@ -69,8 +74,7 @@ window['config'] = { ] } }, - blockchain_explorer_config: "viewblock", refresh_rate_config: 300000, api_max_retry_attempt: 10, - environment_config: "stage" + environment_config: "stage_zq2_protomainnet" } diff --git a/products/zillion/src/components/contract-calls/complete-withdraw.tsx b/products/zillion/src/components/contract-calls/complete-withdraw.tsx index b075d522b..5d0f59556 100644 --- a/products/zillion/src/components/contract-calls/complete-withdraw.tsx +++ b/products/zillion/src/components/contract-calls/complete-withdraw.tsx @@ -10,11 +10,10 @@ import ModalPending from '../contract-calls-modal/modal-pending'; import ModalSent from '../contract-calls-modal/modal-sent'; import { useAppSelector } from '../../store/hooks'; import { ZilSigner } from '../../zilliqa-signer'; -import { units } from '@zilliqa-js/zilliqa'; import BigNumber from 'bignumber.js'; import GasSettings from './gas-settings'; -import { BN } from '@zilliqa-js/util'; +import { BN, units } from '@zilliqa-js/util'; function CompleteWithdrawModal(props: any) { const proxy = useAppSelector(state => state.blockchain.proxy); diff --git a/products/zillion/src/components/contract-calls/swap-deleg.tsx b/products/zillion/src/components/contract-calls/swap-deleg.tsx index 9d74c6c97..c5f75d924 100644 --- a/products/zillion/src/components/contract-calls/swap-deleg.tsx +++ b/products/zillion/src/components/contract-calls/swap-deleg.tsx @@ -27,10 +27,9 @@ import { useAppSelector } from '../../store/hooks'; import { SwapDelegModalData } from '../../util/interface'; import { ZilSigner } from '../../zilliqa-signer'; import { ZilSdk } from '../../zilliqa-api'; -import { units } from '@zilliqa-js/zilliqa'; import BigNumber from 'bignumber.js'; import GasSettings from './gas-settings'; -import { BN, validation } from '@zilliqa-js/util'; +import { BN, validation, units } from '@zilliqa-js/util'; function SwapDelegModal(props: any) { diff --git a/products/zillion/src/components/contract-calls/update-commission-rate.tsx b/products/zillion/src/components/contract-calls/update-commission-rate.tsx index 6314a1f73..1174aff05 100644 --- a/products/zillion/src/components/contract-calls/update-commission-rate.tsx +++ b/products/zillion/src/components/contract-calls/update-commission-rate.tsx @@ -10,12 +10,11 @@ import ModalPending from '../contract-calls-modal/modal-pending'; import ModalSent from '../contract-calls-modal/modal-sent'; import { useAppSelector } from '../../store/hooks'; import { ZilSigner } from '../../zilliqa-signer'; -import { units } from '@zilliqa-js/zilliqa'; import BigNumber from 'bignumber.js'; import GasSettings from './gas-settings'; import { logger } from '../../util/logger'; -import { BN } from '@zilliqa-js/util'; +import { BN, units } from '@zilliqa-js/util'; function UpdateCommRateModal(props: any) { const proxy = useAppSelector(state => state.blockchain.proxy); diff --git a/products/zillion/src/components/contract-calls/update-receiver-address.tsx b/products/zillion/src/components/contract-calls/update-receiver-address.tsx index a4dc57fbc..0cf68dc3c 100644 --- a/products/zillion/src/components/contract-calls/update-receiver-address.tsx +++ b/products/zillion/src/components/contract-calls/update-receiver-address.tsx @@ -10,11 +10,10 @@ import ModalPending from '../contract-calls-modal/modal-pending'; import ModalSent from '../contract-calls-modal/modal-sent'; import { useAppSelector } from '../../store/hooks'; import { ZilSigner } from '../../zilliqa-signer'; -import { units } from '@zilliqa-js/zilliqa'; import BigNumber from 'bignumber.js'; import GasSettings from './gas-settings'; -import { BN } from '@zilliqa-js/util'; +import { BN, units } from '@zilliqa-js/util'; function UpdateReceiverAddress(props: any) { diff --git a/products/zillion/src/components/contract-calls/withdraw-comm.tsx b/products/zillion/src/components/contract-calls/withdraw-comm.tsx index 68e93dc6b..60bd1c4e6 100644 --- a/products/zillion/src/components/contract-calls/withdraw-comm.tsx +++ b/products/zillion/src/components/contract-calls/withdraw-comm.tsx @@ -10,10 +10,9 @@ import ModalPending from '../contract-calls-modal/modal-pending'; import ModalSent from '../contract-calls-modal/modal-sent'; import { useAppSelector } from '../../store/hooks'; import { ZilSigner } from '../../zilliqa-signer'; -import { units } from '@zilliqa-js/zilliqa'; import BigNumber from 'bignumber.js'; import GasSettings from './gas-settings'; -import { BN } from '@zilliqa-js/util'; +import { BN, units } from '@zilliqa-js/util'; function WithdrawCommModal(props: any) { const proxy = useAppSelector(state => state.blockchain.proxy); diff --git a/products/zillion/src/components/contract-calls/withdraw-stake.tsx b/products/zillion/src/components/contract-calls/withdraw-stake.tsx index f42af1984..39a1ce249 100644 --- a/products/zillion/src/components/contract-calls/withdraw-stake.tsx +++ b/products/zillion/src/components/contract-calls/withdraw-stake.tsx @@ -136,6 +136,7 @@ function WithdrawStakeModal(props: any) { // check if deleg has unwithdrawn rewards or buffered deposits for this ssn address const hasRewards = await hasRewardToWithdraw(); if (hasRewards) { + Alert('info', "Withdraw rewards first", "Withdraw your rewards before withdrawing your staked amount."); setIsPending(''); return null; } diff --git a/products/zillion/src/components/dashboard.tsx b/products/zillion/src/components/dashboard.tsx index 923ab2b42..5e6b85371 100644 --- a/products/zillion/src/components/dashboard.tsx +++ b/products/zillion/src/components/dashboard.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import { ToastContainer, toast } from 'react-toastify'; import ReactTooltip from 'react-tooltip'; -import { Role, NetworkURL, Network as NetworkLabel, AccountType, Environment, Constants, TransactionType, ButtonText, ContractState, OperationStatus } from '../util/enum'; +import { Role, NetworkURL, Network, AccountType, Environment, Constants, TransactionType, ButtonText, ContractState, OperationStatus } from '../util/enum'; import { convertQaToCommaStr, getAddressLink } from '../util/utils'; import StakingPortfolio from './staking-portfolio'; import SsnTable from './ssn-table'; @@ -49,10 +49,11 @@ import WarningDashboardBanner from './warning-dashboard-banner'; import { POLL_USER_DATA_STOP, QUERY_AND_UPDATE_USER_STATS, RESET_USER_STATE, UPDATE_ADDRESS } from '../store/userSlice'; import { useAppDispatch, useAppSelector } from '../store/hooks'; import { logger } from '../util/logger'; -import { getEnvironment, getNetworks, NetworkConfig, Networks } from '../util/config-json-helper'; +import { getEnvironment, getNetworks, NetworkConfig, Networks, tryGetNetworkLabelByApiUrl } from '../util/config-json-helper'; import { RESET_BLOCKCHAIN_STATE, UPDATE_CHAIN_INFO } from '../store/blockchainSlice'; import { ZilSigner } from '../zilliqa-signer'; import { QUERY_AND_UPDATE_STAKING_STATS } from '../store/stakingSlice'; +import { networkStringToNetwork } from '../util/config-helper'; function Dashboard(props: any) { @@ -146,32 +147,12 @@ function Dashboard(props: any) { // for zilpay to toggle different network const networkChanger = (net: string) => { - let label; - - switch (net) { - case NetworkLabel.MAINNET: - // do nothing - Alert("info", "Info", "You are on Mainnet."); - label = NetworkLabel.MAINNET; - break; - case NetworkLabel.TESTNET: - label = NetworkLabel.TESTNET; - if (env === Environment.PROD) { - // warn users not to switch to testnet on production - Alert("warn", "Testnet not supported", "Please switch to Mainnet via ZilPay."); - } - break; - case NetworkLabel.ISOLATED_SERVER: - case NetworkLabel.PRIVATE: - label = NetworkLabel.ISOLATED_SERVER; - if (env === Environment.PROD) { - // warn users not to switch to testnet on production - Alert("warn", "Private network not supported", "Please switch to Mainnet via ZilPay."); - } - break; - default: - label = NetworkLabel.TESTNET; - break; + const label = networkStringToNetwork(net); + + if (label === Network.MAINNET) { + Alert("info", "Info", "You are on Mainnet."); + } else if (env === Environment.PROD) { + Alert("warn", "Warning", "Currently connected network is not supported. Please switch to Mainnet via ZilPay."); } const networkConfig: NetworkConfig = networks[label]; @@ -191,9 +172,12 @@ function Dashboard(props: any) { if (userState.account_type === AccountType.ZILPAY) { const zilPay = (window as any).zilPay; + console.log({ zilpay_data: zilPay.wallet }); + if (zilPay) { - // switch to the zilpay network on load - networkChanger(zilPay.wallet.net); + networkChanger( + tryGetNetworkLabelByApiUrl(zilPay.wallet.http) || zilPay.wallet.net + ); const accountStreamChanged = zilPay.wallet.observableAccount().subscribe((account: any) => { console.log("zil pay account changing..."); diff --git a/products/zillion/src/components/explorer.tsx b/products/zillion/src/components/explorer.tsx index f68e69bd2..a30ba7566 100644 --- a/products/zillion/src/components/explorer.tsx +++ b/products/zillion/src/components/explorer.tsx @@ -1,31 +1,31 @@ -import React, { useEffect, useRef, useState, useCallback } from 'react'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; import { trackPromise } from 'react-promise-tracker'; import DisclaimerModal from './disclaimer'; import Footer from './footer'; -import { Environment, Network, PromiseArea, ContractState, OperationStatus } from '../util/enum'; -import { DelegStats, DelegStakingPortfolioStats, initialDelegStats, PendingWithdrawStats } from '../util/interface'; +import { ContractState, OperationStatus, PromiseArea } from '../util/enum'; +import { DelegStakingPortfolioStats, DelegStats, initialDelegStats, PendingWithdrawStats } from '../util/interface'; import { fromBech32Address, toBech32Address } from '@zilliqa-js/crypto'; import { validation } from "@zilliqa-js/util"; import { computeDelegRewards } from '../util/reward-calculator'; +import useDarkMode from '../util/use-dark-mode'; import { convertQaToCommaStr, isRespOk } from '../util/utils'; import Spinner from './spinner'; -import useDarkMode from '../util/use-dark-mode'; -import ZillionLogo from '../static/zillion.svg'; +import { BigNumber } from 'bignumber.js'; import ZillionLightLogo from '../static/light/zillion.svg'; -import IconSun from './icons/sun'; +import ZillionLogo from '../static/zillion.svg'; +import { useAppSelector } from '../store/hooks'; +import { getDefaultNetworkForCurrentEnv } from '../util/config-helper'; +import { ZilSdk } from '../zilliqa-api'; +import ExplorerPendingWithdrawalTable from './explorer-pending-withdrawal-table'; +import ExplorerStakingPortfolio from './explorer-staking-portfolio'; import IconMoon from './icons/moon'; import IconSearch from './icons/search'; -import ExplorerStakingPortfolio from './explorer-staking-portfolio'; -import WarningBanner from './warning-banner'; -import ExplorerPendingWithdrawalTable from './explorer-pending-withdrawal-table'; +import IconSun from './icons/sun'; import RewardCountdownTable from './reward-countdown-table'; -import { getEnvironment } from '../util/config-json-helper'; -import { useAppSelector } from '../store/hooks'; -import { ZilSdk } from '../zilliqa-api'; -import { BigNumber } from 'bignumber.js'; +import WarningBanner from './warning-banner'; function Explorer(props: any) { const address = props.match.params.address; // bech32 wallet address; @@ -39,8 +39,8 @@ function Explorer(props: any) { // config.js from public folder const impl = useAppSelector(state => state.blockchain.impl); - const env = getEnvironment(); - const network = env === Environment.PROD ? Network.MAINNET : Network.TESTNET; + + const network = getDefaultNetworkForCurrentEnv(); const mountedRef = useRef(true); @@ -268,8 +268,7 @@ function Explorer(props: any) { { - ( env === Environment.STAGE || env === Environment.PROD ) && - {network} + network && {network} } diff --git a/products/zillion/src/components/home.tsx b/products/zillion/src/components/home.tsx index abf02357f..101c55ced 100644 --- a/products/zillion/src/components/home.tsx +++ b/products/zillion/src/components/home.tsx @@ -1,11 +1,11 @@ -import React, { useState, useEffect } from 'react'; +import React, { useEffect, useState } from 'react'; import { withRouter } from "react-router-dom"; import ReactTooltip from "react-tooltip"; -import { AccountType, Environment, Network, Role, ContractState } from '../util/enum'; +import { AccountType, ContractState, Role } from '../util/enum'; import DisclaimerModal from './disclaimer'; -import SsnTable from './ssn-table'; import Footer from './footer'; +import SsnTable from './ssn-table'; import WalletKeystore from './wallet-keystore'; import WalletLedger from './wallet-ledger'; @@ -14,29 +14,28 @@ import WalletZilPay from './wallet-zilpay'; import IconKeystoreLine from './icons/keystore-line'; import IconLedgerLine from './icons/ledger-line'; import IconZilPayLine from './icons/zil-pay-line'; -import IconSun from './icons/sun'; -import IconMoon from './icons/moon'; -import ZillionLogo from '../static/zillion.svg'; import ZillionLightLogo from '../static/light/zillion.svg'; +import ZillionLogo from '../static/zillion.svg'; import LandingStatsTable from './landing-stats-table'; import AvelyLogo from '../static/avely.svg'; -import TorchWalletLogo from '../static/torch_wallet.png'; import PlunderswapLogo from '../static/plunderswap_dao.png'; +import TorchWalletLogo from '../static/torch_wallet.png'; -import useDarkMode from '../util/use-dark-mode'; import { ToastContainer } from 'react-toastify'; +import useDarkMode from '../util/use-dark-mode'; import IconSearch from './icons/search'; import WarningBanner from './warning-banner'; -import RewardCountdownTable from './reward-countdown-table'; import { useAppDispatch, useAppSelector } from '../store/hooks'; -import { getEnvironment } from '../util/config-json-helper'; import { QUERY_AND_UPDATE_STAKING_STATS } from '../store/stakingSlice'; -import { logger } from '../util/logger'; import { INIT_USER, QUERY_AND_UPDATE_USER_STATS, UPDATE_LEDGER_INDEX } from '../store/userSlice'; +import { envStringToEnv, getDefaultNetworkForEnv, networkToNetworkName } from '../util/config-helper'; +import { getEnvironment } from '../util/config-json-helper'; +import { logger } from '../util/logger'; import { ZilSigner } from '../zilliqa-signer'; +import RewardCountdownTable from './reward-countdown-table'; function Home(props: any) { @@ -51,14 +50,9 @@ function Home(props: any) { const [explorerSearchAddress, setExplorerSearchAddress] = useState(''); const [role, setRole] = useState(''); const [accessMethod, setAccessMethod] = useState(''); - const [selectedNetwork, setSelectedNetwork] = useState(() => { - if (env === Environment.PROD) { - return Network.MAINNET; - } else { - // default to testnet - return Network.TESTNET; - } - }); + const [selectedNetwork, setSelectedNetwork] = useState( + () => getDefaultNetworkForEnv(envStringToEnv(env)) + ); const darkMode = useDarkMode(true); @@ -146,13 +140,13 @@ function Home(props: any) { ); } - const toggleTheme = () => { - if (darkMode.value === true) { - darkMode.disable(); - } else { - darkMode.enable(); - } - } + // const toggleTheme = () => { + // if (darkMode.value === true) { + // darkMode.disable(); + // } else { + // darkMode.enable(); + // } + // } const toggleZillionLogo = () => { if (darkMode.value === true) { @@ -180,13 +174,9 @@ function Home(props: any) { }; useEffect(() => { - if (env === Environment.PROD) { - setSelectedNetwork(Network.MAINNET); - } else { - setSelectedNetwork(Network.TESTNET); - } + setSelectedNetwork(getDefaultNetworkForEnv(envStringToEnv(env))); dispatch(QUERY_AND_UPDATE_STAKING_STATS()); - }, [env, selectedNetwork, dispatch]); + }, [env]); // eslint-disable-line react-hooks/exhaustive-deps useEffect(() => { window.onbeforeunload = null; @@ -219,8 +209,8 @@ function Home(props: any) { */} { - (env === Environment.STAGE || env === Environment.PROD) && - {selectedNetwork} + selectedNetwork && + {networkToNetworkName(selectedNetwork)} } @@ -234,21 +224,21 @@ function Home(props: any) { className='btn-logos d-flex justify-content-center align-items-center mx-2' onClick={() => window.location.href = 'https://dapp.avely.fi/'} > - + Avely logo Avely
window.location.href = 'https://instantunstaking.torchwallet.io/'} > - + Torch wallet logo Torch Wallet
window.location.href = 'https://stake.plunderswap.com/'} > - + Plunderswap logo PlunderSwap
@@ -329,7 +319,8 @@ function Home(props: any) {
handleAccessMethod(AccountType.ZILPAY)} - data-tip={env === Environment.PROD ? "Ensure your ZilPay is on Mainnet network" : "Ensure your ZilPay is on Testnet network"}> + data-tip={`Ensure your ZilPay is on ${getDefaultNetworkForEnv(envStringToEnv(env))} network`} + > ZilPay
diff --git a/products/zillion/src/components/landing-stats-table.tsx b/products/zillion/src/components/landing-stats-table.tsx index 4217392e8..1174408a6 100644 --- a/products/zillion/src/components/landing-stats-table.tsx +++ b/products/zillion/src/components/landing-stats-table.tsx @@ -19,6 +19,12 @@ function LandingStatsTable(props: any) {
{ loading === OperationStatus.PENDING &&