From 244d36e1a1530d41482d191d03810be1bdadb730 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Wed, 5 Sep 2018 15:52:31 +0200
Subject: [PATCH] Updating UserDetails component when user is connected to
 provider

---
 .../component/ProviderInfo/UserDetails.jsx    | 36 +++++++++++++------
 .../Header/component/ProviderInfo/index.jsx   |  3 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/components/Header/component/ProviderInfo/UserDetails.jsx b/src/components/Header/component/ProviderInfo/UserDetails.jsx
index 82ce6ae3..8d7202bb 100644
--- a/src/components/Header/component/ProviderInfo/UserDetails.jsx
+++ b/src/components/Header/component/ProviderInfo/UserDetails.jsx
@@ -9,9 +9,11 @@ import Bold from '~/components/layout/Bold'
 import Hairline from '~/components/layout/Hairline'
 import Img from '~/components/layout/Img'
 import Row from '~/components/layout/Row'
+import Block from '~/components/layout/Block'
 import Spacer from '~/components/Spacer'
-import { sm, md, lg, background } from '~/theme/variables'
+import { xs, sm, md, lg, background } from '~/theme/variables'
 import { upperFirst } from '~/utils/css'
+import { shortVersionOf } from '~/logic/wallets/ethAddresses'
 
 const metamask = require('../../assets/metamask.svg')
 const connectedLogo = require('../../assets/connected.svg')
@@ -33,14 +35,17 @@ const openIconStyle = {
 const styles = () => ({
   container: {
     padding: `${md} 12px`,
+    display: 'flex',
+    flexDirection: 'column',
   },
   identicon: {
     justifyContent: 'center',
     padding: `0 ${md}`,
   },
   user: {
-    alignItems: 'center',
+    borderRadius: '3px',
     backgroundColor: background,
+    margin: '0 auto',
     padding: sm,
   },
   details: {
@@ -51,12 +56,20 @@ const styles = () => ({
   address: {
     flexGrow: 1,
     textAlign: 'center',
+    letterSpacing: '-0.5px',
+  },
+  open: {
+    paddingLeft: sm,
+    width: 'auto',
   },
   disconnect: {
-    padding: `${md} 32px`,
+    padding: `${md} ${lg}`,
+  },
+  disconnectText: {
+    letterSpacing: '1px',
   },
   logo: {
-    margin: '0px 2px',
+    margin: `0px ${xs}`,
   },
 })
 
@@ -64,18 +77,19 @@ const UserDetails = ({
   provider, connected, network, userAddress, classes,
 }: Props) => {
   const status = connected ? 'Connected' : 'Not connected'
+  const address = shortVersionOf(userAddress, 6)
 
   return (
     <React.Fragment>
-      <div className={classes.container}>
+      <Block className={classes.container}>
         <Row className={classes.identicon} margin="md" align="center">
           <Identicon address={userAddress} diameter={60} />
         </Row>
-        <Row className={classes.user} grow >
-          <Paragraph className={classes.address} size="sm" noMargin>{userAddress}</Paragraph>
-          <OpenInNew style={openIconStyle} />
-        </Row>
-      </div>
+        <Block align="center" className={classes.user}>
+          <Paragraph className={classes.address} size="sm" noMargin>{address}</Paragraph>
+          <OpenInNew className={classes.open} style={openIconStyle} />
+        </Block>
+      </Block>
       <Hairline margin="xs" />
       <Row className={classes.details}>
         <Paragraph size="sm" noMargin align="right">Status </Paragraph>
@@ -115,7 +129,7 @@ const UserDetails = ({
           color="primary"
           fullWidth
         >
-          DISCONNECT
+          <Paragraph className={classes.disconnectText} size="sm" weight="regular" noMargin>DISCONNECT</Paragraph>
         </Button>
       </Row>
     </React.Fragment>
diff --git a/src/components/Header/component/ProviderInfo/index.jsx b/src/components/Header/component/ProviderInfo/index.jsx
index 34a48150..2961bfb9 100644
--- a/src/components/Header/component/ProviderInfo/index.jsx
+++ b/src/components/Header/component/ProviderInfo/index.jsx
@@ -6,6 +6,7 @@ import Col from '~/components/layout/Col'
 import Img from '~/components/layout/Img'
 import { sm } from '~/theme/variables'
 import Identicon from '~/components/Identicon'
+import { shortVersionOf } from '~/logic/wallets/ethAddresses'
 
 const connectedLogo = require('../../assets/connected.svg')
 
@@ -41,7 +42,7 @@ const ProviderInfo = ({
   provider, network, userAddress, connected, classes,
 }: Props) => {
   const providerText = connected ? `${provider} [${network}]` : 'Not connected'
-  const cutAddress = connected ? `${userAddress.substring(0, 8)}...${userAddress.substring(36)}` : ''
+  const cutAddress = connected ? shortVersionOf(userAddress, 6) : ''
 
   return (
     <React.Fragment>