diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index e48ec5455..94c2af668 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -692,8 +692,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r $log.debug('Fixing Tx Cache Unit to:' + name) lodash.each(txs, function(tx) { - tx.amountStr = profileService.formatAmount(tx.amount, config.unitName) + name; - tx.feeStr = profileService.formatAmount(tx.fees, config.unitName) + name; + tx.amountStr = profileService.formatAmount(tx.amount) + name; + tx.feeStr = profileService.formatAmount(tx.fees) + name; }); }; diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index d4e227aec..cb74bfc4d 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -12,6 +12,10 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.color = fc.backgroundColor; $scope.copayerId = fc.credentials.copayerId; $scope.isShared = fc.credentials.n > 1; + + $scope.btx.amountStr = profileService.formatAmount($scope.btx.amount, true) + ' ' + walletSettings.unitName; + $scope.btx.feeStr = profileService.formatAmount($scope.btx.fees, true) + ' ' + walletSettings.unitName; + $scope.showCommentPopup = function() { $scope.data = { comment: $scope.btx.note ? $scope.btx.note.body : '', @@ -42,7 +46,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio return; } // This is only to refresh the current screen data - $scope.btx.note = null; + $scope.btx.note = null; if (args.body) { $scope.btx.note = {}; $scope.btx.note.body = $scope.data.comment; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index bebb57b0f..a99992ce3 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -418,7 +418,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return self.setSendError(gettext(msg)); } - if (form.amount.$modelValue * unitToSat > Number.MAX_SAFE_INTEGER) { + if (form.amount.$modelValue * unitToSat > Number.MAX_SAFE_INTEGER) { var msg = 'Amount too big'; $log.warn(msg); return self.setSendError(gettext(msg)); @@ -811,7 +811,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.openTxModal = function(btx) { var self = this; - $scope.btx = btx; + $scope.btx = lodash.cloneDeep(btx); $scope.self = self; $ionicModal.fromTemplateUrl('views/modals/tx-details.html', { diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 6466a6a4c..4372fd48b 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -20,12 +20,15 @@ angular.module('copayApp.services') root.walletClients = {}; root.Utils = bwcService.getUtils(); - root.formatAmount = function(amount) { + root.formatAmount = function(amount, fullPrecision) { var config = configService.getSync().wallet.settings; if (config.unitCode == 'sat') return amount; //TODO : now only works for english, specify opts to change thousand separator and decimal separator - return this.Utils.formatAmount(amount, config.unitCode); + var opts = { + fullPrecision: !!fullPrecision + }; + return this.Utils.formatAmount(amount, config.unitCode, opts); }; root._setFocus = function(walletId, cb) {