From 23d0afa6345da429b4df7eeb81f5c050ab030f89 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 29 Oct 2026 09:54:53 +0000
Subject: [PATCH] Use width instead of percentage flexBasis for stacked
 workspace cards so they stay one per row after rotation

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 .../workspace/WorkspaceMoreFeaturesPage/MoreFeatureToggle.tsx  | 3 ++-
 src/pages/workspace/connections/ConnectionCard.tsx             | 3 ++-
 src/pages/workspace/connections/ExactOnlineWaitlistCard.tsx    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage/MoreFeatureToggle.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage/MoreFeatureToggle.tsx
index 714eed951d2d..15809104754d 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage/MoreFeatureToggle.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage/MoreFeatureToggle.tsx
@@ -61,7 +61,8 @@ function MoreFeatureToggle({icon, title, subtitle, isActive, pendingAction, onTo
                 <View
                     style={[
                         styles.workspaceSectionMoreFeaturesItem,
-                        shouldUseNarrowLayout && styles.flexBasis100,
+                        // Uses width, not flexBasis, since native Yoga caches a flexBasis percentage across rotations.
+                        shouldUseNarrowLayout && [styles.flexBasisAuto, styles.w100],
                         shouldUseNarrowLayout && StyleUtils.getMinimumWidth(0),
                         hovered && isActive && !!onPress && styles.hoveredComponentBG,
                     ]}
diff --git a/src/pages/workspace/connections/ConnectionCard.tsx b/src/pages/workspace/connections/ConnectionCard.tsx
index af12aeef5495..b8082a56e347 100644
--- a/src/pages/workspace/connections/ConnectionCard.tsx
+++ b/src/pages/workspace/connections/ConnectionCard.tsx
@@ -80,7 +80,8 @@ function ConnectionCard({listing, shouldUseFullWidth}: ConnectionCardProps) {
                 styles.workspaceSectionMoreFeaturesItem,
                 styles.p0,
                 styles.overflowHidden,
-                shouldUseFullWidth ? [styles.flexBasis100, StyleUtils.getMinimumWidth(0)] : styles.connectionCard,
+                // Uses width, not flexBasis, since native Yoga caches a flexBasis percentage across rotations.
+                shouldUseFullWidth ? [styles.flexBasisAuto, styles.w100, StyleUtils.getMinimumWidth(0)] : styles.connectionCard,
             ]}
         >
             <MenuItem
diff --git a/src/pages/workspace/connections/ExactOnlineWaitlistCard.tsx b/src/pages/workspace/connections/ExactOnlineWaitlistCard.tsx
index 5fc3e0074d6f..83fd8fa242a4 100644
--- a/src/pages/workspace/connections/ExactOnlineWaitlistCard.tsx
+++ b/src/pages/workspace/connections/ExactOnlineWaitlistCard.tsx
@@ -25,7 +25,8 @@ function ExactOnlineWaitlistCard({policyID}: ExactOnlineWaitlistCardProps) {
                 styles.workspaceSectionMoreFeaturesItem,
                 styles.p0,
                 styles.overflowHidden,
-                shouldUseNarrowLayout || isMediumScreenWidth ? [styles.flexBasis100, StyleUtils.getMinimumWidth(0)] : styles.connectionCard,
+                // Uses width, not flexBasis, since native Yoga caches a flexBasis percentage across rotations.
+                shouldUseNarrowLayout || isMediumScreenWidth ? [styles.flexBasisAuto, styles.w100, StyleUtils.getMinimumWidth(0)] : styles.connectionCard,
             ]}
         >
             <ExactOnlineWaitlistRow