Skip to content
Permalink
Browse files

Merge branch 'develop' into feat/experimental-languages

  • Loading branch information...
gre committed May 3, 2019
2 parents 679b621 + fd1a731 commit 07954ad33972b2e31748c09399042224c9a0f596
@@ -3,6 +3,7 @@
import React, { PureComponent } from 'react'
import styled from 'styled-components'
import { connect } from 'react-redux'
import { Trans } from 'react-i18next'
import { getDeviceModel } from '@ledgerhq/devices'
import type { DeviceModelId } from '@ledgerhq/devices'

@@ -17,10 +18,10 @@ import TrackPage from 'analytics/TrackPage'

import IconCheckCirle from 'icons/Check'

import type { StepProps } from '..'
import { Title, Inner, FixedTopContainer, StepContainerInner } from '../helperComponents'
import OnboardingFooter from '../OnboardingFooter'

import type { StepProps } from '..'
import Tooltip from '../../base/Tooltip'

const mapDispatchToProps = { deviceModelId }

@@ -57,6 +58,11 @@ class SelectDevice extends PureComponent<StepProps, {}> {
<img alt="" src={i('ledger-nano-x-onb.svg')} />
</DeviceIcon>
<BlockTitle>{getDeviceModel('nanoX').productName}</BlockTitle>
<Tooltip render={() => <Trans i18nKey="onboarding.selectDevice.usbOnlyTooltip" />}>
<USBOnly>
<Trans i18nKey="onboarding.selectDevice.usbOnly" />
</USBOnly>
</Tooltip>
</DeviceContainer>
<DeviceContainer
isActive={onboarding.deviceModelId === 'nanoS'}
@@ -150,3 +156,19 @@ const SelectDeviceIconWrapper = styled(Box).attrs({
width: 18px;
height: 18px;
`

const USBOnly = styled(Box).attrs({
alignItems: 'center',
justifyContent: 'center',
ff: 'Open Sans|Bold',
fontSize: 0,
borderRadius: '2px',
})`
position: absolute;
bottom: 20px;
background-color: ${p => p.theme.colors.lightFog};
line-height: 16px;
padding: 0 4px;
text-transform: uppercase;
transform: translateX(-50%);
`
@@ -639,7 +639,9 @@
}
},
"selectDevice": {
"title": "Select your device"
"title": "Select your device",
"usbOnly": "usb only",
"usbOnlyTooltip": "Ledger Live desktop currently does not support Bluetooth"
},
"selectPIN": {
"disclaimer": {
@@ -588,7 +588,9 @@
}
},
"selectDevice": {
"title": "Selecciona tu dispositivo"
"title": "Selecciona tu dispositivo",
"usbOnly": "usb only",
"usbOnlyTooltip": "Ledger Live desktop currently does not support Bluetooth"
},
"selectPIN": {
"disclaimer": {
@@ -588,7 +588,9 @@
}
},
"selectDevice": {
"title": "Sélectionner votre appareil"
"title": "Sélectionner votre appareil",
"usbOnly": "usb only",
"usbOnlyTooltip": "Ledger Live desktop currently does not support Bluetooth"
},
"selectPIN": {
"disclaimer": {
@@ -588,7 +588,9 @@
}
},
"selectDevice": {
"title": "機器を選択"
"title": "機器を選択",
"usbOnly": "usb only",
"usbOnlyTooltip": "Ledger Live desktop currently does not support Bluetooth"
},
"selectPIN": {
"disclaimer": {
@@ -588,7 +588,9 @@
}
},
"selectDevice": {
"title": "장치 선택"
"title": "장치 선택",
"usbOnly": "usb only",
"usbOnlyTooltip": "Ledger Live desktop currently does not support Bluetooth"
},
"selectPIN": {
"disclaimer": {
@@ -588,7 +588,9 @@
}
},
"selectDevice": {
"title": "Выберите свое устройство"
"title": "Выберите свое устройство",
"usbOnly": "usb only",
"usbOnlyTooltip": "Ledger Live desktop currently does not support Bluetooth"
},
"selectPIN": {
"disclaimer": {
@@ -588,7 +588,9 @@
}
},
"selectDevice": {
"title": "选择您的设备"
"title": "选择您的设备",
"usbOnly": "usb only",
"usbOnlyTooltip": "Ledger Live desktop currently does not support Bluetooth"
},
"selectPIN": {
"disclaimer": {

0 comments on commit 07954ad

Please sign in to comment.
You can’t perform that action at this time.