[pull] main from TryGhost:main

apps/admin-x-settings/src/components/settings/email/enable-newsletters.tsx

@@ -35,8 +35,9 @@ const EnableNewsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const enableToggle = (
         <>
             <Toggle
-                checked={newslettersEnabled !== 'disabled'}
+                checked={newslettersEnabled !== 'disabled' && !isDisabled}
                 direction='rtl'
+                disabled={isDisabled}
                 onChange={handleToggleChange}
             />
         </>
@@ -55,22 +56,24 @@ const EnableNewsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
             values={[
                 {
                     key: 'private',
-                    value: (newslettersEnabled !== 'disabled') ? (<div className='w-full'>
+                    value: (newslettersEnabled !== 'disabled' && !isDisabled) ? (<div className='w-full'>
                         <div className='flex items-center gap-2'>
                             <Icon colorClass='text-green' name='check' size='sm' />
                             <span>Enabled</span>
                         </div>
-                        {isDisabled &&
-                        <Banner className='mt-6 text-sm' color='grey'>
-                            Your <button className='underline!' type="button" onClick={() => {
-                                updateRoute('members');
-                            }}>Subscription access</button> is set to &lsquo;Nobody&rsquo;, only existing members will receive newsletters.
-                        </Banner>
-                        }
                     </div>) :
-                        <div className='flex items-center gap-2 text-grey-900'>
-                            <Icon colorClass='text-grey-600' name='mail-block' size='sm' />
-                            <span>Disabled</span>
+                        <div className='w-full'>
+                            <div className='flex items-center gap-2 text-grey-900'>
+                                <Icon colorClass='text-grey-600' name='mail-block' size='sm' />
+                                <span>Disabled</span>
+                            </div>
+                            {isDisabled &&
+                            <Banner className='mt-6 text-sm' color='grey'>
+                                Your <button className='underline!' type="button" onClick={() => {
+                                    updateRoute('members');
+                                }}>Subscription access</button> is set to &lsquo;Nobody&rsquo;, which disables all newsletter sending. Change to &lsquo;Invite-only&rsquo; to send newsletters to existing members without allowing new signups.
+                            </Banner>
+                            }
                         </div>
                 }
             ]}

apps/admin-x-settings/test/acceptance/membership/access.test.ts

@@ -127,7 +127,7 @@ test.describe('Access settings', async () => {
         await expect(section.getByTestId('subscription-access-select')).toContainText('Nobody');
 
         await expect(page.getByTestId('portal').getByRole('button', {name: 'Customize'})).toBeDisabled();
-        await expect(page.getByTestId('enable-newsletters')).toContainText('only existing members will receive newsletters');
+        await expect(page.getByTestId('enable-newsletters')).toContainText('which disables all newsletter sending');
     });
 
     test('Supports selecting specific tiers', async ({page}) => {

apps/admin/package.json

@@ -49,7 +49,7 @@
     "tailwindcss": "^4.2.2",
     "typescript": "5.9.3",
     "typescript-eslint": "8.58.0",
-    "vite": "7.1.12",
+    "vite": "7.3.2",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "4.1.2"
   },

apps/portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/portal",
-  "version": "2.68.27",
+  "version": "2.68.28",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",

apps/portal/src/app.js

@@ -600,13 +600,17 @@ export default class App extends React.Component {
 
         if (qParams.get('stripe') === 'gift-purchase-success') {
             const token = qParams.get('gift_token');
-            clearURLParams(['stripe', 'gift_token']);
+            const tierId = qParams.get('gift_tier');
+            const cadence = qParams.get('gift_cadence');
+            clearURLParams(['stripe', 'gift_token', 'gift_tier', 'gift_cadence']);
             if (token) {
                 return {
                     showPopup: true,
                     page: 'giftSuccess',
                     pageData: {
-                        token
+                        token,
+                        tierId,
+                        cadence
                     }
                 };
             }