diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index 21416588f472..3315559894c4 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -102,14 +102,16 @@ type SelectionScreenProps<T = string> = {
     /** Whether to show the text input */
     shouldShowTextInput?: boolean;
 
-    /** Label for the text input */
-    textInputLabel?: string;
+    textInputOptions?: {
+        /** Label for the text input */
+        label?: string;
 
-    /** Value for the text input */
-    textInputValue?: string;
+        /** Value for the text input */
+        value?: string;
 
-    /** Callback to fire when the text input changes */
-    onChangeText?: (text: string) => void;
+        /** Callback to fire when the text input changes */
+        onChangeText?: (text: string) => void;
+    };
 };
 
 function SelectionScreen<T = string>({
@@ -135,10 +137,8 @@ function SelectionScreen<T = string>({
     onClose,
     shouldSingleExecuteRowSelect,
     headerTitleAlreadyTranslated,
-    textInputLabel,
-    textInputValue,
-    onChangeText,
     shouldShowTextInput,
+    textInputOptions,
     shouldUpdateFocusedIndex = false,
 }: SelectionScreenProps<T>) {
     const {translate} = useLocalize();
@@ -147,12 +147,6 @@ function SelectionScreen<T = string>({
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: false});
     const isConnectionEmpty = isEmpty(policy?.connections?.[connectionName]);
 
-    const textInputOptions = {
-        onChangeText,
-        textInputLabel,
-        textInputValue,
-    };
-
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardAccountSelectCardPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardAccountSelectCardPage.tsx
index b67c1df6bf92..ab246a1d3108 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardAccountSelectCardPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardAccountSelectCardPage.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useMemo, useState} from 'react';
+import React, {useMemo, useState} from 'react';
 import {View} from 'react-native';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import RenderHTML from '@components/RenderHTML';
@@ -60,33 +60,27 @@ function WorkspaceCompanyCardAccountSelectCardPage({route}: WorkspaceCompanyCard
         return tokenizedSearch(exportMenuItem?.data ?? [], searchText, (option) => [option.value]);
     }, [exportMenuItem?.data, searchText]);
 
-    const listEmptyContent = useMemo(
-        () => (
-            <BlockingView
-                icon={illustrations.Telescope}
-                iconWidth={variables.emptyListIconWidth}
-                iconHeight={variables.emptyListIconHeight}
-                title={translate('workspace.moreFeatures.companyCards.noAccountsFound')}
-                subtitle={currentConnectionName ? translate('workspace.moreFeatures.companyCards.noAccountsFoundDescription', currentConnectionName) : undefined}
-                containerStyle={styles.pb10}
-            />
-        ),
-        [translate, currentConnectionName, styles, illustrations.Telescope],
+    const listEmptyContent = (
+        <BlockingView
+            icon={illustrations.Telescope}
+            iconWidth={variables.emptyListIconWidth}
+            iconHeight={variables.emptyListIconHeight}
+            title={translate('workspace.moreFeatures.companyCards.noAccountsFound')}
+            subtitle={currentConnectionName ? translate('workspace.moreFeatures.companyCards.noAccountsFoundDescription', currentConnectionName) : undefined}
+            containerStyle={styles.pb10}
+        />
     );
 
-    const updateExportAccount = useCallback(
-        ({value}: SelectorType) => {
-            if (!exportMenuItem?.exportType) {
-                return;
-            }
-            const isDefaultSelected = value === defaultCard || value === defaultVendor;
-            const exportValue = isDefaultSelected ? CONST.COMPANY_CARDS.DEFAULT_EXPORT_TYPE : value;
-            setCompanyCardExportAccount(policyID, domainOrWorkspaceAccountID, cardID, exportMenuItem.exportType, exportValue, getCompanyCardFeed(feed));
+    const updateExportAccount = ({value}: SelectorType) => {
+        if (!exportMenuItem?.exportType) {
+            return;
+        }
+        const isDefaultSelected = value === defaultCard || value === defaultVendor;
+        const exportValue = isDefaultSelected ? CONST.COMPANY_CARDS.DEFAULT_EXPORT_TYPE : value;
+        setCompanyCardExportAccount(policyID, domainOrWorkspaceAccountID, cardID, exportMenuItem.exportType, exportValue, getCompanyCardFeed(feed));
 
-            Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARD_DETAILS.getRoute(policyID, feed, cardID, backTo));
-        },
-        [exportMenuItem?.exportType, domainOrWorkspaceAccountID, cardID, policyID, feed, defaultCard, defaultVendor, backTo],
-    );
+        Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARD_DETAILS.getRoute(policyID, feed, cardID, backTo));
+    };
 
     return (
         <SelectionScreen
@@ -113,9 +107,11 @@ function WorkspaceCompanyCardAccountSelectCardPage({route}: WorkspaceCompanyCard
             displayName="WorkspaceCompanyCardAccountSelectCardPage"
             data={searchedListOptions ?? []}
             listItem={RadioListItem}
-            textInputLabel={translate('common.search')}
-            textInputValue={searchText}
-            onChangeText={setSearchText}
+            textInputOptions={{
+                label: translate('common.search'),
+                value: searchText,
+                onChangeText: setSearchText,
+            }}
             onSelectRow={updateExportAccount}
             initiallyFocusedOptionKey={exportMenuItem?.data?.find((mode) => mode.isSelected)?.keyForList}
             onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARD_DETAILS.getRoute(policyID, feed, cardID, backTo))}