Converts SiteInfo into redux component

Resolves brave#9412 Auditors: @bsclifton @bridiver Test Plan:
NejcZdovc · Jun 13, 2017 · 5ff3a61 · 5ff3a61
1 parent 5e16c50
commit 5ff3a61
Show file tree

Hide file tree

Showing 2 changed files with 198 additions and 188 deletions.
diff --git a/app/renderer/components/main/main.js b/app/renderer/components/main/main.js
@@ -67,6 +67,7 @@ const cx = require('../../../../js/lib/classSet')
 const eventUtil = require('../../../../js/lib/eventUtil')
 const siteSettings = require('../../../../js/state/siteSettings')
 const debounce = require('../../../../js/lib/debounce')
+const {isSourceAboutUrl} = require('../../../../js/lib/appUrlUtil')
 const {getCurrentWindowId, isMaximized, isFocused, isFullScreen} = require('../../currentWindow')
 const {isDarwin, isWindows} = require('../../../common/lib/platformUtil')
 
@@ -687,7 +688,7 @@ class Main extends ImmutableComponent {
     const btbMode = getSetting(settings.BOOKMARKS_TOOLBAR_MODE)
     const showFavicon = (btbMode === bookmarksToolbarMode.TEXT_AND_FAVICONS || btbMode === bookmarksToolbarMode.FAVICONS_ONLY)
     const showOnlyFavicon = btbMode === bookmarksToolbarMode.FAVICONS_ONLY
-    const siteInfoIsVisible = this.props.windowState.getIn(['ui', 'siteInfo', 'isVisible'])
+    const siteInfoIsVisible = this.props.windowState.getIn(['ui', 'siteInfo', 'isVisible']) && !isSourceAboutUrl(activeFrame.get('location'))
     const braveryPanelIsVisible = shieldState.braveShieldsEnabled(activeFrame) &&
       this.props.windowState.get('braveryPanelDetail')
     const clearBrowsingDataPanelIsVisible = this.props.windowState.getIn(['ui', 'isClearBrowsingDataPanelVisible'])
@@ -737,8 +738,7 @@ class Main extends ImmutableComponent {
         <Navigator />
         {
           siteInfoIsVisible
-          ? <SiteInfo frameProps={activeFrame}
-            onHide={this.onHideSiteInfo} />
+          ? <SiteInfo />
           : null
         }
         {