From d324d3a672715dd39a182a39c10869afda60a093 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 15 Feb 2023 10:49:36 +0800
Subject: [PATCH] Move notifications link from Following to Home

---
 src/pages/following.jsx | 21 ++-------------------
 src/pages/home.jsx      | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/pages/following.jsx b/src/pages/following.jsx
index 5cee334e..39a39f3d 100644
--- a/src/pages/following.jsx
+++ b/src/pages/following.jsx
@@ -1,8 +1,6 @@
 import { useEffect, useRef } from 'preact/hooks';
 import { useSnapshot } from 'valtio';
 
-import Icon from '../components/icon';
-import Link from '../components/link';
 import Timeline from '../components/timeline';
 import { api } from '../utils/api';
 import states from '../utils/states';
@@ -11,7 +9,7 @@ import useTitle from '../utils/useTitle';
 
 const LIMIT = 20;
 
-function Following({ title, path, id, headerStart }) {
+function Following({ title, path, id, ...props }) {
   useTitle(title || 'Following', path, '/l/f');
   const { masto, instance } = api();
   const snapStates = useSnapshot(states);
@@ -109,20 +107,6 @@ function Following({ title, path, id, headerStart }) {
     };
   }, []);
 
-  const headerEnd = (
-    <Link
-      to="/notifications"
-      class={`button plain ${
-        snapStates.notificationsShowNew ? 'has-badge' : ''
-      }`}
-      onClick={(e) => {
-        e.stopPropagation();
-      }}
-    >
-      <Icon icon="notification" size="l" alt="Notifications" />
-    </Link>
-  );
-
   return (
     <Timeline
       title={title || 'Following'}
@@ -132,9 +116,8 @@ function Following({ title, path, id, headerStart }) {
       fetchItems={fetchHome}
       checkForUpdates={checkForUpdates}
       useItemID
-      headerStart={headerStart}
-      headerEnd={headerEnd}
       boostsCarousel={snapStates.settings.boostsCarousel}
+      {...props}
     />
   );
 }
diff --git a/src/pages/home.jsx b/src/pages/home.jsx
index 41292527..3a756051 100644
--- a/src/pages/home.jsx
+++ b/src/pages/home.jsx
@@ -1,6 +1,8 @@
 import { useEffect } from 'preact/hooks';
+import { useSnapshot } from 'valtio';
 
 import Icon from '../components/icon';
+import Link from '../components/link';
 import db from '../utils/db';
 import openCompose from '../utils/open-compose';
 import states from '../utils/states';
@@ -9,6 +11,7 @@ import { getCurrentAccountNS } from '../utils/store-utils';
 import Following from './following';
 
 function Home() {
+  const snapStates = useSnapshot(states);
   useEffect(() => {
     (async () => {
       const keys = await db.drafts.keys();
@@ -24,7 +27,25 @@ function Home() {
 
   return (
     <>
-      <Following title="Home" path="/" id="home" headerStart={false} />
+      <Following
+        title="Home"
+        path="/"
+        id="home"
+        headerStart={false}
+        headerEnd={
+          <Link
+            to="/notifications"
+            class={`button plain ${
+              snapStates.notificationsShowNew ? 'has-badge' : ''
+            }`}
+            onClick={(e) => {
+              e.stopPropagation();
+            }}
+          >
+            <Icon icon="notification" size="l" alt="Notifications" />
+          </Link>
+        }
+      />
       <button
         // hidden={scrollDirection === 'end' && !nearReachStart}
         type="button"