Fix staking page crash & remove divider line on revamp

Emurgo · Feb 1, 2023 · ec035c3 · ec035c3
1 parent df8abbb
commit ec035c3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/yoroi-extension/app/containers/transfer/Transfer.js b/packages/yoroi-extension/app/containers/transfer/Transfer.js
@@ -86,9 +86,10 @@ class Transfer extends Component<AllProps> {
     if (wallet.getParent().getNetworkInfo().CoinType !== CoinTypes.CARDANO) {
       return (<UnsupportedWallet />);
     }
+    const isRevamp = this.generated.stores.profile.isRevampTheme;
     return (
       <>
-        <HorizontalLine />
+        {!isRevamp && <HorizontalLine />}
         <BackgroundColoredLayout>
           <Suspense fallback={null}>
             <WalletTransferPage
@@ -120,7 +121,10 @@ class Transfer extends Component<AllProps> {
     |},
     stores: {|
       app: {| currentRoute: string |},
-      wallets: {| selected: null | PublicDeriver<> |}
+      wallets: {| selected: null | PublicDeriver<> |},
+      profile: {|
+          isRevampTheme: boolean,
+      |},
     |}
     |} {
     if (this.props.generated !== undefined) {
@@ -137,6 +141,9 @@ class Transfer extends Component<AllProps> {
         },
         wallets: {
           selected: stores.wallets.selected,
+        },
+        profile: {
+          isRevampTheme: stores.profile.isRevampTheme,
         }
       },
       actions: {

diff --git a/packages/yoroi-extension/app/containers/wallet/staking/StakingPage.js b/packages/yoroi-extension/app/containers/wallet/staking/StakingPage.js
@@ -6,6 +6,8 @@ import type { InjectedOrGenerated } from '../../../types/injectedPropsType';
 import type { GeneratedData as SidebarContainerData } from '../../SidebarContainer';
 import type { GeneratedData as NavBarContainerRevampData } from '../../NavBarContainerRevamp';
 import type { ConfigType } from '../../../../config/config-types';
+import { intlShape } from 'react-intl';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { computed } from 'mobx';
 import { observer } from 'mobx-react';
 import globalMessages from '../../../i18n/global-messages';
@@ -25,6 +27,10 @@ type Props = {| ...InjectedOrGenerated<GeneratedData>, stores: any, actions: any
 
 @observer
 class StakingPage extends Component<Props> {
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
+    intl: intlShape.isRequired,
+  };
+
   render(): Node {
     const sidebarContainer = <SidebarContainer {...this.generated.SidebarContainerProps} />;
     return (