From 64af5cd176d8dd19d7b0ca25123b631f2bb28c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 8 Sep 2024 16:25:18 +0200
Subject: [PATCH] Reorder public timelines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../pl-fe/src/components/sidebar-menu.tsx     | 36 +++++++++----------
 .../src/components/sidebar-navigation.tsx     | 16 ++++-----
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/pl-fe/src/components/sidebar-menu.tsx b/packages/pl-fe/src/components/sidebar-menu.tsx
index 1463efbd79..a01e621244 100644
--- a/packages/pl-fe/src/components/sidebar-menu.tsx
+++ b/packages/pl-fe/src/components/sidebar-menu.tsx
@@ -308,15 +308,6 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                       onClick={onClose}
                     />
 
-                    {features.federating && (
-                      <SidebarLink
-                        to='/timeline/fediverse'
-                        icon={require('@tabler/icons/outline/topology-star-ring-3.svg')}
-                        text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
-                        onClick={onClose}
-                      />
-                    )}
-
                     {features.bubbleTimeline && (
                       <SidebarLink
                         to='/timeline/bubble'
@@ -325,6 +316,15 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                         onClick={onClose}
                       />
                     )}
+
+                    {features.federating && (
+                      <SidebarLink
+                        to='/timeline/fediverse'
+                        icon={require('@tabler/icons/outline/topology-star-ring-3.svg')}
+                        text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+                        onClick={onClose}
+                      />
+                    )}
                   </>}
 
                   <Divider />
@@ -423,15 +423,6 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                     onClick={onClose}
                   />
 
-                  {features.federating && !restrictUnauth.timelines.federated && (
-                    <SidebarLink
-                      to='/timeline/fediverse'
-                      icon={require('@tabler/icons/outline/topology-star-ring-3.svg')}
-                      text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
-                      onClick={onClose}
-                    />
-                  )}
-
                   {features.bubbleTimeline && !restrictUnauth.timelines.bubble && (
                     <SidebarLink
                       to='/timeline/bubble'
@@ -441,6 +432,15 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                     />
                   )}
 
+                  {features.federating && !restrictUnauth.timelines.federated && (
+                    <SidebarLink
+                      to='/timeline/fediverse'
+                      icon={require('@tabler/icons/outline/topology-star-ring-3.svg')}
+                      text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+                      onClick={onClose}
+                    />
+                  )}
+
                   <Divider />
                 </>}
 
diff --git a/packages/pl-fe/src/components/sidebar-navigation.tsx b/packages/pl-fe/src/components/sidebar-navigation.tsx
index a5c28b16a0..b81d36e512 100644
--- a/packages/pl-fe/src/components/sidebar-navigation.tsx
+++ b/packages/pl-fe/src/components/sidebar-navigation.tsx
@@ -243,14 +243,6 @@ const SidebarNavigation = () => {
               />
             )}
 
-            {(features.federating && (account || !restrictUnauth.timelines.federated)) && (
-              <SidebarNavigationLink
-                to='/timeline/fediverse'
-                icon={require('@tabler/icons/outline/topology-star-ring-3.svg')}
-                text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
-              />
-            )}
-
             {(features.bubbleTimeline && (account || !restrictUnauth.timelines.bubble)) && (
               <SidebarNavigationLink
                 to='/timeline/bubble'
@@ -258,6 +250,14 @@ const SidebarNavigation = () => {
                 text={<FormattedMessage id='tabs_bar.bubble' defaultMessage='Bubble' />}
               />
             )}
+
+            {(features.federating && (account || !restrictUnauth.timelines.federated)) && (
+              <SidebarNavigationLink
+                to='/timeline/fediverse'
+                icon={require('@tabler/icons/outline/topology-star-ring-3.svg')}
+                text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+              />
+            )}
           </>
         )}