From 9862323301aa38ff4bb27f4f72883aafa62ef2b3 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Thu, 16 Apr 2026 14:33:01 -0300
Subject: [PATCH 1/2] fix: Shows info on UI and hides Manage button for shared
 subs

---
 packages/responses/src/Domain/Temp/Subscription.ts  |  1 +
 .../Panes/Account/AccountPreferences.tsx            |  4 +++-
 .../Subscription/SubscriptionInformation.tsx        |  6 +++++-
 .../Account/Subscription/SubscriptionStatusText.tsx | 13 ++++++++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/responses/src/Domain/Temp/Subscription.ts b/packages/responses/src/Domain/Temp/Subscription.ts
index e749413a965..26949937891 100644
--- a/packages/responses/src/Domain/Temp/Subscription.ts
+++ b/packages/responses/src/Domain/Temp/Subscription.ts
@@ -4,4 +4,5 @@ export type Subscription = {
   createdAt: number
   updatedAt: number
   cancelled: boolean
+  subscriptionType?: 'regular' | 'shared'
 }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
index 7fe9aa7daf5..13294ca0c4f 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
@@ -18,6 +18,8 @@ type Props = {
 
 const AccountPreferences = ({ application }: Props) => {
   const isUsingThirdPartyServer = !application.sessions.isSignedIntoFirstPartyServer()
+  const onlineSubscription = application.subscriptionController.onlineSubscription
+  const isSharedSubscription = onlineSubscription?.subscriptionType === 'shared'
 
   return (
     <PreferencesPane>
@@ -30,7 +32,7 @@ const AccountPreferences = ({ application }: Props) => {
         </>
       )}
       <Subscription />
-      <SubscriptionSharing application={application} />
+      {!isSharedSubscription && <SubscriptionSharing application={application} />}
       {application.hasAccount() && application.featuresController.entitledToFiles && (
         <FilesSection application={application} />
       )}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
index 5e02fc7d703..0c170bccf11 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
@@ -5,6 +5,8 @@ import { useApplication } from '@/Components/ApplicationProvider'
 
 const SubscriptionInformation = () => {
   const application = useApplication()
+  const onlineSubscription = application.subscriptionController.onlineSubscription
+  const isSharedSubscription = onlineSubscription?.subscriptionType === 'shared'
 
   const manageSubscription = async () => {
     void application.openSubscriptionDashboard.execute()
@@ -13,7 +15,9 @@ const SubscriptionInformation = () => {
   return (
     <>
       <SubscriptionStatusText />
-      <Button className="mr-3 mt-3 min-w-20" label="Manage subscription" onClick={manageSubscription} />
+      {!isSharedSubscription && (
+        <Button className="mr-3 mt-3 min-w-20" label="Manage subscription" onClick={manageSubscription} />
+      )}
     </>
   )
 }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
index 03875fcbb41..f747c730f22 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
@@ -11,8 +11,17 @@ const SubscriptionStatusText = () => {
     isUserSubscriptionExpired,
     isUserSubscriptionCanceled,
   } = application.subscriptions
+  const onlineSubscription = application.subscriptionController.onlineSubscription
+  const isSharedSubscription = onlineSubscription?.subscriptionType === 'shared'
 
   const expirationDateString = userSubscriptionExpirationDate?.toLocaleString()
+  const sharedMessage = isSharedSubscription ? (
+    <>
+      <br />
+      <br />
+      This subscription has been shared with you and can only be managed by the owner.
+    </>
+  ) : null
 
   if (isUserSubscriptionCanceled) {
     return (
@@ -29,6 +38,7 @@ const SubscriptionStatusText = () => {
           <span className="font-bold">but will remain valid until {expirationDateString}</span>
         )}
         . You may resubscribe below if you wish.
+        {sharedMessage}
       </Text>
     )
   }
@@ -43,6 +53,7 @@ const SubscriptionStatusText = () => {
         </span>{' '}
         subscription <span className="font-bold">expired on {expirationDateString}</span>. You may resubscribe below if
         you wish.
+        {sharedMessage}
       </Text>
     )
   }
@@ -54,7 +65,7 @@ const SubscriptionStatusText = () => {
         Standard Notes{userSubscriptionName ? ' ' : ''}
         {userSubscriptionName}
       </span>{' '}
-      subscription will be <span className="font-bold">renewed on {expirationDateString}</span>.
+      subscription will be <span className="font-bold">renewed on {expirationDateString}</span>.{sharedMessage}
     </Text>
   )
 }

From a14feea7c3b11a6b9b0a826cad3d1a95f46f0844 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Thu, 23 Apr 2026 14:50:37 -0300
Subject: [PATCH 2/2] chore: dry

---
 .../Preferences/Panes/Account/AccountPreferences.tsx         | 3 +--
 .../Panes/Account/Subscription/SubscriptionInformation.tsx   | 3 +--
 .../Panes/Account/Subscription/SubscriptionStatusText.tsx    | 3 +--
 .../Controllers/Subscription/SubscriptionController.ts       | 5 +++++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
index 13294ca0c4f..2e1dec48264 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
@@ -18,8 +18,7 @@ type Props = {
 
 const AccountPreferences = ({ application }: Props) => {
   const isUsingThirdPartyServer = !application.sessions.isSignedIntoFirstPartyServer()
-  const onlineSubscription = application.subscriptionController.onlineSubscription
-  const isSharedSubscription = onlineSubscription?.subscriptionType === 'shared'
+  const isSharedSubscription = application.subscriptionController.isSharedSubscription
 
   return (
     <PreferencesPane>
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
index 0c170bccf11..f945da5716e 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
@@ -5,8 +5,7 @@ import { useApplication } from '@/Components/ApplicationProvider'
 
 const SubscriptionInformation = () => {
   const application = useApplication()
-  const onlineSubscription = application.subscriptionController.onlineSubscription
-  const isSharedSubscription = onlineSubscription?.subscriptionType === 'shared'
+  const isSharedSubscription = application.subscriptionController.isSharedSubscription
 
   const manageSubscription = async () => {
     void application.openSubscriptionDashboard.execute()
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
index f747c730f22..46c540748c1 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
@@ -11,8 +11,7 @@ const SubscriptionStatusText = () => {
     isUserSubscriptionExpired,
     isUserSubscriptionCanceled,
   } = application.subscriptions
-  const onlineSubscription = application.subscriptionController.onlineSubscription
-  const isSharedSubscription = onlineSubscription?.subscriptionType === 'shared'
+  const isSharedSubscription = application.subscriptionController.isSharedSubscription
 
   const expirationDateString = userSubscriptionExpirationDate?.toLocaleString()
   const sharedMessage = isSharedSubscription ? (
diff --git a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
index e1bf4c67ea5..6395cd276d8 100644
--- a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
+++ b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
@@ -36,6 +36,7 @@ export class SubscriptionController extends AbstractViewController implements In
       hasAccount: observable,
       onlineSubscription: observable,
 
+      isSharedSubscription: computed,
       usedInvitationsCount: computed,
       allowedInvitationsCount: computed,
       allInvitationsUsed: computed,
@@ -96,6 +97,10 @@ export class SubscriptionController extends AbstractViewController implements In
     return !!this.subscriptions.getOnlineSubscription() || offline
   }
 
+  get isSharedSubscription(): boolean {
+    return this.onlineSubscription?.subscriptionType === 'shared'
+  }
+
   get usedInvitationsCount(): number {
     return (
       this.subscriptionInvitations?.filter((invitation) =>