From 7aeb49beb76b62553700bc37d5d3b5e23aee0ba5 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 17:26:46 -0700
Subject: [PATCH 01/20] add draggable list

---
 src/pages/Search/SearchColumnsPage.tsx | 46 +++++++++++++++-----------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 95774157ec52b..5317d3eeaef48 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -8,6 +8,7 @@ import type {SearchCustomColumnIds} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 import SelectionList from '@components/SelectionListWithSections';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
+import DraggableList from '@components/DraggableList';
 import type {SectionListDataType} from '@components/SelectionListWithSections/types';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
@@ -43,17 +44,12 @@ function SearchColumnsPage() {
         return columnIds;
     });
 
-    const sections: Array<SectionListDataType<ListItem>> = [
-        {
-            title: undefined,
-            data: allCustomColumns.map((columnId) => ({
-                text: translate(getSearchColumnTranslationKey(columnId)),
-                value: columnId,
-                keyForList: columnId,
-                isSelected: selectedColumnIds?.includes(columnId),
-            })),
-        },
-    ];
+    const columnsList = selectedColumnIds.map((columnId) => ({
+        text: translate(getSearchColumnTranslationKey(columnId)),
+        value: columnId,
+        keyForList: columnId,
+        isSelected: true,
+    }));
 
     const sortedDefaultColumns = [...defaultCustomColumns].sort();
     const sortedSelectedColumnIds = [...selectedColumnIds].sort();
@@ -69,6 +65,10 @@ function SearchColumnsPage() {
         }
     };
 
+    const onDragEnd = ({data}: {data: typeof columnsList}) => {
+        setSelectedColumnIds(data.map((item) => item.value));
+    };
+
     const resetColumns = () => {
         setSelectedColumnIds(defaultCustomColumns);
     };
@@ -84,6 +84,16 @@ function SearchColumnsPage() {
         Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString}), {forceReplace: true});
     };
 
