From dd67a504bf8427414c98270a0c50261d1b2bd08d Mon Sep 17 00:00:00 2001
From: Pavel Prichodko <14926950+prichodko@users.noreply.github.com>
Date: Tue, 14 Jun 2022 14:15:19 +0200
Subject: [PATCH] fix generating of message ID

---
 packages/status-js/src/client/community/handle-waku-message.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/status-js/src/client/community/handle-waku-message.ts b/packages/status-js/src/client/community/handle-waku-message.ts
index cfefc2e9..98c0f5a4 100644
--- a/packages/status-js/src/client/community/handle-waku-message.ts
+++ b/packages/status-js/src/client/community/handle-waku-message.ts
@@ -57,7 +57,7 @@ export function handleWakuMessage(
   )
 
   const messageId = payloadToId(
-    decodedProtocol?.publicMessage || decodedMetadata.payload,
+    decodedProtocol?.publicMessage ?? wakuMessage.payload,
     publicKey
   )