From a6a89fe9ec102dce49767ab30acda783079f2bcf Mon Sep 17 00:00:00 2001 From: Ikemefuna Obioha Date: Tue, 21 May 2024 11:14:15 +0100 Subject: [PATCH 1/3] Fixed transaction monitor display bug --- .../transaction/components/Explorer/ExplorerTransactions.js | 2 +- .../components/TransactionMonitor/TransactionMonitorList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/transaction/components/Explorer/ExplorerTransactions.js b/src/modules/transaction/components/Explorer/ExplorerTransactions.js index 3e139c99f8..a873fdcdc3 100644 --- a/src/modules/transaction/components/Explorer/ExplorerTransactions.js +++ b/src/modules/transaction/components/Explorer/ExplorerTransactions.js @@ -36,7 +36,7 @@ const Transactions = ({ activeToken, address }) => { }; const shouldRefetchTransactions = (data) => - data?.data?.some((queryData) => queryData.block.executionStatus === 'pending'); + data?.data?.some((queryData) => queryData.executionStatus === 'pending'); return ( diff --git a/src/modules/transaction/components/TransactionMonitor/TransactionMonitorList.js b/src/modules/transaction/components/TransactionMonitor/TransactionMonitorList.js index 052671380d..9da4a44fa8 100644 --- a/src/modules/transaction/components/TransactionMonitor/TransactionMonitorList.js +++ b/src/modules/transaction/components/TransactionMonitor/TransactionMonitorList.js @@ -110,7 +110,7 @@ const Transactions = () => { }; const shouldRefetchTransactions = (data) => - data?.data?.some((queryData) => queryData.block.executionStatus === 'pending'); + data?.data?.some((queryData) => queryData.executionStatus === 'pending'); return ( From 28de2dce4297ac2be8da1fbba9f501b5c1b83370 Mon Sep 17 00:00:00 2001 From: Ikemefuna Obioha Date: Tue, 21 May 2024 11:14:49 +0100 Subject: [PATCH 2/3] Removed lisk v4 banner --- src/locales/en/common.json | 3 --- .../AccountDetails/AccountOverview/banners.js | 1 - src/modules/common/constants.js | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/src/locales/en/common.json b/src/locales/en/common.json index 3b857b069d..0188dfe503 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -54,7 +54,6 @@ "An error occurred while sending your transaction to the network. Please try again.": "An error occurred while sending your transaction to the network. Please try again.", "An error occurred while signing your transaction. Please try again.": "An error occurred while signing your transaction. Please try again.", "An error occurred.": "An error occurred.", - "Announcement": "Announcement", "Anonymous analytics collection": "Anonymous analytics collection", "Appearance": "Appearance", "Application": "Application", @@ -354,7 +353,6 @@ "Lisk Terms of Use": "Lisk Terms of Use", "Lisk Website": "Lisk Website", "Lisk counts your message in bytes, so keep in mind\n that the length of your message may vary in different languages.\n Different characters may consume a varying amount of bytes.": "Lisk counts your message in bytes, so keep in mind\n that the length of your message may vary in different languages.\n Different characters may consume a varying amount of bytes.", - "Lisk v4 Migration": "Lisk v4 Migration", "Lisk {{version}}": "Lisk {{version}}", "Lisk {{version}} is here!": "Lisk {{version}} is here!", "Load more": "Load more", @@ -695,7 +693,6 @@ "This account does not have any staker for the given address.": "This account does not have any staker for the given address.", "This account does not have any stakers.": "This account does not have any stakers.", "This account will no longer be stored on this device.{{text}}": "This account will no longer be stored on this device.{{text}}", - "This announcement is intended for all validators and node operators. Please ensure that you correctly migrate your nodes to the new network to avoid missing any blocks after the network hard fork.": "This announcement is intended for all validators and node operators. Please ensure that you correctly migrate your nodes to the new network to avoid missing any blocks after the network hard fork.", "This avatar will be linked to your new Lisk address.": "This avatar will be linked to your new Lisk address.", "This is a legacy account and can not be used on this network.": "This is a legacy account and can not be used on this network.", "This is a request from wallet connect to establish session with Lisk Desktop, please review the following information carefully before approving.": "This is a request from wallet connect to establish session with Lisk Desktop, please review the following information carefully before approving.", diff --git a/src/modules/account/components/AccountDetails/AccountOverview/banners.js b/src/modules/account/components/AccountDetails/AccountOverview/banners.js index 033997d06f..d8ed48925c 100644 --- a/src/modules/account/components/AccountDetails/AccountOverview/banners.js +++ b/src/modules/account/components/AccountDetails/AccountOverview/banners.js @@ -2,7 +2,6 @@ import { INFO_BANNERS } from 'src/modules/common/constants'; const banners = [ - INFO_BANNERS.liskMigration, INFO_BANNERS.accountManagement, INFO_BANNERS.blockchainExploring, INFO_BANNERS.hardwareWalletManagement, diff --git a/src/modules/common/constants.js b/src/modules/common/constants.js index cd38b28174..fa86e558f8 100644 --- a/src/modules/common/constants.js +++ b/src/modules/common/constants.js @@ -2,17 +2,6 @@ import i18next from 'i18next'; import routes from 'src/routes/routes'; export const INFO_BANNERS = { - liskMigration: { - infoMessage: (t) => t('Lisk v4 Migration'), - infoLabel: (t) => t('Announcement'), - infoDescription: (t) => - t( - 'This announcement is intended for all validators and node operators. Please ensure that you correctly migrate your nodes to the new network to avoid missing any blocks after the network hard fork.' - ), - illustrationName: 'liskMigrationIllustration', - infoLink: 'https://lisk.com/documentation/lisk-core/v4/management/migration.html', - infoLinkText: 'Migration guide', - }, proofOfStake: { infoMessage: (t) => t('Introducing proof of stake'), infoDescription: (t) => From f912f994eb98d328e09d92780e7d2fd1f5e5b5ef Mon Sep 17 00:00:00 2001 From: Ikemefuna Obioha Date: Tue, 21 May 2024 12:01:47 +0100 Subject: [PATCH 3/3] Removed more v4 migration banners --- .../components/AccountDetails/WelcomeView/index.js | 14 -------------- .../components/ValidatorsMonitorView/Validators.js | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/modules/account/components/AccountDetails/WelcomeView/index.js b/src/modules/account/components/AccountDetails/WelcomeView/index.js index e3642f7f6b..8edcc7a90c 100644 --- a/src/modules/account/components/AccountDetails/WelcomeView/index.js +++ b/src/modules/account/components/AccountDetails/WelcomeView/index.js @@ -8,8 +8,6 @@ import { PrimaryButton } from 'src/theme/buttons'; import stylesPrimaryButton from '@theme/buttons/css/primaryButton.css'; import routes from 'src/routes/routes'; import stylesSecondary from '@theme/buttons/css/secondaryButton.css'; -import InfoBanner from '@common/components/infoBanner/infoBanner'; -import { INFO_BANNERS } from '@common/constants'; import styles from './WelcomeView.css'; function AccountUniqueValueProposition({ className, valueProposition, bulletPointNr }) { @@ -47,18 +45,6 @@ export default function WelcomeView() { return (
-
diff --git a/src/modules/pos/validator/components/ValidatorsMonitorView/Validators.js b/src/modules/pos/validator/components/ValidatorsMonitorView/Validators.js index 51133ca02f..3f089baeb0 100644 --- a/src/modules/pos/validator/components/ValidatorsMonitorView/Validators.js +++ b/src/modules/pos/validator/components/ValidatorsMonitorView/Validators.js @@ -179,7 +179,7 @@ const ValidatorsMonitor = ({ watchList }) => {