+    const renderItem = ({item}: {item: ListItem}) => {
+        return (
+            <MultiSelectListItem
+                item={item}
+                isSelected={item.isSelected}
+                onSelectRow={onSelectItem}
+            />
+        );
+    };
+
     return (
         <ScreenWrapper
             testID="SearchColumnsPage"
@@ -95,14 +105,12 @@ function SearchColumnsPage() {
                 {shouldShowResetColumns && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
             </HeaderWithBackButton>
             <View style={[styles.flex1]}>
-                <SelectionList
-                    sections={sections}
-                    onSelectRow={onSelectItem}
-                    shouldStopPropagation
-                    shouldShowTooltips
-                    canSelectMultiple
-                    ListItem={MultiSelectListItem}
-                    footerContent={
+                <DraggableList
+                    data={columnsList}
+                    keyExtractor={(item) => item.value}
+                    onDragEnd={onDragEnd}
+                    renderItem={renderItem}
+                    ListFooterComponent={
                         <View style={[styles.gap2]}>
                             {!selectedColumnIds.length && (
                                 <DotIndicatorMessage

From f3976b05632ca5286adba7ab078b3bdfda7167df Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 17:31:33 -0700
Subject: [PATCH 02/20] update footer

---
 src/pages/Search/SearchColumnsPage.tsx | 55 ++++++++++++--------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 5317d3eeaef48..e1fb66c639efa 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -6,10 +6,8 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {SearchCustomColumnIds} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
-import SelectionList from '@components/SelectionListWithSections';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
 import DraggableList from '@components/DraggableList';
-import type {SectionListDataType} from '@components/SelectionListWithSections/types';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -87,8 +85,8 @@ function SearchColumnsPage() {
     const renderItem = ({item}: {item: ListItem}) => {
         return (
             <MultiSelectListItem
-                item={item}
-                isSelected={item.isSelected}
+                item={item} 
+                showTooltip={false}
                 onSelectRow={onSelectItem}
             />
         );
@@ -104,33 +102,30 @@ function SearchColumnsPage() {
             <HeaderWithBackButton title={translate('search.columns')}>
                 {shouldShowResetColumns && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
             </HeaderWithBackButton>
-            <View style={[styles.flex1]}>
-                <DraggableList
-                    data={columnsList}
-                    keyExtractor={(item) => item.value}
-                    onDragEnd={onDragEnd}
-                    renderItem={renderItem}
-                    ListFooterComponent={
-                        <View style={[styles.gap2]}>
-                            {!selectedColumnIds.length && (
-                                <DotIndicatorMessage
-                                    type="error"
-                                    messages={{error: translate('search.noColumnsError')}}
-                                />
-                            )}
-
-                            <Button
-                                large
-                                success
-                                pressOnEnter
-                                style={[styles.mt3]}
-                                text={translate('common.save')}
-                                onPress={applyChanges}
+            <DraggableList
+                data={columnsList}
+                keyExtractor={(item) => item.value}
+                onDragEnd={onDragEnd}
+                renderItem={renderItem}
+                ListFooterComponent={
+                    <View style={[styles.ph5, styles.pb5, styles.mtAuto, styles.flex1, styles.justifyContentEnd]}>
+                        {!selectedColumnIds.length && (
+                            <DotIndicatorMessage
+                                type="error"
+                                style={styles.mb3}
+                                messages={{error: translate('search.noColumnsError')}}
                             />
-                        </View>
-                    }
-                />
-            </View>
+                        )}
+                        <Button
+                            large
+                            success
+                            pressOnEnter
+                            text={translate('common.save')}
+                            onPress={applyChanges}
+                        />
+                    </View>
+                }
+            />
         </ScreenWrapper>
     );
 }

From 50b35e1f1c4c10d0d096acd45f24065cc01d0b0e Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 17:33:39 -0700
Subject: [PATCH 03/20] fix footer, available items

---
 src/pages/Search/SearchColumnsPage.tsx | 52 +++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index e1fb66c639efa..88c29a2e222eb 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -42,11 +42,11 @@ function SearchColumnsPage() {
         return columnIds;
     });
 
-    const columnsList = selectedColumnIds.map((columnId) => ({
+    const columnsList = allCustomColumns.map((columnId) => ({
         text: translate(getSearchColumnTranslationKey(columnId)),
         value: columnId,
         keyForList: columnId,
-        isSelected: true,
+        isSelected: selectedColumnIds.includes(columnId),
     }));
 
     const sortedDefaultColumns = [...defaultCustomColumns].sort();
@@ -102,30 +102,30 @@ function SearchColumnsPage() {
             <HeaderWithBackButton title={translate('search.columns')}>
                 {shouldShowResetColumns && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
             </HeaderWithBackButton>
-            <DraggableList
-                data={columnsList}
-                keyExtractor={(item) => item.value}
-                onDragEnd={onDragEnd}
-                renderItem={renderItem}
-                ListFooterComponent={
-                    <View style={[styles.ph5, styles.pb5, styles.mtAuto, styles.flex1, styles.justifyContentEnd]}>
-                        {!selectedColumnIds.length && (
-                            <DotIndicatorMessage
-                                type="error"
-                                style={styles.mb3}
-                                messages={{error: translate('search.noColumnsError')}}
-                            />
-                        )}
-                        <Button
-                            large
-                            success
-                            pressOnEnter
-                            text={translate('common.save')}
-                            onPress={applyChanges}
-                        />
-                    </View>
-                }
-            />
+            <View style={styles.flex1}>
+                <DraggableList
+                    data={columnsList}
+                    keyExtractor={(item) => item.value}
+                    onDragEnd={onDragEnd}
+                    renderItem={renderItem}
+                />
+            </View>
+            <View style={[styles.ph5, styles.pb5]}>
+                {!selectedColumnIds.length && (
+                    <DotIndicatorMessage
+                        type="error"
+                        style={styles.mb3}
+                        messages={{error: translate('search.noColumnsError')}}
+                    />
+                )}
+                <Button
+                    large
+                    success
+                    pressOnEnter
+                    text={translate('common.save')}
+                    onPress={applyChanges}
+                />
+            </View>
         </ScreenWrapper>
     );
 }

From 47dd88cb3e4d1f32b2aa75efeeefd4b5e9f6a7d4 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 17:35:30 -0700
Subject: [PATCH 04/20] add drag handles

---
 src/pages/Search/SearchColumnsPage.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 88c29a2e222eb..54fa50068c308 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -2,15 +2,18 @@ import React, {useState} from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
+import DraggableList from '@components/DraggableList';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {SearchCustomColumnIds} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
-import DraggableList from '@components/DraggableList';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import {buildQueryStringFromFilterFormValues} from '@libs/SearchQueryUtils';
@@ -22,6 +25,7 @@ import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import arraysEqual from '@src/utils/arraysEqual';
 
 function SearchColumnsPage() {
+    const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
@@ -47,6 +51,13 @@ function SearchColumnsPage() {
         value: columnId,
         keyForList: columnId,
         isSelected: selectedColumnIds.includes(columnId),
+        leftElement: (
+            <Icon
+                src={Expensicons.DragHandles}
+                fill={theme.icon}
+                additionalStyles={styles.mr3}
+            />
+        ),
     }));
 
     const sortedDefaultColumns = [...defaultCustomColumns].sort();

From df88f1a6eba756da45e360402c49100f8a2db81a Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 17:36:23 -0700
Subject: [PATCH 05/20] use lazy hook

---
 src/pages/Search/SearchColumnsPage.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 54fa50068c308..9134280f56d5c 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -5,12 +5,12 @@ import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import DraggableList from '@components/DraggableList';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
-import * as Expensicons from '@components/Icon/Expensicons';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {SearchCustomColumnIds} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
 import TextLink from '@components/TextLink';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useTheme from '@hooks/useTheme';
@@ -27,6 +27,7 @@ import arraysEqual from '@src/utils/arraysEqual';
 function SearchColumnsPage() {
     const theme = useTheme();
     const styles = useThemeStyles();
+    const icons = useMemoizedLazyExpensifyIcons(['DragHandles']);
     const {translate} = useLocalize();
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
@@ -53,7 +54,7 @@ function SearchColumnsPage() {
         isSelected: selectedColumnIds.includes(columnId),
         leftElement: (
             <Icon
-                src={Expensicons.DragHandles}
+                src={icons.DragHandles}
                 fill={theme.icon}
                 additionalStyles={styles.mr3}
             />

From 04a525dcf04d8153c6c65d61bf56cd07f115db46 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 17:42:18 -0700
Subject: [PATCH 06/20] fix drag logic

---
 src/pages/Search/SearchColumnsPage.tsx | 39 +++++++++++++++-----------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 9134280f56d5c..1e195469c5092 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -36,22 +36,28 @@ function SearchColumnsPage() {
     const allCustomColumns = getCustomColumns(queryType);
     const defaultCustomColumns = getCustomColumnDefault(queryType);
 
-    const [selectedColumnIds, setSelectedColumnIds] = useState<SearchCustomColumnIds[]>(() => {
-        const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => allCustomColumns.includes(columnId)) ?? [];
+    type ColumnItem = {
+        columnId: SearchCustomColumnIds;
+        isSelected: boolean;
+    };
 
-        // We dont allow the user to unselect all columns, so we can assume that no columns = default columns
-        if (!columnIds.length) {
-            return defaultCustomColumns;
-        }
+    const [columns, setColumns] = useState<ColumnItem[]>(() => {
+        const savedColumnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => allCustomColumns.includes(columnId)) ?? [];
+        const selectedIds = savedColumnIds.length ? savedColumnIds : defaultCustomColumns;
 
-        return columnIds;
+        return allCustomColumns.map((columnId) => ({
+            columnId,
+            isSelected: selectedIds.includes(columnId),
+        }));
     });
 
-    const columnsList = allCustomColumns.map((columnId) => ({
+    const selectedColumnIds = columns.filter((col) => col.isSelected).map((col) => col.columnId);
+
+    const columnsList = columns.map(({columnId, isSelected}) => ({
         text: translate(getSearchColumnTranslationKey(columnId)),
         value: columnId,
         keyForList: columnId,
-        isSelected: selectedColumnIds.includes(columnId),
+        isSelected,
         leftElement: (
             <Icon
                 src={icons.DragHandles}
@@ -68,19 +74,20 @@ function SearchColumnsPage() {
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;
 
-        if (item.isSelected) {
-            setSelectedColumnIds(selectedColumnIds.filter((columnId) => columnId !== updatedColumnId));
-        } else {
-            setSelectedColumnIds([...selectedColumnIds, updatedColumnId]);
-        }
+        setColumns(columns.map((col) => (col.columnId === updatedColumnId ? {...col, isSelected: !col.isSelected} : col)));
     };
 
     const onDragEnd = ({data}: {data: typeof columnsList}) => {
-        setSelectedColumnIds(data.map((item) => item.value));
+        setColumns(data.map((item) => ({columnId: item.value, isSelected: item.isSelected})));
     };
 
     const resetColumns = () => {
-        setSelectedColumnIds(defaultCustomColumns);
+        setColumns(
+            allCustomColumns.map((columnId) => ({
+                columnId,
+                isSelected: defaultCustomColumns.includes(columnId),
+            })),
+        );
     };
 
     const applyChanges = () => {

From 154a68918e1ee34b0582436f7268357ae20f86df Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 17:43:23 -0700
Subject: [PATCH 07/20] fix reset

---
 src/pages/Search/SearchColumnsPage.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 1e195469c5092..3db7ebf608d19 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -22,7 +22,6 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
-import arraysEqual from '@src/utils/arraysEqual';
 
 function SearchColumnsPage() {
     const theme = useTheme();
@@ -67,9 +66,15 @@ function SearchColumnsPage() {
         ),
     }));
 
-    const sortedDefaultColumns = [...defaultCustomColumns].sort();
-    const sortedSelectedColumnIds = [...selectedColumnIds].sort();
-    const shouldShowResetColumns = !arraysEqual(sortedSelectedColumnIds, sortedDefaultColumns);
+    const defaultColumns = allCustomColumns.map((columnId) => ({
+        columnId,
+        isSelected: defaultCustomColumns.includes(columnId),
+    }));
+
+    const isDefaultState =
+        columns.length === defaultColumns.length && columns.every((col, index) => col.columnId === defaultColumns.at(index)?.columnId && col.isSelected === defaultColumns.at(index)?.isSelected);
+
+    const shouldShowResetColumns = !isDefaultState;
 
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;

From 467ad57f6631712e1c602ab68ffab09f30d08967 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 18:08:57 -0700
Subject: [PATCH 08/20] move custom column logic

---
 src/libs/SearchUIUtils.ts              | 24 +++++++-------
 src/pages/Search/SearchColumnsPage.tsx | 45 ++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 8ed95caf8cc23..62e5b4e7baf6d 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2941,6 +2941,18 @@ function getColumnsToShow(
               [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
           };
 
+    // If the user has set custom columns for the search, we need to respect their preference, and only show
+    // them what they want to see
+    if (!arraysEqual(Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE), visibleColumns) && visibleColumns.length > 0) {
+        const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TYPE]);
+
+        for (const column of Object.keys(columns) as SearchCustomColumnIds[]) {
+            columns[column] = visibleColumns.includes(column) || requiredColumns.has(column);
+        }
+
+        return columns;
+    }
+
     const {moneyRequestReportActionsByTransactionID} = Array.isArray(data) ? {} : createReportActionsLookupMaps(data);
 
     // eslint-disable-next-line @typescript-eslint/no-deprecated
@@ -2988,18 +3000,6 @@ function getColumnsToShow(
         }
     };
 
-    // If the user has set custom columns for the search, we need to respect their preference, and only show
-    // them what they want to see
-    if (!arraysEqual(Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE), visibleColumns) && visibleColumns.length > 0) {
-        const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TYPE]);
-
-        for (const column of Object.keys(columns) as SearchCustomColumnIds[]) {
-            columns[column] = visibleColumns.includes(column) || requiredColumns.has(column);
-        }
-
-        return columns;
-    }
-
     if (Array.isArray(data)) {
         for (const item of data) {
             updateColumns(item);
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 3db7ebf608d19..45d8f6ed84c6e 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -42,12 +42,42 @@ function SearchColumnsPage() {
 
     const [columns, setColumns] = useState<ColumnItem[]>(() => {
         const savedColumnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => allCustomColumns.includes(columnId)) ?? [];
-        const selectedIds = savedColumnIds.length ? savedColumnIds : defaultCustomColumns;
 
-        return allCustomColumns.map((columnId) => ({
-            columnId,
-            isSelected: selectedIds.includes(columnId),
-        }));
+        // If no saved columns, use default order and selection
+        if (!savedColumnIds.length) {
+            return allCustomColumns.map((columnId) => ({
+                columnId,
+                isSelected: defaultCustomColumns.includes(columnId),
+            }));
+        }
+
+        // Build the list: start with default order, but place selected columns in saved order
+        // Selected columns appear in their saved order positions, unselected stay in default order
+        const unselectedColumns = allCustomColumns.filter((columnId) => !savedColumnIds.includes(columnId));
+        const result: ColumnItem[] = [];
+        let savedIndex = 0;
+        let unselectedIndex = 0;
+
+        // Go through default order and reconstruct the list
+        for (const columnId of allCustomColumns) {
+            if (savedColumnIds.includes(columnId)) {
+                // This position had a selected column - use the next saved column in order
+                result.push({
+                    columnId: savedColumnIds.at(savedIndex) ?? columnId,
+                    isSelected: true,
+                });
+                savedIndex++;
+            } else {
+                // This position has an unselected column - keep it
+                result.push({
+                    columnId: unselectedColumns.at(unselectedIndex) ?? columnId,
+                    isSelected: false,
+                });
+                unselectedIndex++;
+            }
+        }
+
+        return result;
     });
 
     const selectedColumnIds = columns.filter((col) => col.isSelected).map((col) => col.columnId);
@@ -100,7 +130,10 @@ function SearchColumnsPage() {
             return;
         }
 
-        const updatedAdvancedFilters: Partial<SearchAdvancedFiltersForm> = {...searchAdvancedFiltersForm, columns: selectedColumnIds};
+        const updatedAdvancedFilters: Partial<SearchAdvancedFiltersForm> = {
+            ...searchAdvancedFiltersForm,
+            columns: selectedColumnIds,
+        };
         const queryString = buildQueryStringFromFilterFormValues(updatedAdvancedFilters);
 
         Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString}), {forceReplace: true});

From 4fbf0344971fb5aa8f04cec570619c2061122393 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 18:50:25 -0700
Subject: [PATCH 09/20] reorder columns

---
 .../MoneyRequestReportTransactionList.tsx     |  10 +-
 src/components/Search/index.tsx               |   4 +-
 .../Search/TransactionGroupListExpanded.tsx   |   4 +-
 .../SearchTableHeader.tsx                     |  36 +++++-
 src/libs/SearchUIUtils.ts                     | 110 +++++++++---------
 5 files changed, 92 insertions(+), 72 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
index 3f610c2c85f31..31c7a7e94c88a 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
@@ -10,7 +10,7 @@ import MenuItem from '@components/MenuItem';
 import Modal from '@components/Modal';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {useSearchContext} from '@components/Search/SearchContext';
-import type {SearchColumnType, SortOrder} from '@components/Search/types';
+import type {SortOrder} from '@components/Search/types';
 import Text from '@components/Text';
 import {WideRHPContext} from '@components/WideRHPContextProvider';
 import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
@@ -65,7 +65,6 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {columnsSelector} from '@src/selectors/AdvancedSearchFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import MoneyRequestReportGroupHeader from './MoneyRequestReportGroupHeader';
@@ -184,7 +183,6 @@ function MoneyRequestReportTransactionList({
     const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report);
     const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true});
     const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true});
-    const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true, selector: columnsSelector});
 
     const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report);
 
@@ -267,10 +265,10 @@ function MoneyRequestReportTransactionList({
             }));
     }, [newTransactions, sortBy, sortOrder, transactions, localeCompare, report]);
 
+    // Always use default columns for money request report view (don't use user-customized search columns)
     const columnsToShow = useMemo(() => {
-        const columns = getColumnsToShow(currentUserDetails?.accountID, transactions, visibleColumns, true);
-        return (Object.keys(columns) as SearchColumnType[]).filter((column) => columns[column]);
-    }, [transactions, currentUserDetails?.accountID, visibleColumns]);
+        return getColumnsToShow(currentUserDetails?.accountID, transactions, [], true);
+    }, [transactions, currentUserDetails?.accountID]);
 
     const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy);
 
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 60298e23d1449..b078d98398e71 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -831,9 +831,7 @@ function Search({
         if (!searchResults?.data) {
             return [];
         }
-        const columns = getColumnsToShow(accountID, searchResults?.data, visibleColumns, false, searchResults?.search?.type);
-
-        return (Object.keys(columns) as SearchColumnType[]).filter((col) => columns[col]);
+        return getColumnsToShow(accountID, searchResults?.data, visibleColumns, false, searchResults?.search?.type);
     }, [accountID, searchResults?.data, searchResults?.search?.type, visibleColumns]);
 
     const opacity = useSharedValue(1);
diff --git a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
index 90f6036fc8daa..9bee9c523d209 100644
--- a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
+++ b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
@@ -80,9 +80,7 @@ function TransactionGroupListExpanded<TItem extends ListItem>({
         if (!transactionsSnapshot?.data) {
             return [];
         }
-        const columnsToShow = getColumnsToShow(accountID, transactionsSnapshot?.data, visibleColumns, false, transactionsSnapshot?.search.type);
-
-        return (Object.keys(columnsToShow) as SearchColumnType[]).filter((col) => columnsToShow[col]);
+        return getColumnsToShow(accountID, transactionsSnapshot?.data, visibleColumns, false, transactionsSnapshot?.search.type);
     }, [accountID, columns, isExpenseReportType, transactionsSnapshot?.data, transactionsSnapshot?.search.type, visibleColumns]);
 
     const areAllOptionalColumnsHidden = useMemo(() => {
diff --git a/src/components/SelectionListWithSections/SearchTableHeader.tsx b/src/components/SelectionListWithSections/SearchTableHeader.tsx
index 741207762d4f1..541b33a9b8d05 100644
--- a/src/components/SelectionListWithSections/SearchTableHeader.tsx
+++ b/src/components/SelectionListWithSections/SearchTableHeader.tsx
@@ -327,17 +327,49 @@ function SearchTableHeader({
 
     const columnConfig = useMemo(() => getSearchColumns(type, groupBy, icons.Profile), [type, groupBy, icons.Profile]);
 
+    // Reorder columnConfig based on the columns prop order
+    const orderedColumnConfig = useMemo(() => {
+        if (!columnConfig) {
+            return null;
+        }
+
+        // Create a map for quick lookup
+        const configMap = new Map(columnConfig.map((config) => [config.columnName, config]));
+
+        // Build ordered config: first add columns in the order specified by `columns` prop,
+        // then add any remaining columns from columnConfig that weren't in columns
+        const orderedConfig: SearchColumnConfig[] = [];
+        const addedColumns = new Set<SearchColumnType>();
+
+        for (const col of columns) {
+            const config = configMap.get(col);
+            if (config) {
+                orderedConfig.push(config);
+                addedColumns.add(col);
+            }
+        }
+
+        // Add remaining columns that weren't in the columns prop (in their original order)
+        for (const config of columnConfig) {
+            if (!addedColumns.has(config.columnName)) {
+                orderedConfig.push(config);
+            }
+        }
+
+        return orderedConfig;
+    }, [columnConfig, columns]);
+
     if (displayNarrowVersion) {
         return;
     }
 
-    if (!columnConfig) {
+    if (!orderedColumnConfig) {
         return;
     }
 
     return (
         <SortableTableHeader
-            columns={columnConfig}
+            columns={orderedColumnConfig}
             areAllOptionalColumnsHidden={areAllOptionalColumnsHidden}
             shouldShowColumn={shouldShowColumn}
             dateColumnSize={shouldShowYear ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL}
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 62e5b4e7baf6d..001dc627f0b0f 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2828,6 +2828,7 @@ function getActionOptions(translate: LocaleContextProps['translate']) {
 /**
  * Determines what columns to show based on available data
  * @param isExpenseReportView: true when we are inside an expense report view, false if we're in the Reports page.
+ * @returns An ordered array of visible column IDs
  */
 function getColumnsToShow(
     currentAccountID: number | undefined,
@@ -2835,69 +2836,53 @@ function getColumnsToShow(
     visibleColumns: SearchCustomColumnIds[] = [],
     isExpenseReportView = false,
     type?: SearchDataTypes,
-): ColumnVisibility {
+): SearchColumnType[] {
     if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT) {
-        const reportColumns: ColumnVisibility = {
-            [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.SUBMITTED]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.APPROVED]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.EXPORTED]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.STATUS]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.TITLE]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.FROM]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.TO]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.POLICY_NAME]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE_TOTAL]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.NON_REIMBURSABLE_TOTAL]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.BASE_62_REPORT_ID]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.REPORT_ID]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
-        };
-
-        // If there are no visible columns, everything should be visible
+        const defaultReportColumns: SearchColumnType[] = [
+            CONST.SEARCH.TABLE_COLUMNS.AVATAR,
+            CONST.SEARCH.TABLE_COLUMNS.DATE,
+            CONST.SEARCH.TABLE_COLUMNS.STATUS,
+            CONST.SEARCH.TABLE_COLUMNS.TITLE,
+            CONST.SEARCH.TABLE_COLUMNS.FROM,
+            CONST.SEARCH.TABLE_COLUMNS.TO,
+            CONST.SEARCH.TABLE_COLUMNS.TOTAL,
+            CONST.SEARCH.TABLE_COLUMNS.ACTION,
+        ];
+
+        // If there are no visible columns, return default columns
         if (!visibleColumns.length) {
-            return reportColumns;
+            return defaultReportColumns;
         }
 
