mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254
This commit is contained in:
commit
9d7e49fc3b
@ -1,6 +1,9 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Current Master
|
## 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
|
## 4.5.3 Wed Apr 04 2018
|
||||||
|
|
||||||
|
@ -231,6 +231,7 @@ function exportAsFile (filename, data) {
|
|||||||
window.navigator.msSaveBlob(blob, filename)
|
window.navigator.msSaveBlob(blob, filename)
|
||||||
} else {
|
} else {
|
||||||
const elem = window.document.createElement('a')
|
const elem = window.document.createElement('a')
|
||||||
|
elem.target = '_blank'
|
||||||
elem.href = window.URL.createObjectURL(blob)
|
elem.href = window.URL.createObjectURL(blob)
|
||||||
elem.download = filename
|
elem.download = filename
|
||||||
document.body.appendChild(elem)
|
document.body.appendChild(elem)
|
||||||
|
@ -360,6 +360,7 @@ AddTokenScreen.prototype.renderTabs = function () {
|
|||||||
h('div.add-token__info-box__copy', this.context.t('keepTrackTokens')),
|
h('div.add-token__info-box__copy', this.context.t('keepTrackTokens')),
|
||||||
h('a.add-token__info-box__copy--blue', {
|
h('a.add-token__info-box__copy--blue', {
|
||||||
href: 'http://metamask.helpscoutdocs.com/article/16-managing-erc20-tokens',
|
href: 'http://metamask.helpscoutdocs.com/article/16-managing-erc20-tokens',
|
||||||
|
target: '_blank',
|
||||||
}, this.context.t('learnMore')),
|
}, this.context.t('learnMore')),
|
||||||
]),
|
]),
|
||||||
h('div.add-token__input-container', [
|
h('div.add-token__input-container', [
|
||||||
|
@ -255,7 +255,6 @@ SendTransactionScreen.prototype.handleToChange = function (to, nickname = '') {
|
|||||||
const {
|
const {
|
||||||
updateSendTo,
|
updateSendTo,
|
||||||
updateSendErrors,
|
updateSendErrors,
|
||||||
from: {address: from},
|
|
||||||
} = this.props
|
} = this.props
|
||||||
let toError = null
|
let toError = null
|
||||||
|
|
||||||
@ -263,8 +262,6 @@ SendTransactionScreen.prototype.handleToChange = function (to, nickname = '') {
|
|||||||
toError = this.context.t('required')
|
toError = this.context.t('required')
|
||||||
} else if (!isValidAddress(to)) {
|
} else if (!isValidAddress(to)) {
|
||||||
toError = this.context.t('invalidAddressRecipient')
|
toError = this.context.t('invalidAddressRecipient')
|
||||||
} else if (to === from) {
|
|
||||||
toError = this.context.t('fromToSame')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
updateSendTo(to, nickname)
|
updateSendTo(to, nickname)
|
||||||
|
@ -271,6 +271,7 @@ function exportAsFile (filename, data) {
|
|||||||
window.navigator.msSaveBlob(blob, filename)
|
window.navigator.msSaveBlob(blob, filename)
|
||||||
} else {
|
} else {
|
||||||
const elem = window.document.createElement('a')
|
const elem = window.document.createElement('a')
|
||||||
|
elem.target = '_blank'
|
||||||
elem.href = window.URL.createObjectURL(blob)
|
elem.href = window.URL.createObjectURL(blob)
|
||||||
elem.download = filename
|
elem.download = filename
|
||||||
document.body.appendChild(elem)
|
document.body.appendChild(elem)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user