Landing page logic fix (#4378)

* Push fix * Fix bug * Prevent subscribe dropdown from opening on SubscribedChannels route
FreeTubeApp · Nov 24, 2023 · 16050c7 · 16050c7
1 parent d8d6196
commit 16050c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/renderer/App.js b/src/renderer/App.js
@@ -183,8 +183,8 @@ export default defineComponent({
       })
 
       this.$router.onReady(() => {
-        if (this.$router.currentRoute.path !== this.landingPage && this.landingPage !== '/subscriptions') {
-          this.$router.push({ path: this.landingPage })
+        if (this.$router.currentRoute.path === '/' && this.landingPage !== '/subscriptions') {
+          this.$router.replace({ path: this.landingPage })
         }
       })
     })

diff --git a/src/renderer/components/ft-subscribe-button/ft-subscribe-button.js b/src/renderer/components/ft-subscribe-button/ft-subscribe-button.js
@@ -29,6 +29,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    openDropdownOnSubscribe: {
+      type: Boolean,
+      default: true
+    },
     subscriptionCountText: {
       default: '',
       type: String,
@@ -152,7 +156,7 @@ export default defineComponent({
         }
       }
 
-      if (this.isProfileDropdownEnabled && !this.isProfileDropdownOpen) {
+      if (this.isProfileDropdownEnabled && this.openDropdownOnSubscribe && !this.isProfileDropdownOpen) {
         this.toggleProfileDropdown()
       }
     },

diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
@@ -56,6 +56,7 @@
                 :channel-id="channel.id"
                 :channel-name="channel.name"
                 :channel-thumbnail="channel.thumbnail"
+                :open-dropdown-on-subscribe="false"
               />
             </div>
           </div>