diff --git a/src/views/Wallet/views/Account/Receive/ethereum/index.js b/src/views/Wallet/views/Account/Receive/ethereum/index.js index 406820db..f48436e1 100644 --- a/src/views/Wallet/views/Account/Receive/ethereum/index.js +++ b/src/views/Wallet/views/Account/Receive/ethereum/index.js @@ -95,10 +95,11 @@ const AccountReceive = (props: Props) => { const isAddressVerifying = props.modal.context === CONTEXT_DEVICE && props.modal.windowType === 'ButtonRequest_Address'; - const isAddressHidden = !isAddressVerifying && !addressVerified && !addressUnverified; + const isAddressHidden = + !isAddressVerifying && !addressVerified && !addressUnverified && !account.imported; let address = `${account.descriptor.substring(0, 20)}...`; - if (addressVerified || addressUnverified || isAddressVerifying) { + if (addressVerified || addressUnverified || isAddressVerifying || account.imported) { address = account.descriptor; } @@ -166,7 +167,7 @@ const AccountReceive = (props: Props) => { ) } /> - {!(addressVerified || addressUnverified) && ( + {!(addressVerified || addressUnverified) && !account.imported && ( props.showAddress(account.accountPath)} @@ -176,20 +177,21 @@ const AccountReceive = (props: Props) => { )} - {(addressVerified || addressUnverified) && !isAddressVerifying && ( - - - - - )} + {((addressVerified || addressUnverified) && !isAddressVerifying) || + (account.imported && ( + + + + + ))} diff --git a/src/views/Wallet/views/Account/Receive/ripple/index.js b/src/views/Wallet/views/Account/Receive/ripple/index.js index 93480906..f1b0e8c5 100644 --- a/src/views/Wallet/views/Account/Receive/ripple/index.js +++ b/src/views/Wallet/views/Account/Receive/ripple/index.js @@ -101,10 +101,11 @@ const AccountReceive = (props: Props) => { const isAddressVerifying = props.modal.context === CONTEXT_DEVICE && props.modal.windowType === 'ButtonRequest_Address'; - const isAddressHidden = !isAddressVerifying && !addressVerified && !addressUnverified; + const isAddressHidden = + !isAddressVerifying && !addressVerified && !addressUnverified && !account.imported; let address = `${account.descriptor.substring(0, 20)}...`; - if (addressVerified || addressUnverified || isAddressVerifying) { + if (addressVerified || addressUnverified || isAddressVerifying || account.imported) { address = account.descriptor; } @@ -172,7 +173,7 @@ const AccountReceive = (props: Props) => { ) } /> - {!(addressVerified || addressUnverified) && ( + {!(addressVerified || addressUnverified) && !account.imported && ( props.showAddress(account.accountPath)} isDisabled={device.connected && !discovery.completed} @@ -182,20 +183,21 @@ const AccountReceive = (props: Props) => { )} - {(addressVerified || addressUnverified) && !isAddressVerifying && ( - - - - - )} + {((addressVerified || addressUnverified) && !isAddressVerifying) || + (account.imported && ( + + + + + ))} diff --git a/src/views/Wallet/views/Account/Send/ethereum/index.js b/src/views/Wallet/views/Account/Send/ethereum/index.js index 73fd4000..fe6ebed5 100644 --- a/src/views/Wallet/views/Account/Send/ethereum/index.js +++ b/src/views/Wallet/views/Account/Send/ethereum/index.js @@ -312,7 +312,9 @@ const AccountSend = (props: Props) => { total === '0' || amount.length === 0 || address.length === 0 || - sending; + sending || + account.imported; + let amountText = ''; if (networkSymbol !== currency && amount.length > 0 && !errors.amount) { amountText = `${amount} ${currency.toUpperCase()}`; @@ -516,13 +518,14 @@ const AccountSend = (props: Props) => { )} - {props.selectedAccount.pending.length > 0 && ( - - )} + {props.selectedAccount.pending.length > 0 || + (account.imported && ( + + ))} ); }; diff --git a/src/views/Wallet/views/Account/Send/ripple/index.js b/src/views/Wallet/views/Account/Send/ripple/index.js index d3e144d0..c2c2b949 100644 --- a/src/views/Wallet/views/Account/Send/ripple/index.js +++ b/src/views/Wallet/views/Account/Send/ripple/index.js @@ -279,7 +279,9 @@ const AccountSend = (props: Props) => { total === '0' || amount.length === 0 || address.length === 0 || - sending; + sending || + account.imported; + let sendButtonText = ; if (total !== '0') { sendButtonText = ( @@ -481,13 +483,14 @@ const AccountSend = (props: Props) => { )} - {props.selectedAccount.pending.length > 0 && ( - - )} + {props.selectedAccount.pending.length > 0 || + (account.imported && ( + + ))} ); }; diff --git a/src/views/Wallet/views/Account/Summary/ripple/index.js b/src/views/Wallet/views/Account/Summary/ripple/index.js index 3d42bea0..0c9dde3b 100644 --- a/src/views/Wallet/views/Account/Summary/ripple/index.js +++ b/src/views/Wallet/views/Account/Summary/ripple/index.js @@ -44,6 +44,10 @@ const StyledCoinLogo = styled(CoinLogo)` margin-right: 10px; `; +const StyledLink = styled(Link)` + font-size: ${FONT_SIZE.SMALL}; +`; + const AccountSummary = (props: Props) => { const device = props.wallet.selectedDevice; const { account, network, pending, shouldRender } = props.selectedAccount; @@ -69,17 +73,19 @@ const AccountSummary = (props: Props) => { {!account.empty && ( - + - + )}