From 284dd85a99f538b77fd477f4952117d1792f64a5 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Fri, 6 Apr 2018 19:59:51 -0230
Subject: first commit

---
 .../page-container-content.component.js            | 18 ++++++++++
 .../page-container-footer.component.js             | 41 ++++++++++++++++++++++
 .../page-container-header.component.js             | 35 ++++++++++++++++++
 .../page-container/page-container.component.js     | 18 ++++++++++
 .../tests/page-container-content-component.test.js |  0
 .../tests/page-container-footer-component.test.js  |  0
 .../tests/page-container-header-component.test.js  |  0
 7 files changed, 112 insertions(+)
 create mode 100644 ui/app/components/page-container/page-container-content.component.js
 create mode 100644 ui/app/components/page-container/page-container-footer.component.js
 create mode 100644 ui/app/components/page-container/page-container-header.component.js
 create mode 100644 ui/app/components/page-container/page-container.component.js
 create mode 100644 ui/app/components/page-container/tests/page-container-content-component.test.js
 create mode 100644 ui/app/components/page-container/tests/page-container-footer-component.test.js
 create mode 100644 ui/app/components/page-container/tests/page-container-header-component.test.js

(limited to 'ui/app/components/page-container')

diff --git a/ui/app/components/page-container/page-container-content.component.js b/ui/app/components/page-container/page-container-content.component.js
new file mode 100644
index 000000000..ffd62894c
--- /dev/null
+++ b/ui/app/components/page-container/page-container-content.component.js
@@ -0,0 +1,18 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class PageContainerContent extends Component {
+
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+  };
+
+  render () {
+    return (
+      <div className="page-container__content">
+        {this.props.children}
+      </div>
+    );
+  }
+
+}
diff --git a/ui/app/components/page-container/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer.component.js
new file mode 100644
index 000000000..0ef14c9d7
--- /dev/null
+++ b/ui/app/components/page-container/page-container-footer.component.js
@@ -0,0 +1,41 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class PageContainerFooter extends Component {
+
+  static propTypes = {
+    onCancel: PropTypes.func,
+    onSubmit: PropTypes.func,
+    disabled: PropTypes.bool,
+  };
+
+  render () {
+    const { onCancel, onSubmit, disabled } = this.props
+
+    return (
+      <div className="page-container__footer">
+
+        <button
+          className="btn-secondary--lg page-container__footer-button"
+          onClick={() => onCancel()}
+        >
+          {this.context.t('cancel')}
+        </button>
+
+        <button
+          className="btn-primary--lg page-container__footer-button"
+          disabled={disabled}
+          onClick={(e) => onSubmit(e)}
+        >
+          {this.context.t('next')}
+        </button>
+
+      </div>
+    );
+  }
+
+}
+
+PageContainerFooter.contextTypes = {
+  t: PropTypes.func,
+}
diff --git a/ui/app/components/page-container/page-container-header.component.js b/ui/app/components/page-container/page-container-header.component.js
new file mode 100644
index 000000000..9adc88fb3
--- /dev/null
+++ b/ui/app/components/page-container/page-container-header.component.js
@@ -0,0 +1,35 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class PageContainerHeader extends Component {
+
+  static propTypes = {
+    title: PropTypes.string,
+    subtitle: PropTypes.string,
+    onClose: PropTypes.func,
+  };
+
+  render () {
+    const { title, subtitle, onClose } = this.props
+
+    return (
+      <div className="page-container__header">
+
+        <div className="page-container__title">
+          {title}
+        </div>
+
+        <div className="page-container__subtitle">
+          {subtitle}
+        </div>
+
+        <div
+          className="page-container__header-close"
+          onClick={() => onClose()}
+        />
+
+      </div>
+    );
+  }
+
+}
diff --git a/ui/app/components/page-container/page-container.component.js b/ui/app/components/page-container/page-container.component.js
new file mode 100644
index 000000000..7df1d48d8
--- /dev/null
+++ b/ui/app/components/page-container/page-container.component.js
@@ -0,0 +1,18 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class PageContainer extends Component {
+
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+  };
+
+  render () {
+    return (
+      <div className="page-container">
+        {this.props.children}
+      </div>
+    );
+  }
+
+}
diff --git a/ui/app/components/page-container/tests/page-container-content-component.test.js b/ui/app/components/page-container/tests/page-container-content-component.test.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/app/components/page-container/tests/page-container-footer-component.test.js b/ui/app/components/page-container/tests/page-container-footer-component.test.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/app/components/page-container/tests/page-container-header-component.test.js b/ui/app/components/page-container/tests/page-container-header-component.test.js
new file mode 100644
index 000000000..e69de29bb
-- 
cgit 


