From 39e7453662613b662e54ea1dec2fa5cebc1b599d Mon Sep 17 00:00:00 2001
From: shivam <91240327+shivamhwp@users.noreply.github.com>
Date: Thu, 5 Nov 2026 10:30:37 +0000
Subject: [PATCH 1/3] fix(mobile): approval card buttons stack full width

The approval card laid its options out in a wrapping row of
label-sized buttons, so Decline fell onto its own row and the
edges never lined up. Stack them full width, like the other
request cards.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 apps/mobile/src/features/threads/PendingApprovalCard.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/src/features/threads/PendingApprovalCard.tsx b/apps/mobile/src/features/threads/PendingApprovalCard.tsx
index b5a9d4ed27eb2..f9ec44d5d4ee5 100644
--- a/apps/mobile/src/features/threads/PendingApprovalCard.tsx
+++ b/apps/mobile/src/features/threads/PendingApprovalCard.tsx
@@ -80,7 +80,7 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
       {warning ? (
         <Text className="font-sans text-xs leading-normal text-warning-foreground">{warning}</Text>
       ) : null}
-      <View className="flex-row flex-wrap gap-2.5">
+      <View className="gap-2">
         {options.map((option) => (
           <Button
             key={option.decision}
@@ -94,6 +94,7 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
             }
             disabled={disabled || !props.canOperateThread}
             onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
+            fullWidth
           />
         ))}
       </View>

From e07ca42bc55d5c07e9ef832b2631b5f475191f39 Mon Sep 17 00:00:00 2001
From: shivam <91240327+shivamhwp@users.noreply.github.com>
Date: Thu, 5 Nov 2026 10:44:37 +0000
Subject: [PATCH 2/3] fix(mobile): approval card scrolls when it outgrows the
 room

A stacked approval card with many options, or a long command, could
grow past the space between the header and the composer on iOS. Cap it
at that space and scroll, as child approvals already do.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../features/threads/ThreadDetailScreen.tsx   | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
index 0d3258dd3bee7..4d2ffaafdca16 100644
--- a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
@@ -1019,6 +1019,16 @@ function ThreadDetailBody(
     maxHeight: pendingUserInputMaxHeight.value,
     flexGrow: 0,
   }));
+  // Questions overlay the composer on iOS; an approval sits above it, so it gives up its height.
+  const approvalHeightStyle = useAnimatedStyle(() => ({
+    maxHeight: derivePendingUserInputMaxHeight({
+      windowHeight: screenAreaHeight,
+      keyboardHeight: keyboardStickyEnabled ? -keyboardTranslation.value : 0,
+      navigationHeaderHeight,
+      composerOverlapHeight,
+    }),
+    flexGrow: 0,
+  }));
   // The usage panel stacks with the composer and any approval card, so it gets
   // whatever room they leave below the header. Measured only while it is open
   // so typing in the composer does not re-render the screen.
@@ -1718,12 +1728,18 @@ function ThreadDetailBody(
                         exiting={FadeOut.duration(140)}
                       >
                         {props.activePendingApproval ? (
-                          <PendingApprovalCard
-                            canOperateThread={props.canOperateThread}
-                            approval={props.activePendingApproval}
-                            respondingApprovalId={props.respondingApprovalId}
-                            onRespond={props.onRespondToApproval}
-                          />
+                          <Animated.ScrollView
+                            style={approvalHeightStyle}
+                            keyboardShouldPersistTaps="handled"
+                            nestedScrollEnabled
+                          >
+                            <PendingApprovalCard
+                              canOperateThread={props.canOperateThread}
+                              approval={props.activePendingApproval}
+                              respondingApprovalId={props.respondingApprovalId}
+                              onRespond={props.onRespondToApproval}
+                            />
+                          </Animated.ScrollView>
                         ) : null}
                         {props.activePendingUserInput ? (
                           <PendingUserInputCard

From ba3fc2ee2003e619c49f55922510127b3c13de09 Mon Sep 17 00:00:00 2001
From: shivam <91240327+shivamhwp@users.noreply.github.com>
Date: Thu, 5 Nov 2026 11:05:50 +0000
Subject: [PATCH 3/3] fix(mobile): a new approval starts scrolled to the top

Key the approval scroll view by request so a replacement approval
does not inherit the previous one's scroll offset.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 apps/mobile/src/features/threads/ThreadDetailScreen.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
index 4d2ffaafdca16..9a470e7c4bf26 100644
--- a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
@@ -1729,6 +1729,7 @@ function ThreadDetailBody(
                       >
                         {props.activePendingApproval ? (
                           <Animated.ScrollView
+                            key={props.activePendingApproval.requestId}
                             style={approvalHeightStyle}
                             keyboardShouldPersistTaps="handled"
                             nestedScrollEnabled