Merge pull request #113 from loeck/master

Change design for TransactionsList

src/components/AccountPage.js

@@ -104,7 +104,7 @@ class AccountPage extends PureComponent<Props> {
                 </Card>
               </Box>
             </Box>
-            <Card title={t('AccountPage.lastOperations')}>
+            <Card p={0} px={4} title={t('AccountPage.lastOperations')}>
               <TransactionsList transactions={accountData.transactions} />
             </Card>
           </Fragment>

src/components/DashboardPage/index.js

@@ -7,7 +7,9 @@ import { connect } from 'react-redux'
 import { push } from 'react-router-redux'
 
 import chunk from 'lodash/chunk'
+import get from 'lodash/get'
 import random from 'lodash/random'
+import sortBy from 'lodash/sortBy'
 import takeRight from 'lodash/takeRight'
 
 import type { MapStateToProps } from 'react-redux'
@@ -21,6 +23,7 @@ import { AreaChart } from 'components/base/Chart'
 import Box, { Card } from 'components/base/Box'
 import Pills from 'components/base/Pills'
 import Text from 'components/base/Text'
+import TransactionsList from 'components/TransactionsList'
 
 import AccountCard from './AccountCard'
 import BalanceInfos from './BalanceInfos'
@@ -58,6 +61,28 @@ const generateFakeData = v => ({
   value: random(10, 100),
 })
 
+const getAllTransactions = accounts => {
+  const allTransactions = accounts.reduce((result, account) => {
+    const transactions = get(account, 'data.transactions', [])
+
+    result = [
+      ...result,
+      ...transactions.map(t => ({
+        ...t,
+        account: {
+          id: account.id,
+          name: account.name,
+          type: account.type,
+        },
+      })),
+    ]
+
+    return result
+  }, [])
+
+  return sortBy(allTransactions, t => t.received_at).reverse()
+}
+
 class DashboardPage extends PureComponent<Props, State> {
   state = {
     selectedTime: 'day',
@@ -200,6 +225,9 @@ class DashboardPage extends PureComponent<Props, State> {
                   </Box>
                 ))}
               </Box>
+              <Card p={0} px={4} title="Recent activity">
+                <TransactionsList withAccounts transactions={getAllTransactions(accounts)} />
+              </Card>
             </Box>
           </Fragment>
         )}

src/components/TransactionsList/index.js

@@ -5,25 +5,40 @@ import styled from 'styled-components'
 import moment from 'moment'
 import get from 'lodash/get'
 
-import Defer from 'components/base/Defer'
+import type { Transaction as TransactionType } from 'types/common'
+
 import Box from 'components/base/Box'
+import Defer from 'components/base/Defer'
+import FormattedVal from 'components/base/FormattedVal'
 import Text from 'components/base/Text'
 
-import { formatBTC } from 'helpers/format'
+import IconCurrencyBitcoin from 'icons/currencies/Bitcoin'
 
-import type { Transaction as TransactionType } from 'types/common'
+const DATE_COL_SIZE = 80
-
+const ACCOUNT_COL_SIZE = 150
-const DATE_COL_SIZE = 250
 const AMOUNT_COL_SIZE = 150
 
 const Cap = styled(Text).attrs({
-  fontSize: 0,
+  fontSize: 2,
-  color: 'mouse',
+  color: 'warmGrey',
+  ff: 'Museo Sans|Bold',
 })`
   text-transform: uppercase;
-  letter-spacing: 1px;
 `
 
