From 9bbfd81c46cf5a6f735393678b149b706fa1889e Mon Sep 17 00:00:00 2001
From: thelullabyy <the.lullaby2@hotmail.com>
Date: Wed, 20 Aug 2025 17:26:11 +0700
Subject: [PATCH 1/3] fix: tooltip is shown when hover even category is not
 truncated

---
 .../SelectionList/Search/TextWithIconCell.tsx | 31 ++++++++-----------
 src/libs/ReportSecondaryActionUtils.ts        |  2 +-
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/components/SelectionList/Search/TextWithIconCell.tsx b/src/components/SelectionList/Search/TextWithIconCell.tsx
index 8cfbe0933d005..8cb63c5193643 100644
--- a/src/components/SelectionList/Search/TextWithIconCell.tsx
+++ b/src/components/SelectionList/Search/TextWithIconCell.tsx
@@ -7,6 +7,7 @@ import Tooltip from '@components/Tooltip';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type IconAsset from '@src/types/utils/IconAsset';
+import TextWithTooltip from '@components/TextWithTooltip';
 
 type TextWithIconCellProps = {
     icon: IconAsset;
@@ -24,24 +25,18 @@ export default function TextWithIconCell({icon, text, showTooltip, textStyle}: T
     }
 
     return (
-        <Tooltip
-            shouldRender={showTooltip}
+        <View style={[styles.flexRow, styles.flexShrink1, styles.gap1]}>
+        <Icon
+            src={icon}
+            fill={theme.icon}
+            height={12}
+            width={12}
+        />
+        <TextWithTooltip
             text={text}
-        >
-            <View style={[styles.flexRow, styles.flexShrink1, styles.gap1]}>
-                <Icon
-                    src={icon}
-                    fill={theme.icon}
-                    height={12}
-                    width={12}
-                />
-                <Text
-                    numberOfLines={1}
-                    style={[styles.optionDisplayName, styles.label, styles.pre, styles.justifyContentCenter, styles.textMicro, styles.textSupporting, styles.flexShrink1, textStyle]}
-                >
-                    {text}
-                </Text>
-            </View>
-        </Tooltip>
+            shouldShowTooltip={showTooltip}
+            style={[styles.optionDisplayName, styles.label, styles.pre, styles.justifyContentCenter, styles.textMicro, styles.textSupporting, styles.flexShrink1, textStyle]}
+        />
+    </View>
     );
 }
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 1d4e9f47f2c18..a41f966e17e35 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -535,7 +535,7 @@ function isReopenAction(report: Report, policy?: Policy): boolean {
  */
 function isMergeAction(parentReport: Report, reportTransactions: Transaction[], policy?: Policy): boolean {
     // Temporary hide merge action
-    return false;
+    return true;
 
     // Do not show merge action if there are multiple transactions
     if (reportTransactions.length !== 1) {

From cb017f004099d435f39b58e251898aeea4b30938 Mon Sep 17 00:00:00 2001
From: thelullabyy <the.lullaby2@hotmail.com>
Date: Wed, 20 Aug 2025 18:07:28 +0700
Subject: [PATCH 2/3] update code

---
 src/libs/ReportSecondaryActionUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index a41f966e17e35..1d4e9f47f2c18 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -535,7 +535,7 @@ function isReopenAction(report: Report, policy?: Policy): boolean {
  */
 function isMergeAction(parentReport: Report, reportTransactions: Transaction[], policy?: Policy): boolean {
     // Temporary hide merge action
-    return true;
+    return false;
 
     // Do not show merge action if there are multiple transactions
     if (reportTransactions.length !== 1) {

From 9f561d47615ad1ac4227aa0cc5c66c9fefb28d87 Mon Sep 17 00:00:00 2001
From: thelullabyy <the.lullaby2@hotmail.com>
Date: Wed, 20 Aug 2025 18:13:36 +0700
Subject: [PATCH 3/3] fix lint

---
 .../SelectionList/Search/TextWithIconCell.tsx | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/SelectionList/Search/TextWithIconCell.tsx b/src/components/SelectionList/Search/TextWithIconCell.tsx
index 8cb63c5193643..33dd7fc7c7fd8 100644
--- a/src/components/SelectionList/Search/TextWithIconCell.tsx
+++ b/src/components/SelectionList/Search/TextWithIconCell.tsx
@@ -2,12 +2,10 @@ import React from 'react';
 import {View} from 'react-native';
 import type {StyleProp, TextStyle} from 'react-native';
 import Icon from '@components/Icon';
-import Text from '@components/Text';
-import Tooltip from '@components/Tooltip';
+import TextWithTooltip from '@components/TextWithTooltip';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type IconAsset from '@src/types/utils/IconAsset';
-import TextWithTooltip from '@components/TextWithTooltip';
 
 type TextWithIconCellProps = {
     icon: IconAsset;
@@ -26,17 +24,17 @@ export default function TextWithIconCell({icon, text, showTooltip, textStyle}: T
 
     return (
         <View style={[styles.flexRow, styles.flexShrink1, styles.gap1]}>
-        <Icon
-            src={icon}
-            fill={theme.icon}
-            height={12}
-            width={12}
-        />
-        <TextWithTooltip
-            text={text}
-            shouldShowTooltip={showTooltip}
-            style={[styles.optionDisplayName, styles.label, styles.pre, styles.justifyContentCenter, styles.textMicro, styles.textSupporting, styles.flexShrink1, textStyle]}
-        />
-    </View>
+            <Icon
+                src={icon}
+                fill={theme.icon}
+                height={12}
+                width={12}
+            />
+            <TextWithTooltip
+                text={text}
+                shouldShowTooltip={showTooltip}
+                style={[styles.optionDisplayName, styles.label, styles.pre, styles.justifyContentCenter, styles.textMicro, styles.textSupporting, styles.flexShrink1, textStyle]}
+            />
+        </View>
     );
 }