Resolve merge conflicts.

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Current Master
 - Show a warning when a transaction fails during simulation.
 - Fix bug where 20% of gas estimate was not being added properly.
+- Render error messages in our confirmation screen more gracefully.
 
 ## 2.13.7 2016-11-8
 

app/scripts/lib/idStore.js

@@ -246,7 +246,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
   function analyzeForDelegateCall (cb) {
     if (txParams.to) {
       query.getCode(txParams.to, (err, result) => {
-        if (err) return cb(err)
+        if (err) return cb(err.message || err)
         var containsDelegateCall = self.checkForDelegateCall(result)
         txData.containsDelegateCall = containsDelegateCall
         cb()
@@ -261,8 +261,8 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
     // 1 billion gas for estimation
     var gasLimit = '0x3b9aca00'
     estimationParams.gas = gasLimit
-    query.estimateGas(estimationParams, function (err, result) {
-      if (err) return cb(err)
+    query.estimateGas(estimationParams, function(err, result){
+      if (err) return cb(err.message || err)
       if (result === estimationParams.gas) {
         txData.simulationFails = true
         query.getBlockByNumber('latest', true, function (err, block) {
@@ -280,7 +280,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
   }
 
   function didComplete (err) {
-    if (err) return cb(err)
+    if (err) return cb(err.message || err)
     configManager.addTx(txData)
     // signal update
     self._didUpdate()

app/scripts/metamask-controller.js

@@ -199,7 +199,6 @@ module.exports = class MetamaskController {
 
   newUnsignedTransaction (txParams, onTxDoneCb) {
     const keyringController = this.keyringController
-
     const err = this.enforceTxValidations(txParams)
     if (err) return onTxDoneCb(err)
     keyringController.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {