anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4499 from isocolsky/fix/amount-precision

Browse source 
Show amount & fees with full precision on tx details modal
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-24 11:33:23 -03:00 • committed by GitHub
commit dfb12289fe
5 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -42,7 +42,7 @@
"url": "https://github.com/bitpay/copay/issues"
},
"dependencies": {
"bitcore-wallet-client": "2.7.1",
"bitcore-wallet-client": "2.8.0",
"coveralls": "^2.11.9",
"express": "^4.11.2",
"fs": "0.0.2",

4
src/js/controllers/index.js
View file

@ -693,8 +693,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;
});
};

6
src/js/controllers/modals/txDetails.js
View file

@ -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;

4
src/js/controllers/walletHome.js
View file

@ -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', {

7
src/js/services/profileService.js
View file

@ -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) {