From 1bd5b7880db5a640e6661938809e41063ae4f4df Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Wed, 18 Oct 2023 23:54:34 +0530 Subject: [PATCH] chore: fix per-tag preferences not working when using offline subscription code --- .../Components/ContentListView/Header/DisplayOptionsMenu.tsx | 2 +- .../Controllers/Subscription/SubscriptionController.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx index ef12cf3d6..7ddf7db43 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 = ({ : selectedTag.preferences const [currentMode, setCurrentMode] = useState(selectedTagPreferences ? 'tag' : 'global') const [preferences, setPreferences] = useState({}) - const hasSubscription = application.subscriptionController.hasFirstPartyOnlineOrOfflineSubscription() + const hasSubscription = application.subscriptionController.hasFirstPartySubscriptionOrOfflineRepo() 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 b06c45670..2f1c44e12 100644 --- a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts +++ b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts @@ -101,6 +101,10 @@ export class SubscriptionController extends AbstractViewController implements In } } + hasFirstPartySubscriptionOrOfflineRepo(): boolean { + return this.hasFirstPartyOnlineOrOfflineSubscription() || this.features.hasOfflineRepo() + } + get usedInvitationsCount(): number { return ( this.subscriptionInvitations?.filter((invitation) =>