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

Fix names. Fix sendMax

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-28 10:21:53 -03:00
commit 7e86153272
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/services/txFormatService.js
View file

@ -23,7 +23,7 @@ angular.module('copayApp.services').factory('txFormatService', function($filter,
return root.formatAmount(satoshis) + ' ' + config.unitName;
};
root.formatToCode = function(satoshis, code, cb) {
root.toFiat = function(satoshis, code, cb) {
if (isNaN(satoshis)) return;
var val = function() {
var v1 = rateService.toFiat(satoshis, code);
@ -189,9 +189,15 @@ angular.module('copayApp.services').factory('txFormatService', function($filter,
var alternativeIsoCode = config.alternativeIsoCode;
// If fiat currency
if (currency != 'bits' && currency != 'BTC') {
if (currency != 'bits' && currency != 'BTC' && currency != 'sat') {
amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency;
amountSat = rateService.fromFiat(amount, currency).toFixed(0);
} else if (currency == 'sat') {
amountSat = amount;
amountUnitStr = root.formatAmountStr(amountSat);
// convert sat to BTC
amount = (amountSat * satToBtc).toFixed(8);
currency = 'BTC';
} else {
amountSat = parseInt((amount * unitToSatoshi).toFixed(0));
amountUnitStr = root.formatAmountStr(amountSat);