diff --git a/CHANGELOG.md b/CHANGELOG.md index f4f2148b9..a55e34602 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ ## Current Master - net_version has been made synchronous. - Test suite for migrations expanded. +- Network now changeable from lock screen. + +- Improve test coverage of eth.sign behavior, including a code example of verifying a signature. + +## 3.2.2 2017-2-8 + +- Revert eth.sign behavior to the previous one with a big warning. We will be gradually implementing the new behavior over the coming time. https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign - Improve test coverage of eth.sign behavior, including a code example of verifying a signature. diff --git a/ui/app/app.js b/ui/app/app.js index 8aae38067..ea755bec5 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -122,9 +122,9 @@ App.prototype.renderAppBar = function () { background: props.isUnlocked ? 'white' : 'none', height: '36px', position: 'relative', - zIndex: 2, + zIndex: 10, }, - }, props.isUnlocked && [ + }, [ h('div', { style: { @@ -159,14 +159,14 @@ App.prototype.renderAppBar = function () { ]), // metamask name - h('h1', { + props.isUnlocked && h('h1', { style: { position: 'relative', left: '9px', }, }, 'MetaMask'), - h('div', { + props.isUnlocked && h('div', { style: { display: 'flex', flexDirection: 'row', @@ -175,7 +175,7 @@ App.prototype.renderAppBar = function () { }, [ // small accounts nav - h(Tooltip, { title: 'Switch Accounts' }, [ + props.isUnlocked && h(Tooltip, { title: 'Switch Accounts' }, [ h('img.cursor-pointer.color-orange', { src: 'images/switch_acc.svg', style: { @@ -190,7 +190,7 @@ App.prototype.renderAppBar = function () { ]), // hamburger - h(SandwichExpando, { + props.isUnlocked && h(SandwichExpando, { width: 16, barHeight: 2, padding: 0, @@ -262,7 +262,7 @@ App.prototype.renderNetworkDropdown = function () { this.renderCustomOption(props.provider), - h(DropMenuItem, { + props.isUnlocked && h(DropMenuItem, { label: 'Custom RPC', closeMenu: () => this.setState({ isNetworkMenuOpen: false }), action: () => this.props.dispatch(actions.showConfigPage()), diff --git a/ui/app/components/mascot.js b/ui/app/components/mascot.js index f015d0c4d..973ec2cad 100644 --- a/ui/app/components/mascot.js +++ b/ui/app/components/mascot.js @@ -27,7 +27,7 @@ Mascot.prototype.render = function () { this.handleAnimationEvents() return h('#metamask-mascot-container', { - style: { zIndex: 2 }, + style: { zIndex: 0 }, }) }