Merge pull request #186 from meriadec/master

Visual fixes & fix reset account order

src/components/AccountPage/AccountHeader.js

@@ -34,7 +34,7 @@ class AccountHeader extends PureComponent<Props> {
         )}
         <Box>
           <CurName>{account.currency.name}</CurName>
-          <Text ff="Museo Sans|Regular" fontSize={7}>
+          <Text ff="Museo Sans|Regular" fontSize={7} color="dark">
             {account.name}
           </Text>
         </Box>

src/components/AccountPage/index.js

@@ -18,10 +18,11 @@ import { openModal } from 'reducers/modals'
 
 import Box, { Card } from 'components/base/Box'
 import Button from 'components/base/Button'
-import Icon from 'components/base/Icon'
 import IconControls from 'icons/Controls'
 import Text from 'components/base/Text'
 import TransactionsList from 'components/TransactionsList'
+import IconArrowUp from 'icons/ArrowUp'
+import IconArrowDown from 'icons/ArrowDown'
 import AccountHeader from './AccountHeader'
 
 type Props = {
@@ -54,17 +55,13 @@ class AccountPage extends PureComponent<Props> {
           <Box horizontal alignItems="center" justifyContent="flex-end" grow flow={2}>
             <Button primary onClick={() => openModal(MODAL_SEND, { account })}>
               <Box horizontal flow={2} alignItems="center">
-                <Box>
+                <IconArrowUp height={16} width={16} />
-                  <Icon name="upload" />
-                </Box>
                 <Box>{t('send:title')}</Box>
               </Box>
             </Button>
             <Button primary onClick={() => openModal(MODAL_RECEIVE, { account })}>
               <Box horizontal flow={2} alignItems="center">
-                <Box>
+                <IconArrowDown height={16} width={16} />
-                  <Icon name="download" />
-                </Box>
                 <Box>{t('receive:title')}</Box>
               </Box>
             </Button>

src/components/SettingsPage/Display.js

@@ -25,7 +25,6 @@ class TabProfile extends PureComponent<Props, State> {
   state = {
     inputValue: {
       language: this.props.settings.language,
-      orderAccounts: '',
     },
   }
 

src/components/base/Button/index.js

@@ -34,6 +34,11 @@ const Base = styled.button.attrs({
   }
 
   &:active {
+    border: ${p =>
+      p.primary
+        ? 'none'
+        : `2px solid ${p.disabled ? 'transparent' : darken(p.theme.colors.grey, 0.2)}`};
+    color: ${p => (p.primary ? '' : darken(p.theme.colors.grey, 0.2))};
     background: ${p => (p.primary ? darken(p.theme.colors.wallet, 0.1) : '')};
   }
 `

src/types/common.js

@@ -59,7 +59,6 @@ export type SettingsProfile = {
 }
 export type SettingsDisplay = {
   language: string,
-  orderAccounts: string,
 }
 export type Settings = SettingsProfile & SettingsDisplay