From 70c05a0c085adb95ef9946ac58a461f56252c2c2 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 12:17:14 -0800
Subject: [PATCH 1/3] Fix showFeaturesPanel option as instance

---
 src/App.js                    | 2 +-
 src/boot/after_store.js       | 1 +
 src/components/about/about.js | 2 +-
 src/modules/config.js         | 3 +--
 src/modules/instance.js       | 1 +
 static/config.json            | 3 ++-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/App.js b/src/App.js
index 18bff2dd..200254f3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -82,7 +82,7 @@ export default {
     unseenNotificationsCount () {
       return this.unseenNotifications.length
     },
-    showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
+    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
   },
   methods: {
     scrollToTop () {
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5693dcc6..2e7754ab 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -86,6 +86,7 @@ const afterStoreSetup = ({ store, i18n }) => {
           copyInstanceOption('subjectLineBehavior')
           copyInstanceOption('alwaysShowSubjectInput')
           copyInstanceOption('noAttachmentLinks')
+          copyInstanceOption('showFeaturesPanel')
 
           if ((config.chatDisabled)) {
             store.dispatch('disableChat')
diff --git a/src/components/about/about.js b/src/components/about/about.js
index b1ce3c7d..ae1cb182 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -9,7 +9,7 @@ const About = {
     TermsOfServicePanel
   },
   computed: {
-    showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
+    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
   }
 }
 
diff --git a/src/modules/config.js b/src/modules/config.js
index 526a7021..c9528f6f 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -30,8 +30,7 @@ const defaultState = {
   interfaceLanguage: browserLocale,
   scopeCopy: undefined, // instance default
   subjectLineBehavior: undefined, // instance default
-  alwaysShowSubjectInput: undefined, // instance default
-  showFeaturesPanel: true
+  alwaysShowSubjectInput: undefined // instance default
 }
 
 const config = {
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 4ad41873..1bb5eb1b 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -28,6 +28,7 @@ const defaultState = {
   nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
   noAttachmentLinks: false,
+  showFeaturesPanel: false,
 
   // Nasty stuff
   pleromaBackend: true,
diff --git a/static/config.json b/static/config.json
index 24e26696..204b5fc7 100644
--- a/static/config.json
+++ b/static/config.json
@@ -19,5 +19,6 @@
   "loginMethod": "password",
   "webPushNotifications": false,
   "noAttachmentLinks": false,
-  "nsfwCensorImage": ""
+  "nsfwCensorImage": "",
+  "showFeaturesPanel": true
 }

From ced29a64827ee4f34c71776cb217188093e7ee58 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 13:18:50 -0800
Subject: [PATCH 2/3] fixing conflicts

---
 src/modules/config.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/modules/config.js b/src/modules/config.js
index eb2df541..71f71376 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -30,13 +30,8 @@ const defaultState = {
   interfaceLanguage: browserLocale,
   scopeCopy: undefined, // instance default
   subjectLineBehavior: undefined, // instance default
-<<<<<<< HEAD
-  alwaysShowSubjectInput: undefined // instance default
-=======
   alwaysShowSubjectInput: undefined, // instance default
-  showFeaturesPanel: true,
   postContentType: undefined // instance default
->>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac
 }
 
 const config = {

From 5b52e020e32def19622e3d1df82f93bc716946e2 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 13:20:47 -0800
Subject: [PATCH 3/3] fixing conflicts

---
 src/modules/instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 46ca04d8..b4ec8253 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -29,7 +29,7 @@ const defaultState = {
   nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
   noAttachmentLinks: false,
-  showFeaturesPanel: false,
+  showFeaturesPanel: true,
 
   // Nasty stuff
   pleromaBackend: true,