diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index dd2f7ae6b..b4d5517f5 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -98,6 +98,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ }; $scope.sendMax = function() { + $scope.showSendMax = false; $state.transitionTo('tabs.send.confirm', { isWallet: $scope.isWallet, toAmount: null, diff --git a/src/js/directives/sendMax.js b/src/js/directives/itemSelector.js similarity index 70% rename from src/js/directives/sendMax.js rename to src/js/directives/itemSelector.js index 26e5b4832..0d99c4c66 100644 --- a/src/js/directives/sendMax.js +++ b/src/js/directives/itemSelector.js @@ -1,14 +1,14 @@ 'use strict'; angular.module('copayApp.directives') - .directive('sendMax', function($timeout) { + .directive('itemSelector', function($timeout) { return { restrict: 'E', - templateUrl: 'views/includes/sendMax.html', + templateUrl: 'views/includes/itemSelector.html', transclude: true, scope: { - show: '=sendMaxShow', - onSelect: '=sendMaxOnSelect' + show: '=itemSelectorShow', + onSelect: '=itemSelectorOnSelect' }, link: function(scope, element, attrs) { scope.hide = function() { diff --git a/src/sass/views/includes/send-max.scss b/src/sass/views/includes/itemSelector.scss similarity index 83% rename from src/sass/views/includes/send-max.scss rename to src/sass/views/includes/itemSelector.scss index 86213ceb8..e059907a4 100644 --- a/src/sass/views/includes/send-max.scss +++ b/src/sass/views/includes/itemSelector.scss @@ -1,4 +1,4 @@ -send-max-selector { +item-selector { $border-color: #EFEFEF; @@ -7,18 +7,18 @@ send-max-selector { padding-right: .75rem; } - .send-max-selector { + .item-selector { .option { border: 0; padding-right: 0; padding-top: 0; - padding-left: 65px; padding-bottom: 0; margin-bottom: 1px; overflow: visible; > i { - padding: 0; + color: #647ce8; + padding: 0 0 5px 0; margin-left: -5px; > img { @@ -28,7 +28,7 @@ send-max-selector { } } } - .send-max-inner { + .item-selector-inner { display: flex; position: relative; padding-top: 16px; @@ -49,10 +49,10 @@ send-max-selector { padding: 0 1.2rem; } } - .send-max-details { + .item-selector-details { flex-grow: 1; - .send-max-name { + .item-selector-name { padding-bottom: 5px; } } diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 8e241aba7..351a93298 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -39,6 +39,7 @@ @import "includes/tx-details"; @import "includes/txp-details"; @import "includes/tx-status"; +@import "includes/itemSelector"; @import "includes/walletSelector"; @import "integrations/coinbase"; @import "integrations/glidera"; diff --git a/www/views/amount.html b/www/views/amount.html index e6b3bd887..d535cb079 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -120,8 +120,8 @@ - - + + diff --git a/www/views/includes/itemSelector.html b/www/views/includes/itemSelector.html new file mode 100644 index 000000000..476814e33 --- /dev/null +++ b/www/views/includes/itemSelector.html @@ -0,0 +1,12 @@ + + +
{{title}}
+ + +
+
+
Send max amount
+
+
+
+
diff --git a/www/views/includes/sendMax.html b/www/views/includes/sendMax.html deleted file mode 100644 index 5f23b4f3d..000000000 --- a/www/views/includes/sendMax.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - -
-
-
Send max amount
-
- - - -
-
-