From d4d51dc61f75bcaab50184e066da23fc5cabfbdc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Nov 2019 10:03:05 +0000
Subject: [PATCH 01/87] Rip out the remainder of Bluebird

---
 .babelrc                                         |  1 -
 package.json                                     |  2 --
 src/ContentMessages.js                           |  1 -
 src/Lifecycle.js                                 |  5 ++---
 src/Modal.js                                     |  1 -
 src/Notifier.js                                  |  2 +-
 src/Resend.js                                    |  2 +-
 src/RoomNotifs.js                                |  1 -
 src/Rooms.js                                     |  1 -
 src/ScalarAuthClient.js                          |  1 -
 src/ScalarMessaging.js                           |  8 ++++----
 src/SlashCommands.js                             |  1 -
 src/Terms.js                                     |  1 -
 src/ToWidgetPostMessageApi.js                    |  2 --
 src/VectorConferenceHandler.js                   |  1 -
 src/autocomplete/Autocompleter.js                |  1 -
 src/components/structures/GroupView.js           |  5 ++---
 src/components/structures/InteractiveAuth.js     |  2 +-
 src/components/structures/MatrixChat.js          | 10 ++++------
 src/components/structures/MyGroups.js            |  2 +-
 src/components/structures/RoomDirectory.js       |  9 ++++-----
 src/components/structures/RoomView.js            |  9 ++++-----
 src/components/structures/ScrollPanel.js         |  1 -
 src/components/structures/TimelinePanel.js       |  3 +--
 src/components/structures/auth/ForgotPassword.js |  2 +-
 src/components/structures/auth/Login.js          |  4 ++--
 .../structures/auth/PostRegistration.js          |  2 +-
 src/components/structures/auth/Registration.js   |  3 +--
 .../views/auth/InteractiveAuthEntryComponents.js |  2 +-
 .../views/context_menus/RoomTileContextMenu.js   |  4 ++--
 .../views/dialogs/AddressPickerDialog.js         |  4 ++--
 .../views/dialogs/CreateGroupDialog.js           |  2 +-
 src/components/views/dialogs/KeyShareDialog.js   |  2 +-
 src/components/views/dialogs/SetEmailDialog.js   |  4 ++--
 src/components/views/dialogs/SetMxIdDialog.js    |  1 -
 src/components/views/elements/AppTile.js         |  2 +-
 .../views/elements/EditableTextContainer.js      |  5 ++---
 src/components/views/elements/ErrorBoundary.js   |  2 +-
 src/components/views/elements/ImageView.js       |  2 +-
 .../views/elements/LanguageDropdown.js           |  2 +-
 src/components/views/groups/GroupUserSettings.js |  2 +-
 src/components/views/messages/MAudioBody.js      |  2 +-
 src/components/views/messages/MImageBody.js      |  3 +--
 src/components/views/messages/MVideoBody.js      |  3 +--
 src/components/views/right_panel/UserInfo.js     |  2 +-
 .../views/room_settings/ColorSettings.js         |  1 -
 src/components/views/rooms/Autocomplete.js       |  1 -
 src/components/views/rooms/LinkPreviewWidget.js  |  2 +-
 src/components/views/rooms/MemberInfo.js         |  6 +++---
 src/components/views/settings/ChangeAvatar.js    |  2 +-
 src/components/views/settings/ChangePassword.js  |  3 +--
 src/components/views/settings/DevicesPanel.js    |  2 +-
 src/components/views/settings/Notifications.js   | 15 +++++++--------
 .../settings/tabs/user/HelpUserSettingsTab.js    |  2 +-
 src/createRoom.js                                |  1 -
 src/languageHandler.js                           |  1 -
 src/rageshake/rageshake.js                       |  2 --
 src/rageshake/submit-rageshake.js                |  1 -
 src/settings/handlers/DeviceSettingsHandler.js   |  1 -
 src/settings/handlers/LocalEchoWrapper.js        |  1 -
 .../handlers/RoomDeviceSettingsHandler.js        |  1 -
 src/settings/handlers/SettingsHandler.js         |  2 --
 src/stores/FlairStore.js                         |  1 -
 src/stores/RoomViewStore.js                      |  2 +-
 src/utils/DecryptFile.js                         |  1 -
 src/utils/MultiInviter.js                        |  2 --
 src/utils/promise.js                             |  3 ---
 .../views/dialogs/InteractiveAuthDialog-test.js  |  1 -
 .../elements/MemberEventListSummary-test.js      |  2 +-
 .../views/rooms/MessageComposerInput-test.js     |  1 -
 test/components/views/rooms/RoomSettings-test.js |  1 -
 test/i18n-test/languageHandler-test.js           |  2 +-
 test/stores/RoomViewStore-test.js                |  2 --
 test/test-utils.js                               |  1 -
 yarn.lock                                        | 16 +++-------------
 75 files changed, 71 insertions(+), 135 deletions(-)

diff --git a/.babelrc b/.babelrc
index 3fb847ad18..abe7e1ef3f 100644
--- a/.babelrc
+++ b/.babelrc
@@ -13,7 +13,6 @@
         ],
         "transform-class-properties",
         "transform-object-rest-spread",
-        "transform-async-to-bluebird",
         "transform-runtime",
         "add-module-exports",
         "syntax-dynamic-import"
