diff --git a/src/components/AccountPage/index.js b/src/components/AccountPage/index.js index 5bd21ee9..7b0f5101 100644 --- a/src/components/AccountPage/index.js +++ b/src/components/AccountPage/index.js @@ -74,8 +74,8 @@ type State = { class AccountPage extends PureComponent { state = { - selectedTime: 'week', - daysCount: 7, + selectedTime: 'month', + daysCount: 30, } handleChangeSelectedTime = item => diff --git a/src/components/DashboardPage/AccountCard.js b/src/components/DashboardPage/AccountCard.js index 1aa61b95..1e392ff2 100644 --- a/src/components/DashboardPage/AccountCard.js +++ b/src/components/DashboardPage/AccountCard.js @@ -41,7 +41,7 @@ class AccountCard extends PureComponent<{ - {account.unit.code} + {account.currency.name} {account.name} diff --git a/src/components/OperationsList/index.js b/src/components/OperationsList/index.js index d060156b..eef11544 100644 --- a/src/components/OperationsList/index.js +++ b/src/components/OperationsList/index.js @@ -1,6 +1,6 @@ // @flow -import React, { PureComponent } from 'react' +import React, { PureComponent, Fragment } from 'react' import styled from 'styled-components' import { connect } from 'react-redux' import { compose } from 'redux' @@ -9,6 +9,9 @@ import { groupAccountOperationsByDay, groupAccountsOperationsByDay, } from '@ledgerhq/live-common/lib/helpers/account' +import IconReceive from 'icons/Receive' +import IconSend from 'icons/Send' +import Button from 'components/base/Button' import type { Operation, Account } from '@ledgerhq/live-common/lib/types' @@ -66,7 +69,13 @@ const initialState = { nbToShow: 20, } -const footerPlaceholder = null // TODO figure out with design what we want here +const footerPlaceholder = ( + + + No more operations + + +) export class OperationsList extends PureComponent { static defaultProps = { diff --git a/src/components/base/Modal/ModalBody.js b/src/components/base/Modal/ModalBody.js index f6056f2a..bf437430 100644 --- a/src/components/base/Modal/ModalBody.js +++ b/src/components/base/Modal/ModalBody.js @@ -55,13 +55,13 @@ class ModalBody extends PureComponent { } const CloseContainer = styled(Box).attrs({ - p: 4, + p: 2, color: 'fog', })` cursor: pointer; position: absolute; - top: 0; - right: 0; + top: 25px; + right: 10px; z-index: 1; &:hover { diff --git a/src/components/modals/OperationDetails.js b/src/components/modals/OperationDetails.js index e1c56783..5f58a9b9 100644 --- a/src/components/modals/OperationDetails.js +++ b/src/components/modals/OperationDetails.js @@ -160,7 +160,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => { Fees - + diff --git a/src/main/app.js b/src/main/app.js index 4cc4afaf..7367ab42 100644 --- a/src/main/app.js +++ b/src/main/app.js @@ -65,7 +65,7 @@ const defaultWindowOptions = { } function createMainWindow() { - const MIN_HEIGHT = 500 //768 + const MIN_HEIGHT = 720 const MIN_WIDTH = 1024 const savedDimensions = db.getIn('settings', 'window.MainWindow.dimensions', {})