diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-07 07:21:18 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-07 07:21:18 +0800 |
| commit | 7c9d942ba165ff53f44985793f28ffb48fa578e1 (patch) | |
| tree | c588281c58c8bae4a4da228b2e27ea708c4eb09d /old-ui | |
| parent | 6b2511f94f436a30c6c683f9da2c3142d9a6461c (diff) | |
| parent | b4aaf30d6fe829f18dea68a5e6cc321b9fb00d4e (diff) | |
| download | tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar.gz tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar.bz2 tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar.lz tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar.xz tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar.zst tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support
Diffstat (limited to 'old-ui')
| -rw-r--r-- | old-ui/app/app.js | 1 | ||||
| -rw-r--r-- | old-ui/app/keychains/hd/restore-vault.js | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 5c2dccc03..0637e3b5b 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -183,6 +183,7 @@ App.prototype.renderAppBar = function () { this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) }, }), + ]), props.isUnlocked && h('div', { diff --git a/old-ui/app/keychains/hd/restore-vault.js b/old-ui/app/keychains/hd/restore-vault.js index d334d8e5f..e9486a28d 100644 --- a/old-ui/app/keychains/hd/restore-vault.js +++ b/old-ui/app/keychains/hd/restore-vault.js @@ -42,9 +42,6 @@ RestoreVaultScreen.prototype.render = function () { // wallet seed entry h('h3', 'Wallet Seed'), h('textarea.twelve-word-phrase.letter-spacey', { - dataset: { - persistentFormId: 'wallet-seed', - }, placeholder: 'Enter your secret twelve word phrase here to restore your vault.', }), |