Implement optimistic update on Operation & bugfixes

package.json

@@ -42,7 +42,7 @@
     "@ledgerhq/hw-transport": "^4.12.0",
     "@ledgerhq/hw-transport-node-hid": "^4.12.0",
     "@ledgerhq/ledger-core": "^1.2.0",
-    "@ledgerhq/live-common": "2.8.0-beta.2",
+    "@ledgerhq/live-common": "^2.8.1",
     "axios": "^0.18.0",
     "babel-runtime": "^6.26.0",
     "bcryptjs": "^2.4.3",

src/api/Ethereum.js

@@ -1,7 +1,7 @@
 // @flow
 import axios from 'axios'
 import type { CryptoCurrency } from '@ledgerhq/live-common/lib/types'
-import { blockchainBaseURL } from './Ledger'
+import { blockchainBaseURL, userFriendlyError } from './Ledger'
 
 export type Block = { height: number } // TODO more fields actually
 export type Tx = {
@@ -34,7 +34,7 @@ export type API = {
     txs: Tx[],
   }>,
   getCurrentBlock: () => Promise<Block>,
-  getAccountNonce: (address: string) => Promise<string>,
+  getAccountNonce: (address: string) => Promise<number>,
   broadcastTransaction: (signedTransaction: string) => Promise<string>,
   getAccountBalance: (address: string) => Promise<number>,
 }