From f96c13d616e429447ac0a6a24c6aeee902162b88 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Tue, 10 Apr 2018 15:28:52 -0700
Subject: Refactor page-container component structure

---
 ui/app/components/page-container/index.js          |  1 +
 .../page-container-content.component.js            | 18 -------
 .../page-container-footer.component.js             | 41 ---------------
 .../page-container/page-container-footer/index.js  |  1 +
 .../page-container-footer.component.js             | 49 ++++++++++++++++++
 .../tests/page-container-footer.component.test.js  |  0
 .../page-container-header.component.js             | 35 -------------
 .../page-container/page-container-header/index.js  |  1 +
 .../page-container-header.component.js             | 57 ++++++++++++++++++++
 .../tests/page-container-header.component.test.js  |  0
 .../page-container/page-container.component.js     | 60 ++++++++++++++++++++--
 .../tests/page-container-content-component.test.js |  0
 .../tests/page-container-footer-component.test.js  |  0
 .../tests/page-container-header-component.test.js  |  0
 .../tests/page-container.component.test.js         |  0
 15 files changed, 166 insertions(+), 97 deletions(-)
 create mode 100644 ui/app/components/page-container/index.js
 delete mode 100644 ui/app/components/page-container/page-container-content.component.js
 delete mode 100644 ui/app/components/page-container/page-container-footer.component.js
 create mode 100644 ui/app/components/page-container/page-container-footer/index.js
 create mode 100644 ui/app/components/page-container/page-container-footer/page-container-footer.component.js
 create mode 100644 ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js
 delete mode 100644 ui/app/components/page-container/page-container-header.component.js
 create mode 100644 ui/app/components/page-container/page-container-header/index.js
 create mode 100644 ui/app/components/page-container/page-container-header/page-container-header.component.js
 create mode 100644 ui/app/components/page-container/page-container-header/tests/page-container-header.component.test.js
 delete mode 100644 ui/app/components/page-container/tests/page-container-content-component.test.js
 delete mode 100644 ui/app/components/page-container/tests/page-container-footer-component.test.js
 delete mode 100644 ui/app/components/page-container/tests/page-container-header-component.test.js
 create mode 100644 ui/app/components/page-container/tests/page-container.component.test.js

(limited to 'ui/app/components/page-container')