diff --git a/package.json b/package.json
index eb234e0573..620b323af7 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
   "dependencies": {
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-runtime": "^6.26.0",
-    "bluebird": "^3.5.0",
     "blueimp-canvas-to-blob": "^3.5.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
@@ -120,7 +119,6 @@
     "babel-eslint": "^10.0.1",
     "babel-loader": "^7.1.5",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-transform-async-to-bluebird": "^1.1.1",
     "babel-plugin-transform-builtin-extend": "^1.1.2",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index dab8de2465..6908a6a18e 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 'use strict';
 
-import Promise from 'bluebird';
 import extend from './extend';
 import dis from './dispatcher';
 import MatrixClientPeg from './MatrixClientPeg';
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index ffd5baace4..c519e52872 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import Matrix from 'matrix-js-sdk';
 
 import MatrixClientPeg from './MatrixClientPeg';
@@ -525,7 +524,7 @@ export function logout() {
             console.log("Failed to call logout API: token will not be invalidated");
             onLoggedOut();
         },
-    ).done();
+    );
 }
 
 export function softLogout() {
@@ -614,7 +613,7 @@ export function onLoggedOut() {
     // that can occur when components try to use a null client.
     dis.dispatch({action: 'on_logged_out'}, true);
     stopMatrixClient();
-    _clearStorage().done();
+    _clearStorage();
 }
 
 /**
diff --git a/src/Modal.js b/src/Modal.js
index cb19731f01..4fc9fdcb02 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -23,7 +23,6 @@ import Analytics from './Analytics';
 import sdk from './index';
 import dis from './dispatcher';
 import { _t } from './languageHandler';
-import Promise from "bluebird";
 import {defer} from "./utils/promise";
 
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
diff --git a/src/Notifier.js b/src/Notifier.js
index cca0ea2b89..edb9850dfe 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -198,7 +198,7 @@ const Notifier = {
 
         if (enable) {
             // Attempt to get permission from user
-            plaf.requestNotificationPermission().done((result) => {
+            plaf.requestNotificationPermission().then((result) => {
                 if (result !== 'granted') {
                     // The permission request was dismissed or denied
                     // TODO: Support alternative branding in messaging
diff --git a/src/Resend.js b/src/Resend.js
index 4eaee16d1b..51ec804c01 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -35,7 +35,7 @@ module.exports = {
     },
     resend: function(event) {
         const room = MatrixClientPeg.get().getRoom(event.getRoomId());
-        MatrixClientPeg.get().resendEvent(event, room).done(function(res) {
+        MatrixClientPeg.get().resendEvent(event, room).then(function(res) {
             dis.dispatch({
                 action: 'message_sent',
                 event: event,
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index 2d5e4b3136..5bef4afd25 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 import MatrixClientPeg from './MatrixClientPeg';
 import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
-import Promise from 'bluebird';
 
 export const ALL_MESSAGES_LOUD = 'all_messages_loud';
 export const ALL_MESSAGES = 'all_messages';
diff --git a/src/Rooms.js b/src/Rooms.js
index c8f90ec39a..239e348b58 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
-import Promise from 'bluebird';
 
 /**
  * Given a room object, return the alias we should use for it,
diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 3623d47f8e..92f0ff6340 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import url from 'url';
-import Promise from 'bluebird';
 import SettingsStore from "./settings/SettingsStore";
 import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
 const request = require('browser-request');
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 910a6c4f13..c0ffc3022d 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -279,7 +279,7 @@ function inviteUser(event, roomId, userId) {
         }
     }
 
-    client.invite(roomId, userId).done(function() {
+    client.invite(roomId, userId).then(function() {
         sendResponse(event, {
             success: true,
         });
@@ -398,7 +398,7 @@ function setPlumbingState(event, roomId, status) {
         sendError(event, _t('You need to be logged in.'));
         return;
     }
-    client.sendStateEvent(roomId, "m.room.plumbing", { status: status }).done(() => {
+    client.sendStateEvent(roomId, "m.room.plumbing", { status: status }).then(() => {
         sendResponse(event, {
             success: true,
         });
@@ -414,7 +414,7 @@ function setBotOptions(event, roomId, userId) {
         sendError(event, _t('You need to be logged in.'));
         return;
     }
-    client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).done(() => {
+    client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).then(() => {
         sendResponse(event, {
             success: true,
         });
@@ -444,7 +444,7 @@ function setBotPower(event, roomId, userId, level) {
             },
         );
 
-        client.setPowerLevel(roomId, userId, level, powerEvent).done(() => {
+        client.setPowerLevel(roomId, userId, level, powerEvent).then(() => {
             sendResponse(event, {
                 success: true,
             });
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 1a491da54f..31e7ca4f39 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -28,7 +28,6 @@ import { linkifyAndSanitizeHtml } from './HtmlUtils';
 import QuestionDialog from "./components/views/dialogs/QuestionDialog";
 import WidgetUtils from "./utils/WidgetUtils";
 import {textToHtmlRainbow} from "./utils/colour";
-import Promise from "bluebird";
 import { getAddressType } from './UserAddress';
 import { abbreviateUrl } from './utils/UrlUtils';
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/IdentityServerUtils';
diff --git a/src/Terms.js b/src/Terms.js
index 685a39709c..14a7ccb65e 100644
--- a/src/Terms.js
+++ b/src/Terms.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import classNames from 'classnames';
 
 import MatrixClientPeg from './MatrixClientPeg';
diff --git a/src/ToWidgetPostMessageApi.js b/src/ToWidgetPostMessageApi.js
index def4af56ae..00309d252c 100644
--- a/src/ToWidgetPostMessageApi.js
+++ b/src/ToWidgetPostMessageApi.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from "bluebird";
-
 // const OUTBOUND_API_NAME = 'toWidget';
 
 // Initiate requests using the "toWidget" postMessage API and handle responses
diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index 37b3a7ddad..e0e333a371 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import {createNewMatrixCall, Room} from "matrix-js-sdk";
 import CallHandler from './CallHandler';
 import MatrixClientPeg from "./MatrixClientPeg";
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index c385e13878..a26eb6033b 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -26,7 +26,6 @@ import RoomProvider from './RoomProvider';
 import UserProvider from './UserProvider';
 import EmojiProvider from './EmojiProvider';
 import NotifProvider from './NotifProvider';
-import Promise from 'bluebird';
 import {timeout} from "../utils/promise";
 
 export type SelectionRange = {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 776e7f0d6d..a0aa36803f 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -19,7 +19,6 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import sdk from '../../index';
 import dis from '../../dispatcher';
@@ -637,7 +636,7 @@ export default createReactClass({
                 title: _t('Error'),
                 description: _t('Failed to upload image'),
             });
-        }).done();
+        });
     },
 
     _onJoinableChange: function(ev) {
@@ -676,7 +675,7 @@ export default createReactClass({
             this.setState({
                 avatarChanged: false,
             });
-        }).done();
+        });
     },
 
     _saveGroup: async function() {
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 5e06d124c4..e1b02f653b 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -121,7 +121,7 @@ export default createReactClass({
             this.setState({
                 errorText: msg,
             });
-        }).done();
+        });
 
         this._intervalId = null;
         if (this.props.poll) {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b499cb6e42..455f039896 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -17,8 +17,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
-
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
@@ -542,7 +540,7 @@ export default createReactClass({
                             const Loader = sdk.getComponent("elements.Spinner");
                             const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
-                            MatrixClientPeg.get().leave(payload.room_id).done(() => {
+                            MatrixClientPeg.get().leave(payload.room_id).then(() => {
                                 modal.close();
                                 if (this.state.currentRoomId === payload.room_id) {
                                     dis.dispatch({action: 'view_next_room'});
@@ -863,7 +861,7 @@ export default createReactClass({
             waitFor = this.firstSyncPromise.promise;
         }
 
-        waitFor.done(() => {
+        waitFor.then(() => {
             let presentedId = roomInfo.room_alias || roomInfo.room_id;
             const room = MatrixClientPeg.get().getRoom(roomInfo.room_id);
             if (room) {
@@ -980,7 +978,7 @@ export default createReactClass({
 
         const [shouldCreate, createOpts] = await modal.finished;
         if (shouldCreate) {
-            createRoom({createOpts}).done();
+            createRoom({createOpts});
         }
     },
 
@@ -1756,7 +1754,7 @@ export default createReactClass({
             return;
         }
 
-        cli.sendEvent(roomId, event.getType(), event.getContent()).done(() => {
+        cli.sendEvent(roomId, event.getType(), event.getContent()).then(() => {
             dis.dispatch({action: 'message_sent'});
         }, (err) => {
             dis.dispatch({action: 'message_send_failed'});
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 2de15a5444..63ae14ba09 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -47,7 +47,7 @@ export default createReactClass({
     },
 
     _fetch: function() {
-        this.context.matrixClient.getJoinedGroups().done((result) => {
+        this.context.matrixClient.getJoinedGroups().then((result) => {
             this.setState({groups: result.groups, error: null});
         }, (err) => {
             if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 84f402e484..efca8d12a8 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -27,7 +27,6 @@ const dis = require('../../dispatcher');
 
 import { linkifyAndSanitizeHtml } from '../../HtmlUtils';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import { _t } from '../../languageHandler';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
@@ -89,7 +88,7 @@ module.exports = createReactClass({
             this.setState({protocolsLoading: false});
             return;
         }
-        MatrixClientPeg.get().getThirdpartyProtocols().done((response) => {
+        MatrixClientPeg.get().getThirdpartyProtocols().then((response) => {
             this.protocols = response;
             this.setState({protocolsLoading: false});
         }, (err) => {
@@ -135,7 +134,7 @@ module.exports = createReactClass({
             publicRooms: [],
             loading: true,
         });
-        this.getMoreRooms().done();
+        this.getMoreRooms();
     },
 
     getMoreRooms: function() {
@@ -246,7 +245,7 @@ module.exports = createReactClass({
                     if (!alias) return;
                     step = _t('delete the alias.');
                     return MatrixClientPeg.get().deleteAlias(alias);
-                }).done(() => {
+                }).then(() => {
                     modal.close();
                     this.refreshRoomList();
                 }, (err) => {
@@ -348,7 +347,7 @@ module.exports = createReactClass({
                 });
                 return;
             }
-            MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).done((resp) => {
+            MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).then((resp) => {
                 if (resp.length > 0 && resp[0].alias) {
                     this.showRoomAlias(resp[0].alias, true);
                 } else {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4de573479d..ca558f2456 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -27,7 +27,6 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import classNames from 'classnames';
 import {Room} from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
@@ -1101,7 +1100,7 @@ module.exports = createReactClass({
         }
 
         ContentMessages.sharedInstance().sendStickerContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
-            .done(undefined, (error) => {
+            .then(undefined, (error) => {
                 if (error.name === "UnknownDeviceError") {
                     // Let the staus bar handle this
                     return;
@@ -1145,7 +1144,7 @@ module.exports = createReactClass({
             filter: filter,
             term: term,
         });
-        this._handleSearchResult(searchPromise).done();
+        this._handleSearchResult(searchPromise);
     },
 
     _handleSearchResult: function(searchPromise) {
@@ -1316,7 +1315,7 @@ module.exports = createReactClass({
     },
 
     onForgetClick: function() {
-        MatrixClientPeg.get().forget(this.state.room.roomId).done(function() {
+        MatrixClientPeg.get().forget(this.state.room.roomId).then(function() {
             dis.dispatch({ action: 'view_next_room' });
         }, function(err) {
             const errCode = err.errcode || _t("unknown error code");
@@ -1333,7 +1332,7 @@ module.exports = createReactClass({
         this.setState({
             rejecting: true,
         });
-        MatrixClientPeg.get().leave(this.state.roomId).done(function() {
+        MatrixClientPeg.get().leave(this.state.roomId).then(function() {
             dis.dispatch({ action: 'view_next_room' });
             self.setState({
                 rejecting: false,
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 1d5c520285..8a67e70467 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 import { KeyCode } from '../../Keyboard';
 import Timer from '../../utils/Timer';
 import AutoHideScrollbar from "./AutoHideScrollbar";
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 3dd5ea761e..7b0791ff1d 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -23,7 +23,6 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import ReactDOM from "react-dom";
 import PropTypes from 'prop-types';
-import Promise from 'bluebird';
 
 const Matrix = require("matrix-js-sdk");
 const EventTimeline = Matrix.EventTimeline;
@@ -462,7 +461,7 @@ const TimelinePanel = createReactClass({
         // timeline window.
         //
         // see https://github.com/vector-im/vector-web/issues/1035
-        this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).done(() => {
+        this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).then(() => {
             if (this.unmounted) { return; }
 
             const { events, liveEvents } = this._getEvents();
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 46a5fa7bd7..6f68293caa 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -105,7 +105,7 @@ module.exports = createReactClass({
             phase: PHASE_SENDING_EMAIL,
         });
         this.reset = new PasswordReset(this.props.serverConfig.hsUrl, this.props.serverConfig.isUrl);
-        this.reset.resetPassword(email, password).done(() => {
+        this.reset.resetPassword(email, password).then(() => {
             this.setState({
                 phase: PHASE_EMAIL_SENT,
             });
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index ad77ed49a5..2cdf5890cf 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -253,7 +253,7 @@ module.exports = createReactClass({
             this.setState({
                 busy: false,
             });
-        }).done();
+        });
     },
 
     onUsernameChanged: function(username) {
@@ -424,7 +424,7 @@ module.exports = createReactClass({
             this.setState({
                 busy: false,
             });
-        }).done();
+        });
     },
 
     _isSupportedFlow: function(flow) {
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
index 66075c80f7..760163585d 100644
--- a/src/components/structures/auth/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -43,7 +43,7 @@ module.exports = createReactClass({
         const cli = MatrixClientPeg.get();
         this.setState({busy: true});
         const self = this;
-        cli.getProfileInfo(cli.credentials.userId).done(function(result) {
+        cli.getProfileInfo(cli.credentials.userId).then(function(result) {
             self.setState({
                 avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(result.avatar_url),
                 busy: false,
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 6321028457..3578d745f5 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -18,7 +18,6 @@ limitations under the License.
 */
 
 import Matrix from 'matrix-js-sdk';
-import Promise from 'bluebird';
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
@@ -371,7 +370,7 @@ module.exports = createReactClass({
                 if (pushers[i].kind === 'email') {
                     const emailPusher = pushers[i];
                     emailPusher.data = { brand: this.props.brand };
-                    matrixClient.setPusher(emailPusher).done(() => {
+                    matrixClient.setPusher(emailPusher).then(() => {
                         console.log("Set email branding to " + this.props.brand);
                     }, (error) => {
                         console.error("Couldn't set email branding: " + error);
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index d19ce95b33..cc3f9f96c4 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -441,7 +441,7 @@ export const MsisdnAuthEntry = createReactClass({
             this.props.fail(e);
         }).finally(() => {
             this.setState({requestingToken: false});
-        }).done();
+        });
     },
 
     /*
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index fb056ee47f..97433e1f77 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -160,7 +160,7 @@ module.exports = createReactClass({
 
     _onClickForget: function() {
         // FIXME: duplicated with RoomSettings (and dead code in RoomView)
-        MatrixClientPeg.get().forget(this.props.room.roomId).done(() => {
+        MatrixClientPeg.get().forget(this.props.room.roomId).then(() => {
             // Switch to another room view if we're currently viewing the
             // historical room
             if (RoomViewStore.getRoomId() === this.props.room.roomId) {
@@ -190,7 +190,7 @@ module.exports = createReactClass({
         this.setState({
             roomNotifState: newState,
         });
-        RoomNotifs.setRoomNotifsState(roomId, newState).done(() => {
+        RoomNotifs.setRoomNotifsState(roomId, newState).then(() => {
             // delay slightly so that the user can see their state change
             // before closing the menu
             return sleep(500).then(() => {
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 24d8b96e0c..a40495893d 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -266,7 +266,7 @@ module.exports = createReactClass({
             this.setState({
                 searchError: err.errcode ? err.message : _t('Something went wrong!'),
             });
-        }).done(() => {
+        }).then(() => {
             this.setState({
                 busy: false,
             });
@@ -379,7 +379,7 @@ module.exports = createReactClass({
                 // Do a local search immediately
                 this._doLocalSearch(query);
             }
-        }).done(() => {
+        }).then(() => {
             this.setState({
                 busy: false,
             });
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 11f4c21366..3430a12e71 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -93,7 +93,7 @@ export default createReactClass({
             this.setState({createError: e});
         }).finally(() => {
             this.setState({creating: false});
-        }).done();
+        });
     },
 
     _onCancel: function() {
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
index a10c25a0fb..01e3479bb1 100644
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -78,7 +78,7 @@ export default createReactClass({
                     true,
                 );
             }
-        }).done();
+        });
     },
 
     componentWillUnmount: function() {
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index bedf713c4e..b527abffc9 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -62,7 +62,7 @@ export default createReactClass({
             return;
         }
         this._addThreepid = new AddThreepid();
-        this._addThreepid.addEmailAddress(emailAddress).done(() => {
+        this._addThreepid.addEmailAddress(emailAddress).then(() => {
             Modal.createTrackedDialog('Verification Pending', '', QuestionDialog, {
                 title: _t("Verification Pending"),
                 description: _t(
@@ -96,7 +96,7 @@ export default createReactClass({
     },
 
     verifyEmailAddress: function() {
-        this._addThreepid.checkEmailLinkClicked().done(() => {
+        this._addThreepid.checkEmailLinkClicked().then(() => {
             this.props.onFinished(true);
         }, (err) => {
             this.setState({emailBusy: false});
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index 3bc6f5597e..598d0ce354 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 260b63dfd4..453630413c 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -205,7 +205,7 @@ export default class AppTile extends React.Component {
         if (!this._scalarClient) {
             this._scalarClient = defaultManager.getScalarClient();
         }
-        this._scalarClient.getScalarToken().done((token) => {
+        this._scalarClient.getScalarToken().then((token) => {
             // Append scalar_token as a query param if not already present
             this._scalarClient.scalarToken = token;
             const u = url.parse(this._addWurlParams(this.props.url));
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index 3bf37df951..5cba98470c 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import sdk from '../../../index';
-import Promise from 'bluebird';
 
 /**
  * A component which wraps an EditableText, with a spinner while updates take
@@ -51,7 +50,7 @@ export default class EditableTextContainer extends React.Component {
 
         this.setState({busy: true});
 
-        this.props.getInitialValue().done(
+        this.props.getInitialValue().then(
             (result) => {
                 if (this._unmounted) { return; }
                 this.setState({
@@ -83,7 +82,7 @@ export default class EditableTextContainer extends React.Component {
             errorString: null,
         });
 
-        this.props.onSubmit(value).done(
+        this.props.onSubmit(value).then(
             () => {
                 if (this._unmounted) { return; }
                 this.setState({
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.js
index e53e1ec0fa..e36464c4ef 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@@ -54,7 +54,7 @@ export default class ErrorBoundary extends React.PureComponent {
         if (!PlatformPeg.get()) return;
 
         MatrixClientPeg.get().stopClient();
-        MatrixClientPeg.get().store.deleteAllData().done(() => {
+        MatrixClientPeg.get().store.deleteAllData().then(() => {
             PlatformPeg.get().reload();
         });
     };
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index 2772363bd0..b2f6d0abbb 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -84,7 +84,7 @@ export default class ImageView extends React.Component {
                         title: _t('Error'),
                         description: _t('You cannot delete this image. (%(code)s)', {code: code}),
                     });
-                }).done();
+                });
             },
         });
     };
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 365f9ded61..451c97d958 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -49,7 +49,7 @@ export default class LanguageDropdown extends React.Component {
             this.setState({langs});
         }).catch(() => {
             this.setState({langs: ['en']});
-        }).done();
+        });
 
         if (!this.props.value) {
             // If no value is given, we start with the first
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 7d80bdd209..3cd5731b99 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -36,7 +36,7 @@ export default createReactClass({
     },
 
     componentWillMount: function() {
-        this.context.matrixClient.getJoinedGroups().done((result) => {
+        this.context.matrixClient.getJoinedGroups().then((result) => {
             this.setState({groups: result.groups || [], error: null});
         }, (err) => {
             console.error(err);
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index b4f26d0cbd..0246d28542 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -55,7 +55,7 @@ export default class MAudioBody extends React.Component {
             decryptFile(content.file).then(function(blob) {
                 decryptedBlob = blob;
                 return URL.createObjectURL(decryptedBlob);
-            }).done((url) => {
+            }).then((url) => {
                 this.setState({
                     decryptedUrl: url,
                     decryptedBlob: decryptedBlob,
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 640baa1966..b12957a7df 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -24,7 +24,6 @@ import MFileBody from './MFileBody';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
 import { decryptFile } from '../../../utils/DecryptFile';
-import Promise from 'bluebird';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
@@ -289,7 +288,7 @@ export default class MImageBody extends React.Component {
                 this.setState({
                     error: err,
                 });
-            }).done();
+            });
         }
 
         // Remember that the user wanted to show this particular image
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index d277b6eae9..43e4f2dd75 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -20,7 +20,6 @@ import createReactClass from 'create-react-class';
 import MFileBody from './MFileBody';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
-import Promise from 'bluebird';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
@@ -115,7 +114,7 @@ module.exports = createReactClass({
                 this.setState({
                     error: err,
                 });
-            }).done();
+            });
         }
     },
 
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 207bf29998..8c4d5a3586 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -870,7 +870,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
                 },
             ).finally(() => {
                 stopUpdating();
-            }).done();
+            });
         };
 
         const roomId = user.roomId;
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index aab6c04f53..952c49828b 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index d4b51081f4..76a3a19e00 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -21,7 +21,6 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import flatMap from 'lodash/flatMap';
 import type {Completion} from '../../../autocomplete/Autocompleter';
-import Promise from 'bluebird';
 import { Room } from 'matrix-js-sdk';
 
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index d93fe76b46..3826c410bf 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -53,7 +53,7 @@ module.exports = createReactClass({
             );
         }, (error)=>{
             console.error("Failed to get URL preview: " + error);
-        }).done();
+        });
     },
 
     componentDidMount: function() {
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2ea6392e96..cd6de64a5a 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -248,7 +248,7 @@ module.exports = createReactClass({
             return client.getStoredDevicesForUser(member.userId);
         }).finally(function() {
             self._cancelDeviceList = null;
-        }).done(function(devices) {
+        }).then(function(devices) {
             if (cancelled) {
                 // we got cancelled - presumably a different user now
                 return;
@@ -572,7 +572,7 @@ module.exports = createReactClass({
             },
         ).finally(()=>{
             this.setState({ updating: this.state.updating - 1 });
-        }).done();
+        });
     },
 
     onPowerChange: async function(powerLevel) {
@@ -629,7 +629,7 @@ module.exports = createReactClass({
         this.setState({ updating: this.state.updating + 1 });
         createRoom({dmUserId: this.props.member.userId}).finally(() => {
             this.setState({ updating: this.state.updating - 1 });
-        }).done();
+        });
     },
 
     onLeaveClick: function() {
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 32521006c7..904b17b15f 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -112,7 +112,7 @@ module.exports = createReactClass({
             }
         });
 
-        httpPromise.done(function() {
+        httpPromise.then(function() {
             self.setState({
                 phase: self.Phases.Display,
                 avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(newUrl),
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 91292b19f9..a317c46cec 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -25,7 +25,6 @@ const Modal = require("../../../Modal");
 const sdk = require("../../../index");
 
 import dis from "../../../dispatcher";
-import Promise from 'bluebird';
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
 
@@ -174,7 +173,7 @@ module.exports = createReactClass({
                 newPassword: "",
                 newPasswordConfirm: "",
             });
-        }).done();
+        });
     },
 
     _optionallySetEmail: function() {
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 30f507ea18..cb5db10be4 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -52,7 +52,7 @@ export default class DevicesPanel extends React.Component {
     }
 
     _loadDevices() {
-        MatrixClientPeg.get().getDevices().done(
+        MatrixClientPeg.get().getDevices().then(
             (resp) => {
                 if (this._unmounted) { return; }
                 this.setState({devices: resp.devices || []});
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index e3b4cfe122..6c71101eb8 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import Promise from 'bluebird';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -97,7 +96,7 @@ module.exports = createReactClass({
             phase: this.phases.LOADING,
         });
 
-        MatrixClientPeg.get().setPushRuleEnabled('global', self.state.masterPushRule.kind, self.state.masterPushRule.rule_id, !checked).done(function() {
+        MatrixClientPeg.get().setPushRuleEnabled('global', self.state.masterPushRule.kind, self.state.masterPushRule.rule_id, !checked).then(function() {
            self._refreshFromServer();
         });
     },
@@ -170,7 +169,7 @@ module.exports = createReactClass({
             emailPusher.kind = null;
             emailPusherPromise = MatrixClientPeg.get().setPusher(emailPusher);
         }
-        emailPusherPromise.done(() => {
+        emailPusherPromise.then(() => {
             this._refreshFromServer();
         }, (error) => {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -274,7 +273,7 @@ module.exports = createReactClass({
                 }
             }
 
-            Promise.all(deferreds).done(function() {
+            Promise.all(deferreds).then(function() {
                 self._refreshFromServer();
             }, function(error) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -343,7 +342,7 @@ module.exports = createReactClass({
             }
         }
 
-        Promise.all(deferreds).done(function(resps) {
+        Promise.all(deferreds).then(function(resps) {
             self._refreshFromServer();
         }, function(error) {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -398,7 +397,7 @@ module.exports = createReactClass({
         };
 
         // Then, add the new ones
-        Promise.all(removeDeferreds).done(function(resps) {
+        Promise.all(removeDeferreds).then(function(resps) {
             const deferreds = [];
 
             let pushRuleVectorStateKind = self.state.vectorContentRules.vectorState;
@@ -434,7 +433,7 @@ module.exports = createReactClass({
                 }
             }
 
-            Promise.all(deferreds).done(function(resps) {
+            Promise.all(deferreds).then(function(resps) {
                 self._refreshFromServer();
             }, onError);
         }, onError);
@@ -650,7 +649,7 @@ module.exports = createReactClass({
                 externalContentRules: self.state.externalContentRules,
                 externalPushRules: self.state.externalPushRules,
             });
-        }).done();
+        });
 
         MatrixClientPeg.get().getThreePids().then((r) => this.setState({threepids: r.threepids}));
     },
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index fbad327078..875f0bfc10 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -75,7 +75,7 @@ export default class HelpUserSettingsTab extends React.Component {
         // stopping in the middle of the logs.
         console.log("Clear cache & reload clicked");
         MatrixClientPeg.get().stopClient();
-        MatrixClientPeg.get().store.deleteAllData().done(() => {
+        MatrixClientPeg.get().store.deleteAllData().then(() => {
             PlatformPeg.get().reload();
         });
     };
diff --git a/src/createRoom.js b/src/createRoom.js
index 120043247d..0ee90beba8 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -21,7 +21,6 @@ import { _t } from './languageHandler';
 import dis from "./dispatcher";
 import * as Rooms from "./Rooms";
 
-import Promise from 'bluebird';
 import {getAddressType} from "./UserAddress";
 
 /**
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 179bb2d1d0..c56e5378df 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -19,7 +19,6 @@ limitations under the License.
 
 import request from 'browser-request';
 import counterpart from 'counterpart';
-import Promise from 'bluebird';
 import React from 'react';
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
 
diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index 820550af88..47bab38079 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -16,8 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
-
 // This module contains all the code needed to log the console, persist it to
 // disk and submit bug reports. Rationale is as follows:
 //  - Monkey-patching the console is preferable to having a log library because
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index e772912e48..457958eb82 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -17,7 +17,6 @@ limitations under the License.
 */
 
 import pako from 'pako';
-import Promise from 'bluebird';
 
 import MatrixClientPeg from '../MatrixClientPeg';
 import PlatformPeg from '../PlatformPeg';
diff --git a/src/settings/handlers/DeviceSettingsHandler.js b/src/settings/handlers/DeviceSettingsHandler.js
index 780815efd1..76c518b97b 100644
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.js
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import SettingsHandler from "./SettingsHandler";
 import MatrixClientPeg from "../../MatrixClientPeg";
 import {SettingLevel} from "../SettingsStore";
diff --git a/src/settings/handlers/LocalEchoWrapper.js b/src/settings/handlers/LocalEchoWrapper.js
index e6964f9bf7..4cbe4891be 100644
--- a/src/settings/handlers/LocalEchoWrapper.js
+++ b/src/settings/handlers/LocalEchoWrapper.js
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from "bluebird";
 import SettingsHandler from "./SettingsHandler";
 
 /**
diff --git a/src/settings/handlers/RoomDeviceSettingsHandler.js b/src/settings/handlers/RoomDeviceSettingsHandler.js
index a0981ffbab..a9cf686c4c 100644
--- a/src/settings/handlers/RoomDeviceSettingsHandler.js
+++ b/src/settings/handlers/RoomDeviceSettingsHandler.js
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import SettingsHandler from "./SettingsHandler";
 import {SettingLevel} from "../SettingsStore";
 
diff --git a/src/settings/handlers/SettingsHandler.js b/src/settings/handlers/SettingsHandler.js
index d1566d6bfa..7d987fc136 100644
--- a/src/settings/handlers/SettingsHandler.js
+++ b/src/settings/handlers/SettingsHandler.js
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from "bluebird";
-
 /**
  * Represents the base class for all level handlers. This class performs no logic
  * and should be overridden.
diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index c8b4d75010..94b81c1ba5 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import EventEmitter from 'events';
-import Promise from 'bluebird';
 
 const BULK_REQUEST_DEBOUNCE_MS = 200;
 
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 6a405124f4..a3caf876ef 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -234,7 +234,7 @@ class RoomViewStore extends Store {
         });
         MatrixClientPeg.get().joinRoom(
             this._state.roomAlias || this._state.roomId, payload.opts,
-        ).done(() => {
+        ).then(() => {
             // We don't actually need to do anything here: we do *not*
             // clear the 'joining' flag because the Room object and/or
             // our 'joined' member event may not have come down the sync
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index ea0e4c3fb0..f193bd7709 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -21,7 +21,6 @@ import encrypt from 'browser-encrypt-attachment';
 import 'isomorphic-fetch';
 // Grab the client so that we can turn mxc:// URLs into https:// URLS.
 import MatrixClientPeg from '../MatrixClientPeg';
-import Promise from 'bluebird';
 
 // WARNING: We have to be very careful about what mime-types we allow into blobs,
 // as for performance reasons these are now rendered via URL.createObjectURL()
diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
index de5c2e7610..8b952a2b5b 100644
--- a/src/utils/MultiInviter.js
+++ b/src/utils/MultiInviter.js
@@ -15,11 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
 import MatrixClientPeg from '../MatrixClientPeg';
 import {getAddressType} from '../UserAddress';
 import GroupStore from '../stores/GroupStore';
-import Promise from 'bluebird';
 import {_t} from "../languageHandler";
 import sdk from "../index";
 import Modal from "../Modal";
diff --git a/src/utils/promise.js b/src/utils/promise.js
index e6e6ccb5c8..d7e8d2eae1 100644
--- a/src/utils/promise.js
+++ b/src/utils/promise.js
@@ -14,9 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// This is only here to allow access to methods like done for the time being
-import Promise from "bluebird";
-
 // @flow
 
 // Returns a promise which resolves with a given value after the given number of ms
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index 7612b43b48..5f90e0f21c 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import expect from 'expect';
-import Promise from 'bluebird';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index 95f7e7999a..a31cbdebb5 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -91,7 +91,7 @@ describe('MemberEventListSummary', function() {
         testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
 
-        languageHandler.setLanguage('en').done(done);
+        languageHandler.setLanguage('en').then(done);
         languageHandler.setMissingEntryGenerator(function(key) {
             return key.split('|', 2)[1];
         });
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 04a5c83ed0..60380eecd2 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -3,7 +3,6 @@ import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
 import expect from 'expect';
 import sinon from 'sinon';
-import Promise from 'bluebird';
 import * as testUtils from '../../../test-utils';
 import sdk from 'matrix-react-sdk';
 const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index dd91e812bc..1c0bfd95dc 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -3,7 +3,6 @@
 // import ReactDOM from 'react-dom';
 // import expect from 'expect';
 // import jest from 'jest-mock';
-// import Promise from 'bluebird';
 // import * as testUtils from '../../../test-utils';
 // import sdk from 'matrix-react-sdk';
 // const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
diff --git a/test/i18n-test/languageHandler-test.js b/test/i18n-test/languageHandler-test.js
index 0d96bc15ab..8f21638703 100644
--- a/test/i18n-test/languageHandler-test.js
+++ b/test/i18n-test/languageHandler-test.js
@@ -11,7 +11,7 @@ describe('languageHandler', function() {
         testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
 
-        languageHandler.setLanguage('en').done(done);
+        languageHandler.setLanguage('en').then(done);
     });
 
     afterEach(function() {
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index be598de8da..77dfb37b0a 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -1,13 +1,11 @@
 import expect from 'expect';
 
-import dis from '../../src/dispatcher';
 import RoomViewStore from '../../src/stores/RoomViewStore';
 
 
 import peg from '../../src/MatrixClientPeg';
 
 import * as testUtils from '../test-utils';
-import Promise from 'bluebird';
 
 const dispatch = testUtils.getDispatchForStore(RoomViewStore);
 
diff --git a/test/test-utils.js b/test/test-utils.js
index ff800132b9..64704fc610 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -1,7 +1,6 @@
 "use strict";
 
 import sinon from 'sinon';
-import Promise from 'bluebird';
 import React from 'react';
 import PropTypes from 'prop-types';
 import peg from '../src/MatrixClientPeg';
diff --git a/yarn.lock b/yarn.lock
index 3e43c29ef6..95d9adb573 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -899,7 +899,7 @@ babel-helper-explode-assignable-expression@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-function-name@^6.24.1, babel-helper-function-name@^6.8.0:
+babel-helper-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
   integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
@@ -1042,16 +1042,6 @@ babel-plugin-syntax-trailing-function-commas@^6.22.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
   integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
 
-babel-plugin-transform-async-to-bluebird@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-bluebird/-/babel-plugin-transform-async-to-bluebird-1.1.1.tgz#46ea3e7c5af629782ac9f1ed1b7cd38f8425afd4"
-  integrity sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q=
-  dependencies:
-    babel-helper-function-name "^6.8.0"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-template "^6.9.0"
-    babel-traverse "^6.10.4"
-
 babel-plugin-transform-async-to-generator@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
@@ -1442,7 +1432,7 @@ babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtim
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0, babel-template@^6.9.0:
+babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
@@ -1453,7 +1443,7 @@ babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0, babel-tem
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.10.4, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=

From e144f1c368c6bd56935caf56df985fdf22ceceea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Nov 2019 10:37:29 +0000
Subject: [PATCH 02/87] remove Promise.config

---
 src/components/structures/MatrixChat.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1fb1065e82..a2f2601e75 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -61,10 +61,6 @@ import { setTheme } from "../../theme";
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
 
-// Disable warnings for now: we use deprecated bluebird functions
-// and need to migrate, but they spam the console with warnings.
-Promise.config({warnings: false});
-
 /** constants for MatrixChat.state.view */
 const VIEWS = {
     // a special initial state which is only used at startup, while we are

From b69cee0c6756796ae6db514a2a328fd7b012ff02 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Nov 2019 15:45:32 +0000
Subject: [PATCH 03/87] Remove getBaseTheme

This was only used by vector/index.js, in the code removed by
https://github.com/vector-im/riot-web/pull/11445

React SDK does a very similar thing in setTheme but also gets the
rest of the custom theme name.

Requires https://github.com/vector-im/riot-web/pull/11445
---
 src/theme.js | 79 ++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 45 deletions(-)

diff --git a/src/theme.js b/src/theme.js
index 43bc813d34..634e5cce7f 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -127,28 +127,14 @@ function getCustomTheme(themeName) {
     return customTheme;
 }
 
-/**
- * Gets the underlying theme name for the given theme. This is usually the theme or
- * CSS resource that the theme relies upon to load.
- * @param {string} theme The theme name to get the base of.
- * @returns {string} The base theme (typically "light" or "dark").
- */
-export function getBaseTheme(theme) {
-    if (!theme) return "light";
-    if (theme.startsWith("custom-")) {
-        const customTheme = getCustomTheme(theme.substr(7));
-        return customTheme.is_dark ? "dark-custom" : "light-custom";
-    }
-
-    return theme; // it's probably a base theme
-}
-
 /**
  * Called whenever someone changes the theme
+ * Async function that returns once the theme has been set
+ * (ie. the CSS has been loaded)
  *
  * @param {string} theme new theme
  */
-export function setTheme(theme) {
+export async function setTheme(theme) {
     if (!theme) {
         const themeWatcher = new ThemeWatcher();
         theme = themeWatcher.getEffectiveTheme();
@@ -190,38 +176,41 @@ export function setTheme(theme) {
 
     styleElements[stylesheetName].disabled = false;
 
-    const switchTheme = function() {
-        // we re-enable our theme here just in case we raced with another
-        // theme set request as per https://github.com/vector-im/riot-web/issues/5601.
-        // We could alternatively lock or similar to stop the race, but
-        // this is probably good enough for now.
-        styleElements[stylesheetName].disabled = false;
-        Object.values(styleElements).forEach((a) => {
-            if (a == styleElements[stylesheetName]) return;
-            a.disabled = true;
-        });
-        Tinter.setTheme(theme);
-    };
+    return new Promise((resolve) => {
+        const switchTheme = function() {
+            // we re-enable our theme here just in case we raced with another
+            // theme set request as per https://github.com/vector-im/riot-web/issues/5601.
+            // We could alternatively lock or similar to stop the race, but
+            // this is probably good enough for now.
+            styleElements[stylesheetName].disabled = false;
+            Object.values(styleElements).forEach((a) => {
+                if (a == styleElements[stylesheetName]) return;
+                a.disabled = true;
+            });
+            Tinter.setTheme(theme);
+            resolve();
+        };
 
-    // turns out that Firefox preloads the CSS for link elements with
-    // the disabled attribute, but Chrome doesn't.
+        // turns out that Firefox preloads the CSS for link elements with
+        // the disabled attribute, but Chrome doesn't.
 
-    let cssLoaded = false;
+        let cssLoaded = false;
 
-    styleElements[stylesheetName].onload = () => {
-        switchTheme();
-    };
+        styleElements[stylesheetName].onload = () => {
+            switchTheme();
+        };
 
-    for (let i = 0; i < document.styleSheets.length; i++) {
-        const ss = document.styleSheets[i];
-        if (ss && ss.href === styleElements[stylesheetName].href) {
-            cssLoaded = true;
-            break;
+        for (let i = 0; i < document.styleSheets.length; i++) {
+            const ss = document.styleSheets[i];
+            if (ss && ss.href === styleElements[stylesheetName].href) {
+                cssLoaded = true;
+                break;
+            }
         }
-    }
 
-    if (cssLoaded) {
-        styleElements[stylesheetName].onload = undefined;
-        switchTheme();
-    }
+        if (cssLoaded) {
+            styleElements[stylesheetName].onload = undefined;
+            switchTheme();
+        }
+    });
 }

From 93e4de986128267b96cf2d307b890c248ed9003b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 11:00:39 -0700
Subject: [PATCH 04/87] Fix positioning and sizing of e2e icon in the composer

This also removes the special case class for the composer because the input is now aligned regardless of icon.
---
 res/css/views/rooms/_MessageComposer.scss          | 8 ++++----
 src/components/views/rooms/MessageComposer.js      | 6 +-----
 src/components/views/rooms/SlateMessageComposer.js | 6 +-----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 14562fe7ed..a0c8048475 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -23,10 +23,6 @@ limitations under the License.
     padding-left: 84px;
 }
 
-.mx_MessageComposer_wrapper.mx_MessageComposer_hasE2EIcon {
-    padding-left: 109px;
-}
-
 .mx_MessageComposer_replaced_wrapper {
     margin-left: auto;
     margin-right: auto;
@@ -78,6 +74,10 @@ limitations under the License.
 .mx_MessageComposer_e2eIcon.mx_E2EIcon {
     position: absolute;
     left: 60px;
+    width: 16px;
+    height: 16px;
+    margin-right: 0; // Counteract the E2EIcon class
+    margin-left: 3px; // Counteract the E2EIcon class
 
     &::after {
         background-color: $composer-e2e-icon-color;
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 632ca53f82..b41b970fc6 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -353,13 +353,9 @@ export default class MessageComposer extends React.Component {
             );
         }
 
-        const wrapperClasses = classNames({
-            mx_MessageComposer_wrapper: true,
-            mx_MessageComposer_hasE2EIcon: !!this.props.e2eStatus,
-        });
         return (
             <div className="mx_MessageComposer">
-                <div className={wrapperClasses}>
+                <div className="mx_MessageComposer_wrapper">
                     <div className="mx_MessageComposer_row">
                         { controls }
                     </div>
diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js
index 4bb2f29e61..eb41f6729b 100644
--- a/src/components/views/rooms/SlateMessageComposer.js
+++ b/src/components/views/rooms/SlateMessageComposer.js
@@ -460,13 +460,9 @@ export default class SlateMessageComposer extends React.Component {
 
         const showFormatBar = this.state.showFormatting && this.state.inputState.isRichTextEnabled;
 
-        const wrapperClasses = classNames({
-            mx_MessageComposer_wrapper: true,
-            mx_MessageComposer_hasE2EIcon: !!this.props.e2eStatus,
-        });
         return (
             <div className="mx_MessageComposer">
-                <div className={wrapperClasses}>
+                <div className="mx_MessageComposer_wrapper">
                     <div className="mx_MessageComposer_row">
                         { controls }
                     </div>

From f6394b1251cef54042914c421dc15306bc0d2980 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 11:03:53 -0700
Subject: [PATCH 05/87] Remove stray colour correction on composer e2e icon

We want it to match the room header
---
 res/css/views/rooms/_MessageComposer.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index a0c8048475..036756e2eb 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -78,10 +78,6 @@ limitations under the License.
     height: 16px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
-
-    &::after {
-        background-color: $composer-e2e-icon-color;
-    }
 }
 
 .mx_MessageComposer_noperm_error {

From 8abc0953d518d7f7c47a1a1b74f92cdaf4a06567 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 11:08:53 -0700
Subject: [PATCH 06/87] Remove the import my IDE should have removed for me

---
 src/components/views/rooms/MessageComposer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index b41b970fc6..128f9be964 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -25,7 +25,6 @@ import RoomViewStore from '../../../stores/RoomViewStore';
 import Stickerpicker from './Stickerpicker';
 import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks';
 import ContentMessages from '../../../ContentMessages';
-import classNames from 'classnames';
 import E2EIcon from './E2EIcon';
 
 function ComposerAvatar(props) {

From 966f84115dc16415269e5285d104f90e3596a988 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 20 Nov 2019 18:26:29 +0000
Subject: [PATCH 07/87] js-sdk rc.1

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index eb234e0573..57e8dd77e3 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "lolex": "4.2",
-    "matrix-js-sdk": "2.4.3",
+    "matrix-js-sdk": "2.4.4-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 3e43c29ef6..eb72b11793 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5197,10 +5197,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3.tgz#23b78cc707a02eb0ce7eecb3aa50129e46dd5b6e"
-  integrity sha512-8qTqILd/NmTWF24tpaxmDIzkTk/bZhPD5N8h69PlvJ5Y6kMFctpRj+Tud5zZjl5/yhO07+g+JCyDzg+AagiM/A==
+matrix-js-sdk@2.4.4-rc.1:
+  version "2.4.4-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4-rc.1.tgz#5fd33fd11be9eea23cd0d0b8eb79da7a4b6253bf"
+  integrity sha512-Kn94zZMXh2EmihYL3lWNp2lpT7RtqcaUxjkP7H9Mr113swSOXtKr8RWMrvopAIguC1pcLzL+lCk+N8rrML2A4Q==
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"

From 318a720e75e9e70831aa7f9cd775cb902274b657 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 20 Nov 2019 18:29:16 +0000
Subject: [PATCH 08/87] Prepare changelog for v1.7.3-rc.1

---
 CHANGELOG.md | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c46530fad..2dad0accd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,97 @@
+Changes in [1.7.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.3-rc.1) (2019-11-20)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.2...v1.7.3-rc.1)
+
+ * Fix positioning, size, and colour of the composer e2e icon
+   [\#3641](https://github.com/matrix-org/matrix-react-sdk/pull/3641)
+ * upgrade nunito from 3.500 to 3.504
+   [\#3639](https://github.com/matrix-org/matrix-react-sdk/pull/3639)
+ * Wire up the widget permission prompt to the cross-platform setting
+   [\#3630](https://github.com/matrix-org/matrix-react-sdk/pull/3630)
+ * Get theme automatically from system setting
+   [\#3637](https://github.com/matrix-org/matrix-react-sdk/pull/3637)
+ * Update code style for our 90 char life
+   [\#3636](https://github.com/matrix-org/matrix-react-sdk/pull/3636)
+ * use general warning icon instead of e2e one for room status
+   [\#3633](https://github.com/matrix-org/matrix-react-sdk/pull/3633)
+ * Add support for platform specific event indexing and search
+   [\#3550](https://github.com/matrix-org/matrix-react-sdk/pull/3550)
+ * Update from Weblate
+   [\#3635](https://github.com/matrix-org/matrix-react-sdk/pull/3635)
+ * Use a settings watcher to set the theme
+   [\#3634](https://github.com/matrix-org/matrix-react-sdk/pull/3634)
+ * Merge the `feature_user_info_panel` flag into `feature_dm_verification`
+   [\#3632](https://github.com/matrix-org/matrix-react-sdk/pull/3632)
+ * Fix some styling regressions in member panel
+   [\#3631](https://github.com/matrix-org/matrix-react-sdk/pull/3631)
+ * Add a bit more safety around breadcrumbs
+   [\#3629](https://github.com/matrix-org/matrix-react-sdk/pull/3629)
+ * Ensure widgets always have a sender associated with them
+   [\#3628](https://github.com/matrix-org/matrix-react-sdk/pull/3628)
+ * re-add missing case of codepath
+   [\#3627](https://github.com/matrix-org/matrix-react-sdk/pull/3627)
+ * Implement the bulk of the new widget permission prompt design
+   [\#3622](https://github.com/matrix-org/matrix-react-sdk/pull/3622)
+ * Relax identity server discovery error handling
+   [\#3588](https://github.com/matrix-org/matrix-react-sdk/pull/3588)
+ * Add cross-signing feature flag
+   [\#3626](https://github.com/matrix-org/matrix-react-sdk/pull/3626)
+ * Attempt number two at ripping out Bluebird from rageshake.js
+   [\#3624](https://github.com/matrix-org/matrix-react-sdk/pull/3624)
+ * Update from Weblate
+   [\#3625](https://github.com/matrix-org/matrix-react-sdk/pull/3625)
+ * Remove Bluebird: phase 2.1
+   [\#3618](https://github.com/matrix-org/matrix-react-sdk/pull/3618)
+ * Add better error handling to Synapse user deactivation
+   [\#3619](https://github.com/matrix-org/matrix-react-sdk/pull/3619)
+ * New design for member panel
+   [\#3620](https://github.com/matrix-org/matrix-react-sdk/pull/3620)
+ * Show server details on login for unreachable homeserver
+   [\#3617](https://github.com/matrix-org/matrix-react-sdk/pull/3617)
+ * Add a function to get the "base" theme for a theme
+   [\#3615](https://github.com/matrix-org/matrix-react-sdk/pull/3615)
+ * Remove Bluebird: phase 2
+   [\#3616](https://github.com/matrix-org/matrix-react-sdk/pull/3616)
+ * Remove Bluebird: phase 1
+   [\#3612](https://github.com/matrix-org/matrix-react-sdk/pull/3612)
+ * Move notification count to in front of the room name in the page title
+   [\#3613](https://github.com/matrix-org/matrix-react-sdk/pull/3613)
+ * Add some logging/recovery for lost rooms
+   [\#3614](https://github.com/matrix-org/matrix-react-sdk/pull/3614)
+ * Add Mjolnir ban list support
+   [\#3585](https://github.com/matrix-org/matrix-react-sdk/pull/3585)
+ * Improve room switching performance with alias cache
+   [\#3610](https://github.com/matrix-org/matrix-react-sdk/pull/3610)
+ * Fix draw order when hovering composer format buttons
+   [\#3609](https://github.com/matrix-org/matrix-react-sdk/pull/3609)
+ * Use a ternary operator instead of relying on AND semantics in
+   EditHistoryDialog
+   [\#3606](https://github.com/matrix-org/matrix-react-sdk/pull/3606)
+ * Update from Weblate
+   [\#3608](https://github.com/matrix-org/matrix-react-sdk/pull/3608)
+ * Fix HTML fallback in replies
+   [\#3607](https://github.com/matrix-org/matrix-react-sdk/pull/3607)
+ * Fix rounded corners for the formatting toolbar
+   [\#3605](https://github.com/matrix-org/matrix-react-sdk/pull/3605)
+ * Check for a message type before assuming it is a room message
+   [\#3604](https://github.com/matrix-org/matrix-react-sdk/pull/3604)
+ * Remove lint comments about no-descending-specificity
+   [\#3603](https://github.com/matrix-org/matrix-react-sdk/pull/3603)
+ * Show verification requests in the timeline
+   [\#3601](https://github.com/matrix-org/matrix-react-sdk/pull/3601)
+ * Match identity server registration to the IS r0.3.0 spec
+   [\#3602](https://github.com/matrix-org/matrix-react-sdk/pull/3602)
+ * Restore thumbs after variation selector removal
+   [\#3600](https://github.com/matrix-org/matrix-react-sdk/pull/3600)
+ * Fix breadcrumbs so the bar is a toolbar and the buttons are buttons.
+   [\#3599](https://github.com/matrix-org/matrix-react-sdk/pull/3599)
+ * Now that part of spacing is padding, make it smaller when collapsed
+   [\#3597](https://github.com/matrix-org/matrix-react-sdk/pull/3597)
+ * Remove variation selectors from quick reactions
+   [\#3598](https://github.com/matrix-org/matrix-react-sdk/pull/3598)
+ * Fix linkify imports
+   [\#3595](https://github.com/matrix-org/matrix-react-sdk/pull/3595)
+
 Changes in [1.7.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.2) (2019-11-06)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.1...v1.7.2)

From ef475bbdadd9c4ae1ab9057b6b18602cf39af137 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 20 Nov 2019 18:29:16 +0000
Subject: [PATCH 09/87] v1.7.3-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 57e8dd77e3..e5d2d7635c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "1.7.2",
+  "version": "1.7.3-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From fccf9f138e53fd8286cd42066233a16eff814d00 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 Nov 2019 22:32:11 +0000
Subject: [PATCH 10/87] Add eslint-plugin-jest because we inherit js-sdk's
 eslintrc and it wants

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json |  1 +
 yarn.lock    | 72 +++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index eb234e0573..fe399e4c49 100644
--- a/package.json
+++ b/package.json
@@ -135,6 +135,7 @@
     "eslint": "^5.12.0",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^5.2.1",
+    "eslint-plugin-jest": "^23.0.4",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-react": "^7.7.0",
     "eslint-plugin-react-hooks": "^2.0.1",
diff --git a/yarn.lock b/yarn.lock
index 3e43c29ef6..8bfaaa74c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -244,6 +244,11 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/json-schema@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
+  integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -293,6 +298,28 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@typescript-eslint/experimental-utils@^2.5.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.8.0.tgz#208b4164d175587e9b03ce6fea97d55f19c30ca9"
+  integrity sha512-jZ05E4SxCbbXseQGXOKf3ESKcsGxT8Ucpkp1jiVp55MGhOvZB2twmWKf894PAuVQTCgbPbJz9ZbRDqtUWzP8xA==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.8.0"
+    eslint-scope "^5.0.0"
+
+"@typescript-eslint/typescript-estree@2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.8.0.tgz#fcc3fe6532840085d29b75432c8a59895876aeca"
+  integrity sha512-ksvjBDTdbAQ04cR5JyFSDX113k66FxH1tAXmi+dj6hufsl/G0eMc/f1GgLjEVPkYClDbRKv+rnBFuE5EusomUw==
+  dependencies:
+    debug "^4.1.1"
+    eslint-visitor-keys "^1.1.0"
+    glob "^7.1.6"
+    is-glob "^4.0.1"
+    lodash.unescape "4.0.1"
+    semver "^6.3.0"
+    tsutils "^3.17.1"
+
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@@ -2891,6 +2918,13 @@ eslint-plugin-flowtype@^2.30.0:
   dependencies:
     lodash "^4.17.10"
 
+eslint-plugin-jest@^23.0.4:
+  version "23.0.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.4.tgz#1ab81ffe3b16c5168efa72cbd4db14d335092aa0"
+  integrity sha512-OaP8hhT8chJNodUPvLJ6vl8gnalcsU/Ww1t9oR3HnGdEWjm/DdCCUXLOral+IPGAeWu/EwgVQCK/QtxALpH1Yw==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "^2.5.0"
+
 eslint-plugin-react-hooks@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.0.1.tgz#e898ec26a0a335af6f7b0ad1f0bedda7143ed756"
@@ -2924,6 +2958,14 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-scope@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
+  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
 eslint-utils@^1.3.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
@@ -2931,7 +2973,7 @@ eslint-utils@^1.3.1:
   dependencies:
     eslint-visitor-keys "^1.0.0"
 
-eslint-visitor-keys@^1.0.0:
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
@@ -3714,6 +3756,18 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules@2.0.0, global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -5038,6 +5092,11 @@ lodash.mergewith@^4.6.1:
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
+lodash.unescape@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
+  integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
+
 lodash@^4.1.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -7149,7 +7208,7 @@ selection-is-backward@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@6.3.0:
+semver@6.3.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -8086,11 +8145,18 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
+tsutils@^3.17.1:
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
+  integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
+  dependencies:
+    tslib "^1.8.1"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"

From 62a2c7a51a58bbfb992565868da873ccbc65d682 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 16:26:06 -0700
Subject: [PATCH 11/87] Re-add encryption warning to widget permission prompt

---
 src/components/views/elements/AppPermission.js | 5 ++++-
 src/components/views/elements/AppTile.js       | 2 ++
 src/i18n/strings/en_EN.json                    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 422427d4c4..c514dbc950 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -30,6 +30,7 @@ export default class AppPermission extends React.Component {
         creatorUserId: PropTypes.string.isRequired,
         roomId: PropTypes.string.isRequired,
         onPermissionGranted: PropTypes.func.isRequired,
+        isRoomEncrypted: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -114,6 +115,8 @@ export default class AppPermission extends React.Component {
             : _t("Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
                 {widgetDomain: this.state.widgetDomain}, {helpIcon: () => warningTooltip});
 
+        const encryptionWarning = this.props.isRoomEncrypted ? _t("Widgets are not encrypted.") : null;
+
         return (
             <div className='mx_AppPermissionWarning'>
                 <div className='mx_AppPermissionWarning_row mx_AppPermissionWarning_bolder mx_AppPermissionWarning_smallText'>
@@ -128,7 +131,7 @@ export default class AppPermission extends React.Component {
                     {warning}
                 </div>
                 <div className='mx_AppPermissionWarning_row mx_AppPermissionWarning_smallText'>
-                    {_t("This widget may use cookies.")}
+                    {_t("This widget may use cookies.")}&nbsp;{encryptionWarning}
                 </div>
                 <div className='mx_AppPermissionWarning_row'>
                     <AccessibleButton kind='primary_sm' onClick={this.props.onPermissionGranted}>
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index db5978c792..4b0079098a 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -585,12 +585,14 @@ export default class AppTile extends React.Component {
                 </div>
             );
             if (!this.state.hasPermissionToLoad) {
+                const isEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
                 appTileBody = (
                     <div className={appTileBodyClass}>
                         <AppPermission
                             roomId={this.props.room.roomId}
                             creatorUserId={this.props.creatorUserId}
                             url={this.state.widgetUrl}
+                            isRoomEncrypted={isEncrypted}
                             onPermissionGranted={this._grantWidgetPermission}
                         />
                     </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7709a4a398..8b71a1e182 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1195,6 +1195,7 @@
     "Widget ID": "Widget ID",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
+    "Widgets are not encrypted.": "Widgets are not encrypted.",
     "Widget added by": "Widget added by",
     "This widget may use cookies.": "This widget may use cookies.",
     "Delete Widget": "Delete Widget",

From a40194194d10756414703abad5fc45cd5d180188 Mon Sep 17 00:00:00 2001
From: bkil <b.K.il.h.u+tigbuh@gmail.com>
Date: Thu, 21 Nov 2019 01:50:18 +0100
Subject: [PATCH 12/87] ReactionsRowButtonTooltip: fix null dereference if
 emoji owner left room

Signed-off-by: bkil <b.K.il.h.u+tigbuh@gmail.com>
---
 src/components/views/messages/ReactionsRowButtonTooltip.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.js b/src/components/views/messages/ReactionsRowButtonTooltip.js
index b70724d516..d7e1ef3488 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.js
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.js
@@ -43,7 +43,8 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
         if (room) {
             const senders = [];
             for (const reactionEvent of reactionEvents) {
-                const { name } = room.getMember(reactionEvent.getSender());
+                const member = room.getMember(reactionEvent.getSender());
+                const name = member ? member.name : reactionEvent.getSender();
                 senders.push(name);
             }
             const shortName = unicodeToShortcode(content);

From fd12eb28e76eab962d7748a63ce00907106c67c5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 19:17:42 -0700
Subject: [PATCH 13/87] Move many widget options to a context menu

Part of https://github.com/vector-im/riot-web/issues/11262
---
 res/css/_components.scss                      |   1 +
 .../context_menus/_WidgetContextMenu.scss     |  36 +++++
 res/css/views/rooms/_AppsDrawer.scss          |  32 +----
 res/img/feather-customised/widget/bin.svg     |  65 ---------
 res/img/feather-customised/widget/camera.svg  |   6 -
 res/img/feather-customised/widget/edit.svg    |   6 -
 res/img/feather-customised/widget/refresh.svg |   6 -
 .../feather-customised/widget/x-circle.svg    |   6 -
 .../views/context_menus/WidgetContextMenu.js  | 134 ++++++++++++++++++
 src/components/views/elements/AppTile.js      | 105 +++++++-------
 src/i18n/strings/en_EN.json                   |   8 +-
 11 files changed, 234 insertions(+), 171 deletions(-)
 create mode 100644 res/css/views/context_menus/_WidgetContextMenu.scss
 delete mode 100644 res/img/feather-customised/widget/bin.svg
 delete mode 100644 res/img/feather-customised/widget/camera.svg
 delete mode 100644 res/img/feather-customised/widget/edit.svg
 delete mode 100644 res/img/feather-customised/widget/refresh.svg
 delete mode 100644 res/img/feather-customised/widget/x-circle.svg
 create mode 100644 src/components/views/context_menus/WidgetContextMenu.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 40a2c576d0..45c0443cfb 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -48,6 +48,7 @@
 @import "./views/context_menus/_StatusMessageContextMenu.scss";
 @import "./views/context_menus/_TagTileContextMenu.scss";
 @import "./views/context_menus/_TopLeftMenu.scss";
+@import "./views/context_menus/_WidgetContextMenu.scss";
 @import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
 @import "./views/dialogs/_ChangelogDialog.scss";
diff --git a/res/css/views/context_menus/_WidgetContextMenu.scss b/res/css/views/context_menus/_WidgetContextMenu.scss
new file mode 100644
index 0000000000..314c3be7bb
--- /dev/null
+++ b/res/css/views/context_menus/_WidgetContextMenu.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2019 The Matrix.org Foundaction C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_WidgetContextMenu {
+    padding: 6px;
+
+  .mx_WidgetContextMenu_option {
+      padding: 3px 6px 3px 6px;
+      cursor: pointer;
+      white-space: nowrap;
+  }
+
+  .mx_WidgetContextMenu_separator {
+      margin-top: 0;
+      margin-bottom: 0;
+      border-bottom-style: none;
+      border-left-style: none;
+      border-right-style: none;
+      border-top-style: solid;
+      border-top-width: 1px;
+      border-color: $menu-border-color;
+  }
+}
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 6f5e3abade..a3fe573ad0 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -153,40 +153,12 @@ $AppsDrawerBodyHeight: 273px;
     background-color: $accent-color;
 }
 
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_reload {
-    mask-image: url('$(res)/img/feather-customised/widget/refresh.svg');
-    mask-size: 100%;
-}
-
 .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_popout {
     mask-image: url('$(res)/img/feather-customised/widget/external-link.svg');
 }
 
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_snapshot {
-    mask-image: url('$(res)/img/feather-customised/widget/camera.svg');
-}
-
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_edit {
-    mask-image: url('$(res)/img/feather-customised/widget/edit.svg');
-}
-
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_delete {
-    mask-image: url('$(res)/img/feather-customised/widget/bin.svg');
-    background-color: $warning-color;
-}
-
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_cancel {
-    mask-image: url('$(res)/img/feather-customised/widget/x-circle.svg');
-}
-
-/* delete ? */
-.mx_AppTileMenuBarWidget {
-    cursor: pointer;
-    width: 10px;
-    height: 10px;
-    padding: 1px;
-    transition-duration: 500ms;
-    border: 1px solid transparent;
+.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_menu {
+    mask-image: url('$(res)/img/icon_context.svg');
 }
 
 .mx_AppTileMenuBarWidgetDelete {
diff --git a/res/img/feather-customised/widget/bin.svg b/res/img/feather-customised/widget/bin.svg
deleted file mode 100644
index 7616d8931b..0000000000
--- a/res/img/feather-customised/widget/bin.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="11.014242"
-   height="12"
-   viewBox="0 0 11.014242 12"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="bin.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="750"
-     inkscape:window-height="480"
-     id="namedview8"
-     showgrid="false"
-     fit-margin-top="0.5"
-     fit-margin-left="0.5"
-     fit-margin-bottom="0.5"
-     fit-margin-right="0.5"
-     inkscape:zoom="19.666667"
-     inkscape:cx="5.5071212"
-     inkscape:cy="6"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg6" />
-  <g
-     id="g4"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     transform="translate(1.0071212)">
-    <path
-       d="M 0,3 H 9 M 8,3 v 7 A 1,1 0 0 1 7,11 H 2 A 1,1 0 0 1 1,10 V 3 M 2.5,3 V 2 a 1,1 0 0 1 1,-1 h 2 a 1,1 0 0 1 1,1 v 1 m -3,2.5 v 3 m 2,-3 v 3"
-       id="path2"
-       style="stroke:#000000;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/img/feather-customised/widget/camera.svg b/res/img/feather-customised/widget/camera.svg
deleted file mode 100644
index 5502493068..0000000000
--- a/res/img/feather-customised/widget/camera.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="11" viewBox="0 0 13 11">
-    <g fill="none" fill-rule="evenodd" stroke="#212121" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
-        <path d="M11 8a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V2.5a1 1 0 0 1 1-1h2L4 0h3l1 1.5h2a1 1 0 0 1 1 1V8z"/>
-        <circle cx="5.5" cy="5" r="2"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/widget/edit.svg b/res/img/feather-customised/widget/edit.svg
deleted file mode 100644
index 749e83f982..0000000000
--- a/res/img/feather-customised/widget/edit.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="11" viewBox="0 0 12 11">
-    <g fill="none" fill-rule="evenodd" stroke="#212121" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M10 6.33V9a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h2.67"/>
-        <path d="M9 0l2 2-5 5H4V5z"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/widget/refresh.svg b/res/img/feather-customised/widget/refresh.svg
deleted file mode 100644
index 0994bbdd52..0000000000
--- a/res/img/feather-customised/widget/refresh.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="11" viewBox="0 0 13 11">
-    <g fill="none" fill-rule="evenodd" stroke="#212121" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M12 1.5v3H9M1 9.5v-3h3"/>
-        <path d="M2.255 4A4.5 4.5 0 0 1 9.68 2.32L12 4.5m-11 2l2.32 2.18A4.5 4.5 0 0 0 10.745 7"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/widget/x-circle.svg b/res/img/feather-customised/widget/x-circle.svg
deleted file mode 100644
index 951407b39c..0000000000
--- a/res/img/feather-customised/widget/x-circle.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
-    <g fill="none" fill-rule="evenodd" stroke="#212121" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
-        <circle cx="5" cy="5" r="5"/>
-        <path d="M6.5 3.5l-3 3M3.5 3.5l3 3"/>
-    </g>
-</svg>
diff --git a/src/components/views/context_menus/WidgetContextMenu.js b/src/components/views/context_menus/WidgetContextMenu.js
new file mode 100644
index 0000000000..43e7e172cc
--- /dev/null
+++ b/src/components/views/context_menus/WidgetContextMenu.js
@@ -0,0 +1,134 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import {_t} from '../../../languageHandler';
+
+export default class WidgetContextMenu extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func,
+
+        // Callback for when the revoke button is clicked. Required.
+        onRevokeClicked: PropTypes.func.isRequired,
+
+        // Callback for when the snapshot button is clicked. Button not shown
+        // without a callback.
+        onSnapshotClicked: PropTypes.func,
+
+        // Callback for when the reload button is clicked. Button not shown
+        // without a callback.
+        onReloadClicked: PropTypes.func,
+
+        // Callback for when the edit button is clicked. Button not shown
+        // without a callback.
+        onEditClicked: PropTypes.func,
+
+        // Callback for when the delete button is clicked. Button not shown
+        // without a callback.
+        onDeleteClicked: PropTypes.func,
+    };
+
+    proxyClick(fn) {
+        fn();
+        if (this.props.onFinished) this.props.onFinished();
+    }
+
+    // XXX: It's annoying that our context menus require us to hit onFinished() to close :(
+
+    onEditClicked = () => {
+        this.proxyClick(this.props.onEditClicked);
+    };
+
+    onReloadClicked = () => {
+        this.proxyClick(this.props.onReloadClicked);
+    };
+
+    onSnapshotClicked = () => {
+        this.proxyClick(this.props.onSnapshotClicked);
+    };
+
+    onDeleteClicked = () => {
+        this.proxyClick(this.props.onDeleteClicked);
+    };
+
+    onRevokeClicked = () => {
+        this.proxyClick(this.props.onRevokeClicked);
+    };
+
+    render() {
+        const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
+
+        const options = [];
+
+        if (this.props.onEditClicked) {
+            options.push(
+                <AccessibleButton className='mx_WidgetContextMenu_option' onClick={this.onEditClicked} key='edit'>
+                    {_t("Edit")}
+                </AccessibleButton>,
+            );
+        }
+
+        if (this.props.onReloadClicked) {
+            options.push(
+                <AccessibleButton className='mx_WidgetContextMenu_option' onClick={this.onReloadClicked}
+                                  key='reload'>
+                    {_t("Reload")}
+                </AccessibleButton>,
+            );
+        }
+
+        if (this.props.onSnapshotClicked) {
+            options.push(
+                <AccessibleButton className='mx_WidgetContextMenu_option' onClick={this.onSnapshotClicked}
+                                  key='snap'>
+                    {_t("Take picture")}
+                </AccessibleButton>,
+            );
+        }
+
+        if (this.props.onDeleteClicked) {
+            options.push(
+                <AccessibleButton className='mx_WidgetContextMenu_option' onClick={this.onDeleteClicked}
+                                  key='delete'>
+                    {_t("Remove for everyone")}
+                </AccessibleButton>,
+            );
+        }
+
+        // Push this last so it appears last. It's always present.
+        options.push(
+            <AccessibleButton className='mx_WidgetContextMenu_option' onClick={this.onRevokeClicked} key='revoke'>
+                {_t("Remove for me")}
+            </AccessibleButton>,
+        );
+
+        // Put separators between the options
+        if (options.length > 1) {
+            const length = options.length;
+            for (let i = 0; i < length - 1; i++) {
+                const sep = <hr key={i} className="mx_WidgetContextMenu_separator" />;
+
+                // Insert backwards so the insertions don't affect our math on where to place them.
+                // We also use our cached length to avoid worrying about options.length changing
+                options.splice(length - 1 - i, 0, sep);
+            }
+        }
+
+        return <div className="mx_WidgetContextMenu">{options}</div>;
+    }
+}
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index db5978c792..0010e8022e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -35,6 +35,7 @@ import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import classNames from 'classnames';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import {createMenu} from "../../structures/ContextualMenu";
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
@@ -52,7 +53,7 @@ export default class AppTile extends React.Component {
         this._onLoaded = this._onLoaded.bind(this);
         this._onEditClick = this._onEditClick.bind(this);
         this._onDeleteClick = this._onDeleteClick.bind(this);
-        this._onCancelClick = this._onCancelClick.bind(this);
+        this._onRevokeClicked = this._onRevokeClicked.bind(this);
         this._onSnapshotClick = this._onSnapshotClick.bind(this);
         this.onClickMenuBar = this.onClickMenuBar.bind(this);
         this._onMinimiseClick = this._onMinimiseClick.bind(this);
@@ -271,7 +272,7 @@ export default class AppTile extends React.Component {
         return WidgetUtils.canUserModifyWidgets(this.props.room.roomId);
     }
 
-    _onEditClick(e) {
+    _onEditClick() {
         console.log("Edit widget ID ", this.props.id);
         if (this.props.onEditClick) {
             this.props.onEditClick();
@@ -293,7 +294,7 @@ export default class AppTile extends React.Component {
         }
     }
 
-    _onSnapshotClick(e) {
+    _onSnapshotClick() {
         console.warn("Requesting widget snapshot");
         ActiveWidgetStore.getWidgetMessaging(this.props.id).getScreenshot()
             .catch((err) => {
@@ -360,13 +361,9 @@ export default class AppTile extends React.Component {
         }
     }
 
-    _onCancelClick() {
-        if (this.props.onDeleteClick) {
-            this.props.onDeleteClick();
-        } else {
-            console.log("Revoke widget permissions - %s", this.props.id);
-            this._revokeWidgetPermission();
-        }
+    _onRevokeClicked() {
+        console.log("Revoke widget permissions - %s", this.props.id);
+        this._revokeWidgetPermission();
     }
 
     /**
@@ -544,18 +541,59 @@ export default class AppTile extends React.Component {
         }
     }
 
-    _onPopoutWidgetClick(e) {
+    _onPopoutWidgetClick() {
         // Using Object.assign workaround as the following opens in a new window instead of a new tab.
         // window.open(this._getSafeUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),
             { target: '_blank', href: this._getSafeUrl(), rel: 'noopener'}).click();
     }
 
-    _onReloadWidgetClick(e) {
+    _onReloadWidgetClick() {
         // Reload iframe in this way to avoid cross-origin restrictions
         this.refs.appFrame.src = this.refs.appFrame.src;
     }
 
+    _getMenuOptions(ev) {
+        // TODO: This block of code gets copy/pasted a lot. We should make that happen less.
+        const menuOptions = {};
+        const buttonRect = ev.target.getBoundingClientRect();
+        // The window X and Y offsets are to adjust position when zoomed in to page
+        const buttonLeft = buttonRect.left + window.pageXOffset;
+        const buttonTop = buttonRect.top + window.pageYOffset;
+        // Align the right edge of the menu to the left edge of the button
+        menuOptions.right = window.innerWidth - buttonLeft;
+        // Align the menu vertically on whichever side of the button has more
+        // space available.
+        if (buttonTop < window.innerHeight / 2) {
+            menuOptions.top = buttonTop;
+        } else {
+            menuOptions.bottom = window.innerHeight - buttonTop;
+        }
+        return menuOptions;
+    }
+
+    _onContextMenuClick = (ev) => {
+        const WidgetContextMenu = sdk.getComponent('views.context_menus.WidgetContextMenu');
+        const menuOptions = {
+            ...this._getMenuOptions(ev),
+
+            // A revoke handler is always required
+            onRevokeClicked: this._onRevokeClicked,
+        };
+
+        const canUserModify = this._canUserModify();
+        const showEditButton = Boolean(this._scalarClient && canUserModify);
+        const showDeleteButton = (this.props.showDelete === undefined || this.props.showDelete) && canUserModify;
+        const showPictureSnapshotButton = this._hasCapability('m.capability.screenshot') && this.props.show;
+
+        if (showEditButton) menuOptions.onEditClicked = this._onEditClick;
+        if (showDeleteButton) menuOptions.onDeleteClicked = this._onDeleteClick;
+        if (showPictureSnapshotButton) menuOptions.onSnapshotClicked = this._onSnapshotClick;
+        if (this.props.showReload) menuOptions.onReloadClicked = this._onReloadWidgetClick;
+
+        createMenu(WidgetContextMenu, menuOptions);
+    };
+
     render() {
         let appTileBody;
 
@@ -565,7 +603,7 @@ export default class AppTile extends React.Component {
         }
 
         // Note that there is advice saying allow-scripts shouldn't be used with allow-same-origin
-        // because that would allow the iframe to prgramatically remove the sandbox attribute, but
+        // because that would allow the iframe to programmatically remove the sandbox attribute, but
         // this would only be for content hosted on the same origin as the riot client: anything
         // hosted on the same origin as the client will get the same access as if you clicked
         // a link to it.
@@ -643,13 +681,6 @@ export default class AppTile extends React.Component {
             }
         }
 
-        // editing is done in scalar
-        const canUserModify = this._canUserModify();
-        const showEditButton = Boolean(this._scalarClient && canUserModify);
-        const showDeleteButton = (this.props.showDelete === undefined || this.props.showDelete) && canUserModify;
-        const showCancelButton = (this.props.showCancel === undefined || this.props.showCancel) && !showDeleteButton;
-        // Picture snapshot - only show button when apps are maximised.
-        const showPictureSnapshotButton = this._hasCapability('m.capability.screenshot') && this.props.show;
         const showMinimiseButton = this.props.showMinimise && this.props.show;
         const showMaximiseButton = this.props.showMinimise && !this.props.show;
 
@@ -688,41 +719,17 @@ export default class AppTile extends React.Component {
                         { this.props.showTitle && this._getTileTitle() }
                     </span>
                     <span className="mx_AppTileMenuBarWidgets">
-                        { /* Reload widget */ }
-                        { this.props.showReload && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_reload"
-                            title={_t('Reload widget')}
-                            onClick={this._onReloadWidgetClick}
-                        /> }
                         { /* Popout widget */ }
                         { this.props.showPopout && <AccessibleButton
                             className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_popout"
                             title={_t('Popout widget')}
                             onClick={this._onPopoutWidgetClick}
                         /> }
-                        { /* Snapshot widget */ }
-                        { showPictureSnapshotButton && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_snapshot"
-                            title={_t('Picture')}
-                            onClick={this._onSnapshotClick}
-                        /> }
-                        { /* Edit widget */ }
-                        { showEditButton && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_edit"
-                            title={_t('Edit')}
-                            onClick={this._onEditClick}
-                        /> }
-                        { /* Delete widget */ }
-                        { showDeleteButton && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_delete"
-                            title={_t('Delete widget')}
-                            onClick={this._onDeleteClick}
-                        /> }
-                        { /* Cancel widget */ }
-                        { showCancelButton && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_cancel"
-                            title={_t('Revoke widget access')}
-                            onClick={this._onCancelClick}
+                        { /* Context menu */ }
+                        { <AccessibleButton
+                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_menu"
+                            title={_t('More options')}
+                            onClick={this._onContextMenuClick}
                         /> }
                     </span>
                 </div> }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7709a4a398..dbe5cb3e08 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1204,10 +1204,8 @@
     "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
     "Minimize apps": "Minimize apps",
     "Maximize apps": "Maximize apps",
-    "Reload widget": "Reload widget",
     "Popout widget": "Popout widget",
-    "Picture": "Picture",
-    "Revoke widget access": "Revoke widget access",
+    "More options": "More options",
     "Create new room": "Create new room",
     "Unblacklist": "Unblacklist",
     "Blacklist": "Blacklist",
@@ -1564,6 +1562,10 @@
     "Hide": "Hide",
     "Home": "Home",
     "Sign in": "Sign in",
+    "Reload": "Reload",
+    "Take picture": "Take picture",
+    "Remove for everyone": "Remove for everyone",
+    "Remove for me": "Remove for me",
     "powered by Matrix": "powered by Matrix",
     "This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
     "Custom Server Options": "Custom Server Options",

From 66c51704cc7edb7f2bb758b5eba785f07681b200 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 19:21:10 -0700
Subject: [PATCH 14/87] Fix indentation

---
 .../context_menus/_WidgetContextMenu.scss     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/res/css/views/context_menus/_WidgetContextMenu.scss b/res/css/views/context_menus/_WidgetContextMenu.scss
index 314c3be7bb..60b7b93f99 100644
--- a/res/css/views/context_menus/_WidgetContextMenu.scss
+++ b/res/css/views/context_menus/_WidgetContextMenu.scss
@@ -17,20 +17,20 @@ limitations under the License.
 .mx_WidgetContextMenu {
     padding: 6px;
 
-  .mx_WidgetContextMenu_option {
-      padding: 3px 6px 3px 6px;
-      cursor: pointer;
-      white-space: nowrap;
-  }
+    .mx_WidgetContextMenu_option {
+        padding: 3px 6px 3px 6px;
+        cursor: pointer;
+        white-space: nowrap;
+    }
 
-  .mx_WidgetContextMenu_separator {
-      margin-top: 0;
-      margin-bottom: 0;
-      border-bottom-style: none;
-      border-left-style: none;
-      border-right-style: none;
-      border-top-style: solid;
-      border-top-width: 1px;
-      border-color: $menu-border-color;
-  }
+    .mx_WidgetContextMenu_separator {
+        margin-top: 0;
+        margin-bottom: 0;
+        border-bottom-style: none;
+        border-left-style: none;
+        border-right-style: none;
+        border-top-style: solid;
+        border-top-width: 1px;
+        border-color: $menu-border-color;
+    }
 }

From b0eb54541cbe18c67c91f9017ec609478bf53ce1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 19:50:13 -0700
Subject: [PATCH 15/87] Rip out options to change your integration manager

We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there.
---
 .../settings/_SetIntegrationManager.scss      |   8 -
 .../views/settings/SetIntegrationManager.js   | 153 +-----------------
 2 files changed, 2 insertions(+), 159 deletions(-)

diff --git a/res/css/views/settings/_SetIntegrationManager.scss b/res/css/views/settings/_SetIntegrationManager.scss
index 99537f9eb4..454fb95cf7 100644
--- a/res/css/views/settings/_SetIntegrationManager.scss
+++ b/res/css/views/settings/_SetIntegrationManager.scss
@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_SetIntegrationManager .mx_Field_input {
-    @mixin mx_Settings_fullWidthField;
-}
-
 .mx_SetIntegrationManager {
     margin-top: 10px;
     margin-bottom: 10px;
@@ -31,7 +27,3 @@ limitations under the License.
     display: inline-block;
     padding-left: 5px;
 }
-
-.mx_SetIntegrationManager_tooltip {
-    @mixin mx_Settings_tooltip;
-}
diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.js
index b1268c8048..2482b3c846 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.js
@@ -16,13 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../languageHandler";
-import sdk from '../../../index';
-import Field from "../elements/Field";
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import MatrixClientPeg from "../../../MatrixClientPeg";
-import {SERVICE_TYPES} from "matrix-js-sdk";
-import {IntegrationManagerInstance} from "../../../integrations/IntegrationManagerInstance";
-import Modal from "../../../Modal";
 
 export default class SetIntegrationManager extends React.Component {
     constructor() {
@@ -32,136 +26,10 @@ export default class SetIntegrationManager extends React.Component {
 
         this.state = {
             currentManager,
-            url: "", // user-entered text
-            error: null,
-            busy: false,
-            checking: false,
         };
     }
 
-    _onUrlChanged = (ev) => {
-        const u = ev.target.value;
-        this.setState({url: u});
-    };
-
-    _getTooltip = () => {
-        if (this.state.checking) {
-            const InlineSpinner = sdk.getComponent('views.elements.InlineSpinner');
-            return <div>
-                <InlineSpinner />
-                { _t("Checking server") }
-            </div>;
-        } else if (this.state.error) {
-            return <span className="warning">{this.state.error}</span>;
-        } else {
-            return null;
-        }
-    };
-
-    _canChange = () => {
-        return !!this.state.url && !this.state.busy;
-    };
-
-    _continueTerms = async (manager) => {
-        try {
-            await IntegrationManagers.sharedInstance().overwriteManagerOnAccount(manager);
-            this.setState({
-                busy: false,
-                error: null,
-                currentManager: IntegrationManagers.sharedInstance().getPrimaryManager(),
-                url: "", // clear input
-            });
-        } catch (e) {
-            console.error(e);
-            this.setState({
-                busy: false,
-                error: _t("Failed to update integration manager"),
-            });
-        }
-    };
-
-    _setManager = async (ev) => {
-        // Don't reload the page when the user hits enter in the form.
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        this.setState({busy: true, checking: true, error: null});
-
-        let offline = false;
-        let manager: IntegrationManagerInstance;
-        try {
-            manager = await IntegrationManagers.sharedInstance().tryDiscoverManager(this.state.url);
-            offline = !manager; // no manager implies offline
-        } catch (e) {
-            console.error(e);
-            offline = true; // probably a connection error
-        }
-        if (offline) {
-            this.setState({
-                busy: false,
-                checking: false,
-                error: _t("Integration manager offline or not accessible."),
-            });
-            return;
-        }
-
-        // Test the manager (causes terms of service prompt if agreement is needed)
-        // We also cancel the tooltip at this point so it doesn't collide with the dialog.
-        this.setState({checking: false});
-        try {
-            const client = manager.getScalarClient();
-            await client.connect();
-        } catch (e) {
-            console.error(e);
-            this.setState({
-                busy: false,
-                error: _t("Terms of service not accepted or the integration manager is invalid."),
-            });
-            return;
-        }
-
-        // Specifically request the terms of service to see if there are any.
-        // The above won't trigger a terms of service check if there are no terms to
-        // sign, so when there's no terms at all we need to ensure we tell the user.
-        let hasTerms = true;
-        try {
-            const terms = await MatrixClientPeg.get().getTerms(SERVICE_TYPES.IM, manager.trimmedApiUrl);
-            hasTerms = terms && terms['policies'] && Object.keys(terms['policies']).length > 0;
-        } catch (e) {
-            // Assume errors mean there are no terms. This could be a 404, 500, etc
-            console.error(e);
-            hasTerms = false;
-        }
-        if (!hasTerms) {
-            this.setState({busy: false});
-            const QuestionDialog = sdk.getComponent("views.dialogs.QuestionDialog");
-            Modal.createTrackedDialog('No Terms Warning', '', QuestionDialog, {
-                title: _t("Integration manager has no terms of service"),
-                description: (
-                    <div>
-                        <span className="warning">
-                            {_t("The integration manager you have chosen does not have any terms of service.")}
-                        </span>
-                        <span>
-                            &nbsp;{_t("Only continue if you trust the owner of the server.")}
-                        </span>
-                    </div>
-                ),
-                button: _t("Continue"),
-                onFinished: async (confirmed) => {
-                    if (!confirmed) return;
-                    this._continueTerms(manager);
-                },
-            });
-            return;
-        }
-
-        this._continueTerms(manager);
-    };
-
     render() {
-        const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
-
         const currentManager = this.state.currentManager;
         let managerName;
         let bodyText;
@@ -181,7 +49,7 @@ export default class SetIntegrationManager extends React.Component {
         }
 
         return (
-            <form className="mx_SettingsTab_section mx_SetIntegrationManager" onSubmit={this._setManager}>
+            <div className='mx_SetIntegrationManager'>
                 <div className="mx_SettingsTab_heading">
                     <span>{_t("Integration Manager")}</span>
                     <span className="mx_SettingsTab_subheading">{managerName}</span>
@@ -189,24 +57,7 @@ export default class SetIntegrationManager extends React.Component {
                 <span className="mx_SettingsTab_subsectionText">
                     {bodyText}
                 </span>
-                <Field
-                    label={_t("Enter a new integration manager")}
-                    id="mx_SetIntegrationManager_newUrl"
-                    type="text" value={this.state.url}
-                    autoComplete="off"
-                    onChange={this._onUrlChanged}
-                    tooltipContent={this._getTooltip()}
-                    tooltipClassName="mx_SetIntegrationManager_tooltip"
-                    disabled={this.state.busy}
-                    flagInvalid={!!this.state.error}
-                />
-                <AccessibleButton
-                    kind="primary_sm"
-                    type="submit"
-                    disabled={!this._canChange()}
-                    onClick={this._setManager}
-                >{_t("Change")}</AccessibleButton>
-            </form>
+            </div>
         );
     }
 }

From 0a0e952691808ed17787bf2950825a9567cfd2d8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 19:53:52 -0700
Subject: [PATCH 16/87] Update integration manager copy

---
 .../views/settings/SetIntegrationManager.js       | 15 +++++++++------
 src/i18n/strings/en_EN.json                       | 13 ++++---------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.js
index 2482b3c846..11dadb4918 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.js
@@ -36,26 +36,29 @@ export default class SetIntegrationManager extends React.Component {
         if (currentManager) {
             managerName = `(${currentManager.name})`;
             bodyText = _t(
-                "You are currently using <b>%(serverName)s</b> to manage your bots, widgets, " +
+                "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, " +
                 "and sticker packs.",
                 {serverName: currentManager.name},
                 { b: sub => <b>{sub}</b> },
             );
         } else {
-            bodyText = _t(
-                "Add which integration manager you want to manage your bots, widgets, " +
-                "and sticker packs.",
-            );
+            bodyText = _t("Use an Integration Manager to manage bots, widgets, and sticker packs.");
         }
 
         return (
             <div className='mx_SetIntegrationManager'>
                 <div className="mx_SettingsTab_heading">
-                    <span>{_t("Integration Manager")}</span>
+                    <span>{_t("Integrations")}</span>
                     <span className="mx_SettingsTab_subheading">{managerName}</span>
                 </div>
                 <span className="mx_SettingsTab_subsectionText">
                     {bodyText}
+                    <br />
+                    <br />
+                    {_t(
+                        "Integration Managers receive configuration data, and can modify widgets, " +
+                        "send room invites, and set power levels on your behalf.",
+                    )}
                 </span>
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7709a4a398..7f1a5ab851 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -598,15 +598,10 @@
     "Do not use an identity server": "Do not use an identity server",
     "Enter a new identity server": "Enter a new identity server",
     "Change": "Change",
-    "Failed to update integration manager": "Failed to update integration manager",
-    "Integration manager offline or not accessible.": "Integration manager offline or not accessible.",
-    "Terms of service not accepted or the integration manager is invalid.": "Terms of service not accepted or the integration manager is invalid.",
-    "Integration manager has no terms of service": "Integration manager has no terms of service",
-    "The integration manager you have chosen does not have any terms of service.": "The integration manager you have chosen does not have any terms of service.",
-    "You are currently using <b>%(serverName)s</b> to manage your bots, widgets, and sticker packs.": "You are currently using <b>%(serverName)s</b> to manage your bots, widgets, and sticker packs.",
-    "Add which integration manager you want to manage your bots, widgets, and sticker packs.": "Add which integration manager you want to manage your bots, widgets, and sticker packs.",
-    "Integration Manager": "Integration Manager",
-    "Enter a new integration manager": "Enter a new integration manager",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
+    "Integrations": "Integrations",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
     "Flair": "Flair",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
     "Success": "Success",

From 3391cc0d9017065c777c681381b5dcc0c8f9e9fc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 20:05:32 -0700
Subject: [PATCH 17/87] Add the toggle switch for provisioning

---
 .../views/settings/_SetIntegrationManager.scss  |  8 ++++++++
 .../views/settings/SetIntegrationManager.js     | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/res/css/views/settings/_SetIntegrationManager.scss b/res/css/views/settings/_SetIntegrationManager.scss
index 454fb95cf7..3e59ac73ac 100644
--- a/res/css/views/settings/_SetIntegrationManager.scss
+++ b/res/css/views/settings/_SetIntegrationManager.scss
@@ -27,3 +27,11 @@ limitations under the License.
     display: inline-block;
     padding-left: 5px;
 }
+
+.mx_SetIntegrationManager .mx_ToggleSwitch {
+    display: inline-block;
+    float: right;
+    top: 9px;
+
+    @mixin mx_Settings_fullWidthField;
+}
diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.js
index 11dadb4918..26c45e3d2a 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.js
@@ -17,6 +17,8 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../languageHandler";
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
+import sdk from '../../../index';
+import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 
 export default class SetIntegrationManager extends React.Component {
     constructor() {
@@ -26,10 +28,24 @@ export default class SetIntegrationManager extends React.Component {
 
         this.state = {
             currentManager,
+            provisioningEnabled: SettingsStore.getValue("integrationProvisioning"),
         };
     }
 
+    onProvisioningToggled = () => {
+        const current = this.state.provisioningEnabled;
+        SettingsStore.setValue("integrationProvisioning", null, SettingLevel.ACCOUNT, !current).catch(err => {
+            console.error("Error changing integration manager provisioning");
+            console.error(err);
+
+            this.setState({provisioningEnabled: current});
+        });
+        this.setState({provisioningEnabled: !current});
+    };
+
     render() {
+        const ToggleSwitch = sdk.getComponent("views.elements.ToggleSwitch");
+
         const currentManager = this.state.currentManager;
         let managerName;
         let bodyText;
@@ -50,6 +66,7 @@ export default class SetIntegrationManager extends React.Component {
                 <div className="mx_SettingsTab_heading">
                     <span>{_t("Integrations")}</span>
                     <span className="mx_SettingsTab_subheading">{managerName}</span>
+                    <ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} />
                 </div>
                 <span className="mx_SettingsTab_subsectionText">
                     {bodyText}

From 81c9bdd9f33580cc10ced8ac18c7cc31e171f9d8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 20:14:20 -0700
Subject: [PATCH 18/87] It's called an "Integration Manager" (singular)

Fixes https://github.com/vector-im/riot-web/issues/11256

This was finally annoying me enough to fix it.
---
 res/css/_components.scss                      |  2 +-
 res/css/views/dialogs/_TermsDialog.scss       |  4 ++--
 ...sManager.scss => _IntegrationManager.scss} | 10 ++++-----
 src/CallHandler.js                            |  2 +-
 .../dialogs/TabbedIntegrationManagerDialog.js |  8 +++----
 src/components/views/dialogs/TermsDialog.js   |  2 +-
 src/components/views/rooms/Stickerpicker.js   |  6 ++---
 ...ationsManager.js => IntegrationManager.js} | 22 +++++++++----------
 src/i18n/strings/en_EN.json                   | 16 +++++++-------
 .../IntegrationManagerInstance.js             | 14 ++++++------
 src/integrations/IntegrationManagers.js       |  7 +++---
 11 files changed, 46 insertions(+), 47 deletions(-)
 rename res/css/views/settings/{_IntegrationsManager.scss => _IntegrationManager.scss} (83%)
 rename src/components/views/settings/{IntegrationsManager.js => IntegrationManager.js} (81%)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 40a2c576d0..dc360c5caa 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -172,7 +172,7 @@
 @import "./views/rooms/_WhoIsTypingTile.scss";
 @import "./views/settings/_DevicesPanel.scss";
 @import "./views/settings/_EmailAddresses.scss";
-@import "./views/settings/_IntegrationsManager.scss";
+@import "./views/settings/_IntegrationManager.scss";
 @import "./views/settings/_KeyBackupPanel.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";
diff --git a/res/css/views/dialogs/_TermsDialog.scss b/res/css/views/dialogs/_TermsDialog.scss
index aad679a5b3..beb507e778 100644
--- a/res/css/views/dialogs/_TermsDialog.scss
+++ b/res/css/views/dialogs/_TermsDialog.scss
@@ -16,10 +16,10 @@ limitations under the License.
 
 /*
  * To avoid visual glitching of two modals stacking briefly, we customise the
- * terms dialog sizing when it will appear for the integrations manager so that
+ * terms dialog sizing when it will appear for the integration manager so that
  * it gets the same basic size as the IM's own modal.
  */
-.mx_TermsDialog_forIntegrationsManager .mx_Dialog {
+.mx_TermsDialog_forIntegrationManager .mx_Dialog {
     width: 60%;
     height: 70%;
     box-sizing: border-box;
diff --git a/res/css/views/settings/_IntegrationsManager.scss b/res/css/views/settings/_IntegrationManager.scss
similarity index 83%
rename from res/css/views/settings/_IntegrationsManager.scss
rename to res/css/views/settings/_IntegrationManager.scss
index 8b51eb272e..81b01ab8de 100644
--- a/res/css/views/settings/_IntegrationsManager.scss
+++ b/res/css/views/settings/_IntegrationManager.scss
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_IntegrationsManager .mx_Dialog {
+.mx_IntegrationManager .mx_Dialog {
     width: 60%;
     height: 70%;
     overflow: hidden;
@@ -23,22 +23,22 @@ limitations under the License.
     max-height: initial;
 }
 
-.mx_IntegrationsManager iframe {
+.mx_IntegrationManager iframe {
     background-color: #fff;
     border: 0px;
     width: 100%;
     height: 100%;
 }
 
-.mx_IntegrationsManager_loading h3 {
+.mx_IntegrationManager_loading h3 {
     text-align: center;
 }
 
-.mx_IntegrationsManager_error {
+.mx_IntegrationManager_error {
     text-align: center;
     padding-top: 20px;
 }
 
-.mx_IntegrationsManager_error h3 {
+.mx_IntegrationManager_error h3 {
     color: $warning-color;
 }
diff --git a/src/CallHandler.js b/src/CallHandler.js
index bcdf7853fd..625ca8c551 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -382,7 +382,7 @@ function _onAction(payload) {
 }
 
 async function _startCallApp(roomId, type) {
-    // check for a working integrations manager. Technically we could put
+    // check for a working integration manager. Technically we could put
     // the state event in anyway, but the resulting widget would then not
     // work for us. Better that the user knows before everyone else in the
     // room sees it.
diff --git a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
index 5ef7aef9ab..e86a46fb36 100644
--- a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
+++ b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
@@ -82,10 +82,10 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
 
         client.setTermsInteractionCallback((policyInfo, agreedUrls) => {
             // To avoid visual glitching of two modals stacking briefly, we customise the
-            // terms dialog sizing when it will appear for the integrations manager so that
+            // terms dialog sizing when it will appear for the integration manager so that
             // it gets the same basic size as the IM's own modal.
             return dialogTermsInteractionCallback(
-                policyInfo, agreedUrls, 'mx_TermsDialog_forIntegrationsManager',
+                policyInfo, agreedUrls, 'mx_TermsDialog_forIntegrationManager',
             );
         });
 
@@ -139,7 +139,7 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
     }
 
     _renderTab() {
-        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+        const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
         let uiUrl = null;
         if (this.state.currentScalarClient) {
             uiUrl = this.state.currentScalarClient.getScalarInterfaceUrlForRoom(
@@ -148,7 +148,7 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
                 this.props.integrationId,
             );
         }
-        return <IntegrationsManager
+        return <IntegrationManager
             configured={true}
             loading={this.state.currentLoading}
             connected={this.state.currentConnected}
diff --git a/src/components/views/dialogs/TermsDialog.js b/src/components/views/dialogs/TermsDialog.js
index 6fd818c97c..ea090ef080 100644
--- a/src/components/views/dialogs/TermsDialog.js
+++ b/src/components/views/dialogs/TermsDialog.js
@@ -86,7 +86,7 @@ export default class TermsDialog extends React.PureComponent {
             case Matrix.SERVICE_TYPES.IS:
                 return <div>{_t("Identity Server")}<br />({host})</div>;
             case Matrix.SERVICE_TYPES.IM:
-                return <div>{_t("Integrations Manager")}<br />({host})</div>;
+                return <div>{_t("Integration Manager")}<br />({host})</div>;
         }
     }
 
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 28e51ed12e..47239cf33f 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -74,10 +74,10 @@ export default class Stickerpicker extends React.Component {
                 this.forceUpdate();
                 return this.scalarClient;
             }).catch((e) => {
-                this._imError(_td("Failed to connect to integrations server"), e);
+                this._imError(_td("Failed to connect to integration manager"), e);
             });
         } else {
-            this._imError(_td("No integrations server is configured to manage stickers with"));
+            this._imError(_td("No integration manager is configured to manage stickers with"));
         }
     }
 
@@ -346,7 +346,7 @@ export default class Stickerpicker extends React.Component {
     }
 
     /**
-     * Launch the integrations manager on the stickers integration page
+     * Launch the integration manager on the stickers integration page
      */
     _launchManageIntegrations() {
         // TODO: Open the right integration manager for the widget
diff --git a/src/components/views/settings/IntegrationsManager.js b/src/components/views/settings/IntegrationManager.js
similarity index 81%
rename from src/components/views/settings/IntegrationsManager.js
rename to src/components/views/settings/IntegrationManager.js
index d463b043d5..97c469e9aa 100644
--- a/src/components/views/settings/IntegrationsManager.js
+++ b/src/components/views/settings/IntegrationManager.js
@@ -21,12 +21,12 @@ import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher';
 
-export default class IntegrationsManager extends React.Component {
+export default class IntegrationManager extends React.Component {
     static propTypes = {
-        // false to display an error saying that there is no integrations manager configured
+        // false to display an error saying that there is no integration manager configured
         configured: PropTypes.bool.isRequired,
 
-        // false to display an error saying that we couldn't connect to the integrations manager
+        // false to display an error saying that we couldn't connect to the integration manager
         connected: PropTypes.bool.isRequired,
 
         // true to display a loading spinner
@@ -72,9 +72,9 @@ export default class IntegrationsManager extends React.Component {
     render() {
         if (!this.props.configured) {
             return (
-                <div className='mx_IntegrationsManager_error'>
-                    <h3>{_t("No integrations server configured")}</h3>
-                    <p>{_t("This Riot instance does not have an integrations server configured.")}</p>
+                <div className='mx_IntegrationManager_error'>
+                    <h3>{_t("No integration manager configured")}</h3>
+                    <p>{_t("This Riot instance does not have an integration manager configured.")}</p>
                 </div>
             );
         }
@@ -82,8 +82,8 @@ export default class IntegrationsManager extends React.Component {
         if (this.props.loading) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return (
-                <div className='mx_IntegrationsManager_loading'>
-                    <h3>{_t("Connecting to integrations server...")}</h3>
+                <div className='mx_IntegrationManager_loading'>
+                    <h3>{_t("Connecting to integration manager...")}</h3>
                     <Spinner />
                 </div>
             );
@@ -91,9 +91,9 @@ export default class IntegrationsManager extends React.Component {
 
         if (!this.props.connected) {
             return (
-                <div className='mx_IntegrationsManager_error'>
-                    <h3>{_t("Cannot connect to integrations server")}</h3>
-                    <p>{_t("The integrations server is offline or it cannot reach your homeserver.")}</p>
+                <div className='mx_IntegrationManager_error'>
+                    <h3>{_t("Cannot connect to integration manager")}</h3>
+                    <p>{_t("The integration manager is offline or it cannot reach your homeserver.")}</p>
                 </div>
             );
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7f1a5ab851..0735a8e4b3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -507,11 +507,11 @@
     "Failed to set display name": "Failed to set display name",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
-    "No integrations server configured": "No integrations server configured",
-    "This Riot instance does not have an integrations server configured.": "This Riot instance does not have an integrations server configured.",
-    "Connecting to integrations server...": "Connecting to integrations server...",
-    "Cannot connect to integrations server": "Cannot connect to integrations server",
-    "The integrations server is offline or it cannot reach your homeserver.": "The integrations server is offline or it cannot reach your homeserver.",
+    "No integration manager configured": "No integration manager configured",
+    "This Riot instance does not have an integration manager configured.": "This Riot instance does not have an integration manager configured.",
+    "Connecting to integration manager...": "Connecting to integration manager...",
+    "Cannot connect to integration manager": "Cannot connect to integration manager",
+    "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
     "Delete Backup": "Delete Backup",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
@@ -1019,8 +1019,8 @@
     "numbered-list": "numbered-list",
     "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
     "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
-    "Failed to connect to integrations server": "Failed to connect to integrations server",
-    "No integrations server is configured to manage stickers with": "No integrations server is configured to manage stickers with",
+    "Failed to connect to integration manager": "Failed to connect to integration manager",
+    "No integration manager is configured to manage stickers with": "No integration manager is configured to manage stickers with",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Add some now": "Add some now",
     "Stickerpack": "Stickerpack",
@@ -1470,7 +1470,7 @@
     "Missing session data": "Missing session data",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.",
     "Your browser likely removed this data when running low on disk space.": "Your browser likely removed this data when running low on disk space.",
-    "Integrations Manager": "Integrations Manager",
+    "Integration Manager": "Integration Manager",
     "Find others by phone or email": "Find others by phone or email",
     "Be found by phone or email": "Be found by phone or email",
     "Use bots, bridges, widgets and sticker packs": "Use bots, bridges, widgets and sticker packs",
diff --git a/src/integrations/IntegrationManagerInstance.js b/src/integrations/IntegrationManagerInstance.js
index d36fa73d48..2b616c9fed 100644
--- a/src/integrations/IntegrationManagerInstance.js
+++ b/src/integrations/IntegrationManagerInstance.js
@@ -57,19 +57,19 @@ export class IntegrationManagerInstance {
     }
 
     async open(room: Room = null, screen: string = null, integrationId: string = null): void {
-        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+        const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
         const dialog = Modal.createTrackedDialog(
-            'Integration Manager', '', IntegrationsManager,
-            {loading: true}, 'mx_IntegrationsManager',
+            'Integration Manager', '', IntegrationManager,
+            {loading: true}, 'mx_IntegrationManager',
         );
 
         const client = this.getScalarClient();
         client.setTermsInteractionCallback((policyInfo, agreedUrls) => {
             // To avoid visual glitching of two modals stacking briefly, we customise the
-            // terms dialog sizing when it will appear for the integrations manager so that
+            // terms dialog sizing when it will appear for the integration manager so that
             // it gets the same basic size as the IM's own modal.
             return dialogTermsInteractionCallback(
-                policyInfo, agreedUrls, 'mx_TermsDialog_forIntegrationsManager',
+                policyInfo, agreedUrls, 'mx_TermsDialog_forIntegrationManager',
             );
         });
 
@@ -94,8 +94,8 @@ export class IntegrationManagerInstance {
         // Close the old dialog and open a new one
         dialog.close();
         Modal.createTrackedDialog(
-            'Integration Manager', '', IntegrationsManager,
-            newProps, 'mx_IntegrationsManager',
+            'Integration Manager', '', IntegrationManager,
+            newProps, 'mx_IntegrationManager',
         );
     }
 }
diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.js
index a0fbff56fb..96fd18b5b8 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.js
@@ -172,11 +172,10 @@ export class IntegrationManagers {
     }
 
     openNoManagerDialog(): void {
-        // TODO: Is it Integrations (plural) or Integration (singular). Singular is easier spoken.
-        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+        const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
         Modal.createTrackedDialog(
-            "Integration Manager", "None", IntegrationsManager,
-            {configured: false}, 'mx_IntegrationsManager',
+            "Integration Manager", "None", IntegrationManager,
+            {configured: false}, 'mx_IntegrationManager',
         );
     }
 

From 94fed922cfe3c61ca3fd6169efdb1c4e54405778 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 20:40:39 -0700
Subject: [PATCH 19/87] Intercept cases of disabled/no integration managers

We already intercepted most of the cases where no integration manager was present, though there was a bug in many components where openAll() would be called regardless of an integration manager being available.

The integration manager being disabled by the user is handled in the IntegrationManager classes rather than on click because we have quite a few calls to these functions. The StickerPicker is an exception because it does slightly different behaviour.

This also removes the old "no integration manager configured" state from the IntegrationManager component as it is now replaced by a dialog.
---
 .../dialogs/IntegrationsDisabledDialog.js     | 57 +++++++++++++++++++
 .../dialogs/IntegrationsImpossibleDialog.js   | 55 ++++++++++++++++++
 src/components/views/rooms/Stickerpicker.js   |  7 ++-
 .../views/settings/IntegrationManager.js      | 13 -----
 src/i18n/strings/en_EN.json                   |  7 ++-
 .../IntegrationManagerInstance.js             |  6 ++
 src/integrations/IntegrationManagers.js       | 24 ++++++--
 7 files changed, 147 insertions(+), 22 deletions(-)
 create mode 100644 src/components/views/dialogs/IntegrationsDisabledDialog.js
 create mode 100644 src/components/views/dialogs/IntegrationsImpossibleDialog.js

diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.js b/src/components/views/dialogs/IntegrationsDisabledDialog.js
new file mode 100644
index 0000000000..3ab1123f8b
--- /dev/null
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.js
@@ -0,0 +1,57 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {_t} from "../../../languageHandler";
+import sdk from "../../../index";
+import dis from '../../../dispatcher';
+
+export default class IntegrationsDisabledDialog extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    _onAcknowledgeClick = () => {
+        this.props.onFinished();
+    };
+
+    _onOpenSettingsClick = () => {
+        this.props.onFinished();
+        dis.dispatch({action: "view_user_settings"});
+    };
+
+    render() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+
+        return (
+            <BaseDialog className='mx_IntegrationsDisabledDialog' hasCancel={true}
+                        onFinished={this.props.onFinished}
+                        title={_t("Integrations are disabled")}>
+                <div className='mx_IntegrationsDisabledDialog_content'>
+                    <p>{_t("Enable 'Manage Integrations' in Settings to do this.")}</p>
+                </div>
+                <DialogButtons
+                    primaryButton={_t("Settings")}
+                    onPrimaryButtonClick={this._onOpenSettingsClick}
+                    cancelButton={_t("OK")}
+                    onCancel={this._onAcknowledgeClick}
+                />
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/dialogs/IntegrationsImpossibleDialog.js b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
new file mode 100644
index 0000000000..9927f627f1
--- /dev/null
+++ b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
@@ -0,0 +1,55 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {_t} from "../../../languageHandler";
+import sdk from "../../../index";
+
+export default class IntegrationsImpossibleDialog extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    _onAcknowledgeClick = () => {
+        this.props.onFinished();
+    };
+
+    render() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+
+        return (
+            <BaseDialog className='mx_IntegrationsImpossibleDialog' hasCancel={false}
+                        onFinished={this.props.onFinished}
+                        title={_t("Integrations not allowed")}>
+                <div className='mx_IntegrationsImpossibleDialog_content'>
+                    <p>
+                        {_t(
+                            "Your Riot doesn't allow you to use an Integration Manager to do this. " +
+                            "Please contact an admin.",
+                        )}
+                    </p>
+                </div>
+                <DialogButtons
+                    primaryButton={_t("OK")}
+                    onPrimaryButtonClick={this._onAcknowledgeClick}
+                    hasCancel={false}
+                />
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 47239cf33f..d35285463a 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -77,7 +77,7 @@ export default class Stickerpicker extends React.Component {
                 this._imError(_td("Failed to connect to integration manager"), e);
             });
         } else {
-            this._imError(_td("No integration manager is configured to manage stickers with"));
+            IntegrationManagers.sharedInstance().openNoManagerDialog();
         }
     }
 
@@ -293,6 +293,11 @@ export default class Stickerpicker extends React.Component {
      * @param  {Event} e Event that triggered the function
      */
     _onShowStickersClick(e) {
+        if (!SettingsStore.getValue("integrationProvisioning")) {
+            // Intercept this case and spawn a warning.
+            return IntegrationManagers.sharedInstance().showDisabledDialog();
+        }
+
         // XXX: Simplify by using a context menu that is positioned relative to the sticker picker button
 
         const buttonRect = e.target.getBoundingClientRect();
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.js
index 97c469e9aa..1ab17ca8a0 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.js
@@ -23,9 +23,6 @@ import dis from '../../../dispatcher';
 
 export default class IntegrationManager extends React.Component {
     static propTypes = {
-        // false to display an error saying that there is no integration manager configured
-        configured: PropTypes.bool.isRequired,
-
         // false to display an error saying that we couldn't connect to the integration manager
         connected: PropTypes.bool.isRequired,
 
@@ -40,7 +37,6 @@ export default class IntegrationManager extends React.Component {
     };
 
     static defaultProps = {
-        configured: true,
         connected: true,
         loading: false,
     };
@@ -70,15 +66,6 @@ export default class IntegrationManager extends React.Component {
     };
 
     render() {
-        if (!this.props.configured) {
-            return (
-                <div className='mx_IntegrationManager_error'>
-                    <h3>{_t("No integration manager configured")}</h3>
-                    <p>{_t("This Riot instance does not have an integration manager configured.")}</p>
-                </div>
-            );
-        }
-
         if (this.props.loading) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0735a8e4b3..375124b4dc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -507,8 +507,6 @@
     "Failed to set display name": "Failed to set display name",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
-    "No integration manager configured": "No integration manager configured",
-    "This Riot instance does not have an integration manager configured.": "This Riot instance does not have an integration manager configured.",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
     "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
@@ -1020,7 +1018,6 @@
     "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
     "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
     "Failed to connect to integration manager": "Failed to connect to integration manager",
-    "No integration manager is configured to manage stickers with": "No integration manager is configured to manage stickers with",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Add some now": "Add some now",
     "Stickerpack": "Stickerpack",
@@ -1393,6 +1390,10 @@
     "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.",
     "Waiting for partner to confirm...": "Waiting for partner to confirm...",
     "Incoming Verification Request": "Incoming Verification Request",
+    "Integrations are disabled": "Integrations are disabled",
+    "Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
+    "Integrations not allowed": "Integrations not allowed",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
     "Start verification": "Start verification",
diff --git a/src/integrations/IntegrationManagerInstance.js b/src/integrations/IntegrationManagerInstance.js
index 2b616c9fed..4958209351 100644
--- a/src/integrations/IntegrationManagerInstance.js
+++ b/src/integrations/IntegrationManagerInstance.js
@@ -20,6 +20,8 @@ import {dialogTermsInteractionCallback, TermsNotSignedError} from "../Terms";
 import type {Room} from "matrix-js-sdk";
 import Modal from '../Modal';
 import url from 'url';
+import SettingsStore from "../settings/SettingsStore";
+import {IntegrationManagers} from "./IntegrationManagers";
 
 export const KIND_ACCOUNT = "account";
 export const KIND_CONFIG = "config";
@@ -57,6 +59,10 @@ export class IntegrationManagerInstance {
     }
 
     async open(room: Room = null, screen: string = null, integrationId: string = null): void {
+        if (!SettingsStore.getValue("integrationProvisioning")) {
+            return IntegrationManagers.sharedInstance().showDisabledDialog();
+        }
+
         const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
         const dialog = Modal.createTrackedDialog(
             'Integration Manager', '', IntegrationManager,
diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.js
index 96fd18b5b8..60ceb49dc0 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.js
@@ -22,6 +22,10 @@ import type {MatrixClient, MatrixEvent, Room} from "matrix-js-sdk";
 import WidgetUtils from "../utils/WidgetUtils";
 import MatrixClientPeg from "../MatrixClientPeg";
 import {AutoDiscovery} from "matrix-js-sdk";
+import {_t} from "../languageHandler";
+import dis from "../dispatcher";
+import React from 'react';
+import SettingsStore from "../settings/SettingsStore";
 
 const HS_MANAGERS_REFRESH_INTERVAL = 8 * 60 * 60 * 1000; // 8 hours
 const KIND_PREFERENCE = [
@@ -172,14 +176,19 @@ export class IntegrationManagers {
     }
 
     openNoManagerDialog(): void {
-        const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
-        Modal.createTrackedDialog(
-            "Integration Manager", "None", IntegrationManager,
-            {configured: false}, 'mx_IntegrationManager',
-        );
+        const IntegrationsImpossibleDialog = sdk.getComponent("dialogs.IntegrationsImpossibleDialog");
+        Modal.createTrackedDialog('Integrations impossible', '', IntegrationsImpossibleDialog);
     }
 
     openAll(room: Room = null, screen: string = null, integrationId: string = null): void {
+        if (!SettingsStore.getValue("integrationProvisioning")) {
+            return this.showDisabledDialog();
+        }
+
+        if (this._managers.length === 0) {
+            return this.openNoManagerDialog();
+        }
+
         const TabbedIntegrationManagerDialog = sdk.getComponent("views.dialogs.TabbedIntegrationManagerDialog");
         Modal.createTrackedDialog(
             'Tabbed Integration Manager', '', TabbedIntegrationManagerDialog,
@@ -187,6 +196,11 @@ export class IntegrationManagers {
         );
     }
 
+    showDisabledDialog(): void {
+        const IntegrationsDisabledDialog = sdk.getComponent("dialogs.IntegrationsDisabledDialog");
+        Modal.createTrackedDialog('Integrations disabled', '', IntegrationsDisabledDialog);
+    }
+
     async overwriteManagerOnAccount(manager: IntegrationManagerInstance) {
         // TODO: TravisR - We should be logging out of scalar clients.
         await WidgetUtils.removeIntegrationManagerWidgets();

From 560c0afae3d0ea6cf9b7a0b2df508b339c9734d4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 20:45:16 -0700
Subject: [PATCH 20/87] Appease the linter

---
 src/components/views/rooms/Stickerpicker.js | 1 +
 src/integrations/IntegrationManagers.js     | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index d35285463a..879b7c7582 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -291,6 +291,7 @@ export default class Stickerpicker extends React.Component {
      * Show the sticker picker overlay
      * If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
      * @param  {Event} e Event that triggered the function
+     * @returns Nothing of use when the thing happens.
      */
     _onShowStickersClick(e) {
         if (!SettingsStore.getValue("integrationProvisioning")) {
diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.js
index 60ceb49dc0..6c4d2ae4d4 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.js
@@ -22,9 +22,6 @@ import type {MatrixClient, MatrixEvent, Room} from "matrix-js-sdk";
 import WidgetUtils from "../utils/WidgetUtils";
 import MatrixClientPeg from "../MatrixClientPeg";
 import {AutoDiscovery} from "matrix-js-sdk";
-import {_t} from "../languageHandler";
-import dis from "../dispatcher";
-import React from 'react';
 import SettingsStore from "../settings/SettingsStore";
 
 const HS_MANAGERS_REFRESH_INTERVAL = 8 * 60 * 60 * 1000; // 8 hours

From a69d818a0de2a22a7267dee89e34b17a88d29ad2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 20:49:41 -0700
Subject: [PATCH 21/87] Our linter is seriously picky.

---
 src/components/views/rooms/Stickerpicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 879b7c7582..25001a2b80 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -291,7 +291,7 @@ export default class Stickerpicker extends React.Component {
      * Show the sticker picker overlay
      * If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
      * @param  {Event} e Event that triggered the function
-     * @returns Nothing of use when the thing happens.
+     * @return Nothing of use when the thing happens.
      */
     _onShowStickersClick(e) {
         if (!SettingsStore.getValue("integrationProvisioning")) {

From 670c14b2e3f00588c99916043b4bca4225aae54b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Nov 2019 20:54:21 -0700
Subject: [PATCH 22/87] Circumvent the linter

---
 src/components/views/rooms/Stickerpicker.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 25001a2b80..7eabf27528 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -287,11 +287,10 @@ export default class Stickerpicker extends React.Component {
         return stickersContent;
     }
 
-    /**
+    // Dev note: this isn't jsdoc because it's angry.
+    /*
      * Show the sticker picker overlay
      * If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
-     * @param  {Event} e Event that triggered the function
-     * @return Nothing of use when the thing happens.
      */
     _onShowStickersClick(e) {
         if (!SettingsStore.getValue("integrationProvisioning")) {

From 8c02893da7616a2ceadd976e7e98a93b20f5be1f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 08:58:13 +0000
Subject: [PATCH 23/87] Update CIDER docs now that it is used for main composer
 as well

---
 docs/ciderEditor.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/ciderEditor.md b/docs/ciderEditor.md
index e67c74a95c..00033b5b8c 100644
--- a/docs/ciderEditor.md
+++ b/docs/ciderEditor.md
@@ -2,8 +2,7 @@
 
 The CIDER editor is a custom editor written for Riot.
 Most of the code can be found in the `/editor/` directory of the `matrix-react-sdk` project.
-It is used to power the composer to edit messages,
-and will soon be used as the main composer to send messages as well.
+It is used to power the composer main composer (both to send and edit messages), and might be used for other usecases where autocomplete is desired (invite box, ...).
 
 ## High-level overview.
 

From 5670a524693c3cc267065dd782967078a27a74d6 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 21 Nov 2019 02:52:36 +0000
Subject: [PATCH 24/87] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1919 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 1dfdc34f1a..2d6d3f55bc 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2344,5 +2344,7 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "使用這個小工具可能會與 %(widgetDomain)s 以及您的整合管理員分享資料 <helpIcon />。",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "使用這個小工具可能會與 %(widgetDomain)s 分享資料 <helpIcon /> 。",
     "Widget added by": "小工具新增由",
-    "This widget may use cookies.": "這個小工具可能會使用 cookies。"
+    "This widget may use cookies.": "這個小工具可能會使用 cookies。",
+    "Enable local event indexing and E2EE search (requires restart)": "啟用本機事件索引與端到端加密搜尋（需要重新啟動）",
+    "Match system dark mode setting": "與系統深色模式設定相符"
 }

From 670d44ecd8bfdf41026cfbed45ca5d7f120f5137 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Thu, 21 Nov 2019 11:36:43 +0000
Subject: [PATCH 25/87] Translated using Weblate (Finnish)

Currently translated at 96.1% (1845 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
---
 src/i18n/strings/fi.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 80fbb9b138..81a8563e5b 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2137,5 +2137,25 @@
     "%(count)s unread messages including mentions.|one": "Yksi lukematon maininta.",
     "%(count)s unread messages.|one": "Yksi lukematon viesti.",
     "Unread messages.": "Lukemattomat viestit.",
-    "Message Actions": "Viestitoiminnot"
+    "Message Actions": "Viestitoiminnot",
+    "Custom (%(level)s)": "Mukautettu (%(level)s)",
+    "Match system dark mode setting": "Sovita järjestelmän tumman tilan asetukseen",
+    "None": "Ei mitään",
+    "Unsubscribe": "Lopeta tilaus",
+    "View rules": "Näytä säännöt",
+    "Subscribe": "Tilaa",
+    "Direct message": "Yksityisviesti",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> huoneessa %(roomName)s",
+    "Security": "Tietoturva",
+    "Any of the following data may be shared:": "Seuraavat tiedot saatetaan jakaa:",
+    "Your display name": "Näyttönimesi",
+    "Your avatar URL": "Kuvasi URL-osoite",
+    "Your user ID": "Käyttäjätunnuksesi",
+    "Your theme": "Teemasi",
+    "Riot URL": "Riotin URL-osoite",
+    "Room ID": "Huoneen tunnus",
+    "Widget ID": "Sovelman tunnus",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Tämän sovelman käyttäminen voi jakaa tietoja <helpIcon /> verkkotunnukselle %(widgetDomain)s.",
+    "Widget added by": "Sovelman lisäsi",
+    "This widget may use cookies.": "Tämä sovelma saattaa käyttää evästeitä."
 }

From ad941b96e09c863dd5c2a8add15c455ea9ce9218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 21 Nov 2019 11:17:02 +0000
Subject: [PATCH 26/87] Translated using Weblate (French)

Currently translated at 100.0% (1919 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 64272bb839..e58cb187e8 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2351,5 +2351,7 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s.",
     "Widget added by": "Widget ajouté par",
     "This widget may use cookies.": "Ce widget pourrait utiliser des cookies.",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Envoyer les demandes de vérification en message direct, en incluant une nouvelle expérience de vérification dans le tableau des membres."
+    "Send verification requests in direct message, including a new verification UX in the member panel.": "Envoyer les demandes de vérification en message direct, en incluant une nouvelle expérience de vérification dans le tableau des membres.",
+    "Enable local event indexing and E2EE search (requires restart)": "Activer l’indexation des événements locaux et la recherche des données chiffrées de bout en bout (nécessite un redémarrage)",
+    "Match system dark mode setting": "S’adapter aux paramètres de mode sombre du système"
 }

From d786017d08deef229710db2c2cf7a65a0400efd3 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 20 Nov 2019 19:02:23 +0000
Subject: [PATCH 27/87] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1919 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 892f21dbb1..e48161d798 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2338,5 +2338,7 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> %(widgetDomain)s domain-nel.",
     "Widget added by": "A kisalkalmazást hozzáadta",
     "This widget may use cookies.": "Ez a kisalkalmazás sütiket használhat.",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Ellenőrzés küldése közvetlen üzenetben, beleértve az új ellenőrzési felhasználói élményt a résztvevői panelen."
+    "Send verification requests in direct message, including a new verification UX in the member panel.": "Ellenőrzés küldése közvetlen üzenetben, beleértve az új ellenőrzési felhasználói élményt a résztvevői panelen.",
+    "Enable local event indexing and E2EE search (requires restart)": "Helyi esemény indexálás és végponttól végpontig titkosított események keresésének engedélyezése (újraindítás szükséges)",
+    "Match system dark mode setting": "Rendszer sötét témájához alkalmazkodás"
 }

From 87167f42f89cd8c2f3e87f8d18ad95d717ad678e Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 21 Nov 2019 09:34:39 +0000
Subject: [PATCH 28/87] Translated using Weblate (Italian)

Currently translated at 99.9% (1917 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index efab4595f6..9faa48328c 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2295,5 +2295,8 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s e il tuo Gestore di Integrazione.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s.",
     "Widget added by": "Widget aggiunto da",
-    "This widget may use cookies.": "Questo widget può usare cookie."
+    "This widget may use cookies.": "Questo widget può usare cookie.",
+    "Send verification requests in direct message, including a new verification UX in the member panel.": "Invia le richieste di verifica via messaggio diretto, inclusa una nuova esperienza utente per la verifica nel pannello membri.",
+    "Enable local event indexing and E2EE search (requires restart)": "Attiva l'indicizzazione di eventi locali e la ricerca E2EE (richiede riavvio)",
+    "Match system dark mode setting": "Combacia la modalità scura di sistema"
 }

From 598901b48339e5547b1396db16e81d8b2ab5e932 Mon Sep 17 00:00:00 2001
From: Edgars Voroboks <edgars.voroboks@gmail.com>
Date: Wed, 20 Nov 2019 18:58:42 +0000
Subject: [PATCH 29/87] Translated using Weblate (Latvian)

Currently translated at 47.8% (918 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
---
 src/i18n/strings/lv.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 80e173dc3f..1c7d2b0311 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1144,5 +1144,8 @@
     "You do not have permission to start a conference call in this room": "Šajā istabā nav atļaujas sākt konferences zvanu",
     "Replying With Files": "Atbildot ar failiem",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Šobrīd nav iespējams atbildēt ar failu. Vai vēlaties augšupielādēt šo failu, neatbildot?",
-    "Your Riot is misconfigured": "Jūsu Riot ir nepareizi konfigurēts"
+    "Your Riot is misconfigured": "Jūsu Riot ir nepareizi konfigurēts",
+    "Add Email Address": "Pievienot e-pasta adresi",
+    "Add Phone Number": "Pievienot tālruņa numuru",
+    "Call failed due to misconfigured server": "Zvans neizdevās nekorekti nokonfigurēta servera dēļ"
 }

From 5c6ef10c6b6c1f063e9eeee653cc8419ff172200 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Nov 2019 15:55:30 +0000
Subject: [PATCH 30/87] Ignore media actions

Hopefully the comment explains all

Fixes https://github.com/vector-im/riot-web/issues/11118
---
 src/CallHandler.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 625ca8c551..4ffc9fb7a2 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -495,6 +495,15 @@ async function _startCallApp(roomId, type) {
 // with the dispatcher once
 if (!global.mxCallHandler) {
     dis.register(_onAction);
+    // add empty handlers for media actions, otherwise the media keys
+    // end up causing the audio elements with our ring/ringback etc
+    // audio clips in to play.
+    navigator.mediaSession.setActionHandler('play', function() {});
+    navigator.mediaSession.setActionHandler('pause', function() {});
+    navigator.mediaSession.setActionHandler('seekbackward', function() {});
+    navigator.mediaSession.setActionHandler('seekforward', function() {});
+    navigator.mediaSession.setActionHandler('previoustrack', function() {});
+    navigator.mediaSession.setActionHandler('nexttrack', function() {});
 }
 
 const callHandler = {

From f7f22444e8f0581ddb1e6520dcfd596a29e1b139 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 21 Nov 2019 09:03:07 -0700
Subject: [PATCH 31/87] Rename section heading for integrations in settings

Misc design update
---
 src/components/views/settings/SetIntegrationManager.js | 2 +-
 src/i18n/strings/en_EN.json                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.js
index 26c45e3d2a..e205f02e6c 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.js
@@ -64,7 +64,7 @@ export default class SetIntegrationManager extends React.Component {
         return (
             <div className='mx_SetIntegrationManager'>
                 <div className="mx_SettingsTab_heading">
-                    <span>{_t("Integrations")}</span>
+                    <span>{_t("Manage integrations")}</span>
                     <span className="mx_SettingsTab_subheading">{managerName}</span>
                     <ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} />
                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a6173e15b7..618c9ad63a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -598,7 +598,7 @@
     "Change": "Change",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
-    "Integrations": "Integrations",
+    "Manage integrations": "Manage integrations",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
     "Flair": "Flair",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",

From f0fbb20ee50b8d822175207136d8ffa3f1ee107c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Nov 2019 16:11:42 +0000
Subject: [PATCH 32/87] Detect support for mediaSession

Firefox doesn't support mediaSession so don't try setting handlers
---
 src/CallHandler.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 4ffc9fb7a2..9350fe4dd9 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -498,12 +498,14 @@ if (!global.mxCallHandler) {
     // add empty handlers for media actions, otherwise the media keys
     // end up causing the audio elements with our ring/ringback etc
     // audio clips in to play.
-    navigator.mediaSession.setActionHandler('play', function() {});
-    navigator.mediaSession.setActionHandler('pause', function() {});
-    navigator.mediaSession.setActionHandler('seekbackward', function() {});
-    navigator.mediaSession.setActionHandler('seekforward', function() {});
-    navigator.mediaSession.setActionHandler('previoustrack', function() {});
-    navigator.mediaSession.setActionHandler('nexttrack', function() {});
+    if (navigator.mediaSession) {
+        navigator.mediaSession.setActionHandler('play', function() {});
+        navigator.mediaSession.setActionHandler('pause', function() {});
+        navigator.mediaSession.setActionHandler('seekbackward', function() {});
+        navigator.mediaSession.setActionHandler('seekforward', function() {});
+        navigator.mediaSession.setActionHandler('previoustrack', function() {});
+        navigator.mediaSession.setActionHandler('nexttrack', function() {});
+    }
 }
 
 const callHandler = {

From a55e5f77598f4ca7c433240b50229329f6a45e9c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 21 Nov 2019 09:12:07 -0700
Subject: [PATCH 33/87] Update copy for widgets not using message encryption

Misc design update
---
 src/components/views/elements/AppPermission.js | 2 +-
 src/i18n/strings/en_EN.json                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index c514dbc950..8dc58643bd 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -115,7 +115,7 @@ export default class AppPermission extends React.Component {
             : _t("Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
                 {widgetDomain: this.state.widgetDomain}, {helpIcon: () => warningTooltip});
 
-        const encryptionWarning = this.props.isRoomEncrypted ? _t("Widgets are not encrypted.") : null;
+        const encryptionWarning = this.props.isRoomEncrypted ? _t("Widgets do not use message encryption.") : null;
 
         return (
             <div className='mx_AppPermissionWarning'>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a6173e15b7..56ae95d568 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1187,7 +1187,7 @@
     "Widget ID": "Widget ID",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
-    "Widgets are not encrypted.": "Widgets are not encrypted.",
+    "Widgets do not use message encryption.": "Widgets do not use message encryption.",
     "Widget added by": "Widget added by",
     "This widget may use cookies.": "This widget may use cookies.",
     "Delete Widget": "Delete Widget",

From 08e08376a204e34926a525b34454427589878b25 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 21 Nov 2019 15:19:59 +0000
Subject: [PATCH 34/87] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1922 of 1922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index e48161d798..70a966ce3d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2340,5 +2340,11 @@
     "This widget may use cookies.": "Ez a kisalkalmazás sütiket használhat.",
     "Send verification requests in direct message, including a new verification UX in the member panel.": "Ellenőrzés küldése közvetlen üzenetben, beleértve az új ellenőrzési felhasználói élményt a résztvevői panelen.",
     "Enable local event indexing and E2EE search (requires restart)": "Helyi esemény indexálás és végponttól végpontig titkosított események keresésének engedélyezése (újraindítás szükséges)",
-    "Match system dark mode setting": "Rendszer sötét témájához alkalmazkodás"
+    "Match system dark mode setting": "Rendszer sötét témájához alkalmazkodás",
+    "Widgets are not encrypted.": "A kisalkalmazások nem titkosítottak.",
+    "More options": "További beállítások",
+    "Reload": "Újratölt",
+    "Take picture": "Fénykép készítés",
+    "Remove for everyone": "Visszavonás mindenkitől",
+    "Remove for me": "Visszavonás magamtól"
 }

From 5d8476185f83e73ff06a59e89a71a4f53bf0a419 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Nov 2019 17:00:35 +0000
Subject: [PATCH 35/87] Catch exceptions when we can't play audio

...or try to: the chrome debugger still breakpoints, even when we
catch the exception.

Related to, but probably does not fix https://github.com/vector-im/riot-web/issues/7657
---
 src/CallHandler.js | 17 +++++++++++++++--
 src/Notifier.js    |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 625ca8c551..c15fda1ef9 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -80,13 +80,26 @@ function play(audioId) {
     // which listens?
     const audio = document.getElementById(audioId);
     if (audio) {
+        const playAudio = async () => {
+            try {
+                // This still causes the chrome debugger to break on promise rejection if
+                // the promise is rejected, even though we're catching the exception.
+                await audio.play();
+            } catch (e) {
+                // This is usually because the user hasn't interacted with the document,
+                // or chrome doesn't think so and is denying the request. Not sure what
+                // we can really do here...
+                // https://github.com/vector-im/riot-web/issues/7657
+                console.log("Unable to play audio clip", e);
+            }
+        };
         if (audioPromises[audioId]) {
             audioPromises[audioId] = audioPromises[audioId].then(()=>{
                 audio.load();
-                return audio.play();
+                return playAudio();
             });
         } else {
-            audioPromises[audioId] = audio.play();
+            audioPromises[audioId] = playAudio();
         }
     }
 }
diff --git a/src/Notifier.js b/src/Notifier.js
index edb9850dfe..dd691d8ca7 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -146,7 +146,7 @@ const Notifier = {
                 }
                 document.body.appendChild(audioElement);
             }
-            audioElement.play();
+            await audioElement.play();
         } catch (ex) {
             console.warn("Caught error when trying to fetch room notification sound:", ex);
         }

From 3cddcad5de18f926dcd2b44e0b4dfe36968018d3 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:12:32 +0100
Subject: [PATCH 36/87] use correct icons with borders

---
 res/img/e2e/verified.svg | 14 +++-----------
 res/img/e2e/warning.svg  | 15 ++++-----------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/res/img/e2e/verified.svg b/res/img/e2e/verified.svg
index af6bb92297..464b443dcf 100644
--- a/res/img/e2e/verified.svg
+++ b/res/img/e2e/verified.svg
@@ -1,12 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   fill="none">
-  <path
-     style="stroke:none;fill:#03b381;fill-opacity:1"
-     d="M 12 2 L 3 4.8496094 L 3 11.5 C 3 17.2 12 21 12 21 C 12 21 21 17.2 21 11.5 L 21 4.8496094 L 12 2 z M 16.541016 7.5332031 C 16.789066 7.5332031 17.037312 7.6240256 17.226562 7.8066406 C 17.605062 8.1718706 17.605063 8.7636762 17.226562 9.1289062 L 11.400391 14.75 C 11.021891 15.1152 10.40975 15.1152 10.03125 14.75 L 10.013672 14.734375 C 10.007572 14.728775 10.002044 14.722597 9.9960938 14.716797 L 7.3242188 12.138672 C 6.9267788 11.755172 6.9267788 11.1335 7.3242188 10.75 C 7.7216487 10.3665 8.3662319 10.3665 8.7636719 10.75 L 10.783203 12.699219 L 15.855469 7.8066406 C 16.044719 7.6240256 16.292966 7.5332031 16.541016 7.5332031 z "
-     id="path2" />
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 21C12 21 21 17.2 21 11.5V4.85L12 2L3 4.85V11.5C3 17.2 12 21 12 21Z" fill="#03B381" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2268 7.80652C17.6053 8.17175 17.6053 8.7639 17.2268 9.12913L11.4013 14.7502C11.0228 15.1154 10.4091 15.1154 10.0306 14.7502L10.0145 14.7342C10.0084 14.7286 10.0023 14.7229 9.99635 14.7171L7.32348 12.1381C6.92604 11.7546 6.92604 11.1328 7.32348 10.7493C7.72091 10.3658 8.36528 10.3658 8.76272 10.7493L10.7838 12.6995L15.8561 7.80652C16.2346 7.44129 16.8483 7.44129 17.2268 7.80652Z" fill="white"/>
 </svg>
diff --git a/res/img/e2e/warning.svg b/res/img/e2e/warning.svg
index 2501da6ab3..209ae0f71f 100644
--- a/res/img/e2e/warning.svg
+++ b/res/img/e2e/warning.svg
@@ -1,12 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
-   fill="none"
-   viewBox="0 0 24 24">
-  <path
-     style="fill-opacity:1;fill:#ff4b55;stroke:none"
-     d="M 12 2 L 3 4.8496094 L 3 11.5 C 3 17.2 12 21 12 21 C 12 21 21 17.2 21 11.5 L 21 4.8496094 L 12 2 z M 12.050781 5.5 C 12.743281 5.5 13.300781 6.0575 13.300781 6.75 L 13.300781 12.25 C 13.300781 12.9425 12.743281 13.5 12.050781 13.5 C 11.358281 13.5 10.800781 12.9425 10.800781 12.25 L 10.800781 6.75 C 10.800781 6.0575 11.358281 5.5 12.050781 5.5 z M 12.050781 15 C 12.743281 15 13.300781 15.5575 13.300781 16.25 C 13.300781 16.9425 12.743281 17.5 12.050781 17.5 C 11.358281 17.5 10.800781 16.9425 10.800781 16.25 C 10.800781 15.5575 11.358281 15 12.050781 15 z "
-     id="path2" />
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 21C12 21 21 17.2 21 11.5V4.85L12 2L3 4.85V11.5C3 17.2 12 21 12 21Z" fill="#FF4B55" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="10.8" y="5.5" width="2.5" height="8" rx="1.25" fill="white"/>
+<rect x="10.8" y="15" width="2.5" height="2.5" rx="1.25" fill="white"/>
 </svg>

From cb0e6ca5d280d16b951e843748936f337f05d802 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:13:01 +0100
Subject: [PATCH 37/87] dont make e2e icons themable, as they have multiple
 colors

---
 res/css/views/rooms/_E2EIcon.scss | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/css/views/rooms/_E2EIcon.scss b/res/css/views/rooms/_E2EIcon.scss
index 1ee5008888..cb99aa63f1 100644
--- a/res/css/views/rooms/_E2EIcon.scss
+++ b/res/css/views/rooms/_E2EIcon.scss
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 .mx_E2EIcon {
-    width: 25px;
-    height: 25px;
+    width: 16px;
+    height: 16px;
     margin: 0 9px;
     position: relative;
     display: block;
@@ -30,16 +30,14 @@ limitations under the License.
     bottom: 0;
     left: 0;
     right: 0;
-    mask-repeat: no-repeat;
-    mask-size: contain;
+    background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .mx_E2EIcon_verified::after {
-    mask-image: url('$(res)/img/e2e/verified.svg');
-    background-color: $accent-color;
+    background-image: url('$(res)/img/e2e/verified.svg');
 }
 
 .mx_E2EIcon_warning::after {
-    mask-image: url('$(res)/img/e2e/warning.svg');
-    background-color: $warning-color;
+    background-image: url('$(res)/img/e2e/warning.svg');
 }

From 854f27df3fbd0b8d65790a06c33d0ed301756a7f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:14:25 +0100
Subject: [PATCH 38/87] remove obsolete style from message composer for e2e
 icon as it's now the default size for the e2e iconn

---
 res/css/views/rooms/_MessageComposer.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 036756e2eb..12e45a07c9 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -74,8 +74,6 @@ limitations under the License.
 .mx_MessageComposer_e2eIcon.mx_E2EIcon {
     position: absolute;
     left: 60px;
-    width: 16px;
-    height: 16px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
 }

From f75e45a715db4314ffa23684412d24fbd86f02a4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:17:55 +0100
Subject: [PATCH 39/87] reduce margin on e2e icon in room header

---
 res/css/views/rooms/_RoomHeader.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 5da8ff76b9..f1e4456cc1 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -17,6 +17,10 @@ limitations under the License.
 .mx_RoomHeader {
     flex: 0 0 52px;
     border-bottom: 1px solid $primary-hairline-color;
+
+    .mx_E2EIcon {
+        margin: 0 5px;
+    }
 }
 
 .mx_RoomHeader_wrapper {

From b239fde32dec454b29f9b11611e02862a79cd979 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Nov 2019 17:31:57 +0000
Subject: [PATCH 40/87] Workaround for soft-crash with calls on startup

Fixes https://github.com/vector-im/riot-web/issues/11458
---
 src/components/views/voip/CallView.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index a4d7927ac3..cf1f505197 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -90,6 +90,13 @@ module.exports = createReactClass({
             }
         } else {
             call = CallHandler.getAnyActiveCall();
+            // Ignore calls if we can't get the room associated with them.
+            // I think the underlying problem is that the js-sdk sends events
+            // for calls before it has made the rooms available in the store,
+            // although this isn't confirmed.
+            if (MatrixClientPeg.get().getRoom(call.roomId) === null) {
+                call = null;
+            }
             this.setState({ call: call });
         }
 

From a02a285058fdc38bebcc198aaefe06d1f28cd586 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Nov 2019 10:24:51 +0000
Subject: [PATCH 41/87] Show m.room.create event before the ELS on room upgrade

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index cf2a5b1738..39504666bf 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -411,6 +411,11 @@ module.exports = createReactClass({
                     readMarkerInSummary = true;
                 }
 
+                // If this m.room.create event should be shown (room upgrade) then show it before the summary
+                if (this._shouldShowEvent(mxEv)) {
+                    ret.push(...this._getTilesForEvent(prevEvent, mxEv, false));
+                }
+
                 const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary
                 for (;i + 1 < this.props.events.length; i++) {
                     const collapsedMxEv = this.props.events[i + 1];

From 6d4abeef4515bab769d04359a2ded0ca70219d57 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Nov 2019 12:07:25 +0000
Subject: [PATCH 42/87] Convert MessagePanel to React class

I was about to add the getDerivedStateFromProps function to change
how read markers worked, but doing that in an old style class
means the statics object, so let;s just convert the thing.
---
 src/components/structures/MessagePanel.js | 132 +++++++++++-----------
 1 file changed, 65 insertions(+), 67 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index cf2a5b1738..3781dd0ce7 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,7 +19,6 @@ limitations under the License.
 /* global Velocity */
 
 import React from 'react';
-import createReactClass from 'create-react-class';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -37,10 +37,8 @@ const isMembershipChange = (e) => e.getType() === 'm.room.member' || e.getType()
 
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
-module.exports = createReactClass({
-    displayName: 'MessagePanel',
-
-    propTypes: {
+export default class MessagePanel extends React.Component {
+    propTypes = {
         // true to give the component a 'display: none' style.
         hidden: PropTypes.bool,
 
@@ -109,9 +107,9 @@ module.exports = createReactClass({
 
         // whether to show reactions for an event
         showReactions: PropTypes.bool,
-    },
+    };
 
-    componentWillMount: function() {
+    componentDidMount() {
         // the event after which we put a visible unread marker on the last
         // render cycle; null if readMarkerVisible was false or the RM was
         // suppressed (eg because it was at the end of the timeline)
@@ -168,37 +166,37 @@ module.exports = createReactClass({
             SettingsStore.getValue("showHiddenEventsInTimeline");
 
         this._isMounted = true;
-    },
+    }
 
-    componentWillUnmount: function() {
+    componentWillUnmount() {
         this._isMounted = false;
-    },
+    }
 
     /* get the DOM node representing the given event */
-    getNodeForEventId: function(eventId) {
+    getNodeForEventId(eventId) {
         if (!this.eventNodes) {
             return undefined;
         }
 
         return this.eventNodes[eventId];
-    },
+    }
 
     /* return true if the content is fully scrolled down right now; else false.
      */
-    isAtBottom: function() {
+    isAtBottom() {
         return this.refs.scrollPanel
             && this.refs.scrollPanel.isAtBottom();
-    },
+    }
 
     /* get the current scroll state. See ScrollPanel.getScrollState for
      * details.
      *
      * returns null if we are not mounted.
      */
-    getScrollState: function() {
+    getScrollState() {
         if (!this.refs.scrollPanel) { return null; }
         return this.refs.scrollPanel.getScrollState();
-    },
+    }
 
     // returns one of:
     //
@@ -206,7 +204,7 @@ module.exports = createReactClass({
     //  -1: read marker is above the window
     //   0: read marker is within the window
     //  +1: read marker is below the window
-    getReadMarkerPosition: function() {
+    getReadMarkerPosition() {
         const readMarker = this.refs.readMarkerNode;
         const messageWrapper = this.refs.scrollPanel;
 
@@ -226,45 +224,45 @@ module.exports = createReactClass({
         } else {
             return 1;
         }
-    },
+    }
 
     /* jump to the top of the content.
      */
-    scrollToTop: function() {
+    scrollToTop() {
         if (this.refs.scrollPanel) {
             this.refs.scrollPanel.scrollToTop();
         }
-    },
+    }
 
     /* jump to the bottom of the content.
      */
-    scrollToBottom: function() {
+    scrollToBottom() {
         if (this.refs.scrollPanel) {
             this.refs.scrollPanel.scrollToBottom();
         }
-    },
+    }
 
     /**
      * Page up/down.
      *
      * @param {number} mult: -1 to page up, +1 to page down
      */
-    scrollRelative: function(mult) {
+    scrollRelative(mult) {
         if (this.refs.scrollPanel) {
             this.refs.scrollPanel.scrollRelative(mult);
         }
-    },
+    }
 
     /**
      * Scroll up/down in response to a scroll key
      *
      * @param {KeyboardEvent} ev: the keyboard event to handle
      */
-    handleScrollKey: function(ev) {
+    handleScrollKey(ev) {
         if (this.refs.scrollPanel) {
             this.refs.scrollPanel.handleScrollKey(ev);
         }
-    },
+    }
 
     /* jump to the given event id.
      *
@@ -276,33 +274,33 @@ module.exports = createReactClass({
      * node (specifically, the bottom of it) will be positioned. If omitted, it
      * defaults to 0.
      */
-    scrollToEvent: function(eventId, pixelOffset, offsetBase) {
+    scrollToEvent(eventId, pixelOffset, offsetBase) {
         if (this.refs.scrollPanel) {
             this.refs.scrollPanel.scrollToToken(eventId, pixelOffset, offsetBase);
         }
-    },
+    }
 
-    scrollToEventIfNeeded: function(eventId) {
+    scrollToEventIfNeeded(eventId) {
         const node = this.eventNodes[eventId];
         if (node) {
             node.scrollIntoView({block: "nearest", behavior: "instant"});
         }
-    },
+    }
 
     /* check the scroll state and send out pagination requests if necessary.
      */
-    checkFillState: function() {
+    checkFillState() {
         if (this.refs.scrollPanel) {
             this.refs.scrollPanel.checkFillState();
         }
-    },
+    }
 
-    _isUnmounting: function() {
+    _isUnmounting() {
         return !this._isMounted;
-    },
+    }
 
     // TODO: Implement granular (per-room) hide options
-    _shouldShowEvent: function(mxEv) {
+    _shouldShowEvent(mxEv) {
         if (mxEv.sender && MatrixClientPeg.get().isUserIgnored(mxEv.sender.userId)) {
             return false; // ignored = no show (only happens if the ignore happens after an event was received)
         }
@@ -320,9 +318,9 @@ module.exports = createReactClass({
         if (this.props.highlightedEventId === mxEv.getId()) return true;
 
         return !shouldHideEvent(mxEv);
-    },
+    }
 
-    _getEventTiles: function() {
+    _getEventTiles() {
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
         const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
@@ -596,9 +594,9 @@ module.exports = createReactClass({
 
         this.currentReadMarkerEventId = readMarkerVisible ? this.props.readMarkerEventId : null;
         return ret;
-    },
+    }
 
-    _getTilesForEvent: function(prevEvent, mxEv, last) {
+    _getTilesForEvent(prevEvent, mxEv, last) {
         const EventTile = sdk.getComponent('rooms.EventTile');
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const ret = [];
@@ -691,20 +689,20 @@ module.exports = createReactClass({
         );
 
         return ret;
-    },
+    }
 
-    _wantsDateSeparator: function(prevEvent, nextEventDate) {
+    _wantsDateSeparator(prevEvent, nextEventDate) {
         if (prevEvent == null) {
             // first event in the panel: depends if we could back-paginate from
             // here.
             return !this.props.suppressFirstDateSeparator;
         }
         return wantsDateSeparator(prevEvent.getDate(), nextEventDate);
-    },
+    }
 
     // Get a list of read receipts that should be shown next to this event
     // Receipts are objects which have a 'userId', 'roomMember' and 'ts'.
-    _getReadReceiptsForEvent: function(event) {
+    _getReadReceiptsForEvent(event) {
         const myUserId = MatrixClientPeg.get().credentials.userId;
 
         // get list of read receipts, sorted most recent first
@@ -728,12 +726,12 @@ module.exports = createReactClass({
             });
         });
         return receipts;
-    },
+    }
 
     // Get an object that maps from event ID to a list of read receipts that
     // should be shown next to that event. If a hidden event has read receipts,
     // they are folded into the receipts of the last shown event.
-    _getReadReceiptsByShownEvent: function() {
+    _getReadReceiptsByShownEvent() {
         const receiptsByEvent = {};
         const receiptsByUserId = {};
 
@@ -786,9 +784,9 @@ module.exports = createReactClass({
         }
 
         return receiptsByEvent;
-    },
+    }
 
-    _getReadMarkerTile: function(visible) {
+    _getReadMarkerTile(visible) {
         let hr;
         if (visible) {
             hr = <hr className="mx_RoomView_myReadMarker"
@@ -802,9 +800,9 @@ module.exports = createReactClass({
                 { hr }
             </li>
         );
-    },
+    }
 
-    _startAnimation: function(ghostNode) {
+    _startAnimation = (ghostNode) => {
         if (this._readMarkerGhostNode) {
             Velocity.Utilities.removeData(this._readMarkerGhostNode);
         }
@@ -816,9 +814,9 @@ module.exports = createReactClass({
                      {duration: 400, easing: 'easeInSine',
                       delay: 1000});
         }
-    },
+    };
 
-    _getReadMarkerGhostTile: function() {
+    _getReadMarkerGhostTile() {
         const hr = <hr className="mx_RoomView_myReadMarker"
                   style={{opacity: 1, width: '99%'}}
                   ref={this._startAnimation}
@@ -833,31 +831,31 @@ module.exports = createReactClass({
                 { hr }
             </li>
         );
-    },
+    }
 
-    _collectEventNode: function(eventId, node) {
+    _collectEventNode = (eventId, node) => {
         this.eventNodes[eventId] = node;
-    },
+    }
 
     // once dynamic content in the events load, make the scrollPanel check the
     // scroll offsets.
-    _onHeightChanged: function() {
+    _onHeightChanged = () => {
         const scrollPanel = this.refs.scrollPanel;
         if (scrollPanel) {
             scrollPanel.checkScroll();
         }
-    },
+    };
 
-    _onTypingShown: function() {
+    _onTypingShown = () => {
         const scrollPanel = this.refs.scrollPanel;
         // this will make the timeline grow, so checkScroll
         scrollPanel.checkScroll();
         if (scrollPanel && scrollPanel.getScrollState().stuckAtBottom) {
             scrollPanel.preventShrinking();
         }
-    },
+    };
 
-    _onTypingHidden: function() {
+    _onTypingHidden = () => {
         const scrollPanel = this.refs.scrollPanel;
         if (scrollPanel) {
             // as hiding the typing notifications doesn't
@@ -868,9 +866,9 @@ module.exports = createReactClass({
             // reveal added padding to balance the notifs disappearing.
             scrollPanel.checkScroll();
         }
-    },
+    };
 
-    updateTimelineMinHeight: function() {
+    updateTimelineMinHeight() {
         const scrollPanel = this.refs.scrollPanel;
 
         if (scrollPanel) {
@@ -885,16 +883,16 @@ module.exports = createReactClass({
                 scrollPanel.preventShrinking();
             }
         }
-    },
+    }
 
-    onTimelineReset: function() {
+    onTimelineReset() {
         const scrollPanel = this.refs.scrollPanel;
         if (scrollPanel) {
             scrollPanel.clearPreventShrinking();
         }
-    },
+    }
 
-    render: function() {
+    render() {
         const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
         const WhoIsTypingTile = sdk.getComponent("rooms.WhoIsTypingTile");
         const Spinner = sdk.getComponent("elements.Spinner");
@@ -941,5 +939,5 @@ module.exports = createReactClass({
                 { bottomSpinner }
             </ScrollPanel>
         );
-    },
-});
+    }
+}

From fd5a5e13ee0c485716e7d758e2da63c9b434ee12 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Nov 2019 12:59:51 +0000
Subject: [PATCH 43/87] Make addEventListener conditional

Safari doesn't support addEventListener
---
 src/theme.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/theme.js b/src/theme.js
index 92bf03ef0a..9208ff2045 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -41,14 +41,18 @@ export class ThemeWatcher {
     start() {
         this._themeWatchRef = SettingsStore.watchSetting("theme", null, this._onChange);
         this._systemThemeWatchRef = SettingsStore.watchSetting("use_system_theme", null, this._onChange);
-        this._preferDark.addEventListener('change', this._onChange);
-        this._preferLight.addEventListener('change', this._onChange);
+        if (this._preferDark.addEventListener) {
+            this._preferDark.addEventListener('change', this._onChange);
+            this._preferLight.addEventListener('change', this._onChange);
+        }
         this._dispatcherRef = dis.register(this._onAction);
     }
 
     stop() {
-        this._preferDark.removeEventListener('change', this._onChange);
-        this._preferLight.removeEventListener('change', this._onChange);
+        if (this._preferDark.addEventListener) {
+            this._preferDark.removeEventListener('change', this._onChange);
+            this._preferLight.removeEventListener('change', this._onChange);
+        }
         SettingsStore.unwatchSetting(this._systemThemeWatchRef);
         SettingsStore.unwatchSetting(this._themeWatchRef);
         dis.unregister(this._dispatcherRef);

From 3f5a8faf376b33499258f071b1eefe69e8c2c5ee Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Nov 2019 13:01:56 +0000
Subject: [PATCH 44/87] PropTypes should be static

---
 res/css/structures/_RoomView.scss         | 1 +
 src/components/structures/MessagePanel.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 50d412ad58..8e47fe7509 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -221,6 +221,7 @@ hr.mx_RoomView_myReadMarker {
     position: relative;
     top: -1px;
     z-index: 1;
+    transition: width 1s easeInSine;
 }
 
 .mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 3781dd0ce7..bd5630ab12 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -38,7 +38,7 @@ const isMembershipChange = (e) => e.getType() === 'm.room.member' || e.getType()
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
 export default class MessagePanel extends React.Component {
-    propTypes = {
+    static propTypes = {
         // true to give the component a 'display: none' style.
         hidden: PropTypes.bool,
 

From 0dbb639aea1ef008bcdede36899112f3b7bca1fa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Nov 2019 13:06:35 +0000
Subject: [PATCH 45/87] Accidentally committed

---
 res/css/structures/_RoomView.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 8e47fe7509..50d412ad58 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -221,7 +221,6 @@ hr.mx_RoomView_myReadMarker {
     position: relative;
     top: -1px;
     z-index: 1;
-    transition: width 1s easeInSine;
 }
 
 .mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {

From 936c36dd586ebaacfe203f00759f7d01f1abe0dd Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 22 Nov 2019 03:23:27 +0000
Subject: [PATCH 46/87] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 2d6d3f55bc..2fd014554e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2346,5 +2346,22 @@
     "Widget added by": "小工具新增由",
     "This widget may use cookies.": "這個小工具可能會使用 cookies。",
     "Enable local event indexing and E2EE search (requires restart)": "啟用本機事件索引與端到端加密搜尋（需要重新啟動）",
-    "Match system dark mode setting": "與系統深色模式設定相符"
+    "Match system dark mode setting": "與系統深色模式設定相符",
+    "Connecting to integration manager...": "正在連線到整合管理員……",
+    "Cannot connect to integration manager": "無法連線到整合管理員",
+    "The integration manager is offline or it cannot reach your homeserver.": "整合管理員已離線或無法存取您的家伺服器。",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "使用整合管理員 <b>(%(serverName)s)</b> 以管理機器人、小工具與貼紙包。",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "使用整合管理員以管理機器人、小工具與貼紙包。",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "整合管理員接收設定資料，並可以修改小工具、傳送聊天室邀請並設定權限等級。",
+    "Failed to connect to integration manager": "連線到整合管理員失敗",
+    "Widgets do not use message encryption.": "小工具不使用訊息加密。",
+    "More options": "更多選項",
+    "Integrations are disabled": "整合已停用",
+    "Enable 'Manage Integrations' in Settings to do this.": "在設定中啟用「管理整合」以執行此動作。",
+    "Integrations not allowed": "不允許整合",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "您的 Riot 不允許您使用整合管理員來執行此動作。請聯絡管理員。",
+    "Reload": "重新載入",
+    "Take picture": "拍照",
+    "Remove for everyone": "對所有人移除",
+    "Remove for me": "對我移除"
 }

From 27c64db613281d6d44c35fca40402c53df8e39c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 22 Nov 2019 08:35:43 +0000
Subject: [PATCH 47/87] Translated using Weblate (French)

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e58cb187e8..0c13b3c722 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2353,5 +2353,22 @@
     "This widget may use cookies.": "Ce widget pourrait utiliser des cookies.",
     "Send verification requests in direct message, including a new verification UX in the member panel.": "Envoyer les demandes de vérification en message direct, en incluant une nouvelle expérience de vérification dans le tableau des membres.",
     "Enable local event indexing and E2EE search (requires restart)": "Activer l’indexation des événements locaux et la recherche des données chiffrées de bout en bout (nécessite un redémarrage)",
-    "Match system dark mode setting": "S’adapter aux paramètres de mode sombre du système"
+    "Match system dark mode setting": "S’adapter aux paramètres de mode sombre du système",
+    "Connecting to integration manager...": "Connexion au gestionnaire d’intégrations…",
+    "Cannot connect to integration manager": "Impossible de se connecter au gestionnaire d’intégrations",
+    "The integration manager is offline or it cannot reach your homeserver.": "Le gestionnaire d’intégrations est hors ligne ou il ne peut pas joindre votre serveur d’accueil.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Utilisez un gestionnaire d’intégrations <b>(%(serverName)s)</b> pour gérer les bots, les widgets et les packs de stickers.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Utilisez un gestionnaire d’intégrations pour gérer les bots, les widgets et les packs de stickers.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Les gestionnaires d’intégrations reçoivent les données de configuration et peuvent modifier les widgets, envoyer des invitations aux salons et définir les rangs à votre place.",
+    "Failed to connect to integration manager": "Échec de la connexion au gestionnaire d’intégrations",
+    "Widgets do not use message encryption.": "Les widgets n’utilisent pas le chiffrement des messages.",
+    "More options": "Plus d’options",
+    "Integrations are disabled": "Les intégrations sont désactivées",
+    "Enable 'Manage Integrations' in Settings to do this.": "Activez « Gérer les intégrations » dans les paramètres pour faire ça.",
+    "Integrations not allowed": "Les intégrations ne sont pas autorisées",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Votre Riot ne vous autorise pas à utiliser un gestionnaire d’intégrations pour faire ça. Contactez un administrateur.",
+    "Reload": "Recharger",
+    "Take picture": "Prendre une photo",
+    "Remove for everyone": "Supprimer pour tout le monde",
+    "Remove for me": "Supprimer pour moi"
 }

From fed1ed3b500d5e98bc04ab9ab52dd9f63949db06 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 21 Nov 2019 20:00:59 +0000
Subject: [PATCH 48/87] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 70a966ce3d..7ed4eb253c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2346,5 +2346,17 @@
     "Reload": "Újratölt",
     "Take picture": "Fénykép készítés",
     "Remove for everyone": "Visszavonás mindenkitől",
-    "Remove for me": "Visszavonás magamtól"
+    "Remove for me": "Visszavonás magamtól",
+    "Connecting to integration manager...": "Kapcsolódás az integrációs menedzserhez...",
+    "Cannot connect to integration manager": "A kapcsolódás az integrációs menedzserhez sikertelen",
+    "The integration manager is offline or it cannot reach your homeserver.": "Az integrációs menedzser nem működik vagy nem éri el a matrix szerveredet.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Használj Integrációs Menedzsert <b>(%(serverName)s)</b> a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Használj Integrációs Menedzsert a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrációs Menedzser megkapja a konfigurációt, módosíthat kisalkalmazásokat, szobához meghívót küldhet és a hozzáférési szintet beállíthatja helyetted.",
+    "Failed to connect to integration manager": "Az integrációs menedzserhez nem sikerült csatlakozni",
+    "Widgets do not use message encryption.": "A kisalkalmazások nem használnak üzenet titkosítást.",
+    "Integrations are disabled": "Az integrációk le vannak tiltva",
+    "Enable 'Manage Integrations' in Settings to do this.": "Ehhez engedélyezd az „Integrációk Kezelésé”-t a Beállításokban.",
+    "Integrations not allowed": "Az integrációk nem engedélyezettek",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "A Riotod nem használhat ehhez Integrációs Menedzsert. Kérlek vedd fel a kapcsolatot az adminisztrátorral."
 }

From 25ba4c5f7124d40fd5d83cddba30b1479f64dc0c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Nov 2019 13:11:36 +0000
Subject: [PATCH 49/87] Fix read markers

init code needs to be a constructor or its run too late
---
 src/components/structures/MessagePanel.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index bd5630ab12..22be35db60 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -109,7 +109,8 @@ export default class MessagePanel extends React.Component {
         showReactions: PropTypes.bool,
     };
 
-    componentDidMount() {
+    constructor() {
+        super();
         // the event after which we put a visible unread marker on the last
         // render cycle; null if readMarkerVisible was false or the RM was
         // suppressed (eg because it was at the end of the timeline)
@@ -165,6 +166,10 @@ export default class MessagePanel extends React.Component {
         this._showHiddenEventsInTimeline =
             SettingsStore.getValue("showHiddenEventsInTimeline");
 
+        this._isMounted = false;
+    }
+
+    componentDidMount() {
         this._isMounted = true;
     }
 

From d1501a16515c003a949cd819be4a1f34c567f8ea Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:17:55 +0100
Subject: [PATCH 50/87] reduce margin on e2e icon in room header

---
 res/css/views/rooms/_RoomHeader.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 5da8ff76b9..f1e4456cc1 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -17,6 +17,10 @@ limitations under the License.
 .mx_RoomHeader {
     flex: 0 0 52px;
     border-bottom: 1px solid $primary-hairline-color;
+
+    .mx_E2EIcon {
+        margin: 0 5px;
+    }
 }
 
 .mx_RoomHeader_wrapper {

From de645a32a8d3024956270094bc01e4b6277d7bf9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:14:25 +0100
Subject: [PATCH 51/87] remove obsolete style from message composer for e2e
 icon as it's now the default size for the e2e iconn

---
 res/css/views/rooms/_MessageComposer.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 036756e2eb..12e45a07c9 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -74,8 +74,6 @@ limitations under the License.
 .mx_MessageComposer_e2eIcon.mx_E2EIcon {
     position: absolute;
     left: 60px;
-    width: 16px;
-    height: 16px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
 }

From 9c234d93172c77b532b696ce18f71fb77e70db66 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:13:01 +0100
Subject: [PATCH 52/87] dont make e2e icons themable, as they have multiple
 colors

---
 res/css/views/rooms/_E2EIcon.scss | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/css/views/rooms/_E2EIcon.scss b/res/css/views/rooms/_E2EIcon.scss
index 1ee5008888..cb99aa63f1 100644
--- a/res/css/views/rooms/_E2EIcon.scss
+++ b/res/css/views/rooms/_E2EIcon.scss
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 .mx_E2EIcon {
-    width: 25px;
-    height: 25px;
+    width: 16px;
+    height: 16px;
     margin: 0 9px;
     position: relative;
     display: block;
@@ -30,16 +30,14 @@ limitations under the License.
     bottom: 0;
     left: 0;
     right: 0;
-    mask-repeat: no-repeat;
-    mask-size: contain;
+    background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .mx_E2EIcon_verified::after {
-    mask-image: url('$(res)/img/e2e/verified.svg');
-    background-color: $accent-color;
+    background-image: url('$(res)/img/e2e/verified.svg');
 }
 
 .mx_E2EIcon_warning::after {
-    mask-image: url('$(res)/img/e2e/warning.svg');
-    background-color: $warning-color;
+    background-image: url('$(res)/img/e2e/warning.svg');
 }

From 35877a06a387e5148cdcb1aa2158283dbdeb5371 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Nov 2019 18:12:32 +0100
Subject: [PATCH 53/87] use correct icons with borders

---
 res/img/e2e/verified.svg | 14 +++-----------
 res/img/e2e/warning.svg  | 15 ++++-----------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/res/img/e2e/verified.svg b/res/img/e2e/verified.svg
index af6bb92297..464b443dcf 100644
--- a/res/img/e2e/verified.svg
+++ b/res/img/e2e/verified.svg
@@ -1,12 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   fill="none">
-  <path
-     style="stroke:none;fill:#03b381;fill-opacity:1"
-     d="M 12 2 L 3 4.8496094 L 3 11.5 C 3 17.2 12 21 12 21 C 12 21 21 17.2 21 11.5 L 21 4.8496094 L 12 2 z M 16.541016 7.5332031 C 16.789066 7.5332031 17.037312 7.6240256 17.226562 7.8066406 C 17.605062 8.1718706 17.605063 8.7636762 17.226562 9.1289062 L 11.400391 14.75 C 11.021891 15.1152 10.40975 15.1152 10.03125 14.75 L 10.013672 14.734375 C 10.007572 14.728775 10.002044 14.722597 9.9960938 14.716797 L 7.3242188 12.138672 C 6.9267788 11.755172 6.9267788 11.1335 7.3242188 10.75 C 7.7216487 10.3665 8.3662319 10.3665 8.7636719 10.75 L 10.783203 12.699219 L 15.855469 7.8066406 C 16.044719 7.6240256 16.292966 7.5332031 16.541016 7.5332031 z "
-     id="path2" />
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 21C12 21 21 17.2 21 11.5V4.85L12 2L3 4.85V11.5C3 17.2 12 21 12 21Z" fill="#03B381" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2268 7.80652C17.6053 8.17175 17.6053 8.7639 17.2268 9.12913L11.4013 14.7502C11.0228 15.1154 10.4091 15.1154 10.0306 14.7502L10.0145 14.7342C10.0084 14.7286 10.0023 14.7229 9.99635 14.7171L7.32348 12.1381C6.92604 11.7546 6.92604 11.1328 7.32348 10.7493C7.72091 10.3658 8.36528 10.3658 8.76272 10.7493L10.7838 12.6995L15.8561 7.80652C16.2346 7.44129 16.8483 7.44129 17.2268 7.80652Z" fill="white"/>
 </svg>
diff --git a/res/img/e2e/warning.svg b/res/img/e2e/warning.svg
index 2501da6ab3..209ae0f71f 100644
--- a/res/img/e2e/warning.svg
+++ b/res/img/e2e/warning.svg
@@ -1,12 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
-   fill="none"
-   viewBox="0 0 24 24">
-  <path
-     style="fill-opacity:1;fill:#ff4b55;stroke:none"
-     d="M 12 2 L 3 4.8496094 L 3 11.5 C 3 17.2 12 21 12 21 C 12 21 21 17.2 21 11.5 L 21 4.8496094 L 12 2 z M 12.050781 5.5 C 12.743281 5.5 13.300781 6.0575 13.300781 6.75 L 13.300781 12.25 C 13.300781 12.9425 12.743281 13.5 12.050781 13.5 C 11.358281 13.5 10.800781 12.9425 10.800781 12.25 L 10.800781 6.75 C 10.800781 6.0575 11.358281 5.5 12.050781 5.5 z M 12.050781 15 C 12.743281 15 13.300781 15.5575 13.300781 16.25 C 13.300781 16.9425 12.743281 17.5 12.050781 17.5 C 11.358281 17.5 10.800781 16.9425 10.800781 16.25 C 10.800781 15.5575 11.358281 15 12.050781 15 z "
-     id="path2" />
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 21C12 21 21 17.2 21 11.5V4.85L12 2L3 4.85V11.5C3 17.2 12 21 12 21Z" fill="#FF4B55" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="10.8" y="5.5" width="2.5" height="8" rx="1.25" fill="white"/>
+<rect x="10.8" y="15" width="2.5" height="2.5" rx="1.25" fill="white"/>
 </svg>

From 521cbbac74b392d61b1b85c31d6e0d06808929d3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Nov 2019 12:59:51 +0000
Subject: [PATCH 54/87] Make addEventListener conditional

Safari doesn't support addEventListener
---
 src/theme.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/theme.js b/src/theme.js
index fa7e3f783b..e89af55924 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -41,14 +41,18 @@ export class ThemeWatcher {
     start() {
         this._themeWatchRef = SettingsStore.watchSetting("theme", null, this._onChange);
         this._systemThemeWatchRef = SettingsStore.watchSetting("use_system_theme", null, this._onChange);
-        this._preferDark.addEventListener('change', this._onChange);
-        this._preferLight.addEventListener('change', this._onChange);
+        if (this._preferDark.addEventListener) {
+            this._preferDark.addEventListener('change', this._onChange);
+            this._preferLight.addEventListener('change', this._onChange);
+        }
         this._dispatcherRef = dis.register(this._onAction);
     }
 
     stop() {
-        this._preferDark.removeEventListener('change', this._onChange);
-        this._preferLight.removeEventListener('change', this._onChange);
+        if (this._preferDark.addEventListener) {
+            this._preferDark.removeEventListener('change', this._onChange);
+            this._preferLight.removeEventListener('change', this._onChange);
+        }
         SettingsStore.unwatchSetting(this._systemThemeWatchRef);
         SettingsStore.unwatchSetting(this._themeWatchRef);
         dis.unregister(this._dispatcherRef);

From 5ec4b6efcdf74197b8efd60e1014aa0d83d50d6b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Nov 2019 10:24:51 +0000
Subject: [PATCH 55/87] Show m.room.create event before the ELS on room upgrade

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index cf2a5b1738..39504666bf 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -411,6 +411,11 @@ module.exports = createReactClass({
                     readMarkerInSummary = true;
                 }
 
+                // If this m.room.create event should be shown (room upgrade) then show it before the summary
+                if (this._shouldShowEvent(mxEv)) {
+                    ret.push(...this._getTilesForEvent(prevEvent, mxEv, false));
+                }
+
                 const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary
                 for (;i + 1 < this.props.events.length; i++) {
                     const collapsedMxEv = this.props.events[i + 1];

From e86d2b616e647f85bbfa56cb79bc952ca932ad40 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 20 Nov 2019 16:18:28 +0100
Subject: [PATCH 56/87] add ToastContainer

---
 res/css/_components.scss                    |   1 +
 res/css/structures/_ToastContainer.scss     | 105 ++++++++++++++++++++
 src/components/structures/LoggedInView.js   |   2 +
 src/components/structures/ToastContainer.js |  85 ++++++++++++++++
 4 files changed, 193 insertions(+)
 create mode 100644 res/css/structures/_ToastContainer.scss
 create mode 100644 src/components/structures/ToastContainer.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 40a2c576d0..f7147b3b9f 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -25,6 +25,7 @@
 @import "./structures/_TabbedView.scss";
 @import "./structures/_TagPanel.scss";
 @import "./structures/_TagPanelButtons.scss";
+@import "./structures/_ToastContainer.scss";
 @import "./structures/_TopLeftMenuButton.scss";
 @import "./structures/_UploadBar.scss";
 @import "./structures/_ViewSource.scss";
diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
new file mode 100644
index 0000000000..54132d19bf
--- /dev/null
+++ b/res/css/structures/_ToastContainer.scss
@@ -0,0 +1,105 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_ToastContainer {
+    position: absolute;
+    top: 0;
+    left: 70px;
+    z-index: 101;
+    padding: 4px;
+    display: grid;
+    grid-template-rows: 1fr 14px 6px;
+
+    &.mx_ToastContainer_stacked::before {
+        content: "";
+        margin: 0 4px;
+        grid-row: 2 / 4;
+        grid-column: 1;
+        background-color: white;
+        box-shadow: 0px 4px 12px $menu-box-shadow-color;
+        border-radius: 8px;
+    }
+
+    .mx_Toast_toast {
+        grid-row: 1 / 3;
+        grid-column: 1;
+        color: $primary-fg-color;
+        background-color: $primary-bg-color;
+        box-shadow: 0px 4px 12px $menu-box-shadow-color;
+        border-radius: 8px;
+        overflow: hidden;
+    }
+
+    .mx_Toast_toast {
+        display: grid;
+        grid-template-columns: 20px 1fr;
+        column-gap: 10px;
+        row-gap: 4px;
+        padding: 8px;
+        padding-right: 16px;
+
+        &.mx_Toast_hasIcon {
+            &::after {
+                content: "";
+                width: 20px;
+                height: 20px;
+                grid-column: 1;
+                grid-row: 1;
+                mask-size: 100%;
+                mask-repeat: no-repeat;
+            }
+
+            &.mx_Toast_icon_verification::after {
+                mask-image: url("$(res)/img/e2e/normal.svg");
+                background-color: $primary-fg-color;
+            }
+
+            h2, .mx_Toast_body {
+                grid-column: 2;
+            }
+        }
+
+        h2 {
+            grid-column: 1 / 3;
+            grid-row: 1;
+            margin: 0;
+            font-size: 15px;
+            font-weight: 600;
+        }
+
+        .mx_Toast_body {
+            grid-column: 1 / 3;
+            grid-row: 2;
+        }
+
+        .mx_Toast_buttons {
+            display: flex;
+
+            > :not(:last-child) {
+                margin-right: 8px;
+            }
+        }
+
+        .mx_Toast_description {
+            max-width: 400px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            margin: 4px 0 11px 0;
+            font-size: 12px;
+        }
+    }
+}
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 889b0cdc8b..d071ba1d79 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -525,6 +525,7 @@ const LoggedInView = createReactClass({
         const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
         const GroupView = sdk.getComponent('structures.GroupView');
         const MyGroups = sdk.getComponent('structures.MyGroups');
+        const ToastContainer = sdk.getComponent('structures.ToastContainer');
         const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
         const CookieBar = sdk.getComponent('globals.CookieBar');
         const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
@@ -628,6 +629,7 @@ const LoggedInView = createReactClass({
         return (
             <div onPaste={this._onPaste} onKeyDown={this._onReactKeyDown} className='mx_MatrixChat_wrapper' aria-hidden={this.props.hideToSRUsers} onMouseDown={this._onMouseDown} onMouseUp={this._onMouseUp}>
                 { topBar }
+                <ToastContainer />
                 <DragDropContext onDragEnd={this._onDragEnd}>
                     <div ref={this._setResizeContainerRef} className={bodyClasses}>
                         <LeftPanel
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
new file mode 100644
index 0000000000..b8ced1e9de
--- /dev/null
+++ b/src/components/structures/ToastContainer.js
@@ -0,0 +1,85 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as React from "react";
+import dis from "../../dispatcher";
+import { _t } from '../../languageHandler';
+import classNames from "classnames";
+
+export default class ToastContainer extends React.Component {
+    constructor() {
+        super();
+        this.state = {toasts: []};
+    }
+
+    componentDidMount() {
+        this._dispatcherRef = dis.register(this.onAction);
+    }
+
+    componentWillUnmount() {
+        dis.unregister(this._dispatcherRef);
+    }
+
+    onAction = (payload) => {
+        if (payload.action === "show_toast") {
+            this._addToast(payload.toast);
+        }
+    };
+
+    _addToast(toast) {
+        this.setState({toasts: this.state.toasts.concat(toast)});
+    }
+
+    dismissTopToast = () => {
+        const [, ...remaining] = this.state.toasts;
+        this.setState({toasts: remaining});
+    };
+
+    render() {
+        const totalCount = this.state.toasts.length;
+        if (totalCount === 0) {
+            return null;
+        }
+        const isStacked = totalCount > 1;
+        const topToast = this.state.toasts[0];
+        const {title, icon, key, component, props} = topToast;
+
+        const containerClasses = classNames("mx_ToastContainer", {
+            "mx_ToastContainer_stacked": isStacked,
+        });
+
+        const toastClasses = classNames("mx_Toast_toast", {
+            "mx_Toast_hasIcon": icon,
+            [`mx_Toast_icon_${icon}`]: icon,
+        });
+
+        const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
+
+        const toastProps = Object.assign({}, props, {
+            dismiss: this.dismissTopToast,
+            key,
+        });
+
+        return (
+            <div className={containerClasses}>
+                <div className={toastClasses}>
+                    <h2>{title}{countIndicator}</h2>
+                    <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div>
+                </div>
+            </div>
+        );
+    }
+}

From 66cc68bae4dcee465946089df4a5d973a8e02497 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 20 Nov 2019 16:18:59 +0100
Subject: [PATCH 57/87] add new-styled button

might merge it later on with accessible button
---
 res/css/_components.scss                    |  1 +
 res/css/views/elements/_FormButton.scss     | 31 +++++++++++++++++++++
 src/components/views/elements/FormButton.js | 27 ++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 res/css/views/elements/_FormButton.scss
 create mode 100644 src/components/views/elements/FormButton.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index f7147b3b9f..8d2b1cc91a 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -91,6 +91,7 @@
 @import "./views/elements/_ErrorBoundary.scss";
 @import "./views/elements/_EventListSummary.scss";
 @import "./views/elements/_Field.scss";
+@import "./views/elements/_FormButton.scss";
 @import "./views/elements/_IconButton.scss";
 @import "./views/elements/_ImageView.scss";
 @import "./views/elements/_InlineSpinner.scss";
diff --git a/res/css/views/elements/_FormButton.scss b/res/css/views/elements/_FormButton.scss
new file mode 100644
index 0000000000..191dee5566
--- /dev/null
+++ b/res/css/views/elements/_FormButton.scss
@@ -0,0 +1,31 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_FormButton {
+    line-height: 16px;
+    padding: 5px 15px;
+    font-size: 12px;
+
+    &.mx_AccessibleButton_kind_primary {
+        color: $accent-color;
+        background-color: $accent-bg-color;
+    }
+
+    &.mx_AccessibleButton_kind_danger {
+        color: $notice-primary-color;
+        background-color: $notice-primary-bg-color;
+    }
+}
diff --git a/src/components/views/elements/FormButton.js b/src/components/views/elements/FormButton.js
new file mode 100644
index 0000000000..d667132c38
--- /dev/null
+++ b/src/components/views/elements/FormButton.js
@@ -0,0 +1,27 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import AccessibleButton from "./AccessibleButton";
+
+export default function FormButton(props) {
+    const {className, label, kind, ...restProps} = props;
+    const newClassName = (className || "") + " mx_FormButton";
+    const allProps = Object.assign({}, restProps, {className: newClassName, kind: kind || "primary", children: [label]});
+    return React.createElement(AccessibleButton, allProps);
+}
+
+FormButton.propTypes = AccessibleButton.propTypes;

From f1c62e7dab0ef27bb3a5fd9fa8a63833a8779148 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 20 Nov 2019 16:19:51 +0100
Subject: [PATCH 58/87] make colors slightly more opaque than in design

as it is very light otherwise
---
 res/themes/light/css/_light.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index dcd7ce166e..0a3ef812b8 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -12,9 +12,9 @@ $monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emo
 // unified palette
 // try to use these colors when possible
 $accent-color: #03b381;
-$accent-bg-color: rgba(115, 247, 91, 0.08);
+$accent-bg-color: rgba(3, 179, 129, 0.16);
 $notice-primary-color: #ff4b55;
-$notice-primary-bg-color: rgba(255, 75, 85, 0.08);
+$notice-primary-bg-color: rgba(255, 75, 85, 0.16);
 $notice-secondary-color: #61708b;
 $header-panel-bg-color: #f3f8fd;
 

From c705752317769c7bcd0ed00cef8beca7c15d82a9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Nov 2019 16:00:39 +0100
Subject: [PATCH 59/87] add toast for verification requests

this uses a verification requests as emitted by the js-sdk with
the `crypto.verification.request` rather than a verifier as emitted
by `crypto.verification.start` as this works for both to_device and
timeline events with the changes made in the js-sdk pr.
---
 .../views/toasts/VerificationRequestToast.js  | 123 ++++++++++++++++++
 src/i18n/strings/en_EN.json                   |   3 +
 src/utils/KeyVerificationStateObserver.js     |  14 +-
 3 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 src/components/views/toasts/VerificationRequestToast.js

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
new file mode 100644
index 0000000000..c6f7f3a363
--- /dev/null
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -0,0 +1,123 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from "../../../index";
+import { _t } from '../../../languageHandler';
+import Modal from "../../../Modal";
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+import KeyVerificationStateObserver, {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
+import dis from "../../../dispatcher";
+
+export default class VerificationRequestToast extends React.PureComponent {
+    constructor(props) {
+        super(props);
+        const {event, timeout} = props.request;
+        // to_device requests don't have a timestamp, so consider them age=0
+        const age = event.getTs() ? event.getLocalAge() : 0;
+        const remaining = Math.max(0, timeout - age);
+        const counter = Math.ceil(remaining / 1000);
+        this.state = {counter};
+        if (this.props.requestObserver) {
+            this.props.requestObserver.setCallback(this._checkRequestIsPending);
+        }
+    }
+
+    componentDidMount() {
+        if (this.props.requestObserver) {
+            this.props.requestObserver.attach();
+            this._checkRequestIsPending();
+        }
+        this._intervalHandle = setInterval(() => {
+            let {counter} = this.state;
+            counter -= 1;
+            if (counter <= 0) {
+                this.cancel();
+            } else {
+                this.setState({counter});
+            }
+        }, 1000);
+    }
+
+    componentWillUnmount() {
+        clearInterval(this._intervalHandle);
+        if (this.props.requestObserver) {
+            this.props.requestObserver.detach();
+        }
+    }
+
+    _checkRequestIsPending = () => {
+        if (!this.props.requestObserver.pending) {
+            this.props.dismiss();
+        }
+    }
+
+    cancel = () => {
+        this.props.dismiss();
+        try {
+            this.props.request.cancel();
+        } catch (err) {
+            console.error("Error while cancelling verification request", err);
+        }
+    }
+
+    accept = () => {
+        this.props.dismiss();
+        const {event} = this.props.request;
+        // no room id for to_device requests
+        if (event.getRoomId()) {
+            dis.dispatch({
+                action: 'view_room',
+                room_id: event.getRoomId(),
+                should_peek: false,
+            });
+        }
+
+        const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
+        const IncomingSasDialog = sdk.getComponent('views.dialogs.IncomingSasDialog');
+        Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {verifier});
+    };
+
+    render() {
+        const FormButton = sdk.getComponent("elements.FormButton");
+        const {event} = this.props.request;
+        const userId = event.getSender();
+        let nameLabel = event.getRoomId() ? userLabelForEventRoom(userId, event) : userId;
+        // for legacy to_device verification requests
+        if (nameLabel === userId) {
+            const client = MatrixClientPeg.get();
+            const user = client.getUser(event.getSender());
+            if (user && user.displayName) {
+                nameLabel = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
+            }
+        }
+        return (<div>
+            <div className="mx_Toast_description">{nameLabel}</div>
+            <div className="mx_Toast_buttons">
+                <FormButton label={_t("Decline (%(counter)s)", {counter: this.state.counter})} kind="danger" onClick={this.cancel} />
+                <FormButton label={_t("Accept")} onClick={this.accept} />
+            </div>
+        </div>);
+    }
+}
+
+VerificationRequestToast.propTypes = {
+    dismiss: PropTypes.func.isRequired,
+    request: PropTypes.object.isRequired,
+    requestObserver: PropTypes.instanceOf(KeyVerificationStateObserver),
+};
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7709a4a398..177d999148 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -481,6 +481,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
+    "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Failed to upload profile picture!": "Failed to upload profile picture!",
     "Upload new:": "Upload new:",
@@ -1694,6 +1695,7 @@
     "Review terms and conditions": "Review terms and conditions",
     "Old cryptography data detected": "Old cryptography data detected",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
+    "Verification Request": "Verification Request",
     "Logout": "Logout",
     "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
     "Your Communities": "Your Communities",
@@ -1759,6 +1761,7 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Guest": "Guest",
     "Your profile": "Your profile",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
diff --git a/src/utils/KeyVerificationStateObserver.js b/src/utils/KeyVerificationStateObserver.js
index 7de50ec4bf..2f7c0367ad 100644
--- a/src/utils/KeyVerificationStateObserver.js
+++ b/src/utils/KeyVerificationStateObserver.js
@@ -30,6 +30,18 @@ export default class KeyVerificationStateObserver {
         this._updateVerificationState();
     }
 
+    get concluded() {
+        return this.accepted || this.done || this.cancelled;
+    }
+
+    get pending() {
+        return !this.concluded;
+    }
+
+    setCallback(callback) {
+        this._updateCallback = callback;
+    }
+
     attach() {
         this._requestEvent.on("Event.relationsCreated", this._onRelationsCreated);
         for (const phaseName of SUB_EVENT_TYPES_OF_INTEREST) {
@@ -83,7 +95,7 @@ export default class KeyVerificationStateObserver {
 
     _onRelationsUpdated = (event) => {
         this._updateVerificationState();
-        this._updateCallback();
+        this._updateCallback && this._updateCallback();
     };
 
     _updateVerificationState() {

From 8cb362002bf00062b8a106cdc2a2cd14b001f93b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Nov 2019 16:02:11 +0100
Subject: [PATCH 60/87] show a toast instead of dialog when feature flag is
 enabled

---
 src/components/structures/MatrixChat.js | 35 ++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 661a0c7077..9d0dd7da8f 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -62,6 +62,7 @@ import { countRoomsWithNotif } from '../../RoomNotifs';
 import { ThemeWatcher } from "../../theme";
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
+import KeyVerificationStateObserver from '../../utils/KeyVerificationStateObserver';
 
 // Disable warnings for now: we use deprecated bluebird functions
 // and need to migrate, but they spam the console with warnings.
@@ -1270,7 +1271,6 @@ export default createReactClass({
         this.firstSyncComplete = false;
         this.firstSyncPromise = defer();
         const cli = MatrixClientPeg.get();
-        const IncomingSasDialog = sdk.getComponent('views.dialogs.IncomingSasDialog');
 
         // Allow the JS SDK to reap timeline events. This reduces the amount of
         // memory consumed as the JS SDK stores multiple distinct copies of room
@@ -1469,12 +1469,35 @@ export default createReactClass({
             }
         });
 
-        cli.on("crypto.verification.start", (verifier) => {
-            Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
-                verifier,
-            });
-        });
+        if (SettingsStore.isFeatureEnabled("feature_dm_verification")) {
+            cli.on("crypto.verification.request", request => {
+                let requestObserver;
+                if (request.event.getRoomId()) {
+                    requestObserver = new KeyVerificationStateObserver(
+                        request.event, MatrixClientPeg.get());
+                }
 
+                if (!requestObserver || requestObserver.pending) {
+                    dis.dispatch({
+                        action: "show_toast",
+                        toast: {
+                            key: request.event.getId(),
+                            title: _t("Verification Request"),
+                            icon: "verification",
+                            props: {request, requestObserver},
+                            component: sdk.getComponent("toasts.VerificationRequestToast"),
+                        },
+                    });
+                }
+            });
+        } else {
+            cli.on("crypto.verification.start", (verifier) => {
+                const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
+                Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
+                    verifier,
+                });
+            });
+        }
         // Fire the tinter right on startup to ensure the default theme is applied
         // A later sync can/will correct the tint to be the right value for the user
         const colorScheme = SettingsStore.getValue("roomColor");

From 0dfb0f54688e2bff8427dd38d7ce108666fc871a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Nov 2019 16:25:30 +0100
Subject: [PATCH 61/87] fix lint

---
 src/components/views/elements/FormButton.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/FormButton.js b/src/components/views/elements/FormButton.js
index d667132c38..f6b4c986f5 100644
--- a/src/components/views/elements/FormButton.js
+++ b/src/components/views/elements/FormButton.js
@@ -20,7 +20,8 @@ import AccessibleButton from "./AccessibleButton";
 export default function FormButton(props) {
     const {className, label, kind, ...restProps} = props;
     const newClassName = (className || "") + " mx_FormButton";
-    const allProps = Object.assign({}, restProps, {className: newClassName, kind: kind || "primary", children: [label]});
+    const allProps = Object.assign({}, restProps,
+        {className: newClassName, kind: kind || "primary", children: [label]});
     return React.createElement(AccessibleButton, allProps);
 }
 

From 309633181d60b0732966e7c8fe4acd4255341af4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Nov 2019 16:32:50 +0100
Subject: [PATCH 62/87] use FormButton in verification request tile too and
 dedupe styles

---
 res/css/structures/_ToastContainer.scss         |  4 ----
 res/css/views/elements/_FormButton.scss         |  5 +++++
 .../messages/_MKeyVerificationRequest.scss      | 17 -----------------
 .../views/messages/MKeyVerificationRequest.js   |  6 +++---
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 54132d19bf..ca8477dcc5 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -87,10 +87,6 @@ limitations under the License.
 
         .mx_Toast_buttons {
             display: flex;
-
-            > :not(:last-child) {
-                margin-right: 8px;
-            }
         }
 
         .mx_Toast_description {
diff --git a/res/css/views/elements/_FormButton.scss b/res/css/views/elements/_FormButton.scss
index 191dee5566..1483fe2091 100644
--- a/res/css/views/elements/_FormButton.scss
+++ b/res/css/views/elements/_FormButton.scss
@@ -18,6 +18,11 @@ limitations under the License.
     line-height: 16px;
     padding: 5px 15px;
     font-size: 12px;
+    height: min-content;
+
+    &:not(:last-child) {
+        margin-right: 8px;
+    }
 
     &.mx_AccessibleButton_kind_primary {
         color: $accent-color;
diff --git a/res/css/views/messages/_MKeyVerificationRequest.scss b/res/css/views/messages/_MKeyVerificationRequest.scss
index 87a75dee82..ee20751083 100644
--- a/res/css/views/messages/_MKeyVerificationRequest.scss
+++ b/res/css/views/messages/_MKeyVerificationRequest.scss
@@ -65,23 +65,6 @@ limitations under the License.
     .mx_KeyVerification_buttons {
         align-items: center;
         display: flex;
-
-        .mx_AccessibleButton_kind_decline {
-            color: $notice-primary-color;
-            background-color: $notice-primary-bg-color;
-        }
-
-        .mx_AccessibleButton_kind_accept {
-            color: $accent-color;
-            background-color: $accent-bg-color;
-        }
-
-        [role=button] {
-            margin: 10px;
-            padding: 7px 15px;
-            border-radius: 5px;
-            height: min-content;
-        }
     }
 
     .mx_KeyVerification_state {
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 21d82309ed..b2a1724fc6 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -111,10 +111,10 @@ export default class MKeyVerificationRequest extends React.Component {
                 userLabelForEventRoom(fromUserId, mxEvent)}</div>);
             const isResolved = !(this.state.accepted || this.state.cancelled || this.state.done);
             if (isResolved) {
-                const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+                const FormButton = sdk.getComponent("elements.FormButton");
                 stateNode = (<div className="mx_KeyVerification_buttons">
-                    <AccessibleButton kind="decline" onClick={this._onRejectClicked}>{_t("Decline")}</AccessibleButton>
-                    <AccessibleButton kind="accept" onClick={this._onAcceptClicked}>{_t("Accept")}</AccessibleButton>
+                    <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
+                    <FormButton onClick={this._onAcceptClicked} label={_t("Accept")} />
                 </div>);
             }
         } else if (isOwn) { // request sent by us

From 8ce1ed472654297091d8fc4b76c89ffe772572e7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Nov 2019 16:36:22 +0100
Subject: [PATCH 63/87] moar lint

---
 res/css/structures/_ToastContainer.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index ca8477dcc5..4c5e746e66 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -41,9 +41,6 @@ limitations under the License.
         box-shadow: 0px 4px 12px $menu-box-shadow-color;
         border-radius: 8px;
         overflow: hidden;
-    }
-
-    .mx_Toast_toast {
         display: grid;
         grid-template-columns: 20px 1fr;
         column-gap: 10px;

From 32b6fccbfcfe9f8197354e69634d48d2da557ce5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Nov 2019 17:26:14 +0100
Subject: [PATCH 64/87] fix double date separator

---
 src/components/structures/MessagePanel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 7eae3ff7a3..912b865b9f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -416,7 +416,8 @@ export default class MessagePanel extends React.Component {
 
                 // If this m.room.create event should be shown (room upgrade) then show it before the summary
                 if (this._shouldShowEvent(mxEv)) {
-                    ret.push(...this._getTilesForEvent(prevEvent, mxEv, false));
+                    // pass in the mxEv as prevEvent as well so no extra DateSeparator is rendered
+                    ret.push(...this._getTilesForEvent(mxEv, mxEv, false));
                 }
 
                 const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary

From f1d096e7aa860bb673513f3d6fead7880343574c Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 22 Nov 2019 15:16:53 +0000
Subject: [PATCH 65/87] Translated using Weblate (Bulgarian)

Currently translated at 95.9% (1840 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 3697cc635c..0ec1d91b9b 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2260,5 +2260,7 @@
     "You cancelled": "Отказахте потвърждаването",
     "%(name)s cancelled": "%(name)s отказа",
     "%(name)s wants to verify": "%(name)s иска да извърши потвърждение",
-    "You sent a verification request": "Изпратихте заявка за потвърждение"
+    "You sent a verification request": "Изпратихте заявка за потвърждение",
+    "Custom (%(level)s)": "Собствен (%(level)s)",
+    "Try out new ways to ignore people (experimental)": "Опитайте нови начини да игнорирате хора (експериментално)"
 }

From 9bb98e2b9c64bf7127ffcd7143cc387a8d1ae965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Fri, 22 Nov 2019 13:42:28 +0000
Subject: [PATCH 66/87] Translated using Weblate (Czech)

Currently translated at 95.8% (1837 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index e4e01b0116..62e6147506 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1269,7 +1269,7 @@
     "Security & Privacy": "Bezpečnost & Soukromí",
     "Encryption": "Šifrování",
     "Once enabled, encryption cannot be disabled.": "Když se šifrování zapne, už nepůjde vypnout.",
-    "Encrypted": "Šifrování je zapnuté",
+    "Encrypted": "Šifrování",
     "General": "Obecné",
     "General failure": "Nějaká chyba",
     "This homeserver does not support login using email address.": "Tento homeserver neumožňuje přihlášní pomocí emailu.",

From fab7dfd8e81f709d05e012284200d59a5c1369e5 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 22 Nov 2019 14:01:15 +0000
Subject: [PATCH 67/87] Translated using Weblate (Italian)

Currently translated at 99.9% (1916 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 9faa48328c..eb5f5f76f2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2298,5 +2298,22 @@
     "This widget may use cookies.": "Questo widget può usare cookie.",
     "Send verification requests in direct message, including a new verification UX in the member panel.": "Invia le richieste di verifica via messaggio diretto, inclusa una nuova esperienza utente per la verifica nel pannello membri.",
     "Enable local event indexing and E2EE search (requires restart)": "Attiva l'indicizzazione di eventi locali e la ricerca E2EE (richiede riavvio)",
-    "Match system dark mode setting": "Combacia la modalità scura di sistema"
+    "Match system dark mode setting": "Combacia la modalità scura di sistema",
+    "Connecting to integration manager...": "Connessione al gestore di integrazioni...",
+    "Cannot connect to integration manager": "Impossibile connettere al gestore di integrazioni",
+    "The integration manager is offline or it cannot reach your homeserver.": "Il gestore di integrazioni è offline o non riesce a raggiungere il tuo homeserver.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usa un gestore di integrazioni <b>(%(serverName)s)</b> per gestire bot, widget e pacchetti di adesivi.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Usa un gestore di integrazioni per gestire bot, widget e pacchetti di adesivi.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "I gestori di integrazione ricevono dati di configurazione e possono modificare widget, inviare inviti alla stanza, assegnare permessi a tuo nome.",
+    "Failed to connect to integration manager": "Connessione al gestore di integrazioni fallita",
+    "Widgets do not use message encryption.": "I widget non usano la cifratura dei messaggi.",
+    "More options": "Altre opzioni",
+    "Integrations are disabled": "Le integrazioni sono disattivate",
+    "Enable 'Manage Integrations' in Settings to do this.": "Attiva 'Gestisci integrazioni' nelle impostazioni per continuare.",
+    "Integrations not allowed": "Integrazioni non permesse",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Il tuo Riot non ti permette di usare il gestore di integrazioni per questa azione. Contatta un amministratore.",
+    "Reload": "Ricarica",
+    "Take picture": "Scatta foto",
+    "Remove for everyone": "Rimuovi per tutti",
+    "Remove for me": "Rimuovi per me"
 }

From 2b7a7f88b8dd2dba96b58e18d81c53939707b781 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Nov 2019 17:26:14 +0100
Subject: [PATCH 68/87] fix double date separator

---
 src/components/structures/MessagePanel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 39504666bf..aad01a2bff 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -413,7 +413,8 @@ module.exports = createReactClass({
 
                 // If this m.room.create event should be shown (room upgrade) then show it before the summary
                 if (this._shouldShowEvent(mxEv)) {
-                    ret.push(...this._getTilesForEvent(prevEvent, mxEv, false));
+                    // pass in the mxEv as prevEvent as well so no extra DateSeparator is rendered
+                    ret.push(...this._getTilesForEvent(mxEv, mxEv, false));
                 }
 
                 const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary

From aae315038309df0533986e3f7a186c236a6a7998 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Nov 2019 16:50:32 +0000
Subject: [PATCH 69/87] Null check on thumbnail_file

---
 src/components/views/messages/MVideoBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 43e4f2dd75..44954344ff 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -88,7 +88,7 @@ module.exports = createReactClass({
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
             let thumbnailPromise = Promise.resolve(null);
-            if (content.info.thumbnail_file) {
+            if (content.info && content.info.thumbnail_file) {
                 thumbnailPromise = decryptFile(
                     content.info.thumbnail_file,
                 ).then(function(blob) {

From f23e5942e6e80465a8031aacd15878fc0360563d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 22 Nov 2019 17:18:26 +0000
Subject: [PATCH 70/87] Prepare changelog for v1.7.3-rc.2

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dad0accd2..a3f72685db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+Changes in [1.7.3-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.3-rc.2) (2019-11-22)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.3-rc.1...v1.7.3-rc.2)
+
+ * Fix double date separator for room upgrade tiles
+   [\#3663](https://github.com/matrix-org/matrix-react-sdk/pull/3663)
+ * Show m.room.create event before the ELS on room upgrade
+   [\#3660](https://github.com/matrix-org/matrix-react-sdk/pull/3660)
+ * Make addEventListener conditional
+   [\#3659](https://github.com/matrix-org/matrix-react-sdk/pull/3659)
+ * Fix e2e icons
+   [\#3658](https://github.com/matrix-org/matrix-react-sdk/pull/3658)
+
 Changes in [1.7.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.3-rc.1) (2019-11-20)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.2...v1.7.3-rc.1)

From 730967fd3f381ed26db5f09a3cbaf9824fe14191 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 22 Nov 2019 17:18:27 +0000
Subject: [PATCH 71/87] v1.7.3-rc.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e5d2d7635c..099fc30b33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "1.7.3-rc.1",
+  "version": "1.7.3-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 8254261f261006740cc53ff6ea0602f14aac4562 Mon Sep 17 00:00:00 2001
From: Keunes <keunes@mailbox.org>
Date: Fri, 22 Nov 2019 18:48:44 +0000
Subject: [PATCH 72/87] Translated using Weblate (Dutch)

Currently translated at 93.4% (1794 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 825f3c6a48..7ec8197eaf 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1193,7 +1193,7 @@
     "Encrypted, not sent": "Versleuteld, niet verstuurd",
     "Demote yourself?": "Uzelf degraderen?",
     "Demote": "Degraderen",
-    "Share Link to User": "Koppeling met gebruiker delen",
+    "Share Link to User": "Link naar gebruiker delen",
     "deleted": "verwijderd",
     "underlined": "onderstreept",
     "inline-code": "code",

From d867f41f569e01db0fbeba732ff97ba354fc3f64 Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Fri, 22 Nov 2019 18:48:50 +0000
Subject: [PATCH 73/87] Translated using Weblate (Dutch)

Currently translated at 93.4% (1794 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 7ec8197eaf..347afc3583 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1193,7 +1193,7 @@
     "Encrypted, not sent": "Versleuteld, niet verstuurd",
     "Demote yourself?": "Uzelf degraderen?",
     "Demote": "Degraderen",
-    "Share Link to User": "Link naar gebruiker delen",
+    "Share Link to User": "Koppeling naar gebruiker delen",
     "deleted": "verwijderd",
     "underlined": "onderstreept",
     "inline-code": "code",

From 95e02899b45735da73f299043e341f08287fc30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 23 Nov 2019 10:08:24 +0000
Subject: [PATCH 74/87] Translated using Weblate (French)

Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 0c13b3c722..097dd0824f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2370,5 +2370,9 @@
     "Reload": "Recharger",
     "Take picture": "Prendre une photo",
     "Remove for everyone": "Supprimer pour tout le monde",
-    "Remove for me": "Supprimer pour moi"
+    "Remove for me": "Supprimer pour moi",
+    "Decline (%(counter)s)": "Refuser (%(counter)s)",
+    "Manage integrations": "Gérer les intégrations",
+    "Verification Request": "Demande de vérification",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)"
 }

From 1c02fa573f315ba5dbb479b440c7506f606d7b92 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 22 Nov 2019 18:52:54 +0000
Subject: [PATCH 75/87] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7ed4eb253c..9e41b7381e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2358,5 +2358,9 @@
     "Integrations are disabled": "Az integrációk le vannak tiltva",
     "Enable 'Manage Integrations' in Settings to do this.": "Ehhez engedélyezd az „Integrációk Kezelésé”-t a Beállításokban.",
     "Integrations not allowed": "Az integrációk nem engedélyezettek",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "A Riotod nem használhat ehhez Integrációs Menedzsert. Kérlek vedd fel a kapcsolatot az adminisztrátorral."
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "A Riotod nem használhat ehhez Integrációs Menedzsert. Kérlek vedd fel a kapcsolatot az adminisztrátorral.",
+    "Decline (%(counter)s)": "Elutasítás (%(counter)s)",
+    "Manage integrations": "Integrációk kezelése",
+    "Verification Request": "Ellenőrzési kérés",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)"
 }

From 00fd329bfeeb3dab87e2ccbc2d08a64ebed35c85 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.hotlab@hotmail.com>
Date: Sat, 23 Nov 2019 18:56:46 +0000
Subject: [PATCH 76/87] Translated using Weblate (Italian)

Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index eb5f5f76f2..21c03a7802 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2315,5 +2315,11 @@
     "Reload": "Ricarica",
     "Take picture": "Scatta foto",
     "Remove for everyone": "Rimuovi per tutti",
-    "Remove for me": "Rimuovi per me"
+    "Remove for me": "Rimuovi per me",
+    "Trust": "Fidati",
+    "Decline (%(counter)s)": "Rifiuta (%(counter)s)",
+    "Manage integrations": "Gestisci integrazioni",
+    "Ignored/Blocked": "Ignorati/Bloccati",
+    "Verification Request": "Richiesta verifica",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)"
 }

From 1607bc329bc819866e22f1d68814f897d3d7a336 Mon Sep 17 00:00:00 2001
From: dreboy30 <a30nunes@gmail.com>
Date: Sat, 23 Nov 2019 15:16:23 +0000
Subject: [PATCH 77/87] Translated using Weblate (Portuguese)

Currently translated at 34.5% (663 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 5a56e807e4..7aa8851daa 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -350,7 +350,7 @@
     "No devices with registered encryption keys": "Não há dispositivos com chaves de criptografia registradas",
     "No more results": "Não há mais resultados",
     "No results": "Sem resultados",
-    "OK": "Ok",
+    "OK": "OK",
     "Revoke Moderator": "Retirar status de moderador",
     "Search": "Pesquisar",
     "Search failed": "Busca falhou",
@@ -847,6 +847,29 @@
     "Add Phone Number": "Adicione número de telefone",
     "The platform you're on": "A plataforma em que se encontra",
     "The version of Riot.im": "A versão do RIOT.im",
-    "Whether or not you're logged in (we don't record your username)": "Tenha ou não, iniciado sessão (não iremos guardar o seu username)",
-    "Your language of choice": "O seu idioma de escolha"
+    "Whether or not you're logged in (we don't record your username)": "Tenha ou não, iniciado sessão (não iremos guardar o seu nome de utilizador)",
+    "Your language of choice": "O seu idioma que escolheu",
+    "Which officially provided instance you are using, if any": "Qual instância oficial está utilizando, se for o caso",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se está a usar o modo de texto enriquecido do editor de texto enriquecido",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Se usa a funcionalidade 'breadcrumbs' (avatares em cima da lista de salas",
+    "Your homeserver's URL": "O URL do seu servidor de início",
+    "Your identity server's URL": "O URL do seu servidor de identidade",
+    "e.g. %(exampleValue)s": "ex. %(exampleValue)s",
+    "Every page you use in the app": "Todas as páginas que usa na aplicação",
+    "e.g. <CurrentPageURL>": "ex. <CurrentPageURL>",
+    "Your User Agent": "O seu Agente de Utilizador",
+    "Your device resolution": "A resolução do seu dispositivo",
+    "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o Riot.im incluem:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página contém informação de que permitam a sua identificação, como uma sala, ID de utilizador ou de grupo, estes dados são removidos antes de serem enviados ao servidor.",
+    "Call Failed": "A chamada falhou",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Há dispositivos desconhecidos nesta sala: se continuar sem os verificar, será possível que alguém espie a sua chamada.",
+    "Review Devices": "Rever dispositivos",
+    "Call Anyway": "Ligar na mesma",
+    "Answer Anyway": "Responder na mesma",
+    "Call": "Ligar",
+    "Answer": "Responder",
+    "Call failed due to misconfigured server": "Chamada falhada devido a um erro de configuração do servidor",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Peça ao administrador do seu servidor inicial (<code>%(homeserverDomain)s</code>) de configurar um servidor TURN para que as chamadas funcionem fiavelmente.",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativamente, pode tentar usar o servidor público em <code>turn.matrix.org</code>, mas não será tão fiável e partilhará o seu IP com esse servidor. Também pode gerir isso nas definições.",
+    "Try using turn.matrix.org": "Tente utilizar turn.matrix.org"
 }

From 4fb6e4b9833e4cbb69dd773515ff41d17eb13f89 Mon Sep 17 00:00:00 2001
From: dreboy30 <a30nunes@gmail.com>
Date: Sat, 23 Nov 2019 15:31:58 +0000
Subject: [PATCH 78/87] Translated using Weblate (Portuguese (Brazil))

Currently translated at 68.8% (1321 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 072215663d..415d2fdd4b 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -652,7 +652,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se você está usando o editor de texto visual",
     "Your homeserver's URL": "A URL do seu Servidor de Base (homeserver)",
     "Your identity server's URL": "A URL do seu servidor de identidade",
-    "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo usadas para ajudar a melhorar o Riot.im incluem:",
+    "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o Riot.im incluem:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página tem informação de identificação, como uma sala, ID de usuária/o ou de grupo, estes dados são removidos antes de serem enviados ao servidor.",
     "Call Failed": "A chamada falhou",
     "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Há dispositivos desconhecidos nesta sala: se você continuar sem verificá-los, será possível alguém espiar sua chamada.",

From 11fec80370fa7cd8e081acbd19e631a88cfff131 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 24 Nov 2019 20:52:22 -0700
Subject: [PATCH 79/87] Hide tooltips with CSS when they aren't visible

Fixes https://github.com/vector-im/riot-web/issues/11456
---
 src/components/views/elements/Tooltip.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/Tooltip.js b/src/components/views/elements/Tooltip.js
index bb5f9f0604..8ff3ce9bdb 100644
--- a/src/components/views/elements/Tooltip.js
+++ b/src/components/views/elements/Tooltip.js
@@ -100,7 +100,9 @@ module.exports = createReactClass({
         const parent = ReactDOM.findDOMNode(this).parentNode;
         let style = {};
         style = this._updatePosition(style);
-        style.display = "block";
+        // Hide the entire container when not visible. This prevents flashing of the tooltip
+        // if it is not meant to be visible on first mount.
+        style.display = this.props.visible ? "block" : "none";
 
         const tooltipClasses = classNames("mx_Tooltip", this.props.tooltipClassName, {
             "mx_Tooltip_visible": this.props.visible,

From 56a7de5157dd70d281b80cdf59523844971bb7c8 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 25 Nov 2019 08:31:58 +0000
Subject: [PATCH 80/87] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 2fd014554e..a5f8e5e04b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2363,5 +2363,9 @@
     "Reload": "重新載入",
     "Take picture": "拍照",
     "Remove for everyone": "對所有人移除",
-    "Remove for me": "對我移除"
+    "Remove for me": "對我移除",
+    "Decline (%(counter)s)": "拒絕 (%(counter)s)",
+    "Manage integrations": "管理整合",
+    "Verification Request": "驗證請求",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)"
 }

From 422ab81185433c3d61cd261760dfcaee192b72e2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 25 Nov 2019 12:31:57 +0100
Subject: [PATCH 81/87] a11y adjustments for toasts

---
 src/components/structures/ToastContainer.js             | 2 +-
 src/components/views/toasts/VerificationRequestToast.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index b8ced1e9de..83bbdac1a1 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -74,7 +74,7 @@ export default class ToastContainer extends React.Component {
         });
 
         return (
-            <div className={containerClasses}>
+            <div className={containerClasses} role="alert" aria-live="polite">
                 <div className={toastClasses}>
                     <h2>{title}{countIndicator}</h2>
                     <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div>
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index c6f7f3a363..89af91c41f 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -108,7 +108,7 @@ export default class VerificationRequestToast extends React.PureComponent {
         }
         return (<div>
             <div className="mx_Toast_description">{nameLabel}</div>
-            <div className="mx_Toast_buttons">
+            <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Decline (%(counter)s)", {counter: this.state.counter})} kind="danger" onClick={this.cancel} />
                 <FormButton label={_t("Accept")} onClick={this.accept} />
             </div>

From 694f2cb1dc676c06fd2961e566eeaf144c5cf603 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 25 Nov 2019 13:20:20 +0100
Subject: [PATCH 82/87] make sure the toast container is always in the document

---
 src/components/structures/ToastContainer.js | 43 ++++++++++-----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index 83bbdac1a1..a8dca35747 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -50,35 +50,34 @@ export default class ToastContainer extends React.Component {
 
     render() {
         const totalCount = this.state.toasts.length;
-        if (totalCount === 0) {
-            return null;
-        }
         const isStacked = totalCount > 1;
-        const topToast = this.state.toasts[0];
-        const {title, icon, key, component, props} = topToast;
+        let toast;
+        if (totalCount !== 0) {
+            const topToast = this.state.toasts[0];
+            const {title, icon, key, component, props} = topToast;
+            const toastClasses = classNames("mx_Toast_toast", {
+                "mx_Toast_hasIcon": icon,
+                [`mx_Toast_icon_${icon}`]: icon,
+            });
+            const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
+
+            const toastProps = Object.assign({}, props, {
+                dismiss: this.dismissTopToast,
+                key,
+            });
+            toast = (<div className={toastClasses}>
+                <h2>{title}{countIndicator}</h2>
+                <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div>
+            </div>);
+        }
 
         const containerClasses = classNames("mx_ToastContainer", {
             "mx_ToastContainer_stacked": isStacked,
         });
 
-        const toastClasses = classNames("mx_Toast_toast", {
-            "mx_Toast_hasIcon": icon,
-            [`mx_Toast_icon_${icon}`]: icon,
-        });
-
-        const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
-
-        const toastProps = Object.assign({}, props, {
-            dismiss: this.dismissTopToast,
-            key,
-        });
-
         return (
-            <div className={containerClasses} role="alert" aria-live="polite">
-                <div className={toastClasses}>
-                    <h2>{title}{countIndicator}</h2>
-                    <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div>
-                </div>
+            <div className={containerClasses} role="alert">
+                {toast}
             </div>
         );
     }

From 942db34e9263c6e9b6f7236cfdb704f223a169a7 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 25 Nov 2019 13:27:15 +0000
Subject: [PATCH 83/87] released js-sdk

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 099fc30b33..a92222579c 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "lolex": "4.2",
-    "matrix-js-sdk": "2.4.4-rc.1",
+    "matrix-js-sdk": "2.4.4",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index eb72b11793..44d9548b54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5197,10 +5197,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@2.4.4-rc.1:
-  version "2.4.4-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4-rc.1.tgz#5fd33fd11be9eea23cd0d0b8eb79da7a4b6253bf"
-  integrity sha512-Kn94zZMXh2EmihYL3lWNp2lpT7RtqcaUxjkP7H9Mr113swSOXtKr8RWMrvopAIguC1pcLzL+lCk+N8rrML2A4Q==
+matrix-js-sdk@2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4.tgz#d5e2d6fbe938c4275a1423a5f09330d33517ce3f"
+  integrity sha512-wSaRFvhWvwEzVaEkyBGo5ReumvaM5OrC1MJ6SVlyoLwH/WRPEXcUlu+rUNw5TFVEAH4TAVHXf/SVRBiR0j5nSQ==
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"

From 92a50c73274160cc3476dfcfba1a2fb3c0421f43 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 25 Nov 2019 13:30:40 +0000
Subject: [PATCH 84/87] Prepare changelog for v1.7.3

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3f72685db..bc2341863a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.7.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.3) (2019-11-25)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.3-rc.2...v1.7.3)
+
+ * No changes since rc.2
+
 Changes in [1.7.3-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.3-rc.2) (2019-11-22)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.3-rc.1...v1.7.3-rc.2)

From f62cd367450ce47329828ca44b50550c774c61c6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 25 Nov 2019 13:30:40 +0000
Subject: [PATCH 85/87] v1.7.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a92222579c..1ecfe63c23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "1.7.3-rc.2",
+  "version": "1.7.3",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 54294e4927b0392d6eb6a14a9282128405955eb1 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 25 Nov 2019 14:03:40 +0000
Subject: [PATCH 86/87] Clarify that cross-signing is in development

In an attempt to clarify the state of this highly anticipated feature, this
updates the labs flag name to match.

Part of https://github.com/vector-im/riot-web/issues/11492
---
 src/i18n/strings/en_EN.json | 2 +-
 src/settings/Settings.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ddc7c016cc..0a83237f45 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -342,7 +342,7 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Send verification requests in direct message, including a new verification UX in the member panel.": "Send verification requests in direct message, including a new verification UX in the member panel.",
-    "Enable cross-signing to verify per-user instead of per-device": "Enable cross-signing to verify per-user instead of per-device",
+    "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 89693f7c50..5a3283c5f0 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -143,7 +143,7 @@ export const SETTINGS = {
     },
     "feature_cross_signing": {
         isFeature: true,
-        displayName: _td("Enable cross-signing to verify per-user instead of per-device"),
+        displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
         controller: new ReloadOnChangeController(),

From 21a15fdcb4ec1098df2a62ea3fabea5812c7dbd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 21 Nov 2019 10:38:21 +0100
Subject: [PATCH 87/87] EventIndex: Move the checkpoint loading logic into the
 init method.

The checkpoints don't seem to be loaded anymore in the onSync method,
the reason why this has stopped working is left unexplored since loading
the checkpoints makes most sense during the initialization step anyways.
---
 src/indexing/EventIndex.js    | 13 +++++--------
 src/indexing/EventIndexPeg.js |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 6bad992017..cf7e2d8da2 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -35,7 +35,12 @@ export default class EventIndex {
 
     async init() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
+
         await indexManager.initEventIndex();
+        console.log("EventIndex: Successfully initialized the event index");
+
+        this.crawlerCheckpoints = await indexManager.loadCheckpoints();
+        console.log("EventIndex: Loaded checkpoints", this.crawlerCheckpoints);
 
         this.registerListeners();
     }
@@ -62,14 +67,6 @@ export default class EventIndex {
     onSync = async (state, prevState, data) => {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
-        if (prevState === null && state === "PREPARED") {
-            // Load our stored checkpoints, if any.
-            this.crawlerCheckpoints = await indexManager.loadCheckpoints();
-            console.log("EventIndex: Loaded checkpoints",
-                        this.crawlerCheckpoints);
-            return;
-        }
-
         if (prevState === "PREPARED" && state === "SYNCING") {
             const addInitialCheckpoints = async () => {
                 const client = MatrixClientPeg.get();
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index c0bdd74ff4..75f0fa66ba 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -55,8 +55,6 @@ class EventIndexPeg {
             return false;
         }
 
-        console.log("EventIndex: Successfully initialized the event index");
-
         this.index = index;
 
         return true;