Update dependencies, change few components for styled-system 2.x

7 years ago · 314db434f2
39 changed files with 420 additions and 334 deletions
--- a/package.json
+++ b/package.json
@ -40,17 +40,17 @@
    "webpack-sources": "1.0.1"
  },
  "dependencies": {
-    "@fortawesome/fontawesome": "^1.1.3",
    "@fortawesome/fontawesome-free-brands": "^5.0.6",
    "@fortawesome/fontawesome-free-regular": "^5.0.6",
    "@fortawesome/fontawesome-free-solid": "^5.0.6",
+    "@fortawesome/fontawesome": "^1.1.3",
    "@fortawesome/react-fontawesome": "^0.0.17",
    "@ledgerhq/common": "2.3.0",
    "@ledgerhq/currencies": "^2.3.0",
    "@ledgerhq/hw-app-btc": "^4.0.0",
    "@ledgerhq/hw-app-eth": "^4.0.0",
-    "@ledgerhq/hw-transport": "^4.0.0",
    "@ledgerhq/hw-transport-node-hid": "^4.0.0",
+    "@ledgerhq/hw-transport": "^4.0.0",
    "axios": "^0.17.1",
    "babel-runtime": "^6.26.0",
    "bcryptjs": "^2.4.3",
@ -64,35 +64,35 @@
    "electron-updater": "^2.20.1",
    "fuse.js": "^3.2.0",
    "history": "^4.7.2",
-    "i18next": "^10.2.2",
    "i18next-node-fs-backend": "^1.0.0",
+    "i18next": "^10.4.1",
+    "ledger-test-library": "KhalilBellakrid/ledger-test-library",
    "lodash": "^4.17.5",
    "moment": "^2.20.1",
    "object-path": "^0.11.4",
    "qrcode": "^1.2.0",
    "query-string": "^5.1.0",
-    "raven": "^2.4.1",
    "raven-js": "^3.22.3",
-    "react": "^16.2.0",
+    "raven": "^2.4.1",
    "react-dom": "^16.2.0",
    "react-i18next": "^7.3.6",
    "react-mortal": "^3.2.0",
    "react-motion": "^0.5.2",
    "react-qr-reader": "^2.0.1",
-    "react-redux": "^5.0.6",
-    "react-router": "^4.2.0",
+    "react-redux": "^5.0.7",
    "react-router-dom": "^4.2.2",
    "react-router-redux": "5.0.0-alpha.9",
+    "react-router": "^4.2.0",
    "react-smooth-scrollbar": "^8.0.6",
+    "react": "^16.2.0",
    "recharts": "^1.0.0-beta.10",
-    "redux": "^3.7.2",
    "redux-actions": "^2.2.1",
    "redux-thunk": "^2.2.0",
+    "redux": "^3.7.2",
    "smooth-scrollbar": "^8.2.6",
    "source-map-support": "^0.5.3",
    "styled-components": "^3.1.6",
-    "styled-system": "^1.1.7",
-    "ledger-test-library": "KhalilBellakrid/ledger-test-library"
+    "styled-system": "^2.1.0"
  },
  "devDependencies": {
    "@storybook/addon-actions": "^3.3.13",
@ -115,23 +115,23 @@
    "concurrently": "^3.5.1",
    "dotenv": "^5.0.0",
    "electron": "1.8.2",
-    "electron-builder": "^20.0.4",
+    "electron-builder": "^20.0.5",
    "electron-devtools-installer": "^2.2.3",
    "electron-rebuild": "^1.7.3",
    "electron-webpack": "1.12.1",
-    "eslint": "^4.17.0",
+    "eslint": "^4.18.0",
    "eslint-config-airbnb": "^16.1.0",
    "eslint-config-prettier": "^2.9.0",
    "eslint-import-resolver-babel-module": "^4.0.0",
-    "eslint-plugin-flowtype": "^2.44.0",
+    "eslint-plugin-flowtype": "^2.45.0",
    "eslint-plugin-import": "^2.8.0",
    "eslint-plugin-jsx-a11y": "^6.0.3",
    "eslint-plugin-react": "^7.6.1",
-    "flow-bin": "^0.65.0",
+    "flow-bin": "^0.66.0",
    "flow-typed": "^2.3.0",
    "hard-source-webpack-plugin": "^0.5.18",
    "husky": "^0.14.3",
-    "lint-staged": "^6.1.0",
+    "lint-staged": "^6.1.1",
    "node-loader": "^0.6.0",
    "prettier": "^1.10.2",
    "react-hot-loader": "^4.0.0-beta.21",
--- a/src/components/AccountPage.js
+++ b/src/components/AccountPage.js
@ -54,9 +54,9 @@ class AccountPage extends PureComponent<Props> {
          <Box>
            <Text fontSize={8}>{account.name}</Text>
          </Box>
-          <Box horizontal align="center" justify="flex-end" grow flow={2}>
+          <Box horizontal alignItems="center" justifyContent="flex-end" grow flow={2}>
            <Button primary onClick={() => openModal(MODAL_SEND, { account })}>
-              <Box horizontal flow={2} align="center">
+              <Box horizontal flow={2} alignItems="center">
                <Box>
                  <Icon name="upload" />
                </Box>
@ -64,7 +64,7 @@ class AccountPage extends PureComponent<Props> {
              </Box>
            </Button>
            <Button primary onClick={() => openModal(MODAL_RECEIVE, { account })}>
-              <Box horizontal flow={2} align="center">
+              <Box horizontal flow={2} alignItems="center">
                <Box>
                  <Icon name="download" />
                </Box>
@ -86,8 +86,8 @@ class AccountPage extends PureComponent<Props> {
                <Card
                  title={t('AccountPage.balance')}
                  style={{ height: 435 }}
-                  align="center"
-                  justify="center"
+                  alignItems="center"
+                  justifyContent="center"
                >
                  <Text fontSize={5}>{formatBTC(accountData.balance)}</Text>
                </Card>
--- a/src/components/Breadcrumb/index.js
+++ b/src/components/Breadcrumb/index.js
@ -7,7 +7,7 @@ import Box from 'components/base/Box'

 const BreadcrumbWrapper = styled(Box).attrs({
  horizontal: true,
-  align: 'center',
+  alignItems: 'center',
  relative: true,
 })``

@ -15,7 +15,7 @@ const BreadcrumbStep = styled(({ start, active, end, ...props }) => (
  <Box start={start} end={end} active={active} {...props} />
 )).attrs({
  color: p => (p.active ? 'blue' : 'mouse'),
-  align: 'center',
+  alignItems: 'center',
  flow: 5,
  relative: true,
 })`
@ -55,8 +55,8 @@ const BreadcrumbNumberWrapper = styled(Box).attrs({
 const BreadcrumbNumber = styled(Box).attrs({
  color: p => (p.active ? 'white' : 'mouse'),
  bg: p => (p.active ? 'blue' : 'pearl'),
-  align: 'center',
-  justify: 'center',
+  alignItems: 'center',
+  justifyContent: 'center',
 })`
  border-radius: 50%;
  box-shadow: ${p => `0 0 0 ${p.active ? 4 : 0}px ${p.theme.colors.cream}`};
--- a/src/components/DashboardPage/AccountCard.js
+++ b/src/components/DashboardPage/AccountCard.js
@ -21,8 +21,8 @@ const AccountCard = ({
  onClick: Function,
 }) => (
  <Card p={4} flow={4} flex={1} style={{ cursor: 'pointer' }} onClick={onClick}>
-    <Box horizontal ff="Open Sans|SemiBold" flow={3} align="center">
-      <Box align="center" justify="center" style={{ color: '#fcb653' }}>
+    <Box horizontal ff="Open Sans|SemiBold" flow={3} alignItems="center">
+      <Box alignItems="center" justifyContent="center" style={{ color: '#fcb653' }}>
        <IconCurrencyBitcoin height={20} width={20} />
      </Box>
      <Box>
@ -35,7 +35,7 @@ const AccountCard = ({
      </Box>
    </Box>
    <Bar size={1} color="argile" />
-    <Box grow justify="center" color="dark">
+    <Box grow justifyContent="center" color="dark">
      {account.data && (
        <FormattedVal
          alwaysShowSign={false}
--- a/src/components/DashboardPage/AccountsOrder.js
+++ b/src/components/DashboardPage/AccountsOrder.js
@ -85,7 +85,7 @@ class AccountsOrder extends Component<Props, State> {
        flow={1}
        color="dark"
        horizontal
-        align="center"
+        alignItems="center"
      >
        <Text color="dark">{t(`orderAccounts.${cachedValue || 'balance'}`)}</Text>
        <IconAngleDown height={7} width={8} />
--- a/src/components/DashboardPage/BalanceInfos.js
+++ b/src/components/DashboardPage/BalanceInfos.js
@ -29,7 +29,7 @@ const Sub = styled(Text).attrs({
 function BalanceInfos(props: Props) {
  const { totalBalance } = props
  return (
-    <Box horizontal align="flex-end" flow={7}>
+    <Box horizontal alignItems="flex-end" flow={7}>
      <Box grow>
        <FormattedVal
          val={totalBalance}
@ -42,11 +42,11 @@ function BalanceInfos(props: Props) {
        />
        <Sub>{'Total balance'}</Sub>
      </Box>
-      <Box align="flex-end">
+      <Box alignItems="flex-end">
        <FormattedVal isPercent val={9.25} alwaysShowSign fontSize={7} />
        <Sub>{'since one week'}</Sub>
      </Box>
-      <Box align="flex-end">
+      <Box alignItems="flex-end">
        <FormattedVal currency="USD" alwaysShowSign showCode val={6132.23} fontSize={7} />
        <Sub>{'since one week'}</Sub>
      </Box>
--- a/src/components/DashboardPage/index.js
+++ b/src/components/DashboardPage/index.js
@ -137,6 +137,8 @@ class DashboardPage extends PureComponent<Props, State> {
  }

  componentDidMount() {
+    this._mounted = true
+
    this.addFakeDatasOnAccounts()
  }

@ -159,6 +161,7 @@ class DashboardPage extends PureComponent<Props, State> {
  }

  componentWillUnmount() {
+    this._mounted = false
    clearTimeout(this._timeout)
  }

@ -176,10 +179,12 @@ class DashboardPage extends PureComponent<Props, State> {
    }, fakeDatas)

    window.requestIdleCallback(() => {
-      this.setState({
-        fakeDatas: newFakeDatas,
-        fakeDatasMerge: mergeFakeDatas(newFakeDatas),
-      })
+      if (this._mounted) {
+        this.setState({
+          fakeDatas: newFakeDatas,
+          fakeDatasMerge: mergeFakeDatas(newFakeDatas),
+        })
+      }

      this._timeout = setTimeout(() => {
        this.addFakeDatasOnAccounts()
@ -188,6 +193,7 @@ class DashboardPage extends PureComponent<Props, State> {
  }

  _timeout = undefined
+  _mounted = false

  render() {
    const { push, accounts } = this.props
@ -198,7 +204,7 @@ class DashboardPage extends PureComponent<Props, State> {

    return (
      <Box flow={7}>
-        <Box horizontal align="flex-end">
+        <Box horizontal alignItems="flex-end">
          <Box>
            <Text color="dark" ff="Museo Sans" fontSize={7}>
              {'Good morning, Khalil.'}
@ -239,7 +245,7 @@ class DashboardPage extends PureComponent<Props, State> {
              </Box>
            </Card>
            <Box flow={4}>
-              <Box horizontal align="flex-end">
+              <Box horizontal alignItems="flex-end">
                <Text color="dark" ff="Museo Sans" fontSize={6}>
                  {'Accounts'}
                </Text>
--- a/src/components/DevTools.js
+++ b/src/components/DevTools.js
@ -97,16 +97,15 @@ const Items = styled(Box).attrs({
 })``

 const Item = styled(Box).attrs({
-  align: 'center',
+  alignItems: 'center',
  bg: 'night',
-  borderColor: 'white',
  borderRadius: 1,
-  borderWidth: 2,
  color: 'white',
-  justify: 'center',
+  justifyContent: 'center',
  py: 2,
  px: 4,
 })`
+  border: 2px solid ${p => p.theme.colors.white};
  flex: 1;
  overflow: hidden;
  cursor: pointer;
@ -241,7 +240,7 @@ class DevTools extends PureComponent<any, State> {
              >
                {l.map(k => (
                  <Box key={k} style={{ flex: 1 }}>
-                    <Box horizontal align="center" flow={2}>
+                    <Box horizontal alignItems="center" flow={2}>
                      <Box fontSize={1}>{last(cpuUsage[k]).value}%</Box>
                      <Box>{k}</Box>
                    </Box>
--- a/src/components/GlobalSearch.js
+++ b/src/components/GlobalSearch.js
@ -30,7 +30,7 @@ class GlobalSearch extends PureComponent<{}> {
  render() {
    return (
      <Box grow horizontal ff="Open Sans|SemiBold" fontSize={4}>
-        <Box justify="center" onClick={this.focusInput} pr={2}>
+        <Box justifyContent="center" onClick={this.focusInput} pr={2}>
          <IconSearch height={16} width={16} />
        </Box>
        <Input placeholder="Search" innerRef={input => (this._input = input)} />
--- a/src/components/IsUnlocked.js
+++ b/src/components/IsUnlocked.js
@ -127,7 +127,7 @@ class IsUnlocked extends Component<Props, State> {

    if (isLocked) {
      return (
-        <Box sticky align="center" justify="center" onClick={this.handleFocusInput}>
+        <Box sticky alignItems="center" justifyContent="center" onClick={this.handleFocusInput}>
          <form onSubmit={this.handleSubmit}>
            <Box>
              <Input
--- a/src/components/ReceiveBox.js
+++ b/src/components/ReceiveBox.js
@ -16,27 +16,26 @@ type Props = {
 }

 export const AddressBox = styled(Box).attrs({
-  borderWidth: 1,
-  borderColor: 'mouse',
  bg: 'cream',
  p: 2,
 })`
  border-radius: 3px;
+  border: 1px solid ${p => p.theme.colors.mouse};
  cursor: text;
-  text-align: center;
+  text-alignitems: center;
  user-select: text;
  word-break: break-all;
 `

 const Action = styled(Box).attrs({
-  align: 'center',
+  alignItems: 'center',
  color: 'mouse',
  flex: 1,
  flow: 1,
  fontSize: 0,
 })`
  font-weight: bold;
-  text-align: center;
+  text-alignitems: center;
  cursor: pointer;
  text-transform: uppercase;

@ -47,10 +46,10 @@ const Action = styled(Box).attrs({

 const ReceiveBox = ({ amount, address }: Props) => (
  <Box flow={3}>
-    <Box align="center">
+    <Box alignItems="center">
      <QRCode size={150} data={`bitcoin:${address}${amount ? `?amount=${amount}` : ''}`} />
    </Box>
-    <Box align="center" flow={2}>
+    <Box alignItems="center" flow={2}>
      <Text fontSize={1}>{'Current address'}</Text>
      <AddressBox>{address}</AddressBox>
    </Box>
--- a/src/components/RecipientAddress/index.js
+++ b/src/components/RecipientAddress/index.js
@ -63,7 +63,7 @@ class RecipientAddress extends PureComponent<Props, State> {
    const { qrReaderOpened } = this.state

    return (
-      <Box relative justify="center">
+      <Box relative justifyContent="center">
        <InputAddress value={value} withQrCode={withQrCode} onChange={onChange} />
        {withQrCode && (
          <Fragment>
--- a/src/components/SelectAccount/index.js
+++ b/src/components/SelectAccount/index.js
@ -22,7 +22,7 @@ const mapStateToProps: MapStateToProps<*, *, *> = state => ({
 })

 const renderItem = item => (
-  <Box horizontal align="center">
+  <Box horizontal alignItems="center">
    <Box grow>
      <Text color="night" fontSize={0} fontWeight="bold">
        {item.name}
--- a/src/components/SettingsPage/Display.js
+++ b/src/components/SettingsPage/Display.js
@ -86,7 +86,7 @@ class TabProfile extends PureComponent<Props, State> {
              items={languages}
            />
          </Box>
-          <Box horizontal justify="flex-end">
+          <Box horizontal justifyContent="flex-end">
            <Button primary type="submit">
              Save
            </Button>
--- a/src/components/SettingsPage/Profile.js
+++ b/src/components/SettingsPage/Profile.js
@ -89,7 +89,7 @@ class TabProfile extends PureComponent<Props, State> {
          <label>
            <Box
              horizontal
-              align="center"
+              alignItems="center"
              flow={2}
              style={{ cursor: 'pointer' }}
              onClick={() => this.handleChangeInput('password.state')(!isPasswordChecked)}
@ -108,7 +108,7 @@ class TabProfile extends PureComponent<Props, State> {
              />
            </Box>
          )}
-          <Box horizontal justify="flex-end">
+          <Box horizontal justifyContent="flex-end">
            <Button primary type="submit">
              Save
            </Button>
--- a/src/components/SideBar/Item.js
+++ b/src/components/SideBar/Item.js
@ -28,7 +28,7 @@ const mapDispatchToProps = {
 }

 const Container = styled(Tabbable).attrs({
-  align: 'center',
+  alignItems: 'center',
  borderRadius: 1,
  ff: 'Open Sans|SemiBold',
  flow: 3,
@ -86,7 +86,7 @@ function Item({
      isActive={isActive}
    >
      {icon && <Box color={isActive ? iconActiveColor : void 0}>{icon}</Box>}
-      <Box justify="center">
+      <Box justifyContent="center">
        <Text fontSize={4}>{children}</Text>
        {desc && (
          <Box color="steel" fontSize={3}>
--- a/src/components/SideBar/index.js
+++ b/src/components/SideBar/index.js
@ -95,7 +95,7 @@ class SideBar extends PureComponent<Props> {
            </Box>
          </Box>
          <Box flow={4} grow pt={1}>
-            <CapsSubtitle horizontal align="center">
+            <CapsSubtitle horizontal alignItems="center">
              <Box grow>{t('sidebar.accounts')}</Box>
              <PlusBtn onClick={() => openModal(MODAL_ADD_ACCOUNT)}>
                <IconPlus height={14} width={14} />
--- a/src/components/TopBar.js
+++ b/src/components/TopBar.js
@ -34,11 +34,10 @@ const Container = styled(Box).attrs({
 const Inner = styled(Box).attrs({
  horizontal: true,
  grow: true,
-  borderBottom: true,
  flow: 4,
-  borderWidth: 1,
-  borderColor: p => rgba(p.theme.colors.black, 0.15),
-})``
+})`
+  border-bottom: 1px solid ${p => rgba(p.theme.colors.black, 0.15)};
+`

 const Bar = styled.div`
  height: 15px;
@ -137,14 +136,14 @@ class TopBar extends PureComponent<Props, State> {
        <Inner>
          <Box grow horizontal flow={4}>
            <GlobalSearch />
-            <Box justify="center">
+            <Box justifyContent="center">
              <IconDevices height={16} width={16} />
            </Box>
-            <Box justify="center" relative>
+            <Box justifyContent="center" relative>
              <IconActivity height={16} width={16} />
              {hasAccounts && <Activity progress={sync.progress} fail={sync.fail} />}
            </Box>
-            <Box justify="center">
+            <Box justifyContent="center">
              <Bar />
            </Box>
          </Box>
@ -158,8 +157,8 @@ class TopBar extends PureComponent<Props, State> {
              ff="Open Sans|SemiBold"
              fontSize={4}
              offsetTop={-2}
-              align="center"
-              justify="center"
+              alignItems="center"
+              justifyContent="center"
              flow={1}
              color="warmGrey"
              horizontal
--- a/src/components/TransactionsList/index.js
+++ b/src/components/TransactionsList/index.js
@ -53,7 +53,7 @@ HeaderCol.defaultProps = {

 const TransactionRaw = styled(Box).attrs({
  horizontal: true,
-  align: 'center',
+  alignItems: 'center',
 })`
  border-bottom: 1px solid ${p => p.theme.colors.argile};
  height: 68px;
@ -66,7 +66,7 @@ const TransactionRaw = styled(Box).attrs({
 const Cell = styled(Box).attrs({
  px: 4,
  horizontal: true,
-  align: 'center',
+  alignItems: 'center',
 })`
  width: ${p => (p.size ? `${p.size}px` : '')};
 `
@ -81,7 +81,7 @@ const Transaction = ({
  const time = moment(tx.received_at)
  return (
    <TransactionRaw>
-      <Cell size={DATE_COL_SIZE} justify="space-between">
+      <Cell size={DATE_COL_SIZE} justifyContent="space-between">
        <Box>
          <Day>{time.format('DD MMM')}</Day>
          <Hour>{time.format('HH:mm')}</Hour>
@ -95,7 +95,7 @@ const Transaction = ({
          style={{ cursor: 'pointer' }}
          onClick={() => onAccountClick && onAccountClick(tx.account)}
        >
-          <Box align="center" justify="center" style={{ color: '#fcb653' }}>
+          <Box alignItems="center" justifyContent="center" style={{ color: '#fcb653' }}>
            <IconCurrencyBitcoin height={16} width={16} />
          </Box>
          <Box ff="Open Sans|SemiBold" fontSize={4} color="dark">
@ -120,7 +120,7 @@ const Transaction = ({
          {tx.balance > 0 ? get(tx, 'inputs.0.address') : get(tx, 'outputs.0.address')}
        </Box>
      </Cell>
-      <Cell size={AMOUNT_COL_SIZE} justify="flex-end">
+      <Cell size={AMOUNT_COL_SIZE} justifyContent="flex-end">
        <FormattedVal val={tx.balance} currency="BTC" showCode fontSize={4} alwaysShowSign />
      </Cell>
    </TransactionRaw>
@ -166,7 +166,7 @@ class TransactionsList extends Component<Props> {
          <HeaderCol size={DATE_COL_SIZE}>{'Date'}</HeaderCol>
          {withAccounts && <HeaderCol size={ACCOUNT_COL_SIZE}>{'Account'}</HeaderCol>}
          <HeaderCol grow>{'Address'}</HeaderCol>
-          <HeaderCol size={AMOUNT_COL_SIZE} justify="flex-end">
+          <HeaderCol size={AMOUNT_COL_SIZE} justifyContent="flex-end">
            {'Amount'}
          </HeaderCol>
        </Box>
--- a/src/components/base/BoldToggle.js
+++ b/src/components/base/BoldToggle.js
@ -20,7 +20,7 @@ function BoldToggle(props: Props) {
        {children}
      </Text>
      {!isBold && (
-        <Box sticky align="center" justify="center">
+        <Box sticky alignItems="center" justifyContent="center">
          <Text fontWeight={normalWeight} {...p}>
            {children}
          </Text>
--- a/src/components/base/Box/index.js
+++ b/src/components/base/Box/index.js
@ -4,9 +4,7 @@ import React, { PureComponent } from 'react'
 import styled from 'styled-components'
 import {
  alignItems,
-  borderColor,
  borderRadius,
-  borderWidth,
  boxShadow,
  color,
  flex,
@ -21,9 +19,7 @@ import Text from 'components/base/Text'

 const Box = styled.div`
  ${alignItems};
-  ${borderColor};
  ${borderRadius};
-  ${borderWidth};
  ${boxShadow};
  ${color};
  ${flex};
--- a/src/components/base/Box/stories.js
+++ b/src/components/base/Box/stories.js
@ -33,11 +33,11 @@ const justify = [

 stories.add('basic', () => (
  <Box
-    align={select('align', align, 'center')}
+    alignItems={select('align', align, 'center')}
    flow={number('flow', undefined)}
    grow={boolean('grow', false)}
    horizontal={boolean('horizontal', false)}
-    justify={select('justify', justify, 'center')}
+    justifyContent={select('justify', justify, 'center')}
    padding={number('padding', undefined)}
    relative={boolean('relative', false)}
    sticky={boolean('sticky', true)}
@ -50,9 +50,9 @@ const Container = props => <Box flow={10} {...props} />
 const Row = props => <Box horizontal flow={10} {...props} />
 const Col = styled(({ color, ...props }) => (
  <Box
-    align="center"
+    alignItems="center"
    grow
-    justify="center"
+    justifyContent="center"
    style={{
      backgroundColor: color,
    }}
--- a/src/components/base/Button/index.js
+++ b/src/components/base/Button/index.js
@ -2,20 +2,19 @@

 import React from 'react'
 import styled from 'styled-components'
-import { borderColor, borderWidth, space, fontSize, fontWeight, color } from 'styled-system'
+import { space, fontSize, fontWeight, color } from 'styled-system'
 import noop from 'lodash/noop'

 import Box from 'components/base/Box'
 import Icon from 'components/base/Icon'

 const Base = styled.button`
-  ${borderColor};
-  ${borderWidth};
  ${space};
  ${color};
  ${fontSize};
  ${fontWeight};
  border-radius: 5px;
+  border: ${p => (p.primary ? '' : `1px solid ${p.theme.colors.mouse}`)};
  cursor: ${p => (p.disabled ? 'default' : 'pointer')};
  height: 40px;
  box-shadow: ${p => (p.withShadow ? 'rgba(0, 0, 0, 0.2) 0 3px 10px' : '')};
@ -50,13 +49,10 @@ function getProps({ disabled, icon, primary }: Object) {
      {
        color: 'white',
        bg: 'blue',
-        borderWidth: 0,
        withShadow: true,
      },
      {
        bg: 'transparent',
-        borderColor: 'mouse',
-        borderWidth: 1,
      },
    ),
    ...props(disabled, {
@ -69,7 +65,7 @@ function getProps({ disabled, icon, primary }: Object) {

 const Button = ({ children, onClick, primary, icon, disabled, ...props }: Props) => {
  children = icon ? (
-    <Box align="center" justify="center">
+    <Box alignItems="center" justifyContent="center">
      <Icon name={icon} />
    </Box>
  ) : (
--- a/src/components/base/CheckBox/index.js
+++ b/src/components/base/CheckBox/index.js
@ -20,8 +20,8 @@ const bounce = keyframes`
 `

 const Base = styled(Tabbable).attrs({
-  align: 'center',
-  justify: 'center',
+  alignItems: 'center',
+  justifyContent: 'center',
 })`
  cursor: pointer;
  outline: none;
--- a/src/components/base/Defer.js
+++ b/src/components/base/Defer.js
@ -16,11 +16,19 @@ class Defer extends PureComponent<Props, State> {
  }

  componentDidMount() {
+    this._mounted = true
+
    window.requestAnimationFrame(() =>
-      window.requestAnimationFrame(() => this.setState({ shouldRender: true })),
+      window.requestAnimationFrame(() => this._mounted && this.setState({ shouldRender: true })),
    )
  }

+  componentWillUnmount() {
+    this._mounted = false
+  }
+
+  _mounted = false
+
  render() {
    const { children } = this.props
    const { shouldRender } = this.state
--- a/src/components/base/GrowScroll/stories.js
+++ b/src/components/base/GrowScroll/stories.js
@ -14,10 +14,11 @@ stories.add('basic', () => {

  return (
    <Box
-      borderWidth={1}
-      borderColor="night"
      bg={reverseColor ? 'night' : 'white'}
      color={reverseColor ? 'white' : 'night'}
+      style={{
+        border: '1px solid black',
+      }}
    >
      <GrowScroll maxHeight={400}>
        {[...Array(1000).keys()].map(v => <div key={v}>{v}</div>)}
--- a/src/components/base/Modal/index.js
+++ b/src/components/base/Modal/index.js
@ -49,8 +49,8 @@ const mapDispatchToProps = (dispatch, { name, onClose = noop }) => ({

 const Container = styled(Box).attrs({
  color: 'grey',
-  align: 'center',
-  justify: 'flex-start',
+  alignItems: 'center',
+  justifyContent: 'flex-start',
  sticky: true,
  style: p => ({
    pointerEvents: p.isVisible ? 'auto' : 'none',
@ -181,9 +181,9 @@ export class Modal extends Component<Props> {
          <Container isVisible={isVisible}>
            <Backdrop op={m.opacity} />
            <GrowScroll
-              align="center"
+              alignItems="center"
              full
-              justify="flex-start"
+              justifyContent="flex-start"
              onClick={preventBackdropClick ? undefined : onClose}
              style={{ height: '100%' }}
            >
--- a/src/components/base/Pills/index.js
+++ b/src/components/base/Pills/index.js
@ -29,8 +29,8 @@ const Pill = styled(Tabbable).attrs({
  px: 3,
  fontSize: 4,
  borderRadius: 1,
-  align: 'center',
-  justify: 'center',
+  alignItems: 'center',
+  justifyContent: 'center',
 })`
  height: 28px;
  outline: none;
--- a/src/components/base/Select/index.js
+++ b/src/components/base/Select/index.js
@ -53,7 +53,7 @@ const TriggerBtn = styled(Box).attrs({
 `

 const Item = styled(Box).attrs({
-  align: 'center',
+  alignItems: 'center',
  p: 2,
 })`
  background: ${p => (p.highlighted ? p.theme.colors.cream : p.theme.colors.white)};
@ -79,8 +79,8 @@ const Dropdown = styled(Box).attrs({
 `

 const FloatingTriangles = styled(Box).attrs({
-  align: 'center',
-  justify: 'center',
+  alignItems: 'center',
+  justifyContent: 'center',
  mr: 2,
 })`
  position: absolute;
@ -96,8 +96,8 @@ const FloatingTriangles = styled(Box).attrs({
 const IconSelected = styled(Box).attrs({
  bg: 'blue',
  color: 'white',
-  align: 'center',
-  justify: 'center',
+  alignItems: 'center',
+  justifyContent: 'center',
 })`
  border-radius: 50%;
  height: 15px;
@ -233,7 +233,13 @@ class Select extends PureComponent<Props> {
                  </FloatingTriangles>
                </Box>
              ) : (
-                <TriggerBtn {...getButtonProps()} tabIndex={0} horizontal align="center" flow={2}>
+                <TriggerBtn
+                  {...getButtonProps()}
+                  tabIndex={0}
+                  horizontal
+                  alignItems="center"
+                  flow={2}
+                >
                  <Box grow>
                    {selectedItem && renderSelected ? (
                      renderSelected(selectedItem)
--- a/src/components/base/Tabs/index.js
+++ b/src/components/base/Tabs/index.js
@ -7,11 +7,17 @@ import type { Element } from 'react'

 import Box, { Tabbable } from 'components/base/Box'

+const WrapperTab = styled(Box).attrs({
+  horizontal: true,
+})`
+  border-bottom: 1px solid ${p => p.theme.colors.argile};
+`
+
 const Tab = styled(Tabbable).attrs({
  flex: 1,
  pb: 2,
-  align: 'center',
-  justify: 'center',
+  alignItems: 'center',
+  justifyContent: 'center',
  fontSize: 3,
 })`
  border-bottom: 2px solid transparent;
@ -39,7 +45,7 @@ type Props = {

 const Tabs = ({ items, index, onTabClick }: Props) => (
  <Fragment>
-    <Box horizontal borderBottom borderWidth={1} borderColor="argile">
+    <WrapperTab>
      {items.map((item, i) => (
        <Tab
          key={item.key}
@ -50,7 +56,7 @@ const Tabs = ({ items, index, onTabClick }: Props) => (
          {item.title}
        </Tab>
      ))}
-    </Box>
+    </WrapperTab>
    {items[index] && items[index].render()}
  </Fragment>
 )
--- a/src/components/base/Text/stories.js
+++ b/src/components/base/Text/stories.js
@ -23,7 +23,7 @@ const FontStyles = () => (
    {map(fontFamilies, (weights, fontName) => (
      <Box key={fontName}>
        {map(weights, (_, weight) => (
-          <Box key={weight} horizontal align="center">
+          <Box key={weight} horizontal alignItems="center">
            <Box style={{ width: 200 }}>
              <Text style={{ fontFamily: 'monospace' }} fontSize={3}>
                {fontName} {weight}
--- a/src/components/modals/AddAccount/CreateAccount.js
+++ b/src/components/modals/AddAccount/CreateAccount.js
@ -54,7 +54,7 @@ class CreateAccount extends PureComponent<Props, State> {
              <Label>Account name</Label>
              <Input value={accountName} onChange={this.handleChangeInput} />
            </Box>
-            <Box horizontal justify="flex-end">
+            <Box horizontal justifyContent="flex-end">
              <Button primary type="submit">
                Create
              </Button>
--- a/src/components/modals/AddAccount/ImportAccounts.js
+++ b/src/components/modals/AddAccount/ImportAccounts.js
@ -107,7 +107,7 @@ class ImportAccounts extends PureComponent<Props, State> {
                </Box>
              )
            })}
-            <Box horizontal justify="flex-end">
+            <Box horizontal justifyContent="flex-end">
              <Button primary disabled={!canImportAccounts} type="submit">
                Import
              </Button>
--- a/src/components/modals/AddAccount/RestoreAccounts.js
+++ b/src/components/modals/AddAccount/RestoreAccounts.js
@ -1,6 +1,7 @@
 // @flow

 import React from 'react'
+import styled from 'styled-components'

 import Box from 'components/base/Box'
 import Button from 'components/base/Button'
@ -8,6 +9,10 @@ import Text from 'components/base/Text'

 import type { Accounts } from 'types/common'

+const Container = styled(Box)`
+  border: 1px solid ${p => p.theme.colors.grenade};
+`
+
 type Props = {
  archivedAccounts: Accounts,
  updateAccount: Function,
@ -16,19 +21,19 @@ type Props = {
 function RestoreAccounts(props: Props) {
  const { archivedAccounts, updateAccount } = props
  return (
-    <Box borderWidth={1} borderColor="grenade">
+    <Container>
      <Text fontSize={3} fontWeight="bold">
        {'Restore account'}
      </Text>
      {archivedAccounts.map(account => (
-        <Box key={account.id} horizontal flow={2} align="center">
+        <Box key={account.id} horizontal flow={2} alignItems="center">
          <Text>{account.name}</Text>
          <Button primary onClick={() => updateAccount({ ...account, archived: false })}>
            {'restore'}
          </Button>
        </Box>
      ))}
-    </Box>
+    </Container>
  )
 }

--- a/src/components/modals/AddAccount/index.js
+++ b/src/components/modals/AddAccount/index.js
@ -51,7 +51,7 @@ const Steps = {
            value={currencies.find(c => c.key === props.value.wallet)}
          />
        </Box>
-        <Box horizontal justify="flex-end">
+        <Box horizontal justifyContent="flex-end">
          <Button primary type="submit">
            {props.t('addAccount.title')}
          </Button>
--- a/src/components/modals/Receive.js
+++ b/src/components/modals/Receive.js
@ -87,7 +87,7 @@ class ReceiveModal extends PureComponent<Props, State> {
                    <ReceiveBox amount={amount} address={get(account, 'data.address', '')} />
                  </Fragment>
                )}
-              <Box horizontal justify="center">
+              <Box horizontal justifyContent="center">
                <Button primary onClick={onClose}>
                  Close
                </Button>
--- a/src/components/modals/Send.js
+++ b/src/components/modals/Send.js
@ -45,11 +45,11 @@ const Steps = {
          <Label>Amount</Label>
          <Input onChange={props.onChangeInput('amount')} value={props.value.amount} />
        </Box>
-        <Box horizontal align="center">
+        <Box horizontal alignItems="center">
          <Box grow>
            <Text>Cancel</Text>
          </Box>
-          <Box justify="flex-end">
+          <Box justifyContent="flex-end">
            <Button type="submit" primary disabled={!props.canSubmit}>
              Next
            </Button>
--- a/src/components/modals/SettingsAccount.js
+++ b/src/components/modals/SettingsAccount.js
@ -145,7 +145,7 @@ class SettingsAccount extends PureComponent<Props, State> {
                Account settings
              </Text>
              <Box
-                align="center"
+                alignItems="center"
                flow={2}
                horizontal
                onMouseEnter={this.handleHoveredName(true)}
@ -154,7 +154,7 @@ class SettingsAccount extends PureComponent<Props, State> {
                <Box>
                  {editName ? (
                    <form onSubmit={this.handleSubmitName(account)}>
-                      <Box align="center" horizontal flow={2}>
+                      <Box alignItems="center" horizontal flow={2}>
                        <Box>
                          <Input value={account.name} onChange={this.handleChangeName} />
                        </Box>
@ -179,7 +179,7 @@ class SettingsAccount extends PureComponent<Props, State> {
                    </Box>
                  )}
              </Box>
-              <Box horizontal grow align="flex-end" flow={2}>
+              <Box horizontal grow alignItems="flex-end" flow={2}>
                <Box grow>
                  <Button onClick={this.handleArchiveAccount(account)}>
                    {hasNoTransactions(account) ? 'Remove account' : 'Archive account'}
--- a/yarn.lock
+++ b/yarn.lock
@ -555,25 +555,25 @@ anymatch@^2.0.0:
    micromatch "^3.1.4"
    normalize-path "^2.1.1"

-app-builder-bin-linux@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.1.tgz#4e1bb0f0e7c7b15ed134193edb1797a1fc18a40c"
+app-builder-bin-linux@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.5.tgz#8ef1a839d0614b81e0f11bd593ff533a058d7c5b"

-app-builder-bin-mac@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.1.tgz#329357417ea0919adf094855404f229c5ff5f12f"
+app-builder-bin-mac@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.5.tgz#3a9d3dea92f4fd5cf531a8947571c4c67a10761b"

-app-builder-bin-win@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.1.tgz#a819d0ba9bb3831d69ab43b744a2794686bfc547"
+app-builder-bin-win@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.5.tgz#5d2a3c31e8a54991498f861b5a0cbe0227a91e9c"

-app-builder-bin@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.1.tgz#ba24cb6778c56ba925f282be42aa5dcccc533201"
+app-builder-bin@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.5.tgz#70d6a16a19265cd764747779c84017abc14abce4"
  optionalDependencies:
-    app-builder-bin-linux "1.3.1"
-    app-builder-bin-mac "1.3.1"
-    app-builder-bin-win "1.3.1"
+    app-builder-bin-linux "1.3.5"
+    app-builder-bin-mac "1.3.5"
+    app-builder-bin-win "1.3.5"

 app-root-path@^2.0.0:
  version "2.0.1"
@ -591,8 +591,8 @@ are-we-there-yet@~1.1.2:
    readable-stream "^2.0.6"

 argparse@^1.0.2, argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
  dependencies:
    sprintf-js "~1.0.2"

@ -1787,8 +1787,8 @@ base64-js@1.2.0:
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"

 base64-js@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"

 base@^0.11.1:
  version "0.11.2"
@ -1978,9 +1978,9 @@ braces@^1.8.2:
    preserve "^0.2.0"
    repeat-element "^1.1.2"

-braces@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.0.tgz#a46941cb5fb492156b3d6a656e06c35364e3e66e"
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
  dependencies:
    arr-flatten "^1.1.0"
    array-unique "^0.3.2"
@ -1988,6 +1988,7 @@ braces@^2.3.0:
    extend-shallow "^2.0.1"
    fill-range "^4.0.0"
    isobject "^3.0.1"
+    kind-of "^6.0.2"
    repeat-element "^1.1.2"
    snapdragon "^0.8.1"
    snapdragon-node "^2.0.1"
@ -2098,8 +2099,8 @@ buffer@^4.3.0:
    isarray "^1.0.0"

 buffer@^5.0.3:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.8.tgz#84daa52e7cf2fa8ce4195bc5cf0f7809e0930b24"
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
  dependencies:
    base64-js "^1.0.2"
    ieee754 "^1.1.4"
@ -2117,12 +2118,12 @@ builder-util-runtime@4.0.5, builder-util-runtime@^4.0.5, builder-util-runtime@~4
    fs-extra-p "^4.5.0"
    sax "^1.2.4"

-builder-util@5.2.0, builder-util@^5.1.0, builder-util@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.2.0.tgz#dd5631b1611e60b35c9fa87ab5a266175db0b0a7"
+builder-util@5.3.0, builder-util@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.3.0.tgz#595d553fe7ab69a109cbb463ff82977ff3e66f2e"
  dependencies:
    "7zip-bin" "~3.1.0"
-    app-builder-bin "1.3.1"
+    app-builder-bin "1.3.5"
    bluebird-lst "^1.0.5"
    builder-util-runtime "^4.0.5"
    chalk "^2.3.0"
@ -2149,22 +2150,22 @@ bytes@3.0.0:
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"

 cacache@^10.0.1:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.2.tgz#105a93a162bbedf3a25da42e1939ed99ffb145f8"
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
  dependencies:
-    bluebird "^3.5.0"
+    bluebird "^3.5.1"
    chownr "^1.0.1"
    glob "^7.1.2"
    graceful-fs "^4.1.11"
    lru-cache "^4.1.1"
-    mississippi "^1.3.0"
+    mississippi "^2.0.0"
    mkdirp "^0.5.1"
    move-concurrently "^1.0.1"
    promise-inflight "^1.0.1"
-    rimraf "^2.6.1"
-    ssri "^5.0.0"
+    rimraf "^2.6.2"
+    ssri "^5.2.4"
    unique-filename "^1.1.0"
-    y18n "^3.2.1"
+    y18n "^4.0.0"

 cache-base@^1.0.1:
  version "1.0.1"
@ -2236,12 +2237,12 @@ caniuse-api@^1.5.2:
    lodash.uniq "^4.5.0"

 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000808"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000808.tgz#30dfd83009d5704f02dffb37725068ed12a366bb"
+  version "1.0.30000809"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000809.tgz#b0b88434a598f40b546d46a4dbd839b0ff798f4d"

 caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
-  version "1.0.30000808"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000808.tgz#7d759b5518529ea08b6705a19e70dbf401628ffc"
+  version "1.0.30000809"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000809.tgz#1e12c1344b8f74d56737ee2614bcedb648943479"

 capture-stack-trace@^1.0.0:
  version "1.0.0"
@ -2292,7 +2293,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
    strip-ansi "^3.0.0"
    supports-color "^2.0.0"

-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
  dependencies:
@ -2328,8 +2329,8 @@ chokidar@^1.7.0:
    fsevents "^1.0.0"

 chokidar@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.1.tgz#6e67e9998fe10e8f651e975ca62460456ff8e297"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
  dependencies:
    anymatch "^2.0.0"
    async-each "^1.0.0"
@ -2341,7 +2342,7 @@ chokidar@^2.0.0:
    normalize-path "^2.1.1"
    path-is-absolute "^1.0.0"
    readdirp "^2.0.0"
-    upath "1.0.0"
+    upath "^1.0.0"
  optionalDependencies:
    fsevents "^1.0.0"

@ -2567,19 +2568,19 @@ component-emitter@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"

-compressible@~2.0.11:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66"
+compressible@~2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
  dependencies:
-    mime-db ">= 1.30.0 < 2"
+    mime-db ">= 1.33.0 < 2"

 compression@^1.5.2:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69"
  dependencies:
    accepts "~1.3.4"
    bytes "3.0.0"
-    compressible "~2.0.11"
+    compressible "~2.0.13"
    debug "2.6.9"
    on-headers "~1.0.1"
    safe-buffer "5.1.1"
@ -2885,8 +2886,8 @@ css-selector-tokenizer@^0.7.0:
    regexpu-core "^1.0.0"

 css-to-react-native@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.1.1.tgz#ea0f6ca3cdbc37cb40f3f4f55b49d3bb28b8a43e"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.1.2.tgz#c06d628467ef961c85ec358a90f3c87469fb0095"
  dependencies:
    css-color-keywords "^1.0.0"
    fbjs "^0.8.5"
@ -3093,6 +3094,13 @@ define-property@^1.0.0:
  dependencies:
    is-descriptor "^1.0.0"

+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@ -3177,13 +3185,13 @@ dijkstrajs@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"

-dmg-builder@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.0.2.tgz#0ca90a6fbd8e92dbcc15889f8950d6080534af5a"
+dmg-builder@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.0.tgz#40b6ce05b59a3baebd69680a1f2875b1ff475e24"
  dependencies:
    bluebird-lst "^1.0.5"
-    builder-util "^5.2.0"
-    electron-builder-lib "~20.0.4"
+    builder-util "^5.3.0"
+    electron-builder-lib "~20.0.5"
    fs-extra-p "^4.5.0"
    iconv-lite "^0.4.19"
    js-yaml "^3.10.0"
@ -3334,21 +3342,21 @@ ejs@^2.5.7:
  version "2.5.7"
  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"

-electron-builder-lib@20.0.4, electron-builder-lib@~20.0.4:
-  version "20.0.4"
-  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.0.4.tgz#8f27786f03153591b9d051c2bae81d02a3365752"
+electron-builder-lib@20.0.5:
+  version "20.0.5"
+  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.0.5.tgz#dd1e673eae548fe6c2f73bd066be5d68469c4e19"
  dependencies:
    "7zip-bin" "~3.1.0"
-    app-builder-bin "1.3.1"
+    app-builder-bin "1.3.5"
    async-exit-hook "^2.0.1"
    bluebird-lst "^1.0.5"
-    builder-util "5.2.0"
+    builder-util "5.3.0"
    builder-util-runtime "4.0.5"
    chromium-pickle-js "^0.2.0"
    debug "^3.1.0"
    ejs "^2.5.7"
    electron-osx-sign "0.4.8"
-    electron-publish "20.0.2"
+    electron-publish "20.0.5"
    fs-extra-p "^4.5.0"
    hosted-git-info "^2.5.0"
    is-ci "^1.1.0"
@ -3363,16 +3371,45 @@ electron-builder-lib@20.0.4, electron-builder-lib@~20.0.4:
    semver "^5.5.0"
    temp-file "^3.1.1"

-electron-builder@^20.0.4:
-  version "20.0.4"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.0.4.tgz#6c14baba7807c4053a346cefbe2f505d4cf48a15"
+electron-builder-lib@~20.0.5:
+  version "20.0.6"
+  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.0.6.tgz#1484108626312026cf5c2188aefe0c33f40bad81"
+  dependencies:
+    "7zip-bin" "~3.1.0"
+    app-builder-bin "1.3.5"
+    async-exit-hook "^2.0.1"
+    bluebird-lst "^1.0.5"
+    builder-util "5.3.0"
+    builder-util-runtime "4.0.5"
+    chromium-pickle-js "^0.2.0"
+    debug "^3.1.0"
+    ejs "^2.5.7"
+    electron-osx-sign "0.4.8"
+    electron-publish "20.0.6"
+    fs-extra-p "^4.5.2"
+    hosted-git-info "^2.5.0"
+    is-ci "^1.1.0"
+    isbinaryfile "^3.0.2"
+    js-yaml "^3.10.0"
+    lazy-val "^1.0.3"
+    minimatch "^3.0.4"
+    normalize-package-data "^2.4.0"
+    plist "^2.1.0"
+    read-config-file "3.0.0"
+    sanitize-filename "^1.6.1"
+    semver "^5.5.0"
+    temp-file "^3.1.1"
+
+electron-builder@^20.0.5:
+  version "20.0.5"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.0.5.tgz#17a0fae426f19fdbf71efba7c06d9ea29e077382"
  dependencies:
    bluebird-lst "^1.0.5"
-    builder-util "5.2.0"
+    builder-util "5.3.0"
    builder-util-runtime "4.0.5"
    chalk "^2.3.0"
-    dmg-builder "4.0.2"
-    electron-builder-lib "20.0.4"
+    dmg-builder "4.1.0"
+    electron-builder-lib "20.0.5"
    electron-download-tf "4.3.4"
    fs-extra-p "^4.5.0"
    is-ci "^1.1.0"
@ -3434,17 +3471,29 @@ electron-osx-sign@0.4.8:
    minimist "^1.2.0"
    plist "^2.1.0"

-electron-publish@20.0.2:
-  version "20.0.2"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.0.2.tgz#6ac7ca3f55d01867c1e4159bff231583d9102000"
+electron-publish@20.0.5:
+  version "20.0.5"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.0.5.tgz#e2f37d86ee641e56ac3c04ecb88774a157b3764e"
  dependencies:
    bluebird-lst "^1.0.5"
-    builder-util "^5.1.0"
+    builder-util "^5.3.0"
    builder-util-runtime "^4.0.5"
    chalk "^2.3.0"
    fs-extra-p "^4.5.0"
    mime "^2.2.0"

+electron-publish@20.0.6:
+  version "20.0.6"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.0.6.tgz#24a3c508428eea31813e064f80468f626dff1d87"
+  dependencies:
+    bluebird-lst "^1.0.5"
+    builder-util "^5.3.0"
+    builder-util-runtime "^4.0.5"
+    chalk "^2.3.0"
+    fs-extra-p "^4.5.2"
+    lazy-val "^1.0.3"
+    mime "^2.2.0"
+
 electron-rebuild@^1.7.3:
  version "1.7.3"
  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.7.3.tgz#24ae06ad9dd61cb7e4d688961f49118c40a110eb"
@ -3592,8 +3641,8 @@ env-paths@^1.0.0:
  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"

 errno@^0.1.3, errno@^0.1.4:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
  dependencies:
    prr "~1.0.1"

@ -3622,8 +3671,8 @@ es-to-primitive@^1.1.1:
    is-symbol "^1.0.1"

 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.38"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3"
+  version "0.10.39"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87"
  dependencies:
    es6-iterator "~2.0.3"
    es6-symbol "~3.1.1"
@ -3748,9 +3797,9 @@ eslint-module-utils@^2.1.1:
    debug "^2.6.8"
    pkg-dir "^1.0.0"

-eslint-plugin-flowtype@^2.44.0:
-  version "2.44.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.44.0.tgz#c0610d0018801e1fbe1eaec1c2174de1338ab4ee"
+eslint-plugin-flowtype@^2.45.0:
+  version "2.45.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.45.0.tgz#20d8b15d1e1e71ea4e9498e8be3fc62c0752fcbf"
  dependencies:
    lodash "^4.15.0"

@ -3805,9 +3854,9 @@ eslint-visitor-keys@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"

-eslint@^4.17.0:
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.17.0.tgz#dc24bb51ede48df629be7031c71d9dc0ee4f3ddf"
+eslint@^4.18.0:
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.0.tgz#ebd0ba795af6dc59aa5cee17938160af5950e051"
  dependencies:
    ajv "^5.3.0"
    babel-code-frame "^6.22.0"
@ -4020,7 +4069,7 @@ extend-shallow@^2.0.1:
  dependencies:
    is-extendable "^0.1.0"

-extend-shallow@^3.0.0:
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
  dependencies:
@ -4045,7 +4094,7 @@ extglob@^0.3.1:
  dependencies:
    is-extglob "^1.0.0"

-extglob@^2.0.2:
+extglob@^2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
  dependencies:
@ -4241,9 +4290,9 @@ flatten@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"

-flow-bin@^0.65.0:
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.65.0.tgz#64ffeca27211c786e2d68508c65686ba1b8a2169"
+flow-bin@^0.66.0:
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.66.0.tgz#a96dde7015dc3343fd552a7b4963c02be705ca26"

 flow-typed@^2.3.0:
  version "2.3.0"
@ -4333,9 +4382,9 @@ from2@^2.1.0:
    inherits "^2.0.1"
    readable-stream "^2.0.0"

-fs-extra-p@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.0.tgz#b79f3f3fcc0b5e57b7e7caeb06159f958ef15fe8"
+fs-extra-p@^4.5.0, fs-extra-p@^4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.2.tgz#0a22aba489284d17f375d5dc5139aa777fe2df51"
  dependencies:
    bluebird-lst "^1.0.5"
    fs-extra "^5.0.0"
@ -4504,8 +4553,8 @@ glamor@^2.20.40:
    through "^2.3.8"

 glamorous@^4.11.2:
-  version "4.11.4"
-  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.11.4.tgz#61b333e1ec552abbe48e2fea48fea89fc0026149"
+  version "4.11.6"
+  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.11.6.tgz#337d9ec370ef3fa7cd0cd8f9f1c058fa3c55a424"
  dependencies:
    brcast "^3.0.0"
    fast-memoize "^2.2.7"
@ -4809,17 +4858,21 @@ hoek@2.x.x:
  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"

 hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"

 hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"

-hoist-non-react-statics@2.3.1, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1:
+hoist-non-react-statics@2.3.1:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"

+hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
+
 home-or-tmp@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@ -4985,9 +5038,9 @@ i18next-node-fs-backend@^1.0.0:
    js-yaml "3.5.4"
    json5 "0.5.0"

-i18next@^10.2.2:
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-10.3.0.tgz#6866d14f6ae7b3629921f78bc028d04914f0654c"
+i18next@^10.4.1:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-10.4.1.tgz#90b0ac1683b0a5874a38588c6aaf1831360b460f"

 iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.19, iconv-lite@~0.4.13:
  version "0.4.19"
@ -5210,7 +5263,7 @@ is-descriptor@^0.1.0:
    is-data-descriptor "^0.1.4"
    kind-of "^5.0.0"

-is-descriptor@^1.0.0:
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
  dependencies:
@ -5315,6 +5368,10 @@ is-number@^3.0.0:
  dependencies:
    kind-of "^3.0.2"

+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0, is-obj@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@ -5329,11 +5386,11 @@ is-observable@^0.2.0:
  dependencies:
    symbol-observable "^0.2.2"

-is-odd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
  dependencies:
-    is-number "^3.0.0"
+    is-number "^4.0.0"

 is-path-cwd@^1.0.0:
  version "1.0.0"
@ -5417,7 +5474,7 @@ is-utf8@^0.2.0:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"

-is-windows@^1.0.0:
+is-windows@^1.0.0, is-windows@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"

@ -5600,9 +5657,9 @@ jsprim@^1.2.2:
    json-schema "0.2.3"
    verror "1.10.0"

-"jsqr@https://github.com/cozmo/jsQR.git":
+"jsqr@git+https://github.com/cozmo/jsQR.git":
  version "1.0.1"
-  resolved "https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70"
+  resolved "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70"

 jsx-ast-utils@^2.0.0, jsx-ast-utils@^2.0.1:
  version "2.0.1"
@ -5630,7 +5687,7 @@ kind-of@^4.0.0:
  dependencies:
    is-buffer "^1.1.5"

-kind-of@^5.0.0, kind-of@^5.0.2:
+kind-of@^5.0.0:
  version "5.1.0"
  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"

@ -5672,7 +5729,7 @@ lcid@^1.0.0:

 ledger-test-library@KhalilBellakrid/ledger-test-library:
  version "1.0.0"
-  resolved "https://codeload.github.com/KhalilBellakrid/ledger-test-library/tar.gz/9763ce5d2f284f8f2dc404e3d04cb3f2b38ea8ef"
+  resolved "https://codeload.github.com/KhalilBellakrid/ledger-test-library/tar.gz/250c9fc992f498360f6396d4ed3ea1bb7637d863"
  dependencies:
    axios "^0.17.1"
    bindings "^1.3.0"
@ -5690,9 +5747,9 @@ levn@^0.3.0, levn@~0.3.0:
    prelude-ls "~1.1.2"
    type-check "~0.3.2"

-lint-staged@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.1.0.tgz#28f600c10a6cbd249ceb003118a1552e53544a93"
+lint-staged@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.1.1.tgz#cd08c4d9b8ccc2d37198d1c47ce77d22be6cf324"
  dependencies:
    app-root-path "^2.0.0"
    chalk "^2.1.0"
@ -5712,7 +5769,7 @@ lint-staged@^6.1.0:
    p-map "^1.1.1"
    path-is-inside "^1.0.2"
    pify "^3.0.0"
-    staged-git-files "0.0.4"
+    staged-git-files "1.0.0"
    stringify-object "^3.2.0"

 listr-silent-renderer@^1.1.1:
@ -5810,7 +5867,7 @@ locate-path@^2.0.0:
    p-locate "^2.0.0"
    path-exists "^3.0.0"

-lodash-es@^4.17.4, lodash-es@^4.2.0, lodash-es@^4.2.1:
+lodash-es@^4.17.4, lodash-es@^4.17.5, lodash-es@^4.2.1:
  version "4.17.5"
  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.5.tgz#9fc6e737b1c4d151d8f9cae2247305d552ce748f"

@ -5834,6 +5891,10 @@ lodash.debounce@^4.0.8:
  version "4.0.8"
  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"

+lodash.endswith@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
+
 lodash.flattendeep@^4.4.0:
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@ -5850,10 +5911,18 @@ lodash.isequal@^4.5.0:
  version "4.5.0"
  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"

+lodash.isfunction@^3.0.8:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
+
 lodash.isplainobject@^4.0.6:
  version "4.0.6"
  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"

+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+
 lodash.keys@^3.1.2:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@ -5878,11 +5947,15 @@ lodash.sortby@^4.7.0:
  version "4.7.0"
  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"

+lodash.startswith@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.startswith/-/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
+
 lodash.uniq@^4.5.0:
  version "4.5.0"
  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"

-lodash@3.x, lodash@^3.10.1:
+lodash@^3.10.1:
  version "3.10.1"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

@ -5950,14 +6023,14 @@ macaddress@^0.2.8:
  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"

 make-dir@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
  dependencies:
    pify "^3.0.0"

 make-error@^1.3.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.3.tgz#a97ae14ffd98b05f543e83ddc395e1b2b6e4cc6a"
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"

 map-cache@^0.2.2:
  version "0.2.2"
@ -5981,8 +6054,8 @@ markdown-loader@^2.0.1:
    marked "^0.3.9"

 marked@^0.3.9:
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519"
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.15.tgz#de96982e54c880962f5093a2fa93d0866bf73668"

 "match-stream@>= 0.0.2 < 1":
  version "0.0.2"
@ -6077,18 +6150,18 @@ micromatch@^2.1.5, micromatch@^2.3.11:
    regex-cache "^0.4.2"

 micromatch@^3.1.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.6.tgz#8d7c043b48156f408ca07a4715182b79b99420bf"
  dependencies:
    arr-diff "^4.0.0"
    array-unique "^0.3.2"
-    braces "^2.3.0"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
-    extglob "^2.0.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
    fragment-cache "^0.2.1"
-    kind-of "^6.0.0"
-    nanomatch "^1.2.5"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
    object.pick "^1.3.0"
    regex-not "^1.0.0"
    snapdragon "^0.8.1"
@ -6101,19 +6174,15 @@ miller-rabin@^4.0.0:
    bn.js "^4.0.0"
    brorand "^1.0.1"

-"mime-db@>= 1.30.0 < 2":
-  version "1.32.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414"
+"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"

-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+mime-types@^2.1.12, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
  dependencies:
-    mime-db "~1.30.0"
+    mime-db "~1.33.0"

 mime@1.4.1:
  version "1.4.1"
@ -6163,9 +6232,9 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

-mississippi@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e"
+mississippi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
  dependencies:
    concat-stream "^1.5.0"
    duplexify "^3.4.2"
@ -6173,7 +6242,7 @@ mississippi@^1.3.0:
    flush-write-stream "^1.0.0"
    from2 "^2.1.0"
    parallel-transform "^1.1.0"
-    pump "^1.0.0"
+    pump "^2.0.1"
    pumpify "^1.3.3"
    stream-each "^1.1.0"
    through2 "^2.0.0"
@ -6235,17 +6304,18 @@ nan@^2.3.0, nan@^2.6.2:
  version "2.8.0"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"

-nanomatch@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
  dependencies:
    arr-diff "^4.0.0"
    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
    fragment-cache "^0.2.1"
-    is-odd "^1.0.0"
-    kind-of "^5.0.2"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
    object.pick "^1.3.0"
    regex-not "^1.0.0"
    snapdragon "^0.8.1"
@ -6657,20 +6727,13 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"

-osenv@0:
+osenv@0, osenv@^0.1.4:
  version "0.1.5"
  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
  dependencies:
    os-homedir "^1.0.0"
    os-tmpdir "^1.0.0"

-osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 "over@>= 0.0.5 < 1":
  version "0.0.5"
  resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708"
@ -6911,8 +6974,8 @@ pluralize@^7.0.0:
  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"

 pngjs@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.1.tgz#8e14e6679ee7424b544334c3b2d21cea6d8c209a"
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.2.tgz#097c3c2a75feb223eadddea6bc9f0050cf830bc3"

 podda@^1.2.2:
  version "1.2.2"
@ -7210,12 +7273,12 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
    supports-color "^3.2.3"

 postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.17:
-  version "6.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.17.tgz#e259a051ca513f81e9afd0c21f7f82eda50c65c5"
+  version "6.0.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
  dependencies:
-    chalk "^2.3.0"
+    chalk "^2.3.1"
    source-map "^0.6.1"
-    supports-color "^5.1.0"
+    supports-color "^5.2.0"

 prebuild-install@^2.2.2:
  version "2.5.1"
@ -7479,8 +7542,8 @@ randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
    safe-buffer "^5.1.0"

 randomfill@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
  dependencies:
    randombytes "^2.0.5"
    safe-buffer "^5.1.0"
@ -7541,8 +7604,8 @@ react-datetime@^2.11.1:
    react-onclickoutside "^6.5.0"

 react-docgen@^2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-2.20.0.tgz#41a6da483a34a4aaed041a9909f5e61864d681cb"
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-2.20.1.tgz#29c3a1216066f513958abb1a43678860bbd51c7f"
  dependencies:
    async "^2.1.4"
    babel-runtime "^6.9.2"
@ -7571,12 +7634,12 @@ react-fuzzy@^0.5.1:
    prop-types "^15.5.9"

 react-hot-loader@^4.0.0-beta.21:
-  version "4.0.0-beta.22"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.0.0-beta.22.tgz#a0596395dc46c416c52ea9c7565bd2e8ff3ca964"
+  version "4.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.0.0-rc.0.tgz#54d931dafeface5119c741d44ccc3e75fbb432e8"
  dependencies:
    fast-levenshtein "^2.0.6"
    global "^4.3.0"
-    hoist-non-react-statics "^2.3.1"
+    hoist-non-react-statics "^2.5.0"
    prop-types "^15.6.0"
    shallowequal "^1.0.2"

@ -7612,8 +7675,8 @@ react-inspector@^2.2.2:
    is-dom "^1.0.9"

 react-modal@^3.1.10:
-  version "3.1.13"
-  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.13.tgz#9b27e7774e6ecdc255f489487f518eb4361716ab"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.2.1.tgz#fa8f76aed55b67c22dcf1a1c15b05c8d11f18afe"
  dependencies:
    exenv "^1.2.0"
    prop-types "^15.5.10"
@ -7654,16 +7717,16 @@ react-qr-reader@^2.0.1:
    prop-types "^15.5.8"
    webrtc-adapter "^5.0.6"

-react-redux@^5.0.5, react-redux@^5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.6.tgz#23ed3a4f986359d68b5212eaaa681e60d6574946"
+react-redux@^5.0.5, react-redux@^5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
  dependencies:
-    hoist-non-react-statics "^2.2.1"
+    hoist-non-react-statics "^2.5.0"
    invariant "^2.0.0"
-    lodash "^4.2.0"
-    lodash-es "^4.2.0"
+    lodash "^4.17.5"
+    lodash-es "^4.17.5"
    loose-envify "^1.1.0"
-    prop-types "^15.5.10"
+    prop-types "^15.6.0"

 react-resize-detector@1.1.0:
  version "1.1.0"
@ -8695,9 +8758,9 @@ sshpk@^1.7.0:
    jsbn "~0.1.0"
    tweetnacl "~0.14.0"

-ssri@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.2.1.tgz#8b6eb873688759bd3c75a88dee74593d179bb73c"
+ssri@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.2.4.tgz#9985e14041e65fc397af96542be35724ac11da52"
  dependencies:
    safe-buffer "^5.1.1"

@ -8705,9 +8768,9 @@ stack-trace@0.0.9:
  version "0.0.9"
  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.9.tgz#a8f6eaeca90674c333e7c43953f275b451510695"

-staged-git-files@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35"
+staged-git-files@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.0.0.tgz#cdb847837c1fcc52c08a872d4883cc0877668a80"

 stat-mode@^0.2.2:
  version "0.2.2"
@ -8873,8 +8936,8 @@ style-loader@^0.19.1:
    schema-utils "^0.3.0"

 style-loader@^0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.1.tgz#33ac2bf4d5c65a8906bc586ad253334c246998d0"
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.2.tgz#851b373c187890331776e9cde359eea9c95ecd00"
  dependencies:
    loader-utils "^1.1.0"
    schema-utils "^0.4.3"
@ -8893,9 +8956,9 @@ styled-components@^3.1.6:
    stylis-rule-sheet "^0.0.7"
    supports-color "^3.2.3"

-styled-system@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-1.1.7.tgz#b9b6906aaec41b9c79f40780e07dc39b81fe93fb"
+styled-system@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-2.1.0.tgz#dd5a8f863c962e0aaf054443f05b6d7aa0b4dc31"
  dependencies:
    prop-types "^15.6.0"

@ -8904,8 +8967,8 @@ stylis-rule-sheet@^0.0.7:
  resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.7.tgz#5c51dc879141a61821c2094ba91d2cbcf2469c6c"

 stylis@^3.0.0, stylis@^3.4.0:
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.4.8.tgz#94380babbcd4c75726215794ca985b38ec96d1a3"
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.4.10.tgz#a135cab4b9ff208e327fbb5a6fde3fa991c638ee"

 sumchecker@^1.2.0:
  version "1.3.1"
@ -9187,11 +9250,11 @@ type-check@~0.3.2:
    prelude-ls "~1.1.2"

 type-is@~1.6.15:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
  dependencies:
    media-typer "0.3.0"
-    mime-types "~2.1.15"
+    mime-types "~2.1.18"

 typedarray@^0.0.6:
  version "0.0.6"
@ -9213,8 +9276,8 @@ uglify-es@^3.3.4:
    source-map "~0.6.1"

 uglify-js@3.3.x:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.10.tgz#8e47821d4cf28e14c1826a0078ba0825ed094da8"
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.11.tgz#e9d058b20715138bb4e8e5cae2ea581686bdaae3"
  dependencies:
    commander "~2.14.1"
    source-map "~0.6.1"
@ -9241,8 +9304,8 @@ uglifyjs-webpack-plugin@^0.4.6:
    webpack-sources "^1.0.1"

 uglifyjs-webpack-plugin@^1.1.6:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.8.tgz#1302fb9471a7daf3d0a5174da6d65f0f415e75ad"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.0.tgz#f706fa4c655000a086b4a97c7d835ed0f6e9b0ef"
  dependencies:
    cacache "^10.0.1"
    find-cache-dir "^1.0.0"
@ -9257,10 +9320,6 @@ uid-number@^0.0.6:
  version "0.0.6"
  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"

-underscore.string@2.3.x:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.3.3.tgz#71c08bf6b428b1133f37e78fa3a21c82f7329b0d"
-
 union-value@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@ -9332,12 +9391,14 @@ unzip@^0.1.11:
    readable-stream "~1.0.31"
    setimmediate ">= 1.0.1 < 2"

-upath@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.0.tgz#b4706b9461ca8473adf89133d235689ca17f3656"
+upath@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.2.tgz#80aaae5395abc5fd402933ae2f58694f0860204c"
  dependencies:
-    lodash "3.x"
-    underscore.string "2.3.x"
+    lodash.endswith "^4.2.1"
+    lodash.isfunction "^3.0.8"
+    lodash.isstring "^4.0.1"
+    lodash.startswith "^4.2.1"

 update-notifier@^2.3.0:
  version "2.3.0"
@ -9779,6 +9840,10 @@ y18n@^3.2.1:
  version "3.2.1"
  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"

+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
 yallist@^2.1.2:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"