chore: cleanup

packages/app/src/Pages/Root.tsx

@@ -11,7 +11,7 @@ import { debounce, getRelayName, sha256 } from "SnortUtils";
 import useLogin from "Hooks/useLogin";
 import Discover from "Pages/Discover";
 import TrendingUsers from "Element/TrendingUsers";
-import TrendingNotes from "Element/Feed/TrendingPosts";
+import TrendingNotes from "Element/TrendingPosts";
 import HashTagsPage from "Pages/HashTagsPage";
 import SuggestedProfiles from "Element/SuggestedProfiles";
 import { TaskList } from "Tasks/TaskList";
@@ -65,25 +65,19 @@ export const GlobalTab = () => {
   const [now] = useState(unixNow());
   const system = useContext(SnortContext);
 
-  const subject: TimelineSubject = {
-    type: "global",
-    items: [],
-    relay: relay?.url ? [relay.url] : undefined,
-    discriminator: `all-${sha256(relay?.url ?? "").slice(0, 12)}`,
-  };
-
   function globalRelaySelector() {
     if (!allRelays || allRelays.length === 0) return null;
 
     const paidRelays = allRelays.filter(a => a.paid);
     const publicRelays = allRelays.filter(a => !a.paid);
     return (
-      <div className="flex items-center mb10 justify-end nowrap">
-        <FormattedMessage
-          defaultMessage="Read global from"
-          description="Label for reading global feed from specific relays"
-        />
-        &nbsp;
+      <div className="flex items-center g8 justify-end nowrap">
+        <h3>
+          <FormattedMessage
+            defaultMessage="Relay"
+            description="Label for reading global feed from specific relays"
+          />
+        </h3>
         <select
           className="f-ellipsis"
           onChange={e => setRelay(allRelays.find(a => a.url === e.target.value))}
@@ -113,10 +107,12 @@ export const GlobalTab = () => {
     return debounce(500, () => {
       const ret: RelayOption[] = [];
       system.Sockets.forEach(v => {
-        ret.push({
-          url: v.address,
-          paid: v.info?.limitation?.payment_required ?? false,
-        });
+        if (v.connected) {
+          ret.push({
+            url: v.address,
+            paid: v.info?.limitation?.payment_required ?? false,
+          });
+        }
       });
       ret.sort(a => (a.paid ? -1 : 1));
 
@@ -130,7 +126,14 @@ export const GlobalTab = () => {
   return (
     <>
       {globalRelaySelector()}
-      {relay && <Timeline subject={subject} postsOnly={false} method={"TIME_RANGE"} window={600} now={now} />}
+      {relay && <Timeline subject={
+        {
+          type: "global",
+          items: [],
+          relay: [relay.url],
+          discriminator: `all-${sha256(relay.url)}`,
+        }
+      } postsOnly={false} method={"TIME_RANGE"} window={600} now={now} />}
     </>
   );
 };
@@ -148,8 +151,8 @@ export const NotesTab = () => {
         noteOnClick={
           deckContext
             ? ev => {
-                deckContext.setThread(NostrLink.fromEvent(ev));
-              }
+              deckContext.setThread(NostrLink.fromEvent(ev));
+            }
             : undefined
         }
       />