update

frontend/src/components/layout/AppShell.jsx

@@ -34,14 +34,14 @@ export default function AppShell({ title, subtitle, rightContent, children }) {
     const [showSettingsNav, setShowSettingsNav] = useState(false);
 
     useEffect(() => {
-        const syncAdminNav = () => {
+        const syncSettingsNav = () => {
             apiFetch('/api/auth/me')
                 .then((r) => (r.ok ? r.json() : null))
-                .then((u) => setShowSettingsNav(u?.current_role === 'admin'))
+                .then((u) => setShowSettingsNav(u != null))
                 .catch(() => setShowSettingsNav(false));
         };
-        syncAdminNav();
-        window.addEventListener('emailout-auth-changed', syncAdminNav);
+        syncSettingsNav();
+        window.addEventListener('emailout-auth-changed', syncSettingsNav);
         return () => window.removeEventListener('emailout-auth-changed', syncAdminNav);
     }, []);
 

frontend/src/components/layout/GoogleAuthBar.jsx

@@ -1,19 +1,12 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
-import { LogOut, Building2 } from 'lucide-react';
+import { LogOut } from 'lucide-react';
 import { Button } from '@/components/ui/button';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/components/ui/select';
 import { cn } from '@/lib/utils';
 import { apiFetch } from '@/lib/api';
 
 /**
- * Sign-in (Google), workspace switcher; invitations live on Settings (admins). Session from OAuth callback.
+ * Sign-in (Google). Workspace details and switching context live in Settings / session. OAuth callback sets session.
  */
 export default function GoogleAuthBar() {
     const [searchParams, setSearchParams] = useSearchParams();
@@ -70,22 +63,6 @@ export default function GoogleAuthBar() {
         }
     };
 
-    const switchTenant = async (tid) => {
-        const id = parseInt(tid, 10);
-        if (!id || id === user?.current_tenant_id) return;
-        try {
-            const res = await apiFetch('/api/auth/switch-tenant', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ tenant_id: id }),
-            });
-            if (!res.ok) return;
-            window.location.reload();
-        } catch (e) {
-            console.error(e);
-        }
-    };
-
     const inviteParam = searchParams.get('invite');
     const googleHref = inviteParam
         ? `/api/auth/google?invite=${encodeURIComponent(inviteParam)}`
