Fixes to get tests passing.

9 files changed, 35 insertions, 15 deletions

diff --git a/development/states/confirm-new-ui.json b/development/states/confirm-new-ui.json
index ae3098ecb..71ccbd96c 100644
--- a/development/states/confirm-new-ui.json
+++ b/development/states/confirm-new-ui.json
@@ -151,5 +151,10 @@
     "scrollToBottom": false,
     "forgottenPassword": null
   },
-  "identities": {}
+  "identities": {},
+  "send": {
+    "fromDropdownOpen": false,
+    "toDropdownOpen": false,
+    "errors": {}
+  }
 }
diff --git a/development/states/send-edit.json b/development/states/send-edit.json
index ae3098ecb..71ccbd96c 100644
--- a/development/states/send-edit.json
+++ b/development/states/send-edit.json
@@ -151,5 +151,10 @@
     "scrollToBottom": false,
     "forgottenPassword": null
   },
-  "identities": {}
+  "identities": {},
+  "send": {
+    "fromDropdownOpen": false,
+    "toDropdownOpen": false,
+    "errors": {}
+  }
 }
diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json
index 1297a9139..4b2d20730 100644
--- a/development/states/send-new-ui.json
+++ b/development/states/send-new-ui.json
@@ -130,5 +130,10 @@
     "scrollToBottom": false,
     "forgottenPassword": null
   },
-  "identities": {}
+  "identities": {},
+  "send": {
+    "fromDropdownOpen": false,
+    "toDropdownOpen": false,
+    "errors": {}
+  }
 }
diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json
index d567e3fed..43e6f4b90 100644
--- a/development/states/tx-list-items.json
+++ b/development/states/tx-list-items.json
@@ -124,5 +124,10 @@
     "scrollToBottom": false,
     "forgottenPassword": null
   },
-  "identities": {}
+  "identities": {},
+  "send": {
+    "fromDropdownOpen": false,
+    "toDropdownOpen": false,
+    "errors": {}
+  }
 }
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index 16dbd273b..936db3bcb 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -141,7 +141,7 @@ ConfirmSendEther.prototype.updateComponentSendErrors = function (prevProps) {
   if (shouldUpdateBalanceSendErrors) {
     const balanceIsSufficient = this.isBalanceSufficient(txMeta)
     updateSendErrors({
-      insufficientFunds: balanceIsSufficient ? false : this.context.t('insufficientFunds'),
+      insufficientFunds: balanceIsSufficient ? false : 'insufficientFunds',
     })
   }
 
@@ -149,7 +149,7 @@ ConfirmSendEther.prototype.updateComponentSendErrors = function (prevProps) {
 
   if (shouldUpdateSimulationSendError) {
     updateSendErrors({
-      simulationFails: !txMeta.simulationFails ? false : this.context.t('transactionError'),
+      simulationFails: !txMeta.simulationFails ? false : 'transactionError',
     })
   }
 }
@@ -559,9 +559,9 @@ ConfirmSendEther.prototype.onSubmit = function (event) {
   if (valid && this.verifyGasParams() && balanceIsSufficient) {
     this.props.sendTransaction(txMeta, event)
   } else if (!balanceIsSufficient) {
-    updateSendErrors({ insufficientFunds: this.context.t('insufficientFunds') })
+    updateSendErrors({ insufficientFunds: 'insufficientFunds' })
   } else {
-    updateSendErrors({ invalidGasParams: this.context.t('invalidGasParams') })
+    updateSendErrors({ invalidGasParams: 'invalidGasParams' })
     this.setState({ submitting: false })
   }
 }
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index 656093b3d..281c42824 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -558,9 +558,9 @@ ConfirmSendToken.prototype.onSubmit = function (event) {
   if (valid && this.verifyGasParams() && balanceIsSufficient) {
     this.props.sendTransaction(txMeta, event)
   } else if (!balanceIsSufficient) {
-    updateSendErrors({ insufficientFunds: this.context.t('insufficientFunds') })
+    updateSendErrors({ insufficientFunds: 'insufficientFunds' })
   } else {
-    updateSendErrors({ invalidGasParams: this.context.t('invalidGasParams') })
+    updateSendErrors({ invalidGasParams: 'invalidGasParams' })
     this.setState({ submitting: false })
   }
 }
diff --git a/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js b/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
index 8af8eaf26..337228122 100644
--- a/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
+++ b/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
@@ -37,7 +37,7 @@ export default class FromDropdown extends Component {
         onClick={() => closeDropdown}
       />
       <div className="send-v2__from-dropdown__list">
-        {...accounts.map((account, index) => <AccountListItem
+        {accounts.map((account, index) => <AccountListItem
           account={account}
           className="account-list-item__dropdown"
           handleClick={() => {
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
index 65dc6ad93..a8441c92f 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
@@ -15,7 +15,7 @@ export default class SendGasRow extends Component {
     gasLoadingError: PropTypes.bool,
     gasTotal: PropTypes.string,
     openFromDropdown: PropTypes.func,
-    showCustomizeGasModal: PropTypes.bool,
+    showCustomizeGasModal: PropTypes.func,
     tokenContract: PropTypes.object,
     updateSendFrom: PropTypes.func,
     updateSendTokenBalance: PropTypes.func,
diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js
index efe06ee64..ef67ebf5e 100644
--- a/ui/app/send-v2.js
+++ b/ui/app/send-v2.js
@@ -203,11 +203,11 @@ SendTransactionScreen.prototype.validateAmount = function (value) {
   )
 
   if (conversionRate && !sufficientBalance) {
-    amountError = this.context.t('insufficientFunds')
+    amountError = 'insufficientFunds'
   } else if (verifyTokenBalance && !sufficientTokens) {
-    amountError = this.context.t('insufficientTokens')
+    amountError = 'insufficientTokens'
   } else if (amountLessThanZero) {
-    amountError = this.context.t('negativeETH')
+    amountError = 'negativeETH'
   }
 
   updateSendErrors({ amount: amountError })