From d6d00acc455ded2051f7be5c475e35cab291b12a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 19 Dec 2025 12:16:53 -0500
Subject: [PATCH 1/3] Better fix for overlapping card name

---
 .../companyCards/WorkspaceCompanyCardsTableItem.tsx         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
index 45f4b7d41621f..7eddac3259f18 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
@@ -97,7 +97,7 @@ function WorkspaceCompanyCardTableItem({
     const companyCardFeedIcons = useCompanyCardFeedIcons();
     const Expensicons = useMemoizedLazyExpensifyIcons(['ArrowRight']);
 
-    const cardFeedIcon = !plaidIconUrl && getCardFeedIcon(selectedFeed as CompanyCardFeed, illustrations, companyCardFeedIcons) : null;
+    const cardFeedIcon = !plaidIconUrl && getCardFeedIcon(selectedFeed as CompanyCardFeed, illustrations, companyCardFeedIcons);
 
     const {failedCompanyCardAssignment} = item;
     let {cardName, customCardName, cardholder, assignedCard, isAssigned, isCardDeleted} = item;
@@ -234,9 +234,9 @@ function WorkspaceCompanyCardTableItem({
                             </View>
                         )}
 
-                        <View style={[styles.flex1, !isAssigned && styles.alignItemsEnd]}>
+                        <View style={[styles.flex0, styles.alignItemsEnd]}>
                             {isAssigned && (
-                                <View style={[styles.justifyContentCenter, styles.flexRow, styles.alignItemsCenter, styles.ml2, styles.gap3]}>
+                                <View style={[styles.justifyContentEnd, styles.w100, styles.flexRow, styles.alignItemsCenter, styles.ml2, styles.gap3]}>
                                     {!shouldUseNarrowTableRowLayout && (
                                         <Text
                                             numberOfLines={1}

From ae913ae7ab3ac7d6f5643b2755cdfab9d0348eb0 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 19 Dec 2025 12:17:46 -0500
Subject: [PATCH 2/3] Revert flex change

---
 .../workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
index 7eddac3259f18..e16c37b15d602 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
@@ -234,7 +234,7 @@ function WorkspaceCompanyCardTableItem({
                             </View>
                         )}
 
-                        <View style={[styles.flex0, styles.alignItemsEnd]}>
+                        <View style={[styles.flex1, styles.alignItemsEnd]}>
                             {isAssigned && (
                                 <View style={[styles.justifyContentEnd, styles.w100, styles.flexRow, styles.alignItemsCenter, styles.ml2, styles.gap3]}>
                                     {!shouldUseNarrowTableRowLayout && (

From 35fc07019905c428b5ad85da90fbf5b09e401ac8 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 19 Dec 2025 12:18:34 -0500
Subject: [PATCH 3/3] Remove redundant style

---
 .../workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
index e16c37b15d602..b55a87ff63dab 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTableItem.tsx
@@ -236,7 +236,7 @@ function WorkspaceCompanyCardTableItem({
 
                         <View style={[styles.flex1, styles.alignItemsEnd]}>
                             {isAssigned && (
-                                <View style={[styles.justifyContentEnd, styles.w100, styles.flexRow, styles.alignItemsCenter, styles.ml2, styles.gap3]}>
+                                <View style={[styles.justifyContentEnd, styles.w100, styles.flexRow, styles.ml2, styles.gap3]}>
                                     {!shouldUseNarrowTableRowLayout && (
                                         <Text
                                             numberOfLines={1}