Merge pull request #9714 from Expensify/Rory-FixOptionSelectorCrash

Fix OptionsSelector crash (cherry picked from commit e45ef30)
Expensify · Jul 5, 2022 · ec2c375 · ec2c375
1 parent 4c0c7f0
commit ec2c375
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/components/OptionsSelector.js b/src/components/OptionsSelector.js
@@ -229,12 +229,12 @@ class OptionsSelector extends Component {
         this.setState({
             allOptions: newOptions,
             focusedIndex: newFocusedIndex,
+        }, () => {
+            if (this.state.allOptions.length <= this.state.focusedIndex) {
+                return;
+            }
+            this.scrollToIndex(this.state.focusedIndex);
         });
-
-        if (newOptions.length <= newFocusedIndex) {
-            return;
-        }
-        this.scrollToIndex(newFocusedIndex);
     }
 
     componentWillUnmount() {