2 files changed, 8 insertions, 6 deletions
diff --git a/front/src/pages/Feed.tsx b/front/src/pages/Feed.tsx
index e29033e..65dee64 100644
--- a/front/src/pages/Feed.tsx
+++ b/front/src/pages/Feed.tsx
@@ -1,17 +1,17 @@
 // import spinner from "@/assets/icons/spinner.svg";
 import "@/styles/trill.css";
+import "@/styles/feed.css";
 import UserFeed from "./User";
 import PostList from "@/components/feed/PostList";
 import useLocalState from "@/state/state";
-import { useParams, useLocation } from "wouter";
+import { useParams } from "wouter";
 import spinner from "@/assets/triangles.svg";
 import { useState } from "react";
-import Composer from "@/components/feed/Composer";
+import Composer from "@/components/composer/Composer";
 // import UserFeed from "./User";
 import { P404 } from "@/Router";
-import { useQuery } from "@tanstack/react-query";
 import { isValidPatp } from "urbit-ob";
-import { eventsToFc } from "@/logic/nostril";
+import { eventsToFc } from "@/logic/nostrill";
 
 type FeedType = "global" | "following" | "nostr";
 function Loader() {
@@ -88,8 +88,8 @@ function Global() {
   return <p>Error</p>;
 }
 function Nostr() {
-  const { relays } = useLocalState();
-  const feed = eventsToFc(relays);
+  const { nostrFeed } = useLocalState();
+  const feed = eventsToFc(nostrFeed);
   console.log({ feed });
   const refetch = () => feed;
   return <PostList data={feed} refetch={refetch} />;
diff --git a/front/src/pages/User.tsx b/front/src/pages/User.tsx
index fc727e4..a1e26f1 100644
--- a/front/src/pages/User.tsx
+++ b/front/src/pages/User.tsx
@@ -1,4 +1,5 @@
 // import spinner from "@/assets/icons/spinner.svg";
+import Composer from "@/components/composer/Composer";
 import PostList from "@/components/feed/PostList";
 import useLocalState from "@/state/state";
 import type { Ship } from "@/types/urbit";
@@ -10,6 +11,7 @@ function UserFeed({ p }: { p: Ship }) {
   if (p === api!.airlock.our)
     return (
       <div id="feed-proper">
+        <Composer />
         <PostList data={feed!} refetch={refetch} />
       </div>
     );