From 32c691d3c25c7bf2251b11be9b529e80ac858b3d Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Wed, 27 Jun 2018 14:50:28 +0200
Subject: [PATCH] Cleaner design for error desc on device interaction

---
 .../DeviceInteraction/components.js           | 52 ++++---------------
 src/components/DeviceInteraction/index.js     | 12 +----
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/src/components/DeviceInteraction/components.js b/src/components/DeviceInteraction/components.js
index 32a83123..a6cb01ae 100644
--- a/src/components/DeviceInteraction/components.js
+++ b/src/components/DeviceInteraction/components.js
@@ -2,17 +2,17 @@
 
 import React from 'react'
 import styled from 'styled-components'
-import Tooltip from 'components/base/Tooltip'
 
-import { radii, colors } from 'styles/theme'
+import { radii } from 'styles/theme'
 import { rgba } from 'styles/helpers'
 
 import TranslatedError from 'components/TranslatedError'
 import Box from 'components/base/Box'
+import FakeLink from 'components/base/FakeLink'
 import Spinner from 'components/base/Spinner'
 import IconCheck from 'icons/Check'
 import IconCross from 'icons/Cross'
-import IconRecover from 'icons/Recover'
+import IconExclamationCircle from 'icons/ExclamationCircle'
 
 export const DeviceInteractionStepContainer = styled(Box).attrs({
   horizontal: true,
@@ -92,25 +92,6 @@ export const ErrorContainer = ({ isVisible }: { isVisible: boolean }) => (
   </ErrorContainerWrapper>
 )
 
-const ErrorRetryContainer = styled(Box).attrs({
-  bg: rgba(colors.alertRed, 0.1),
-  borderRadius: 1,
-  grow: 1,
-  color: 'alertRed',
-  cursor: 'pointer',
-  p: 1,
-  align: 'center',
-  justify: 'center',
-  overflow: 'hidden',
-})`
-  &:hover {
-    background-color: ${() => rgba(colors.alertRed, 0.1)};
-  }
-  &:active {
-    background-color: ${() => rgba(colors.alertRed, 0.15)};
-  }
-`
-
 export const ErrorDescContainer = ({
   error,
   onRetry,
@@ -119,26 +100,13 @@ export const ErrorDescContainer = ({
   error: Error,
   onRetry: void => void,
 }) => (
-  <Box
-    pl={0}
-    fontSize={3}
-    color="alertRed"
-    align="flex-start"
-    justify="center"
-    style={{
-      cursor: 'text',
-    }}
-    {...p}
-  >
-    <Box horizontal>
-      <Box p={1} pl={2}>
-        <TranslatedError error={error} />
-      </Box>
-      <Tooltip render={() => 'Retry'} style={{ display: 'flex', alignItems: 'center' }}>
-        <ErrorRetryContainer onClick={onRetry}>
-          <IconRecover size={12} />
-        </ErrorRetryContainer>
-      </Tooltip>
+  <Box horizontal fontSize={3} color="alertRed" align="center" cursor="text" {...p}>
+    <IconExclamationCircle size={16} />
+    <Box ml={1}>
+      <TranslatedError error={error} />
     </Box>
+    <FakeLink ml={1} underline color="alertRed" onClick={onRetry}>
+      {'Retry'}
+    </FakeLink>
   </Box>
 )
diff --git a/src/components/DeviceInteraction/index.js b/src/components/DeviceInteraction/index.js
index 1759c41d..5542aaaa 100644
--- a/src/components/DeviceInteraction/index.js
+++ b/src/components/DeviceInteraction/index.js
@@ -5,14 +5,11 @@ import React, { PureComponent } from 'react'
 import { delay } from 'helpers/promise'
 
 import Box from 'components/base/Box'
-import Space from 'components/base/Space'
-
 import DeviceInteractionStep from './DeviceInteractionStep'
+import { ErrorDescContainer } from './components'
 
 import type { Step } from './DeviceInteractionStep'
 
-import { ErrorDescContainer } from './components'
-
 type Props = {
   steps: Step[],
   onSuccess?: any => void,
@@ -109,12 +106,7 @@ class DeviceInteraction extends PureComponent<Props, State> {
           )
         })}
         {error &&
-          shouldRenderRetry && (
-            <Box align="flex-end">
-              <Space of={0} />
-              <ErrorDescContainer error={error} onRetry={this.reset} mt={2} />
-            </Box>
-          )}
+          shouldRenderRetry && <ErrorDescContainer error={error} onRetry={this.reset} mt={2} />}
       </Box>
     )
   }