From 5db77c839bcf2ec433c8618c5b2ef1ff850df613 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 8 Nov 2019 21:57:09 -0600
Subject: [PATCH] about page: fix hiding of instance-specific panel, flow ToS
 and ISP better

---
 src/components/about/about.js  | 7 ++++++-
 src/components/about/about.vue | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/about/about.js b/src/components/about/about.js
index ae1cb182..92856b21 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -9,7 +9,12 @@ const About = {
     TermsOfServicePanel
   },
   computed: {
-    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
+    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
+    showInstanceSpecificPanel () {
+      return this.$store.state.instance.showInstanceSpecificPanel &&
+        !this.$store.getters.mergedConfig.hideISP &&
+        this.$store.state.instance.instanceSpecificPanelContent
+    }
   }
 }
 
diff --git a/src/components/about/about.vue b/src/components/about/about.vue
index 62ae16ea..10dad4bb 100644
--- a/src/components/about/about.vue
+++ b/src/components/about/about.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="sidebar">
-    <instance-specific-panel />
-    <features-panel v-if="showFeaturesPanel" />
+    <instance-specific-panel v-if="showInstanceSpecificPanel" />
     <terms-of-service-panel />
+    <features-panel v-if="showFeaturesPanel" />
   </div>
 </template>