From 4e6cd62701e6e878ce9f1f16d60bfa9273edbd28 Mon Sep 17 00:00:00 2001
From: Nodebrute <anusharukhsar1@gmail.com>
Date: Tue, 30 Dec 2025 23:56:32 +0500
Subject: [PATCH 1/4] fix add approver cut off

---
 src/components/CategoryPicker.tsx | 3 +++
 src/components/TagPicker.tsx      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/CategoryPicker.tsx b/src/components/CategoryPicker.tsx
index e9e3422909e25..a251fd431b9ea 100644
--- a/src/components/CategoryPicker.tsx
+++ b/src/components/CategoryPicker.tsx
@@ -4,6 +4,7 @@ import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
 import {getCategoryListSections} from '@libs/CategoryOptionListUtils';
 import type {Category} from '@libs/CategoryOptionListUtils';
 import {getEnabledCategoriesCount} from '@libs/CategoryUtils';
@@ -29,6 +30,7 @@ type CategoryPickerProps = {
 };
 
 function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeAreaPadding = false, contentContainerStyle}: CategoryPickerProps) {
+    const styles = useThemeStyles();
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`, {canBeMissing: true});
     const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`, {canBeMissing: true});
     const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`, {canBeMissing: true});
@@ -88,6 +90,7 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeArea
             initiallyFocusedOptionKey={selectedOptionKey ?? undefined}
             addBottomSafeAreaPadding={addBottomSafeAreaPadding}
             contentContainerStyle={contentContainerStyle}
+            listItemTitleStyles={styles.mnw100}
         />
     );
 }
diff --git a/src/components/TagPicker.tsx b/src/components/TagPicker.tsx
index 61ed1b2f27913..a5fc116fa47fd 100644
--- a/src/components/TagPicker.tsx
+++ b/src/components/TagPicker.tsx
@@ -139,7 +139,7 @@ function TagPicker({
         <SelectionList
             ListItem={RadioListItem}
             sectionTitleStyles={styles.mt5}
-            listItemTitleStyles={styles.breakAll}
+            listItemTitleStyles={[styles.breakAll, styles.mnw100]}
             sections={sections}
             textInputValue={searchValue}
             headerMessage={headerMessage}

From c2222c1a596ff6210ef0346f5879c04eda4d7a5b Mon Sep 17 00:00:00 2001
From: Nodebrute <anusharukhsar1@gmail.com>
Date: Wed, 31 Dec 2025 00:43:56 +0500
Subject: [PATCH 2/4] fix usememo

---
 src/components/TagPicker.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/TagPicker.tsx b/src/components/TagPicker.tsx
index a5fc116fa47fd..b2efa3666c7e6 100644
--- a/src/components/TagPicker.tsx
+++ b/src/components/TagPicker.tsx
@@ -135,11 +135,13 @@ function TagPicker({
 
     const selectedOptionKey = sections.at(0)?.data?.find((policyTag) => policyTag.searchText === selectedTag)?.keyForList;
 
+    const listItemTitleStyles = useMemo(() => [styles.breakAll, styles.mnw100], [styles.breakAll, styles.mnw100]);
+
     return (
         <SelectionList
             ListItem={RadioListItem}
             sectionTitleStyles={styles.mt5}
-            listItemTitleStyles={[styles.breakAll, styles.mnw100]}
+            listItemTitleStyles={listItemTitleStyles}
             sections={sections}
             textInputValue={searchValue}
             headerMessage={headerMessage}

From 37a239097debbda5ca7128cbdb4c9338a21855cf Mon Sep 17 00:00:00 2001
From: Nodebrute <anusharukhsar1@gmail.com>
Date: Mon, 19 Jan 2026 21:48:45 +0500
Subject: [PATCH 3/4] change minwidth to width

---
 src/components/CategoryPicker.tsx | 2 +-
 src/components/TagPicker.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/CategoryPicker.tsx b/src/components/CategoryPicker.tsx
index a251fd431b9ea..a60f4c75ade47 100644
--- a/src/components/CategoryPicker.tsx
+++ b/src/components/CategoryPicker.tsx
@@ -90,7 +90,7 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeArea
             initiallyFocusedOptionKey={selectedOptionKey ?? undefined}
             addBottomSafeAreaPadding={addBottomSafeAreaPadding}
             contentContainerStyle={contentContainerStyle}
-            listItemTitleStyles={styles.mnw100}
+            listItemTitleStyles={styles.w100}
         />
     );
 }
diff --git a/src/components/TagPicker.tsx b/src/components/TagPicker.tsx
index b2efa3666c7e6..5f78dcf46774b 100644
--- a/src/components/TagPicker.tsx
+++ b/src/components/TagPicker.tsx
@@ -135,7 +135,7 @@ function TagPicker({
 
     const selectedOptionKey = sections.at(0)?.data?.find((policyTag) => policyTag.searchText === selectedTag)?.keyForList;
 
-    const listItemTitleStyles = useMemo(() => [styles.breakAll, styles.mnw100], [styles.breakAll, styles.mnw100]);
+    const listItemTitleStyles = useMemo(() => [styles.breakAll, styles.w100], [styles.breakAll, styles.w100]);
 
     return (
         <SelectionList

From 88623a70313f6fe33be11ea13563b65bea08066e Mon Sep 17 00:00:00 2001
From: Nodebrute <anusharukhsar1@gmail.com>
Date: Tue, 27 Jan 2026 14:52:51 +0500
Subject: [PATCH 4/4] remove memo

---
 src/components/TagPicker.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TagPicker.tsx b/src/components/TagPicker.tsx
index 5f78dcf46774b..440e83b1410da 100644
--- a/src/components/TagPicker.tsx
+++ b/src/components/TagPicker.tsx
@@ -135,7 +135,7 @@ function TagPicker({
 
     const selectedOptionKey = sections.at(0)?.data?.find((policyTag) => policyTag.searchText === selectedTag)?.keyForList;
 
-    const listItemTitleStyles = useMemo(() => [styles.breakAll, styles.w100], [styles.breakAll, styles.w100]);
+    const listItemTitleStyles = [styles.breakAll, styles.w100];
 
     return (
         <SelectionList