diff --git a/app/components/Contacts/ContactForm/ContactForm.scss b/app/components/Contacts/ContactForm/ContactForm.scss index 5ab5e2c33..c723945e0 100644 --- a/app/components/Contacts/ContactForm/ContactForm.scss +++ b/app/components/Contacts/ContactForm/ContactForm.scss @@ -72,6 +72,6 @@ .submitButton { margin-top: auto; - margin-bottom: 50px; + margin-bottom: 26px; } } diff --git a/app/components/Panel/FullHeightPanel/FullHeightPanel.scss b/app/components/Panel/FullHeightPanel/FullHeightPanel.scss index feb435576..8aa5ae856 100644 --- a/app/components/Panel/FullHeightPanel/FullHeightPanel.scss +++ b/app/components/Panel/FullHeightPanel/FullHeightPanel.scss @@ -51,7 +51,7 @@ .instructions { border-bottom: solid thin var(--panel-full-height-instructions-border); - margin-bottom: 40px; + margin-bottom: 30px; margin-top: 40px; padding-bottom: 5px; width: 500px; diff --git a/app/containers/Send/Send.jsx b/app/containers/Send/Send.jsx index de74ba979..4d1fc75e8 100644 --- a/app/containers/Send/Send.jsx +++ b/app/containers/Send/Send.jsx @@ -191,15 +191,18 @@ export default class Send extends React.Component { calculateMaxValue = (asset: string, index: number = 0) => { const { sendableAssets } = this.props - const rows = [...this.state.sendRowDetails] - const rowsWithAsset = rows.filter(row => row.asset === asset) - const existingAmounts = this.calculateRowAmounts(asset, index) - const decimals = this.calculateDecimals(asset) - const totalSendableAssets = toBigNumber(sendableAssets[asset].balance) - if (rowsWithAsset.length === 1 || rowsWithAsset.length === 0) { - return toNumber(sendableAssets[asset].balance).toFixed(decimals) + if (sendableAssets[asset]) { + const rows = [...this.state.sendRowDetails] + const rowsWithAsset = rows.filter(row => row.asset === asset) + const existingAmounts = this.calculateRowAmounts(asset, index) + const decimals = this.calculateDecimals(asset) + const totalSendableAssets = toBigNumber(sendableAssets[asset].balance) + if (rowsWithAsset.length === 1 || rowsWithAsset.length === 0) { + return toNumber(sendableAssets[asset].balance).toFixed(decimals) + } + return minusNumber(totalSendableAssets, existingAmounts).toFixed(decimals) } - return minusNumber(totalSendableAssets, existingAmounts).toFixed(decimals) + return '0' } calculateRowAmounts = (asset: string, index: number) => {