diff --git a/src/views/Wallet/components/Title/index.js b/src/views/Wallet/components/Title/index.js
index 8736a055..c06e9bfc 100644
--- a/src/views/Wallet/components/Title/index.js
+++ b/src/views/Wallet/components/Title/index.js
@@ -8,6 +8,7 @@ const Wrapper = styled.div`
font-size: ${FONT_SIZE.WALLET_TITLE};
font-weight: ${FONT_WEIGHT.BASE};
color: ${colors.WALLET_TITLE};
+ padding-bottom: 25px;
`;
const Title = ({
diff --git a/src/views/Wallet/views/Account/Receive/index.js b/src/views/Wallet/views/Account/Receive/index.js
index 960ffd33..f5ffa111 100644
--- a/src/views/Wallet/views/Account/Receive/index.js
+++ b/src/views/Wallet/views/Account/Receive/index.js
@@ -24,7 +24,6 @@ const Label = styled.div`
const AddressWrapper = styled.div`
position: relative;
display: flex;
- margin-top: 20px;
flex-wrap: wrap;
flex-direction: ${props => (props.isShowingQrCode ? 'column' : 'row')};
`;
diff --git a/src/views/Wallet/views/Account/Send/index.js b/src/views/Wallet/views/Account/Send/index.js
index 74dcd5e7..9bc0c150 100644
--- a/src/views/Wallet/views/Account/Send/index.js
+++ b/src/views/Wallet/views/Account/Send/index.js
@@ -34,7 +34,7 @@ const AmountInputLabel = styled.span`
`;
const InputRow = styled.div`
- margin: 20px 0;
+ padding: 0 0 15px 0;
`;
const SetMaxAmountButton = styled(Button)`
@@ -247,155 +247,152 @@ const AccountSend = (props: Props) => {
return (
-
- Send Ethereum or tokens
-
- onAddressChange(event.target.value)}
- />
-
-
-
-
- Amount
- {(isCurrentCurrencyToken && selectedToken) && (
- You have: {selectedTokenBalance} {selectedToken.symbol}
- )}
-
- )}
- value={amount}
- onChange={event => onAmountChange(event.target.value)}
- bottomText={errors.amount || warnings.amount || infos.amount}
- sideAddons={[
- (
- onSetMax()}
- isActive={setMax}
- >
- {!setMax && (
-
- )}
- {setMax && (
-
- )}
- Set max
-
- ),
- (
-
- ),
- ]}
- />
-
-
-
-
- Fee
- {gasPriceNeedsUpdate && (
-
-
- Recommended fees updated. Click here to use them
-
- )}
-
-
-
-
-
- Advanced settings
-
-
-
- {isAdvancedSettingsHidden && (
- onSend()}
- >
- {sendButtonText}
-
+ Send Ethereum or tokens
+
+ onAddressChange(event.target.value)}
+ />
+
+
+
+ Amount
+ {(isCurrentCurrencyToken && selectedToken) && (
+ You have: {selectedTokenBalance} {selectedToken.symbol}
+ )}
+
)}
-
+ value={amount}
+ onChange={event => onAmountChange(event.target.value)}
+ bottomText={errors.amount || warnings.amount || infos.amount}
+ sideAddons={[
+ (
+ onSetMax()}
+ isActive={setMax}
+ >
+ {!setMax && (
+
+ )}
+ {setMax && (
+
+ )}
+ Set max
+
+ ),
+ (
+
+ ),
+ ]}
+ />
+
- {advanced && (
-
- onSend()}
- >
- {sendButtonText}
-
-
- )}
+
+
+ Fee
+ {gasPriceNeedsUpdate && (
+
+
+ Recommended fees updated. Click here to use them
+
+ )}
+
+
- {props.selectedAccount.pending.length > 0 && (
-
+
+ Advanced settings
+
+
+
+ {isAdvancedSettingsHidden && (
+ onSend()}
+ >
+ {sendButtonText}
+
)}
-
+
+
+ {advanced && (
+
+ onSend()}
+ >
+ {sendButtonText}
+
+
+ )}
+
+ {props.selectedAccount.pending.length > 0 && (
+
+ )}
);
};
diff --git a/src/views/Wallet/views/Account/SignVerify/index.js b/src/views/Wallet/views/Account/SignVerify/index.js
index 4dcc4e0a..4c003fc8 100644
--- a/src/views/Wallet/views/Account/SignVerify/index.js
+++ b/src/views/Wallet/views/Account/SignVerify/index.js
@@ -10,12 +10,13 @@ import colors from 'config/colors';
const Wrapper = styled.div`
display: flex;
flex: 1;
+ margin-top: -5px;
flex-direction: row;
background: ${colors.WHITE};
`;
const Row = styled.div`
- padding: 10px 0 10px 0;
+ padding: 0 0 10px 0;
`;
const RowButtons = styled(Row)`
diff --git a/src/views/Wallet/views/Account/Summary/index.js b/src/views/Wallet/views/Account/Summary/index.js
index 4dfd8d6e..3be7a769 100644
--- a/src/views/Wallet/views/Account/Summary/index.js
+++ b/src/views/Wallet/views/Account/Summary/index.js
@@ -7,7 +7,6 @@ import Icon from 'components/Icon';
import { AsyncSelect } from 'components/Select';
import ICONS from 'config/icons';
import colors from 'config/colors';
-import Title from 'views/Wallet/components/Title';
import Tooltip from 'components/Tooltip';
import Content from 'views/Wallet/components/Content';
@@ -83,7 +82,7 @@ const AccountSummary = (props: Props) => {
- Account #{parseInt(account.index, 10) + 1}
+ Account #{parseInt(account.index, 10) + 1}
See full transaction history