From f587533e4b27a5e4437274b948e50a6f22a9f08a Mon Sep 17 00:00:00 2001
From: Cezar Augusto <cezaraugusto@outlook.it>
Date: Wed, 8 Mar 2017 15:49:03 -0800
Subject: [PATCH] Avoid race condition on publisherToggle Auditors: @bsclifton

Fix #7497
---
 app/renderer/components/publisherToggle.js | 3 +++
 js/components/navigationBar.js             | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/renderer/components/publisherToggle.js b/app/renderer/components/publisherToggle.js
index e439cdb836..8782674259 100644
--- a/app/renderer/components/publisherToggle.js
+++ b/app/renderer/components/publisherToggle.js
@@ -93,6 +93,9 @@ class PublisherToggle extends ImmutableComponent {
   }
 
   render () {
+    if (!this.props.locationInfo) {
+      return null
+    }
     return this.shouldShowAddPublisherButton
       ? <span
         data-test-id='publisherButton'
diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
index bb2d4582a1..fa5a8f298c 100644
--- a/js/components/navigationBar.js
+++ b/js/components/navigationBar.js
@@ -119,12 +119,12 @@ class NavigationBar extends ImmutableComponent {
   }
 
   get publisherId () {
-    return (this.props.locationInfo && this.props.locationInfo.getIn([this.locationId, 'publisher'])) || ''
+    return this.props.locationInfo && this.props.locationInfo.getIn([this.locationId, 'publisher'])
   }
 
   get visiblePublisher () {
     // No publisher is visible if ledger is disabled
-    if (!getSetting(settings.PAYMENTS_ENABLED)) {
+    if (!getSetting(settings.PAYMENTS_ENABLED) || !this.publisherId) {
       return false
     }
     const hostPattern = UrlUtil.getHostPattern(this.publisherId)