From cc9ddb351f9e2c6c6ed75ca198783bcd3b0b6cbe Mon Sep 17 00:00:00 2001
From: James Salter <iteration@gmail.com>
Date: Wed, 11 Aug 2021 17:47:54 +0100
Subject: [PATCH] Remove test error on startup, and send correct user text

---
 src/components/structures/MatrixChat.tsx         | 10 +---------
 src/components/views/dialogs/BugReportDialog.tsx |  2 +-
 src/rageshake/rageshake.js                       |  2 +-
 src/sentry.ts                                    |  2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index e288884a5a..7b3fe260d7 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -108,7 +108,7 @@ import SoftLogout from './auth/SoftLogout';
 import { makeRoomPermalink } from "../../utils/permalinks/Permalinks";
 import { copyPlaintext } from "../../utils/strings";
 import { PosthogAnalytics } from '../../PosthogAnalytics';
-import {initSentry, sendSentryReport} from "../../sentry";
+import { initSentry, sendSentryReport } from "../../sentry";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -396,14 +396,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         CountlyAnalytics.instance.enable(/* anonymous = */ true);
 
         initSentry(SdkConfig.get()["sentry"]);
-        setTimeout(() => {
-            try {
-                const e = new Error("whoops");
-                throw(e);
-            } catch (e) {
-                sendSentryReport("user text", "label", e);
-            }
-        }, 4000);
     }
 
     private async postLoginSetup() {
diff --git a/src/components/views/dialogs/BugReportDialog.tsx b/src/components/views/dialogs/BugReportDialog.tsx
index 08d295d8b7..cdb463976a 100644
--- a/src/components/views/dialogs/BugReportDialog.tsx
+++ b/src/components/views/dialogs/BugReportDialog.tsx
@@ -116,7 +116,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
             }
         });
 
-        sendSentryReport(userText, this.state.issueUrl, this.props.error);
+        sendSentryReport(this.state.text, this.state.issueUrl, this.props.error);
     };
 
     private onDownload = async (): Promise<void> => {
diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index a3a59a472b..9512f62e42 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -84,7 +84,7 @@ class ConsoleLogger {
                     // In development, it can be useful to log complex cyclic
                     // objects to the console for inspection. This is fine for
                     // the console, but default `stringify` can't handle that.
-                    // We w orkaround this by using a special replacer function
+                    // We workaround this by using a special replacer function
                     // to only log values of the root object and avoid cycles.
                     return JSON.stringify(arg, (key, value) => {
                         if (key && typeof value === "object") {
diff --git a/src/sentry.ts b/src/sentry.ts
index 841eac2f24..26a1ffc2e9 100644
--- a/src/sentry.ts
+++ b/src/sentry.ts
@@ -115,7 +115,7 @@ export async function sendSentryReport(userText: string, issueUrl: string, error
     const captureContext = {
         "contexts": await getContexts(),
         "extra": {
-            "userText": userText,
+            "user_text": userText,
             "issue_url": issueUrl,
         },
     };