From a62ffc6cf9479761f731c25de042e801eee51604 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Thu, 19 Oct 2023 19:20:55 +0530
Subject: [PATCH] refactor: display options menu logic

---
 .../ContentListView/Header/DisplayOptionsMenu.tsx |  2 +-
 .../Subscription/SubscriptionController.ts        | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
index 7ddf7db43..ef12cf3d6 100644
--- a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
@@ -93,7 +93,7 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
     : selectedTag.preferences
   const [currentMode, setCurrentMode] = useState<PreferenceMode>(selectedTagPreferences ? 'tag' : 'global')
   const [preferences, setPreferences] = useState<TagPreferences>({})
-  const hasSubscription = application.subscriptionController.hasFirstPartySubscriptionOrOfflineRepo()
+  const hasSubscription = application.subscriptionController.hasFirstPartyOnlineOrOfflineSubscription()
   const controlsDisabled = currentMode === 'tag' && !hasSubscription
   const isDailyEntry = selectedTagPreferences?.entryMode === 'daily'
 
diff --git a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
index 2f1c44e12..e1bf4c67e 100644
--- a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
+++ b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
@@ -89,20 +89,11 @@ export class SubscriptionController extends AbstractViewController implements In
   }
 
   hasFirstPartyOnlineOrOfflineSubscription(): boolean {
-    if (this.sessions.isSignedIn()) {
-      if (!this.sessions.isSignedIntoFirstPartyServer()) {
-        return false
-      }
-
-      return !!this.subscriptions.getOnlineSubscription()
-    } else {
-      const offline = this.features.hasFirstPartyOfflineSubscription()
+    const offline = this.features.hasFirstPartyOfflineSubscription()
+    if (!this.sessions.isSignedIn() || !this.sessions.isSignedIntoFirstPartyServer()) {
       return offline
     }
-  }
-
-  hasFirstPartySubscriptionOrOfflineRepo(): boolean {
-    return this.hasFirstPartyOnlineOrOfflineSubscription() || this.features.hasOfflineRepo()
+    return !!this.subscriptions.getOnlineSubscription() || offline
   }
 
   get usedInvitationsCount(): number {