diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-17 07:02:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 07:02:24 +0800 |
| commit | ee62a6a3913967a6840d28ca812b94bbfa7a5779 (patch) | |
| tree | cac32de6cc520917db9621ce93f7f4ad9abd787e /mock-dev.js | |
| parent | e8e06542e47b41668f196b6db54290490003845b (diff) | |
| parent | 88fabdd2de78d0dd4be86b02c94a64d9748667fa (diff) | |
| download | tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.gz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.bz2 tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.lz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.xz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.zst tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.zip | |
Merge pull request #1005 from MetaMask/dev
Merge dev into master!
Diffstat (limited to 'mock-dev.js')
| -rw-r--r-- | mock-dev.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mock-dev.js b/mock-dev.js index 99b846e51..283bc2c79 100644 --- a/mock-dev.js +++ b/mock-dev.js @@ -26,7 +26,7 @@ const extension = require('./development/mockExtension') // Query String const qs = require('qs') let queryString = qs.parse(window.location.href.split('#')[1]) -let selectedView = queryString.view || 'terms' +let selectedView = queryString.view || 'first time' const firstState = states[selectedView] updateQueryParams(selectedView) @@ -46,7 +46,7 @@ const controller = new MetamaskController({ // User confirmation callbacks: showUnconfirmedMessage: noop, unlockAccountMessage: noop, - showUnconfirmedTx: noop, + showUnapprovedTx: noop, // Persistence Methods: setData, loadData, @@ -107,7 +107,7 @@ function getOldStyleData () { return result } -actions._setAccountManager(controller.getApi()) +actions._setBackgroundConnection(controller.getApi()) actions.update = function(stateName) { selectedView = stateName updateQueryParams(stateName) |