diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 2bd562405..0bb858229 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -128,7 +128,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.toName = data.stateParams.toName; $scope.toEmail = data.stateParams.toEmail; $scope.toColor = data.stateParams.toColor; - $scope.showSendMax = false; if (!$scope.nextStep && !data.stateParams.toAddress) { $log.error('Bad params at amount') @@ -208,12 +207,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ if (value && evaluate(value) > 0) paste(evaluate(value)); }; - $scope.showSendMaxMenu = function() { - $scope.showSendMax = true; - }; - $scope.sendMax = function() { - $scope.showSendMax = false; $scope.useSendMax = true; $scope.finish(); }; diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss index 43aaf2bc2..97a5ae45f 100644 --- a/src/sass/buttons.scss +++ b/src/sass/buttons.scss @@ -40,3 +40,7 @@ @include button-outline($v-button-secondary-color); } } + +.button-sendmax { + line-height: inherit; +} diff --git a/www/views/amount.html b/www/views/amount.html index aa2f79817..b82e8e5aa 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -3,13 +3,7 @@ {{'Enter amount' | translate}} - - - - - + @@ -54,6 +48,18 @@
{{globalResult}} {{unit}}
≈ {{alternativeAmount || '0.00'}} {{alternativeUnit}}
+
+ +
@@ -71,6 +77,18 @@ {{globalResult}} {{unit}} ≈ {{alternativeAmount || '0.00'}} {{alternativeUnit}} +
+ +
@@ -118,8 +136,4 @@
- -