From 0663ab3b87455de6dac8d21337e30c68e294492b Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 10:17:33 +0000
Subject: [PATCH] lint, and detect new requests

---
 res/css/views/dialogs/_DevtoolsDialog.scss    |  4 +--
 .../views/dialogs/DevtoolsDialog.js           | 30 ++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 22975f0c52..500c46b5fd 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -195,7 +195,7 @@ limitations under the License.
     border-radius: 3px;
     padding: 1px 5px;
     margin-bottom: 6px;
-    font-family: "Inconsolata", courier;
+    font-family: $monospace-font-family;
 
     dl {
         display: grid;
@@ -222,4 +222,4 @@ limitations under the License.
     dt::after {
         content: ":";
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index ade23c90f1..0452e88dfa 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -30,7 +30,7 @@ import {
     PHASE_DONE,
     PHASE_STARTED,
     PHASE_CANCELLED,
-} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest"
+} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 class GenericEditor extends React.PureComponent {
     // static propTypes = {onBack: PropTypes.func.isRequired};
@@ -621,7 +621,7 @@ const PHASE_MAP = {
     [PHASE_DONE]: "done",
     [PHASE_STARTED]: "started",
     [PHASE_CANCELLED]: "cancelled",
-}
+};
 
 function VerificationRequest({txnId, request}) {
     const [, updateState] = useState();
@@ -631,18 +631,18 @@ function VerificationRequest({txnId, request}) {
     useEffect(() => {
         request.on("change", updateState);
         return () => request.off("change", updateState);
-    }, []);
+    }, [request]);
 
     /* Keep re-rendering if there's a timeout */
     useEffect(() => {
-        if (timeout == 0) return;
+        if (request.timeout == 0) return;
 
         const id = setInterval(() => {
            setTimeout(request.timeout);
         }, 500);
 
-        return () => { clearInterval(id); }
-    }, []);
+        return () => { clearInterval(id); };
+    }, [request]);
 
     return (<div className="mx_DevTools_VerificationRequest">
         <dl>
@@ -660,7 +660,7 @@ function VerificationRequest({txnId, request}) {
     </div>);
 }
 
-class VerificationExplorer extends React.PureComponent {
+class VerificationExplorer extends React.Component {
     static getLabel() {
         return _t("Verification Requests");
     }
@@ -668,6 +668,20 @@ class VerificationExplorer extends React.PureComponent {
     /* Ensure this.context is the cli */
     static contextType = MatrixClientContext;
 
+    onNewRequest = () => {
+        this.forceUpdate();
+    }
+
+    componentDidMount() {
+        const cli = this.context;
+        cli.on("crypto.verification.request", this.onNewRequest);
+    }
+
+    componentWillUnmount() {
+        const cli = this.context;
+        cli.off("crypto.verification.request", this.onNewRequest);
+    }
+
     render() {
         const cli = this.context;
         const room = this.props.room;
@@ -677,7 +691,7 @@ class VerificationExplorer extends React.PureComponent {
         return (<div>
             <div className="mx_Dialog_content">
                 {Array.from(inRoomRequests.entries()).reverse().map(([txnId, request]) =>
-                    <VerificationRequest txnId={txnId} request={request} key={txnId}/>
+                    <VerificationRequest txnId={txnId} request={request} key={txnId} />,
                 )}
             </div>
         </div>);