diff --git a/ui/app/components/page-container/index.js b/ui/app/components/page-container/index.js
new file mode 100644
index 000000000..415870b37
--- /dev/null
+++ b/ui/app/components/page-container/index.js
@@ -0,0 +1 @@
+export { default } from './page-container.component'
diff --git a/ui/app/components/page-container/page-container-content.component.js b/ui/app/components/page-container/page-container-content.component.js
deleted file mode 100644
index ffd62894c..000000000
--- a/ui/app/components/page-container/page-container-content.component.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-
-export default class PageContainerContent extends Component {
-
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-  };
-
-  render () {
-    return (
-      <div className="page-container__content">
-        {this.props.children}
-      </div>
-    );
-  }
-
-}
diff --git a/ui/app/components/page-container/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer.component.js
deleted file mode 100644
index 0ef14c9d7..000000000
--- a/ui/app/components/page-container/page-container-footer.component.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-
-export default class PageContainerFooter extends Component {
-
-  static propTypes = {
-    onCancel: PropTypes.func,
-    onSubmit: PropTypes.func,
-    disabled: PropTypes.bool,
-  };
-
-  render () {
-    const { onCancel, onSubmit, disabled } = this.props
-
-    return (
-      <div className="page-container__footer">
-
-        <button
-          className="btn-secondary--lg page-container__footer-button"
-          onClick={() => onCancel()}
-        >
-          {this.context.t('cancel')}
-        </button>
-
-        <button
-          className="btn-primary--lg page-container__footer-button"
-          disabled={disabled}
-          onClick={(e) => onSubmit(e)}
-        >
-          {this.context.t('next')}
-        </button>
-
-      </div>
-    );
-  }
-
-}
-
-PageContainerFooter.contextTypes = {
-  t: PropTypes.func,
-}
diff --git a/ui/app/components/page-container/page-container-footer/index.js b/ui/app/components/page-container/page-container-footer/index.js
new file mode 100644
index 000000000..7825c4520
--- /dev/null
+++ b/ui/app/components/page-container/page-container-footer/index.js
@@ -0,0 +1 @@
+export { default } from './page-container-footer.component'
diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
new file mode 100644
index 000000000..fafe1c19e
--- /dev/null
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -0,0 +1,49 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class PageContainerFooter extends Component {
+
+  static propTypes = {
+    onCancel: PropTypes.func,
+    cancelText: PropTypes.string,
+    onSubmit: PropTypes.func,
+    submitText: PropTypes.string,
+    disabled: PropTypes.bool,
+  }
+
+  static contextTypes = {
+    t: PropTypes.func,
+  }
+
+  render () {
+    const {
+      onCancel,
+      cancelText,
+      onSubmit,
+      submitText,
+      disabled,
+    } = this.props
+
+    return (
+      <div className="page-container__footer">
+
+        <button
+          className="btn-secondary--lg page-container__footer-button"
+          onClick={() => onCancel()}
+        >
+          { this.context.t('cancel') || cancelText }
+        </button>
+
+        <button
+          className="btn-primary--lg page-container__footer-button"
+          disabled={disabled}
+          onClick={e => onSubmit(e)}
+        >
+          { this.context.t('next') || submitText }
+        </button>
+
+      </div>
+    )
+  }
+
+}
diff --git a/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js b/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/app/components/page-container/page-container-header.component.js b/ui/app/components/page-container/page-container-header.component.js
deleted file mode 100644
index 9adc88fb3..000000000
--- a/ui/app/components/page-container/page-container-header.component.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-
-export default class PageContainerHeader extends Component {
-
-  static propTypes = {
-    title: PropTypes.string,
-    subtitle: PropTypes.string,
-    onClose: PropTypes.func,
-  };
-
-  render () {
-    const { title, subtitle, onClose } = this.props
-
-    return (
-      <div className="page-container__header">
-
-        <div className="page-container__title">
-          {title}
-        </div>
-
-        <div className="page-container__subtitle">
-          {subtitle}
-        </div>
-
-        <div
-          className="page-container__header-close"
-          onClick={() => onClose()}
-        />
-
-      </div>
-    );
-  }
-
-}
diff --git a/ui/app/components/page-container/page-container-header/index.js b/ui/app/components/page-container/page-container-header/index.js
new file mode 100644
index 000000000..b194af057
--- /dev/null
+++ b/ui/app/components/page-container/page-container-header/index.js
@@ -0,0 +1 @@
+export { default } from './page-container-header.component'
diff --git a/ui/app/components/page-container/page-container-header/page-container-header.component.js b/ui/app/components/page-container/page-container-header/page-container-header.component.js
new file mode 100644
index 000000000..28882edce
--- /dev/null
+++ b/ui/app/components/page-container/page-container-header/page-container-header.component.js
@@ -0,0 +1,57 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class PageContainerHeader extends Component {
+
+  static propTypes = {
+    title: PropTypes.string.isRequired,
+    subtitle: PropTypes.string,
+    onClose: PropTypes.func,
+    showBackButton: PropTypes.bool,
+    onBackButtonClick: PropTypes.func,
+    backButtonStyles: PropTypes.object,
+    backButtonString: PropTypes.string,
+  };
+
+  renderHeaderRow () {
+    const { showBackButton, onBackButtonClick, backButtonStyles, backButtonString } = this.props
+
+    return showBackButton && (
+      <div className="page-container__header-row">
+        <span
+          className="page-container__back-button"
+          onClick={onBackButtonClick}
+          style={backButtonStyles}
+        >
+          { backButtonString || 'Back' }
+        </span>
+      </div>
+    )
+  }
+
+  render () {
+    const { title, subtitle, onClose } = this.props
+
+    return (
+      <div className="page-container__header">
+
+        { this.renderHeaderRow() }
+
+        <div className="page-container__title">
+          {title}
+        </div>
+
+        <div className="page-container__subtitle">
+          {subtitle}
+        </div>
+
+        <div
+          className="page-container__header-close"
+          onClick={() => onClose()}
+        />
+
+      </div>
+    )
+  }
+
+}
diff --git a/ui/app/components/page-container/page-container-header/tests/page-container-header.component.test.js b/ui/app/components/page-container/page-container-header/tests/page-container-header.component.test.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/app/components/page-container/page-container.component.js b/ui/app/components/page-container/page-container.component.js
index 7df1d48d8..9bfb99ade 100644
--- a/ui/app/components/page-container/page-container.component.js
+++ b/ui/app/components/page-container/page-container.component.js
@@ -1,18 +1,72 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 
+import PageContainerHeader from './page-container-header'
+import PageContainerFooter from './page-container-footer'
+
 export default class PageContainer extends Component {
 
   static propTypes = {
-    children: PropTypes.node.isRequired,
+    // PageContainerHeader props
+    title: PropTypes.string.isRequired,
+    subtitle: PropTypes.string,
+    onClose: PropTypes.func,
+    showBackButton: PropTypes.bool,
+    onBackButtonClick: PropTypes.func,
+    backButtonStyles: PropTypes.object,
+    backButtonString: PropTypes.string,
+    // Content props
+    ContentComponent: PropTypes.func,
+    contentComponentProps: PropTypes.object,
+    // PageContainerFooter props
+    onCancel: PropTypes.func,
+    cancelText: PropTypes.string,
+    onSubmit: PropTypes.func,
+    submitText: PropTypes.string,
+    disabled: PropTypes.bool,
   };
 
   render () {
+    const {
+      title,
+      subtitle,
+      onClose,
+      showBackButton,
+      onBackButtonClick,
+      backButtonStyles,
+      backButtonString,
+      ContentComponent,
+      contentComponentProps,
+      onCancel,
+      cancelText,
+      onSubmit,
+      submitText,
+      disabled,
+    } = this.props
+
     return (
       <div className="page-container">
-        {this.props.children}
+        <PageContainerHeader
+          title={title}
+          subtitle={subtitle}
+          onClose={onClose}
+          showBackButton={showBackButton}
+          onBackButtonClick={onBackButtonClick}
+          backButtonStyles={backButtonStyles}
+          backButtonString={backButtonString}
+        />
+        <div className="page-container__content">
+          <ContentComponent { ...contentComponentProps } />
+        </div>
+        <PageContainerFooter
+          onCancel={onCancel}
+          cancelText={cancelText}
+          onSubmit={onSubmit}
+          submitText={submitText}
+          disabled={disabled}
+        />
       </div>
-    );
+    )
   }
 
 }
