diff options
-rw-r--r-- | ui/app/css/itcss/components/send.scss | 11 | ||||
-rw-r--r-- | ui/app/send-v2.js | 14 |
2 files changed, 18 insertions, 7 deletions
diff --git a/ui/app/css/itcss/components/send.scss b/ui/app/css/itcss/components/send.scss index 3013ee66b..458434de4 100644 --- a/ui/app/css/itcss/components/send.scss +++ b/ui/app/css/itcss/components/send.scss @@ -400,7 +400,7 @@ .send-v2 { &__container { - height: 701px; + // height: 701px; width: 380px; border-radius: 8px; background-color: $white; @@ -416,6 +416,7 @@ width: 100%; top: 0; box-shadow: none; + flex: 1 1 auto; } } @@ -520,18 +521,20 @@ } &__form { - margin-top: 13px; + margin: 13px 0; width: 100%; @media screen and (max-width: $break-small) { - margin-top: 0px; + padding: 13px 0; + margin: 0; height: 0; overflow-y: auto; flex: 1 1 auto; } } - &__form-header, &__form-header-copy { + &__form-header, + &__form-header-copy { width: 100%; display: flex; flex-flow: column; diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js index 8b49f7307..3775603b8 100644 --- a/ui/app/send-v2.js +++ b/ui/app/send-v2.js @@ -372,7 +372,7 @@ SendTransactionScreen.prototype.renderForm = function () { this.renderGasRow(), - this.renderMemoRow(), + // this.renderMemoRow(), ]) } @@ -381,9 +381,9 @@ SendTransactionScreen.prototype.renderFooter = function () { const { goHome, clearSend, - errors: { amount: amountError, to: toError } + errors: { amount: amountError, to: toError }, } = this.props - + const noErrors = amountError === null && toError === null const errorClass = noErrors ? '' : '__disabled' @@ -395,6 +395,7 @@ SendTransactionScreen.prototype.renderFooter = function () { }, }, 'Cancel'), h(`button.send-v2__next-btn${errorClass}`, { + onClick: event => this.onSubmit(event), }, 'Next'), ]) } @@ -435,8 +436,15 @@ SendTransactionScreen.prototype.onSubmit = function (event) { selectedToken, toAccounts, clearSend, + errors: { amount: amountError, to: toError }, } = this.props + const noErrors = amountError === null && toError === null + + if (!noErrors) { + return + } + this.addToAddressBookIfNew(to) const txParams = { |