Move ledger state manipulation out into a helper file (can be refacto…

…red later to be a more event based process and code can be turned into a reducer).

Auditors: @cezaraugusto

app/common/state/publisherState.js

@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const {makeImmutable} = require('./immutableUtil')
+const ledger = require('../../ledger')
+
+const publisherState = {
+  setLocation: (state) => {
+    state = makeImmutable(state)
+    return state.set('publisherLocation', makeImmutable(ledger.locations))
+  },
+  setPublisherInfo: (state, action) => {
+    state = makeImmutable(state)
+    return state.set('publisherInfo', makeImmutable(action.publisherInfo))
+  },
+  setLedgerInfo: (state, action) => {
+    state = makeImmutable(state)
+    return state.set('ledgerInfo', makeImmutable(action.ledgerInfo))
+  },
+  onBackupKeys: (state, action) => {
+    state = makeImmutable(state)
+    return ledger.backupKeys(state, action)
+  },
+  onRecoverKeys: (state, action) => {
+    state = makeImmutable(state)
+    return ledger.recoverKeys(state, action)
+  }
+}
+
+module.exports = publisherState

js/components/main.js

@@ -1003,7 +1003,7 @@ class Main extends ImmutableComponent {
                 noScriptIsVisible={noScriptIsVisible}
                 menubarVisible={customTitlebar.menubarVisible}
                 allSiteSettings={allSiteSettings}
-                publisherInfo={this.props.appState.get('publisherInfo') || new Immutable.Map()}
+                publisherLocation={this.props.appState.get('publisherLocation') || new Immutable.Map()}
               />
               <div className='topLevelEndButtons'>
                 <div className={cx({

js/components/navigationBar.js

@@ -133,12 +133,11 @@ class NavigationBar extends ImmutableComponent {
   }
 
   get shouldShowAddPublisherButton () {
-    const publisherLocation = this.props.publisherInfo.get('location')
     const hostSettings = this.props.allSiteSettings.get(this.hostPattern)
 
-    if (hostSettings && publisherLocation) {
+    if (hostSettings && this.props.publisherLocation) {
       const ledgerPaymentsShown = hostSettings.get('ledgerPaymentsShown')
-      const validPublisher = !!publisherLocation.get(this.props.location)
+      const validPublisher = !!this.props.publisherLocation.get(this.props.location)
 
       if (validPublisher && ledgerPaymentsShown !== false) {
         return !getSetting(settings.AUTO_SUGGEST_SITES) && !getSetting(settings.HIDE_EXCLUDED_SITES)
@@ -173,7 +172,7 @@ class NavigationBar extends ImmutableComponent {
     if (this.props.activeFrameKey === undefined) {
       return null
     }
-    console.log('LOCATION HERE -----------------', !!this.props.publisherInfo)
+    console.log('LOCATION HERE -----------------', JSON.stringify(this.props.publisherLocation))
 
     return <div id='navigator'
       ref='navigator'

js/stores/appStore.js

@@ -41,6 +41,7 @@ const basicAuthState = require('../../app/common/state/basicAuthState')
 const extensionState = require('../../app/common/state/extensionState')
 const aboutNewTabState = require('../../app/common/state/aboutNewTabState')
 const aboutHistoryState = require('../../app/common/state/aboutHistoryState')
+const publisherState = require('../../app/common/state/publisherState')
 const windowState = require('../../app/common/state/windowState')
 
 const webtorrent = require('../../app/browser/webtorrent')
@@ -369,8 +370,6 @@ const handleAppAction = (action) => {
     return
   }
 
-  const ledger = require('../../app/ledger')
-
   appState = applyReducers(appState, action)
 
   switch (action.actionType) {
@@ -499,9 +498,7 @@ const handleAppAction = (action) => {
       }
       appState = aboutNewTabState.setSites(appState, action)
       appState = aboutHistoryState.setHistory(appState, action)
-
-      const location = ledger.locations
-      appState = appState.setIn(['publisherInfo', 'location'], Immutable.fromJS(location))
+      appState = publisherState.setLocation(appState)
       break
     case appConstants.APP_REMOVE_SITE:
       appState = appState.set('sites', siteUtil.removeSite(appState.get('sites'), action.siteDetail, action.tag))
@@ -614,10 +611,10 @@ const handleAppAction = (action) => {
         break
       }
     case appConstants.APP_UPDATE_LEDGER_INFO:
-      appState = appState.set('ledgerInfo', Immutable.fromJS(action.ledgerInfo))
+      appState = publisherState.setLedgerInfo(appState, action)
       break
     case appConstants.APP_UPDATE_PUBLISHER_INFO:
-      appState = appState.set('publisherInfo', Immutable.fromJS(action.publisherInfo))
+      appState = publisherState.setPublisherInfo(appState, action)
       break
     case appConstants.APP_SHOW_MESSAGE_BOX:
       let notifications = appState.get('notifications')
@@ -675,10 +672,10 @@ const handleAppAction = (action) => {
       appState = appState.setIn(['dictionary', 'locale'], action.locale)
       break
     case appConstants.APP_BACKUP_KEYS:
-      appState = ledger.backupKeys(appState, action)
+      appState = publisherState.onBackupKeys(appState, action)
       break
     case appConstants.APP_RECOVER_WALLET:
-      appState = ledger.recoverKeys(appState, action)
+      appState = publisherState.onRecoverKeys(appState, action)
       break
     case appConstants.APP_LEDGER_RECOVERY_SUCCEEDED:
       appState = appState.setIn(['ui', 'about', 'preferences', 'recoverySucceeded'], true)