-        // If the user has set custom columns, toggle the visible columns on, with all other
-        // columns hidden by default
-        const columns: ColumnVisibility = {};
-        const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
-        const columnsToShow = visibleColumns.length ? visibleColumns : CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT;
+        // If the user has set custom columns, use their order with required columns
+        const requiredColumns = new Set<SearchColumnType>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
+        const result: SearchColumnType[] = [];
 
-        for (const columnId of Object.keys(reportColumns) as SearchColumnType[]) {
-            columns[columnId] = requiredColumns.has(columnId);
+        // Add required columns that aren't in visibleColumns at the start
+        for (const col of requiredColumns) {
+            if (!visibleColumns.includes(col as SearchCustomColumnIds)) {
+                result.push(col);
+            }
         }
 
-        for (const column of columnsToShow) {
-            columns[column as keyof ColumnVisibility] = true;
+        // Add visible columns in their order
+        for (const col of visibleColumns) {
+            result.push(col);
         }
 
-        return columns;
+        return result;
     }
 
     if (type === CONST.SEARCH.DATA_TYPES.TASK) {
-        return {
-            [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.TITLE]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.FROM]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.IN]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.ASSIGNEE]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.RECEIPT]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.MERCHANT]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.TO]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.CATEGORY]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.TAG]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.COMMENTS]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.TYPE]: false,
-            [CONST.SEARCH.TABLE_COLUMNS.WITHDRAWAL_ID]: false,
-        };
+        return [
+            CONST.SEARCH.TABLE_COLUMNS.DATE,
+            CONST.SEARCH.TABLE_COLUMNS.TITLE,
+            CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION,
+            CONST.SEARCH.TABLE_COLUMNS.FROM,
+            CONST.SEARCH.TABLE_COLUMNS.IN,
+            CONST.SEARCH.TABLE_COLUMNS.ASSIGNEE,
+            CONST.SEARCH.TABLE_COLUMNS.ACTION,
+        ];
     }
 
     const columns: ColumnVisibility = isExpenseReportView
