diff --git a/src/components/DeviceInteraction/components.js b/src/components/DeviceInteraction/components.js
index a81e425f..77e8a82c 100644
--- a/src/components/DeviceInteraction/components.js
+++ b/src/components/DeviceInteraction/components.js
@@ -19,6 +19,7 @@ export const DeviceInteractionStepContainer = styled(Box).attrs({
ff: 'Open Sans',
fontSize: 3,
color: 'graphite',
+ bg: p => (p.isActive && !p.isFinished ? 'white' : ''),
})`
position: relative;
z-index: ${p => (p.isActive ? 1 : '')};
diff --git a/src/components/EnsureDeviceApp.js b/src/components/EnsureDeviceApp.js
index c63caa6b..d001471d 100644
--- a/src/components/EnsureDeviceApp.js
+++ b/src/components/EnsureDeviceApp.js
@@ -79,7 +79,7 @@ class EnsureDeviceApp extends Component<{
return (
{'Open the '}
- {cur.name}
+ {cur.name}
{' app on your device'}
)
diff --git a/src/components/ManagerPage/ManagerGenuineCheck.js b/src/components/ManagerPage/ManagerGenuineCheck.js
index a5255073..db0d9303 100644
--- a/src/components/ManagerPage/ManagerGenuineCheck.js
+++ b/src/components/ManagerPage/ManagerGenuineCheck.js
@@ -22,9 +22,8 @@ class ManagerGenuineCheck extends PureComponent {
render() {
const { t, onSuccess } = this.props
return (
-
+
-
{
handleResetScanState = () => {
this.setState({
+ isAppOpened: false,
scanStatus: 'idle',
err: null,
scannedAccounts: [],
diff --git a/src/components/modals/OperationDetails.js b/src/components/modals/OperationDetails.js
index 504839da..732f3444 100644
--- a/src/components/modals/OperationDetails.js
+++ b/src/components/modals/OperationDetails.js
@@ -8,6 +8,7 @@ import styled from 'styled-components'
import moment from 'moment'
import { getOperationAmountNumber } from '@ledgerhq/live-common/lib/helpers/operation'
import { getAccountOperationExplorer } from '@ledgerhq/live-common/lib/explorers'
+import uniq from 'lodash/uniq'
import TrackPage from 'analytics/TrackPage'
import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
@@ -126,6 +127,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => {
const isConfirmed = confirmations >= currencySettings.confirmationsNb
const url = getAccountOperationExplorer(account, operation)
+ const uniqueSenders = uniq(senders)
return (
@@ -217,12 +219,12 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => {
{t('app:operationDetails.from')}
-
+
{t('app:operationDetails.to')}
-
+
@@ -271,7 +273,7 @@ const More = styled(Text).attrs({
outline: none;
`
-export class Recipients extends Component<{ recipients: Array<*>, t: T }, *> {
+export class DataList extends Component<{ lines: string[], t: T }, *> {
state = {
showMore: false,
}
@@ -279,18 +281,18 @@ export class Recipients extends Component<{ recipients: Array<*>, t: T }, *> {
this.setState(({ showMore }) => ({ showMore: !showMore }))
}
render() {
- const { recipients, t } = this.props
+ const { lines, t } = this.props
const { showMore } = this.state
// Hardcoded for now
const numToShow = 2
- const shouldShowMore = recipients.length > 3
+ const shouldShowMore = lines.length > 3
return (
- {(shouldShowMore ? recipients.slice(0, numToShow) : recipients).map(recipient => (
-
- {recipient}
+ {(shouldShowMore ? lines.slice(0, numToShow) : lines).map(line => (
+
+ {line}
-
+
))}
@@ -299,14 +301,12 @@ export class Recipients extends Component<{ recipients: Array<*>, t: T }, *> {
- {t('app:operationDetails.showMore', { recipients: recipients.length - numToShow })}
+ {t('app:operationDetails.showMore', { recipients: lines.length - numToShow })}
)}
{showMore &&
- recipients
- .slice(numToShow)
- .map(recipient => {recipient})}
+ lines.slice(numToShow).map(line => {line})}
{shouldShowMore &&
showMore && (
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 b7e653bb..f7ab82d5 100644
--- a/src/components/modals/Receive/steps/03-step-confirm-address.js
+++ b/src/components/modals/Receive/steps/03-step-confirm-address.js
@@ -74,7 +74,7 @@ const Container = styled(Box).attrs({
})``
const Title = styled(Box).attrs({
- ff: 'Museo Sans|Regular',
+ ff: 'Open Sans|SemiBold',
fontSize: 6,
mb: 1,
})``
diff --git a/src/components/modals/StepConnectDevice.js b/src/components/modals/StepConnectDevice.js
index 5a037481..d9eb4ffc 100644
--- a/src/components/modals/StepConnectDevice.js
+++ b/src/components/modals/StepConnectDevice.js
@@ -20,7 +20,7 @@ const StepConnectDevice = ({ account, currency, onChangeDevice, onStatusChange }
{
// TODO: remove those non-nense callbacks
if (onChangeDevice) {