Fix order of button text in page-container-footer.

2 files changed, 4 insertions, 10 deletions

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>
diff --git a/ui/app/components/send_/send-footer/send-footer.container.js b/ui/app/components/send_/send-footer/send-footer.container.js
index 0242dfa54..64e4b4bd3 100644
--- a/ui/app/components/send_/send-footer/send-footer.container.js
+++ b/ui/app/components/send_/send-footer/send-footer.container.js
@@ -26,7 +26,6 @@ import {
   addressIsNew,
   constructTxParams,
   constructUpdatedTx,
-  formShouldBeDisabled,
 } from './send-footer.utils'
 
 export default connect(mapStateToProps, mapDispatchToProps)(SendFooter)
@@ -34,21 +33,16 @@ export default connect(mapStateToProps, mapDispatchToProps)(SendFooter)
 function mapStateToProps (state) {
   return {
     amount: getSendAmount(state),
-    disabled: formShouldBeDisabled({
-      inError: isSendFormInError(state),
-      selectedToken: getSelectedToken(state),
-      tokenBalance: getTokenBalance(state),
-      gasTotal: getGasTotal(state),
-    }),
     editingTransactionId: getSendEditingTransactionId(state),
     from: getSendFromObject(state),
     gasLimit: getGasLimit(state),
     gasPrice: getGasPrice(state),
+    gasTotal: getGasTotal(state),
     inError: isSendFormInError(state),
-    isToken: Boolean(getSelectedToken(state)),
     selectedToken: getSelectedToken(state),
     to: getSendTo(state),
     toAccounts: getSendToAccounts(state),
+    tokenBalance: getTokenBalance(state),
     unapprovedTxs: getUnapprovedTxs(state),
   }
 }