Merge pull request #27350 from rezkiy37/fix/27341-split-bill-select-row

[CP Staging] Fix OptionRow selection condition (cherry picked from commit e884a5a)
Expensify · Sep 14, 2023 · db7841d · db7841d
1 parent e3d0752
commit db7841d
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js
@@ -170,14 +170,26 @@ function BaseOptionsList({
      */
     const renderItem = ({item, index, section}) => {
         const isItemDisabled = isDisabled || section.isDisabled || !!item.isDisabled;
+        const isSelected = _.some(selectedOptions, (option) => {
+            if (option.accountID === item.accountID) {
+                return true;
+            }
+
+            if (_.isEmpty(option.name)) {
+                return false;
+            }
+
+            return option.name === item.searchText;
+        });
+
         return (
             <OptionRow
                 option={item}
                 showTitleTooltip={showTitleTooltip}
                 hoverStyle={optionHoveredStyle}
                 optionIsFocused={!disableFocusOptions && !isItemDisabled && focusedIndex === index + section.indexOffset}
                 onSelectRow={onSelectRow}
-                isSelected={Boolean(_.find(selectedOptions, (option) => option.accountID === item.accountID || option.name === item.searchText))}
+                isSelected={isSelected}
                 showSelectedState={canSelectMultipleOptions}
                 highlightSelected={highlightSelectedOptions}
                 boldStyle={boldStyle}