diff --git a/ui/app/components/page-container/tests/page-container-content-component.test.js b/ui/app/components/page-container/tests/page-container-content-component.test.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/page-container/tests/page-container-footer-component.test.js b/ui/app/components/page-container/tests/page-container-footer-component.test.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/page-container/tests/page-container-header-component.test.js b/ui/app/components/page-container/tests/page-container-header-component.test.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/page-container/tests/page-container.component.test.js b/ui/app/components/page-container/tests/page-container.component.test.js
new file mode 100644
index 000000000..e69de29bb
-- 
cgit 


From 8ff7806f1b471a90fa3f45ebc10f0f4452ade541 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 26 Apr 2018 14:08:38 -0230
Subject: Core of the refactor complete

---
 ui/app/components/page-container/page-container.component.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/components/page-container')

diff --git a/ui/app/components/page-container/page-container.component.js b/ui/app/components/page-container/page-container.component.js
index 7df1d48d8..1b5e7f819 100644
--- a/ui/app/components/page-container/page-container.component.js
+++ b/ui/app/components/page-container/page-container.component.js
@@ -8,6 +8,7 @@ export default class PageContainer extends Component {
   };
 
   render () {
+    console.log(`QQQQQQQQQQQQQQQQQ this.props.children`, this.props.children);
     return (
       <div className="page-container">
         {this.props.children}
-- 
cgit 


From 91c201aa72581a59a0d2ef73a225b1768584dea7 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 26 Apr 2018 22:08:14 -0230
Subject: Lint fixes and alphabetization for i3725-refactor-send-component

---
 ui/app/components/page-container/page-container-content.component.js | 2 +-
 ui/app/components/page-container/page-container-footer.component.js  | 2 +-
 ui/app/components/page-container/page-container-header.component.js  | 2 +-
 ui/app/components/page-container/page-container.component.js         | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'ui/app/components/page-container')

diff --git a/ui/app/components/page-container/page-container-content.component.js b/ui/app/components/page-container/page-container-content.component.js
index ffd62894c..a1d6988cc 100644
--- a/ui/app/components/page-container/page-container-content.component.js
+++ b/ui/app/components/page-container/page-container-content.component.js
@@ -12,7 +12,7 @@ export default class PageContainerContent extends Component {
       <div className="page-container__content">
         {this.props.children}
       </div>
-    );
+    )
   }
 
 }
