Merge branch 'main' into starter-packs

src/view/com/composer/Composer.tsx

@@ -154,6 +154,13 @@ export const ComposePost = observer(function ComposePost({
   const [extGif, setExtGif] = useState<Gif>()
   const [labels, setLabels] = useState<string[]>([])
   const [threadgate, setThreadgate] = useState<ThreadgateSetting[]>([])
+
+  React.useEffect(() => {
+    if (!isAndroid) return
+    const id = setTimeout(() => textInput.current?.focus(), 100)
+    return () => clearTimeout(id)
+  }, [])
+
   const gallery = useMemo(
     () => new GalleryModel(initImageUris),
     [initImageUris],
@@ -517,7 +524,7 @@ export const ComposePost = observer(function ComposePost({
                 ref={textInput}
                 richtext={richtext}
                 placeholder={selectTextInputPlaceholder}
-                autoFocus={true}
+                autoFocus={!isAndroid}
                 setRichText={setRichText}
                 onPhotoPasted={onPhotoPasted}
                 onPressPublish={onPressPublish}

src/view/com/notifications/Feed.tsx

@@ -161,7 +161,11 @@ export function Feed({
         )
       } else if (item === LOADING_ITEM) {
         return (
-          <View style={[pal.border, {borderTopWidth: hairlineWidth}]}>
+          <View
+            style={[
+              pal.border,
+              !isTabletOrMobile && {borderTopWidth: hairlineWidth},
+            ]}>
             <NotificationFeedLoadingPlaceholder />
           </View>
         )
@@ -217,6 +221,7 @@ export function Feed({
         desktopFixedHeight
         initialNumToRender={initialNumToRender}
         windowSize={11}
+        sideBorders={false}
       />
     </View>
   )

src/view/com/util/post-ctrls/RepostButton.tsx

@@ -108,6 +108,7 @@ let RepostButton = ({
                 </Text>
               </Button>
               <Button
+                testID="quoteBtn"
                 style={[a.justify_start, a.px_md]}
                 label={_(msg`Quote post`)}
                 onPress={() => {

src/view/com/util/post-embeds/QuoteEmbed.tsx

@@ -181,9 +181,11 @@ export function QuoteEmbed({
   }, [queryClient, quote.author, onOpen])
 
   return (
-    <ContentHider modui={moderation?.ui('contentList')}>
+    <ContentHider
+      modui={moderation?.ui('contentList')}
+      style={[styles.container, pal.borderDark, style]}
+      childContainerStyle={[a.pt_sm]}>
       <Link
-        style={[styles.container, pal.borderDark, style]}
         hoverStyle={{borderColor: pal.colors.borderLinkHover}}
         href={itemHref}
         title={itemTitle}