From 3cbbd67198c60a1d97c0cb17d6c5bc81f654e59a Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Sat, 9 Nov 2024 11:21:38 +0000
Subject: [PATCH] fix up rebase errors

---
 src/Navigation.tsx                            | 20 +++++++++----------
 .../dms/dialogs/SearchablePeopleList.tsx      |  2 +-
 src/routes.ts                                 |  1 +
 .../com/util/load-latest/LoadLatestBtn.tsx    | 10 +++++++++-
 src/view/shell/desktop/LeftNav.tsx            |  9 ++++++++-
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/Navigation.tsx b/src/Navigation.tsx
index 985a64d791..418720417b 100644
--- a/src/Navigation.tsx
+++ b/src/Navigation.tsx
@@ -69,6 +69,7 @@ import {SupportScreen} from '#/view/screens/Support'
 import {TermsOfServiceScreen} from '#/view/screens/TermsOfService'
 import {BottomBar} from '#/view/shell/bottom-bar/BottomBar'
 import {createNativeStackNavigatorWithAuth} from '#/view/shell/createNativeStackNavigatorWithAuth'
+import {LeftNav} from '#/view/shell/desktop/LeftNav'
 import {SharedPreferencesTesterScreen} from '#/screens/E2E/SharedPreferencesTesterScreen'
 import HashtagScreen from '#/screens/Hashtag'
 import {MessagesScreen} from '#/screens/Messages/ChatList'
@@ -112,6 +113,7 @@ const MyProfileTab =
   createNativeStackNavigatorWithAuth<MyProfileTabNavigatorParams>()
 const MessagesTab =
   createNativeStackNavigatorWithAuth<MessagesTabNavigatorParams>()
+const FeedsTab = createNativeStackNavigatorWithAuth<FlatNavigatorParams>()
 const ListsTab = createNativeStackNavigatorWithAuth<FlatNavigatorParams>()
 const ModerationTab = createNativeStackNavigatorWithAuth<FlatNavigatorParams>()
 const SettingsTab = createNativeStackNavigatorWithAuth<FlatNavigatorParams>()