+const Day = styled(Text).attrs({
+  color: 'dark',
+  fontSize: 3,
+  ff: 'Open Sans',
+})`
+  letter-spacing: 0.3px;
+  text-transform: uppercase;
+`
+
+const Hour = styled(Day).attrs({
+  color: 'warmGrey',
+})``
+
 const HeaderCol = ({ size, children, ...props }: { size?: number, children: any }) => (
   <Cell size={size} {...props}>
     <Cap>{children}</Cap>
@@ -37,15 +52,17 @@ HeaderCol.defaultProps = {
 const TransactionRaw = styled(Box).attrs({
   horizontal: true,
   align: 'center',
-  py: 2,
 })`
-  &:nth-child(odd) {
+  border-bottom: 1px solid ${p => p.theme.colors.argile};
-    background: ${p => p.theme.colors.cream};
+  height: 68px;
+
+  &:last-child {
+    border-bottom: 0;
   }
 `
 
 const Cell = styled(Box).attrs({
-  px: 2,
+  px: 4,
   horizontal: true,
   align: 'center',
 })`
@@ -58,11 +75,20 @@ const Transaction = ({ tx }: { tx: TransactionType }) => {
     <TransactionRaw>
       <Cell size={DATE_COL_SIZE} justify="space-between">
         <Box>
-          <Text>{time.format('DD/MM/YYYY')}</Text>
+          <Day>{time.format('DD MMM')}</Day>
-          <Cap>{time.format('HH:mm')}</Cap>
+          <Hour>{time.format('HH:mm')}</Hour>
         </Box>
-        <Cap>{tx.balance > 0 ? 'From' : 'To'}</Cap>
       </Cell>
+      {tx.account && (
+        <Cell size={ACCOUNT_COL_SIZE} horizontal flow={2}>
+          <Box align="center" justify="center" style={{ color: '#fcb653' }}>
+            <IconCurrencyBitcoin height={16} width={16} />
+          </Box>
+          <Box ff="Open Sans|SemiBold" fontSize={4} color="dark">
+            {tx.account.name}
+          </Box>
+        </Cell>
+      )}
       <Cell
         grow
         shrink
@@ -73,10 +99,15 @@ const Transaction = ({ tx }: { tx: TransactionType }) => {
           display: 'block',
         }}
       >
-        {tx.balance > 0 ? get(tx, 'inputs.0.address') : get(tx, 'outputs.0.address')}
+        <Box ff="Open Sans" fontSize={3} color="lead">
+          {tx.balance > 0 ? 'From' : 'To'}
+        </Box>
+        <Box color="dark" ff="Open Sans" fontSize={3}>
+          {tx.balance > 0 ? get(tx, 'inputs.0.address') : get(tx, 'outputs.0.address')}
+        </Box>
       </Cell>
       <Cell size={AMOUNT_COL_SIZE} justify="flex-end">
-        <Text color={tx.balance > 0 ? 'green' : void 0}>{formatBTC(tx.balance)}</Text>
+        <FormattedVal val={tx.balance} currency="BTC" showCode fontSize={4} alwaysShowSign />
       </Cell>
     </TransactionRaw>
   )
@@ -84,19 +115,31 @@ const Transaction = ({ tx }: { tx: TransactionType }) => {
 
 type Props = {
   transactions: Array<TransactionType>,
+  withAccounts?: boolean,
 }
 
-export default ({ transactions }: Props) => (
+const TransactionsList = ({ transactions, withAccounts }: Props) => (
-  <Box flow={2}>
+  <Box flow={1}>
-    <Box horizontal>
+    <Box horizontal pt={4}>
       <HeaderCol size={DATE_COL_SIZE}>{'Date'}</HeaderCol>
+      {withAccounts && <HeaderCol size={ACCOUNT_COL_SIZE}>{'Account'}</HeaderCol>}
       <HeaderCol grow>{'Address'}</HeaderCol>
       <HeaderCol size={AMOUNT_COL_SIZE} justify="flex-end">
         {'Amount'}
       </HeaderCol>
     </Box>
     <Defer>
-      <Box>{transactions.map(t => <Transaction key={t.hash} tx={t} />)}</Box>
+      <Box>
+        {transactions.map(t => (
+          <Transaction key={`{${t.hash}-${t.account ? t.account.id : ''}`} tx={t} />
+        ))}
+      </Box>
     </Defer>
   </Box>
 )
+
+TransactionsList.defaultProps = {
+  withAccounts: false,
+}
+
+export default TransactionsList

src/components/base/Box/index.js

@@ -60,8 +60,8 @@ const RawCard = styled(Box).attrs({ bg: 'white', p: 3, boxShadow: 0, borderRadiu
 export const Card = ({ title, ...props }: { title?: string }) => {
   if (title) {
     return (
-      <Box flow={2}>
+      <Box flow={4}>
-        <Text fontWeight="bold" color="mouse">
+        <Text color="dark" ff="Museo Sans" fontSize={6}>
           {title}
         </Text>
         <RawCard {...props} />

src/types/common.js

@@ -11,6 +11,7 @@ export type Devices = Array<Device>
 // -------------------- Transactions
 
 export type Transaction = {
+  account?: Object,
   balance: number,
   hash: string,
   received_at: string,