From dfbe519a3f6a0819056763cc1ebde7ffac90d1a4 Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 4 Jul 2018 11:51:41 +0200 Subject: [PATCH 1/8] Fix ManagerGenuineCheck vertical padding --- src/components/ManagerPage/ManagerGenuineCheck.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 ( - + - Date: Wed, 4 Jul 2018 11:53:20 +0200 Subject: [PATCH 2/8] Make currency name bold in EnsureDeviceApp --- src/components/EnsureDeviceApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'} ) From ab9a72156da147d4b3688af93d336e7caff4d31b Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 4 Jul 2018 11:58:38 +0200 Subject: [PATCH 3/8] Update EnsureDeviceApp interaction delay --- src/components/modals/StepConnectDevice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From ab4eee1bdb7359322c0b2faf9ca6ee0581546f7c Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 4 Jul 2018 12:00:24 +0200 Subject: [PATCH 4/8] Correct reset of app opened state in AddAccountsModal This one allowed to go to 3rd step without validating 2nd one :D --- src/components/modals/AddAccounts/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/modals/AddAccounts/index.js b/src/components/modals/AddAccounts/index.js index 8c5230f5..2e65f1db 100644 --- a/src/components/modals/AddAccounts/index.js +++ b/src/components/modals/AddAccounts/index.js @@ -190,6 +190,7 @@ class AddAccounts extends PureComponent { handleResetScanState = () => { this.setState({ + isAppOpened: false, scanStatus: 'idle', err: null, scannedAccounts: [], From 78b1bd1a1a7d568e2114b801da1875bf5dba05c3 Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 4 Jul 2018 12:09:13 +0200 Subject: [PATCH 5/8] Fix duplicate senders in OperationDetailsModal --- src/components/modals/OperationDetails.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/modals/OperationDetails.js b/src/components/modals/OperationDetails.js index a760ac99..0bb58d85 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 type { Account, Operation } from '@ledgerhq/live-common/lib/types' import type { T, CurrencySettings } from 'types/common' @@ -125,6 +126,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => { const isConfirmed = confirmations >= currencySettings.confirmationsNb const url = getAccountOperationExplorer(account, operation) + const uniqueSenders = uniq(senders) return ( @@ -215,7 +217,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => { {t('app:operationDetails.from')} - + From 81e809f21ad9f3db99e2237d13885530c0c05e30 Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 4 Jul 2018 12:13:22 +0200 Subject: [PATCH 6/8] Rename Recipient => DataList in OperationDetailsModal --- src/components/modals/OperationDetails.js | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/components/modals/OperationDetails.js b/src/components/modals/OperationDetails.js index 0bb58d85..f85fd921 100644 --- a/src/components/modals/OperationDetails.js +++ b/src/components/modals/OperationDetails.js @@ -217,12 +217,12 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => { {t('app:operationDetails.from')} - + {t('app:operationDetails.to')} - + @@ -271,7 +271,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 +279,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 +299,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 && ( From 09d162ee7ac2d2e73882897fa18da1edff8fd932 Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 4 Jul 2018 12:16:26 +0200 Subject: [PATCH 7/8] Fonts polishes --- src/components/base/AccountsList/index.js | 1 + src/components/modals/Receive/steps/03-step-confirm-address.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/base/AccountsList/index.js b/src/components/base/AccountsList/index.js index 2793d33c..a9cfe13b 100644 --- a/src/components/base/AccountsList/index.js +++ b/src/components/base/AccountsList/index.js @@ -86,6 +86,7 @@ class AccountsList extends Component< {withToggleAll && ( Date: Wed, 4 Jul 2018 14:37:55 +0200 Subject: [PATCH 8/8] White background on active device interaction step --- src/components/DeviceInteraction/components.js | 1 + 1 file changed, 1 insertion(+) 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 : '')};