Merge branch 'custom-algos' of github.com:bluesky-social/social-app into custom-algos

src/view/screens/CustomFeed.tsx

@@ -338,7 +338,11 @@ export const CustomFeedScreen = withAuthRequired(
           extraData={[uri, isPinned]}
         />
         {isScrolledDown ? (
-          <LoadLatestBtn onPress={onScrollToTop} label="Scroll to top" />
+          <LoadLatestBtn
+            onPress={onScrollToTop}
+            label="Scroll to top"
+            showIndicator={false}
+          />
         ) : null}
         <FAB
           testID="composeFAB"

src/view/screens/DiscoverFeeds.tsx

@@ -72,6 +72,7 @@ export const DiscoverFeedsScreen = withAuthRequired(
           style={[!isDesktopWeb && s.flex1]}
           data={feeds.feeds}
           keyExtractor={item => item.data.uri}
+          contentContainerStyle={styles.contentContainer}
           refreshControl={
             <RefreshControl
               refreshing={feeds.isRefreshing}
@@ -93,7 +94,9 @@ export const DiscoverFeedsScreen = withAuthRequired(
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    paddingBottom: isDesktopWeb ? 0 : 100,
+  },
+  contentContainer: {
+    paddingBottom: 100,
   },
   containerDesktop: {
     borderLeftWidth: 1,