Various fixes from PR comments

2 files changed, 26 insertions, 13 deletions

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 7c7550170..08923af88 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
@@ -11,16 +11,17 @@ import {
 export default class ConfirmPageContainerContent extends Component {
   static propTypes = {
     action: PropTypes.string,
-    title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    titleComponent: PropTypes.func,
-    subtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    hideSubtitle: PropTypes.bool,
-    errorMessage: PropTypes.string,
-    summaryComponent: PropTypes.node,
-    detailsComponent: PropTypes.node,
     dataComponent: PropTypes.node,
+    detailsComponent: PropTypes.node,
+    errorKey: PropTypes.string,
+    errorMessage: PropTypes.string,
+    hideSubtitle: PropTypes.bool,
     identiconAddress: PropTypes.string,
     nonce: PropTypes.string,
+    subtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    summaryComponent: PropTypes.node,
+    title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    titleComponent: PropTypes.func,
     warning: PropTypes.string,
   }
 
@@ -52,10 +53,11 @@ export default class ConfirmPageContainerContent extends Component {
   render () {
     const {
       action,
+      errorKey,
+      errorMessage,
       title,
       subtitle,
       hideSubtitle,
-      errorMessage,
       identiconAddress,
       nonce,
       summaryComponent,
@@ -88,9 +90,12 @@ export default class ConfirmPageContainerContent extends Component {
         }
         { this.renderContent() }
         {
-          errorMessage && (
+          (errorKey || errorMessage) && (
             <div className="confirm-page-container-content__error-container">
-              <ConfirmPageContainerError error={errorMessage} />
+              <ConfirmPageContainerError
+                errorMessage={errorMessage}
+                errorKey={errorKey}
+              />
             </div>
           )
         }
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
index dc5b9b935..70ebdeb20 100644
--- 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
@@ -1,20 +1,28 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-const ConfirmPageContainerError = props => {
+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"
       />
-      { `ALERT: ${props.error}` }
+      { `ALERT: ${error}` }
     </div>
   )
 }
 
 ConfirmPageContainerError.propTypes = {
-  error: PropTypes.string,
+  errorMessage: PropTypes.string,
+  errorKey: PropTypes.string,
+}
+
+ConfirmPageContainerError.contextTypes = {
+  t: PropTypes.func,
 }
 
 export default ConfirmPageContainerError