From 7939340c146770d8a08d8ef4edb9c2fd4f7ee6c1 Mon Sep 17 00:00:00 2001 From: Olgierd Date: Thu, 16 Oct 2025 08:22:26 +0200 Subject: [PATCH 1/4] Make NetSuiteCustomFieldMappingPicker use new SelectionList --- .../NetSuiteCustomFieldMappingPicker.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx index 82abf00eda97..9f78167f059a 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx @@ -1,8 +1,8 @@ import React from 'react'; import {View} from 'react-native'; import FormHelpMessage from '@components/FormHelpMessage'; -import SelectionList from '@components/SelectionListWithSections'; -import RadioListItem from '@components/SelectionListWithSections/RadioListItem'; +import SelectionList from '@components/SelectionList'; +import RadioListItem from '@components/SelectionList/ListItem/RadioListItem'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import CONST from '@src/CONST'; @@ -36,12 +36,12 @@ function NetSuiteCustomFieldMappingPicker({value, errorText, onInputChange}: Net return ( <> { onInputChange?.(selected.value); }} ListItem={RadioListItem} - initiallyFocusedOptionKey={value ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG} + initiallyFocusedItemKey={value ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG} shouldSingleExecuteRowSelect shouldUpdateFocusedIndex /> From d00c003c50fcaa2aa5549b8834561ba15eec6e4a Mon Sep 17 00:00:00 2001 From: Olgierd Date: Thu, 16 Oct 2025 14:35:25 +0200 Subject: [PATCH 2/4] Fix the bug with navigating back to ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW --- .../netsuite/import/NetSuiteImportCustomFieldEdit.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx index 1b26beb09870..d9ba14529947 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx @@ -91,7 +91,7 @@ function NetSuiteImportCustomFieldEdit({ } } - Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW.getRoute(policyID, importCustomField, valueIndex)); + Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW.getRoute(policyID, importCustomField, valueIndex)); }, [allRecords, customField, fieldName, importCustomField, policyID, valueIndex], ); From 69efb4497a87bd7d266c14be9d4344ce62b1d50f Mon Sep 17 00:00:00 2001 From: Olgierd Date: Thu, 16 Oct 2025 16:52:01 +0200 Subject: [PATCH 3/4] Delete unnecessary shouldUpdateFocusedIndex prop from SelectionList in NetSuiteCustomFieldMappingPicker --- .../NetSuiteCustomFieldMappingPicker.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx index 9f78167f059a..fb1c74f69128 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx @@ -43,7 +43,6 @@ function NetSuiteCustomFieldMappingPicker({value, errorText, onInputChange}: Net ListItem={RadioListItem} initiallyFocusedItemKey={value ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG} shouldSingleExecuteRowSelect - shouldUpdateFocusedIndex /> {!!errorText && ( From 4df870f67738b0d964a9c6179467de203303e966 Mon Sep 17 00:00:00 2001 From: Olgierd Date: Thu, 30 Oct 2025 11:46:58 +0100 Subject: [PATCH 4/4] Bring back the shouldUpdateFocusedIndex prop --- .../NetSuiteCustomFieldMappingPicker.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx index fb1c74f69128..9f78167f059a 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx @@ -43,6 +43,7 @@ function NetSuiteCustomFieldMappingPicker({value, errorText, onInputChange}: Net ListItem={RadioListItem} initiallyFocusedItemKey={value ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG} shouldSingleExecuteRowSelect + shouldUpdateFocusedIndex /> {!!errorText && (