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

fix amount.js for fiat/config

Browse source
This commit is contained in:
matias 2017-08-31 17:13:54 -03:00
commit f96f0bb037
2 changed files with 346 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.editorconfig
View file

@ -1,13 +1,3 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# http://editorconfig.org
## Plugins
# Atom (https://github.com/sindresorhus/atom-editorconfig)
# Vim (https://github.com/editorconfig/editorconfig-vim)
# Sublime (https://github.com/sindresorhus/editorconfig-sublime)
;
root = true root = true
[*] [*]
@ -27,4 +17,3 @@ indent_style = tab
[**.html] [**.html]
max_char = 78 max_char = 78
brace_style = expand brace_style = expand

17
src/js/controllers/amount.js
View file

@ -62,32 +62,31 @@ angular.module('copayApp.controllers').controller('amountController', function($
} }
}); });
if (newAvailableUnits.length>0) { if (newAvailableUnits.length > 0) {
availableUnits = newAvailableUnits; availableUnits = newAvailableUnits;
} }
} }
// currency have preference // currency have preference
var fiat; var fiatName;
if (data.stateParams.currency) { if (data.stateParams.currency) {
fiat = data.stateParams.currency; fiatCode = data.stateParams.currency;
altUnitIndex = unitIndex altUnitIndex = unitIndex
unitIndex = availableUnits.length; unitIndex = availableUnits.length;
} else { } else {
fiat = config.fiat || 'USD'; fiatCode = config.alternativeIsoCode || 'USD';
fiatName = config.alternanativeName || fiatCode;
altUnitIndex = availableUnits.length; altUnitIndex = availableUnits.length;
} }
availableUnits.push({ availableUnits.push({
name: fiat, // TODO name: fiatName || fiatCode, // TODO
id: fiat, id: fiatCode,
shortName: fiat, shortName: fiatCode,
isFiat: true, isFiat: true,
}); });
fiatCode = fiat;
if (data.stateParams.fixedUnit) { if (data.stateParams.fixedUnit) {
fixedUnit = true; fixedUnit = true;
} }