diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 6ccdb9981..7dc98407e 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -146,7 +146,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( fee: resp.fee, feePerKb: feePerKb, }; + toAmount = parseFloat((resp.amount * satToUnit).toFixed(unitDecimals)); + txFormatService.formatAlternativeStr(resp.amount, function(v) { + $scope.alternativeAmountStr = v; + }); var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", { fee: txFormatService.formatAmount(resp.fee) + ' ' + unitName diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss index 73b66ad3a..92042b2c9 100644 --- a/src/sass/views/tab-send.scss +++ b/src/sass/views/tab-send.scss @@ -1,7 +1,23 @@ #tab-send { @extend .deflash-blue; - input { - width: 100%; + .input { + input { + width: 100%; + height: auto; + } + &.item { + height: 55px; + } + i { + &.left { + padding-left: 15px; + } + &.qr { + cursor: pointer; + cursor: hand; + padding-right: 5px; + } + } } .qr-scan-icon { cursor: pointer; @@ -10,7 +26,7 @@ padding-left: 10px; } .qr-icon { - line-height: 45px; + line-height: 20px; } .zero-state-cta { padding-bottom: 3vh; diff --git a/www/img/scan-ico.svg b/www/img/scan-ico.svg new file mode 100644 index 000000000..5d13c91fe --- /dev/null +++ b/www/img/scan-ico.svg @@ -0,0 +1,24 @@ + + + + scan-ico + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/tab-send.html b/www/views/tab-send.html index 2b999cfd3..45d7c86de 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -32,10 +32,10 @@ --> -
- +
+ - +