Merge pull request #47144 from Krishna2323/krishna2323/issue/46767_2

fix: NetSuite - 'Select existing' invoice item option isn't highlighted when selected.
Expensify · Aug 14, 2024 · d4d5a25 · d4d5a25
2 parents fcf4b4f + 6cf59fe
commit d4d5a25
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
@@ -450,7 +450,7 @@ function BaseSelectionList<TItem extends ListItem>(
                         if (shouldSingleExecuteRowSelect) {
                             singleExecution(() => selectRow(item, index))();
                         } else {
-                            selectRow(item);
+                            selectRow(item, index);
                         }
                     }}
                     onCheckboxPress={handleOnCheckboxPress()}

diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
@@ -90,6 +90,9 @@ type SelectionScreenProps<T = string> = {
 
     /** Used for dynamic header title translation with parameters */
     headerTitleAlreadyTranslated?: string;
+
+    /** Whether to update the focused index on a row select */
+    shouldUpdateFocusedIndex?: boolean;
 };
 
 function SelectionScreen<T = string>({
@@ -114,6 +117,7 @@ function SelectionScreen<T = string>({
     onClose,
     shouldSingleExecuteRowSelect,
     headerTitleAlreadyTranslated,
+    shouldUpdateFocusedIndex = false,
 }: SelectionScreenProps<T>) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -153,6 +157,7 @@ function SelectionScreen<T = string>({
                         listFooterContent={listFooterContent}
                         sectionListStyle={!!sections.length && [styles.flexGrow0]}
                         shouldSingleExecuteRowSelect={shouldSingleExecuteRowSelect}
+                        shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
                     >
                         <ErrorMessageRow
                             errors={errors}

diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
@@ -79,6 +79,7 @@ function NetSuiteInvoiceItemPreferenceSelectPage({policy}: WithPolicyConnections
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldUpdateFocusedIndex
             listFooterContent={
                 config?.invoiceItemPreference === CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.SELECT ? (
                     <OfflineWithFeedback