Merge pull request #711 from LedgerHQ/develop

Prepare for beta.3

electron-builder.yml

@@ -1,5 +1,4 @@
 appId: com.ledger.live
-npmRebuild: false
 
 protocols:
   name: Ledger Live
@@ -36,16 +35,17 @@ win:
     - target: nsis
       arch:
         - x64
-        - ia32
     - target: zip
       arch:
         - x64
-        - ia32
 
 nsis:
   oneClick: false
   perMachine: true
   allowToChangeInstallationDirectory: true
+  installerIcon: build/windows/installer.ico
+  installerSidebar: build/windows/installerSidebar.bmp
+  uninstallerSidebar: build/windows/uninstallerSidebar.bmp
 
 files:
   # Include files

src/components/ManagerPage/Dashboard.js

@@ -3,6 +3,7 @@ import React from 'react'
 import { translate } from 'react-i18next'
 
 import type { T, Device } from 'types/common'
+import type { DeviceInfo } from 'helpers/devices/getDeviceInfo'
 
 import Box from 'components/base/Box'
 import Text from 'components/base/Text'
@@ -10,13 +11,6 @@ import Text from 'components/base/Text'
 import AppsList from './AppsList'
 import FirmwareUpdate from './FirmwareUpdate'
 
-type DeviceInfo = {
-  targetId: number | string,
-  version: string,
-  final: boolean,
-  mcu: boolean,
-}
-
 type Props = {
   t: T,
   device: Device,
@@ -37,7 +31,12 @@ const Dashboard = ({ device, deviceInfo, t }: Props) => (
       <FirmwareUpdate deviceInfo={deviceInfo} device={device} />
     </Box>
     <Box mt={5}>
-      <AppsList device={device} targetId={deviceInfo.targetId} version={deviceInfo.version} />
+      <AppsList
+        device={device}
+        targetId={deviceInfo.targetId}
+        provider={deviceInfo.providerId}
+        fullVersion={deviceInfo.fullVersion}
+      />
     </Box>
   </Box>
 )

src/components/TopBar/ActivityIndicator.js

@@ -46,7 +46,6 @@ class ActivityIndicatorInner extends PureComponent<Props, { lastClickTime: numbe
   onClick = () => {
     this.props.cvPoll()
     this.props.setSyncBehavior({ type: 'SYNC_ALL_ACCOUNTS', priority: 5 })
-    this.lastClickTime = Date.now()
     this.setState({ lastClickTime: Date.now() })
   }