Improved app-server structure

src/components/app/AppLayout.tsx

@@ -18,13 +18,11 @@ export default function AppLayout({
   children,
   chatWith,
   onNewMessage,
-  server,
   app,
 }: {
   onNewMessage?: (msg: Message) => void;
   chatWith?: string;
   children?: React.ReactNode;
-  server?: Server;
   app: App;
 }) {
   const router = useRouter();
@@ -77,8 +75,8 @@ export default function AppLayout({
 
         <div className="flex-1 min-w-0 flex flex-col bg-sidebar">
           <div className="flex-1 min-h-0">
-            {server ? (
-              <SidebarChannels server={server} app={app} />
+            {app.server ? (
+              <SidebarChannels app={app} />
             ) : (
               <SidebarDMs app={app} />
             )}

src/components/app/SidebarChannels.tsx

@@ -36,21 +36,15 @@ export function ChannelItem({ channel, app }: { channel: Channel; app: App }) {
   );
 }
 
-export default function SidebarChannels({
-  server,
-  app,
-}: {
-  server: Server;
-  app: App;
-}) {
+export default function SidebarChannels({ app }: { app: App }) {
   return (
     <div className="w-full flex flex-col bg-sidebar">
       <div className="p-3 border-b flex items-center gap-2">
-        <h2>{server.name}</h2>
+        <h2>{app.server?.name}</h2>
       </div>
       <ScrollArea className="flex-1">
         <div className="p-2 flex flex-col gap-2">
-          {server.channels.map((channel: Channel) => (
+          {app.server?.channels.map((channel: Channel) => (
             <ChannelItem key={channel.id} channel={channel} app={app} />
           ))}
         </div>