From 4bf920fef8bb99ee4c479553685c9edab39727b0 Mon Sep 17 00:00:00 2001
From: hellno <hellno@users.noreply.github.com>
Date: Mon, 9 Dec 2024 17:43:26 +0100
Subject: [PATCH 1/2] bring back feed and search, remove analytics

---
 src/home/index.tsx | 122 ++++++++++++++++++++++-----------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/src/home/index.tsx b/src/home/index.tsx
index 2ef770d7..47b73e6b 100644
--- a/src/home/index.tsx
+++ b/src/home/index.tsx
@@ -162,56 +162,56 @@ const Home = ({ children }: { children: React.ReactNode }) => {
     {
       name: 'main',
       items: [
-        // {
-        //   name: 'Feeds',
-        //   router: '/feeds',
-        //   icon: <NewspaperIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
-        //   getTitle: getFeedTitle,
-        //   getHeaderActions: () => {
-        //     const isChannelPinned = channels.findIndex((channel) => channel.url === selectedChannelUrl) !== -1;
-        //     const isChannelFeed =
-        //       selectedChannelUrl !== CUSTOM_CHANNELS.FOLLOWING &&
-        //       selectedChannelUrl !== CUSTOM_CHANNELS.TRENDING &&
-        //       !selectedList;
-        //     const actions = [
-        //       {
-        //         name: 'Cast',
-        //         onClick: () => {
-        //           let parentUrl;
-        //           if (isChannelFeed) {
-        //             parentUrl = selectedChannelUrl;
-        //           }
-        //           setCastModalView(CastModalView.New);
-        //           addNewPostDraft({
-        //             parentUrl,
-        //             onSuccess(draftId) {
-        //               setCastModalDraftId(draftId);
-        //               openNewCastModal();
-        //             },
-        //           });
-        //         },
-        //       },
-        //     ];
-        //     if (isChannelFeed) {
-        //       actions.push({
-        //         name: isChannelPinned ? 'Unpin' : 'Pin',
-        //         onClick: () => {
-        //           const channel = channels.find((c) => c.url === selectedChannelUrl);
-        //           if (!channel) return;
+        {
+          name: 'Feeds',
+          router: '/feeds',
+          icon: <NewspaperIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
+          getTitle: getFeedTitle,
+          getHeaderActions: () => {
+            const isChannelPinned = channels.findIndex((channel) => channel.url === selectedChannelUrl) !== -1;
+            const isChannelFeed =
+              selectedChannelUrl !== CUSTOM_CHANNELS.FOLLOWING &&
+              selectedChannelUrl !== CUSTOM_CHANNELS.TRENDING &&
+              !selectedList;
+            const actions = [
+              {
+                name: 'Cast',
+                onClick: () => {
+                  let parentUrl;
+                  if (isChannelFeed) {
+                    parentUrl = selectedChannelUrl;
+                  }
+                  setCastModalView(CastModalView.New);
+                  addNewPostDraft({
+                    parentUrl,
+                    onSuccess(draftId) {
+                      setCastModalDraftId(draftId);
+                      openNewCastModal();
+                    },
+                  });
+                },
+              },
+            ];
+            if (isChannelFeed) {
+              actions.push({
+                name: isChannelPinned ? 'Unpin' : 'Pin',
+                onClick: () => {
+                  const channel = channels.find((c) => c.url === selectedChannelUrl);
+                  if (!channel) return;
 
-        //           if (isChannelPinned) {
-        //             removePinnedChannel(channel);
-        //           } else {
-        //             addPinnedChannel(channel);
-        //           }
-        //         },
-        //       });
-        //     }
-        //     return actions;
-        //   },
-        //   shortcut: 'Shift + F',
-        //   additionalPaths: ['/conversation/[...slug]'],
-        // },
+                  if (isChannelPinned) {
+                    removePinnedChannel(channel);
+                  } else {
+                    addPinnedChannel(channel);
+                  }
+                },
+              });
+            }
+            return actions;
+          },
+          shortcut: 'Shift + F',
+          additionalPaths: ['/conversation/[...slug]'],
+        },
         {
           name: 'Post',
           router: '/post',
@@ -229,24 +229,24 @@ const Home = ({ children }: { children: React.ReactNode }) => {
           ],
           icon: <PencilSquareIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
         },
-        // {
-        //   name: 'Search',
-        //   router: '/search',
-        //   icon: <MagnifyingGlassIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
-        //   shortcut: '/',
-        // },
+        {
+          name: 'Search',
+          router: '/search',
+          icon: <MagnifyingGlassIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
+          shortcut: '/',
+        },
         // {
         //   name: 'Notifications',
         //   router: '/notifications',
         //   icon: <BellIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
         //   shortcut: 'Shift + N',
         // },
-        {
-          name: 'Analytics',
-          router: '/analytics',
-          icon: <ChartBarIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
-          shortcut: 'Shift + A',
-        },
+        // {
+        //   name: 'Analytics',
+        //   router: '/analytics',
+        //   icon: <ChartBarIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
+        //   shortcut: 'Shift + A',
+        // },
         {
           name: 'Profile',
           router: '/profile',

From 8b1d302be37791f2b3774d2f70e0ca3507e9d9cf Mon Sep 17 00:00:00 2001
From: hellno <hellno@users.noreply.github.com>
Date: Mon, 9 Dec 2024 17:44:20 +0100
Subject: [PATCH 2/2] Update RightSidebar.tsx

---
 src/common/components/Sidebar/RightSidebar.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/components/Sidebar/RightSidebar.tsx b/src/common/components/Sidebar/RightSidebar.tsx
index 6e9971fa..53740e2b 100644
--- a/src/common/components/Sidebar/RightSidebar.tsx
+++ b/src/common/components/Sidebar/RightSidebar.tsx
@@ -42,7 +42,10 @@ const RightSidebar = ({ showFeeds, showSearches, showLists, showManageLists, sho
   const renderAuthorInfo = () => {
     if (!showAuthorInfo || !selectedCast) return null;
 
-    if (selectedAccount?.platformAccountId === selectedCast.author.fid.toString()) {
+    if (
+      !selectedAccount?.platformAccountId ||
+      selectedAccount?.platformAccountId === selectedCast.author.fid.toString()
+    ) {
       return null;
     }