m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into kovan-faucet-instructions

Browse Source
This commit is contained in:
Kevin Serrano 2017-03-27 16:45:04 -04:00 committed by GitHub
commit 67892c49a6
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@
- Add link to Kovan Test Faucet instructions on buy view. - Add link to Kovan Test Faucet instructions on buy view.
## 3.5.1 2017-3-27
- Fix edge case where users were unable to enable the notice button if notices were short enough to not require a scrollbar.
## 3.5.0 2017-3-27 ## 3.5.0 2017-3-27
- Add better error messages for when a transaction fails on approval - Add better error messages for when a transaction fails on approval

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "MetaMask", "name": "MetaMask",
"short_name": "Metamask", "short_name": "Metamask",
"version": "3.5.0", "version": "3.5.1",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "Ethereum Browser Extension", "description": "Ethereum Browser Extension",

3
ui/app/components/notice.js
View File

@ -92,6 +92,7 @@ Notice.prototype.render = function () {
}, },
}, [ }, [
h(ReactMarkdown, { h(ReactMarkdown, {
className: 'notice-box',
source: body, source: body,
skipHtml: true, skipHtml: true,
}), }),
@ -114,6 +115,8 @@ Notice.prototype.render = function () {
Notice.prototype.componentDidMount = function () { Notice.prototype.componentDidMount = function () {
var node = findDOMNode(this) var node = findDOMNode(this)
linker.setupListener(node) linker.setupListener(node)
if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) { this.setState({disclaimerDisabled: false}) }
} }
Notice.prototype.componentWillUnmount = function () { Notice.prototype.componentWillUnmount = function () {