From 665bb862a85300f7dbf91c945e542935f5335134 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 5 Jul 2018 01:15:21 +0800 Subject: [PATCH] on search success and other user/s are selected already, remove current user first before profile match filtering (#1876) --- app/screens/more_dms/more_dms.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/screens/more_dms/more_dms.js b/app/screens/more_dms/more_dms.js index fda9798e3..b091b88fd 100644 --- a/app/screens/more_dms/more_dms.js +++ b/app/screens/more_dms/more_dms.js @@ -95,10 +95,17 @@ class MoreDirectMessages extends PureComponent { nextProps.getRequest.status === RequestStatus.SUCCESS) { const profiles = this.sliceProfiles(nextProps.profiles); this.setState({profiles, showNoResults: true}); - } else if (this.state.searching && - nextProps.searchRequest.status === RequestStatus.SUCCESS) { + } else if ( + this.state.searching && + nextProps.searchRequest.status === RequestStatus.SUCCESS + ) { + let profiles = nextProps.profiles; + if (this.state.selectedCount > 0) { + profiles = this.removeCurrentUserFromProfiles(profiles); + } + const exactMatches = []; - let results = filterProfilesMatchingTerm(nextProps.profiles, this.state.term).filter((p) => { + const results = filterProfilesMatchingTerm(profiles, this.state.term).filter((p) => { if (p.username === this.state.term || p.username.startsWith(this.state.term)) { exactMatches.push(p); return false; @@ -107,10 +114,6 @@ class MoreDirectMessages extends PureComponent { return true; }); - if (this.state.selectedCount > 0) { - results = this.removeCurrentUserFromProfiles(results); - } - this.setState({profiles: [...exactMatches, ...results], showNoResults: true}); } }