From 5ba8ecabb52e7f35cae01b1a356da8d8a3f29594 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 6 Feb 2023 10:50:34 +0000
Subject: [PATCH] Element-R: fix rageshages (#10081)

quick hacks to get rageshakes working in element R

Fixes https://github.com/vector-im/element-web/issues/24430
---
 src/rageshake/submit-rageshake.ts | 3 ++-
 src/sentry.ts                     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index 1024caadf0..09f9ae6037 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -84,7 +84,8 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true): Promise<Form
         body.append("user_id", client.credentials.userId);
         body.append("device_id", client.deviceId);
 
-        if (client.isCryptoEnabled()) {
+        // TODO: make this work with rust crypto
+        if (client.isCryptoEnabled() && client.crypto) {
             const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
             if (client.getDeviceCurve25519Key) {
                 keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
diff --git a/src/sentry.ts b/src/sentry.ts
index 6336fc2018..f4fb178144 100644
--- a/src/sentry.ts
+++ b/src/sentry.ts
@@ -116,7 +116,8 @@ function getEnabledLabs(): string {
 }
 
 async function getCryptoContext(client: MatrixClient): Promise<CryptoContext> {
-    if (!client.isCryptoEnabled()) {
+    // TODO: make this work with rust crypto
+    if (!client.isCryptoEnabled() || !client.crypto) {
         return {};
     }
     const keys = [`ed25519:${client.getDeviceEd25519Key()}`];