From 54b8eacba1b991179d53b04ccaef23b5b247e4fa Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Fri, 10 Oct 2025 19:30:29 +0300
Subject: [PATCH] Fix chat request buttons not moving with swipe gesture
 (#9155)

* portal in buttons so they move with swipe

* remove outline style buttons
---
 .../Messages/components/ChatListItem.tsx      | 370 +++++++++---------
 .../Messages/components/ChatStatusInfo.tsx    |   5 +-
 .../Messages/components/RequestButtons.tsx    |   8 +-
 .../Messages/components/RequestListItem.tsx   |  65 +--
 4 files changed, 231 insertions(+), 217 deletions(-)

diff --git a/src/screens/Messages/components/ChatListItem.tsx b/src/screens/Messages/components/ChatListItem.tsx
index cc21a2688a..f4e7863679 100644
--- a/src/screens/Messages/components/ChatListItem.tsx
+++ b/src/screens/Messages/components/ChatListItem.tsx
@@ -42,11 +42,14 @@ import {Trash_Stroke2_Corner0_Rounded} from '#/components/icons/Trash'
 import {Link} from '#/components/Link'
 import {useMenuControl} from '#/components/Menu'
 import {PostAlerts} from '#/components/moderation/PostAlerts'
+import {createPortalGroup} from '#/components/Portal'
 import {Text} from '#/components/Typography'
 import {useSimpleVerificationState} from '#/components/verification'
 import {VerificationCheck} from '#/components/verification/VerificationCheck'
 import type * as bsky from '#/types/bsky'
 
+export const ChatListItemPortal = createPortalGroup()
+
 export let ChatListItem = ({
   convo,
   showMenu = true,
@@ -331,200 +334,215 @@ function ChatListItemReady({
   const hasUnread = convo.unreadCount > 0 && !isDeletedAccount
 
   return (
-    <GestureActionView actions={actions}>
-      <View
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
-        // @ts-expect-error web only
-        onFocus={onFocus}
-        onBlur={onMouseLeave}
-        style={[a.relative, t.atoms.bg]}>
+    <ChatListItemPortal.Provider>
+      <GestureActionView actions={actions}>
         <View
-          style={[
-            a.z_10,
-            a.absolute,
-            {top: tokens.space.md, left: tokens.space.lg},
-          ]}>
-          <PreviewableUserAvatar
-            profile={profile}
-            size={52}
-            moderation={moderation.ui('avatar')}
-          />
-        </View>
-
-        <Link
-          to={`/messages/${convo.id}`}
-          label={displayName}
-          accessibilityHint={
-            !isDeletedAccount
-              ? _(msg`Go to conversation with ${profile.handle}`)
-              : _(
-                  msg`This conversation is with a deleted or a deactivated account. Press for options`,
-                )
-          }
-          accessibilityActions={
-            isNative
-              ? [
-                  {name: 'magicTap', label: _(msg`Open conversation options`)},
-                  {name: 'longpress', label: _(msg`Open conversation options`)},
-                ]
-              : undefined
-          }
-          onPress={onPress}
-          onLongPress={isNative ? onLongPress : undefined}
-          onAccessibilityAction={onLongPress}>
-          {({hovered, pressed, focused}) => (
-            <View
-              style={[
-                a.flex_row,
-                isDeletedAccount ? a.align_center : a.align_start,
-                a.flex_1,
-                a.px_lg,
-                a.py_md,
-                a.gap_md,
-                (hovered || pressed || focused) && t.atoms.bg_contrast_25,
-              ]}>
-              {/* Avatar goes here */}
-              <View style={{width: 52, height: 52}} />
+          onMouseEnter={onMouseEnter}
+          onMouseLeave={onMouseLeave}
+          // @ts-expect-error web only
+          onFocus={onFocus}
+          onBlur={onMouseLeave}
+          style={[a.relative, t.atoms.bg]}>
+          <View
+            style={[
+              a.z_10,
+              a.absolute,
+              {top: tokens.space.md, left: tokens.space.lg},
+            ]}>
+            <PreviewableUserAvatar
+              profile={profile}
+              size={52}
+              moderation={moderation.ui('avatar')}
+            />
+          </View>
 
+          <Link
+            to={`/messages/${convo.id}`}
+            label={displayName}
+            accessibilityHint={
+              !isDeletedAccount
+                ? _(msg`Go to conversation with ${profile.handle}`)
+                : _(
+                    msg`This conversation is with a deleted or a deactivated account. Press for options`,
+                  )
+            }
+            accessibilityActions={
+              isNative
+                ? [
+                    {
+                      name: 'magicTap',
+                      label: _(msg`Open conversation options`),
+                    },
+                    {
+                      name: 'longpress',
+                      label: _(msg`Open conversation options`),
+                    },
+                  ]
+                : undefined
+            }
+            onPress={onPress}
+            onLongPress={isNative ? onLongPress : undefined}
+            onAccessibilityAction={onLongPress}>
+            {({hovered, pressed, focused}) => (
               <View
-                style={[a.flex_1, a.justify_center, web({paddingRight: 45})]}>
-                <View style={[a.w_full, a.flex_row, a.align_end, a.pb_2xs]}>
-                  <View style={[a.flex_shrink]}>
+                style={[
+                  a.flex_row,
+                  isDeletedAccount ? a.align_center : a.align_start,
+                  a.flex_1,
+                  a.px_lg,
+                  a.py_md,
+                  a.gap_md,
+                  (hovered || pressed || focused) && t.atoms.bg_contrast_25,
+                ]}>
+                {/* Avatar goes here */}
+                <View style={{width: 52, height: 52}} />
+
+                <View
+                  style={[a.flex_1, a.justify_center, web({paddingRight: 45})]}>
+                  <View style={[a.w_full, a.flex_row, a.align_end, a.pb_2xs]}>
+                    <View style={[a.flex_shrink]}>
+                      <Text
+                        emoji
+                        numberOfLines={1}
+                        style={[
+                          a.text_md,
+                          t.atoms.text,
+                          a.font_semi_bold,
+                          {lineHeight: 21},
+                          isDimStyle && t.atoms.text_contrast_medium,
+                        ]}>
+                        {displayName}
+                      </Text>
+                    </View>
+                    {verification.showBadge && (
+                      <View style={[a.pl_xs, a.self_center]}>
+                        <VerificationCheck
+                          width={14}
+                          verifier={verification.role === 'verifier'}
+                        />
+                      </View>
+                    )}
+                    {lastMessageSentAt && (
+                      <View style={[a.pl_xs]}>
+                        <TimeElapsed timestamp={lastMessageSentAt}>
+                          {({timeElapsed}) => (
+                            <Text
+                              style={[
+                                a.text_sm,
+                                {lineHeight: 21},
+                                t.atoms.text_contrast_medium,
+                                web({whiteSpace: 'preserve nowrap'}),
+                              ]}>
+                              &middot; {timeElapsed}
+                            </Text>
+                          )}
+                        </TimeElapsed>
+                      </View>
+                    )}
+                    {(convo.muted || moderation.blocked) && (
+                      <Text
+                        style={[
+                          a.text_sm,
+                          {lineHeight: 21},
+                          t.atoms.text_contrast_medium,
+                          web({whiteSpace: 'preserve nowrap'}),
+                        ]}>
+                        {' '}
+                        &middot;{' '}
+                        <BellStroke
+                          size="xs"
+                          style={[t.atoms.text_contrast_medium]}
+                        />
+                      </Text>
+                    )}
+                  </View>
+
+                  {!isDeletedAccount && (
                     <Text
-                      emoji
                       numberOfLines={1}
-                      style={[
-                        a.text_md,
-                        t.atoms.text,
-                        a.font_semi_bold,
-                        {lineHeight: 21},
-                        isDimStyle && t.atoms.text_contrast_medium,
-                      ]}>
-                      {displayName}
-                    </Text>
-                  </View>
-                  {verification.showBadge && (
-                    <View style={[a.pl_xs, a.self_center]}>
-                      <VerificationCheck
-                        width={14}
-                        verifier={verification.role === 'verifier'}
-                      />
-                    </View>
-                  )}
-                  {lastMessageSentAt && (
-                    <View style={[a.pl_xs]}>
-                      <TimeElapsed timestamp={lastMessageSentAt}>
-                        {({timeElapsed}) => (
-                          <Text
-                            style={[
-                              a.text_sm,
-                              {lineHeight: 21},
-                              t.atoms.text_contrast_medium,
-                              web({whiteSpace: 'preserve nowrap'}),
-                            ]}>
-                            &middot; {timeElapsed}
-                          </Text>
-                        )}
-                      </TimeElapsed>
-                    </View>
-                  )}
-                  {(convo.muted || moderation.blocked) && (
-                    <Text
                       style={[
                         a.text_sm,
-                        {lineHeight: 21},
                         t.atoms.text_contrast_medium,
-                        web({whiteSpace: 'preserve nowrap'}),
+                        a.pb_xs,
                       ]}>
-                      {' '}
-                      &middot;{' '}
-                      <BellStroke
-                        size="xs"
-                        style={[t.atoms.text_contrast_medium]}
-                      />
+                      @{profile.handle}
                     </Text>
                   )}
+
+                  <Text
+                    emoji
+                    numberOfLines={2}
+                    style={[
+                      a.text_sm,
+                      a.leading_snug,
+                      hasUnread ? a.font_semi_bold : t.atoms.text_contrast_high,
+                      isDimStyle && t.atoms.text_contrast_medium,
+                    ]}>
+                    {lastMessage}
+                  </Text>
+
+                  <PostAlerts
+                    modui={moderation.ui('contentList')}
+                    size="lg"
+                    style={[a.pt_xs]}
+                  />
+
+                  {children}
                 </View>
 
-                {!isDeletedAccount && (
-                  <Text
-                    numberOfLines={1}
-                    style={[a.text_sm, t.atoms.text_contrast_medium, a.pb_xs]}>
-                    @{profile.handle}
-                  </Text>
+                {hasUnread && (
+                  <View
+                    style={[
+                      a.absolute,
+                      a.rounded_full,
+                      {
+                        backgroundColor: isDimStyle
+                          ? t.palette.contrast_200
+                          : t.palette.primary_500,
+                        height: 7,
+                        width: 7,
+                        top: 15,
+                        right: 12,
+                      },
+                    ]}
+                  />
                 )}
-
-                <Text
-                  emoji
-                  numberOfLines={2}
-                  style={[
-                    a.text_sm,
-                    a.leading_snug,
-                    hasUnread ? a.font_semi_bold : t.atoms.text_contrast_high,
-                    isDimStyle && t.atoms.text_contrast_medium,
-                  ]}>
-                  {lastMessage}
-                </Text>
-
-                <PostAlerts
-                  modui={moderation.ui('contentList')}
-                  size="lg"
-                  style={[a.pt_xs]}
-                />
-
-                {children}
               </View>
+            )}
+          </Link>
 
-              {hasUnread && (
-                <View
-                  style={[
-                    a.absolute,
-                    a.rounded_full,
-                    {
-                      backgroundColor: isDimStyle
-                        ? t.palette.contrast_200
-                        : t.palette.primary_500,
-                      height: 7,
-                      width: 7,
-                      top: 15,
-                      right: 12,
-                    },
-                  ]}
-                />
-              )}
-            </View>
+          <ChatListItemPortal.Outlet />
+
+          {showMenu && (
+            <ConvoMenu
+              convo={convo}
+              profile={profile}
+              control={menuControl}
+              currentScreen="list"
+              showMarkAsRead={convo.unreadCount > 0}
+              hideTrigger={isNative}
+              blockInfo={blockInfo}
+              style={[
+                a.absolute,
+                a.h_full,
+                a.self_end,
+                a.justify_center,
+                {
+                  right: tokens.space.lg,
+                  opacity:
+                    !gtMobile || showActions || menuControl.isOpen ? 1 : 0,
+                },
+              ]}
+              latestReportableMessage={latestReportableMessage}
+            />
           )}
-        </Link>
-
-        {showMenu && (
-          <ConvoMenu
-            convo={convo}
-            profile={profile}
-            control={menuControl}
+          <LeaveConvoPrompt
+            control={leaveConvoControl}
+            convoId={convo.id}
             currentScreen="list"
-            showMarkAsRead={convo.unreadCount > 0}
-            hideTrigger={isNative}
-            blockInfo={blockInfo}
-            style={[
-              a.absolute,
-              a.h_full,
-              a.self_end,
-              a.justify_center,
-              {
-                right: tokens.space.lg,
-                opacity: !gtMobile || showActions || menuControl.isOpen ? 1 : 0,
-              },
-            ]}
-            latestReportableMessage={latestReportableMessage}
           />
-        )}
-        <LeaveConvoPrompt
-          control={leaveConvoControl}
-          convoId={convo.id}
-          currentScreen="list"
-        />
-      </View>
-    </GestureActionView>
+        </View>
+      </GestureActionView>
+    </ChatListItemPortal.Provider>
   )
 }
diff --git a/src/screens/Messages/components/ChatStatusInfo.tsx b/src/screens/Messages/components/ChatStatusInfo.tsx
index c02034ff32..0cebabfd11 100644
--- a/src/screens/Messages/components/ChatStatusInfo.tsx
+++ b/src/screens/Messages/components/ChatStatusInfo.tsx
@@ -46,7 +46,7 @@ export function ChatStatusInfo({convoState}: {convoState: ActiveConvoStates}) {
             label={_(msg`Block or report`)}
             convo={convoState.convo}
             profile={otherUser}
-            color="negative"
+            color="negative_subtle"
             size="small"
             currentScreen="conversation"
           />
@@ -70,8 +70,7 @@ export function ChatStatusInfo({convoState}: {convoState: ActiveConvoStates}) {
         <AcceptChatButton
           onAcceptConvo={onAcceptChat}
           convo={convoState.convo}
-          color="primary"
-          variant="outline"
+          color="primary_subtle"
           size="small"
           currentScreen="conversation"
         />
diff --git a/src/screens/Messages/components/RequestButtons.tsx b/src/screens/Messages/components/RequestButtons.tsx
index 560888552b..4437a9a43f 100644
--- a/src/screens/Messages/components/RequestButtons.tsx
+++ b/src/screens/Messages/components/RequestButtons.tsx
@@ -36,7 +36,6 @@ export function RejectMenu({
   convo,
   profile,
   size = 'tiny',
-  variant = 'outline',
   color = 'secondary',
   label,
   showDeleteConvo,
@@ -117,7 +116,6 @@ export function RejectMenu({
               label={triggerProps.accessibilityLabel}
               style={[a.flex_1]}
               color={color}
-              variant={variant}
               size={size}>
               <ButtonText>
                 {label || (
@@ -129,7 +127,7 @@ export function RejectMenu({
             </Button>
           )}
         </Menu.Trigger>
-        <Menu.Outer>
+        <Menu.Outer showCancel>
           <Menu.Group>
             {showDeleteConvo && (
               <Menu.Item
@@ -181,7 +179,6 @@ export function RejectMenu({
 export function AcceptChatButton({
   convo,
   size = 'tiny',
-  variant = 'solid',
   color = 'secondary_inverted',
   label,
   currentScreen,
@@ -248,7 +245,6 @@ export function AcceptChatButton({
       {...props}
       label={label || _(msg`Accept chat request`)}
       size={size}
-      variant={variant}
       color={color}
       style={a.flex_1}
       onPress={onPressAccept}>
@@ -266,7 +262,6 @@ export function AcceptChatButton({
 export function DeleteChatButton({
   convo,
   size = 'tiny',
-  variant = 'outline',
   color = 'secondary',
   label,
   currentScreen,
@@ -315,7 +310,6 @@ export function DeleteChatButton({
     <Button
       label={label || _(msg`Delete chat`)}
       size={size}
-      variant={variant}
       color={color}
       style={a.flex_1}
       onPress={onPressDelete}
diff --git a/src/screens/Messages/components/RequestListItem.tsx b/src/screens/Messages/components/RequestListItem.tsx
index 4b1f4d0140..1f23b88823 100644
--- a/src/screens/Messages/components/RequestListItem.tsx
+++ b/src/screens/Messages/components/RequestListItem.tsx
@@ -7,7 +7,7 @@ import {useSession} from '#/state/session'
 import {atoms as a, tokens} from '#/alf'
 import {KnownFollowers} from '#/components/KnownFollowers'
 import {Text} from '#/components/Typography'
-import {ChatListItem} from './ChatListItem'
+import {ChatListItem, ChatListItemPortal} from './ChatListItem'
 import {AcceptChatButton, DeleteChatButton, RejectMenu} from './RequestButtons'
 
 export function RequestListItem({convo}: {convo: ChatBskyConvoDefs.ConvoView}) {
@@ -42,37 +42,40 @@ export function RequestListItem({convo}: {convo: ChatBskyConvoDefs.ConvoView}) {
             <Trans comment="Accept a chat request">Accept Request</Trans>
           </Text>
         </View>
+        {/* then, this gets absolutely positioned on top of the spacer */}
+        <ChatListItemPortal.Portal>
+          <View
+            style={[
+              a.absolute,
+              a.pr_md,
+              a.w_full,
+              a.flex_row,
+              a.align_center,
+              a.gap_sm,
+              {
+                bottom: tokens.space.md,
+                paddingLeft: tokens.space.lg + 52 + tokens.space.md,
+              },
+            ]}>
+            {!isDeletedAccount ? (
+              <>
+                <AcceptChatButton convo={convo} currentScreen="list" />
+                <RejectMenu
+                  convo={convo}
+                  profile={otherUser}
+                  showDeleteConvo
+                  currentScreen="list"
+                />
+              </>
+            ) : (
+              <>
+                <DeleteChatButton convo={convo} currentScreen="list" />
+                <View style={a.flex_1} />
+              </>
+            )}
+          </View>
+        </ChatListItemPortal.Portal>
       </ChatListItem>
-      <View
-        style={[
-          a.absolute,
-          a.pr_md,
-          a.w_full,
-          a.flex_row,
-          a.align_center,
-          a.gap_sm,
-          {
-            bottom: tokens.space.md,
-            paddingLeft: tokens.space.lg + 52 + tokens.space.md,
-          },
-        ]}>
-        {!isDeletedAccount ? (
-          <>
-            <AcceptChatButton convo={convo} currentScreen="list" />
-            <RejectMenu
-              convo={convo}
-              profile={otherUser}
-              showDeleteConvo
-              currentScreen="list"
-            />
-          </>
-        ) : (
-          <>
-            <DeleteChatButton convo={convo} currentScreen="list" />
-            <View style={a.flex_1} />
-          </>
-        )}
-      </View>
     </View>
   )
 }