From 90dcb3f0334c90618a4c3ef423ed0487fcfe67e8 Mon Sep 17 00:00:00 2001 From: Ionatan Wiznia Date: Fri, 20 Jan 2023 14:06:01 -0300 Subject: [PATCH 1/3] Fix currency search --- src/pages/iou/IOUCurrencySelection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js index db6092205f9b..4a650e6d8368 100644 --- a/src/pages/iou/IOUCurrencySelection.js +++ b/src/pages/iou/IOUCurrencySelection.js @@ -88,7 +88,7 @@ class IOUCurrencySelection extends Component { */ changeSearchValue(searchValue) { const currencyOptions = this.getCurrencyOptions(this.props.currencyList); - const searchRegex = new RegExp(searchValue, 'i'); + const searchRegex = new RegExp(searchValue.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'i'); const filteredCurrencies = _.filter(currencyOptions, currencyOption => searchRegex.test(currencyOption.text)); this.setState({ From 6370512b7566571d8ad6f6c55d89a7055c42575c Mon Sep 17 00:00:00 2001 From: Ionatan Wiznia Date: Mon, 23 Jan 2023 18:03:35 -0300 Subject: [PATCH 2/3] Use helper method --- src/pages/iou/IOUCurrencySelection.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js index 4a650e6d8368..647b9379d597 100644 --- a/src/pages/iou/IOUCurrencySelection.js +++ b/src/pages/iou/IOUCurrencySelection.js @@ -2,6 +2,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; +import Str from 'expensify-common/lib/str'; import ONYXKEYS from '../../ONYXKEYS'; import OptionsSelector from '../../components/OptionsSelector'; import Navigation from '../../libs/Navigation/Navigation'; @@ -88,7 +89,7 @@ class IOUCurrencySelection extends Component { */ changeSearchValue(searchValue) { const currencyOptions = this.getCurrencyOptions(this.props.currencyList); - const searchRegex = new RegExp(searchValue.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'i'); + const searchRegex = Str.escapeForRegExp(searchValue); const filteredCurrencies = _.filter(currencyOptions, currencyOption => searchRegex.test(currencyOption.text)); this.setState({ From 73d23d8240c8db4b51809b52bfbd6503c9261f6a Mon Sep 17 00:00:00 2001 From: Ionatan Wiznia Date: Tue, 24 Jan 2023 16:21:32 +0100 Subject: [PATCH 3/3] Update src/pages/iou/IOUCurrencySelection.js Co-authored-by: Eugene Voloshchak --- src/pages/iou/IOUCurrencySelection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js index 647b9379d597..e78cbd48e16f 100644 --- a/src/pages/iou/IOUCurrencySelection.js +++ b/src/pages/iou/IOUCurrencySelection.js @@ -89,7 +89,7 @@ class IOUCurrencySelection extends Component { */ changeSearchValue(searchValue) { const currencyOptions = this.getCurrencyOptions(this.props.currencyList); - const searchRegex = Str.escapeForRegExp(searchValue); + const searchRegex = new RegExp(Str.escapeForRegExp(searchValue), 'i'); const filteredCurrencies = _.filter(currencyOptions, currencyOption => searchRegex.test(currencyOption.text)); this.setState({