From 5f0898daff418f55311655ad6dd9097ef5ec9401 Mon Sep 17 00:00:00 2001 From: Bobo Date: Wed, 21 Aug 2024 07:38:09 +0200 Subject: [PATCH 1/4] Release hotfix to main (#1375) * hotfix: enable xcm with Bifrost (#1361) * Fix ledger on the portal (#1370) * disable celer bridge (#1353) * disable cbridge * fix statement shorter * disable celer bridge icon too (#1354) * Fix usePrice hooks (#1355) * fix usePrice issue * refactor, just using immediate is enough * only enable immediate for h160 wallet (#1356) * Add metadata hash and uplift to polkadot 12.0.1 * Added // @ts-nocheck to ignore some typing errors for now * More // @ts-nocheck * WithSignedTransaction * Remove hash * $api removed * fix: removed useLedger and login toggle (#1371) --------- Co-authored-by: Taegeon Alan Go Co-authored-by: Roy <92044428+impelcrypto@users.noreply.github.com> * Add raw metadata to chain info (#1372) * Add raw metadata to chain info * Enable users to update metadata once more event if it is up to date * Polkadot types errors fix (#1373) * Fix polkadot types errors * Be strict * Polkasafe version update * Fix for getting dApps (#1374) --------- Co-authored-by: Roy <92044428+impelcrypto@users.noreply.github.com> Co-authored-by: Taegeon Alan Go --- src/staking-v3/hooks/useDapps.ts | 2 +- src/staking-v3/logic/services/DappStakingService.ts | 12 +++++------- src/staking-v3/logic/services/IDappStakingService.ts | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/staking-v3/hooks/useDapps.ts b/src/staking-v3/hooks/useDapps.ts index 0c4211139..ec973d901 100644 --- a/src/staking-v3/hooks/useDapps.ts +++ b/src/staking-v3/hooks/useDapps.ts @@ -45,7 +45,7 @@ export function useDapps() { try { aggregator.publish(new BusyMessage(true)); - const dApps = await service.getDapps(currentNetworkName.value.toLowerCase()); + const dApps = await service.getDapps(); store.commit('stakingV3/addDapps', dApps.fullInfo); store.commit('stakingV3/addNewDapps', dApps.chainInfo); // Memo: this can a heavy operations since we are querying all dapps stakes for a chain. diff --git a/src/staking-v3/logic/services/DappStakingService.ts b/src/staking-v3/logic/services/DappStakingService.ts index 89bf6b27d..552a40867 100644 --- a/src/staking-v3/logic/services/DappStakingService.ts +++ b/src/staking-v3/logic/services/DappStakingService.ts @@ -48,15 +48,13 @@ export class DappStakingService extends SignerService implements IDappStakingSer } // @inheritdoc - public async getDapps( - network: string - ): Promise<{ fullInfo: CombinedDappInfo[]; chainInfo: DappInfo[] }> { - Guard.ThrowIfUndefined(network, 'network'); - + public async getDapps(): Promise<{ fullInfo: CombinedDappInfo[]; chainInfo: DappInfo[] }> { + const metadata = await this.metadataRepository.getChainMetadata(); + const chain = metadata.chain.toLowerCase(); const [storeDapps, chainDapps, tokenApiDapps] = await Promise.all([ - this.dappStakingRepository.getDapps(network.toLowerCase()), + this.dappStakingRepository.getDapps(chain), this.dappStakingRepository.getChainDapps(), - this.tokenApiRepository.getDapps(network.toLowerCase()), + this.tokenApiRepository.getDapps(chain), ]); // Map on chain and in store dApps (registered only) diff --git a/src/staking-v3/logic/services/IDappStakingService.ts b/src/staking-v3/logic/services/IDappStakingService.ts index 80469e18c..d128bba0d 100644 --- a/src/staking-v3/logic/services/IDappStakingService.ts +++ b/src/staking-v3/logic/services/IDappStakingService.ts @@ -15,10 +15,9 @@ import { export interface IDappStakingService { /** * Gets the dapps for the given network. - * @param network Name of the network to get dapps for. * @returns A map containing full dapps info (chain and firebase data) and chain info (only for new dapps not stored in firebase yet). */ - getDapps(network: string): Promise<{ fullInfo: CombinedDappInfo[]; chainInfo: DappInfo[] }>; + getDapps(): Promise<{ fullInfo: CombinedDappInfo[]; chainInfo: DappInfo[] }>; /** * Invokes claim staker rewards, unstake and unlock calls. From 42dcf25572c68685bd28fa46632f99b3f91b7f1b Mon Sep 17 00:00:00 2001 From: Roy <92044428+impelcrypto@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:46:30 +0800 Subject: [PATCH 2/4] feat: removed ledger logic (#1378) --- src/components/header/ClaimWarningBanner.vue | 93 ------------------- .../header/modals/SelectAccount.vue | 4 - .../header/styles/select-account.scss | 16 ---- src/config/localStorage.ts | 1 - src/hooks/useConnectWallet.ts | 18 +--- src/i18n/en-US/index.ts | 13 --- src/i18n/es/index.ts | 14 --- src/i18n/fr/index.ts | 13 --- src/i18n/ja/index.ts | 13 --- src/i18n/pt/index.ts | 13 --- src/store/general/getters.ts | 2 - src/store/general/mutations.ts | 3 - src/store/general/state.ts | 2 - 13 files changed, 2 insertions(+), 203 deletions(-) delete mode 100644 src/components/header/ClaimWarningBanner.vue diff --git a/src/components/header/ClaimWarningBanner.vue b/src/components/header/ClaimWarningBanner.vue deleted file mode 100644 index 0af607021..000000000 --- a/src/components/header/ClaimWarningBanner.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - diff --git a/src/components/header/modals/SelectAccount.vue b/src/components/header/modals/SelectAccount.vue index bbf13371a..548fd3ec1 100644 --- a/src/components/header/modals/SelectAccount.vue +++ b/src/components/header/modals/SelectAccount.vue @@ -91,7 +91,6 @@ import { wait, } from '@astar-network/astar-sdk-core'; import { ApiPromise } from '@polkadot/api'; -import { Ledger } from '@polkadot/hw-ledger'; import copy from 'copy-to-clipboard'; import { ethers } from 'ethers'; import { $api } from 'src/boot/api'; @@ -173,8 +172,6 @@ export default defineComponent({ () => store.getters['general/substrateAccounts'] ); - const isLedger = computed(() => store.getters['general/isLedger']); - const nativeTokenSymbol = computed(() => { const chainInfo = store.getters['general/chainInfo']; return chainInfo ? chainInfo.tokenSymbol : ''; @@ -303,7 +300,6 @@ export default defineComponent({ isShowBalance, currentNetworkChain, astarChain, - isLedger, displayBalance, backModal, isClosing, diff --git a/src/components/header/styles/select-account.scss b/src/components/header/styles/select-account.scss index d8f03b584..d0fd68cec 100644 --- a/src/components/header/styles/select-account.scss +++ b/src/components/header/styles/select-account.scss @@ -35,18 +35,6 @@ justify-content: flex-end; } -.text--is-ledger { - font-weight: 600; - font-size: 13px; - color: $gray-5; -} - -.row--ledger-check { - display: flex; - justify-content: space-between; - align-items: center; -} - .box--account { width: 100%; display: flex; @@ -281,10 +269,6 @@ color: $gray-3; } - .text--is-ledger { - color: $gray-1; - } - .wrapper--account-detail { .account-name { color: $gray-1; diff --git a/src/config/localStorage.ts b/src/config/localStorage.ts index 0c9e541ed..eb030722f 100644 --- a/src/config/localStorage.ts +++ b/src/config/localStorage.ts @@ -18,7 +18,6 @@ export enum LOCAL_STORAGE { XVM_TX_HISTORIES = 'xvmTxHistories', BALLOON_NATIVE_TOKEN = 'balloonNativeToken', THEME_COLOR = 'themeColor', - IS_LEDGER = 'isLedger', MULTISIG = 'multisig', CLOSE_DAPP_STAKING_V3_ONBOARDING = 'closeDappStakingV3Onboarding', DECOMMISSION = 'decommission', diff --git a/src/hooks/useConnectWallet.ts b/src/hooks/useConnectWallet.ts index c2a0ba4fa..f72b1d6e5 100644 --- a/src/hooks/useConnectWallet.ts +++ b/src/hooks/useConnectWallet.ts @@ -1,6 +1,5 @@ import { ASTAR_SS58_FORMAT, - astarChain, checkSumEvmAddress, hasProperty, wait, @@ -40,7 +39,7 @@ import { useRouter } from 'vue-router'; import * as utils from 'src/hooks/custom-signature/utils'; export const useConnectWallet = () => { - const { SELECTED_ADDRESS, IS_LEDGER, SELECTED_WALLET } = LOCAL_STORAGE; + const { SELECTED_ADDRESS, SELECTED_WALLET } = LOCAL_STORAGE; const modalAccountSelect = ref(false); const modalPolkasafeSelect = ref(false); @@ -53,8 +52,7 @@ export const useConnectWallet = () => { const { requestAccounts, requestSignature } = useEvmAccount(); const { currentAccount, currentAccountName, disconnectAccount } = useAccount(); const router = useRouter(); - const { currentNetworkIdx, currentNetworkChain, evmNetworkIdx, currentNetworkName } = - useNetworkInfo(); + const { evmNetworkIdx, currentNetworkName } = useNetworkInfo(); const currentRouter = computed(() => router.currentRoute.value.matched[0]); const currentNetworkStatus = computed(() => store.getters['general/networkStatus']); @@ -366,16 +364,6 @@ export const useConnectWallet = () => { }); }; - // Memo: Ledger accounts are available on Astar only - const handleCheckLedgerEnvironment = async (): Promise => { - const isLedger = localStorage.getItem(IS_LEDGER) === 'true'; - if (isLedger && currentNetworkChain.value && currentNetworkChain.value !== astarChain.ASTAR) { - localStorage.setItem(IS_LEDGER, 'false'); - await disconnectAccount(); - window.location.reload(); - } - }; - watch([selectedWallet, currentEcdsaAccount, currentAccount, isH160], changeEvmAccount); watchEffect(async () => { @@ -394,8 +382,6 @@ export const useConnectWallet = () => { { immediate: true } ); - watch([currentNetworkChain], handleCheckLedgerEnvironment); - // Memo: check the EVM wallet's connected chainId when users switch the page watch( [currentRouter, selectedWallet, isH160], diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index c65196d9f..50789d60b 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -70,7 +70,6 @@ export default { insufficientExistentialDeposit: 'Account balances in {network} network is below than the existential deposit amount', withdrawalNotSupport: "The portal doesn't support withdrawing to {chain} at this moment", - ledgerNotOpened: 'Ledger has not opened Astar App. Please open it and refresh this page.', claimRewards: 'DApp Staking V3 is coming early 2024! Make sure to claim your rewards and stay tuned for the release date.', underDevelopmentShibuyaWarning: @@ -202,7 +201,6 @@ export default { "Switch your network to 'Shiden' in the Math Wallet extension and refresh this page", }, showBalance: 'Show {token} balance', - isLedgerAccount: 'This is a Ledger account, connected and running Astar app', switchWalletConnectNetwork: 'Please switch to {network} network in your wallet', multisig: { initPolkasafe: 'Initializing PolkaSafe SDK for signature request; this may take a while', @@ -320,15 +318,6 @@ export default { 'The number of eras that is shown here is per dApp. You may need to claim multiple times if you have too many unclaimed eras.', restakeTip: 'By turning on, your rewards will be automatically re-staked when you make a claim.', - claimable: { - limitation: - 'There is a limitation on the number of eras that can be claimed in one transaction.', - nativeWallets: 'Native wallets: ≒56 eras', - ledgerX: 'Ledger Nano X: 6 eras', - ledgerSPlus: 'Ledger Nano S Plus: 6 eras', - ledgerS: 'Ledger Nano S: 2 eras', - dcentWallet: "D'CENT Wallet: ≒28 eras", - }, dappsOwners: 'DApps owners! We can now help to promote your campaign. Please check', dappsOwnersLink: 'the details.', }, @@ -580,8 +569,6 @@ export default { notSendToEvmExchanges: "I’m NOT sending tokens to Exchange's EVM deposit addresses. I understand that if I do so, the funds will likely be lost.", understandWarning: 'I understand that if I do so, the funds will likely be lost', - notDestIsLedgerAccount: - 'The destination address is neither a ledger native account nor an exchange address. I understand that if I do so, the funds will likely be lost.', notDestIsExchangeAddress: 'Destination address is not an Exchange address', youWillReceive: 'You will receive', faucetNextRequest: 'Time left until the next request', diff --git a/src/i18n/es/index.ts b/src/i18n/es/index.ts index cfe43b934..db7d25d45 100644 --- a/src/i18n/es/index.ts +++ b/src/i18n/es/index.ts @@ -67,8 +67,6 @@ export default { insufficientExistentialDeposit: 'Los saldos de las cuentas en la red {network} son inferiores al importe del depósito existencial', withdrawalNotSupport: 'El Portal no admite retiros en la red {chain} en este momento', - ledgerNotOpened: - 'Ledger no ha abierto la aplicación Astar. Por favor, ábrala y actualice esta página.', }, toast: { transactionFailed: 'Transacción fallida con el error: {message}', @@ -166,7 +164,6 @@ export default { switchNetwork: 'Cambia tu red a "Shiden" en la extensión Math Wallet y actualiza esta página', }, showBalance: 'Mostrar saldo en {token}', - isLedgerAccount: 'Esta es una cuenta Ledger, conectada y ejecutando la aplicación Astar', multisig: { initPolkasafe: 'Inicializando PolkaSafe SDK para la solicitud de firma; esto puede tardar un rato', @@ -284,15 +281,6 @@ export default { 'El número de eras que se muestra aquí es por dApp. Es posible que tengas que reclamar varias veces si tienes demasiadas eras sin reclamar.', restakeTip: 'Al activarlo, tus recompensas se irán a Staking automáticamente cuando hagas una reclamación.', - claimable: { - limitation: - 'Existe una limitación en el número de eras que pueden reclamarse en una transacción.', - nativeWallets: 'Billeteras nativas: ≒56 eras', - ledgerX: 'Ledger Nano X: 6 eras', - ledgerSPlus: 'Ledger Nano S Plus: 6 eras', - ledgerS: 'Ledger Nano S: 2 eras', - dcentWallet: "D'CENT Wallet: ≒28 eras", - }, dappsOwners: '¡Propietarios de dApps! Ahora podemos ayudarles a promocionar sus campañas. Por favor, compruebe', dappsOwnersLink: 'los detalles.', @@ -532,8 +520,6 @@ export default { notSendToEvmExchanges: 'NO voy a enviar tokens a las direcciones de depósito EVM de Exchange. Entiendo que si lo hago, es probable que los fondos se pierdan.', understandWarning: 'Entiendo que si lo hago, es probable que los fondos se pierdan', - notDestIsLedgerAccount: - 'La dirección de destino no es ni una cuenta nativa de ledger ni una dirección de exchange. Entiendo que si lo hago, es probable que los fondos se pierdan.', notDestIsExchangeAddress: 'La dirección de destino no es una dirección Exchange', youWillReceive: 'Recibirás', faucetNextRequest: 'Tiempo restante hasta la siguiente solicitud', diff --git a/src/i18n/fr/index.ts b/src/i18n/fr/index.ts index fac72144f..dddcb8028 100644 --- a/src/i18n/fr/index.ts +++ b/src/i18n/fr/index.ts @@ -69,7 +69,6 @@ export default { 'Le solde sur le réseau {network} est inférieur au montant du dépôt existentiel', withdrawalNotSupport: 'Le portail ne prend pas en charge le retrait vers {chain} pour le moment', - ledgerNotOpened: "Ledger n'a pas ouvert l'App Astar. Ouvrez là et rafraichissez la page.", }, toast: { transactionFailed: "La transaction a échoué avec l'erreur: {message}", @@ -170,7 +169,6 @@ export default { "Basculez vers le réseau 'Shiden' dans l'extension Math Wallet et rafraîchissez la page", }, showBalance: 'Afficher le solde des {token}', - isLedgerAccount: "Ceci est un compte Ledger, connecté et en cours d'exécution sur l'app Astar", multisig: { initPolkasafe: 'Initialisation du SDK PolkaSafe pour une demande de signature; Ceci peut prendre un moment ', @@ -287,15 +285,6 @@ export default { "Le nombre d'ères affiché ici est par dApp. Vous devrez peut-être réclamer plusieurs fois si vous avez trop d'ères non réclamées.", restakeTip: 'En activant, vos récompenses seront automatiquement re-investies lorsque vous les récupérer.', - claimable: { - limitation: - "Il existe une limite au nombre d'ères pouvant être réclamées en une seule transaction.", - nativeWallets: 'Portefeuilles natifs: ≒56 ères', - ledgerX: 'Ledger Nano X: 6 ères', - ledgerSPlus: 'Ledger Nano S Plus: 6 ères', - ledgerS: 'Ledger Nano S: 2 ères', - dcentWallet: "D'CENT Wallet: ≒28 ères", - }, dappsOwners: "Propriétaires de DApps! Nous pouvons désormais vous aider à promouvoir votre campagne. Vérifiez s'il vous plaît", dappsOwnersLink: 'les détails.', @@ -539,8 +528,6 @@ export default { notSendToEvmExchanges: "Je n'envoie PAS de jetons aux adresses de dépôt EVM sur un Exchange. Je comprends que si je le fais, les fonds seront probablement perdus.", understandWarning: 'Je comprends que si je le fais, les fonds seront probablement perdus', - notDestIsLedgerAccount: - "L'adresse de destination n'est ni un compte natif Ledger ni une adresse d'Exchange. Je comprends que si je le fais, les fonds seront probablement perdus.", notDestIsExchangeAddress: "L'adresse de destination n'est pas l'adresse d'un Exchange", youWillReceive: 'Vous allez recevoir', faucetNextRequest: 'Temps restant avant la prochaine demande', diff --git a/src/i18n/ja/index.ts b/src/i18n/ja/index.ts index b13bc1499..9f1e5155c 100644 --- a/src/i18n/ja/index.ts +++ b/src/i18n/ja/index.ts @@ -67,8 +67,6 @@ export default { insufficientExistentialDeposit: '{network} ネットワークにある残高が existential depositi 以下です。', withdrawalNotSupport: '現在のところ {chain} への送金はサポートされていません。', - ledgerNotOpened: - 'LedgerがAstarアプリを開いていません。アプリを開き、このページを更新してください。', claimRewards: 'DApp ステーキング V3 は 2024 年初頭に登場します! 必ず報酬を受け取り、リリース日を楽しみにお待ちください。', }, @@ -167,7 +165,6 @@ export default { 'Math Walletの拡張機能であなたのネットワークをShidenに切り替え、このページを更新してください。', }, showBalance: '{token}の残高を表示する', - isLedgerAccount: 'これはLedgerアカウントです。Ledgerを接続し、Astar appが動いています。', multisig: { initPolkasafe: '署名要求のためにPolkaSafe SDKを初期化しています。しばらく時間がかかります。', noAccounts: 'マルチシグアカウントが見つかりません。', @@ -282,14 +279,6 @@ export default { availableToClaimTip2: 'ここに表示されているERA数はdAppごとのものです。未請求のERAが多すぎる場合は、複数回請求する必要があるかもしれません。', restakeTip: 'オンにすることで、クレーム時に報酬が自動的に再ステークされます。', - claimable: { - limitation: '1回の取引で請求できるERA数には制限があります。', - nativeWallets: 'Native wallets: ≒56 eras', - ledgerX: 'Ledger Nano X: 6 eras', - ledgerSPlus: 'Ledger Nano S Plus: 6 eras', - ledgerS: 'Ledger Nano S: 2 eras', - dcentWallet: "D'CENT Wallet: ≒28 eras", - }, dappsOwners: 'dAppsオーナー！私たちはあなたのキャンペーンを促進するお手伝いをします。ご確認ください。', dappsOwnersLink: '詳細はこちら', @@ -538,8 +527,6 @@ export default { notSendToEvmExchanges: '私は取引所のEVM depositアドレスにトークンを送っていません。それをすると、資金が失われる可能性が高いことを理解しているからです。', understandWarning: 'その場合、資金が失われる可能性が高いことを理解しています。', - notDestIsLedgerAccount: - '宛先のアドレスは、Ledgerネイティブアカウントでも取引所アドレスでもありません。そうであったとすると、資金が失われる可能性が高いことを理解しているからです。', notDestIsExchangeAddress: '宛先アドレスが取引所アドレスではありません。', youWillReceive: 'あなたは受け取るでしょう。', faucetNextRequest: '次のリクエストまでの残り時間', diff --git a/src/i18n/pt/index.ts b/src/i18n/pt/index.ts index 0808b03bd..80ef20d71 100644 --- a/src/i18n/pt/index.ts +++ b/src/i18n/pt/index.ts @@ -63,8 +63,6 @@ export default { insufficientExistentialDeposit: 'Saldos da conta na rede {network} está abaixo do valor do depósito existencial', withdrawalNotSupport: 'O portal não suporta o saque para {chain} neste momento', - ledgerNotOpened: - 'Ledger não abriu o aplicativo Astar. Por favor, abra-o e atualize esta página.', }, toast: { transactionFailed: 'Transação falhou com erro: {message}', @@ -158,7 +156,6 @@ export default { switchNetwork: "Mude sua rede para 'Shiden' na extensão Math Wallet e atualize esta página", }, showBalance: 'Mostrar saldo {token}', - isLedgerAccount: 'Essa é uma conta Ledger, conecatada e executando Astar app', multisig: { initPolkasafe: 'Iniciando PolkaSafe SDK para assinatura; poderá levar um tempo', noAccounts: 'Contas multisig não encontradas', @@ -279,14 +276,6 @@ export default { 'O número de eras mostrado aqui é por dApp. Você pode precisar clamar várias vezes se tiver muitas eras não clamadas.', restakeTip: 'Ao ativar, suas recompensas serão colocadas em stake automaticamente quando você clamar.', - claimable: { - limitation: 'Há uma limitação no número de eras que podem ser clamadas em uma transação.', - nativeWallets: 'Carteiras nativas: ≒56 eras', - ledgerX: 'Ledger Nano X: 6 eras', - ledgerSPlus: 'Ledger Nano S Plus: 6 eras', - ledgerS: 'Ledger Nano S: 2 eras', - dcentWallet: "D'CENT Wallet: ≒28 eras", - }, dappsOwners: 'DApps owners! We can now help to promote your campaign. Please check', dappsOwnersLink: 'the details.', }, @@ -520,8 +509,6 @@ export default { notSendToEvmExchanges: 'NÃO estou enviando tokens para endereços de depósito EVM de Corretora. Entendo que, se fizer isso, os fundos provavelmente serão perdidos.', understandWarning: 'Entendo que se o fizer, os fundos provavelmente serão perdidos', - notDestIsLedgerAccount: - 'O endereço de destino não é uma conta Ledger nativa nem um endereço de Corretora. Entendo que se eu fizer isso, os fundos provavelmente serão perdidos.', notDestIsExchangeAddress: 'Endereço de destino não é um endereço de Corretora', youWillReceive: 'Você receberá', faucetNextRequest: 'Tempo restante até a próxima solicitação', diff --git a/src/store/general/getters.ts b/src/store/general/getters.ts index 93bb9114b..0bc2a54bc 100644 --- a/src/store/general/getters.ts +++ b/src/store/general/getters.ts @@ -27,7 +27,6 @@ export interface GeneralGetters { networkIdx(state: State): number; isEthWallet(state: State): boolean; isH160Formatted(state: State): boolean; - isLedger(state: State): boolean; currentEcdsaAccount(state: State): EcdsaAccount; selectedAddress(state: State): string; theme(state: State): Theme; @@ -53,7 +52,6 @@ const getters: GetterTree & GeneralGetters = { networkIdx: (state) => state.currentNetworkIdx, isEthWallet: (state) => state.isEthWallet, isH160Formatted: (state) => state.isH160Formatted, - isLedger: (state) => state.isLedger, currentEcdsaAccount: (state) => state.currentEcdsaAccount, theme: (state: State) => state.currentTheme, selectedAddress: (state: State) => { diff --git a/src/store/general/mutations.ts b/src/store/general/mutations.ts index 7640e1891..8d5c75a0b 100644 --- a/src/store/general/mutations.ts +++ b/src/store/general/mutations.ts @@ -80,9 +80,6 @@ const mutation: MutationTree & GeneralMutations = { setIsH160Formatted(state, isH160Formatted) { state.isH160Formatted = isH160Formatted; }, - setIsLedger(state, isLedger) { - state.isLedger = isLedger; - }, setCurrentEcdsaAccount(state, ecdsa) { state.currentEcdsaAccount = ecdsa; }, diff --git a/src/store/general/state.ts b/src/store/general/state.ts index 6c161700e..5b8b813e8 100644 --- a/src/store/general/state.ts +++ b/src/store/general/state.ts @@ -59,7 +59,6 @@ export interface GeneralStateInterface { currentNetworkIdx: number; isEthWallet: boolean; isH160Formatted: boolean; - isLedger: boolean; currentEcdsaAccount: EcdsaAccount; currentAddress: string; currentTheme: Theme; @@ -93,7 +92,6 @@ function state(): GeneralStateInterface { currentNetworkIdx: endpointKey.ASTAR, isEthWallet: false, isH160Formatted: false, - isLedger: localStorage.getItem(LOCAL_STORAGE.IS_LEDGER) === 'true', currentEcdsaAccount: { ethereum: '', ss58: '', From aeefe348b217d3efdb4d33a9c6743dafc5fea233 Mon Sep 17 00:00:00 2001 From: Bobo Date: Tue, 27 Aug 2024 11:59:11 +0200 Subject: [PATCH 3/4] Display a dApp tier rank (#1363) * Display a dApp tier rank * PR comments fixes --- src/components/common/Balance.vue | 8 +- src/components/common/FormatBalance.vue | 13 +- src/hooks/helper/plasmUtils.ts | 8 +- src/i18n/en-US/index.ts | 3 +- src/staking-v3/components/FeatureDapp.vue | 128 ------------------ src/staking-v3/components/KpiCard.vue | 4 +- .../components/dapp/DappStatistics.vue | 28 +++- .../dapp/styles/dapp-statistics.scss | 12 ++ src/staking-v3/hooks/useDappStaking.ts | 6 + 9 files changed, 61 insertions(+), 149 deletions(-) delete mode 100644 src/staking-v3/components/FeatureDapp.vue diff --git a/src/components/common/Balance.vue b/src/components/common/Balance.vue index 732e354ef..34f2b0c75 100644 --- a/src/components/common/Balance.vue +++ b/src/components/common/Balance.vue @@ -4,7 +4,6 @@ - diff --git a/src/staking-v3/components/KpiCard.vue b/src/staking-v3/components/KpiCard.vue index dd2884a5d..c3cc97a47 100644 --- a/src/staking-v3/components/KpiCard.vue +++ b/src/staking-v3/components/KpiCard.vue @@ -1,5 +1,5 @@