Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist

2018-07-04 11:21:16 +01:00
parent 1b003ca39f 4b4864abed
commit 168edbca16
23 changed files with 582 additions and 143 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1306,7 +1306,7 @@ export default React.createClass({

        const dft = new DecryptionFailureTracker((total) => {
            // TODO: Pass reason for failure as third argument to trackEvent
-            Analytics.trackEvent('E2E', 'Decryption failure', null, total);
+            Analytics.trackEvent('E2E', 'Decryption failure', 'unspecified_error', total);
        });

        // Shelved for later date when we have time to think about persisting history of