@@ -2941,16 +2926,24 @@ function getColumnsToShow(
               [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
           };
 
-    // If the user has set custom columns for the search, we need to respect their preference, and only show
-    // them what they want to see
+    // If the user has set custom columns for the search, we need to respect their preference and order
     if (!arraysEqual(Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE), visibleColumns) && visibleColumns.length > 0) {
-        const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TYPE]);
+        const requiredColumns = new Set<SearchColumnType>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TYPE]);
+        const result: SearchColumnType[] = [];
 
-        for (const column of Object.keys(columns) as SearchCustomColumnIds[]) {
-            columns[column] = visibleColumns.includes(column) || requiredColumns.has(column);
+        // Add required columns that aren't in visibleColumns at the start
+        for (const col of requiredColumns) {
+            if (!visibleColumns.includes(col as SearchCustomColumnIds)) {
+                result.push(col);
+            }
+        }
+
+        // Add visible columns in their order
+        for (const col of visibleColumns) {
+            result.push(col);
         }
 
-        return columns;
+        return result;
     }
 
     const {moneyRequestReportActionsByTransactionID} = Array.isArray(data) ? {} : createReportActionsLookupMaps(data);
@@ -3013,7 +3006,8 @@ function getColumnsToShow(
         }
     }
 
-    return columns;
+    // Return columns in default order, filtered to only visible ones
+    return (Object.keys(columns) as SearchColumnType[]).filter((col) => columns[col]);
 }
 
 /**

From 6f840460a59ca39cefaef7bdccabc48d3cf11f18 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 18:58:49 -0700
Subject: [PATCH 10/20] add total amount to RHP

---
 src/CONST/index.ts        | 5 ++++-
 src/libs/SearchUIUtils.ts | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index e2e87e10312e7..ebe0768d4900f 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6715,6 +6715,7 @@ const CONST = {
                     TAX_AMOUNT: this.TABLE_COLUMNS.TAX_AMOUNT,
                     STATUS: this.TABLE_COLUMNS.STATUS,
                     TITLE: this.TABLE_COLUMNS.TITLE,
+                    AMOUNT: this.TABLE_COLUMNS.TOTAL_AMOUNT,
                     ACTION: this.TABLE_COLUMNS.ACTION,
                 },
                 EXPENSE_REPORT: {
@@ -6731,6 +6732,7 @@ const CONST = {
                     NON_REIMBURSABLE_TOTAL: this.TABLE_COLUMNS.NON_REIMBURSABLE_TOTAL,
                     REPORT_ID: this.TABLE_COLUMNS.REPORT_ID,
                     BASE_62_REPORT_ID: this.TABLE_COLUMNS.BASE_62_REPORT_ID,
+                    AMOUNT: this.TABLE_COLUMNS.TOTAL,
                     ACTION: this.TABLE_COLUMNS.ACTION,
                 },
                 INVOICE: {},
@@ -6749,9 +6751,10 @@ const CONST = {
                     this.TABLE_COLUMNS.TO,
                     this.TABLE_COLUMNS.CATEGORY,
                     this.TABLE_COLUMNS.TAG,
+                    this.TABLE_COLUMNS.TOTAL_AMOUNT,
                     this.TABLE_COLUMNS.ACTION,
                 ],
-                EXPENSE_REPORT: [this.TABLE_COLUMNS.DATE, this.TABLE_COLUMNS.STATUS, this.TABLE_COLUMNS.TITLE, this.TABLE_COLUMNS.FROM, this.TABLE_COLUMNS.TO, this.TABLE_COLUMNS.ACTION],
+                EXPENSE_REPORT: [this.TABLE_COLUMNS.DATE, this.TABLE_COLUMNS.STATUS, this.TABLE_COLUMNS.TITLE, this.TABLE_COLUMNS.FROM, this.TABLE_COLUMNS.TO, this.TABLE_COLUMNS.TOTAL, this.TABLE_COLUMNS.ACTION],
                 INVOICE: [],
                 TASK: [],
                 TRIP: [],
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 001dc627f0b0f..be5e7582adf8f 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2458,6 +2458,10 @@ function getSearchColumnTranslationKey(columnId: SearchCustomColumnIds): Transla
             return 'iou.taxRate';
         case CONST.SEARCH.TABLE_COLUMNS.REPORT_ID:
             return 'common.longID';
+        case CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT:
+            return 'iou.amount';
+        case CONST.SEARCH.TABLE_COLUMNS.TOTAL:
+            return 'common.total';
         case CONST.SEARCH.TABLE_COLUMNS.BASE_62_REPORT_ID:
             return 'common.reportID';
     }
@@ -2918,11 +2922,11 @@ function getColumnsToShow(
               [CONST.SEARCH.TABLE_COLUMNS.TAX_RATE]: false,
               [CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT]: false,
               [CONST.SEARCH.TABLE_COLUMNS.ORIGINAL_AMOUNT]: false,
-              [CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]: true,
               [CONST.SEARCH.TABLE_COLUMNS.BASE_62_REPORT_ID]: false,
               [CONST.SEARCH.TABLE_COLUMNS.REPORT_ID]: false,
               [CONST.SEARCH.TABLE_COLUMNS.TITLE]: false,
               [CONST.SEARCH.TABLE_COLUMNS.STATUS]: false,
+              [CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]: true,
               [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
           };
 

From c46faec6d981bc6fd0290bf34ee5771b2ffdf148 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 19:02:42 -0700
Subject: [PATCH 11/20] fix amount column

---
 .../MultiSelectListItem.tsx                   |  3 +-
 src/pages/Search/SearchColumnsPage.tsx        | 41 ++++++++++++-------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/SelectionListWithSections/MultiSelectListItem.tsx b/src/components/SelectionListWithSections/MultiSelectListItem.tsx
index 230ef43dc4203..74664ff8a97ce 100644
--- a/src/components/SelectionListWithSections/MultiSelectListItem.tsx
+++ b/src/components/SelectionListWithSections/MultiSelectListItem.tsx
@@ -36,9 +36,10 @@ function MultiSelectListItem<TItem extends ListItem>({
                 onPress={() => onSelectRow(item)}
                 isIndeterminate={item.isIndeterminate}
                 style={[isMultilineSupported ? styles.ml3 : null]}
+                disabled={isDisabled ?? false}
             />
         );
-    }, [isMultilineSupported, isSelected, item, onSelectRow, styles.ml3]);
+    }, [isDisabled, isMultilineSupported, isSelected, item, onSelectRow, styles.ml3]);
 
     return (
         <RadioListItem
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 45d8f6ed84c6e..8cc50c5eb499d 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -35,6 +35,9 @@ function SearchColumnsPage() {
     const allCustomColumns = getCustomColumns(queryType);
     const defaultCustomColumns = getCustomColumnDefault(queryType);
 
+    // Columns that cannot be deselected (always required)
+    const requiredColumns = new Set<SearchCustomColumnIds>([CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
+
     type ColumnItem = {
         columnId: SearchCustomColumnIds;
         isSelected: boolean;
@@ -82,19 +85,23 @@ function SearchColumnsPage() {
 
     const selectedColumnIds = columns.filter((col) => col.isSelected).map((col) => col.columnId);
 
-    const columnsList = columns.map(({columnId, isSelected}) => ({
-        text: translate(getSearchColumnTranslationKey(columnId)),
-        value: columnId,
-        keyForList: columnId,
-        isSelected,
-        leftElement: (
-            <Icon
-                src={icons.DragHandles}
-                fill={theme.icon}
-                additionalStyles={styles.mr3}
-            />
-        ),
-    }));
+    const columnsList = columns.map(({columnId, isSelected}) => {
+        const isRequired = requiredColumns.has(columnId);
+        return {
+            text: translate(getSearchColumnTranslationKey(columnId)),
+            value: columnId,
+            keyForList: columnId,
+            isSelected: isRequired ? true : isSelected,
+            isDisabled: isRequired,
+            leftElement: (
+                <Icon
+                    src={icons.DragHandles}
+                    fill={theme.icon}
+                    additionalStyles={styles.mr3}
+                />
+            ),
+        };
+    });
 
     const defaultColumns = allCustomColumns.map((columnId) => ({
         columnId,
@@ -109,6 +116,11 @@ function SearchColumnsPage() {
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;
 
+        // Don't allow toggling required columns
+        if (requiredColumns.has(updatedColumnId)) {
+            return;
+        }
+
         setColumns(columns.map((col) => (col.columnId === updatedColumnId ? {...col, isSelected: !col.isSelected} : col)));
     };
 
@@ -142,9 +154,10 @@ function SearchColumnsPage() {
     const renderItem = ({item}: {item: ListItem}) => {
         return (
             <MultiSelectListItem
-                item={item} 
+                item={item}
                 showTooltip={false}
                 onSelectRow={onSelectItem}
+                isDisabled={item.isDisabled}
             />
         );
     };

From eb646955b70379bbd92ae3f749723a7125394583 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 19:12:19 -0700
Subject: [PATCH 12/20] update comments

---
 .../Search/TransactionGroupListExpanded.tsx               | 1 -
 .../SelectionListWithSections/SearchTableHeader.tsx       | 8 +++-----
 src/libs/SearchUIUtils.ts                                 | 6 +-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
index 9bee9c523d209..0a85c36f3baa7 100644
--- a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
+++ b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
@@ -4,7 +4,6 @@ import ActivityIndicator from '@components/ActivityIndicator';
 import Button from '@components/Button';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
-import type {SearchColumnType} from '@components/Search/types';
 import SearchTableHeader, {getExpenseHeaders} from '@components/SelectionListWithSections/SearchTableHeader';
 import type {ListItem, TransactionGroupListExpandedProps, TransactionListItemType} from '@components/SelectionListWithSections/types';
 import Text from '@components/Text';
diff --git a/src/components/SelectionListWithSections/SearchTableHeader.tsx b/src/components/SelectionListWithSections/SearchTableHeader.tsx
index 541b33a9b8d05..a8ec2ba67e045 100644
--- a/src/components/SelectionListWithSections/SearchTableHeader.tsx
+++ b/src/components/SelectionListWithSections/SearchTableHeader.tsx
@@ -327,17 +327,16 @@ function SearchTableHeader({
 
     const columnConfig = useMemo(() => getSearchColumns(type, groupBy, icons.Profile), [type, groupBy, icons.Profile]);
 
-    // Reorder columnConfig based on the columns prop order
     const orderedColumnConfig = useMemo(() => {
         if (!columnConfig) {
             return null;
         }
 
-        // Create a map for quick lookup
         const configMap = new Map(columnConfig.map((config) => [config.columnName, config]));
 
-        // Build ordered config: first add columns in the order specified by `columns` prop,
-        // then add any remaining columns from columnConfig that weren't in columns
+        // Users can customize column order via the Search Columns page.
+        // We respect their preferred order by placing user-selected columns first,
+        // then appending any remaining columns (which will be filtered out by shouldShowColumn).
         const orderedConfig: SearchColumnConfig[] = [];
         const addedColumns = new Set<SearchColumnType>();
 
@@ -349,7 +348,6 @@ function SearchTableHeader({
             }
         }
 
-        // Add remaining columns that weren't in the columns prop (in their original order)
         for (const config of columnConfig) {
             if (!addedColumns.has(config.columnName)) {
                 orderedConfig.push(config);
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index be5e7582adf8f..67f7bc18d6436 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2858,18 +2858,16 @@ function getColumnsToShow(
             return defaultReportColumns;
         }
 
-        // If the user has set custom columns, use their order with required columns
+        // If the user has set custom columns, use their order then add required columns
         const requiredColumns = new Set<SearchColumnType>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
         const result: SearchColumnType[] = [];
 
-        // Add required columns that aren't in visibleColumns at the start
         for (const col of requiredColumns) {
             if (!visibleColumns.includes(col as SearchCustomColumnIds)) {
                 result.push(col);
             }
         }
 
-        // Add visible columns in their order
         for (const col of visibleColumns) {
             result.push(col);
         }
@@ -2942,7 +2940,6 @@ function getColumnsToShow(
             }
         }
 
-        // Add visible columns in their order
         for (const col of visibleColumns) {
             result.push(col);
         }
@@ -3010,7 +3007,6 @@ function getColumnsToShow(
         }
     }
 
-    // Return columns in default order, filtered to only visible ones
     return (Object.keys(columns) as SearchColumnType[]).filter((col) => columns[col]);
 }
 

From cd230548098a1eb68f9b0030894e8992f22eccf8 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 19:15:36 -0700
Subject: [PATCH 13/20] fix prettier

---
 src/CONST/index.ts                     | 10 +++++++++-
 src/pages/Search/SearchColumnsPage.tsx |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index ebe0768d4900f..79a70476e71c8 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6754,7 +6754,15 @@ const CONST = {
                     this.TABLE_COLUMNS.TOTAL_AMOUNT,
                     this.TABLE_COLUMNS.ACTION,
                 ],
-                EXPENSE_REPORT: [this.TABLE_COLUMNS.DATE, this.TABLE_COLUMNS.STATUS, this.TABLE_COLUMNS.TITLE, this.TABLE_COLUMNS.FROM, this.TABLE_COLUMNS.TO, this.TABLE_COLUMNS.TOTAL, this.TABLE_COLUMNS.ACTION],
+                EXPENSE_REPORT: [
+                    this.TABLE_COLUMNS.DATE,
+                    this.TABLE_COLUMNS.STATUS,
+                    this.TABLE_COLUMNS.TITLE,
+                    this.TABLE_COLUMNS.FROM,
+                    this.TABLE_COLUMNS.TO,
+                    this.TABLE_COLUMNS.TOTAL,
+                    this.TABLE_COLUMNS.ACTION,
+                ],
                 INVOICE: [],
                 TASK: [],
                 TRIP: [],
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 8cc50c5eb499d..219e7c65c3ac1 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -109,7 +109,8 @@ function SearchColumnsPage() {
     }));
 
     const isDefaultState =
-        columns.length === defaultColumns.length && columns.every((col, index) => col.columnId === defaultColumns.at(index)?.columnId && col.isSelected === defaultColumns.at(index)?.isSelected);
+        columns.length === defaultColumns.length &&
+        columns.every((col, index) => col.columnId === defaultColumns.at(index)?.columnId && col.isSelected === defaultColumns.at(index)?.isSelected);
 
     const shouldShowResetColumns = !isDefaultState;
 

From 40d3c6f822b2e11b9632b90a449abfb0c30ec8de Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 17 Dec 2025 19:25:17 -0700
Subject: [PATCH 14/20] fix tests;

---
 tests/unit/Search/SearchUIUtilsTest.ts | 114 ++++++++++---------------
 1 file changed, 47 insertions(+), 67 deletions(-)

diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index fe248c2a58dd3..03e9dbdb07bb0 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -2783,49 +2783,29 @@ describe('SearchUIUtils', () => {
 
     describe('Test getColumnsToShow', () => {
         test('Should show all default columns when no custom columns are saved & viewing expense reports', () => {
-            expect(SearchUIUtils.getColumnsToShow(1, [], [], false, CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT)).toEqual({
-                [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.SUBMITTED]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.APPROVED]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.EXPORTED]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.STATUS]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.TITLE]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.FROM]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.POLICY_NAME]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.TO]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE_TOTAL]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.NON_REIMBURSABLE_TOTAL]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.BASE_62_REPORT_ID]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.REPORT_ID]: false,
-            });
+            expect(SearchUIUtils.getColumnsToShow(1, [], [], false, CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT)).toEqual([
+                CONST.SEARCH.TABLE_COLUMNS.AVATAR,
+                CONST.SEARCH.TABLE_COLUMNS.DATE,
+                CONST.SEARCH.TABLE_COLUMNS.STATUS,
+                CONST.SEARCH.TABLE_COLUMNS.TITLE,
+                CONST.SEARCH.TABLE_COLUMNS.FROM,
+                CONST.SEARCH.TABLE_COLUMNS.TO,
+                CONST.SEARCH.TABLE_COLUMNS.TOTAL,
+                CONST.SEARCH.TABLE_COLUMNS.ACTION,
+            ]);
         });
 
         test('Should show specific columns when custom columns are saved & viewing expense reports', () => {
-            const visibleColumns = [CONST.SEARCH.TABLE_COLUMNS.DATE, CONST.SEARCH.TABLE_COLUMNS.STATUS, CONST.SEARCH.TABLE_COLUMNS.TITLE];
+            const visibleColumns = [CONST.SEARCH.TABLE_COLUMNS.DATE, CONST.SEARCH.TABLE_COLUMNS.STATUS, CONST.SEARCH.TABLE_COLUMNS.TITLE, CONST.SEARCH.TABLE_COLUMNS.TOTAL];
 
-            expect(SearchUIUtils.getColumnsToShow(1, [], visibleColumns, false, CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT)).toEqual({
+            expect(SearchUIUtils.getColumnsToShow(1, [], visibleColumns, false, CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT)).toEqual([
                 // Avatar should always be visible
-                [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.SUBMITTED]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.APPROVED]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.EXPORTED]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.STATUS]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.TITLE]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.FROM]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.POLICY_NAME]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.TO]: false,
-                // Total should always be visible
-                [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
-                [CONST.SEARCH.TABLE_COLUMNS.ACTION]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE_TOTAL]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.NON_REIMBURSABLE_TOTAL]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.BASE_62_REPORT_ID]: false,
-                [CONST.SEARCH.TABLE_COLUMNS.REPORT_ID]: false,
-            });
+                CONST.SEARCH.TABLE_COLUMNS.AVATAR,
+                CONST.SEARCH.TABLE_COLUMNS.DATE,
+                CONST.SEARCH.TABLE_COLUMNS.STATUS,
+                CONST.SEARCH.TABLE_COLUMNS.TITLE,
+                CONST.SEARCH.TABLE_COLUMNS.TOTAL,
+            ]);
         });
 
         test('Should only show columns when at least one transaction has a value for them', () => {
@@ -2912,32 +2892,32 @@ describe('SearchUIUtils', () => {
 
             // Test 1: No optional fields should be shown when all transactions are empty
             let columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, emptyTransaction], [], false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]).toBe(false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.FROM]).toBe(false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TO]).toBe(false);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.MERCHANT);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.CATEGORY);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.TAG);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.FROM);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.TO);
 
             // Test 2: Merchant column should show when at least one transaction has merchant
             columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, merchantTransaction], [], false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(false);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.MERCHANT);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.CATEGORY);
 
             // Test 3: Category column should show when at least one transaction has category
             columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, categoryTransaction], [], false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(false);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.CATEGORY);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.MERCHANT);
 
             // Test 4: Tag column should show when at least one transaction has tag
             columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, tagTransaction], [], false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(false);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.TAG);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.CATEGORY);
 
             // Test 5: Description column should show when at least one transaction has description
             columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, descriptionTransaction], [], false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(false);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.MERCHANT);
 
             // Test 6: From/To columns should show when at least one transaction has different users
             // @ts-expect-error -- no need to construct all data again, the function below only needs the report and transactions
@@ -2949,15 +2929,15 @@ describe('SearchUIUtils', () => {
                 personalDetailsList: searchResults.data.personalDetailsList,
             };
             columns = SearchUIUtils.getColumnsToShow(submitterAccountID, data, [], false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.FROM]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TO]).toBe(true);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.FROM);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.TO);
 
             // Test 7: Multiple columns should show when transactions have different fields
             columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [merchantTransaction, categoryTransaction, tagTransaction], [], false);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]).toBe(false);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.MERCHANT);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.CATEGORY);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.TAG);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
         });
 
         test('Should respect isExpenseReportView flag and not show From/To columns', () => {
@@ -2979,14 +2959,14 @@ describe('SearchUIUtils', () => {
             const columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [testTransaction], [], true);
 
             // These columns should be shown based on data
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(true);
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]).toBe(true);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.MERCHANT);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.CATEGORY);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.TAG);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
 
             // From/To columns should not exist in expense report view
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.FROM]).toBeUndefined();
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TO]).toBeUndefined();
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.FROM);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.TO);
         });
 
         test('Should handle modifiedMerchant and empty category/tag values correctly', () => {
@@ -3006,13 +2986,13 @@ describe('SearchUIUtils', () => {
             const columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [testTransaction], [], false);
 
             // Should show merchant column because modifiedMerchant has value
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(true);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.MERCHANT);
 
             // Should not show category column because 'Uncategorized' is an empty value
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(false);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.CATEGORY);
 
             // Should not show tag column because it's the empty tag value
-            expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(false);
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.TAG);
         });
     });
 

From b7857af818e36db748210e4bb32a070594c2053c Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 18 Dec 2025 09:34:48 -0700
Subject: [PATCH 15/20] fix conflict resolution

---
 src/pages/Search/SearchColumnsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 9cf44d5cdb64b..304b5e7a4dbf4 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -169,7 +169,7 @@ function SearchColumnsPage() {
             includeSafeAreaPaddingBottom
         >
             <HeaderWithBackButton title={translate('search.columns')}>
-                {!isDefaultColumns && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
+                {!isDefaultState && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
             </HeaderWithBackButton>
             <View style={styles.flex1}>
                 <DraggableList

From d14e936ce565a95e16c8fd80f7fd2ebb7be507b2 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 18 Dec 2025 09:38:33 -0700
Subject: [PATCH 16/20] address comments

---
 src/pages/Search/SearchColumnsPage.tsx | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 304b5e7a4dbf4..079bf689d7a5a 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -23,6 +23,11 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 
+type ColumnItem = {
+    columnId: SearchCustomColumnIds;
+    isSelected: boolean;
+};
+
 function SearchColumnsPage() {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -38,11 +43,6 @@ function SearchColumnsPage() {
     // Columns that cannot be deselected (always required)
     const requiredColumns = new Set<SearchCustomColumnIds>([CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
 
-    type ColumnItem = {
-        columnId: SearchCustomColumnIds;
-        isSelected: boolean;
-    };
-
     const [columns, setColumns] = useState<ColumnItem[]>(() => {
         const savedColumnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => allCustomColumns.includes(columnId)) ?? [];
 
@@ -91,7 +91,7 @@ function SearchColumnsPage() {
             text: translate(getSearchColumnTranslationKey(columnId)),
             value: columnId,
             keyForList: columnId,
-            isSelected: isRequired ? true : isSelected,
+            isSelected: isRequired || isSelected,
             isDisabled: isRequired,
             leftElement: (
                 <Icon
@@ -127,14 +127,7 @@ function SearchColumnsPage() {
         setColumns(data.map((item) => ({columnId: item.value, isSelected: item.isSelected})));
     };
 
-    const resetColumns = () => {
-        setColumns(
-            allCustomColumns.map((columnId) => ({
-                columnId,
-                isSelected: defaultCustomColumns.includes(columnId),
-            })),
-        );
-    };
+    const resetColumns = () => setColumns(defaultColumns);
 
     const applyChanges = () => {
         if (!selectedColumnIds.length) {

From 1450328feca934378637d750f711c01ec57e413a Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 18 Dec 2025 09:43:48 -0700
Subject: [PATCH 17/20] address comments, fix groups

---
 src/components/DraggableList/SortableItem.tsx |  6 +-
 src/components/DraggableList/index.tsx        |  3 +
 src/components/DraggableList/types.ts         |  2 +
 .../Search/TransactionGroupListExpanded.tsx   |  1 +
 src/libs/SearchUIUtils.ts                     | 44 ++++-----
 src/pages/Search/SearchColumnsPage.tsx        | 95 ++++++++++++-------
 6 files changed, 90 insertions(+), 61 deletions(-)

diff --git a/src/components/DraggableList/SortableItem.tsx b/src/components/DraggableList/SortableItem.tsx
index e3ea9b9c263d8..91c8e4f8d7401 100644
--- a/src/components/DraggableList/SortableItem.tsx
+++ b/src/components/DraggableList/SortableItem.tsx
@@ -3,8 +3,8 @@ import {CSS} from '@dnd-kit/utilities';
 import React from 'react';
 import type {SortableItemProps} from './types';
 
-function SortableItem({id, children}: SortableItemProps) {
-    const {attributes, listeners, setNodeRef, transform, transition} = useSortable({id});
+function SortableItem({id, children, disabled = false}: SortableItemProps) {
+    const {attributes, listeners, setNodeRef, transform, transition} = useSortable({id, disabled});
 
     const style = {
         touchAction: 'none',
@@ -19,7 +19,7 @@ function SortableItem({id, children}: SortableItemProps) {
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...attributes}
             // eslint-disable-next-line react/jsx-props-no-spreading
-            {...listeners}
+            {...(disabled ? {} : listeners)}
         >
             {children}
         </div>
diff --git a/src/components/DraggableList/index.tsx b/src/components/DraggableList/index.tsx
index 570cccdc4521f..a3e6f8d57c399 100644
--- a/src/components/DraggableList/index.tsx
+++ b/src/components/DraggableList/index.tsx
@@ -50,10 +50,13 @@ function DraggableList<T>({
 
     const sortableItems = data.map((item, index) => {
         const key = keyExtractor(item, index);
+        // Check if item has a disabled property for dragging
+        const isDisabled = typeof item === 'object' && item !== null && 'isDragDisabled' in item ? !!(item as {isDragDisabled?: boolean}).isDragDisabled : false;
         return (
             <SortableItem
                 id={key}
                 key={key}
+                disabled={isDisabled}
             >
                 {renderItem({
                     item,
diff --git a/src/components/DraggableList/types.ts b/src/components/DraggableList/types.ts
index 722f9c108b1e5..b2a0f25b80fb6 100644
--- a/src/components/DraggableList/types.ts
+++ b/src/components/DraggableList/types.ts
@@ -26,6 +26,8 @@ type DraggableListProps<T> = {
 type SortableItemProps = {
     id: string | number;
     children: React.ReactNode | React.ReactNode[];
+    /** Whether dragging is disabled for this item */
+    disabled?: boolean;
 };
 
 export default DraggableListProps;
