Merge branch 'instance-migration' into shigusegubu-themes3

src/App.js

@@ -23,6 +23,7 @@ import { getOrCreateServiceWorker } from './services/sw/sw'
 import { windowHeight, windowWidth } from './services/window_utils/window_utils'
 
 import { useInstanceStore } from 'src/stores/instance.js'
+import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useShoutStore } from 'src/stores/shout.js'
 
@@ -146,13 +147,6 @@ export default {
     shout() {
       return useShoutStore().joined
     },
-    showInstanceSpecificPanel() {
-      return (
-        this.showInstanceSpecificPanel &&
-        !this.$store.getters.mergedConfig.hideISP &&
-        this.instanceSpecificPanelContent
-      )
-    },
     isChats() {
       return this.$route.name === 'chat' || this.$route.name === 'chats'
     },
@@ -193,6 +187,12 @@ export default {
     scrollParent() {
       return window /* this.$refs.appContentRef */
     },
+    showInstanceSpecificPanel() {
+      return (
+        this.instanceSpecificPanelPresent &&
+        !this.$store.getters.mergedConfig.hideISP
+      )
+    },
     ...mapGetters(['mergedConfig']),
     ...mapState(useInterfaceStore, [
       'themeApplied',
@@ -200,14 +200,15 @@ export default {
       'layoutType',
     ]),
     ...mapState(useInstanceStore, ['styleDataUsed', 'private']),
+    ...mapState(useInstanceCapabilitiesStore, [
+      'suggestionsEnabled',
+      'editingAvailable',
+    ]),
     ...mapState(useInstanceStore, {
       instanceBackground: (store) => store.instanceIdentity.background,
       showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel,
-      showInstanceSpecificPanel: (store) =>
-        store.instanceIdentity.showInstanceSpecificPanel,
-      suggestionsEnabled: (store) => store.featureSet.suggestionsEnabled,
-      editingAvailable: (store) => store.featureSet.editingAvailable,
-      instanceSpecificPanelContent: (store) =>
+      instanceSpecificPanelPresent: (store) =>
+        store.instanceIdentity.showInstanceSpecificPanel &&
         store.instanceIdentity.instanceSpecificPanelContent,
     }),
   },