Browse Source

update for nano x

develop
Valentin D. Pinkman 6 years ago
parent
commit
b5bacfb228
No known key found for this signature in database GPG Key ID: E7D110669FFB8D3E
  1. 1
      package.json
  2. 3
      src/analytics/segment.js
  3. 7
      src/components/ManagerPage/DeviceInfos.js
  4. 13
      src/components/ManagerPage/FirmwareUpdate.js
  5. 11
      src/renderer/events.js
  6. 5
      src/types/common.js
  7. 4
      static/i18n/en/app.json

1
package.json

@ -35,6 +35,7 @@
}
},
"dependencies": {
"@ledgerhq/devices": "^4.39.0",
"@ledgerhq/errors": "^4.39.0",
"@ledgerhq/hw-app-btc": "^4.39.0",
"@ledgerhq/hw-app-eth": "^4.39.0",

3
src/analytics/segment.js

@ -3,6 +3,7 @@
import uuid from 'uuid/v4'
import logger from 'logger'
import invariant from 'invariant'
import { getDeviceModel } from '@ledgerhq/devices'
import { getSystemLocale } from 'helpers/systemLocale'
import { langAndRegionSelector, shareAnalyticsSelector } from 'reducers/settings'
import { getCurrentDevice } from 'reducers/devices'
@ -34,7 +35,7 @@ const extraProperties = store => {
const systemLocale = getSystemLocale()
const device = getCurrentDevice(state)
const deviceInfo = device && {
productId: device.productId,
productId: getDeviceModel(device.modelId).usbProductId,
}
return {
appVersion: __APP_VERSION__,

7
src/components/ManagerPage/DeviceInfos.js

@ -5,7 +5,7 @@ import React, { PureComponent } from 'react'
import Text from 'components/base/Text'
import Box, { Card } from 'components/base/Box'
import Button from 'components/base/Button'
import { getDeviceModel } from '@ledgerhq/devices'
import type { Device, MemoryInfos } from 'types/common'
import MemInfos from './MemInfos'
@ -43,10 +43,11 @@ class DeviceInfos extends PureComponent<Props, State> {
return <Box py={5}>{'You dont have any device connected'}</Box>
}
const deviceInfos = getDeviceModel(device.modelId)
const title = (
<Text>
{device.manufacturer}
<Text ff="Museo Sans|Bold">{` ${device.product}`}</Text>
<Text ff="Museo Sans|Bold">{`${deviceInfos.productName}`}</Text>
</Text>
)
return (

13
src/components/ManagerPage/FirmwareUpdate.js

@ -3,10 +3,10 @@
import React, { PureComponent, Fragment } from 'react'
import { translate } from 'react-i18next'
import { getDeviceModel } from '@ledgerhq/devices'
import type { DeviceInfo, FirmwareUpdateContext } from '@ledgerhq/live-common/lib/types/manager'
import type { Device, T } from 'types/common'
import type { DeviceInfo, FirmwareUpdateContext } from '@ledgerhq/live-common/lib/types/manager'
import type { StepId } from 'components/modals/UpdateFirmware'
import getLatestFirmwareForDevice from 'commands/getLatestFirmwareForDevice'
@ -81,18 +81,19 @@ class FirmwareUpdate extends PureComponent<Props, State> {
render() {
const { deviceInfo, t, device } = this.props
const { firmware, modal, stepId, ready } = this.state
const deviceSpecs = getDeviceModel(device.modelId)
return (
<Card p={4}>
<Box horizontal align="center" flow={2}>
<Box color="dark">
{device.product === 'Blue' ? <Blue size={30} /> : <NanoS size={30} />}
{deviceSpecs.id === 'blue' ? <Blue size={30} /> : <NanoS size={30} />}
</Box>
<Box>
<Box horizontal align="center">
<Text ff="Open Sans|SemiBold" fontSize={4} color="dark">
{device.product === 'Blue'
? t('manager.firmware.titleBlue')
: t('manager.firmware.titleNano')}
{deviceSpecs.productName}
</Text>
<Box color="wallet" ml={2}>
<Tooltip render={() => t('manager.yourDeviceIsGenuine')}>

11
src/renderer/events.js

@ -51,14 +51,19 @@ export default ({ store }: { store: Object }) => {
function syncDevices() {
syncDeviceSub = listenDevices.send().subscribe(
({ device, type }) => {
({ device, deviceModel, type }) => {
if (device) {
const stateDevice = {
path: device.path,
modelId: deviceModel ? deviceModel.id : 'nanoS',
type: 'hid',
}
if (type === 'add') {
d.device('Device - add')
store.dispatch(addDevice(device))
store.dispatch(addDevice(stateDevice))
} else if (type === 'remove') {
d.device('Device - remove')
store.dispatch(removeDevice(device))
store.dispatch(removeDevice(stateDevice))
}
}
},

5
src/types/common.js

@ -1,11 +1,8 @@
// @flow
export type Device = {
manufacturer: string,
path: string,
product: string,
productId: string,
vendorId: string,
modelId: string,
}
// -------------------- Settings

4
static/i18n/en/app.json

@ -254,8 +254,6 @@
},
"firmware": {
"installed": "Firmware version {{version}}",
"titleNano": "Ledger Nano S",
"titleBlue": "Ledger Blue",
"update": "Update",
"latest": "Firmware version {{version}} is available",
"disclaimerTitle": "You are about to install <1><0>firmware version {{version}}</0></1>.",
@ -933,4 +931,4 @@
"description": "Please contact Ledger Support"
}
}
}
}
Loading…
Cancel
Save