diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
| commit | bef023fb4a699c16fe0fff30ce18840678ed7ad0 (patch) | |
| tree | d11be9af938712aeb554f070822be01b2d7fbceb /mock-dev.js | |
| parent | 37d836fa72c75945d436bd94feadb65aa95d7e5f (diff) | |
| parent | 39e0a33bba2709971edec0304027f646cb2db3cc (diff) | |
| download | tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.gz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.zst tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.zip | |
Resolve merge conflict.
Diffstat (limited to 'mock-dev.js')
| -rw-r--r-- | mock-dev.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mock-dev.js b/mock-dev.js index 99b846e51..84f2d234a 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) @@ -107,7 +107,7 @@ function getOldStyleData () { return result } -actions._setAccountManager(controller.getApi()) +actions._setBackgroundConnection(controller.getApi()) actions.update = function(stateName) { selectedView = stateName updateQueryParams(stateName) |