From a935e91ba006543d3406d4f915224fc09374d514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Pr=C3=B6schel?= <chris@airy.co>
Date: Tue, 23 Feb 2021 11:26:30 +0100
Subject: [PATCH] Fix tag id creation crash

---
 .../src/pages/Inbox/Messenger/ConversationMetadata/index.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx b/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
index ce01be57ba..99206ff3c1 100644
--- a/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
+++ b/frontend/ui/src/pages/Inbox/Messenger/ConversationMetadata/index.tsx
@@ -59,11 +59,11 @@ const ConversationMetadata = (props: ConnectedProps<typeof connector>) => {
   };
 
   const filterForUnusedTags = (tags: TagModel[]): TagModel[] => {
-    return tags.filter(tag => !(tag.id in conversation.metadata.tags));
+    return tags.filter(tag => !(tag.id in (conversation.metadata.tags || {})));
   };
 
   const filterForUsedTags = (tags: TagModel[]): TagModel[] => {
-    return tags.filter(tag => tag.id in conversation.metadata.tags);
+    return tags.filter(tag => tag.id in (conversation.metadata.tags || {}));
   };
 
   const tagSorter = (tagA: TagModel, tagB: TagModel) => {