Browse Source

pixel push

master
Gaëtan Renaudeau 7 years ago
parent
commit
625d7e1274
  1. 4
      src/components/AccountPage/index.js
  2. 2
      src/components/DashboardPage/AccountCard.js
  3. 13
      src/components/OperationsList/index.js
  4. 6
      src/components/base/Modal/ModalBody.js
  5. 2
      src/components/modals/OperationDetails.js
  6. 2
      src/main/app.js

4
src/components/AccountPage/index.js

@ -74,8 +74,8 @@ type State = {
class AccountPage extends PureComponent<Props, State> { class AccountPage extends PureComponent<Props, State> {
state = { state = {
selectedTime: 'week', selectedTime: 'month',
daysCount: 7, daysCount: 30,
} }
handleChangeSelectedTime = item => handleChangeSelectedTime = item =>

2
src/components/DashboardPage/AccountCard.js

@ -41,7 +41,7 @@ class AccountCard extends PureComponent<{
</Box> </Box>
<Box> <Box>
<Box style={{ textTransform: 'uppercase' }} fontSize={0} color="graphite"> <Box style={{ textTransform: 'uppercase' }} fontSize={0} color="graphite">
{account.unit.code} {account.currency.name}
</Box> </Box>
<Box fontSize={4} color="dark"> <Box fontSize={4} color="dark">
{account.name} {account.name}

13
src/components/OperationsList/index.js

@ -1,6 +1,6 @@
// @flow // @flow
import React, { PureComponent } from 'react' import React, { PureComponent, Fragment } from 'react'
import styled from 'styled-components' import styled from 'styled-components'
import { connect } from 'react-redux' import { connect } from 'react-redux'
import { compose } from 'redux' import { compose } from 'redux'
@ -9,6 +9,9 @@ import {
groupAccountOperationsByDay, groupAccountOperationsByDay,
groupAccountsOperationsByDay, groupAccountsOperationsByDay,
} from '@ledgerhq/live-common/lib/helpers/account' } 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' import type { Operation, Account } from '@ledgerhq/live-common/lib/types'
@ -66,7 +69,13 @@ const initialState = {
nbToShow: 20, nbToShow: 20,
} }
const footerPlaceholder = null // TODO figure out with design what we want here const footerPlaceholder = (
<Box p={4} align="center">
<Text ff="Open Sans" fontSize={3}>
No more operations
</Text>
</Box>
)
export class OperationsList extends PureComponent<Props, State> { export class OperationsList extends PureComponent<Props, State> {
static defaultProps = { static defaultProps = {

6
src/components/base/Modal/ModalBody.js

@ -55,13 +55,13 @@ class ModalBody extends PureComponent<Props, State> {
} }
const CloseContainer = styled(Box).attrs({ const CloseContainer = styled(Box).attrs({
p: 4, p: 2,
color: 'fog', color: 'fog',
})` })`
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
top: 0; top: 25px;
right: 0; right: 10px;
z-index: 1; z-index: 1;
&:hover { &:hover {

2
src/components/modals/OperationDetails.js

@ -160,7 +160,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => {
<Line> <Line>
<ColLeft>Fees</ColLeft> <ColLeft>Fees</ColLeft>
<ColRight> <ColRight>
<FormattedVal unit={unit} showCode val={fee} /> <FormattedVal unit={unit} showCode val={fee} color="dark" />
</ColRight> </ColRight>
</Line> </Line>
<B /> <B />

2
src/main/app.js

@ -65,7 +65,7 @@ const defaultWindowOptions = {
} }
function createMainWindow() { function createMainWindow() {
const MIN_HEIGHT = 500 //768 const MIN_HEIGHT = 720
const MIN_WIDTH = 1024 const MIN_WIDTH = 1024
const savedDimensions = db.getIn('settings', 'window.MainWindow.dimensions', {}) const savedDimensions = db.getIn('settings', 'window.MainWindow.dimensions', {})

Loading…
Cancel
Save