update old components

6 years ago · 2804275ca9
parent 25083b5f19
commit 2804275ca9
4 changed files with 217 additions and 229 deletions
--- a/src/views/Wallet/index.js
+++ b/src/views/Wallet/index.js
@ -12,13 +12,15 @@ import type { State } from 'flowtype';
 import Header from 'components/Header';
 import Footer from 'components/Footer';
 import ModalContainer from 'components/modals';
-import Notifications from 'components/Notification';
+import ContextNotifications from 'components/notifications/Context';
+
 import Log from 'components/Log';

 import LeftNavigation from './components/LeftNavigation/Container';
 import TopNavigationAccount from './components/TopNavigationAccount';
 import TopNavigationDeviceSettings from './components/TopNavigationDeviceSettings';

+
 type WalletContainerProps = {
    wallet: $ElementType<State, 'wallet'>,
    children?: React.Node
@ -89,7 +91,7 @@ const Wallet = (props: WalletContainerProps) => (
                    <Route path="/device/:device/network/:network/account/:account" component={TopNavigationAccount} />
                    <Route path="/device/:device/device-settings" component={TopNavigationDeviceSettings} />
                </Navigation>
-                <Notifications />
+                <ContextNotifications />
                <Log />
                <Body>
                    { props.children }
--- a/src/views/Wallet/views/AccountReceive/index.js
+++ b/src/views/Wallet/views/AccountReceive/index.js
@ -154,12 +154,14 @@ const AccountReceive = (props: Props) => {
    const isAddressHidden = !isAddressVerifying && !addressVerified && !addressUnverified;

    return (
-        <SelectedAccount {...props}>
        <Wrapper>
            <StyledH2>Receive Ethereum or tokens</StyledH2>
            <AddressWrapper
                isShowingQrCode={addressVerified || addressUnverified}
            >
+                {isAddressVerifying && (
+                    <AddressInfoText>Confirm address on TREZOR</AddressInfoText>
+                )}
                {((addressVerified || addressUnverified) && !isAddressVerifying) && (
                    <Tooltip
                        placement="bottomRight"
@ -196,20 +198,8 @@ const AccountReceive = (props: Props) => {
                >{address}
                </ValueWrapper>
                {isAddressVerifying && (
-                        <React.Fragment>
-                            <ArrowUp />
-                            <AddressInfoText>
-                                <Icon
-                                    icon={ICONS.T1}
-                                    color={colors.WHITE}
-                                />
-                                Check address on your Trezor
-                            </AddressInfoText>
-                        </React.Fragment>
-                    )}
-                    {/* {isAddressVerifying && (
                    <AddressInfoText>{account.network} account #{account.index + 1}</AddressInfoText>
-                    )} */}
+                )}
                {(addressVerified || addressUnverified) && (
                    <QRCode
                        bgColor="#FFFFFF"
@ -233,7 +223,6 @@ const AccountReceive = (props: Props) => {
                )}
            </AddressWrapper>
        </Wrapper>
-        </SelectedAccount>
    );
 };

--- a/src/views/Wallet/views/AccountSend/index.js
+++ b/src/views/Wallet/views/AccountSend/index.js
@ -12,7 +12,6 @@ import { FONT_SIZE, FONT_WEIGHT, TRANSITION } from 'config/variables';
 import colors from 'config/colors';
 import P from 'components/Paragraph';
 import { H2 } from 'components/Heading';
-import SelectedAccount from 'views/Wallet/components/SelectedAccount';
 import type { Token } from 'flowtype';
 import AdvancedForm from './components/AdvancedForm';
 import PendingTransactions from './components/PendingTransactions';
@ -252,7 +251,6 @@ const AccountSend = (props: Props) => {
    const isAdvancedSettingsHidden = !advanced;

    return (
-        <SelectedAccount {...props}>
        <Wrapper>
            <StyledH2>Send Ethereum or tokens</StyledH2>
            <InputRow>
@ -402,7 +400,6 @@ const AccountSend = (props: Props) => {
                />
            )}
        </Wrapper>
-        </SelectedAccount>
    );
 };

--- a/src/views/Wallet/views/AccountSummary/index.js
+++ b/src/views/Wallet/views/AccountSummary/index.js
@ -11,7 +11,6 @@ import Tooltip from 'components/Tooltip';

 import CoinLogo from 'components/images/CoinLogo';
 import * as stateUtils from 'reducers/utils';
-import SelectedAccount from 'views/Wallet/components/SelectedAccount';
 import Link from 'components/Link';
 import AccountBalance from './components/AccountBalance';
 import AddedToken from './components/AddedToken';
@ -65,17 +64,18 @@ const AccountSummary = (props: Props) => {
        network,
        tokens,
        pending,
+        visible,
    } = props.selectedAccount;

    // flow
-    if (!device || !account || !network) return <SelectedAccount {...props} />;
+    if (!device || !account || !network || !visible) return null;

    const explorerLink: string = `${network.explorer.address}${account.address}`;
    const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol);
    const balance: string = new BigNumber(account.balance).minus(pendingAmount).toString(10);

    return (
-        <SelectedAccount {...props}>
+        <section>
            <AccountHeading>
                <AccountName>
                    <StyledCoinLogo coinNetwork={account.network} />
@ -155,7 +155,7 @@ const AccountSummary = (props: Props) => {
                    />
                ))}
            </AddedTokensWrapper>
-        </SelectedAccount>
+        </section>
    );
 };