@@ -44,25 +44,27 @@ export const apiForCurrency = (currency: CryptoCurrency): API => {
 
   return {
     async getTransactions(address, blockHash) {
-      const { data } = await axios.get(`${baseURL}/addresses/${address}/transactions`, {
-        params: { blockHash, noToken: 1 },
-      })
+      const { data } = await userFriendlyError(
+        axios.get(`${baseURL}/addresses/${address}/transactions`, {
+          params: { blockHash, noToken: 1 },
+        }),
+      )
       return data
     },
     async getCurrentBlock() {
-      const { data } = await axios.get(`${baseURL}/blocks/current`)
+      const { data } = await userFriendlyError(axios.get(`${baseURL}/blocks/current`))
       return data
     },
     async getAccountNonce(address) {
-      const { data } = await axios.get(`${baseURL}/addresses/${address}/nonce`)
+      const { data } = await userFriendlyError(axios.get(`${baseURL}/addresses/${address}/nonce`))
       return data[0].nonce
     },
     async broadcastTransaction(tx) {
-      const { data } = await axios.post(`${baseURL}/transactions/send`, { tx })
+      const { data } = await userFriendlyError(axios.post(`${baseURL}/transactions/send`, { tx }))
       return data.result
     },
     async getAccountBalance(address) {
-      const { data } = await axios.get(`${baseURL}/addresses/${address}/balance`)
+      const { data } = await userFriendlyError(axios.get(`${baseURL}/addresses/${address}/balance`))
       return data[0].balance
     },
   }

src/api/Fees.js

@@ -1,14 +1,14 @@
 // @flow
 import axios from 'axios'
 import type { Currency } from '@ledgerhq/live-common/lib/types'
-import { blockchainBaseURL } from './Ledger'
+import { blockchainBaseURL, userFriendlyError } from './Ledger'
 
 export type Fees = {
   [_: string]: number,
 }
 
 export const getEstimatedFees = async (currency: Currency): Promise<Fees> => {
-  const { data, status } = await axios.get(`${blockchainBaseURL(currency)}/fees`)
+  const { data, status } = await userFriendlyError(axios.get(`${blockchainBaseURL(currency)}/fees`))
   if (data) {
     return data
   }

src/api/Ledger.js

@@ -14,5 +14,39 @@ export const currencyToFeeTicker = (currency: Currency) => {
   return mapping[currency.id] || tickerLowerCase
 }
 
+export const userFriendlyError = <A>(p: Promise<A>): Promise<A> =>
+  p.catch(error => {
+    if (error.response) {
+      // The request was made and the server responded with a status code
+      // that falls out of the range of 2xx
+      const { data } = error.response
+      if (data && typeof data.error === 'string') {
+        const msg = data.error || data.message
+        if (typeof msg === 'string') {
+          const m = msg.match(/^JsDefined\((.*)\)$/)
+          if (m) {
+            try {
+              const { message } = JSON.parse(m[1])
+              if (typeof message === 'string') {
+                throw new Error(message)
+              }
+            } catch (e) {
+              console.log(e)
+            }
+          }
+          throw new Error(msg)
+        }
+      }
+      console.log('Ledger API: HTTP status', error.response.status, 'data: ', error.response.data)
+      throw new Error('A problem occurred with Ledger Servers. Please try again later.')
+    } else if (error.request) {
+      // The request was made but no response was received
+      // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+      // http.ClientRequest in node.js
+      throw new Error('Your network is down. Please try again later.')
+    }
+    throw error
+  })
+
 export const blockchainBaseURL = (currency: Currency) =>
   `${BASE_URL}blockchain/v2/${currencyToFeeTicker(currency)}`

src/bridge/EthereumJSBridge.js

@@ -2,6 +2,7 @@
 import React from 'react'
 import EthereumKind from 'components/FeesField/EthereumKind'
 import throttle from 'lodash/throttle'
+import uniqBy from 'lodash/uniqBy'
 import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 import { apiForCurrency } from 'api/Ethereum'
 import type { Tx } from 'api/Ethereum'
@@ -29,7 +30,7 @@ const toAccountOperation = (account: Account) => (tx: Tx): $Exact<Operation> =>
   const receiving = account.freshAddress.toLowerCase() === tx.to.toLowerCase()
   const type = sending && receiving ? 'SELF' : sending ? 'OUT' : 'IN'
   return {
-    id: tx.hash,
+    id: `${account.id}-${tx.hash}-${type}`,
     hash: tx.hash,
     type,
     value: tx.value,
@@ -47,9 +48,9 @@ function isRecipientValid(currency, recipient) {
 }
 
 function mergeOps(existing: Operation[], newFetched: Operation[]) {
-  const ids = existing.map(o => o.id)
-  const all = existing.concat(newFetched.filter(o => !ids.includes(o.id)))
-  return all.sort((a, b) => a.date - b.date)
+  const ids = newFetched.map(o => o.id)
+  const all = newFetched.concat(existing.filter(o => !ids.includes(o.id)))
+  return uniqBy(all.sort((a, b) => a.date - b.date), 'id')
 }
 
 const paginateMoreTransactions = async (
@@ -66,7 +67,7 @@ const paginateMoreTransactions = async (
 }
 
 const fetchCurrentBlock = (perCurrencyId => currency => {
-  if (perCurrencyId[currency.id]) return perCurrencyId[currency.id]
+  if (perCurrencyId[currency.id]) return perCurrencyId[currency.id]()
   const api = apiForCurrency(currency)
   const f = throttle(
     () =>
@@ -77,7 +78,7 @@ const fetchCurrentBlock = (perCurrencyId => currency => {
     5000,
   )
   perCurrencyId[currency.id] = f
-  return f
+  return f()
 })({})
 
 const EthereumBridge: WalletBridge<Transaction> = {
@@ -113,7 +114,6 @@ const EthereumBridge: WalletBridge<Transaction> = {
         if (isStandard) {
           if (newAccountCount === 0) {
             // first zero account will emit one account as opportunity to create a new account..
-            const currentBlock = await fetchCurrentBlock(currency)
             const accountId = `${currency.id}_${address}`
             const account: $Exact<Account> = {
               id: accountId,
@@ -158,7 +158,7 @@ const EthereumBridge: WalletBridge<Transaction> = {
         unit: currency.units[0],
         lastSyncDate: new Date(),
       }
-      account.operations = txs.map(toAccountOperation(account))
+      account.operations = mergeOps([], txs.map(toAccountOperation(account)))
       return { account }
     }
 
@@ -205,6 +205,8 @@ const EthereumBridge: WalletBridge<Transaction> = {
           if (unsubscribed) return
           const { txs } = await api.getTransactions(freshAddress)
           if (unsubscribed) return
+          const nonce = await api.getAccountNonce(freshAddress)
+          if (unsubscribed) return
           next(a => {
             const currentOps = a.operations
             const newOps = txs.map(toAccountOperation(a))
@@ -219,8 +221,15 @@ const EthereumBridge: WalletBridge<Transaction> = {
               return a
             }
             const operations = mergeOps(currentOps, newOps)
+            const pendingOperations = a.pendingOperations.filter(
+              o =>
+                o.transactionSequenceNumber &&
+                o.transactionSequenceNumber >= nonce &&
+                !operations.some(op => o.hash === op.hash),
+            )
             return {
               ...a,
+              pendingOperations,
               operations,
               balance,
               blockHeight: block.height,
@@ -234,6 +243,7 @@ const EthereumBridge: WalletBridge<Transaction> = {
       }
     }
     main()
+
     return {
       unsubscribe() {
         unsubscribed = true
@@ -291,10 +301,31 @@ const EthereumBridge: WalletBridge<Transaction> = {
       })
       .toPromise()
 
-    const result = await api.broadcastTransaction(transaction)
+    const hash = await api.broadcastTransaction(transaction)
 
-    return result
+    return {
+      id: `${a.id}-${hash}-OUT`,
+      hash,
+      type: 'OUT',
+      value: t.amount,
+      blockHeight: null,
+      blockHash: null,
+      accountId: a.id,
+      senders: [a.freshAddress],
+      recipients: [t.recipient],
+      transactionSequenceNumber: nonce,
+      date: new Date(),
+    }
   },
+
+  addPendingOperation: (account, operation) => ({
+    ...account,
+    pendingOperations: [operation].concat(
+      account.pendingOperations.filter(
+        o => o.transactionSequenceNumber === operation.transactionSequenceNumber,
+      ),
+    ),
+  }),
 }
 
 export default EthereumBridge

src/bridge/LibcoreBridge.js

@@ -44,7 +44,16 @@ const LibcoreBridge: WalletBridge<Transaction> = {
       switch (msg.type) {
         case 'account.sync.progress': {
           next(a => a)
-          // use next(), to actually emit account updates.....
+          // FIXME TODO: use next(), to actually emit account updates.....
+          // - need to sync the balance
+          // - need to sync block height & block hash
+          // - need to sync operations.
+          // - once all that, need to set lastSyncDate to new Date()
+
+          // - when you implement addPendingOperation you also here need to:
+          //   - if there were pendingOperations that are now in operations, remove them as well.
+          //   - if there are pendingOperations that is older than a threshold (that depends on blockchain speed typically)
+          //     then we probably should trash them out? it's a complex question for UI
           break
         }
         case 'account.sync.fail': {

src/bridge/RippleJSBridge.js

@@ -119,6 +119,7 @@ type Tx = {
 
 const txToOperation = (account: Account) => ({
   id,
+  sequence,
   outcome: { deliveredAmount, ledgerVersion, timestamp },
   specification: { source, destination },
 }: Tx): Operation => {
@@ -135,6 +136,7 @@ const txToOperation = (account: Account) => ({
     senders: [source.address],
     recipients: [destination.address],
     date: new Date(timestamp),
+    transactionSequenceNumber: sequence,
   }
   return op
 }
@@ -299,9 +301,18 @@ const RippleJSBridge: WalletBridge<Transaction> = {
         next(a => {
           const newOps = transactions.map(txToOperation(a))
           const operations = mergeOps(a.operations, newOps)
+          const [last] = operations
+          const pendingOperations = a.pendingOperations.filter(
+            o =>
+              last &&
+              last.transactionSequenceNumber &&
+              o.transactionSequenceNumber &&
+              o.transactionSequenceNumber > last.transactionSequenceNumber,
+          )
           return {
             ...a,
             operations,
+            pendingOperations,
             blockHeight: maxLedgerVersion,
             lastSyncDate: new Date(),
           }
@@ -394,11 +405,37 @@ const RippleJSBridge: WalletBridge<Transaction> = {
         throw new Error(submittedPayment.resultMessage)
       }
 
-      return computeBinaryTransactionHash(transaction)
+      const hash = computeBinaryTransactionHash(transaction)
+
+      return {
+        id: `${a.id}-${hash}-OUT`,
+        hash,
+        accountId: a.id,
+        type: 'OUT',
+        value: t.amount,
+        blockHash: null,
+        blockHeight: null,
+        senders: [a.freshAddress],
+        recipients: [t.recipient],
+        date: new Date(),
+        // we probably can't get it so it's a predictive value
+        transactionSequenceNumber:
+          (a.operations.length > 0 ? a.operations[0].transactionSequenceNumber : 0) +
+          a.pendingOperations.length,
+      }
     } finally {
       api.disconnect()
     }
   },
+
+  addPendingOperation: (account, operation) => ({
+    ...account,
+    pendingOperations: [operation].concat(
+      account.pendingOperations.filter(
+        o => o.transactionSequenceNumber === operation.transactionSequenceNumber,
+      ),
+    ),
+  }),
 }
 
 export default RippleJSBridge

src/bridge/makeMockBridge.js

@@ -152,12 +152,14 @@ function makeMockBridge(opts?: Opts): WalletBridge<*> {
       const op = genOperation(account, account.operations, account.currency, rng)
       op.type = 'OUT'
       op.value = t.amount
+      op.blockHash = null
+      op.blockHeight = null
       op.senders = [account.freshAddress]
       op.recipients = [t.recipient]
       op.blockHeight = account.blockHeight
       op.date = new Date()
       broadcasted[account.id] = (broadcasted[account.id] || []).concat(op)
-      return op.id
+      return { ...op }
     },
   }
 }

src/bridge/types.js

@@ -1,6 +1,6 @@
 // @flow
 
-import type { Account, Currency } from '@ledgerhq/live-common/lib/types'
+import type { Account, Operation, Currency } from '@ledgerhq/live-common/lib/types'
 
 // a WalletBridge is implemented on renderer side.
 // this is an abstraction on top of libcore / ethereumjs / ripple js / ...
@@ -93,10 +93,18 @@ export interface WalletBridge<Transaction> {
    * finalize the transaction by
    * - signing it with the ledger device
    * - broadcasting it to network
-   * - retrieve and return the id related to this transaction (typically a tx id hash)
+   * - retrieve and return the optimistic Operation that this transaction is likely to create in the future
    *
    * NOTE: in future, when transaction balance is close to account.balance, we could wipe it all at this level...
    * to implement that, we might want to have special logic `account.balance-transaction.amount < dust` but not sure where this should leave (i would say on UI side because we need to inform user visually).
    */
-  signAndBroadcast(account: Account, transaction: Transaction, deviceId: DeviceId): Promise<string>;
+  signAndBroadcast(
+    account: Account,
+    transaction: Transaction,
+    deviceId: DeviceId,
+  ): Promise<Operation>;
+
+  // Implement an optimistic response for signAndBroadcast.
+  // you likely should add the operation in account.pendingOperations but maybe you want to clean it (because maybe some are replaced / cancelled by this one?)
+  addPendingOperation?: (account: Account, optimisticOperation: Operation) => Account;
 }

src/components/DeviceSignTransaction.js

@@ -1,11 +1,11 @@
 // @flow
 import { PureComponent } from 'react'
-import type { Account } from '@ledgerhq/live-common/lib/types'
+import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 import type { Device } from 'types/common'
 import type { WalletBridge } from 'bridge/types'
 
 type Props = {
-  onSuccess: (txid: string) => void,
+  onOperationBroadcasted: (op: Operation) => void,
   render: ({ error: ?Error }) => React$Node,
   device: Device,
   account: Account,
@@ -32,10 +32,10 @@ class DeviceSignTransaction extends PureComponent<Props, State> {
   unmount = false
 
   sign = async () => {
-    const { device, account, transaction, bridge, onSuccess } = this.props
+    const { device, account, transaction, bridge, onOperationBroadcasted } = this.props
     try {
-      const txid = await bridge.signAndBroadcast(account, transaction, device.path)
-      onSuccess(txid)
+      const optimisticOperation = await bridge.signAndBroadcast(account, transaction, device.path)
+      onOperationBroadcasted(optimisticOperation)
     } catch (error) {
       console.warn(error)
       this.setState({ error })

src/components/OperationsList/ConfirmationCheck.js

@@ -46,22 +46,18 @@ const WrapperClock = styled(Box).attrs({
 
 const ConfirmationCheck = ({
   marketColor,
-  confirmations,
-  minConfirmations,
+  isConfirmed,
   t,
   type,
   withTooltip,
   ...props
 }: {
   marketColor: string,
-  confirmations: number,
-  minConfirmations: number,
+  isConfirmed: boolean,
   t: T,
   type: OperationType,
   withTooltip?: boolean,
 }) => {
-  const isConfirmed = confirmations >= minConfirmations
-
   const renderContent = () => (
     <Container type={type} isConfirmed={isConfirmed} marketColor={marketColor} {...props}>
       {type === 'IN' ? <IconReceive size={12} /> : <IconSend size={12} />}

src/components/OperationsList/Operation.js

@@ -11,7 +11,7 @@ import { getOperationAmountNumber } from '@ledgerhq/live-common/lib/helpers/oper
 
 import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 
-import type { T } from 'types/common'
+import type { T, CurrencySettings } from 'types/common'
 
 import { currencySettingsForAccountSelector, marketIndicatorSelector } from 'reducers/settings'
 import { rgba, getMarketColor } from 'styles/helpers'
@@ -33,7 +33,7 @@ const ACCOUNT_COL_SIZE = 150
 const AMOUNT_COL_SIZE = 150
 const CONFIRMATION_COL_SIZE = 44
 
-const OperationRaw = styled(Box).attrs({
+const OperationRow = styled(Box).attrs({
   horizontal: true,
   alignItems: 'center',
 })`
@@ -103,7 +103,7 @@ const Cell = styled(Box).attrs({
 
 type Props = {
   account: Account,
-  currencySettings: *,
+  currencySettings: CurrencySettings,
   onAccountClick: (account: Account) => void,
   onOperationClick: ({ operation: Operation, account: Account, marketColor: string }) => void,
   marketIndicator: string,
@@ -135,19 +135,26 @@ class OperationComponent extends PureComponent<Props> {
     const Icon = getCryptoCurrencyIcon(account.currency)
     const amount = getOperationAmountNumber(op)
     const isNegative = amount < 0
+    const isOptimistic = op.blockHeight === null
+    const isConfirmed =
+      (op.blockHeight ? account.blockHeight - op.blockHeight : 0) > currencySettings.confirmationsNb
 
     const marketColor = getMarketColor({
       marketIndicator,
       isNegative,
     })
 
+    // FIXME each cell in a component
+
     return (
-      <OperationRaw onClick={() => onOperationClick({ operation: op, account, marketColor })}>
+      <OperationRow
+        style={{ opacity: isOptimistic ? 0.5 : 1 }}
+        onClick={() => onOperationClick({ operation: op, account, marketColor })}
+      >
         <Cell size={CONFIRMATION_COL_SIZE} align="center" justify="flex-start">
           <ConfirmationCheck
             type={op.type}
-            minConfirmations={currencySettings.minConfirmations}
-            confirmations={op.blockHeight ? account.blockHeight - op.blockHeight : 0}
+            isConfirmed={isConfirmed}
             marketColor={marketColor}
             t={t}
           />
@@ -208,7 +215,7 @@ class OperationComponent extends PureComponent<Props> {
             />
           </Box>
         </Cell>
-      </OperationRaw>
+      </OperationRow>
     )
   }
 }

src/components/modals/OperationDetails.js

@@ -9,7 +9,7 @@ import moment from 'moment'
 import { getOperationAmountNumber } from '@ledgerhq/live-common/lib/helpers/operation'
 
 import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
-import type { T } from 'types/common'
+import type { T, CurrencySettings } from 'types/common'
 
 import { MODAL_OPERATION_DETAILS } from 'config/constants'
 
@@ -63,7 +63,7 @@ type Props = {
   operation: Operation,
   account: Account,
   onClose: () => void,
-  currencySettings: *,
+  currencySettings: CurrencySettings,
   marketColor: string,
 }
 
@@ -74,7 +74,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => {
 
   const { name, unit, currency } = account
   const confirmations = operation.blockHeight ? account.blockHeight - operation.blockHeight : 0
-  const isConfirmed = confirmations >= currencySettings.minConfirmations
+  const isConfirmed = confirmations >= currencySettings.confirmationsNb
   return (
     <ModalBody onClose={onClose}>
       <ModalTitle>Operation details</ModalTitle>
@@ -82,8 +82,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => {
         <Box alignItems="center" mt={3}>
           <ConfirmationCheck
             marketColor={marketColor}
-            confirmations={confirmations}
-            minConfirmations={currencySettings.minConfirmations}
+            isConfirmed={isConfirmed}
             style={{
               transform: 'scale(2)',
             }}

src/components/modals/Send/03-step-verification.js

@@ -10,7 +10,7 @@ import DeviceSignTransaction from 'components/DeviceSignTransaction'
 import DeviceConfirm from 'components/DeviceConfirm'
 
 import type { WalletBridge } from 'bridge/types'
-import type { Account } from '@ledgerhq/live-common/lib/types'
+import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 import type { Device, T } from 'types/common'
 
 const Container = styled(Box).attrs({
@@ -34,11 +34,11 @@ type Props = {
   device: ?Device,
   bridge: ?WalletBridge<*>,
   transaction: *,
-  onValidate: Function,
+  onOperationBroadcasted: (op: Operation) => void,
   t: T,
 }
 
-export default ({ account, device, bridge, transaction, onValidate, t }: Props) => (
+export default ({ account, device, bridge, transaction, onOperationBroadcasted, t }: Props) => (
   <Container>
     <WarnBox>{multiline(t('send:steps.verification.warning'))}</WarnBox>
     <Info>{t('send:steps.verification.body')}</Info>
@@ -51,7 +51,7 @@ export default ({ account, device, bridge, transaction, onValidate, t }: Props)
           device={device}
           transaction={transaction}
           bridge={bridge}
-          onSuccess={onValidate}
+          onOperationBroadcasted={onOperationBroadcasted}
           render={({ error }) => (
             // FIXME we really really REALLY should use error for the display. otherwise we are completely blind on error cases..
             <DeviceConfirm notValid={!!error} />

src/components/modals/Send/04-step-confirmation.js

@@ -1,6 +1,7 @@
 // @flow
 import React from 'react'
 import styled from 'styled-components'
+import type { Operation } from '@ledgerhq/live-common/lib/types'
 
 import IconCheckCircle from 'icons/CheckCircle'
 import IconExclamationCircleThin from 'icons/ExclamationCircleThin'
@@ -36,15 +37,17 @@ const Text = styled(Box).attrs({
 `
 
 type Props = {
-  txValidated: ?string,
+  optimisticOperation: ?Operation,
   t: T,
 }
 
 function StepConfirmation(props: Props) {
-  const { t, txValidated } = props
-  const Icon = txValidated ? IconCheckCircle : IconExclamationCircleThin
-  const iconColor = txValidated ? colors.positiveGreen : colors.alertRed
-  const tPrefix = txValidated ? 'send:steps.confirmation.success' : 'send:steps.confirmation.error'
+  const { t, optimisticOperation } = props
+  const Icon = optimisticOperation ? IconCheckCircle : IconExclamationCircleThin
+  const iconColor = optimisticOperation ? colors.positiveGreen : colors.alertRed
+  const tPrefix = optimisticOperation
+    ? 'send:steps.confirmation.success'
+    : 'send:steps.confirmation.error'
 
   return (
     <Container>
@@ -53,7 +56,9 @@ function StepConfirmation(props: Props) {
       </span>
       <Title>{t(`${tPrefix}.title`)}</Title>
       <Text>{multiline(t(`${tPrefix}.text`))}</Text>
-      <Text style={{ userSelect: 'text' }}>{txValidated || ''}</Text>
+      <Text style={{ userSelect: 'text' }}>
+        {optimisticOperation ? optimisticOperation.hash : ''}
+      </Text>
     </Container>
   )
 }

src/components/modals/Send/ConfirmationFooter.js

@@ -1,23 +1,24 @@
 // @flow
 import React from 'react'
+import type { Operation } from '@ledgerhq/live-common/lib/types'
 import Button from 'components/base/Button'
 import { ModalFooter } from 'components/base/Modal'
 import type { T } from 'types/common'
 
 export default ({
   t,
-  txValidated,
+  optimisticOperation,
   onClose,
   onGoToFirstStep,
 }: {
   t: T,
-  txValidated: ?string,
+  optimisticOperation: ?Operation,
   onClose: () => void,
   onGoToFirstStep: () => void,
 }) => (
   <ModalFooter horizontal alignItems="center" justifyContent="flex-end" flow={2}>
     <Button onClick={onClose}>{t('common:close')}</Button>
-    {txValidated ? (
+    {optimisticOperation ? (
       // TODO: actually go to operations details
       <Button onClick={onClose} primary>
         {t('send:steps.confirmation.success.cta')}

src/components/modals/Send/SendModalBody.js

@@ -6,12 +6,13 @@ import { connect } from 'react-redux'
 import { compose } from 'redux'
 import { createStructuredSelector } from 'reselect'
 
-import type { Account } from '@ledgerhq/live-common/lib/types'
+import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 import type { T, Device } from 'types/common'
 import type { WalletBridge } from 'bridge/types'
 import { getBridgeForCurrency } from 'bridge'
 
 import { getVisibleAccounts } from 'reducers/accounts'
+import { updateAccountWithUpdater } from 'actions/accounts'
 
 import Breadcrumb from 'components/Breadcrumb'
 import { ModalBody, ModalTitle, ModalContent } from 'components/base/Modal'
@@ -29,6 +30,7 @@ import StepConfirmation from './04-step-confirmation'
 type Props = {
   initialAccount: ?Account,
   onClose: () => void,
+  updateAccountWithUpdater: (string, (Account) => Account) => void,
   accounts: Account[],
   t: T,
 }
@@ -40,7 +42,7 @@ type State<T> = {
   stepIndex: number,
   appStatus: ?string,
   deviceSelected: ?Device,
-  txValidated: ?string,
+  optimisticOperation: ?Operation,
 }
 
 type Step = {
@@ -53,6 +55,10 @@ const mapStateToProps = createStructuredSelector({
   accounts: getVisibleAccounts,
 })
 
+const mapDispatchToProps = {
+  updateAccountWithUpdater,
+}
+
 class SendModalBody extends PureComponent<Props, State<*>> {
   constructor({ t, initialAccount, accounts }: Props) {
     super()
@@ -64,7 +70,7 @@ class SendModalBody extends PureComponent<Props, State<*>> {
       txOperation: null,
       appStatus: null,
       deviceSelected: null,
-      txValidated: null,
+      optimisticOperation: null,
       account,
       bridge,
       transaction,
@@ -124,10 +130,17 @@ class SendModalBody extends PureComponent<Props, State<*>> {
     }
   }
 
-  onValidate = (txid: ?string) => {
-    const { stepIndex } = this.state
+  onOperationBroadcasted = (optimisticOperation: Operation) => {
+    const { stepIndex, account, bridge } = this.state
+    if (!account || !bridge) return
+    const { addPendingOperation } = bridge
+    if (addPendingOperation) {
+      this.props.updateAccountWithUpdater(account.id, account =>
+        addPendingOperation(account, optimisticOperation),
+      )
+    }
     this.setState({
-      txValidated: txid,
+      optimisticOperation,
       stepIndex: stepIndex + 1,
     })
   }
@@ -153,7 +166,14 @@ class SendModalBody extends PureComponent<Props, State<*>> {
 
   render() {
     const { t, onClose } = this.props
-    const { stepIndex, account, transaction, bridge, txValidated, deviceSelected } = this.state
+    const {
+      stepIndex,
+      account,
+      transaction,
+      bridge,
+      optimisticOperation,
+      deviceSelected,
+    } = this.state
 
     const step = this.steps[stepIndex]
     if (!step) return null
@@ -195,17 +215,17 @@ class SendModalBody extends PureComponent<Props, State<*>> {
               bridge={bridge}
               transaction={transaction}
               device={deviceSelected}
-              onValidate={this.onValidate}
+              onOperationBroadcasted={this.onOperationBroadcasted}
             />
 
-            <StepConfirmation t={t} txValidated={txValidated} />
+            <StepConfirmation t={t} optimisticOperation={optimisticOperation} />
           </ChildSwitch>
         </ModalContent>
 
         {stepIndex === 3 ? (
           <ConfirmationFooter
             t={t}
-            txValidated={txValidated}
+            optimisticOperation={optimisticOperation}
             onClose={onClose}
             onGoToFirstStep={this.onGoToFirstStep}
           />
@@ -230,4 +250,4 @@ class SendModalBody extends PureComponent<Props, State<*>> {
   }
 }
 
-export default compose(connect(mapStateToProps), translate())(SendModalBody)
+export default compose(connect(mapStateToProps, mapDispatchToProps), translate())(SendModalBody)

yarn.lock

@@ -2,26 +2,6 @@
 # yarn lockfile v1
 
 
-"7zip-bin-linux@~1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/7zip-bin-linux/-/7zip-bin-linux-1.3.1.tgz#4856db1ab1bf5b6ee8444f93f5a8ad71446d00d5"
-
-"7zip-bin-mac@~1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz#3e68778bbf0926adc68159427074505d47555c02"
-
-"7zip-bin-win@~2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.2.0.tgz#0b81c43e911100f3ece2ebac4f414ca95a572d5b"
-
-"7zip-bin@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-3.1.0.tgz#70814c6b6d44fef8b74be6fc64d3977a2eff59a5"
-  optionalDependencies:
-    "7zip-bin-linux" "~1.3.1"
-    "7zip-bin-mac" "~1.0.1"
-    "7zip-bin-win" "~2.2.0"
-
 "7zip-bin@~4.0.2":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179"
@@ -1480,9 +1460,9 @@
     npm "^5.7.1"
     prebuild-install "^2.2.2"
 
-"@ledgerhq/live-common@2.8.0-beta.2":
-  version "2.8.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.8.0-beta.2.tgz#942c457ee01add58752698fd525f45abdcf4597b"
+"@ledgerhq/live-common@^2.8.1":
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.8.1.tgz#7b1ad72679c899d6f5abc911b9fe36dc08ccf8a7"
   dependencies:
     axios "^0.18.0"
     invariant "^2.2.2"
@@ -1502,13 +1482,19 @@
     glob-to-regexp "^0.3.0"
 
 "@nodelib/fs.stat@^1.0.1":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz#d056b68999769728a1cff8d643bc59eb6f0be436"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a"
 
 "@posthtml/esm@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@posthtml/esm/-/esm-1.0.0.tgz#09bcb28a02438dcee22ad1970ca1d85a000ae0cf"
 
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  dependencies:
+    any-observable "^0.3.0"
+
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
@@ -1875,8 +1861,8 @@
     long "^3.2.0"
 
 JSONStream@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -1949,12 +1935,13 @@ agentkeepalive@^3.3.0, agentkeepalive@^3.4.1:
     humanize-ms "^1.2.1"
 
 airbnb-js-shims@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-1.4.1.tgz#cc3e8eb8d35877f9d0fdc6583e26b0ee75b98ad0"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-1.5.1.tgz#5d7614a76ca7bfdcfc3162eefe4011aff870aee8"
   dependencies:
     array-includes "^3.0.3"
-    array.prototype.flatmap "^1.2.0"
-    array.prototype.flatten "^1.2.0"
+    array.prototype.flat "^1.2.1"
+    array.prototype.flatmap "^1.2.1"
+    array.prototype.flatten "^1.2.1"
     es5-shim "^4.5.10"
     es6-shim "^0.35.3"
     function.prototype.name "^1.1.0"
@@ -1964,6 +1951,7 @@ airbnb-js-shims@^1.4.1:
     promise.prototype.finally "^3.1.0"
     string.prototype.padend "^3.0.0"
     string.prototype.padstart "^3.0.0"
+    symbol.prototype.description "^1.0.0"
 
 ajv-keywords@^2.1.0:
   version "2.1.1"
@@ -2063,9 +2051,9 @@ ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
 
-any-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
 
 anymatch@^2.0.0:
   version "2.0.0"
@@ -2074,29 +2062,9 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-builder-bin-linux@1.8.6:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.6.tgz#81176bbcb2929958a90f2184afb54df90b7210a3"
-
-app-builder-bin-mac@1.8.6:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.6.tgz#20d7233c5cadf00472e7b0ccaf85627b53f90787"
-
-app-builder-bin-win@1.8.6:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.6.tgz#d09f78fb1dd5a5f8ea231294828fd5c9ad0358a5"
-
-app-builder-bin@1.8.6:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.6.tgz#85604ece9c1b63ed0437abe92ddaf41c88c3f2e4"
-  optionalDependencies:
-    app-builder-bin-linux "1.8.6"
-    app-builder-bin-mac "1.8.6"
-    app-builder-bin-win "1.8.6"
-
-app-builder-bin@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.0.tgz#700ff08c2558bb27d271c655e8353fe703fa7647"
+app-builder-bin@1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.5.tgz#f4e2b26e26578c9a48cea85da44f0bc1a7582fc0"
 
 append-transform@^0.4.0:
   version "0.4.0"
@@ -2211,7 +2179,15 @@ array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
-array.prototype.flatmap@^1.2.0:
+array.prototype.flat@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.10.0"
+    function-bind "^1.1.1"
+
+array.prototype.flatmap@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.1.tgz#3103cd4826ef90019c9b0a4839b2535fa6faf4e9"
   dependencies:
@@ -2219,7 +2195,7 @@ array.prototype.flatmap@^1.2.0:
     es-abstract "^1.10.0"
     function-bind "^1.1.1"
 
-array.prototype.flatten@^1.2.0:
+array.prototype.flatten@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flatten/-/array.prototype.flatten-1.2.1.tgz#a77ae1b64524ce373b137fade324d12040d3c680"
   dependencies:
@@ -3793,31 +3769,12 @@ builder-util-runtime@4.2.1, builder-util-runtime@^4.2.1, builder-util-runtime@~4
     fs-extra-p "^4.6.0"
     sax "^1.2.4"
 
-builder-util@5.8.1:
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.8.1.tgz#8dd953c018b7a7b2a56c3427b2c62ef77c925ac7"
-  dependencies:
-    "7zip-bin" "~3.1.0"
-    app-builder-bin "1.8.6"
-    bluebird-lst "^1.0.5"
-    builder-util-runtime "^4.2.1"
-    chalk "^2.4.1"
-    debug "^3.1.0"
-    fs-extra-p "^4.6.0"
-    is-ci "^1.1.0"
-    js-yaml "^3.11.0"
-    lazy-val "^1.0.3"
-    semver "^5.5.0"
-    source-map-support "^0.5.5"
-    stat-mode "^0.2.2"
-    temp-file "^3.1.2"
-
-builder-util@^5.8.1:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.10.0.tgz#025291dba29a865b6e2b28959d0f757f4883c3bd"
+builder-util@5.11.1, builder-util@^5.11.0:
+  version "5.11.1"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.1.tgz#e1540935bc0efcb3948ae364a2f71e08d7bc82e0"
   dependencies:
     "7zip-bin" "~4.0.2"
-    app-builder-bin "1.9.0"
+    app-builder-bin "1.9.5"
     bluebird-lst "^1.0.5"
     builder-util-runtime "^4.2.1"
     chalk "^2.4.1"
@@ -3967,12 +3924,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.30000844"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000844.tgz#bca5798cda2b6931d68100c2d69e55fb338cbb41"
+  version "1.0.30000846"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000846.tgz#d9c86f914738db4da098eeded997413c44561bd2"
 
 caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844:
-  version "1.0.30000844"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000844.tgz#de7c84cde0582143cf4f5abdf1b98e5a0539ad4a"
+  version "1.0.30000846"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000846.tgz#2092911eecad71a89dae1faa62bcc202fde7f959"
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -4411,15 +4368,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0:
+concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -4615,8 +4564,8 @@ crocket@^0.9.11:
     xpipe "*"
 
 cross-env@^5.1.4:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.5.tgz#31daf7f3a52ef337c8ddda585f08175cce5d1fa5"
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.6.tgz#0dc05caf945b24e4b9e3b12871fe0e858d08b38d"
   dependencies:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
@@ -4827,9 +4776,9 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
-"cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+"cssstyle@>= 0.3.1 < 0.4.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.3.1.tgz#6da9b4cff1bc5d716e6e5fe8e04fcb1b50a49adf"
   dependencies:
     cssom "0.3.x"
 
@@ -5304,13 +5253,13 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-dmg-builder@4.1.8:
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.8.tgz#365048a4abf3f4e9a4d8fb0331ce7ba13458f4bd"
+dmg-builder@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.10.1.tgz#5603daa1f93e23b6b3572549f188a62e16eb1ffb"
   dependencies:
     bluebird-lst "^1.0.5"
-    builder-util "^5.8.1"
-    electron-builder-lib "~20.13.2"
+    builder-util "^5.11.0"
+    electron-builder-lib "~20.14.6"
     fs-extra-p "^4.6.0"
     iconv-lite "^0.4.23"
     js-yaml "^3.11.0"
@@ -5502,50 +5451,21 @@ ejs@^2.5.7, ejs@^2.5.9, ejs@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
 
-electron-builder-lib@20.13.4:
-  version "20.13.4"
-  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.13.4.tgz#dcadc4a72b4d57996c11a32e5a6a4669bbb4cff9"
-  dependencies:
-    "7zip-bin" "~3.1.0"
-    app-builder-bin "1.8.6"
-    async-exit-hook "^2.0.1"
-    bluebird-lst "^1.0.5"
-    builder-util "5.8.1"
-    builder-util-runtime "4.2.1"
-    chromium-pickle-js "^0.2.0"
-    debug "^3.1.0"
-    ejs "^2.6.1"
-    electron-osx-sign "0.4.10"
-    electron-publish "20.13.2"
-    fs-extra-p "^4.6.0"
-    hosted-git-info "^2.6.0"
-    is-ci "^1.1.0"
-    isbinaryfile "^3.0.2"
-    js-yaml "^3.11.0"
-    lazy-val "^1.0.3"
-    minimatch "^3.0.4"
-    normalize-package-data "^2.4.0"
-    plist "^3.0.1"
-    read-config-file "3.0.1"
-    sanitize-filename "^1.6.1"
-    semver "^5.5.0"
-    temp-file "^3.1.2"
-
-electron-builder-lib@~20.13.2:
-  version "20.13.5"
-  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.13.5.tgz#7c1d978c08b5ca6f668d5d825f7d3aae9cc9296e"
+electron-builder-lib@20.14.7, electron-builder-lib@~20.14.6:
+  version "20.14.7"
+  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.14.7.tgz#db91977dd13b0a288e1da5629183807a9847de21"
   dependencies:
-    "7zip-bin" "~3.1.0"
-    app-builder-bin "1.8.6"
+    "7zip-bin" "~4.0.2"
+    app-builder-bin "1.9.5"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.5"
-    builder-util "5.8.1"
+    builder-util "5.11.1"
     builder-util-runtime "4.2.1"
     chromium-pickle-js "^0.2.0"
     debug "^3.1.0"
     ejs "^2.6.1"
     electron-osx-sign "0.4.10"
-    electron-publish "20.13.2"
+    electron-publish "20.14.6"
     fs-extra-p "^4.6.0"
     hosted-git-info "^2.6.0"
     is-ci "^1.1.0"
@@ -5558,18 +5478,19 @@ electron-builder-lib@~20.13.2:
     read-config-file "3.0.1"
     sanitize-filename "^1.6.1"
     semver "^5.5.0"
+    stream-json "^0.6.1"
     temp-file "^3.1.2"
 
 electron-builder@^20.9.0:
-  version "20.13.4"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.13.4.tgz#fad23bcf9db1923785ef6bdbcf286a8780453240"
+  version "20.14.7"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.14.7.tgz#41a7c4cb4384690c936eb4fc396270effac53bd7"
   dependencies:
     bluebird-lst "^1.0.5"
-    builder-util "5.8.1"
+    builder-util "5.11.1"
     builder-util-runtime "4.2.1"
     chalk "^2.4.1"
-    dmg-builder "4.1.8"
-    electron-builder-lib "20.13.4"
+    dmg-builder "4.10.1"
+    electron-builder-lib "20.14.7"
     electron-download-tf "4.3.4"
     fs-extra-p "^4.6.0"
     is-ci "^1.1.0"
@@ -5631,12 +5552,12 @@ electron-osx-sign@0.4.10:
     minimist "^1.2.0"
     plist "^2.1.0"
 
-electron-publish@20.13.2:
-  version "20.13.2"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.13.2.tgz#a5388098ac17fa10d0494687e8548a26cf1522ac"
+electron-publish@20.14.6:
+  version "20.14.6"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.14.6.tgz#ced15b0c08fdaef2fb25beba9f55f20d1c19e215"
   dependencies:
     bluebird-lst "^1.0.5"
-    builder-util "^5.8.1"
+    builder-util "^5.11.0"
     builder-util-runtime "^4.2.1"
     chalk "^2.4.1"
     fs-extra-p "^4.6.0"
@@ -5665,8 +5586,8 @@ electron-store@^1.3.0:
     conf "^1.3.0"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
-  version "1.3.47"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz#764e887ca9104d01a0ac8eabee7dfc0e2ce14104"
+  version "1.3.48"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"
 
 electron-updater@^2.21.8:
   version "2.21.10"
@@ -5693,8 +5614,8 @@ electron-webpack-js@~2.0.3:
     babel-plugin-syntax-dynamic-import "^7.0.0-beta.3"
 
 electron-webpack@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/electron-webpack/-/electron-webpack-2.1.1.tgz#283d62ea5be9a68c77b90283fd594470d07db2dd"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/electron-webpack/-/electron-webpack-2.1.2.tgz#f895c020d504f441308a39f208a9c23417e481bc"
   dependencies:
     "@types/webpack-env" "^1.13.6"
     async-exit-hook "^2.0.1"
@@ -5806,9 +5727,9 @@ env-paths@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
 
-envinfo@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-4.4.2.tgz#472c49f3a8b9bca73962641ce7cb692bf623cd1c"
+envinfo@^5.7.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.7.0.tgz#690e5fdf30aa75dda19c0c5338d0a48a48f1e998"
 
 err-code@^1.0.0:
   version "1.1.2"
@@ -5997,10 +5918,10 @@ eslint-module-utils@^2.2.0:
     pkg-dir "^1.0.0"
 
 eslint-plugin-flowtype@^2.46.2:
-  version "2.46.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.46.3.tgz#7e84131d87ef18b496b1810448593374860b4e8e"
+  version "2.47.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.47.1.tgz#1be0d6b855dbf8f253fcf49ea3d44bf6c23ff984"
   dependencies:
-    lodash "^4.15.0"
+    lodash "^4.17.10"
 
 eslint-plugin-import@^2.11.0:
   version "2.12.0"
@@ -6356,12 +6277,12 @@ extglob@^2.0.4:
     to-regex "^3.0.1"
 
 extract-zip@^1.0.3:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
   dependencies:
-    concat-stream "1.6.0"
+    concat-stream "1.6.2"
     debug "2.6.9"
-    mkdirp "0.5.0"
+    mkdirp "0.5.1"
     yauzl "2.4.1"
 
 extsprintf@1.3.0:
@@ -7037,7 +6958,7 @@ got@^7.0.0, got@^7.1.0:
     url-parse-lax "^1.0.0"
     url-to-options "^1.0.1"
 
-got@^8.2.0:
+got@^8.3.1:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.1.tgz#093324403d4d955f5a16a7a8d39955d055ae10ed"
   dependencies:
@@ -7422,8 +7343,8 @@ http-errors@~1.6.2:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.4.0:
-  version "0.4.12"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.12.tgz#b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f"
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
 
 http-proxy-agent@^2.0.0, http-proxy-agent@^2.1.0:
   version "2.1.0"
@@ -7637,7 +7558,7 @@ inquirer@3.3.0, inquirer@^3.0.6:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-inquirer@^5.1.0, inquirer@^5.2.0:
+inquirer@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
   dependencies:
@@ -7665,7 +7586,7 @@ internal-ip@1.2.0:
   dependencies:
     meow "^3.3.0"
 
-interpret@^1.0.0, interpret@^1.0.4:
+interpret@^1.0.0, interpret@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
@@ -7899,11 +7820,11 @@ is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
 
-is-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
   dependencies:
-    symbol-observable "^0.2.2"
+    symbol-observable "^1.1.0"
 
 is-odd@^2.0.0:
   version "2.0.0"
@@ -8477,21 +8398,21 @@ jscodeshift@^0.5.0:
     write-file-atomic "^1.2.0"
 
 jsdom@^11.5.1:
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.10.0.tgz#a42cd54e88895dc765f03f15b807a474962ac3b5"
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e"
   dependencies:
     abab "^1.0.4"
     acorn "^5.3.0"
     acorn-globals "^4.1.0"
     array-equal "^1.0.0"
     cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
+    cssstyle ">= 0.3.1 < 0.4.0"
     data-urls "^1.0.0"
     domexception "^1.0.0"
     escodegen "^1.9.0"
     html-encoding-sniffer "^1.0.2"
     left-pad "^1.2.0"
-    nwmatcher "^1.4.3"
+    nwsapi "^2.0.0"
     parse5 "4.0.0"
     pn "^1.1.0"
     request "^2.83.0"
@@ -8503,7 +8424,7 @@ jsdom@^11.5.1:
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.3"
     whatwg-mimetype "^2.1.0"
-    whatwg-url "^6.4.0"
+    whatwg-url "^6.4.1"
     ws "^4.0.0"
     xml-name-validator "^3.0.0"
 
@@ -8773,15 +8694,15 @@ listr-verbose-renderer@^0.4.0:
     date-fns "^1.27.2"
     figures "^1.7.0"
 
-listr@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
+listr@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.1.tgz#8a7afa4a7135cee4c921d128e0b7dfc6e522d43d"
   dependencies:
-    chalk "^1.1.3"
+    "@samverschueren/stream-to-observable" "^0.3.0"
     cli-truncate "^0.2.1"
     figures "^1.7.0"
     indent-string "^2.1.0"
-    is-observable "^0.2.0"
+    is-observable "^1.1.0"
     is-promise "^2.1.0"
     is-stream "^1.1.0"
     listr-silent-renderer "^1.1.1"
@@ -8791,8 +8712,7 @@ listr@^0.13.0:
     log-update "^1.0.2"
     ora "^0.2.3"
     p-map "^1.1.1"
-    rxjs "^5.4.2"
-    stream-to-observable "^0.2.0"
+    rxjs "^6.1.0"
     strip-ansi "^3.0.1"
 
 load-json-file@^1.0.0:
@@ -9041,10 +8961,6 @@ lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
-
 make-dir@^1.0.0, make-dir@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -9357,11 +9273,11 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
-minipass@^2.2.1, minipass@^2.2.4:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.1.tgz#4e872b959131a672837ab3cb554962bc84b1537d"
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
   dependencies:
-    safe-buffer "^5.1.1"
+    safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
 minizlib@^1.1.0:
@@ -9422,13 +9338,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
-  dependencies:
-    minimist "0.0.8"
-
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -9983,9 +9893,9 @@ numeral@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506"
 
-nwmatcher@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+nwsapi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.0.tgz#7c8faf4ad501e1d17a651ebc5547f966b547c5c7"
 
 oauth-sign@~0.8.2:
   version "0.8.2"
@@ -10357,6 +10267,10 @@ parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
 
+parser-toolkit@>=0.0.3:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
+
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
@@ -10586,11 +10500,10 @@ postcss-discard-unused@^2.2.1:
     uniqs "^2.0.0"
 
 postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec"
   dependencies:
     postcss "^5.0.4"
-    uniqid "^4.0.0"
 
 postcss-flexbugs-fixes@^3.2.0:
   version "3.3.1"
@@ -10875,7 +10788,7 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.12.1, prettier@^1.5.3:
+prettier@^1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
 
@@ -11047,8 +10960,8 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 punycode@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
 
 pushdata-bitcoin@^1.0.1:
   version "1.0.1"
@@ -11247,8 +11160,8 @@ react-docgen@^3.0.0-beta11:
     recast "^0.12.6"
 
 react-dom@^16.3.2:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -11310,9 +11223,9 @@ react-inspector@^2.2.2:
     babel-runtime "^6.26.0"
     is-dom "^1.0.9"
 
-react-is@^16.3.1, react-is@^16.3.2:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
+react-is@^16.3.1, react-is@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.0.tgz#cc9fdc855ac34d2e7d9d2eb7059bbc240d35ffcf"
 
 react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
   version "3.0.4"
@@ -11430,13 +11343,13 @@ react-style-proptype@^3.0.0:
     prop-types "^15.5.4"
 
 react-test-renderer@^16.3.2:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.3.2.tgz#3d1ed74fda8db42521fdf03328e933312214749a"
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.4.0.tgz#0dbe0e24263e94e1830c7afb1f403707fad313a3"
   dependencies:
     fbjs "^0.8.16"
     object-assign "^4.1.1"
     prop-types "^15.6.0"
-    react-is "^16.3.2"
+    react-is "^16.4.0"
 
 react-textarea-autosize@^5.2.1:
   version "5.2.1"
@@ -11464,8 +11377,8 @@ react-treebeard@^2.1.0:
     velocity-react "^1.3.1"
 
 react@^16.2.0, react@^16.3.2:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -12188,16 +12101,16 @@ rx@2.3.24:
   resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
 
 rxjs-compat@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.1.0.tgz#935059623ee4c167728c9dd03ee6e4468cc5b583"
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.2.0.tgz#2eb49cc6ac20d0d7057c6887d1895beaab0966f9"
 
-rxjs@^5.1.1, rxjs@^5.4.2, rxjs@^5.5.2:
-  version "5.5.10"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
+rxjs@^5.1.1, rxjs@^5.5.2:
+  version "5.5.11"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
   dependencies:
     symbol-observable "1.0.1"
 
-rxjs@^6.2.0:
+rxjs@^6.1.0, rxjs@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.0.tgz#e024d0e180b72756a83c2aaea8f25423751ba978"
   dependencies:
@@ -12800,16 +12713,16 @@ stream-iterate@^1.1.0:
     readable-stream "^2.1.5"
     stream-shift "^1.0.0"
 
+stream-json@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.6.1.tgz#c9413e7f42ba8eac4883be712220455f64dcea67"
+  dependencies:
+    parser-toolkit ">=0.0.3"
+
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
-stream-to-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
-  dependencies:
-    any-observable "^0.2.0"
-
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -13054,11 +12967,7 @@ symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
 
-symbol-observable@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
-
-symbol-observable@^1.0.3, symbol-observable@^1.2.0:
+symbol-observable@^1.0.3, symbol-observable@^1.1.0, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
 
@@ -13066,6 +12975,12 @@ symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
+symbol.prototype.description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.0.tgz#6e355660eb1e44ca8ad53a68fdb72ef131ca4b12"
+  dependencies:
+    has-symbols "^1.0.0"
+
 table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
@@ -13126,12 +13041,12 @@ tar@^2.0.0:
     inherits "2"
 
 tar@^4, tar@^4.4.0, tar@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.3.tgz#d6bd509dc7f6b5a5d2c13aa0f7d57b03269b8376"
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
-    minipass "^2.2.4"
+    minipass "^2.3.3"
     minizlib "^1.1.0"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
@@ -13376,8 +13291,8 @@ uglify-es@3.3.7, uglify-es@^3.3.4, uglify-es@^3.3.9:
     source-map "~0.6.1"
 
 uglify-js@3.3.x:
-  version "3.3.26"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.26.tgz#858b74e5e7262e876c834b907a5fa57d4fa0d525"
+  version "3.3.27"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.27.tgz#eb8c3c9429969f86ff5b0a2422ffc78c3cea8cc0"
   dependencies:
     commander "~2.15.0"
     source-map "~0.6.1"
@@ -13470,12 +13385,6 @@ uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
 
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  dependencies:
-    macaddress "^0.2.8"
-
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
@@ -13673,9 +13582,9 @@ uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
-v8-compile-cache@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4"
+v8-compile-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a"
 
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.3"
@@ -13835,8 +13744,8 @@ webpack-addons@^1.1.5:
     jscodeshift "^0.4.0"
 
 webpack-bundle-analyzer@^2.11.1:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.0.tgz#8d7db44c3d4844bc911890998e1110514cf12264"
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz#07d2176c6e86c3cdce4c23e56fae2a7b6b4ad526"
   dependencies:
     acorn "^5.3.0"
     bfj-node4 "^5.2.0"
@@ -13852,35 +13761,35 @@ webpack-bundle-analyzer@^2.11.1:
     ws "^4.0.0"
 
 webpack-cli@^2.0.14, webpack-cli@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.1.3.tgz#65d166851abaa56067ef3f716b02a97ba6bbe84d"
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.1.4.tgz#cab81e79249127384fb69b2fdfe2055f9c771b76"
   dependencies:
-    chalk "^2.3.2"
+    chalk "^2.4.1"
     cross-spawn "^6.0.5"
     diff "^3.5.0"
     enhanced-resolve "^4.0.0"
-    envinfo "^4.4.2"
+    envinfo "^5.7.0"
     glob-all "^3.1.0"
     global-modules "^1.0.0"
-    got "^8.2.0"
+    got "^8.3.1"
     import-local "^1.0.0"
-    inquirer "^5.1.0"
-    interpret "^1.0.4"
+    inquirer "^5.2.0"
+    interpret "^1.1.0"
     jscodeshift "^0.5.0"
-    listr "^0.13.0"
+    listr "^0.14.1"
     loader-utils "^1.1.0"
-    lodash "^4.17.5"
+    lodash "^4.17.10"
     log-symbols "^2.2.0"
     mkdirp "^0.5.1"
     p-each-series "^1.0.0"
     p-lazy "^1.0.0"
-    prettier "^1.5.3"
-    supports-color "^5.3.0"
-    v8-compile-cache "^1.1.2"
+    prettier "^1.12.1"
+    supports-color "^5.4.0"
+    v8-compile-cache "^2.0.0"
     webpack-addons "^1.1.5"
     yargs "^11.1.0"
-    yeoman-environment "^2.0.0"
-    yeoman-generator "^2.0.4"
+    yeoman-environment "^2.1.1"
+    yeoman-generator "^2.0.5"
 
 webpack-core@~0.6.0:
   version "0.6.9"
@@ -14030,8 +13939,8 @@ webpack@^4.6.0:
     webpack-sources "^1.0.1"
 
 webrtc-adapter@^6.1.1:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-6.1.5.tgz#df72e4af5cb6675656c896db0d1187695359220b"
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-6.2.0.tgz#8e8913a8aa9a6501ee9c3e5f67f4518f4024ec39"
   dependencies:
     rtcpeerconnection-shim "^1.2.10"
     sdp "^2.7.0"
@@ -14061,7 +13970,7 @@ whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
 
-whatwg-url@^6.4.0:
+whatwg-url@^6.4.0, whatwg-url@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67"
   dependencies:
@@ -14199,8 +14108,8 @@ ws@^4.0.0:
     safe-buffer "~5.1.0"
 
 ws@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.1.1.tgz#1d43704689711ac1942fd2f283e38f825c4b8b95"
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.0.tgz#9fd95e3ac7c76f6ae8bcc868a0e3f11f1290c33e"
   dependencies:
     async-limiter "~1.0.0"
 
@@ -14424,7 +14333,7 @@ yauzl@2.4.1:
   dependencies:
     fd-slicer "~1.0.1"
 
-yeoman-environment@^2.0.0, yeoman-environment@^2.0.5:
+yeoman-environment@^2.0.5, yeoman-environment@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.1.1.tgz#10a045f7fc4397873764882eae055a33e56ee1c5"
   dependencies:
@@ -14444,7 +14353,7 @@ yeoman-environment@^2.0.0, yeoman-environment@^2.0.5:
     text-table "^0.2.0"
     untildify "^3.0.2"
 
-yeoman-generator@^2.0.4:
+yeoman-generator@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.5.tgz#57b0b3474701293cc9ec965288f3400b00887c81"
   dependencies: