Merge pull request #4013 from Emurgo/fix/YOEXT-1962-bis

fix: drep promotion banner location

Author: vsubhuman

packages/yoroi-extension/app/components/wallet/summary/WalletSummaryRevamp.js

@@ -27,6 +27,9 @@ import { ROUTES } from '../../../routes-config';
 import LocalStorageApi from '../../../api/localStorage';
 import type { WalletState } from '../../../../chrome/extension/background/types';
 import environment from '../../../environment';
+// $FlowIgnore: suppressing this error
+import { DrepPromotionBanner } from '../../../UI/components/DrepPromotionBanner/DrepPromotionBanner';
+import type { StoresMap } from '../../../stores';
 
 const messages = defineMessages({
   transactionType: {
@@ -59,6 +62,7 @@ type Props = {|
   +emptyBannerComponent: Node,
   +goToRoute: ({| route: string, params?: Object, delegateToYoroiDrep?: null | boolean |}) => void,
   +selectedWallet: WalletState,
+  +stores: StoresMap,
 |};
 
 type State = {|
@@ -242,6 +246,7 @@ export default class WalletSummaryRevamp extends Component<Props, State> {
       openExportTxToFileDialog,
       shouldShowEmptyBanner,
       emptyBannerComponent,
+      stores,
     } = this.props;
     const { intl } = this.context;
 
@@ -297,6 +302,7 @@ export default class WalletSummaryRevamp extends Component<Props, State> {
             {this.renderPendingAmount(pendingAmount.outgoing, intl.formatMessage(messages.pendingOutgoingConfirmationLabel))}
           </Typography>
         </Box>
+        <DrepPromotionBanner stores={stores} intl={intl} />
         <Box sx={{ display: 'flex', flexDirection: 'row', gap: '24px' }}>
           {this.renderBringBanner()}
           {this.renderUsdaBanner()}

packages/yoroi-extension/app/containers/wallet/Wallet.js

@@ -19,8 +19,6 @@ import { PoolTransitionDialog } from './dialogs/pool-transition/PoolTransitionDi
 import { Redirect } from 'react-router';
 import type { StoresProps } from '../../stores';
 import semver from 'semver/preload';
-// $FlowIgnore: suppressing this error
-import { DrepPromotionBanner } from '../../UI/components/DrepPromotionBanner/DrepPromotionBanner';
 
 type Props = {|
   +children: Node,
@@ -153,7 +151,6 @@ export default class Wallet extends Component<{| ...Props, ...StoresProps |}> {
           <WalletLoadingAnimation />
         ) : (
           <>
-            <DrepPromotionBanner stores={stores} intl={intl} />
             {this.props.children}
             {this.getDialogs(intl, currentPool)}
           </>

packages/yoroi-extension/app/containers/wallet/WalletSummaryPage.js

@@ -167,6 +167,7 @@ export default class WalletSummaryPage extends Component<StoresProps> {
     return (
       <Box>
         <WalletSummaryRevamp
+          stores={stores}
           pendingAmount={unconfirmedAmount}
           shouldHideBalance={profile.shouldHideBalance}
           isLoadingTransactions={