From 4938bb23c9833b391cb328313d593443f1c3d917 Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Wed, 18 Jul 2018 17:37:08 +0200
Subject: [PATCH 01/13] Correct dynamic library path to be handled by macOS >=
 10.9.0

Fixes #1032
---
 package.json | 4 ++--
 yarn.lock    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0708592e..afcb1a3b 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,8 @@
     "@ledgerhq/hw-app-xrp": "^4.13.0",
     "@ledgerhq/hw-transport": "^4.13.0",
     "@ledgerhq/hw-transport-node-hid": "^4.13.0",
-    "@ledgerhq/ledger-core": "2.0.0-rc.4",
-    "@ledgerhq/live-common": "^2.32.0",
+    "@ledgerhq/ledger-core": "2.0.0-rc.5",
+    "@ledgerhq/live-common": "^2.35.0",
     "animated": "^0.2.2",
     "async": "^2.6.1",
     "axios": "^0.18.0",
diff --git a/yarn.lock b/yarn.lock
index 0ef4da30..aca105e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1521,9 +1521,9 @@
   dependencies:
     events "^2.0.0"
 
-"@ledgerhq/ledger-core@2.0.0-rc.4":
-  version "2.0.0-rc.4"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.4.tgz#0ec80a763c666658bea94bd38b86aa90d5a24906"
+"@ledgerhq/ledger-core@2.0.0-rc.5":
+  version "2.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.5.tgz#ec42f6c3cc265fc5ca82e01d27df38357642d3ed"
   dependencies:
     "@ledgerhq/hw-app-btc" "^4.7.3"
     "@ledgerhq/hw-transport-node-hid" "^4.7.6"

From 824bc0991dce8d4988d4b5ca57e7494b9ac72fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Thu, 19 Jul 2018 19:43:16 +0200
Subject: [PATCH 02/13] Fixes #1186

---
 src/api/Ripple.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/Ripple.js b/src/api/Ripple.js
index 8f0d5fd4..9adbf924 100644
--- a/src/api/Ripple.js
+++ b/src/api/Ripple.js
@@ -40,6 +40,7 @@ export const formatAPICurrencyXRP = (amount: number) => {
   const value = formatCurrencyUnit(rippleUnit, amount, {
     showAllDigits: true,
     disableRounding: true,
+    useGrouping: false,
   })
   return { currency: 'XRP', value }
 }

From 735d1c8ec4f04bebde96c2c21e31e1d32aabb002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Fri, 20 Jul 2018 17:31:28 +0200
Subject: [PATCH 03/13] Fixes 'Ledger Sequence too high'

this error was related to when you don't sign on the device fast enough. this should increase the accepted time.
---
 src/bridge/RippleJSBridge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bridge/RippleJSBridge.js b/src/bridge/RippleJSBridge.js
