Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254

5 files changed, 6 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f427d1e1e..4731faffc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
 ## Current Master
+- Fix link for 'Learn More' in the Add Token Screen to open to a new tab.
+
+- Fix Download State Logs button [#3791](https://github.com/MetaMask/metamask-extension/issues/3791)
 
 ## 4.5.3 Wed Apr 04 2018
 
diff --git a/old-ui/app/util.js b/old-ui/app/util.js
index 3f8b4dcc3..962832ce7 100644
--- a/old-ui/app/util.js
+++ b/old-ui/app/util.js
@@ -231,6 +231,7 @@ function exportAsFile (filename, data) {
     window.navigator.msSaveBlob(blob, filename)
   } else {
     const elem = window.document.createElement('a')
+    elem.target = '_blank'
     elem.href = window.URL.createObjectURL(blob)
     elem.download = filename
     document.body.appendChild(elem)
diff --git a/ui/app/components/pages/add-token.js b/ui/app/components/pages/add-token.js
index 5627760eb..566e42450 100644
--- a/ui/app/components/pages/add-token.js
+++ b/ui/app/components/pages/add-token.js
@@ -360,6 +360,7 @@ AddTokenScreen.prototype.renderTabs = function () {
           h('div.add-token__info-box__copy', this.context.t('keepTrackTokens')),
           h('a.add-token__info-box__copy--blue', {
             href: 'http://metamask.helpscoutdocs.com/article/16-managing-erc20-tokens',
+            target: '_blank',
           }, this.context.t('learnMore')),
         ]),
         h('div.add-token__input-container', [
diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js
index b4d38495d..84465c8dc 100644
--- a/ui/app/send-v2.js
+++ b/ui/app/send-v2.js
@@ -255,7 +255,6 @@ SendTransactionScreen.prototype.handleToChange = function (to, nickname = '') {
   const {
     updateSendTo,
     updateSendErrors,
-    from: {address: from},
   } = this.props
   let toError = null
 
@@ -263,8 +262,6 @@ SendTransactionScreen.prototype.handleToChange = function (to, nickname = '') {
     toError = this.context.t('required')
   } else if (!isValidAddress(to)) {
     toError = this.context.t('invalidAddressRecipient')
-  } else if (to === from) {
-    toError = this.context.t('fromToSame')
   }
 
   updateSendTo(to, nickname)
diff --git a/ui/app/util.js b/ui/app/util.js
index 800ccb218..bbe2bb09e 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -271,6 +271,7 @@ function exportAsFile (filename, data) {
     window.navigator.msSaveBlob(blob, filename)
   } else {
     const elem = window.document.createElement('a')
+    elem.target = '_blank'
     elem.href = window.URL.createObjectURL(blob)
     elem.download = filename
     document.body.appendChild(elem)