feat(admin): photo providers require the journey addon

client/src/components/Admin/AddonManager.test.tsx

@@ -348,6 +348,19 @@ describe('AddonManager', () => {
     await waitFor(() => expect(isOn(subToggle('Unsplash'))).toBe(true));
   });
 
+  it('FE-ADMIN-ADDON-030: provider sub-rows stay hidden while Journey itself is off', async () => {
+    server.use(addonsRoute([
+      buildAddon({ id: 'journey', name: 'Journey', type: 'global', icon: 'Compass', enabled: false }),
+      buildAddon({ id: 'immich', name: 'Immich', description: 'Self-hosted photos', type: 'photo_provider', enabled: true }),
+      buildAddon({ id: 'synologyphotos', name: 'Synology Photos', description: 'NAS photos', type: 'photo_provider', enabled: false }),
+    ]));
+    render(<AddonManager />);
+
+    await screen.findByText('Journey');
+    expect(screen.queryByText('Immich')).not.toBeInTheDocument();
+    expect(screen.queryByText('Synology Photos')).not.toBeInTheDocument();
+  });
+
   it('FE-ADMIN-ADDON-018: the collab sub-features render their state and report the toggled key', async () => {
     const user = userEvent.setup();
     const onToggleCollabFeature = vi.fn();

client/src/components/Admin/AddonManager.tsx

@@ -152,8 +152,8 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
   }
 
   /** Bag tracking, the collab features and the photo providers all hang off their
-   *  parent as shelf rows. The conditions are deliberately the ones that were here
-   *  before — note that the providers render even when Journey itself is off. */
+   *  parent as shelf rows, and each shelf only shows while its parent is on —
+   *  a provider toggled under a disabled Journey would hit the server's 409. */
   const shelfFor = (addon: Addon) => {
     if (addon.id === 'packing' && addon.enabled && onToggleBagTracking) {
       return (
@@ -181,7 +181,7 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
         )
       })
     }
-    if (addon.id === 'journey' && providerOptions.length > 0) {
+    if (addon.id === 'journey' && addon.enabled && providerOptions.length > 0) {
       return providerOptions.map(provider => {
         const ProviderIcon = PROVIDER_ICONS[provider.key]
         return (

client/src/mobile/screens/admin/MAdminAddonManager.tsx

@@ -220,8 +220,8 @@ export default function MAdminAddonManager({ bagTrackingEnabled, onToggleBagTrac
               {globalAddons.map((addon, i) => (
                 <div key={addon.id}>
                   <MAddonRow addon={addon} onToggle={handleToggle} t={t} first={i === 0} />
-                  {/* Memories providers as sub-items under Journey addon */}
-                  {addon.id === 'journey' && providerOptions.length > 0 && (
+                  {/* Memories providers as sub-items under Journey addon — only while it is on */}
+                  {addon.id === 'journey' && addon.enabled && providerOptions.length > 0 && (
                     <>
                       {providerOptions.map(provider => {
                         const ProviderIcon = PROVIDER_ICONS[provider.key]