address review

js/models/conversations.js

@@ -1900,10 +1900,11 @@
           window.console.warn('sendGroupInfo invalid pubkey:', recipient);
           return;
         }
+
+        try {
           await libsession
             .getMessageQueue()
-          .send(recipientPubKey, groupUpdateMessage)
-          .catch(log.error);
+            .send(recipientPubKey, groupUpdateMessage);
 
           const expireUpdate = {
             timestamp: Date.now(),
@@ -1917,8 +1918,10 @@
 
           await libsession
             .getMessageQueue()
-          .sendUsingMultiDevice(recipientPubKey, expirationTimerMessage)
-          .catch(log.error);
+            .sendUsingMultiDevice(recipientPubKey, expirationTimerMessage);
+        } catch (e) {
+          log.error('Failed to send groupInfo:', e);
+        }
       }
     },
 

ts/receiver/dataMessage.ts

@@ -435,15 +435,9 @@ export function initIncomingMessage(data: MessageCreationData): MessageModel {
   } = data;
 
   const type = 'incoming';
-  if (
-    message &&
-    message.group &&
-    message.group.id &&
-    message.group.id.length === 0
-  ) {
-    message.group.id = null;
-  }
-  const groupId = message?.group?.id;
+  const messageGroupId = message?.group?.id;
+  const groupId =
+    messageGroupId && messageGroupId.length > 0 ? messageGroupId : null;
 
   const messageData: any = {
     source,

ts/session/utils/Protobuf.ts

@@ -8,11 +8,7 @@ import ByteBuffer from 'bytebuffer';
  */
 export function convertToTS(object: any): any {
   // No idea why js `ByteBuffer` and ts `ByteBuffer` differ ...
-  if (
-    object &&
-    object.constructor &&
-    object.constructor.name === 'Uint8Array'
-  ) {
+  if (object instanceof Uint8Array) {
     return object;
   } else if (
     object &&