diff --git a/android/app/src/main/java/com/thaliapp/MainApplication.java b/android/app/src/main/java/com/thaliapp/MainApplication.java index 6767912649ec0cd70324db47b90c0ae67b29b859..48ef006e58b20375f02d3b4b5af3c545821082c5 100644 --- a/android/app/src/main/java/com/thaliapp/MainApplication.java +++ b/android/app/src/main/java/com/thaliapp/MainApplication.java @@ -15,7 +15,6 @@ import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage; import io.invertase.firebase.instanceid.RNFirebaseInstanceIdPackage; import io.sentry.RNSentryPackage; import com.azendoo.reactnativesnackbar.SnackbarPackage; -import com.i18n.reactnativei18n.ReactNativeI18n; import com.BV.LinearGradient.LinearGradientPackage; import com.oblador.vectoricons.VectorIconsPackage; import com.facebook.react.ReactNativeHost; @@ -44,7 +43,6 @@ public class MainApplication extends Application implements ShareApplication, Re new RNSharePackage(), new RNSentryPackage(), new SnackbarPackage(), - new ReactNativeI18n(), new RNFirebasePackage(), new RNFirebaseMessagingPackage(), new RNFirebaseNotificationsPackage(), diff --git a/app/ui/screens/events/EventAdminScreen.js b/app/ui/screens/events/EventAdminScreen.js index 4475888ccfe2cdc5d979b21ad92c3ab25e518008..562a9785a110c3c3d947d963d078569ede4a78c7 100644 --- a/app/ui/screens/events/EventAdminScreen.js +++ b/app/ui/screens/events/EventAdminScreen.js @@ -6,6 +6,7 @@ import { withTranslation } from 'react-i18next'; import PropTypes from 'prop-types'; import Icon from 'react-native-vector-icons/MaterialIcons'; import Snackbar from 'react-native-snackbar'; +import unorm from 'unorm'; import styles from './style/EventAdminScreen'; import Colors from '../../style/Colors'; @@ -89,9 +90,12 @@ class EventAdminScreen extends Component { return result; }; + cleanSearchTerm = term => unorm.nfd(term.toLowerCase()).replace(/[\u0300-\u036f]/g, ''); + containsSearchKey = (pk) => { - const name = this.state.registrations[pk].name.toLowerCase(); - return name.indexOf(this.state.searchKey.toLowerCase()) >= 0; + const name = this.cleanSearchTerm(this.state.registrations[pk].name); + console.log('name', name); + return name.indexOf(this.cleanSearchTerm(this.state.searchKey)) >= 0; }; handleRefresh = () => { diff --git a/package.json b/package.json index e00fd08f58bcd80275159e05dd890e628c665512..e0f3ff9cf31dbadcdfbb0d608f06f057540cd997 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,8 @@ "react-navigation": "3.11.0", "react-redux": "7.0.3", "redux": "4.0.1", - "redux-saga": "0.16.2" + "redux-saga": "0.16.2", + "unorm": "1.5.0" }, "devDependencies": { "@babel/plugin-proposal-class-properties": "7.4.4", diff --git a/yarn.lock b/yarn.lock index 4397e6a7cfc5cd172be232a87b2dc9f22e514b9d..3402108b80ce4e033697c31b593887a7479aec40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8518,6 +8518,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +unorm@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a" + integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw== + unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"