Merge pull request #7443 from NejcZdovc/hotfix/#6770-refresh

Fixed wallet preference page refresh
brave · Mar 2, 2017 · 84e45bd · 84e45bd
2 parents 259b5a4 + 24273c2
commit 84e45bd
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 15 deletions.
diff --git a/app/filtering.js b/app/filtering.js
@@ -561,11 +561,24 @@ function initForPartition (partition) {
     registerForDownloadListener,
     registerForMagnetHandler]
   let options = {}
+
   if (isSessionPartition(partition)) {
     options.parent_partition = ''
   }
+
   let ses = session.fromPartition(partition, options)
-  fns.forEach((fn) => { fn(ses, partition, module.exports.isPrivate(partition)) })
+  fns.forEach((fn) => {
+    fn(ses, partition, module.exports.isPrivate(partition))
+  })
+  ses.on('register-navigator-handler', (e, protocol, location) => {
+    appActions.navigatorHandler(ses.partition, protocol, location, true)
+  })
+  ses.on('unregister-navigator-handler', (e, protocol, location) => {
+    appActions.navigatorHandler(ses.partition, protocol, location, false)
+  })
+  ses.protocol.getNavigatorHandlers().forEach((handler) => {
+    appActions.navigatorHandler(ses.partition, handler.protocol, handler.location, true)
+  })
 }
 
 const filterableProtocols = ['http:', 'https:', 'ws:', 'wss:']

diff --git a/app/ledger.js b/app/ledger.js
@@ -232,6 +232,11 @@ const doAction = (action) => {
       setTimeout(networkConnected, 1 * msecs.second)
       break
 
+    case appConstants.APP_NAVIGATOR_HANDLER_UPDATE:
+      ledgerInfo.hasBitcoinHandler = (action.register && action.protocol === 'bitcoin')
+      appActions.updateLedgerInfo(underscore.omit(ledgerInfo, [ '_internal' ]))
+      break
+
     default:
       break
   }
@@ -458,15 +463,6 @@ if (ipc) {
     }
   })
 
-  ipc.on(messages.CHECK_BITCOIN_HANDLER, (event, partition) => {
-    const protocolHandler = session.fromPartition(partition).protocol
-    // TODO: https://github.com/brave/browser-laptop/issues/3625
-    if (typeof protocolHandler.isNavigatorProtocolHandled === 'function') {
-      ledgerInfo.hasBitcoinHandler = protocolHandler.isNavigatorProtocolHandled('bitcoin')
-      appActions.updateLedgerInfo(underscore.omit(ledgerInfo, [ '_internal' ]))
-    }
-  })
-
   ipc.on(messages.LEDGER_PUBLISHER, (event, location) => {
     var ctx
 

diff --git a/docs/appActions.md b/docs/appActions.md
@@ -764,6 +764,22 @@ Update the detail object for the open alert/confirm/prompt (triggers re-render)
 
 
 
+### navigatorHandler(partition, protocol, location, register) 
+
+Action triggered by navigation handler
+
+**Parameters**
+
+**partition**: `string`, session partition
+
+**protocol**: `string`, navigator protocol
+
+**location**: `string`, location where handler was triggered
+
+**register**: `boolean`, true if event was registered or false if unregistered
+
+
+
 
 * * *
 

diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -940,6 +940,23 @@ const appActions = {
       tabId,
       detail
     })
+  },
+
+  /**
+   * Action triggered by navigation handler
+   * @param partition {string} session partition
+   * @param protocol {string} navigator protocol
+   * @param location {string} location where handler was triggered
+   * @param register {boolean} true if event was registered or false if unregistered
+   */
+  navigatorHandler: function (partition, protocol, location, register) {
+    AppDispatcher.dispatch({
+      actionType: appConstants.APP_NAVIGATOR_HANDLER_UPDATE,
+      partition,
+      protocol,
+      location,
+      register
+    })
   }
 }
 

diff --git a/js/components/frame.js b/js/components/frame.js
@@ -91,9 +91,6 @@ class Frame extends ImmutableComponent {
   updateAboutDetails (prevProps) {
     let location = getBaseUrl(this.props.location)
     if (location === 'about:preferences' || location === 'about:contributions' || location === aboutUrls.get('about:contributions')) {
-      if (prevProps.partition !== this.props.partition) {
-        ipc.send(messages.CHECK_BITCOIN_HANDLER, this.props.partition)
-      }
       if (!Immutable.is(prevProps.ledgerInfo, this.props.ledgerInfo) ||
           !Immutable.is(prevProps.publisherInfo, this.props.publisherInfo) ||
           !Immutable.is(prevProps.preferencesData, this.props.preferencesData)) {

diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
@@ -95,7 +95,8 @@ const appConstants = {
   APP_ADD_NOSCRIPT_EXCEPTIONS: _,
   APP_TAB_MESSAGE_BOX_SHOWN: _,
   APP_TAB_MESSAGE_BOX_DISMISSED: _,
-  APP_TAB_MESSAGE_BOX_UPDATED: _
+  APP_TAB_MESSAGE_BOX_UPDATED: _,
+  APP_NAVIGATOR_HANDLER_UPDATE: _
 }
 
 module.exports = mapValuesByKeys(appConstants)
diff --git a/test/unit/app/renderer/components/messageBoxTest.js b/test/unit/app/renderer/components/messageBoxTest.js
@@ -150,7 +150,7 @@ describe('MessageBox component unit tests', function () {
           />
         )
         const instance = wrapper.instance()
-        assert.deepEqual(instance.buttons.toJS(), ['OK'])
+        assert.deepEqual(instance.buttons.toJS(), ['ok'])
       })
     })