Merge pull request #3151 from brave/ca-5438

[brave-extension] do not show advanced view option when Shields is off
brave · Aug 13, 2019 · a4c498d · a4c498d
2 parents 8abf254 + b905eb7
commit a4c498d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/components/brave_extension/extension/brave_extension/components/advancedView/footer.tsx b/components/brave_extension/extension/brave_extension/components/advancedView/footer.tsx
@@ -14,6 +14,7 @@ import * as tabsAPI from '../../background/api/tabsAPI'
 import { getLocale } from '../../background/api/localeAPI'
 
 export interface Props {
+  enabled: boolean
   isBlockedListOpen: boolean
   toggleAdvancedView: () => void
 }
@@ -25,12 +26,12 @@ export default class Footer extends React.PureComponent<Props, {}> {
   }
 
   render () {
-    const { isBlockedListOpen, toggleAdvancedView } = this.props
+    const { enabled, isBlockedListOpen, toggleAdvancedView } = this.props
     return (
       <MainFooter>
-        <Link disabled={isBlockedListOpen} onClick={toggleAdvancedView}>
+        {enabled && <Link disabled={isBlockedListOpen} onClick={toggleAdvancedView}>
           {getLocale('simpleView')}
-        </Link>
+        </Link>}
         <Link
           id='braveShieldsFooter'
           onClick={this.openSettings}

diff --git a/components/brave_extension/extension/brave_extension/components/advancedView/index.tsx b/components/brave_extension/extension/brave_extension/components/advancedView/index.tsx
@@ -157,6 +157,7 @@ export default class Shields extends React.PureComponent<Props, State> {
           )
         }
         <Footer
+          enabled={this.isShieldsEnabled}
           isBlockedListOpen={isBlockedListOpen}
           toggleAdvancedView={toggleAdvancedView}
         />

diff --git a/components/brave_extension/extension/brave_extension/components/simpleView/footer.tsx b/components/brave_extension/extension/brave_extension/components/simpleView/footer.tsx
@@ -14,6 +14,7 @@ import * as tabsAPI from '../../background/api/tabsAPI'
 import { getLocale } from '../../background/api/localeAPI'
 
 export interface Props {
+  enabled: boolean
   toggleAdvancedView: () => void
 }
 
@@ -24,12 +25,13 @@ export default class Footer extends React.PureComponent<Props, {}> {
   }
 
   render () {
-    const { toggleAdvancedView } = this.props
+    const { enabled, toggleAdvancedView } = this.props
     return (
       <MainFooter>
+        {enabled &&
         <Link onClick={toggleAdvancedView}>
           {getLocale('advancedView')}
-        </Link>
+        </Link>}
         <Link id='braveShieldsFooter' onClick={this.openSettings}>
           {getLocale('changeDefaults')}
         </Link>

diff --git a/components/brave_extension/extension/brave_extension/components/simpleView/index.tsx b/components/brave_extension/extension/brave_extension/components/simpleView/index.tsx
@@ -79,6 +79,7 @@ export default class ShieldsSimpleView extends React.PureComponent<Props, {}> {
           toggleReadOnlyView={toggleReadOnlyView}
         />
         <Footer
+          enabled={this.isShieldsEnabled}
           toggleAdvancedView={toggleAdvancedView}
         />
       </ShieldsPanel>