diff --git a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
index c8885095fb686..326abc9b827b1 100644
--- a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
+++ b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
@@ -1,5 +1,6 @@
 import React, {useCallback, useContext, useMemo} from 'react';
 import {View} from 'react-native';
+import ScrollView from '@components/ScrollView';
 import ActivityIndicator from '@components/ActivityIndicator';
 import Button from '@components/Button';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 2d7d89e3978c0..f65c274bd27e0 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2996,31 +2996,31 @@ function getColumnsToShow(
     if (!isExpenseReportView && groupBy) {
         switch (groupBy) {
             case CONST.SEARCH.GROUP_BY.FROM:
-                return {
-                    [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.FROM]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.EXPENSES]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
-                };
+                return [
+                    CONST.SEARCH.TABLE_COLUMNS.AVATAR,
+                    CONST.SEARCH.TABLE_COLUMNS.FROM,
+                    CONST.SEARCH.TABLE_COLUMNS.EXPENSES,
+                    CONST.SEARCH.TABLE_COLUMNS.TOTAL,
+                ];
             case CONST.SEARCH.GROUP_BY.CARD:
-                return {
-                    [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.CARD]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.FEED]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.EXPENSES]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
-                };
+                return [
+                    CONST.SEARCH.TABLE_COLUMNS.AVATAR,
+                    CONST.SEARCH.TABLE_COLUMNS.CARD,
+                    CONST.SEARCH.TABLE_COLUMNS.FEED,
+                    CONST.SEARCH.TABLE_COLUMNS.EXPENSES,
+                    CONST.SEARCH.TABLE_COLUMNS.TOTAL,
+                ];
             case CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID:
