diff --git a/src/App.js b/src/App.js index 220f563f8..512853200 100644 --- a/src/App.js +++ b/src/App.js @@ -133,11 +133,8 @@ export default { userBackground() { return this.currentUser.background_image }, - instanceBackground() { - return this.mergedConfig.hideInstanceWallpaper ? null : this.background - }, background() { - return this.userBackground || this.instanceBackground + return this.userBackground || (this.mergedConfig.hideInstanceWallpaper ? null : this.instanceBackground) }, bgStyle() { if (this.background) { @@ -204,7 +201,7 @@ export default { ]), ...mapState(useInstanceStore, ['styleDataUsed', 'private']), ...mapState(useInstanceStore, { - background: (store) => store.instanceIdentity.background, + instanceBackground: (store) => store.instanceIdentity.background, showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel, showInstanceSpecificPanel: (store) => store.instanceIdentity.showInstanceSpecificPanel,