@@ -108,31 +85,8 @@ export default function GoogleAuthBar() {
     }
 
     if (user) {
-        const tenants = user.tenants || [];
-
         return (
             <div className="flex max-w-[min(100vw-6rem,28rem)] flex-wrap items-center justify-end gap-2">
-                {tenants.length > 0 ? (
-                    <div className="flex items-center gap-1.5 min-w-0">
-                        <Building2 className="h-4 w-4 shrink-0 text-slate-400 hidden sm:block" />
-                        <Select
-                            value={String(user.current_tenant_id ?? '')}
-                            onValueChange={switchTenant}
-                        >
-                            <SelectTrigger className="h-9 max-w-[11rem] sm:max-w-[14rem] border-slate-200 text-xs sm:text-sm">
-                                <SelectValue placeholder="Workspace" />
-                            </SelectTrigger>
-                            <SelectContent>
-                                {tenants.map((tn) => (
-                                    <SelectItem key={tn.id} value={String(tn.id)}>
-                                        {tn.name}
-                                        {tn.role === 'admin' ? ' · admin' : ''}
-                                    </SelectItem>
-                                ))}
-                            </SelectContent>
-                        </Select>
-                    </div>
-                ) : null}
                 {user.picture ? (
                     <img
                         src={user.picture}

frontend/src/pages/Leads.jsx

@@ -373,7 +373,7 @@ export default function Leads() {
     return (
         <AppShell
             title="Leads"
-            subtitle="Replies from Smartlead campaigns appear here. Configure the webhook URL under Settings (admins)."
+            subtitle="Replies from Smartlead campaigns appear here. Configure the Smartlead webhook URL on Settings."
         >
             <MainTableWorkspace
                 primaryAction={{ label: 'New lead', to: '/' }}

frontend/src/pages/Settings.jsx

@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Link } from 'react-router-dom';
 import {
     ClipboardCopy,
     Loader2,
@@ -12,6 +11,13 @@ import {
 import AppShell from '@/components/layout/AppShell';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select';
 import { apiFetch } from '@/lib/api';
 import { cn } from '@/lib/utils';
 
@@ -91,6 +97,25 @@ export default function Settings() {
         return base;
     }, [me]);
 
+    const tenants = me?.tenants || [];
+    const multiWorkspace = tenants.length > 1;
+
+    const switchTenant = async (tid) => {
+        const id = parseInt(tid, 10);
+        if (!id || id === me?.current_tenant_id) return;
+        try {
+            const res = await apiFetch('/api/auth/switch-tenant', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ tenant_id: id }),
+            });
+            if (!res.ok) return;
+            window.location.reload();
+        } catch (e) {
+            console.error(e);
+        }
+    };
+
     const sendInvite = async () => {
         const email = inviteEmail.trim().toLowerCase();
         if (!email || !email.includes('@')) return;
@@ -159,31 +184,14 @@ export default function Settings() {
         );
     }
 
-    if (!isAdmin) {
-        return (
-            <AppShell title="Settings">
-                <div className="rounded-2xl border border-amber-200 bg-amber-50 p-6 flex gap-4 items-start">
-                    <ShieldAlert className="h-8 w-8 shrink-0 text-amber-700" />
-                    <div>
-                        <h3 className="font-semibold text-amber-950">Admin access required</h3>
-                        <p className="text-sm text-amber-900/90 mt-1">
-                            Invitations, member management, and workspace integration URLs are only
-                            available to workspace admins. Ask an admin to grant you the admin role or
-                            use another workspace where you are an admin.
-                        </p>
-                        <Button asChild variant="outline" className="mt-4">
-                            <Link to="/">Back to Generator</Link>
-                        </Button>
-                    </div>
-                </div>
-            </AppShell>
-        );
-    }
-
     return (
         <AppShell
             title="Settings"
-            subtitle="Workspace details, Smartlead webhook, invitations, and members (admins only)."
+            subtitle={
+                isAdmin
+                    ? 'Workspace details, Smartlead webhook, invitations, and members.'
+                    : 'Workspace details and Smartlead webhook. Invites and member management require admin.'
+            }
         >
             <div className="space-y-8 max-w-3xl">
                 <section className="rounded-2xl border border-slate-200 bg-white p-6 shadow-sm">
@@ -191,6 +199,27 @@ export default function Settings() {
                         <Building2 className="h-5 w-5 text-violet-600" />
                         Workspace details
                     </div>
+                    {multiWorkspace ? (
+                        <div className="mb-6 pb-6 border-b border-slate-100">
+                            <p className="text-xs font-medium text-slate-600 mb-2">Active workspace</p>
+                            <Select
+                                value={String(me.current_tenant_id ?? '')}
+                                onValueChange={switchTenant}
+                            >
+                                <SelectTrigger className="h-10 max-w-md border-slate-200 text-sm">
+                                    <SelectValue placeholder="Choose workspace" />
+                                </SelectTrigger>
+                                <SelectContent>
+                                    {tenants.map((tn) => (
+                                        <SelectItem key={tn.id} value={String(tn.id)}>
+                                            {tn.name}
+                                            {tn.role === 'admin' ? ' · admin' : ''}
+                                        </SelectItem>
+                                    ))}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                    ) : null}
                     <dl className="grid gap-3 text-sm sm:grid-cols-[8rem_1fr] sm:gap-x-4">
                         <dt className="text-slate-500">Name</dt>
                         <dd className="text-slate-900 font-medium">
@@ -226,6 +255,17 @@ export default function Settings() {
                     </div>
                 </section>
 
+                {!isAdmin ? (
+                    <div className="rounded-2xl border border-slate-200 bg-slate-50/80 p-5 flex gap-3 items-start">
+                        <ShieldAlert className="h-6 w-6 shrink-0 text-slate-500 mt-0.5" />
+                        <p className="text-sm text-slate-600">
+                            Inviting users and removing members is limited to workspace admins. Ask an
+                            admin if you need help.
+                        </p>
+                    </div>
+                ) : null}
+
+                {isAdmin ? (
                 <section className="rounded-2xl border border-slate-200 bg-white p-6 shadow-sm">
                     <div className="flex items-center gap-2 text-slate-800 font-semibold mb-2">
                         <UserPlus className="h-5 w-5 text-violet-600" />
@@ -265,7 +305,9 @@ export default function Settings() {
                         </div>
                     ) : null}
                 </section>
+                ) : null}
 
+                {isAdmin ? (
                 <section className="rounded-2xl border border-slate-200 bg-white p-6 shadow-sm">
                     <div className="flex items-center gap-2 text-slate-800 font-semibold mb-4">
                         <Users className="h-5 w-5 text-violet-600" />
@@ -347,6 +389,7 @@ export default function Settings() {
                         </div>
                     )}
                 </section>
+                ) : null}
             </div>
         </AppShell>
     );