From 1644a9261561cdb327571960dbc6473dc4ab3e63 Mon Sep 17 00:00:00 2001
From: codytseng <codytseng98@gmail.com>
Date: Sat, 18 Jan 2025 14:22:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=92=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FeedSwitcher/index.tsx         |  2 +-
 src/lib/link.ts                               |  2 +-
 src/pages/secondary/ProfilePage/index.tsx     |  2 +-
 .../secondary/RelaySettingsPage/index.tsx     | 26 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/FeedSwitcher/index.tsx b/src/components/FeedSwitcher/index.tsx
index 3539e61f..dbd4842f 100644
--- a/src/components/FeedSwitcher/index.tsx
+++ b/src/components/FeedSwitcher/index.tsx
@@ -31,7 +31,7 @@ export default function FeedSwitcher({ close }: { close?: () => void }) {
         <div className="flex justify-between px-2">
           <div className="text-muted-foreground text-sm font-semibold">{t('relay sets')}</div>
           <SecondaryPageLink
-            to={toRelaySettings('relay-sets')}
+            to={toRelaySettings()}
             className="text-highlight text-sm font-semibold"
             onClick={() => close?.()}
           >
diff --git a/src/lib/link.ts b/src/lib/link.ts
index c3fcc80a..130710b7 100644
--- a/src/lib/link.ts
+++ b/src/lib/link.ts
@@ -33,7 +33,7 @@ export const toOthersRelaySettings = (pubkey: string) => {
   return `/users/${npub}/relays`
 }
 export const toRelaySettings = (tag?: 'mailbox' | 'relay-sets') => {
-  return '/relay-settings' + (tag === 'relay-sets' ? '#relay-sets' : '')
+  return '/relay-settings' + (tag ? '#' + tag : '')
 }
 export const toSettings = () => '/settings'
 export const toProfileEditor = () => '/profile-editor'
diff --git a/src/pages/secondary/ProfilePage/index.tsx b/src/pages/secondary/ProfilePage/index.tsx
index 4f09a934..a91f1915 100644
--- a/src/pages/secondary/ProfilePage/index.tsx
+++ b/src/pages/secondary/ProfilePage/index.tsx
@@ -125,7 +125,7 @@ export default function ProfilePage({ id, index }: { id?: string; index?: number
               <div className="text-muted-foreground">{t('Following')}</div>
             </SecondaryPageLink>
             <SecondaryPageLink
-              to={isSelf ? toRelaySettings() : toOthersRelaySettings(pubkey)}
+              to={isSelf ? toRelaySettings('mailbox') : toOthersRelaySettings(pubkey)}
               className="flex gap-1 hover:underline w-fit"
             >
               {relayCount}
diff --git a/src/pages/secondary/RelaySettingsPage/index.tsx b/src/pages/secondary/RelaySettingsPage/index.tsx
index b39be0c2..2f7a3413 100644
--- a/src/pages/secondary/RelaySettingsPage/index.tsx
+++ b/src/pages/secondary/RelaySettingsPage/index.tsx
@@ -7,32 +7,32 @@ import { useTranslation } from 'react-i18next'
 
 export default function RelaySettingsPage({ index }: { index?: number }) {
   const { t } = useTranslation()
-  const [tabValue, setTabValue] = useState('mailbox')
+  const [tabValue, setTabValue] = useState('relay-sets')
 
   useEffect(() => {
-    if (window.location.hash === '#relay-sets') {
-      setTabValue('relay-sets')
+    switch (window.location.hash) {
+      case '#mailbox':
+        setTabValue('mailbox')
+        break
+      case '#relay-sets':
+        setTabValue('relay-sets')
+        break
     }
   }, [])
 
   return (
     <SecondaryPageLayout index={index} title={t('Relay settings')}>
-      <Tabs
-        defaultValue="mailbox"
-        value={tabValue}
-        onValueChange={setTabValue}
-        className="px-4 space-y-4"
-      >
+      <Tabs value={tabValue} onValueChange={setTabValue} className="px-4 space-y-4">
         <TabsList>
-          <TabsTrigger value="mailbox">{t('Read & Write Relays')}</TabsTrigger>
           <TabsTrigger value="relay-sets">{t('Relay Sets')}</TabsTrigger>
+          <TabsTrigger value="mailbox">{t('Read & Write Relays')}</TabsTrigger>
         </TabsList>
-        <TabsContent value="mailbox">
-          <MailboxSetting />
-        </TabsContent>
         <TabsContent value="relay-sets">
           <RelaySetsSetting />
         </TabsContent>
+        <TabsContent value="mailbox">
+          <MailboxSetting />
+        </TabsContent>
       </Tabs>
     </SecondaryPageLayout>
   )