From 72c9414993ee7fbc5a5a6663a0b630addac5a81b Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Tue, 11 Aug 2020 13:09:50 -0400
Subject: [PATCH] MM-27607 Fix filter undefined when searching profiles (#4657)
 (#4659)

(cherry picked from commit b001c50fdc558a90254f990b6b2b61f69e4a9ebb)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
---
 .../channel_add_members/channel_add_members.js |  6 +++++-
 app/screens/channel_members/channel_members.js |  6 +++++-
 app/screens/more_dms/more_dms.js               | 18 +++++++++++-------
 app/screens/selector_screen/selector_screen.js |  6 +++++-
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/screens/channel_add_members/channel_add_members.js b/app/screens/channel_add_members/channel_add_members.js
index 99cadb774..afa1110ba 100644
--- a/app/screens/channel_add_members/channel_add_members.js
+++ b/app/screens/channel_add_members/channel_add_members.js
@@ -276,7 +276,11 @@ export default class ChannelAddMembers extends PureComponent {
         const options = {not_in_channel_id: currentChannelId, team_id: currentTeamId, group_constrained: currentChannelGroupConstrained};
         this.setState({loading: true});
 
-        actions.searchProfiles(term.toLowerCase(), options).then(({data}) => {
+        actions.searchProfiles(term.toLowerCase(), options).then((results) => {
+            let data = [];
+            if (results.data) {
+                data = results.data;
+            }
             this.setState({searchResults: data, loading: false});
         });
     };
diff --git a/app/screens/channel_members/channel_members.js b/app/screens/channel_members/channel_members.js
index 12ba33a50..e02d68896 100644
--- a/app/screens/channel_members/channel_members.js
+++ b/app/screens/channel_members/channel_members.js
@@ -307,7 +307,11 @@ export default class ChannelMembers extends PureComponent {
         const options = {in_channel_id: currentChannelId};
         this.setState({loading: true});
 
-        actions.searchProfiles(term.toLowerCase(), options).then(({data}) => {
+        actions.searchProfiles(term.toLowerCase(), options).then((results) => {
+            let data = [];
+            if (results.data) {
+                data = results.data;
+            }
             this.setState({searchResults: data, loading: false});
         });
     };
diff --git a/app/screens/more_dms/more_dms.js b/app/screens/more_dms/more_dms.js
index 2aed8093e..290bb2421 100644
--- a/app/screens/more_dms/more_dms.js
+++ b/app/screens/more_dms/more_dms.js
@@ -279,20 +279,24 @@ export default class MoreDirectMessages extends PureComponent {
         }
     };
 
-    searchProfiles = (term) => {
+    searchProfiles = async (term) => {
         const lowerCasedTerm = term.toLowerCase();
         const {actions, currentTeamId, restrictDirectMessage} = this.props;
         this.setState({loading: true});
+        let results;
 
         if (restrictDirectMessage) {
-            actions.searchProfiles(lowerCasedTerm).then(({data}) => {
-                this.setState({searchResults: data, loading: false});
-            });
+            results = await actions.searchProfiles(lowerCasedTerm);
         } else {
-            actions.searchProfiles(lowerCasedTerm, {team_id: currentTeamId}).then(({data}) => {
-                this.setState({searchResults: data, loading: false});
-            });
+            results = await actions.searchProfiles(lowerCasedTerm, {team_id: currentTeamId});
         }
+
+        let data = [];
+        if (results.data) {
+            data = results.data;
+        }
+
+        this.setState({searchResults: data, loading: false});
     };
 
     startConversation = async (selectedId) => {
diff --git a/app/screens/selector_screen/selector_screen.js b/app/screens/selector_screen/selector_screen.js
index 3d3f7eed1..d919294d9 100644
--- a/app/screens/selector_screen/selector_screen.js
+++ b/app/screens/selector_screen/selector_screen.js
@@ -215,7 +215,11 @@ export default class SelectorScreen extends PureComponent {
         const {actions} = this.props;
         this.setState({loading: true});
 
-        actions.searchProfiles(term.toLowerCase()).then(({data}) => {
+        actions.searchProfiles(term.toLowerCase()).then((results) => {
+            let data = [];
+            if (results.data) {
+                data = results.data;
+            }
             this.setState({searchResults: data, loading: false});
         });
     };