diff --git a/public/views/includes/confirm-tx.html b/public/views/includes/confirm-tx.html index 9e3425b14..4fcd1eee6 100644 --- a/public/views/includes/confirm-tx.html +++ b/public/views/includes/confirm-tx.html @@ -7,7 +7,7 @@
{{tx.amountStr}}
-
{{tx.alternativeAmountStr}}
+
{{tx.alternativeAmountStr}}
@@ -16,8 +16,15 @@ Multiple recipients
-
- Fee: {{tx.feeStr}} +
+
+ Fee: {{tx.feeStr}} + {{confirm.feeAlternativeStr}} +
+
+ {{confirm.feeLevel|translate}} · + {{confirm.feeRateStr}} of the transaction +
diff --git a/src/css/main.css b/src/css/main.css index 2331f8f7f..620fce656 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -652,6 +652,7 @@ input[type=number]::-webkit-outer-spin-button { .label { font-weight: 500; padding: 0.3rem 0.4rem; + vertical-align: text-bottom; } .label.outline { diff --git a/src/js/controllers/confirmTx.js b/src/js/controllers/confirmTx.js index 05dfa8b02..d63c1ac33 100644 --- a/src/js/controllers/confirmTx.js +++ b/src/js/controllers/confirmTx.js @@ -1,6 +1,16 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmTxController', function() { +angular.module('copayApp.controllers').controller('confirmTxController', function(configService, feeService, rateService) { + + + this.processFee = function(amount, fee) { + var walletSettings = configService.getSync().wallet.settings; + var feeAlternativeIsoCode = walletSettings.alternativeIsoCode; + + this.feeLevel = feeService.feeOpts[feeService.getCurrentFeeLevel()]; + this.feeAlternativeStr = parseFloat((rateService.toFiat(fee, feeAlternativeIsoCode)).toFixed(2), 10) + ' ' + feeAlternativeIsoCode; + this.feeRateStr = (fee / amount * 100).toFixed(2) + '%' ; + }; this.close = function(cb) { return cb(); diff --git a/src/js/controllers/tx.js b/src/js/controllers/tx.js index 93cf26111..d9f9e4f39 100644 --- a/src/js/controllers/tx.js +++ b/src/js/controllers/tx.js @@ -15,7 +15,6 @@ angular.module('copayApp.controllers').controller('txController', this.copayerId = fc.credentials.copayerId; this.isShared = fc.credentials.n > 1; - if (isCordova) { $rootScope.modalOpened = true; var self = this;