From 2fcb41adaddf14a7a91dba04f9f2c2c1b08d5b7a Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 13 Jan 2026 09:55:50 +0800
Subject: [PATCH 1/2] Fix: Hydration error when opening the Company Cards list
 page

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

diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx
index 7413c10f94a40..bc5951db36b5f 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx
@@ -132,11 +132,13 @@ function WorkspaceCompanyCardTableItem({
             onClose={resetFailedCompanyCardAssignment}
         >
             <PressableWithFeedback
-                role={CONST.ROLE.BUTTON}
+                role={isAssigned ? CONST.ROLE.BUTTON : CONST.ROLE.PRESENTATION}
                 style={[styles.mh5, styles.flexRow, styles.br3, styles.mb2, styles.highlightBG, styles.overflowHidden]}
                 accessibilityLabel="row"
-                hoverStyle={styles.hoveredComponentBG}
+                hoverStyle={isAssigned && styles.hoveredComponentBG}
                 disabled={isCardDeleted}
+                interactive={isAssigned}
+                pressDimmingValue={isAssigned ? undefined : 1}
                 onPress={() => {
                     if (!assignedCard) {
                         assignCard();

From dac063f57e299673b437a8bde3689d99aad6a7f0 Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 13 Jan 2026 16:41:33 +0800
Subject: [PATCH 2/2] Show text cursor on unassigned card text elements

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

diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx
index bc5951db36b5f..90892d980a003 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx
@@ -187,12 +187,12 @@ function WorkspaceCompanyCardTableItem({
                             <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStretch]}>
                                 <TextWithTooltip
                                     text={leftColumnTitle}
-                                    style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.justifyContentCenter]}
+                                    style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.justifyContentCenter, !isAssigned && styles.cursorText]}
                                 />
                                 {!!leftColumnSubtitle && (
                                     <TextWithTooltip
                                         text={leftColumnSubtitle}
-                                        style={[styles.textLabelSupporting, styles.lh16, styles.pre, styles.mr3]}
+                                        style={[styles.textLabelSupporting, styles.lh16, styles.pre, styles.mr3, !isAssigned && styles.cursorText]}
                                     />
                                 )}
                             </View>
@@ -202,7 +202,7 @@ function WorkspaceCompanyCardTableItem({
                             <View style={[styles.flex1]}>
                                 <Text
                                     numberOfLines={1}
-                                    style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                                    style={[styles.lh16, styles.optionDisplayName, styles.pre, !isAssigned && styles.cursorText]}
                                 >
                                     {cardName}
                                 </Text>