index 53c5f181..969fb6cb 100644
--- a/src/bridge/RippleJSBridge.js
+++ b/src/bridge/RippleJSBridge.js
@@ -68,6 +68,7 @@ async function signAndBroadcast({ a, t, deviceId, isCancelled, onSigned, onOpera
     }
     const instruction = {
       fee: formatAPICurrencyXRP(t.fee).value,
+      maxLedgerVersionOffset: 12,
     }
 
     const prepared = await api.preparePayment(a.freshAddress, payment, instruction)

From 5f355480bb47d3a03aee7b9f29b960b272a38b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Fri, 20 Jul 2018 12:42:47 +0200
Subject: [PATCH 04/13] Fix some errors to happen unexpected and make it more
 clear to user

---
 .../modals/Receive/steps/03-step-confirm-address.js  |  8 +++-----
 .../modals/Receive/steps/04-step-receive-funds.js    |  6 ++++--
 src/components/modals/Send/index.js                  | 12 ++++++++----
 src/config/errors.js                                 |  8 ++++++++
 src/helpers/deviceAccess.js                          |  4 +---
 5 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 src/config/errors.js

diff --git a/src/components/modals/Receive/steps/03-step-confirm-address.js b/src/components/modals/Receive/steps/03-step-confirm-address.js
index 4e496999..6457c7d0 100644
--- a/src/components/modals/Receive/steps/03-step-confirm-address.js
+++ b/src/components/modals/Receive/steps/03-step-confirm-address.js
@@ -1,6 +1,5 @@
 // @flow
 
-import invariant from 'invariant'
 import styled from 'styled-components'
 import React, { Fragment, PureComponent } from 'react'
 
@@ -13,9 +12,7 @@ import TranslatedError from '../../../TranslatedError'
 
 export default class StepConfirmAddress extends PureComponent<StepProps> {
   render() {
-    const { t, device, account, isAddressVerified, verifyAddressError, transitionTo } = this.props
-    invariant(account, 'No account given')
-    invariant(device, 'No device given')
+    const { t, account, isAddressVerified, verifyAddressError, transitionTo } = this.props
     return (
       <Container>
         <TrackPage category="Receive Flow" name="Step 3" />
@@ -34,7 +31,8 @@ export default class StepConfirmAddress extends PureComponent<StepProps> {
           <Fragment>
             <Title>{t('app:receive.steps.confirmAddress.action')}</Title>
             <Text>
-              {t('app:receive.steps.confirmAddress.text', { currencyName: account.currency.name })}
+              {account &&
+                t('app:receive.steps.confirmAddress.text', { currencyName: account.currency.name })}
             </Text>
             <Button mt={4} mb={2} primary onClick={() => transitionTo('receive')}>
               {t('app:buttons.displayAddressOnDevice')}
diff --git a/src/components/modals/Receive/steps/04-step-receive-funds.js b/src/components/modals/Receive/steps/04-step-receive-funds.js
index 36384137..e506059c 100644
--- a/src/components/modals/Receive/steps/04-step-receive-funds.js
+++ b/src/components/modals/Receive/steps/04-step-receive-funds.js
@@ -9,6 +9,7 @@ import { isSegwitAccount } from 'helpers/bip32'
 import Box from 'components/base/Box'
 import CurrentAddressForAccount from 'components/CurrentAddressForAccount'
 import { WrongDeviceForAccount } from 'components/EnsureDeviceApp'
+import { DisconnectedDevice } from 'config/errors'
 
 import type { StepProps } from '..'
 
@@ -21,9 +22,10 @@ export default class StepReceiveFunds extends PureComponent<StepProps> {
 
   confirmAddress = async () => {
     const { account, device, onChangeAddressVerified, transitionTo } = this.props
-    invariant(account, 'No account given')
-    invariant(device, 'No device given')
     try {
+      if (!device || !account) {
+        throw new DisconnectedDevice()
+      }
       const params = {
         currencyId: account.currency.id,
         devicePath: device.path,
diff --git a/src/components/modals/Send/index.js b/src/components/modals/Send/index.js
index e78eaecf..5dac5b5a 100644
--- a/src/components/modals/Send/index.js
+++ b/src/components/modals/Send/index.js
@@ -8,7 +8,6 @@ import { translate } from 'react-i18next'
 import { createStructuredSelector } from 'reselect'
 import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 
-import { createCustomErrorClass } from 'helpers/errors'
 import Track from 'analytics/Track'
 import { updateAccountWithUpdater } from 'actions/accounts'
 import { MODAL_SEND } from 'config/constants'
@@ -21,6 +20,7 @@ import type { StepProps as DefaultStepProps } from 'components/base/Stepper'
 import { getCurrentDevice } from 'reducers/devices'
 import { accountsSelector } from 'reducers/accounts'
 import { closeModal, openModal } from 'reducers/modals'
+import { DisconnectedDevice, UserRefusedOnDevice } from 'config/errors'
 
 import Modal from 'components/base/Modal'
 import Stepper from 'components/base/Stepper'
@@ -31,8 +31,6 @@ import StepConnectDevice, { StepConnectDeviceFooter } from './steps/02-step-conn
 import StepVerification from './steps/03-step-verification'
 import StepConfirmation, { StepConfirmationFooter } from './steps/04-step-confirmation'
 
-const UserRefusedOnDevice = createCustomErrorClass('UserRefusedOnDevice')
-
 type Props = {
   t: T,
   device: ?Device,
@@ -204,7 +202,13 @@ class SendModal extends PureComponent<Props, State<*>> {
     const { device } = this.props
     const { account, transaction, bridge } = this.state
 
-    invariant(device && account && transaction && bridge, 'signTransaction invalid conditions')
+    if (!device) {
+      this.handleTransactionError(new DisconnectedDevice())
+      transitionTo('confirmation')
+      return
+    }
+
+    invariant(account && transaction && bridge, 'signTransaction invalid conditions')
 
     this._signTransactionSub = bridge
       .signAndBroadcast(account, transaction, device.path)
diff --git a/src/config/errors.js b/src/config/errors.js
new file mode 100644
index 00000000..4d1e5989
--- /dev/null
+++ b/src/config/errors.js
@@ -0,0 +1,8 @@
+// @flow
+
+// TODO we need to start porting all custom errors here.
+
+import { createCustomErrorClass } from 'helpers/errors'
+
+export const DisconnectedDevice = createCustomErrorClass('DisconnectedDevice')
+export const UserRefusedOnDevice = createCustomErrorClass('UserRefusedOnDevice') // TODO rename because it's just for transaction refusal
diff --git a/src/helpers/deviceAccess.js b/src/helpers/deviceAccess.js
index d9c14199..2b0a15ff 100644
--- a/src/helpers/deviceAccess.js
+++ b/src/helpers/deviceAccess.js
@@ -3,8 +3,8 @@ import logger from 'logger'
 import throttle from 'lodash/throttle'
 import type Transport from '@ledgerhq/hw-transport'
 import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'
+import { DisconnectedDevice } from 'config/errors'
 import { retry } from './promise'
-import { createCustomErrorClass } from './errors'
 
 // all open to device must use openDevice so we can prevent race conditions
 // and guarantee we do one device access at a time. It also will handle the .close()
@@ -12,8 +12,6 @@ import { createCustomErrorClass } from './errors'
 
 type WithDevice = (devicePath: string) => <T>(job: (Transport<*>) => Promise<*>) => Promise<T>
 
-const DisconnectedDevice = createCustomErrorClass('DisconnectedDevice')
-
 const mapError = e => {
   if (e && e.message && e.message.indexOf('HID') >= 0) {
     throw new DisconnectedDevice(e.message)

From 0ff0a80ef1a38f7779adc2d0c76c972c667fe7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Fri, 20 Jul 2018 12:05:33 +0200
Subject: [PATCH 05/13] Fix edge-case in sync

---
 src/bridge/BridgeSyncContext.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bridge/BridgeSyncContext.js b/src/bridge/BridgeSyncContext.js
index 99099fb0..0a1181c7 100644
--- a/src/bridge/BridgeSyncContext.js
+++ b/src/bridge/BridgeSyncContext.js
@@ -3,7 +3,6 @@
 // it handles automatically re-calling synchronize
 // this is an even high abstraction than the bridge
 
-import invariant from 'invariant'
 import logger from 'logger'
 import shuffle from 'lodash/shuffle'
 import { timeout } from 'rxjs/operators/timeout'
@@ -67,7 +66,10 @@ class Provider extends Component<BridgeSyncProviderOwnProps, Sync> {
         return
       }
       const account = this.props.accounts.find(a => a.id === accountId)
-      invariant(account, 'account not found')
+      if (!account) {
+        next()
+        return
+      }
 
       const bridge = getBridgeForCurrency(account.currency)
 

From 24353ec7460c271dd70d6d95a6dc6c60d694e380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Fri, 20 Jul 2018 16:55:25 +0200
Subject: [PATCH 06/13] Anonymise one more edge case

---
 src/helpers/anonymizer.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/helpers/anonymizer.js b/src/helpers/anonymizer.js
index f24e45d4..c0602449 100644
--- a/src/helpers/anonymizer.js
+++ b/src/helpers/anonymizer.js
@@ -11,9 +11,25 @@ const configDir = (() => {
 
 const cwd = typeof process === 'object' ? process.cwd() || '.' : '__NOTHING_TO_REPLACE__'
 
+// all the paths the app will use. we replace them to anonymize
+const basePaths = {
+  $USER_DATA: configDir,
+  '.': cwd,
+}
+
 function filepathReplace(path: string) {
-  if (!cwd) return path
-  return path.replace(cwd, '.').replace(configDir, '$USER_DATA')
+  if (!path) return path
+  const replaced = Object.keys(basePaths).reduce((path, name) => {
+    const p = basePaths[name]
+    return replaced
+      .replace(p, name) // normal replace of the path
+      .replace(encodeURI(p.replace(/\\/g, '/')), name) // replace of the URI version of the path (that are in file:///)
+  }, path)
+  if (replaced.length !== path.length) {
+    // we need to continue until there is no more occurences
+    return filepathReplace(replaced)
+  }
+  return replaced
 }
 
 function filepathRecursiveReplacer(obj: mixed, seen: Array<*>) {

From 2b267830b48e7cab31723581132345af46126944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Fri, 20 Jul 2018 09:45:52 +0200
Subject: [PATCH 07/13] Fix duplicates between pending & non pending in Ripple

---
 src/bridge/RippleJSBridge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bridge/RippleJSBridge.js b/src/bridge/RippleJSBridge.js
index 969fb6cb..e6908fbb 100644
--- a/src/bridge/RippleJSBridge.js
+++ b/src/bridge/RippleJSBridge.js
@@ -417,6 +417,7 @@ const RippleJSBridge: WalletBridge<Transaction> = {
             const [last] = operations
             const pendingOperations = a.pendingOperations.filter(
               o =>
+                !operations.some(op => o.hash === op.hash) &&
                 last &&
                 last.transactionSequenceNumber &&
                 o.transactionSequenceNumber &&

From d626072c5e39b071139c6f5e4b1cd0c1b1752926 Mon Sep 17 00:00:00 2001
From: Anastasia Poupeney <anastasiasergienko@gmail.com>
Date: Wed, 18 Jul 2018 18:38:01 +0200
Subject: [PATCH 08/13] fix old regression on the onboarding breadcrumb

---
 src/components/Onboarding/OnboardingBreadcrumb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Onboarding/OnboardingBreadcrumb.js b/src/components/Onboarding/OnboardingBreadcrumb.js
index b1505aef..240adb61 100644
--- a/src/components/Onboarding/OnboardingBreadcrumb.js
+++ b/src/components/Onboarding/OnboardingBreadcrumb.js
@@ -51,7 +51,7 @@ function OnboardingBreadcrumb(props: Props) {
 
   return (
     <Breadcrumb
-      stepsErrors={genuine.isGenuineFail ? [genuineStepIndex] : undefined}
+      stepsErrors={genuine.displayErrorScreen ? [genuineStepIndex] : undefined}
       currentStep={stepIndex}
       items={filteredSteps}
     />

From aefab0a605a8432cbb5f35a019a9d9c677f857eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Tue, 17 Jul 2018 15:32:10 +0200
Subject: [PATCH 09/13] ETH/ETC: always scan 9 empty accounts ahead for better
 discoverability

---
 src/bridge/EthereumJSBridge.js | 21 ++++++++++++++++-----
 src/helpers/derivations.js     | 18 +++++++++++-------
 src/logger/logger-storybook.js |  2 ++
 src/logger/logger.js           |  8 ++++++++
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/bridge/EthereumJSBridge.js b/src/bridge/EthereumJSBridge.js
index 48972922..3c366449 100644
--- a/src/bridge/EthereumJSBridge.js
+++ b/src/bridge/EthereumJSBridge.js
@@ -1,5 +1,6 @@
 // @flow
 import { Observable } from 'rxjs'
+import logger from 'logger'
 import React from 'react'
 import FeesField from 'components/FeesField/EthereumKind'
 import AdvancedOptions from 'components/AdvancedOptions/EthereumKind'
@@ -176,7 +177,7 @@ const EthereumBridge: WalletBridge<Transaction> = {
         index,
         { address, path: freshAddressPath, publicKey },
         isStandard,
-        mandatoryCount,
+        shouldSkipEmpty,
       ): { account?: Account, complete?: boolean } {
         const balance = await api.getAccountBalance(address)
         if (finished) return { complete: true }
@@ -213,7 +214,7 @@ const EthereumBridge: WalletBridge<Transaction> = {
             newAccountCount++
           }
 
-          if (index < mandatoryCount) {
+          if (shouldSkipEmpty) {
             return {}
           }
           // NB for legacy addresses maybe we will continue at least for the first 10 addresses
@@ -254,6 +255,8 @@ const EthereumBridge: WalletBridge<Transaction> = {
           const last = derivations[derivations.length - 1]
           for (const derivation of derivations) {
             const isStandard = last === derivation
+            let emptyCount = 0
+            const mandatoryEmptyAccountSkip = derivation.mandatoryEmptyAccountSkip || 0
             for (let index = 0; index < 255; index++) {
               const freshAddressPath = derivation({ currency, x: index, segwit: false })
               const res = await getAddressCommand
@@ -263,10 +266,18 @@ const EthereumBridge: WalletBridge<Transaction> = {
                 index,
                 res,
                 isStandard,
-                // $FlowFixMe i know i know, not part of function
-                derivation.mandatoryCount || 0,
+                emptyCount < mandatoryEmptyAccountSkip,
               )
-              if (r.account) o.next(r.account)
+              logger.log(
+                `scanning ${currency.id} at ${freshAddressPath}: ${res.address} resulted of ${
+                  r.account ? `Account with ${r.account.operations.length} txs` : 'no account'
+                }. ${r.complete ? 'ALL SCANNED' : ''}`,
+              )
+              if (r.account) {
+                o.next(r.account)
+              } else {
+                emptyCount++
+              }
               if (r.complete) {
                 break
               }
diff --git a/src/helpers/derivations.js b/src/helpers/derivations.js
index 8579e4f4..f80e0e22 100644
--- a/src/helpers/derivations.js
+++ b/src/helpers/derivations.js
@@ -1,17 +1,21 @@
 // @flow
 import type { CryptoCurrency } from '@ledgerhq/live-common/lib/types'
 
-type Derivation = ({
-  currency: CryptoCurrency,
-  segwit: boolean,
-  x: number,
-}) => string
+type Derivation = {
+  ({
+    currency: CryptoCurrency,
+    segwit: boolean,
+    x: number,
+  }): string,
+
+  mandatoryEmptyAccountSkip?: number,
+}
 
 const ethLegacyMEW: Derivation = ({ x }) => `44'/60'/0'/${x}`
-ethLegacyMEW.mandatoryCount = 5
+ethLegacyMEW.mandatoryEmptyAccountSkip = 10
 
 const etcLegacyMEW: Derivation = ({ x }) => `44'/60'/160720'/${x}'/0`
-etcLegacyMEW.mandatoryCount = 5
+etcLegacyMEW.mandatoryEmptyAccountSkip = 10
 
 const rippleLegacy: Derivation = ({ x }) => `44'/144'/0'/${x}'`
 
diff --git a/src/logger/logger-storybook.js b/src/logger/logger-storybook.js
index eee5c550..81069e5f 100644
--- a/src/logger/logger-storybook.js
+++ b/src/logger/logger-storybook.js
@@ -16,6 +16,8 @@ module.exports = {
   analyticsTrack: noop,
   analyticsPage: noop,
   log: noop,
+  info: noop,
+  debug: noop,
   warn: noop,
   error: noop,
   critical: noop,
diff --git a/src/logger/logger.js b/src/logger/logger.js
index 234e017f..13fcdee1 100644
--- a/src/logger/logger.js
+++ b/src/logger/logger.js
@@ -350,6 +350,14 @@ export default {
 
   // General functions in case the hooks don't apply
 
+  debug: (...args: any) => {
+    logger.log('debug', ...args)
+  },
+
+  info: (...args: any) => {
+    logger.log('info', ...args)
+  },
+
   log: (...args: any) => {
     logger.log('info', ...args)
   },

From 282934f73fe0611140469357246bb8d44a293e1f Mon Sep 17 00:00:00 2001
From: Anastasia Poupeney <anastasiasergienko@gmail.com>
Date: Wed, 18 Jul 2018 10:26:05 +0200
Subject: [PATCH 10/13] fixes #1169

---
 src/components/base/Chart/handleMouseEvents.js | 4 ++--
 src/styles/reset.js                            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/base/Chart/handleMouseEvents.js b/src/components/base/Chart/handleMouseEvents.js
index b82c0624..adb4d9e7 100644
--- a/src/components/base/Chart/handleMouseEvents.js
+++ b/src/components/base/Chart/handleMouseEvents.js
@@ -65,7 +65,7 @@ export default function handleMouseEvents({
     NODES.tooltip
       .style('transition', '100ms cubic-bezier(.61,1,.53,1) opacity')
       .style('opacity', 1)
-      .style('transform', `translate3d(${MARGINS.left + x(d.parsedDate)}px, 0, 0)`)
+      .style('left', `${Math.floor(MARGINS.left + x(d.parsedDate))}px`)
     NODES.focus.style('opacity', 1)
     NODES.xBar.style('opacity', 1)
   }
@@ -102,7 +102,7 @@ export default function handleMouseEvents({
           </Provider>,
         ),
       )
-      .style('transform', `translate3d(${MARGINS.left + x(d.parsedDate)}px, 0, 0)`)
+      .style('left', `${Math.floor(MARGINS.left + x(d.parsedDate))}px`)
     NODES.xBar
       .attr('x1', x(d.parsedDate))
       .attr('x2', x(d.parsedDate))
diff --git a/src/styles/reset.js b/src/styles/reset.js
index cf45923f..a413c8f3 100644
--- a/src/styles/reset.js
+++ b/src/styles/reset.js
@@ -1,5 +1,6 @@
 module.exports = `* {
   -webkit-font-smoothing: antialiased;
+  backface-visibility: hidden;
   box-sizing: border-box;
   margin: 0;
   padding: 0;

From 5e5433d8b9c5a133b42586ba011523255afd5978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Mon, 23 Jul 2018 18:32:19 +0200
Subject: [PATCH 11/13] update yarn.lock

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index aca105e5..24da8782 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1534,9 +1534,9 @@
     npm "^5.7.1"
     prebuild-install "^2.2.2"
 
-"@ledgerhq/live-common@^2.32.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.34.0.tgz#436ec0816c37f6aabcbca807090f152f1bd3b785"
+"@ledgerhq/live-common@^2.35.0":
+  version "2.35.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.35.0.tgz#526bfb94f1a2f1449674c7854cf2c7a162385018"
   dependencies:
     axios "^0.18.0"
     invariant "^2.2.2"

From 8061336bcb1ad7a7b5a628ce344f10831e8c91c0 Mon Sep 17 00:00:00 2001
From: amougel <alix.mougel@gmail.com>
Date: Mon, 23 Jul 2018 17:13:56 +0200
Subject: [PATCH 12/13] add FORCE_PROVIDER constant for testing

---
 src/config/constants.js              | 3 +++
 src/helpers/devices/getDeviceInfo.js | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/config/constants.js b/src/config/constants.js
index 1fd94965..032f98d9 100644
--- a/src/config/constants.js
+++ b/src/config/constants.js
@@ -56,6 +56,9 @@ export const MANAGER_API_BASE = stringFromEnv(
 
 export const BASE_SOCKET_URL = stringFromEnv('BASE_SOCKET_URL', 'wss://api.ledgerwallet.com/update')
 
+// Provider
+export const FORCE_PROVIDER = intFromEnv('FORCE_PROVIDER', 0)
+
 // Flags
 
 export const DEBUG_ANALYTICS = boolFromEnv('DEBUG_ANALYTICS')
diff --git a/src/helpers/devices/getDeviceInfo.js b/src/helpers/devices/getDeviceInfo.js
index f133b43e..5ea943e3 100644
--- a/src/helpers/devices/getDeviceInfo.js
+++ b/src/helpers/devices/getDeviceInfo.js
@@ -3,6 +3,7 @@
 import type Transport from '@ledgerhq/hw-transport'
 
 import { getFirmwareInfo } from 'helpers/common'
+import { FORCE_PROVIDER } from 'config/constants'
 
 export type DeviceInfo = {
   targetId: string | number,
@@ -31,7 +32,7 @@ export default async (transport: Transport<*>): Promise<DeviceInfo> => {
     seVersion.match(/([0-9]+.[0-9])+(.[0-9]+)?((?!-osu)-([a-z]+))?(-osu)?/) || []
   const isOSU = typeof parsedVersion[5] !== 'undefined'
   const providerName = parsedVersion[4] || ''
-  const providerId = PROVIDERS[providerName]
+  const providerId = FORCE_PROVIDER || PROVIDERS[providerName]
   const isBootloader = targetId === 0x01000001
   const majMin = parsedVersion[1]
   const patch = parsedVersion[2] || '.0'

From 9eee945dbc1025c22bc69fde5b25a9bb1e8b762a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <gaetan.renaudeau@ledger.fr>
Date: Tue, 24 Jul 2018 09:02:58 +0200
Subject: [PATCH 13/13] Fix LibcoreBridge#synchronize to be properly
 unsubscribed

---
 src/bridge/LibcoreBridge.js | 88 +++++++++++++++----------------------
 1 file changed, 35 insertions(+), 53 deletions(-)

diff --git a/src/bridge/LibcoreBridge.js b/src/bridge/LibcoreBridge.js
index 6ea7ff24..c899c342 100644
--- a/src/bridge/LibcoreBridge.js
+++ b/src/bridge/LibcoreBridge.js
@@ -1,8 +1,7 @@
 // @flow
 import React from 'react'
-import { Observable } from 'rxjs'
-import LRU from 'lru-cache'
 import { map } from 'rxjs/operators'
+import LRU from 'lru-cache'
 import type { Account } from '@ledgerhq/live-common/lib/types'
 import { decodeAccount, encodeAccount } from 'reducers/accounts'
 import FeesBitcoinKind from 'components/FeesField/BitcoinKind'
@@ -110,58 +109,41 @@ const LibcoreBridge: WalletBridge<Transaction> = {
   },
 
   synchronize: account =>
-    Observable.create(o => {
-      // FIXME TODO:
-      // - 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
-      ;(async () => {
-        try {
-          const rawAccount = encodeAccount(account)
-          const rawSyncedAccount = await libcoreSyncAccount.send({ rawAccount }).toPromise()
-          const syncedAccount = decodeAccount(rawSyncedAccount)
-          o.next(account => {
-            const accountOps = account.operations
-            const syncedOps = syncedAccount.operations
-            const patch: $Shape<Account> = {
-              id: syncedAccount.id,
-              freshAddress: syncedAccount.freshAddress,
-              freshAddressPath: syncedAccount.freshAddressPath,
-              balance: syncedAccount.balance,
-              blockHeight: syncedAccount.blockHeight,
-              lastSyncDate: new Date(),
-            }
-
-            const hasChanged =
-              accountOps.length !== syncedOps.length || // size change, we do a full refresh for now...
-              (accountOps.length > 0 &&
-                syncedOps.length > 0 &&
-                (accountOps[0].accountId !== syncedOps[0].accountId ||
-                accountOps[0].id !== syncedOps[0].id || // if same size, only check if the last item has changed.
-                  accountOps[0].blockHeight !== syncedOps[0].blockHeight))
-
-            if (hasChanged) {
-              patch.operations = syncedAccount.operations
-              patch.pendingOperations = [] // For now, we assume a change will clean the pendings.
-            }
-
-            return {
-              ...account,
-              ...patch,
-            }
-          })
-          o.complete()
-        } catch (e) {
-          o.error(e)
+    libcoreSyncAccount.send({ rawAccount: encodeAccount(account) }).pipe(
+      map(rawSyncedAccount => {
+        const syncedAccount = decodeAccount(rawSyncedAccount)
+        return account => {
+          const accountOps = account.operations
+          const syncedOps = syncedAccount.operations
+          const patch: $Shape<Account> = {
+            id: syncedAccount.id,
+            freshAddress: syncedAccount.freshAddress,
+            freshAddressPath: syncedAccount.freshAddressPath,
+            balance: syncedAccount.balance,
+            blockHeight: syncedAccount.blockHeight,
+            lastSyncDate: new Date(),
+          }
+
+          const hasChanged =
+            accountOps.length !== syncedOps.length || // size change, we do a full refresh for now...
+            (accountOps.length > 0 &&
+              syncedOps.length > 0 &&
+              (accountOps[0].accountId !== syncedOps[0].accountId ||
+              accountOps[0].id !== syncedOps[0].id || // if same size, only check if the last item has changed.
+                accountOps[0].blockHeight !== syncedOps[0].blockHeight))
+
+          if (hasChanged) {
+            patch.operations = syncedAccount.operations
+            patch.pendingOperations = [] // For now, we assume a change will clean the pendings.
+          }
+
+          return {
+            ...account,
+            ...patch,
+          }
         }
-      })()
-      return {
-        unsubscribe() {
-          // LibcoreBridge: unsub sync not currently implemented
-        },
-      }
-    }),
+      }),
+    ),
 
   pullMoreOperations: () => Promise.reject(notImplemented),