From 1caac3ca90d731daaf88b3cc8389c443a118088a Mon Sep 17 00:00:00 2001
From: jk <Janusz Kornaga>
Date: Tue, 10 Nov 2020 19:32:59 +0100
Subject: [PATCH] hot fix

---
 package.json                            | 2 +-
 src/renderer/store/handlers/messages.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 946d101ba..21f568963 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   },
   "homepage": "https://gitlab.rumblefishdev.com/holmes/zbay",
   "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows",
-  "version": "2.2.0-zbay-lite",
+  "version": "2.2.1-zbay-lite",
   "description": "Distributed goods and bulletin board",
   "main": "dist/main.js",
   "scripts": {
diff --git a/src/renderer/store/handlers/messages.ts b/src/renderer/store/handlers/messages.ts
index 7319f88b6..c6b453d9f 100644
--- a/src/renderer/store/handlers/messages.ts
+++ b/src/renderer/store/handlers/messages.ts
@@ -585,7 +585,7 @@ const setUsersMessages = (address, messages: DisplayableMessage[]) => async (
       return new DisplayableMessage(message);
     })
   );
-  const itemMessages = messagesAll.filter((msg) => msg.message.itemId);
+  const itemMessages = messagesAll.filter((msg) => msg.message ? msg.message.itemId : null);
   const contacts = contactsSelectors.contacts(getState());
   const groupedItemMesssages = R.groupBy<DisplayableMessage>(
     (msg) => msg.message.itemId + msg.sender.username
@@ -639,7 +639,7 @@ const setUsersMessages = (address, messages: DisplayableMessage[]) => async (
       );
     }
   }
-  const normalMessages = messagesAll.filter((msg) => !msg.message.itemId);
+  const normalMessages = messagesAll.filter((msg) => msg.message ? !msg.message.itemId : null);
   const groupedMesssages = R.groupBy<DisplayableMessage>(
     (msg) => msg.publicKey
   )(normalMessages);