From 0e0a2ab3b19372fcaf4aac75f2ce50eb180be5f8 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Wed, 2 Apr 2025 11:20:55 -0500
Subject: [PATCH] Switch back border ordering

(cherry picked from commit 34e3789f8b410132c1390df3c2bb8257630ebdd9)
---
 src/screens/Search/Explore.tsx                       | 12 ++++++++++--
 src/screens/Search/modules/ExploreTrendingTopics.tsx |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/screens/Search/Explore.tsx b/src/screens/Search/Explore.tsx
index 820a3353d4..523e5a1ec5 100644
--- a/src/screens/Search/Explore.tsx
+++ b/src/screens/Search/Explore.tsx
@@ -260,6 +260,10 @@ export function Explore({
   const items = useMemo<ExploreScreenItems[]>(() => {
     const i: ExploreScreenItems[] = []
 
+    const addTopBorder = () => {
+      i.push({type: 'topBorder', key: 'top-border'})
+    }
+
     const addTrendingTopicsModule = () => {
       i.push({
         type: 'trendingTopics',
@@ -431,6 +435,8 @@ export function Explore({
 
     // Dynamic module ordering
 
+    addTopBorder()
+
     if (guide?.guide === 'follow-10' && !guide.isComplete) {
       addSuggestedFollowsModule()
       addTrendingTopicsModule()
@@ -543,7 +549,7 @@ export function Explore({
         }
         case 'loadMore': {
           return (
-            <View style={[a.border_t, t.atoms.border_contrast_low, a.pb_2xl]}>
+            <View style={[a.border_t, t.atoms.border_contrast_low]}>
               <LoadMore item={item} />
             </View>
           )
@@ -598,7 +604,9 @@ export function Explore({
     () =>
       items.reduce(
         (acc, curr) =>
-          [''].includes(curr.type) ? acc.concat(items.indexOf(curr)) : acc,
+          ['topBorder'].includes(curr.type)
+            ? acc.concat(items.indexOf(curr))
+            : acc,
         [] as number[],
       ),
     [items],
diff --git a/src/screens/Search/modules/ExploreTrendingTopics.tsx b/src/screens/Search/modules/ExploreTrendingTopics.tsx
index a085ff88a9..0e3eeff03f 100644
--- a/src/screens/Search/modules/ExploreTrendingTopics.tsx
+++ b/src/screens/Search/modules/ExploreTrendingTopics.tsx
@@ -80,7 +80,7 @@ export function TrendRow({
       label={_(msg`Browse topic ${trend.displayName}`)}
       to={trend.link}
       onPress={onPress}
-      style={[a.border_t, t.atoms.border_contrast_low]}
+      style={[a.border_b, t.atoms.border_contrast_low]}
       PressableComponent={Pressable}>
       {({hovered, pressed}) => (
         <>
@@ -244,7 +244,7 @@ export function TrendingTopicRowSkeleton({}: {withPosts: boolean}) {
         a.py_lg,
         a.flex_row,
         a.gap_2xs,
-        a.border_t,
+        a.border_b,
         t.atoms.border_contrast_low,
       ]}>
       <View style={[a.flex_1, a.gap_sm]}>