Merge release/3.0.3 into development

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.",

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,

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 (
     <div className={styles.wrapper}>
-      <InfoBanner
-        t={t}
-        show
-        name="walletPageBanner"
-        className={styles.bannerWrapper}
-        infoLabel={INFO_BANNERS.liskMigration.infoLabel(t)}
-        infoMessage={INFO_BANNERS.liskMigration.infoMessage(t)}
-        infoDescription={INFO_BANNERS.liskMigration.infoDescription(t)}
-        illustrationName={INFO_BANNERS.liskMigration.illustrationName}
-        infoLink={INFO_BANNERS.liskMigration.infoLink}
-        infoLinkText={INFO_BANNERS.liskMigration.infoLinkText}
-      />
       <section className={styles.welcomeView}>
         <header className={styles.welcomeHeader}>
           <div className={styles.logoContainer}>

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) =>

src/modules/pos/validator/components/ValidatorsMonitorView/Validators.js

@@ -179,7 +179,7 @@ const ValidatorsMonitor = ({ watchList }) => {
     <Box>
       <SwippableInfoBanner
         className={styles.swippableBanner}
-        banners={[INFO_BANNERS.liskMigration, INFO_BANNERS.proofOfStake]}
+        banners={[INFO_BANNERS.proofOfStake]}
         name="validatorsPageBanner"
       />
       <BoxHeader className={`${styles.validatorPageWrapper}`}>

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 (
     <Box main className={`${styles.wrapper} transactions-box`}>

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 (
     <Box main className="transactions-box">