Browse Source
Update font-weight and icon styles of DeviceInteraction
master
meriadec
7 years ago
No known key found for this signature in database
GPG Key ID: 1D2FC2305E2CB399
3 changed files with
8 additions and
8 deletions
-
src/components/DeviceInteraction/DeviceInteractionStep.js
-
src/components/EnsureDeviceApp.js
-
src/components/GenuineCheck.js
|
|
@ -180,7 +180,7 @@ class DeviceInteractionStep extends PureComponent< |
|
|
|
<IconContainer isTransparent={!isActive && !isSuccess}>{step.icon}</IconContainer> |
|
|
|
<Box py={4} justify="center" grow shrink> |
|
|
|
{title && ( |
|
|
|
<Box color={isActive || isSuccess ? 'dark' : ''} ff="Open Sans|SemiBold"> |
|
|
|
<Box color={isActive || isSuccess ? 'dark' : ''} ff="Open Sans|Regular"> |
|
|
|
{title} |
|
|
|
</Box> |
|
|
|
)} |
|
|
|
|
|
@ -27,8 +27,8 @@ import { getCurrentDevice } from 'reducers/devices' |
|
|
|
export const WrongAppOpened = createCustomErrorClass('WrongAppOpened') |
|
|
|
export const WrongDeviceForAccount = createCustomErrorClass('WrongDeviceForAccount') |
|
|
|
|
|
|
|
const usbIcon = <IconUsb size={18} /> |
|
|
|
const Bold = props => <Text ff="Open Sans|Bold" {...props} /> |
|
|
|
const usbIcon = <IconUsb size={16} /> |
|
|
|
const Bold = props => <Text ff="Open Sans|SemiBold" {...props} /> |
|
|
|
|
|
|
|
const mapStateToProps = state => ({ |
|
|
|
device: getCurrentDevice(state), |
|
|
@ -107,7 +107,7 @@ class EnsureDeviceApp extends Component<{ |
|
|
|
{ |
|
|
|
id: 'address', |
|
|
|
title: this.renderOpenAppTitle, |
|
|
|
icon: Icon ? <Icon size={18} /> : null, |
|
|
|
icon: Icon ? <Icon size={16} /> : null, |
|
|
|
run: this.openAppInteractionHandler, |
|
|
|
}, |
|
|
|
]} |
|
|
|
|
|
@ -36,15 +36,15 @@ type Props = { |
|
|
|
device: ?Device, |
|
|
|
} |
|
|
|
|
|
|
|
const usbIcon = <IconUsb size={18} /> |
|
|
|
const homeIcon = <IconHome size={18} /> |
|
|
|
const genuineCheckIcon = <IconCheck size={18} /> |
|
|
|
const usbIcon = <IconUsb size={16} /> |
|
|
|
const homeIcon = <IconHome size={16} /> |
|
|
|
const genuineCheckIcon = <IconCheck size={16} /> |
|
|
|
|
|
|
|
const mapStateToProps = state => ({ |
|
|
|
device: getCurrentDevice(state), |
|
|
|
}) |
|
|
|
|
|
|
|
const Bold = props => <Text ff="Open Sans|Bold" {...props} /> |
|
|
|
const Bold = props => <Text ff="Open Sans|SemiBold" {...props} /> |
|
|
|
|
|
|
|
// to speed up genuine check, cache result by device id
|
|
|
|
const genuineDevices = new WeakSet() |
|
|
|