fix: App is crashing when the label is added first time (#738)

chatwoot · Sep 19, 2023 · b0de7eb · b0de7eb
1 parent 6cf5304
commit b0de7eb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/screens/ChatScreen/components/ConversationLabels.js b/src/screens/ChatScreen/components/ConversationLabels.js
@@ -135,7 +135,7 @@ const ConversationLabels = ({ colors, conversationDetails }) => {
     if (conversationSavedLabels?.includes(label.title)) {
       return false;
     }
-    return label.title.toLowerCase().includes(search.toLowerCase());
+    return label.title.toLowerCase()?.includes(search.toLowerCase());
   });
 
   const createLabelEvent = () => {

diff --git a/src/screens/Conversation/components/ConversationItem/CardLabels.js b/src/screens/Conversation/components/ConversationItem/CardLabels.js
@@ -55,7 +55,7 @@ const CardLabel = ({ conversationDetails, conversationId }) => {
   const activeLabels =
     labels && conversationLabels
       ? labels.filter(({ title }) => {
-          return conversationLabels.includes(title);
+          return conversationLabels?.includes(title);
         })
       : [];
 

diff --git a/src/screens/Conversation/components/ConversationItem/ConversationLabels.js b/src/screens/Conversation/components/ConversationItem/ConversationLabels.js
@@ -55,7 +55,7 @@ const ConversationLabel = ({ conversationDetails, conversationId }) => {
   const activeLabels =
     labels && conversationLabels
       ? labels.filter(({ title }) => {
-          return conversationLabels.includes(title);
+          return conversationLabels?.includes(title);
         })
       : [];
 

diff --git a/src/screens/ConversationDetails/components/LabelView.js b/src/screens/ConversationDetails/components/LabelView.js
@@ -67,7 +67,7 @@ const LabelView = ({ conversationDetails, conversationId, openLabelsBottomSheet
   const activeLabels =
     labels && savedLabels
       ? labels.filter(({ title }) => {
-          return savedLabels.includes(title);
+          return savedLabels?.includes(title);
         })
       : [];