From 880e0396529f8f3149ce0ffaaf0897bd4b5354eb Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 9 Jul 2020 10:28:10 +1000
Subject: [PATCH] handle grantSignature undefined

---
 ts/components/session/LeftPaneMessageSection.tsx | 7 ++++---
 ts/receiver/dataMessage.ts                       | 5 ++++-
 ts/session/protocols/MultiDeviceProtocol.ts      | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx
index 31a46fdc3..b366a922c 100644
--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@@ -456,7 +456,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
     if (!OpenGroup.validate(serverUrl)) {
       window.pushToast({
         title: window.i18n('noServerURL'),
-        id: 'connectToServerFail',
+        id: 'connectToServer',
         type: 'error',
       });
 
@@ -480,7 +480,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
         if (await OpenGroup.serverExists(serverUrl)) {
           window.pushToast({
             title: window.i18n('connectingToServer'),
-            id: 'connectToServerSuccess',
+            id: 'connectToServer',
             type: 'success',
           });
 
@@ -488,9 +488,10 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
         }
       });
     } catch (e) {
+      window.console.error('Failed to connect to server:', e);
       window.pushToast({
         title: window.i18n('connectToServerFail'),
-        id: 'connectToServerFail',
+        id: 'connectToServer',
         type: 'error',
       });
     } finally {
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 575534f10..f14d5642e 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -613,7 +613,10 @@ export async function handleMessageEvent(event: MessageEvent): Promise<void> {
   }
 
   if (!conversationId) {
-    window.console.warn('Invalid conversation id for incoming message', conversationId);
+    window.console.warn(
+      'Invalid conversation id for incoming message',
+      conversationId
+    );
   }
 
   await window.ConversationController.getOrCreateAndWait(conversationId, type);
diff --git a/ts/session/protocols/MultiDeviceProtocol.ts b/ts/session/protocols/MultiDeviceProtocol.ts
index 140e394b8..2ae330040 100644
--- a/ts/session/protocols/MultiDeviceProtocol.ts
+++ b/ts/session/protocols/MultiDeviceProtocol.ts
@@ -98,7 +98,9 @@ export class MultiDeviceProtocol {
           primaryDevicePubKey,
           secondaryDevicePubKey,
           requestSignature: StringUtils.encode(requestSignature, 'base64'),
-          grantSignature: StringUtils.encode(grantSignature, 'base64'),
+          grantSignature: grantSignature
+            ? StringUtils.encode(grantSignature, 'base64')
+            : undefined,
         })
       );