Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	blue_modules/currency.js
  • Loading branch information
tetofonta committed Apr 14, 2021
2 parents 9916758 + 8e1257f commit f3c6550
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions blue_modules/currency.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async function updateExchangeRate() {
if (Object.keys(FiatUnit).some(unit => unit === deviceCurrencies[0])) {
preferredFiatCurrency = FiatUnit[deviceCurrencies[0]];
} else {
preferredFiatCurrency = FiatUnit.EUR;
preferredFiatCurrency = FiatUnit.USD;
}
}

Expand Down Expand Up @@ -110,7 +110,7 @@ function satoshiToLocalCurrency(satoshi) {
} catch (error) {
console.warn(error);
console.log(error);
formatter = new Intl.NumberFormat(FiatUnit.EUR.locale, {
formatter = new Intl.NumberFormat(FiatUnit.USD.locale, {
style: 'currency',
currency: preferredFiatCurrency.endPointKey,
minimumFractionDigits: 2,
Expand Down

0 comments on commit f3c6550

Please sign in to comment.