@@ -377,11 +379,6 @@ function commonScreens(
         getComponent={() => NotificationSettingsScreen}
         options={{title: title(msg`Notification settings`), requireAuth: true}}
       />
-      <Stack.Screen
-        name="Feeds"
-        getComponent={() => FeedsScreen}
-        options={{title: title(msg`Feeds`)}}
-      />
       <Stack.Screen
         name="StarterPack"
         getComponent={() => StarterPackScreen}
@@ -409,6 +406,11 @@ function commonScreens(
             getComponent={() => ModerationScreen}
             options={{title: title(msg`Moderation`), requireAuth: true}}
           />
+          <Stack.Screen
+            name="Feeds"
+            getComponent={() => FeedsScreen}
+            options={{title: title(msg`Feeds`)}}
+          />
           <Stack.Screen
             name="Lists"
             component={ListsScreen}
@@ -453,8 +455,8 @@ function TabsNavigatorMobile() {
         getComponent={() => SearchTabNavigator}
       />
       <MobileTab.Screen
-        name="FeedsTab"
-        getComponent={() => FeedsTabNavigator}
+        name="MessagesTab"
+        getComponent={() => MessagesTabNavigator}
       />
       <MobileTab.Screen
         name="NotificationsTab"
@@ -464,10 +466,6 @@ function TabsNavigatorMobile() {
         name="MyProfileTab"
         getComponent={() => MyProfileTabNavigator}
       />
-      <MobileTab.Screen
-        name="MessagesTab"
-        getComponent={() => MessagesTabNavigator}
-      />
     </MobileTab.Navigator>
   )
 }
diff --git a/src/components/dms/dialogs/SearchablePeopleList.tsx b/src/components/dms/dialogs/SearchablePeopleList.tsx
index a5687a0968..0b6a1e6d45 100644
--- a/src/components/dms/dialogs/SearchablePeopleList.tsx
+++ b/src/components/dms/dialogs/SearchablePeopleList.tsx
@@ -278,7 +278,7 @@ export function SearchablePeopleList({
           ) : null}
         </View>
 
-        <View style={[, web([a.pt_xs])]}>
+        <View style={[web([a.pt_xs])]}>
           <SearchInput
             inputRef={inputRef}
             value={searchText}
diff --git a/src/routes.ts b/src/routes.ts
index 388e8c5210..5ea83c8897 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -14,6 +14,7 @@ export const router = new Router({
   ModerationMutedAccounts: '/moderation/muted-accounts',
   ModerationBlockedAccounts: '/moderation/blocked-accounts',
   // profiles, threads, lists
+  MyProfile: '/my-profile',
   Profile: ['/profile/:name', '/profile/:name/rss'],
   ProfileFollowers: '/profile/:name/followers',
   ProfileFollows: '/profile/:name/follows',
diff --git a/src/view/com/util/load-latest/LoadLatestBtn.tsx b/src/view/com/util/load-latest/LoadLatestBtn.tsx
index 55f3e6475e..9965e1b80e 100644
--- a/src/view/com/util/load-latest/LoadLatestBtn.tsx
+++ b/src/view/com/util/load-latest/LoadLatestBtn.tsx
@@ -1,14 +1,16 @@
 import React from 'react'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 import Animated from 'react-native-reanimated'
+import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {useMediaQuery} from 'react-responsive'
 
 import {HITSLOP_20} from '#/lib/constants'
 import {useMinimalShellFabTransform} from '#/lib/hooks/useMinimalShellTransform'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
+import {clamp} from '#/lib/numbers'
 import {colors} from '#/lib/styles'
-import {isNativeTablet} from '#/platform/detection'
+import {isNativeTablet, isWeb} from '#/platform/detection'
 import {useSession} from '#/state/session'
 import {useTheme} from '#/alf'
 
@@ -28,6 +30,7 @@ export function LoadLatestBtn({
   const {hasSession} = useSession()
   const {isDesktop, isTablet, isMobile, isTabletOrMobile} = useWebMediaQueries()
   const fabMinimalShellTransform = useMinimalShellFabTransform()
+  const insets = useSafeAreaInsets()
 
   // move button inline if it starts overlapping the left nav
   const isTallViewport = useMediaQuery({minHeight: 700})
@@ -36,6 +39,10 @@ export function LoadLatestBtn({
   // it on both tablet and mobile since we are showing the bottom bar (see createNativeStackNavigatorWithAuth)
   const showBottomBar = hasSession ? isMobile : isTabletOrMobile
 
+  const bottomPosition = isTablet
+    ? {bottom: 50}
+    : {bottom: clamp(insets.bottom, 15, 60) + 15}
+
   return (
     <AnimatedTouchableOpacity
       style={[
@@ -47,6 +54,7 @@ export function LoadLatestBtn({
         isTablet && !isNativeTablet && styles.loadLatestInline,
         t.atoms.border_contrast_high,
         t.atoms.bg,
+        bottomPosition,
         showBottomBar && fabMinimalShellTransform,
       ]}
       onPress={onPress}
diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx
index a559938b4b..20cb9f2747 100644
--- a/src/view/shell/desktop/LeftNav.tsx
+++ b/src/view/shell/desktop/LeftNav.tsx
@@ -18,6 +18,7 @@ import {getCurrentRoute, isStateAtTabRoot, isTab} from '#/lib/routes/helpers'
 import {makeProfileLink} from '#/lib/routes/links'
 import {CommonNavigatorParams, NavigationProp} from '#/lib/routes/types'
 import {isInvalidHandle} from '#/lib/strings/handles'
+import {isWeb} from '#/platform/detection'
 import {emitSoftReset} from '#/state/events'
 import {useFetchHandle} from '#/state/queries/handle'
 import {useUnreadMessageCount} from '#/state/queries/messages/list-converations'
@@ -475,7 +476,13 @@ export function LeftNav() {
             label={_(msg`Lists`)}
           />
           <NavItem
-            href={currentAccount ? makeProfileLink(currentAccount) : '/'}
+            href={
+              isWeb
+                ? currentAccount
+                  ? makeProfileLink(currentAccount)
+                  : '/'
+                : '/my-profile'
+            }
             icon={
               <UserCircle
                 aria-hidden={true}