1
0
mirror of https://github.com/kremalicious/blowfish.git synced 2025-02-14 21:10:35 +01:00

merge fix

This commit is contained in:
Matthias Kretschmann 2019-05-20 21:21:05 +02:00
parent 99aaabcc29
commit 79b093d82d
Signed by: m
GPG Key ID: 606EEEF3C479A91F
3 changed files with 2 additions and 4 deletions

View File

@ -5,7 +5,6 @@ import { AppContext } from '../store/createContext'
import { cryptoFormatter } from '../../utils'
import './Balance.css'
import { fadeIn } from './Animations'
import { cryptoFormatter } from '../../utils'
const Animation = posed.h1(fadeIn)

View File

@ -4,7 +4,6 @@ import { AppContext } from '../store/createContext'
import { cryptoFormatter } from '../../utils'
import './Ticker.css'
import { fadeIn } from './Animations'
import { cryptoFormatter } from '../../utils'
const Item = posed.div(fadeIn)

View File

@ -15,7 +15,7 @@ const rgbaToHex = color => {
}
const locale =
typeof navigator !== 'undefined' ? navigator.language : app.getLocale()
typeof navigator !== 'undefined' ? navigator.language : () => app.getLocale()
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat
const numberFormatter = value =>
@ -39,7 +39,7 @@ const cryptoFormatter = (value, currency) => {
if (currency === 'ocean') {
return formatOcean(value)
} else {
return formatCurrency(value, currency.toUpperCase(), locale.split('-')[0])
return formatCurrency(value, currency.toUpperCase(), locale)
.replace(/BTC/, 'Ƀ')
.replace(/ETH/, 'Ξ')
}