-                return {
-                    [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.BANK_ACCOUNT]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.WITHDRAWN]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.WITHDRAWAL_ID]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.EXPENSES]: true,
-                    [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
-                };
+                return [
+                    CONST.SEARCH.TABLE_COLUMNS.AVATAR,
+                    CONST.SEARCH.TABLE_COLUMNS.BANK_ACCOUNT,
+                    CONST.SEARCH.TABLE_COLUMNS.WITHDRAWN,
+                    CONST.SEARCH.TABLE_COLUMNS.WITHDRAWAL_ID,
+                    CONST.SEARCH.TABLE_COLUMNS.EXPENSES,
+                    CONST.SEARCH.TABLE_COLUMNS.TOTAL,
+                ];
             default:
-                return {};
+                return [];
         }
     }
 
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 079bf689d7a5a..cabf52c111550 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -32,7 +32,7 @@ function SearchColumnsPage() {
     const theme = useTheme();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['DragHandles']);
-    const {translate} = useLocalize();
+    const {translate, localeCompare} = useLocalize();
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
 
@@ -43,70 +43,69 @@ function SearchColumnsPage() {
     // Columns that cannot be deselected (always required)
     const requiredColumns = new Set<SearchCustomColumnIds>([CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
 
+    // Helper function to sort columns: selected at top (in order), unselected at bottom (alphabetically)
+    const sortColumns = (columnsToSort: ColumnItem[]): ColumnItem[] => {
+        const selected = columnsToSort.filter((col) => col.isSelected);
+        const unselected = columnsToSort
+            .filter((col) => !col.isSelected)
+            .sort((a, b) => {
+                const textA = translate(getSearchColumnTranslationKey(a.columnId));
+                const textB = translate(getSearchColumnTranslationKey(b.columnId));
+                return localeCompare(textA, textB);
+            });
+        return [...selected, ...unselected];
+    };
+
     const [columns, setColumns] = useState<ColumnItem[]>(() => {
         const savedColumnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => allCustomColumns.includes(columnId)) ?? [];
 
         // If no saved columns, use default order and selection
         if (!savedColumnIds.length) {
-            return allCustomColumns.map((columnId) => ({
+            const initialColumns = allCustomColumns.map((columnId) => ({
                 columnId,
                 isSelected: defaultCustomColumns.includes(columnId),
             }));
+            return sortColumns(initialColumns);
         }
 
-        // Build the list: start with default order, but place selected columns in saved order
-        // Selected columns appear in their saved order positions, unselected stay in default order
-        const unselectedColumns = allCustomColumns.filter((columnId) => !savedColumnIds.includes(columnId));
-        const result: ColumnItem[] = [];
-        let savedIndex = 0;
-        let unselectedIndex = 0;
-
-        // Go through default order and reconstruct the list
-        for (const columnId of allCustomColumns) {
-            if (savedColumnIds.includes(columnId)) {
-                // This position had a selected column - use the next saved column in order
-                result.push({
-                    columnId: savedColumnIds.at(savedIndex) ?? columnId,
-                    isSelected: true,
-                });
-                savedIndex++;
-            } else {
-                // This position has an unselected column - keep it
-                result.push({
-                    columnId: unselectedColumns.at(unselectedIndex) ?? columnId,
-                    isSelected: false,
-                });
-                unselectedIndex++;
-            }
-        }
+        // Build columns with saved selection state, maintaining saved order for selected items
+        const selected = savedColumnIds.map((columnId) => ({columnId, isSelected: true}));
+        const unselected = allCustomColumns
+            .filter((columnId) => !savedColumnIds.includes(columnId))
+            .map((columnId) => ({columnId, isSelected: false}));
 
-        return result;
+        return sortColumns([...selected, ...unselected]);
     });
 
     const selectedColumnIds = columns.filter((col) => col.isSelected).map((col) => col.columnId);
 
     const columnsList = columns.map(({columnId, isSelected}) => {
         const isRequired = requiredColumns.has(columnId);
+        const isEffectivelySelected = isRequired || isSelected;
+        const isDragDisabled = !isEffectivelySelected;
         return {
             text: translate(getSearchColumnTranslationKey(columnId)),
             value: columnId,
             keyForList: columnId,
-            isSelected: isRequired || isSelected,
+            isSelected: isEffectivelySelected,
             isDisabled: isRequired,
+            isDragDisabled,
             leftElement: (
                 <Icon
                     src={icons.DragHandles}
                     fill={theme.icon}
-                    additionalStyles={styles.mr3}
+                    additionalStyles={[styles.mr3, isDragDisabled && styles.opacitySemiTransparent]}
                 />
             ),
         };
     });
 
-    const defaultColumns = allCustomColumns.map((columnId) => ({
-        columnId,
-        isSelected: defaultCustomColumns.includes(columnId),
-    }));
+    const defaultColumns = sortColumns(
+        allCustomColumns.map((columnId) => ({
+            columnId,
+            isSelected: defaultCustomColumns.includes(columnId),
+        })),
+    );
 
     const isDefaultState =
         columns.length === defaultColumns.length &&
@@ -120,11 +119,35 @@ function SearchColumnsPage() {
             return;
         }
 
-        setColumns(columns.map((col) => (col.columnId === updatedColumnId ? {...col, isSelected: !col.isSelected} : col)));
+        setColumns((prevColumns) => {
+            const columnToUpdate = prevColumns.find((col) => col.columnId === updatedColumnId);
+            if (!columnToUpdate) {
+                return prevColumns;
+            }
+
+            const newIsSelected = !columnToUpdate.isSelected;
+
+            if (newIsSelected) {
+                // When selecting an unselected column, move it to the bottom of selected columns
+                const selected = prevColumns.filter((col) => col.isSelected);
+                const unselected = prevColumns.filter((col) => !col.isSelected && col.columnId !== updatedColumnId);
+                const unselectedSorted = unselected.sort((a, b) => {
+                    const textA = translate(getSearchColumnTranslationKey(a.columnId));
+                    const textB = translate(getSearchColumnTranslationKey(b.columnId));
+                    return localeCompare(textA, textB);
+                });
+                return [...selected, {columnId: updatedColumnId, isSelected: true}, ...unselectedSorted];
+            }
+            // When deselecting, update and re-sort
+            const updatedColumns = prevColumns.map((col) => (col.columnId === updatedColumnId ? {...col, isSelected: false} : col));
+            return sortColumns(updatedColumns);
+        });
     };
 
     const onDragEnd = ({data}: {data: typeof columnsList}) => {
-        setColumns(data.map((item) => ({columnId: item.value, isSelected: item.isSelected})));
+        // Only allow reordering within selected columns - maintain selected/unselected separation
+        const newColumns = data.map((item) => ({columnId: item.value, isSelected: item.isSelected}));
+        setColumns(sortColumns(newColumns));
     };
 
     const resetColumns = () => setColumns(defaultColumns);

From 24f96ca9e8a3777d2a1ba67a6dbd1c30218f3cea Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 18 Dec 2025 09:55:12 -0700
Subject: [PATCH 18/20] clean up comments

---
 .../Search/TransactionGroupListExpanded.tsx            |  2 +-
 src/libs/SearchUIUtils.ts                              |  7 +------
 src/pages/Search/SearchColumnsPage.tsx                 | 10 ++--------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
index 326abc9b827b1..7bd6344f44387 100644
--- a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
+++ b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
@@ -1,10 +1,10 @@
 import React, {useCallback, useContext, useMemo} from 'react';
 import {View} from 'react-native';
-import ScrollView from '@components/ScrollView';
 import ActivityIndicator from '@components/ActivityIndicator';
 import Button from '@components/Button';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
+import ScrollView from '@components/ScrollView';
 import SearchTableHeader, {getExpenseHeaders} from '@components/SelectionListWithSections/SearchTableHeader';
 import type {ListItem, TransactionGroupListExpandedProps, TransactionListItemType} from '@components/SelectionListWithSections/types';
 import Text from '@components/Text';
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index f65c274bd27e0..3f2d390791c4d 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2996,12 +2996,7 @@ function getColumnsToShow(
     if (!isExpenseReportView && groupBy) {
         switch (groupBy) {
             case CONST.SEARCH.GROUP_BY.FROM:
-                return [
-                    CONST.SEARCH.TABLE_COLUMNS.AVATAR,
-                    CONST.SEARCH.TABLE_COLUMNS.FROM,
-                    CONST.SEARCH.TABLE_COLUMNS.EXPENSES,
-                    CONST.SEARCH.TABLE_COLUMNS.TOTAL,
-                ];
+                return [CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.FROM, CONST.SEARCH.TABLE_COLUMNS.EXPENSES, CONST.SEARCH.TABLE_COLUMNS.TOTAL];
             case CONST.SEARCH.GROUP_BY.CARD:
                 return [
                     CONST.SEARCH.TABLE_COLUMNS.AVATAR,
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index cabf52c111550..382b4c9c35956 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -40,10 +40,9 @@ function SearchColumnsPage() {
     const allCustomColumns = getCustomColumns(queryType);
     const defaultCustomColumns = getCustomColumnDefault(queryType);
 
-    // Columns that cannot be deselected (always required)
+    // We need at least one element with flex1 in the table to ensure the table looks good in the UI, so we don't allow removing the total columns since it makes sense for them to show up in an expense management App and it fixes the layout issues.
     const requiredColumns = new Set<SearchCustomColumnIds>([CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
 
-    // Helper function to sort columns: selected at top (in order), unselected at bottom (alphabetically)
     const sortColumns = (columnsToSort: ColumnItem[]): ColumnItem[] => {
         const selected = columnsToSort.filter((col) => col.isSelected);
         const unselected = columnsToSort
@@ -59,7 +58,6 @@ function SearchColumnsPage() {
     const [columns, setColumns] = useState<ColumnItem[]>(() => {
         const savedColumnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => allCustomColumns.includes(columnId)) ?? [];
 
-        // If no saved columns, use default order and selection
         if (!savedColumnIds.length) {
             const initialColumns = allCustomColumns.map((columnId) => ({
                 columnId,
@@ -68,7 +66,6 @@ function SearchColumnsPage() {
             return sortColumns(initialColumns);
         }
 
-        // Build columns with saved selection state, maintaining saved order for selected items
         const selected = savedColumnIds.map((columnId) => ({columnId, isSelected: true}));
         const unselected = allCustomColumns
             .filter((columnId) => !savedColumnIds.includes(columnId))
@@ -114,7 +111,6 @@ function SearchColumnsPage() {
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;
 
-        // Don't allow toggling required columns
         if (requiredColumns.has(updatedColumnId)) {
             return;
         }
@@ -128,7 +124,6 @@ function SearchColumnsPage() {
             const newIsSelected = !columnToUpdate.isSelected;
 
             if (newIsSelected) {
-                // When selecting an unselected column, move it to the bottom of selected columns
                 const selected = prevColumns.filter((col) => col.isSelected);
                 const unselected = prevColumns.filter((col) => !col.isSelected && col.columnId !== updatedColumnId);
                 const unselectedSorted = unselected.sort((a, b) => {
@@ -138,14 +133,13 @@ function SearchColumnsPage() {
                 });
                 return [...selected, {columnId: updatedColumnId, isSelected: true}, ...unselectedSorted];
             }
-            // When deselecting, update and re-sort
+
             const updatedColumns = prevColumns.map((col) => (col.columnId === updatedColumnId ? {...col, isSelected: false} : col));
             return sortColumns(updatedColumns);
         });
     };
 
     const onDragEnd = ({data}: {data: typeof columnsList}) => {
-        // Only allow reordering within selected columns - maintain selected/unselected separation
         const newColumns = data.map((item) => ({columnId: item.value, isSelected: item.isSelected}));
         setColumns(sortColumns(newColumns));
     };

From c89c2e106dc99b51bd922c35dd471802eb795a97 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 18 Dec 2025 09:59:52 -0700
Subject: [PATCH 19/20] fix prettier

---
 src/pages/Search/SearchColumnsPage.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 382b4c9c35956..902cf361ec754 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -67,9 +67,7 @@ function SearchColumnsPage() {
         }
 
         const selected = savedColumnIds.map((columnId) => ({columnId, isSelected: true}));
-        const unselected = allCustomColumns
-            .filter((columnId) => !savedColumnIds.includes(columnId))
-            .map((columnId) => ({columnId, isSelected: false}));
+        const unselected = allCustomColumns.filter((columnId) => !savedColumnIds.includes(columnId)).map((columnId) => ({columnId, isSelected: false}));
 
         return sortColumns([...selected, ...unselected]);
     });

From 8642093b13ec75ded48603825c74273fde6fec1b Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 18 Dec 2025 10:41:20 -0700
Subject: [PATCH 20/20] add disabled cursor

---
 src/pages/Search/SearchColumnsPage.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 902cf361ec754..08f920343a216 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -86,11 +86,13 @@ function SearchColumnsPage() {
             isDisabled: isRequired,
             isDragDisabled,
             leftElement: (
-                <Icon
-                    src={icons.DragHandles}
-                    fill={theme.icon}
-                    additionalStyles={[styles.mr3, isDragDisabled && styles.opacitySemiTransparent]}
-                />
+                <View style={[styles.mr3, isDragDisabled && styles.cursorDisabled]}>
+                    <Icon
+                        src={icons.DragHandles}
+                        fill={theme.icon}
+                        additionalStyles={isDragDisabled && styles.opacitySemiTransparent}
+                    />
+                </View>
             ),
         };
     });