From 44d4b5b5db021646ca26026d91ab2ef39153af37 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Sat, 15 Sep 2018 23:50:17 -0700
Subject: Refactor ConfirmPageContainerError to ErrorMessage

---
 .../confirm-page-container-content.component.js    |  9 +++----
 .../confirm-page-container-error.component.js      | 30 ----------------------
 .../confirm-page-container-error/index.js          |  1 -
 .../confirm-page-container-error/index.scss        | 21 ---------------
 .../confirm-page-container-content/index.js        |  1 -
 .../confirm-page-container-content/index.scss      |  2 --
 .../error-message/error-message.component.js       | 30 ++++++++++++++++++++++
 ui/app/components/error-message/index.js           |  1 +
 ui/app/components/error-message/index.scss         | 21 +++++++++++++++
 ui/app/components/index.scss                       |  2 ++
 10 files changed, 57 insertions(+), 61 deletions(-)
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss
 create mode 100644 ui/app/components/error-message/error-message.component.js
 create mode 100644 ui/app/components/error-message/index.js
 create mode 100644 ui/app/components/error-message/index.scss

(limited to 'ui')

diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
index de9aa6eb7..74e95ece6 100644
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
+++ b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
@@ -2,11 +2,8 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import { Tabs, Tab } from '../../tabs'
-import {
-  ConfirmPageContainerSummary,
-  ConfirmPageContainerError,
-  ConfirmPageContainerWarning,
-} from './'
+import { ConfirmPageContainerSummary, ConfirmPageContainerWarning } from './'
+import ErrorMessage from '../../error-message'
 
 export default class ConfirmPageContainerContent extends Component {
   static propTypes = {
@@ -95,7 +92,7 @@ export default class ConfirmPageContainerContent extends Component {
         {
           (errorKey || errorMessage) && (
             <div className="confirm-page-container-content__error-container">
-              <ConfirmPageContainerError
+              <ErrorMessage
                 errorMessage={errorMessage}
                 errorKey={errorKey}
               />
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
deleted file mode 100644
index 4965d7b4e..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
-const ConfirmPageContainerError = (props, context) => {
-  const { errorMessage, errorKey } = props
-  const error = errorKey ? context.t(errorKey) : errorMessage
-
-  return (
-    <div className="confirm-page-container-error">
-      <img
-        src="/images/alert-red.svg"
-        className="confirm-page-container-error__icon"
-      />
-      <div className="confirm-page-container-error__text">
-        { `ALERT: ${error}` }
-      </div>
-    </div>
-  )
-}
-
-ConfirmPageContainerError.propTypes = {
-  errorMessage: PropTypes.string,
-  errorKey: PropTypes.string,
-}
-
-ConfirmPageContainerError.contextTypes = {
-  t: PropTypes.func,
-}
-
-export default ConfirmPageContainerError
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.js
deleted file mode 100644
index 4ac95d0e3..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './confirm-page-container-error.component'
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss
deleted file mode 100644
index 89ff25578..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.confirm-page-container-error {
-  min-height: 32px;
-  border: 1px solid $monzo;
-  color: $monzo;
-  background: lighten($monzo, 56%);
-  border-radius: 4px;
-  font-size: .75rem;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  padding: 8px 16px;
-
-  &__icon {
-    margin-right: 8px;
-    flex: 0 0 auto;
-  }
-
-  &__text {
-    overflow: auto;
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/index.js b/ui/app/components/confirm-page-container/confirm-page-container-content/index.js
index 1469dd438..4dfd89d92 100644
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/index.js
+++ b/ui/app/components/confirm-page-container/confirm-page-container-content/index.js
@@ -1,4 +1,3 @@
 export { default } from './confirm-page-container-content.component'
 export { default as ConfirmPageContainerSummary } from './confirm-page-container-summary'
-export { default as ConfirmPageContainerError } from './confirm-page-container-error'
 export { default as ConfirmPageContainerWarning } from './confirm-page-container-warning'
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-content/index.scss
index 39797a43f..698e624f4 100644
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/index.scss
+++ b/ui/app/components/confirm-page-container/confirm-page-container-content/index.scss
@@ -1,5 +1,3 @@
-@import './confirm-page-container-error/index';
-
 @import './confirm-page-container-warning/index';
 
 @import './confirm-page-container-summary/index';
diff --git a/ui/app/components/error-message/error-message.component.js b/ui/app/components/error-message/error-message.component.js
new file mode 100644
index 000000000..b4464c33b
--- /dev/null
+++ b/ui/app/components/error-message/error-message.component.js
@@ -0,0 +1,30 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+const ErrorMessage = (props, context) => {
+  const { errorMessage, errorKey } = props
+  const error = errorKey ? context.t(errorKey) : errorMessage
+
+  return (
+    <div className="error-message">
+      <img
+        src="/images/alert-red.svg"
+        className="error-message__icon"
+      />
+      <div className="error-message__text">
+        { `ALERT: ${error}` }
+      </div>
+    </div>
+  )
+}
+
+ErrorMessage.propTypes = {
+  errorMessage: PropTypes.string,
+  errorKey: PropTypes.string,
+}
+
+ErrorMessage.contextTypes = {
+  t: PropTypes.func,
+}
+
+export default ErrorMessage
diff --git a/ui/app/components/error-message/index.js b/ui/app/components/error-message/index.js
new file mode 100644
index 000000000..1c97a9955
--- /dev/null
+++ b/ui/app/components/error-message/index.js
@@ -0,0 +1 @@
+export { default } from './error-message.component'
diff --git a/ui/app/components/error-message/index.scss b/ui/app/components/error-message/index.scss
new file mode 100644
index 000000000..5915e21cf
--- /dev/null
+++ b/ui/app/components/error-message/index.scss
@@ -0,0 +1,21 @@
+.error-message {
+  min-height: 32px;
+  border: 1px solid $monzo;
+  color: $monzo;
+  background: lighten($monzo, 56%);
+  border-radius: 4px;
+  font-size: .75rem;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 8px 16px;
+
+  &__icon {
+    margin-right: 8px;
+    flex: 0 0 auto;
+  }
+
+  &__text {
+    overflow: auto;
+  }
+}
diff --git a/ui/app/components/index.scss b/ui/app/components/index.scss
index 983d6b98a..e252bf07d 100644
--- a/ui/app/components/index.scss
+++ b/ui/app/components/index.scss
@@ -6,6 +6,8 @@
 
 @import './confirm-page-container/index';
 
+@import './error-message/index';
+
 @import './export-text-container/index';
 
 @import './info-box/index';
-- 
cgit v1.2.3