Add FormattedVal component and use it in BalanceInfos

src/components/DashboardPage/BalanceInfos.js

@@ -6,11 +6,11 @@ import styled from 'styled-components'
 
 import type { MapStateToProps } from 'react-redux'
 
-import { formatBTC } from 'helpers/format'
 import { getTotalBalance } from 'reducers/accounts'
 
 import Box from 'components/base/Box'
 import Text from 'components/base/Text'
+import FormattedVal from 'components/base/FormattedVal'
 
 const mapStateToProps: MapStateToProps<*, *, *> = state => ({
   totalBalance: getTotalBalance(state),
@@ -31,21 +31,24 @@ function BalanceInfos(props: Props) {
   return (
     <Box horizontal align="flex-end" flow={7}>
       <Box grow>
-        <Text ff="Rubik" fontSize={8} color="dark" style={{ lineHeight: 1 }}>
+        <FormattedVal
-          {formatBTC(totalBalance, {
+          val={totalBalance}
-            alwaysShowSign: false,
+          currency="BTC"
-            showCode: true,
+          alwaysShowSign={false}
-          })}
+          showCode
-        </Text>
+          fontSize={8}
+          color="dark"
+          style={{ lineHeight: 1 }}
+        />
         <Sub>{'Total balance'}</Sub>
       </Box>
       <Box align="flex-end">
-        <Text>{'+9.25%'}</Text>
+        <FormattedVal isPercent val={9.25} alwaysShowSign fontSize={7} />
-        <Sub>{'Since one week'}</Sub>
+        <Sub>{'since one week'}</Sub>
       </Box>
       <Box align="flex-end">
-        <Text>{'+ USD 6,132.23'}</Text>
+        <FormattedVal currency="USD" alwaysShowSign showCode val={6132.23} fontSize={7} />
-        <Sub>{'Since one week'}</Sub>
+        <Sub>{'since one week'}</Sub>
       </Box>
     </Box>
   )

src/components/base/FormattedVal.js

@@ -0,0 +1,72 @@
+// @flow
+
+import React from 'react'
+import styled from 'styled-components'
+
+import { formatCurrencyUnit } from '@ledgerhq/currencies'
+
+import Text from 'components/base/Text'
+
+const T = styled(Text).attrs({
+  ff: 'Rubik',
+  color: p => (p.isNegative ? p.theme.colors.grenade : p.theme.colors.green),
+})``
+
+const currencies = {
+  BTC: {
+    name: 'bitcoin',
+    code: 'BTC',
+    symbol: 'b',
+    magnitude: 8,
+  },
+  USD: {
+    name: 'dollar',
+    code: 'USD',
+    symbol: '$',
+    magnitude: 0,
+  },
+}
+
+type Props = {
+  val: number,
+  isPercent?: boolean,
+  currency?: any,
+  alwaysShowSign?: boolean,
+  showCode?: boolean,
+}
+
+function FormattedVal(props: Props) {
+  const { val, isPercent, currency, alwaysShowSign, showCode, ...p } = props
+
+  const isNegative = val < 0
+
+  let text = ''
+
+  if (isPercent) {
+    text = `${alwaysShowSign ? (isNegative ? '- ' : '+ ') : ''}${val} %`
+  } else {
+    const curr = currency ? currencies[currency] : null
+    if (!curr) {
+      return `[invalid currency ${currency || '(null)'}]`
+    }
+    text = formatCurrencyUnit(curr, val, {
+      alwaysShowSign,
+      showCode,
+    })
+  }
+
+  return (
+    <T isNegative={isNegative} {...p}>
+      {text}
+    </T>
+  )
+}
+
+FormattedVal.defaultProps = {
+  currency: null,
+  isPercent: false,
+  alwaysShowSign: false,
+  showCode: false,
+}
+
+export default FormattedVal