diff --git a/ui/app/components/page-container/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer.component.js
index 0ef14c9d7..475ce6b1c 100644
--- a/ui/app/components/page-container/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer.component.js
@@ -31,7 +31,7 @@ export default class PageContainerFooter extends Component {
         </button>
 
       </div>
-    );
+    )
   }
 
 }
diff --git a/ui/app/components/page-container/page-container-header.component.js b/ui/app/components/page-container/page-container-header.component.js
index 9adc88fb3..5c9d63221 100644
--- a/ui/app/components/page-container/page-container-header.component.js
+++ b/ui/app/components/page-container/page-container-header.component.js
@@ -29,7 +29,7 @@ export default class PageContainerHeader extends Component {
         />
 
       </div>
-    );
+    )
   }
 
 }
diff --git a/ui/app/components/page-container/page-container.component.js b/ui/app/components/page-container/page-container.component.js
index 1b5e7f819..dc3745d4a 100644
--- a/ui/app/components/page-container/page-container.component.js
+++ b/ui/app/components/page-container/page-container.component.js
@@ -8,12 +8,11 @@ export default class PageContainer extends Component {
   };
 
   render () {
-    console.log(`QQQQQQQQQQQQQQQQQ this.props.children`, this.props.children);
     return (
       <div className="page-container">
         {this.props.children}
       </div>
-    );
+    )
   }
 
 }
-- 
cgit 


From 6bc8cc819a16118acc010d0efdec90afbda14590 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Mon, 14 May 2018 11:00:50 -0230
Subject: Merge branch 'develop' into i3725-refactor-send-component-

---
 .../page-container-footer.component.js                  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'ui/app/components/page-container')

diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
index fafe1c19e..84d8296b0 100644
--- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
+import Button from './components/button'
 
 export default class PageContainerFooter extends Component {
 
@@ -27,20 +28,24 @@ export default class PageContainerFooter extends Component {
     return (
       <div className="page-container__footer">
 
-        <button
-          className="btn-secondary--lg page-container__footer-button"
+        <Button
+          type="secondary"
+          large={true}
+          className="page-container__footer-button"
           onClick={() => onCancel()}
         >
           { this.context.t('cancel') || cancelText }
-        </button>
+        </Button>
 
-        <button
-          className="btn-primary--lg page-container__footer-button"
+        <Button
+          type="primary"
+          large={true}
+          className="page-container__footer-button"
           disabled={disabled}
           onClick={e => onSubmit(e)}
         >
           { this.context.t('next') || submitText }
-        </button>
+        </Button>
 
       </div>
     )
-- 
cgit 


From 8ff60267d851be1b64f7024e6263e1e5ba1ef01c Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 15 May 2018 09:13:39 -0230
Subject: Fix Button component path in page-container footer.

---
 .../page-container-footer/page-container-footer.component.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/page-container')

diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
index 84d8296b0..f591ff83f 100644
--- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import Button from './components/button'
+import Button from '../../button'
 
 export default class PageContainerFooter extends Component {
 
-- 
cgit 


From 3a87d9221d7ae1d0d7cb526e5fb22ea528498105 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 24 May 2018 18:25:23 -0230
Subject: Fix order of button text in page-container-footer.

---
 .../page-container-footer/page-container-footer.component.js          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/app/components/page-container')

diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
index f591ff83f..9172aea94 100644
--- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -34,7 +34,7 @@ export default class PageContainerFooter extends Component {
           className="page-container__footer-button"
           onClick={() => onCancel()}
         >
-          { this.context.t('cancel') || cancelText }
+          { cancelText || this.context.t('cancel') }
         </Button>
 
         <Button
@@ -44,7 +44,7 @@ export default class PageContainerFooter extends Component {
           disabled={disabled}
           onClick={e => onSubmit(e)}
         >
-          { this.context.t('next') || submitText }
+          { submitText || this.context.t('next') }
         </Button>
 
       </div>
-- 
cgit