diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 7eeab75be..256bd4f98 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -67,6 +67,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (err || !status) { $log.error(err); } else { + w.status = status; if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name); if (status.availableBalanceSat > $scope.toAmount) { filteredWallets.push(w); @@ -113,6 +114,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.showWalletSelector = function() { console.log('showWalletSelector called'); + console.log('$scope.wallets', $scope.wallets); $scope.showWallets = true; }; diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 127a13c5e..815d55483 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -45,12 +45,20 @@ padding-top: 16px; padding-bottom: 16px; + .wallet-name { + padding-bottom: 5px; + } + + .wallet-balance { + color: #3A3A3A; + font-family: "Roboto-Light"; + } + &::after { display: block; position: absolute; width: 100%; height: 1px; - //background: rgba(221, 221, 221, 0.3); background: $border-color; bottom: 0; right: 0; diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss index 9b482cac0..008056b8e 100644 --- a/src/sass/views/includes/actionSheet.scss +++ b/src/sass/views/includes/actionSheet.scss @@ -16,7 +16,7 @@ action-sheet { padding-left: 2rem; padding-right: .75rem; color: #2f2f2f; - padding-bottom: 2rem; + padding-bottom: 3.5rem; &.slide-up { transform: translateY(0); diff --git a/www/views/confirm.html b/www/views/confirm.html index 4fb7dbc1b..81718fb60 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -86,12 +86,17 @@
- +
{{wallet.name}} - -

+

+

+ + Incomplete + - 0.00 BTC + {{wallet.status.availableBalanceStr}} + [Balance Hidden] +