diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-04-17 07:32:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 07:32:56 +0800 |
| commit | 06689765146c3ca88fc206d93387b05e1db3b81c (patch) | |
| tree | c3c3b50de25ba7aafe6c58a426f0ba6212d63b71 /ui/app/components/pages | |
| parent | 6e1fcefdf1bec334b9cd7a38e6a2f2bb6a007f6e (diff) | |
| parent | 6a7fd3c774f50954050d651f7e6b8ff325ce2940 (diff) | |
| download | tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.gz tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.bz2 tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.lz tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.xz tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.zst tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.zip | |
Merge branch 'master' into i3981-contract-rates
Diffstat (limited to 'ui/app/components/pages')
| -rw-r--r-- | ui/app/components/pages/home.js | 1 | ||||
| -rw-r--r-- | ui/app/components/pages/keychains/restore-vault.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ui/app/components/pages/home.js b/ui/app/components/pages/home.js index 7857a2a99..90b8e1d37 100644 --- a/ui/app/components/pages/home.js +++ b/ui/app/components/pages/home.js @@ -5,6 +5,7 @@ const { Redirect, withRouter } = require('react-router-dom') const { compose } = require('recompose') const h = require('react-hyperscript') const actions = require('../../actions') +const log = require('loglevel') // init const NewKeyChainScreen = require('../../new-keychain') diff --git a/ui/app/components/pages/keychains/restore-vault.js b/ui/app/components/pages/keychains/restore-vault.js index d57894e00..33575bfbb 100644 --- a/ui/app/components/pages/keychains/restore-vault.js +++ b/ui/app/components/pages/keychains/restore-vault.js @@ -6,6 +6,7 @@ const connect = require('../../../metamask-connect') const h = require('react-hyperscript') const { createNewVaultAndRestore, unMarkPasswordForgotten } = require('../../../actions') const { DEFAULT_ROUTE } = require('../../../routes') +const log = require('loglevel') class RestoreVaultPage extends PersistentForm { constructor (props) { |