Merge pull request #30958 from namhihi237/fix-29675-selector-hightlight

Expensify · Nov 14, 2023 · 5a00a8f · 5a00a8f
2 parents 5f5fe0d + e4244af
commit 5a00a8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/components/ValuePicker/ValueSelectorModal.js b/src/components/ValuePicker/ValueSelectorModal.js
@@ -12,9 +12,6 @@ const propTypes = {
     /** Whether the modal is visible */
     isVisible: PropTypes.bool.isRequired,
 
-    /** Current value selected  */
-    currentValue: PropTypes.string,
-
     /** Items to pick from */
     items: PropTypes.arrayOf(PropTypes.shape({value: PropTypes.string, label: PropTypes.string})),
 
@@ -32,15 +29,14 @@ const propTypes = {
 };
 
 const defaultProps = {
-    currentValue: '',
     items: [],
     selectedItem: {},
     label: '',
     onClose: () => {},
     onItemSelected: () => {},
 };
 
-function ValueSelectorModal({currentValue, items, selectedItem, label, isVisible, onClose, onItemSelected}) {
+function ValueSelectorModal({items, selectedItem, label, isVisible, onClose, onItemSelected}) {
     const [sectionsData, setSectionsData] = useState([]);
 
     useEffect(() => {
@@ -70,7 +66,7 @@ function ValueSelectorModal({currentValue, items, selectedItem, label, isVisible
                 <SelectionList
                     sections={[{data: sectionsData}]}
                     onSelectRow={onItemSelected}
-                    initiallyFocusedOptionKey={currentValue}
+                    initiallyFocusedOptionKey={selectedItem.value}
                     shouldStopPropagation
                 />
             </ScreenWrapper>

diff --git a/src/components/ValuePicker/index.js b/src/components/ValuePicker/index.js
@@ -80,7 +80,6 @@ function ValuePicker({value, label, items, placeholder, errorText, onInputChange
             </View>
             <ValueSelectorModal
                 isVisible={isPickerVisible}
-                currentValue={selectedLabel || placeholder || ''}
                 label={label}
                 selectedItem={selectedItem}
                 items={items}