From 1f2bf0485ebee982ca5cdb50cac3f525b26b07fc Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 18 Apr 2020 14:52:41 +0300
Subject: [PATCH 001/181] Implement widget API for signaling the widget to
 gracefully terminate

In theory, widgets could use iframe unload/beforeunload events for
cleanup, but in practice browsers have restrictions on what can be done
in those events which may not give sufficient time for clean
termination.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/WidgetMessaging.js   | 13 +++++++++++++
 src/widgets/WidgetApi.ts | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 5f877bd48a..6a20c340a5 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -87,6 +87,19 @@ export default class WidgetMessaging {
         });
     }
 
+    /**
+     * Tells the widget that it should terminate now.
+     * It is not necessarily called in all instances before the widget is removed,
+     * and the client may force termination with a timeout.
+     * @returns {Promise<*>} Resolves when widget has acknowledged the message.
+     */
+    terminate() {
+        return this.messageToWidget({
+            api: OUTBOUND_API_NAME,
+            action: KnownWidgetActions.Terminate,
+        });
+    }
+
     /**
      * Request a screenshot from a widget
      * @return {Promise} To be resolved with screenshot data when it has been generated
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index 05237d258f..e08476edb5 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -34,6 +34,7 @@ export enum KnownWidgetActions {
     ReceiveOpenIDCredentials = "openid_credentials",
     SetAlwaysOnScreen = "set_always_on_screen",
     ClientReady = "im.vector.ready",
+    Terminate = "im.vector.terminate",
 }
 
 export type WidgetAction = KnownWidgetActions | string;
@@ -68,6 +69,8 @@ export class WidgetApi {
     private inFlightRequests: { [requestId: string]: (reply: FromWidgetRequest) => void } = {};
     private readyPromise: Promise<any>;
     private readyPromiseResolve: () => void;
+    private terminatePromise: Promise<any>;
+    private terminatePromiseResolve: () => void;
 
     /**
      * Set this to true if your widget is expecting a ready message from the client. False otherwise (default).
@@ -78,6 +81,7 @@ export class WidgetApi {
         this.origin = new URL(currentUrl).origin;
 
         this.readyPromise = new Promise<any>(resolve => this.readyPromiseResolve = resolve);
+        this.terminatePromise = new Promise<any>(resolve => this.terminatePromiseResolve = resolve);
 
         window.addEventListener("message", event => {
             if (event.origin !== this.origin) return; // ignore: invalid origin
@@ -98,6 +102,12 @@ export class WidgetApi {
 
                     // Automatically acknowledge so we can move on
                     this.replyToRequest(<ToWidgetRequest>payload, {});
+                } else if (payload.action === KnownWidgetActions.Terminate) {
+                    // Reply after resolving
+                    this.terminatePromise.then(() => {
+                        this.replyToRequest(<ToWidgetRequest>payload, {});
+                    });
+                    this.terminatePromiseResolve();
                 } else {
                     console.warn(`[WidgetAPI] Got unexpected action: ${payload.action}`);
                 }
@@ -116,6 +126,10 @@ export class WidgetApi {
         return this.readyPromise;
     }
 
+    public addTerminateCallback(action) {
+        this.terminatePromise = this.terminatePromise.then(action);
+    }
+
     private replyToRequest(payload: ToWidgetRequest, reply: any) {
         if (!window.parent) return;
 

From 4fac7810517795061ec6a750b49d46ed31ebf059 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 18 Apr 2020 14:53:48 +0300
Subject: [PATCH 002/181] Tell widgets to terminate gracefully in
 AppTile:_endWidgetActions

If the widget fails to terminate in two seconds, proceed with disposing
the iframe nevertheless.

This allows e.g. Jitsi to hangup the conference when minimizing the
widget, instead of abrupt disconnect that can leave ghost users behind.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/components/views/elements/AppTile.js | 74 ++++++++++++++----------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 58bfda8d22..5176753037 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -340,23 +340,30 @@ export default class AppTile extends React.Component {
     /**
      * Ends all widget interaction, such as cancelling calls and disabling webcams.
      * @private
+     * @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
      */
     _endWidgetActions() {
-        // HACK: This is a really dirty way to ensure that Jitsi cleans up
-        // its hold on the webcam. Without this, the widget holds a media
-        // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
-        if (this._appFrame.current) {
-            // In practice we could just do `+= ''` to trick the browser
-            // into thinking the URL changed, however I can foresee this
-            // being optimized out by a browser. Instead, we'll just point
-            // the iframe at a page that is reasonably safe to use in the
-            // event the iframe doesn't wink away.
-            // This is relative to where the Riot instance is located.
-            this._appFrame.current.src = 'about:blank';
-        }
+        const timeout = 2000;
+        const timeoutPromise = new Promise(resolve => setTimeout(resolve, timeout));
+        const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
 
-        // Delete the widget from the persisted store for good measure.
-        PersistedElement.destroyElement(this._persistKey);
+        return Promise.race([messaging.terminate(), timeoutPromise]).finally(() => {
+            // HACK: This is a really dirty way to ensure that Jitsi cleans up
+            // its hold on the webcam. Without this, the widget holds a media
+            // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
+            if (this._appFrame.current) {
+                // In practice we could just do `+= ''` to trick the browser
+                // into thinking the URL changed, however I can foresee this
+                // being optimized out by a browser. Instead, we'll just point
+                // the iframe at a page that is reasonably safe to use in the
+                // event the iframe doesn't wink away.
+                // This is relative to where the Riot instance is located.
+                this._appFrame.current.src = 'about:blank';
+            }
+
+            // Delete the widget from the persisted store for good measure.
+            PersistedElement.destroyElement(this._persistKey);
+        });
     }
 
     /* If user has permission to modify widgets, delete the widget,
@@ -380,21 +387,21 @@ export default class AppTile extends React.Component {
                     }
                     this.setState({deleting: true});
 
-                    this._endWidgetActions();
+                    this._endWidgetActions().then(() => {
+                        WidgetUtils.setRoomWidget(
+                            this.props.room.roomId,
+                            this.props.app.id,
+                        ).catch((e) => {
+                            console.error('Failed to delete widget', e);
+                            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
-                    WidgetUtils.setRoomWidget(
-                        this.props.room.roomId,
-                        this.props.app.id,
-                    ).catch((e) => {
-                        console.error('Failed to delete widget', e);
-                        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-
-                        Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
-                            title: _t('Failed to remove widget'),
-                            description: _t('An error ocurred whilst trying to remove the widget from the room'),
+                            Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
+                                title: _t('Failed to remove widget'),
+                                description: _t('An error ocurred whilst trying to remove the widget from the room'),
+                            });
+                        }).finally(() => {
+                            this.setState({deleting: false});
                         });
-                    }).finally(() => {
-                        this.setState({deleting: false});
                     });
                 },
             });
@@ -545,13 +552,18 @@ export default class AppTile extends React.Component {
         if (this.props.userWidget) {
             this._onMinimiseClick();
         } else {
+            let promise;
             if (this.props.show) {
                 // if we were being shown, end the widget as we're about to be minimized.
-                this._endWidgetActions();
+                promise = this._endWidgetActions();
+            } else {
+                promise = Promise.resolve();
             }
-            dis.dispatch({
-                action: 'appsDrawer',
-                show: !this.props.show,
+            promise.then(() => {
+                dis.dispatch({
+                    action: 'appsDrawer',
+                    show: !this.props.show,
+                });
             });
         }
     }

From 94745e9407a5a772febf74608b536f5d70797417 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 18 Apr 2020 16:57:19 +0300
Subject: [PATCH 003/181] Minimize widget immediately, and end it later

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/components/views/elements/AppTile.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 5176753037..100a31bdcc 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -39,6 +39,7 @@ import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
 import PersistedElement from "./PersistedElement";
 import {WidgetType} from "../../../widgets/WidgetType";
+import {sleep} from "../../../utils/promise";
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
@@ -344,10 +345,9 @@ export default class AppTile extends React.Component {
      */
     _endWidgetActions() {
         const timeout = 2000;
-        const timeoutPromise = new Promise(resolve => setTimeout(resolve, timeout));
         const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
 
-        return Promise.race([messaging.terminate(), timeoutPromise]).finally(() => {
+        return Promise.race([messaging.terminate(), sleep(timeout)]).finally(() => {
             // HACK: This is a really dirty way to ensure that Jitsi cleans up
             // its hold on the webcam. Without this, the widget holds a media
             // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
@@ -552,18 +552,13 @@ export default class AppTile extends React.Component {
         if (this.props.userWidget) {
             this._onMinimiseClick();
         } else {
-            let promise;
             if (this.props.show) {
                 // if we were being shown, end the widget as we're about to be minimized.
-                promise = this._endWidgetActions();
-            } else {
-                promise = Promise.resolve();
+                this._endWidgetActions();
             }
-            promise.then(() => {
-                dis.dispatch({
-                    action: 'appsDrawer',
-                    show: !this.props.show,
-                });
+            dis.dispatch({
+                action: 'appsDrawer',
+                show: !this.props.show,
             });
         }
     }

From 352ea29d1733569ad86e7ffbfb960e4d05bde55d Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 18 Apr 2020 17:04:56 +0300
Subject: [PATCH 004/181] Implement widget ReceiveTerminate capability

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/components/views/elements/AppTile.js | 14 +++++++++++---
 src/utils/WidgetUtils.js                 |  1 +
 src/widgets/WidgetApi.ts                 |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 100a31bdcc..18be0eeb67 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -344,10 +344,18 @@ export default class AppTile extends React.Component {
      * @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
      */
     _endWidgetActions() {
-        const timeout = 2000;
-        const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
+        let promise;
 
-        return Promise.race([messaging.terminate(), sleep(timeout)]).finally(() => {
+        if (this._hasCapability('m.receive_terminate')) {
+            // Wait for widget to terminate within a timeout
+            const timeout = 2000;
+            const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
+            promise = Promise.race([messaging.terminate(), sleep(timeout)]);
+        } else {
+            promise = Promise.resolve();
+        }
+
+        return promise.finally(() => {
             // HACK: This is a really dirty way to ensure that Jitsi cleans up
             // its hold on the webcam. Without this, the widget holds a media
             // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 6a0556c2b3..11dd5a88f7 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -420,6 +420,7 @@ export default class WidgetUtils {
         if (WidgetType.JITSI.matches(appType)) {
             capWhitelist.push(Capability.AlwaysOnScreen);
         }
+        capWhitelist.push(Capability.ReceiveTerminate);
 
         return capWhitelist;
     }
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index e08476edb5..6a29955713 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -23,6 +23,7 @@ export enum Capability {
     Screenshot = "m.capability.screenshot",
     Sticker = "m.sticker",
     AlwaysOnScreen = "m.always_on_screen",
+    ReceiveTerminate = "m.receive_terminate",
 }
 
 export enum KnownWidgetActions {

From cf4137d4b23e5af5baf3c3a1f056da789e51d8b7 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 22 Apr 2020 19:20:28 +0300
Subject: [PATCH 005/181] Make WidgetAPI an EventEmitter + use for terminate +
 cleanups

Use EventEmitter for emitting events, rename terminate event code,
plus misc cleanups from review.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/WidgetMessaging.js                   |  2 --
 src/components/views/elements/AppTile.js | 22 +++++++++---------
 src/widgets/WidgetApi.ts                 | 29 ++++++++++++++----------
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 6a20c340a5..375e7dd8a3 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -89,8 +89,6 @@ export default class WidgetMessaging {
 
     /**
      * Tells the widget that it should terminate now.
-     * It is not necessarily called in all instances before the widget is removed,
-     * and the client may force termination with a timeout.
      * @returns {Promise<*>} Resolves when widget has acknowledged the message.
      */
     terminate() {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 18be0eeb67..057643c725 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -346,7 +346,7 @@ export default class AppTile extends React.Component {
     _endWidgetActions() {
         let promise;
 
-        if (this._hasCapability('m.receive_terminate')) {
+        if (this._hasCapability('im.vector.receive_terminate')) {
             // Wait for widget to terminate within a timeout
             const timeout = 2000;
             const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
@@ -396,20 +396,20 @@ export default class AppTile extends React.Component {
                     this.setState({deleting: true});
 
                     this._endWidgetActions().then(() => {
-                        WidgetUtils.setRoomWidget(
+                        return WidgetUtils.setRoomWidget(
                             this.props.room.roomId,
                             this.props.app.id,
-                        ).catch((e) => {
-                            console.error('Failed to delete widget', e);
-                            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                        );
+                    }).catch((e) => {
+                        console.error('Failed to delete widget', e);
+                        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
-                            Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
-                                title: _t('Failed to remove widget'),
-                                description: _t('An error ocurred whilst trying to remove the widget from the room'),
-                            });
-                        }).finally(() => {
-                            this.setState({deleting: false});
+                        Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
+                            title: _t('Failed to remove widget'),
+                            description: _t('An error ocurred whilst trying to remove the widget from the room'),
                         });
+                    }).finally(() => {
+                        this.setState({deleting: false});
                     });
                 },
             });
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index 6a29955713..c5420dca38 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -18,12 +18,13 @@ limitations under the License.
 // https://github.com/turt2live/matrix-dimension/blob/4f92d560266635e5a3c824606215b84e8c0b19f5/web/app/shared/services/scalar/scalar-widget.api.ts
 
 import { randomString } from "matrix-js-sdk/src/randomstring";
+import { EventEmitter } from "events";
 
 export enum Capability {
     Screenshot = "m.capability.screenshot",
     Sticker = "m.sticker",
     AlwaysOnScreen = "m.always_on_screen",
-    ReceiveTerminate = "m.receive_terminate",
+    ReceiveTerminate = "im.vector.receive_terminate",
 }
 
 export enum KnownWidgetActions {
@@ -64,14 +65,17 @@ export interface FromWidgetRequest extends WidgetRequest {
 
 /**
  * Handles Riot <--> Widget interactions for embedded/standalone widgets.
+ *
+ * Emitted events:
+ * - terminate(wait): client requested the widget to terminate.
+ *   Call the argument 'wait(promise)' to postpone the finalization until
+ *   the given promise resolves.
  */
-export class WidgetApi {
+export class WidgetApi extends EventEmitter {
     private origin: string;
     private inFlightRequests: { [requestId: string]: (reply: FromWidgetRequest) => void } = {};
     private readyPromise: Promise<any>;
     private readyPromiseResolve: () => void;
-    private terminatePromise: Promise<any>;
-    private terminatePromiseResolve: () => void;
 
     /**
      * Set this to true if your widget is expecting a ready message from the client. False otherwise (default).
@@ -79,10 +83,11 @@ export class WidgetApi {
     public expectingExplicitReady = false;
 
     constructor(currentUrl: string, private widgetId: string, private requestedCapabilities: string[]) {
+        super();
+
         this.origin = new URL(currentUrl).origin;
 
         this.readyPromise = new Promise<any>(resolve => this.readyPromiseResolve = resolve);
-        this.terminatePromise = new Promise<any>(resolve => this.terminatePromiseResolve = resolve);
 
         window.addEventListener("message", event => {
             if (event.origin !== this.origin) return; // ignore: invalid origin
@@ -104,11 +109,15 @@ export class WidgetApi {
                     // Automatically acknowledge so we can move on
                     this.replyToRequest(<ToWidgetRequest>payload, {});
                 } else if (payload.action === KnownWidgetActions.Terminate) {
-                    // Reply after resolving
-                    this.terminatePromise.then(() => {
+                    // Finalization needs to be async, so postpone with a promise
+                    let finalizePromise = Promise.resolve();
+                    const wait = promise => {
+                        finalizePromise = finalizePromise.then(value => promise);
+                    }
+                    this.emit('terminate', wait);
+                    Promise.resolve(finalizePromise).then(() => {
                         this.replyToRequest(<ToWidgetRequest>payload, {});
                     });
-                    this.terminatePromiseResolve();
                 } else {
                     console.warn(`[WidgetAPI] Got unexpected action: ${payload.action}`);
                 }
@@ -127,10 +136,6 @@ export class WidgetApi {
         return this.readyPromise;
     }
 
-    public addTerminateCallback(action) {
-        this.terminatePromise = this.terminatePromise.then(action);
-    }
-
     private replyToRequest(payload: ToWidgetRequest, reply: any) {
         if (!window.parent) return;
 

From 798f5d401ba89c96fd1467afe343a7caba0da5a2 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 11 Apr 2020 15:23:32 +0300
Subject: [PATCH 006/181] Ensure active Jitsi conference is closed on widget
 pop-out

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/components/views/elements/AppTile.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 057643c725..f5664fd613 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -671,6 +671,17 @@ export default class AppTile extends React.Component {
     }
 
     _onPopoutWidgetClick() {
+        // Ensure Jitsi conferences are closed on pop-out, to not confuse the user to join them
+        // twice from the same computer, which Jitsi can have problems with (audio echo/gain-loop).
+        if (WidgetType.JITSI.matches(this.props.app.type) && this.props.show) {
+            this._endWidgetActions().then(() => {
+                if (this._appFrame.current) {
+                    // Reload iframe
+                    this._appFrame.current.src = this._getRenderedUrl();
+                    this.setState({});
+                }
+            });
+        }
         // Using Object.assign workaround as the following opens in a new window instead of a new tab.
         // window.open(this._getPopoutUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),

From 38962560acce8fdb09705eee3590ae5331028eea Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Tue, 28 Apr 2020 02:18:43 +0300
Subject: [PATCH 007/181] Style fixes

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/components/views/elements/AppTile.js | 11 ++++++-----
 src/widgets/WidgetApi.ts                 |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index f5664fd613..ef0075e800 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -39,6 +39,7 @@ import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
 import PersistedElement from "./PersistedElement";
 import {WidgetType} from "../../../widgets/WidgetType";
+import {Capability} from "../../../widgets/WidgetApi";
 import {sleep} from "../../../utils/promise";
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
@@ -344,18 +345,18 @@ export default class AppTile extends React.Component {
      * @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
      */
     _endWidgetActions() {
-        let promise;
+        let terminationPromise;
 
-        if (this._hasCapability('im.vector.receive_terminate')) {
+        if (this._hasCapability(Capability.ReceiveTerminate)) {
             // Wait for widget to terminate within a timeout
             const timeout = 2000;
             const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
-            promise = Promise.race([messaging.terminate(), sleep(timeout)]);
+            terminationPromise = Promise.race([messaging.terminate(), sleep(timeout)]);
         } else {
-            promise = Promise.resolve();
+            terminationPromise = Promise.resolve();
         }
 
-        return promise.finally(() => {
+        return terminationPromise.finally(() => {
             // HACK: This is a really dirty way to ensure that Jitsi cleans up
             // its hold on the webcam. Without this, the widget holds a media
             // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index c5420dca38..795c6648ef 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -111,11 +111,12 @@ export class WidgetApi extends EventEmitter {
                 } else if (payload.action === KnownWidgetActions.Terminate) {
                     // Finalization needs to be async, so postpone with a promise
                     let finalizePromise = Promise.resolve();
-                    const wait = promise => {
+                    const wait = (promise) => {
                         finalizePromise = finalizePromise.then(value => promise);
-                    }
+                    };
                     this.emit('terminate', wait);
                     Promise.resolve(finalizePromise).then(() => {
+                        // Acknowledge that we're shut down now
                         this.replyToRequest(<ToWidgetRequest>payload, {});
                     });
                 } else {

From c0ac44e4711e55f32501365045e14576665a0aec Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 2 Jun 2020 17:10:22 +0100
Subject: [PATCH 008/181] Change internal font size from from 15 to 20.

---
 res/css/_common.scss                 |   2 +-
 res/css/_font-sizes.scss             | 112 +++++++++++++--------------
 src/settings/Settings.js             |   2 +-
 src/settings/watchers/FontWatcher.ts |   3 +-
 4 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index ebeeb381e6..c562c3e95f 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -19,7 +19,7 @@ limitations under the License.
 @import "./_font-sizes.scss";
 
 :root {
-    font-size: 15px;
+    font-size: 20px;
 }
 
 html {
diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index 2d7ab67e40..c4a223d66c 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -14,59 +14,59 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-$font-1px: 0.067rem;
-$font-1-5px: 0.100rem;
-$font-2px: 0.133rem;
-$font-3px: 0.200rem;
-$font-4px: 0.267rem;
-$font-5px: 0.333rem;
-$font-6px: 0.400rem;
-$font-7px: 0.467rem;
-$font-8px: 0.533rem;
-$font-9px: 0.600rem;
-$font-10px: 0.667rem;
-$font-10-4px: 0.693rem;
-$font-11px: 0.733rem;
-$font-12px: 0.800rem;
-$font-13px: 0.867rem;
-$font-14px: 0.933rem;
-$font-15px: 1.000rem;
-$font-16px: 1.067rem;
-$font-17px: 1.133rem;
-$font-18px: 1.200rem;
-$font-19px: 1.267rem;
-$font-20px: 1.3333333rem;
-$font-21px: 1.400rem;
-$font-22px: 1.467rem;
-$font-23px: 1.533rem;
-$font-24px: 1.600rem;
-$font-25px: 1.667rem;
-$font-26px: 1.733rem;
-$font-27px: 1.800rem;
-$font-28px: 1.867rem;
-$font-29px: 1.933rem;
-$font-30px: 2.000rem;
-$font-31px: 2.067rem;
-$font-32px: 2.133rem;
-$font-33px: 2.200rem;
-$font-34px: 2.267rem;
-$font-35px: 2.333rem;
-$font-36px: 2.400rem;
-$font-37px: 2.467rem;
-$font-38px: 2.533rem;
-$font-39px: 2.600rem;
-$font-40px: 2.667rem;
-$font-41px: 2.733rem;
-$font-42px: 2.800rem;
-$font-43px: 2.867rem;
-$font-44px: 2.933rem;
-$font-45px: 3.000rem;
-$font-46px: 3.067rem;
-$font-47px: 3.133rem;
-$font-48px: 3.200rem;
-$font-49px: 3.267rem;
-$font-50px: 3.333rem;
-$font-51px: 3.400rem;
-$font-52px: 3.467rem;
-$font-88px: 5.887rem;
-$font-400px: 26.667rem;
+$font-1px: 0.05rem;
+$font-1-5px: 0.075rem;
+$font-2px: 0.1rem;
+$font-3px: 0.15rem;
+$font-4px: 0.2rem;
+$font-5px: 0.25rem;
+$font-6px: 0.3rem;
+$font-7px: 0.35rem;
+$font-8px: 0.4rem;
+$font-9px: 0.45rem;
+$font-10px: 0.5rem;
+$font-10-4px: 0.52rem;
+$font-11px: 0.55rem;
+$font-12px: 0.6rem;
+$font-13px: 0.65rem;
+$font-14px: 0.7rem;
+$font-15px: 0.75rem;
+$font-16px: 0.8rem;
+$font-17px: 0.85rem;
+$font-18px: 0.9rem;
+$font-19px: 0.95rem;
+$font-20px: 1.0rem;
+$font-21px: 1.05rem;
+$font-22px: 1.1rem;
+$font-23px: 1.15rem;
+$font-24px: 1.2rem;
+$font-25px: 1.25rem;
+$font-26px: 1.3rem;
+$font-27px: 1.35rem;
+$font-28px: 1.4rem;
+$font-29px: 1.45rem;
+$font-30px: 1.5rem;
+$font-31px: 1.55rem;
+$font-32px: 1.6rem;
+$font-33px: 1.65rem;
+$font-34px: 1.7rem;
+$font-35px: 1.75rem;
+$font-36px: 1.8rem;
+$font-37px: 1.85rem;
+$font-38px: 1.9rem;
+$font-39px: 1.95rem;
+$font-40px: 2.0rem;
+$font-41px: 2.05rem;
+$font-42px: 2.1rem;
+$font-43px: 2.15rem;
+$font-44px: 2.2rem;
+$font-45px: 2.25rem;
+$font-46px: 2.3rem;
+$font-47px: 2.35rem;
+$font-48px: 2.4rem;
+$font-49px: 2.45rem;
+$font-50px: 2.5rem;
+$font-51px: 2.55rem;
+$font-52px: 2.6rem;
+$font-88px: 4.4rem;
+$font-400px: 20rem;
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index e6aa112c5f..7cb4421a4f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -180,7 +180,7 @@ export const SETTINGS = {
     "fontSize": {
         displayName: _td("Font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 15,
+        default: 20,
         controller: new FontSizeController(),
     },
     "useCustomFontSize": {
diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index dce9e77e9e..08a809f869 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -45,7 +45,8 @@ export class FontWatcher implements IWatcher {
     };
 
     private setRootFontSize = (size) => {
-        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE);
+        // Externally we tell the user the font is size 15. Internally we use 20.
+        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE) + 5;
 
         if (fontSize !== size) {
             SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);

From 1f1f61377775014dfbe8303eb7d89d3ed6f5c520 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 2 Jun 2020 19:07:46 -0600
Subject: [PATCH 009/181] Add a focus_composer dispatcher action

and use it
---
 src/ContentMessages.tsx                           | 3 ++-
 src/components/structures/LeftPanel.js            | 3 ++-
 src/components/structures/LoggedInView.tsx        | 5 +++--
 src/components/structures/MatrixChat.tsx          | 4 ++--
 src/components/structures/RoomStatusBar.js        | 5 +++--
 src/components/structures/RoomView.js             | 7 ++++---
 src/components/views/elements/ReplyThread.js      | 3 ++-
 src/components/views/rooms/EditMessageComposer.js | 7 ++++---
 src/components/views/rooms/SendMessageComposer.js | 3 ++-
 src/cryptodevices.js                              | 3 ++-
 src/dispatcher/actions.ts                         | 5 +++++
 11 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/ContentMessages.tsx b/src/ContentMessages.tsx
index 249ad8381c..25445b1c74 100644
--- a/src/ContentMessages.tsx
+++ b/src/ContentMessages.tsx
@@ -31,6 +31,7 @@ import Spinner from "./components/views/elements/Spinner";
 
 // Polyfill for Canvas.toBlob API using Canvas.toDataURL
 import "blueimp-canvas-to-blob";
+import { Action } from "./dispatcher/actions";
 
 const MAX_WIDTH = 800;
 const MAX_HEIGHT = 600;
@@ -529,7 +530,7 @@ export default class ContentMessages {
         dis.dispatch({action: 'upload_started'});
 
         // Focus the composer view
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
 
         function onProgress(ev) {
             upload.total = ev.total;
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a1b4f49c56..837064e822 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -27,6 +27,7 @@ import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import Analytics from "../../Analytics";
 import RoomList2 from "../views/rooms/RoomList2";
+import {Action} from "../../dispatcher/actions";
 
 
 const LeftPanel = createReactClass({
@@ -198,7 +199,7 @@ const LeftPanel = createReactClass({
 
     onSearchCleared: function(source) {
         if (source === "keyboard") {
-            dis.dispatch({action: 'focus_composer'});
+            dis.fire(Action.FocusComposer);
         }
         this.setState({searchExpanded: false});
     },
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 1ad38c6f04..cf985187e3 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -51,6 +51,7 @@ import {
     showToast as showServerLimitToast,
     hideToast as hideServerLimitToast
 } from "../../toasts/ServerLimitToast";
+import { Action } from "../../dispatcher/actions";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -346,7 +347,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             // refocusing during a paste event will make the
             // paste end up in the newly focused element,
             // so dispatch synchronously before paste happens
-            dis.dispatch({action: 'focus_composer'}, true);
+            dis.fire(Action.FocusComposer, true);
         }
     };
 
@@ -496,7 +497,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
 
             if (!isClickShortcut && ev.key !== Key.TAB && !canElementReceiveInput(ev.target)) {
                 // synchronous dispatch so we focus before key generates input
-                dis.dispatch({action: 'focus_composer'}, true);
+                dis.fire(Action.FocusComposer, true);
                 ev.stopPropagation();
                 // we should *not* preventDefault() here as
                 // that would prevent typing in the now-focussed composer
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 058a7ba50b..97fdfa262e 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -347,7 +347,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             Analytics.trackPageChange(durationMs);
         }
         if (this.focusComposer) {
-            dis.dispatch({action: 'focus_composer'});
+            dis.fire(Action.FocusComposer);
             this.focusComposer = false;
         }
     }
@@ -1363,7 +1363,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 showNotificationsToast();
             }
 
-            dis.dispatch({action: 'focus_composer'});
+            dis.fire(Action.FocusComposer);
             this.setState({
                 ready: true,
             });
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index ae628fd06a..b550b4d756 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -27,6 +27,7 @@ import Resend from '../../Resend';
 import * as cryptodevices from '../../cryptodevices';
 import dis from '../../dispatcher/dispatcher';
 import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
+import {Action} from "../../dispatcher/actions";
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -135,12 +136,12 @@ export default createReactClass({
 
     _onResendAllClick: function() {
         Resend.resendUnsentEvents(this.props.room);
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     _onCancelAllClick: function() {
         Resend.cancelUnsentEvents(this.props.room);
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     _onShowDevicesClick: function() {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c87f4cc4dd..81983b9708 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -55,6 +55,7 @@ import {haveTileForEvent} from "../views/rooms/EventTile";
 import RoomContext from "../../contexts/RoomContext";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { shieldStatusForRoom } from '../../utils/ShieldUtils';
+import {Action} from "../../dispatcher/actions";
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -1171,7 +1172,7 @@ export default createReactClass({
             ev.dataTransfer.files, this.state.room.roomId, this.context,
         );
         this.setState({ draggingFile: false });
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     onDragLeaveOrEnd: function(ev) {
@@ -1377,7 +1378,7 @@ export default createReactClass({
                 event: null,
             });
         }
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     onLeaveClick: function() {
@@ -1488,7 +1489,7 @@ export default createReactClass({
     // jump down to the bottom of this room, where new events are arriving
     jumpToLiveTimeline: function() {
         this._messagePanel.jumpToLiveTimeline();
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     // jump up to wherever our read marker is
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index e7f7196ac6..e96d9ced11 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -26,6 +26,7 @@ import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks
 import SettingsStore from "../../../settings/SettingsStore";
 import escapeHtml from "escape-html";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {Action} from "../../../dispatcher/actions";
 
 // This component does no cycle detection, simply because the only way to make such a cycle would be to
 // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would
@@ -290,7 +291,7 @@ export default class ReplyThread extends React.Component {
             events,
         }, this.loadNextEvent);
 
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     }
 
     render() {
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index b70ef6255c..78c7de887d 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -31,6 +31,7 @@ import {EventStatus} from 'matrix-js-sdk';
 import BasicMessageComposer from "./BasicMessageComposer";
 import {Key} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {Action} from "../../../dispatcher/actions";
 
 function _isReply(mxEvent) {
     const relatesTo = mxEvent.getContent()["m.relates_to"];
@@ -157,7 +158,7 @@ export default class EditMessageComposer extends React.Component {
                 dis.dispatch({action: 'edit_event', event: nextEvent});
             } else {
                 dis.dispatch({action: 'edit_event', event: null});
-                dis.dispatch({action: 'focus_composer'});
+                dis.fire(Action.FocusComposer);
             }
             event.preventDefault();
         }
@@ -165,7 +166,7 @@ export default class EditMessageComposer extends React.Component {
 
     _cancelEdit = () => {
         dis.dispatch({action: "edit_event", event: null});
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     }
 
     _isContentModified(newContent) {
@@ -195,7 +196,7 @@ export default class EditMessageComposer extends React.Component {
 
         // close the event editing and focus composer
         dis.dispatch({action: "edit_event", event: null});
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     };
 
     _cancelPreviousPendingEdit() {
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 3098c62433..25ad192ea4 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -44,6 +44,7 @@ import {Key} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import RateLimitedFunc from '../../../ratelimitedfunc';
+import {Action} from "../../../dispatcher/actions";
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
@@ -364,7 +365,7 @@ export default class SendMessageComposer extends React.Component {
     onAction = (payload) => {
         switch (payload.action) {
             case 'reply_to_event':
-            case 'focus_composer':
+            case Action.FocusComposer:
                 this._editorRef && this._editorRef.focus();
                 break;
             case 'insert_mention':
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index 86b97364f9..0b3dac5434 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -19,6 +19,7 @@ import * as sdk from './index';
 import dis from './dispatcher/dispatcher';
 import Modal from './Modal';
 import { _t } from './languageHandler';
+import {Action} from "./dispatcher/actions";
 
 /**
  * Mark all given devices as 'known'
@@ -66,7 +67,7 @@ export async function getUnknownDevicesForRoom(matrixClient, room) {
 }
 
 function focusComposer() {
-    dis.dispatch({action: 'focus_composer'});
+    dis.fire(Action.FocusComposer);
 }
 
 /**
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 7e76ea5ccb..71493d6e44 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -53,4 +53,9 @@ export enum Action {
      * Provide status information for an ongoing update check. Should be used with a CheckUpdatesPayload.
      */
     CheckUpdates = "check_updates",
+
+    /**
+     * Focuses the user's cursor to the composer. No additional payload information required.
+     */
+    FocusComposer = "focus_composer",
 }

From 6d96d66c031d2cb9753653a079ad3ed9694a7abf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 2 Jun 2020 19:26:07 -0600
Subject: [PATCH 010/181] Split the left panel into new and old for new room
 list designs

Though we consider the "room list" to mean the RoomList component specifically, the room list is actually the entire left panel as far as the user is concerned.

The new proposed designs for the room list modify the whole left panel, so we had might as well break it into new and old now instead of later. This "new" left panel is a bare-bones implementation and meant to only provide the absolute basic feature set to function for those who enable the experimental room list, for whatever reason. This is not intended to be a final implementation, or even remotely close to what it could be. An example of this is the lack of breadcrumbs. Given they are likely to change, they are excluded from this temporary skeleton completely.

This also includes a purple/pink bar between the tag panel and left panel. This is so we can, if needed, differentiate between people who made the mistake of turning on the experimental room list while the overall aesthetic makes it indistinguishable. Once the designs are moderately approved, we can (and definitely should) remove the hideous indicator.
---
 res/css/structures/_LeftPanel.scss         |   8 ++
 src/components/structures/LeftPanel.js     |  32 ++---
 src/components/structures/LeftPanel2.tsx   | 154 +++++++++++++++++++++
 src/components/structures/LoggedInView.tsx |  21 ++-
 4 files changed, 187 insertions(+), 28 deletions(-)
 create mode 100644 src/components/structures/LeftPanel2.tsx

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 7d57425f6f..6edee5eed2 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -22,6 +22,14 @@ limitations under the License.
     flex: 0 0 auto;
 }
 
+// TODO: Remove temporary indicator of new room list implementation.
+// This border is meant to visually distinguish between the two components when the
+// user has turned on the new room list implementation, at least until the designs
+// themselves give it away.
+.mx_LeftPanel2 .mx_LeftPanel {
+    border-left: 5px #e26dff solid;
+}
+
 .mx_LeftPanel_container.collapsed {
     min-width: unset;
     /* Collapsed LeftPanel 50px */
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 837064e822..05cd97df2a 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -26,7 +26,6 @@ import * as VectorConferenceHandler from '../../VectorConferenceHandler';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import Analytics from "../../Analytics";
-import RoomList2 from "../views/rooms/RoomList2";
 import {Action} from "../../dispatcher/actions";
 
 
@@ -275,28 +274,15 @@ const LeftPanel = createReactClass({
             breadcrumbs = (<RoomBreadcrumbs collapsed={this.props.collapsed} />);
         }
 
-        let roomList = null;
-        if (SettingsStore.isFeatureEnabled("feature_new_room_list")) {
-            roomList = <RoomList2
-                onKeyDown={this._onKeyDown}
-                resizeNotifier={this.props.resizeNotifier}
-                collapsed={this.props.collapsed}
-                searchFilter={this.state.searchFilter}
-                ref={this.collectRoomList}
-                onFocus={this._onFocus}
-                onBlur={this._onBlur}
-            />;
-        } else {
-            roomList = <RoomList
-                onKeyDown={this._onKeyDown}
-                onFocus={this._onFocus}
-                onBlur={this._onBlur}
-                ref={this.collectRoomList}
-                resizeNotifier={this.props.resizeNotifier}
-                collapsed={this.props.collapsed}
-                searchFilter={this.state.searchFilter}
-                ConferenceHandler={VectorConferenceHandler} />;
-        }
+        const roomList = <RoomList
+            onKeyDown={this._onKeyDown}
+            onFocus={this._onFocus}
+            onBlur={this._onBlur}
+            ref={this.collectRoomList}
+            resizeNotifier={this.props.resizeNotifier}
+            collapsed={this.props.collapsed}
+            searchFilter={this.state.searchFilter}
+            ConferenceHandler={VectorConferenceHandler} />;
 
         return (
             <div className={containerClasses}>
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
new file mode 100644
index 0000000000..c9a4948539
--- /dev/null
+++ b/src/components/structures/LeftPanel2.tsx
@@ -0,0 +1,154 @@
+/*
+Copyright 2020 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 TagPanel from "./TagPanel";
+import classNames from "classnames";
+import dis from "../../dispatcher/dispatcher";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import { _t } from "../../languageHandler";
+import SearchBox from "./SearchBox";
+import RoomList2 from "../views/rooms/RoomList2";
+import TopLeftMenuButton from "./TopLeftMenuButton";
+import { Action } from "../../dispatcher/actions";
+
+/*******************************************************************
+ *   CAUTION                                                       *
+ *******************************************************************
+ * This is a work in progress implementation and isn't complete or *
+ * even useful as a component. Please avoid using it until this    *
+ * warning disappears.                                             *
+ *******************************************************************/
+
+interface IProps {
+    // TODO: Support collapsed state
+}
+
+interface IState {
+    searchExpanded: boolean;
+    searchFilter: string; // TODO: Move search into room list?
+}
+
+export default class LeftPanel2 extends React.Component<IProps, IState> {
+    // TODO: Properly support TagPanel
+    // TODO: Properly support searching/filtering
+    // TODO: Properly support breadcrumbs
+    // TODO: Properly support TopLeftMenu (User Settings)
+    // TODO: a11y
+    // TODO: actually make this useful in general (match design proposals)
+    // TODO: Fadable support (is this still needed?)
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            searchExpanded: false,
+            searchFilter: "",
+        };
+    }
+
+    private onSearch = (term: string): void => {
+        this.setState({searchFilter: term});
+    };
+
+    private onSearchCleared = (source: string): void => {
+        if (source === "keyboard") {
+            dis.fire(Action.FocusComposer);
+        }
+        this.setState({searchExpanded: false});
+    }
+
+    private onSearchFocus = (): void => {
+        this.setState({searchExpanded: true});
+    };
+
+    private onSearchBlur = (event: FocusEvent): void => {
+        const target = event.target as HTMLInputElement;
+        if (target.value.length === 0) {
+            this.setState({searchExpanded: false});
+        }
+    }
+
+    public render(): React.ReactNode {
+        const tagPanel = (
+            <div className="mx_LeftPanel_tagPanelContainer">
+                <TagPanel/>
+            </div>
+        );
+
+        const exploreButton = (
+            <div
+                className={classNames("mx_LeftPanel_explore", {"mx_LeftPanel_explore_hidden": this.state.searchExpanded})}>
+                <AccessibleButton onClick={() => dis.dispatch({action: 'view_room_directory'})}>
+                    {_t("Explore")}
+                </AccessibleButton>
+            </div>
+        );
+
+        const searchBox = (<SearchBox
+            className="mx_LeftPanel_filterRooms"
+            enableRoomSearchFocus={true}
+            blurredPlaceholder={_t('Filter')}
+            placeholder={_t('Filter rooms…')}
+            onKeyDown={() => {/*TODO*/}}
+            onSearch={this.onSearch}
+            onCleared={this.onSearchCleared}
+            onFocus={this.onSearchFocus}
+            onBlur={this.onSearchBlur}
+            collapsed={false}/>); // TODO: Collapsed support
+
+        // TODO: Improve props for RoomList2
+        const roomList = <RoomList2
+            onKeyDown={() => {/*TODO*/}}
+            resizeNotifier={null}
+            collapsed={false}
+            searchFilter={this.state.searchFilter}
+            onFocus={() => {/*TODO*/}}
+            onBlur={() => {/*TODO*/}}
+        />;
+
+        // TODO: Breadcrumbs
+        // TODO: Conference handling / calls
+
+        const containerClasses = classNames({
+            "mx_LeftPanel_container": true,
+            "mx_fadable": true,
+            "collapsed": false, // TODO: Collapsed support
+            "mx_LeftPanel_container_hasTagPanel": true, // TODO: TagPanel support
+            "mx_fadable_faded": false,
+            "mx_LeftPanel2": true, // TODO: Remove flag when RoomList2 ships (used as an indicator)
+        });
+
+        return (
+            <div className={containerClasses}>
+                {tagPanel}
+                <aside className="mx_LeftPanel dark-panel">
+                    <TopLeftMenuButton collapsed={false}/>
+                    <div
+                        className="mx_LeftPanel_exploreAndFilterRow"
+                        onKeyDown={() => {/*TODO*/}}
+                        onFocus={() => {/*TODO*/}}
+                        onBlur={() => {/*TODO*/}}
+                    >
+                        {exploreButton}
+                        {searchBox}
+                    </div>
+                    {roomList}
+                </aside>
+            </div>
+        );
+    }
+}
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index cf985187e3..d09706402a 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -52,6 +52,7 @@ import {
     hideToast as hideServerLimitToast
 } from "../../toasts/ServerLimitToast";
 import { Action } from "../../dispatcher/actions";
+import LeftPanel2 from "./LeftPanel2";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -656,6 +657,20 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             bodyClasses += ' mx_MatrixChat_useCompactLayout';
         }
 
+        let leftPanel = (
+            <LeftPanel
+                resizeNotifier={this.props.resizeNotifier}
+                collapsed={this.props.collapseLhs || false}
+                disabled={this.props.leftDisabled}
+            />
+        );
+        if (SettingsStore.isFeatureEnabled("feature_new_room_list")) {
+            // TODO: Supply props like collapsed and disabled to LeftPanel2
+            leftPanel = (
+                <LeftPanel2 />
+            );
+        }
+
         return (
             <MatrixClientContext.Provider value={this._matrixClient}>
                 <div
@@ -669,11 +684,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
                     <ToastContainer />
                     <DragDropContext onDragEnd={this._onDragEnd}>
                         <div ref={this._resizeContainer} className={bodyClasses}>
-                            <LeftPanel
-                                resizeNotifier={this.props.resizeNotifier}
-                                collapsed={this.props.collapseLhs || false}
-                                disabled={this.props.leftDisabled}
-                            />
+                            { leftPanel }
                             <ResizeHandle />
                             { pageElement }
                         </div>

From d33cd5d6f826ff99313fd68b8dae64618a10f7fc Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 3 Jun 2020 02:57:55 +0000
Subject: [PATCH 011/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2303 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 0d89863155..9022acca08 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2480,5 +2480,6 @@
     "Restart": "重新啟動",
     "Upgrade your Riot": "升級您的 Riot",
     "A new version of Riot is available!": "已有新版的 Riot！",
-    "New version available. <a>Update now.</a>": "有可用的新版本。<a>立刻更新。</a>"
+    "New version available. <a>Update now.</a>": "有可用的新版本。<a>立刻更新。</a>",
+    "Emoji picker": "顏文字挑選器"
 }

From a165066d195279a3da4f258937f6380f4738eda5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 2 Jun 2020 15:20:44 +0000
Subject: [PATCH 012/181] Translated using Weblate (Estonian)

Currently translated at 57.3% (1320 of 2303 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index d00525b420..eccfec8ef5 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1276,5 +1276,84 @@
     "Keys restored": "Krüptimise võtmed on taastatud",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s sessiooni dekrüptimine ei õnnestunud!",
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s sessiooni võtme taastamine õnnestus",
-    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Hoiatus</b>: sa peaksid võtmete varunduse seadistama vaid usaldusväärsest arvutist."
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Hoiatus</b>: sa peaksid võtmete varunduse seadistama vaid usaldusväärsest arvutist.",
+    "eg: @bot:* or example.org": "näiteks: @bot:* või example.org",
+    "Subscribed lists": "Tellitud loendid",
+    "Subscribe": "Telli",
+    "Start automatically after system login": "Käivita automaatselt peale arvutisse sisselogimist",
+    "Always show the window menu bar": "Näita alati aknas menüüriba",
+    "Show tray icon and minimize window to it on close": "Näita süsteemisalve ikooni ja Rioti'i akna sulgemisel minimeeri ta salve",
+    "Preferences": "Eelistused",
+    "Room list": "Jututubade loend",
+    "Timeline": "Ajajoon",
+    "Autocomplete delay (ms)": "Viivitus automaatsel sõnalõpetusel (ms)",
+    "Server Name": "Serveri nimi",
+    "Enter password": "Sisesta salasõna",
+    "Nice, strong password!": "Vahva, see on korralik salasõna!",
+    "Password is allowed, but unsafe": "Selline salasõna on küll lubatud, kuid üsna ebaturvaline",
+    "Keep going...": "Jätka...",
+    "The email field must not be blank.": "E-posti aadressi väli ei tohi olla tühi.",
+    "The username field must not be blank.": "Kasutajanime väli ei tohi olla tühi.",
+    "The phone number field must not be blank.": "Telefoninumbri väli ei tohi olla tühi.",
+    "The password field must not be blank.": "Salasõna väli ei tohi olla tühi.",
+    "Email": "E-posti aadress",
+    "Username": "Kasutajanimi",
+    "Phone": "Telefon",
+    "Not sure of your password? <a>Set a new one</a>": "Sa ei ole kindel oma salasõnas? <a>Tee uus salasõna</a>",
+    "Sign in with": "Logi sisse oma kasutajaga",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ühtegi isikutuvastusserverit pole seadistatud ning sul ei ole võimalik lisada oma e-posti aadressi hilisemaks võimalikuks salasõna muutmiseks.",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Kui sa ei sisesta oma e-posti aadressi, siis sa ei saa hiljem oma salasõnamuuta. Kas sa kindlasti soovid seda?",
+    "Use an email address to recover your account": "Kasuta e-posti aadressi ligipääsu taastamiseks oma kontole",
+    "Enter email address (required on this homeserver)": "Sisesta e-posti aadress (nõutav selles koduserveris)",
+    "Doesn't look like a valid email address": "Ei tundu olema korralik e-posti aadress",
+    "Passwords don't match": "Salasõnad ei klapi",
+    "Enter phone number (required on this homeserver)": "Sisesta telefoninumber (nõutav selles koduserveris)",
+    "Doesn't look like a valid phone number": "Ei tundu olema korralik telefoninumber",
+    "Use lowercase letters, numbers, dashes and underscores only": "Palun kasuta vaid väiketähti, numbreid, sidekriipsu ja alakriipsu",
+    "Enter username": "Sisesta kasutajanimi",
+    "Email (optional)": "E-posti aadress (kui soovid)",
+    "Phone (optional)": "Telefoninumber (kui soovid)",
+    "Create your Matrix account on %(serverName)s": "Loo oma Matrixi konto %(serverName)s serveris",
+    "Create your Matrix account on <underlinedServerName />": "Loo oma Matrixi konto <underlinedServerName /> serveris",
+    "Register": "Registreeru",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi või telefoninumbrit, et need inimesed, kes sind tunnevad, saaks sind leida.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi, et need inimesed, kes sind tunnevad, saaks sind leida.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Sisesta oma koduserveri aadress <a>Mida see tähendab?</a>",
+    "Homeserver URL": "Koduserveri aadress",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Sisesta kohandatud isikutuvastusserver aadress <a>Mida see tähendab?</a>",
+    "Identity Server URL": "Isikutuvastusserveri aadress",
+    "Other servers": "Muud serverid",
+    "Free": "Tasuta teenus",
+    "Join millions for free on the largest public server": "Liitu tasuta nende miljonitega, kas kasutavad suurimat avalikku Matrix'i serverit",
+    "Premium": "Tasuline eriteenus",
+    "Premium hosting for organisations <a>Learn more</a>": "Tasuline Matrix'i majutusteenus organisatsioonidele <a>Loe lisateavet</a>",
+    "Find other public servers or use a custom server": "Otsi muid avalikke Matrix'i servereid või kasuta enda määratud serverit",
+    "Sign in to your Matrix account on %(serverName)s": "Logi sisse on Matrix'i kontole %(serverName)s serveris",
+    "Sign in to your Matrix account on <underlinedServerName />": "Logi sisse on Matrix'i kontole <underlinedServerName /> serveris",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Vabandust, aga Riot <b>ei toimi</b> sinu brauseris.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid ning mitmed neist kas pole veel olemas või on lahendatud sinu brauseris katselisena.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Sinu praeguse brauseriga meie rakenduse välimus ja toimivus võivad olla täitsa valed ning mõni funktsionaalsus ei pruugi toimida üldse. Kui soovid katsetada, siis loomulikult võid jätkata, kuid erinevate tekkivate vigadega pead ise hakkama saama!",
+    "Fetching third party location failed": "Kolmanda osapoole asukoha tuvastamine ei õnnestunud",
+    "Unable to look up room ID from server": "Jututoa tunnuse otsimine serverist ei õnnestunud",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Näita sessioone</showSessionsText>, <sendAnywayText>saada ikkagi</sendAnywayText> või <cancelText>tühista</cancelText>.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Sinu sõnumit ei saadetud, kuna see koduserver on ületanud on ületanud ressursipiirangu. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Saada kõik uuesti</resendText> või <cancelText>tühista kõigi saatmine</cancelText>. Samuti võid sa valida saatmiseks või saatmise tühistamiseks üksikuid sõnumeid.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Saada sõnum uuesti</resendText> või <cancelText>tühista sõnumi saatmine</cancelText>.",
+    "Connectivity to the server has been lost.": "Ühendus sinu serveriga on katkenud.",
+    "Sent messages will be stored until your connection has returned.": "Saadetud sõnumid salvestatakse seniks, kuni võrguühendus on taastunud.",
+    "Active call": "Käsilolev kõne",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Siin ei leidu kedagi teist! Kas sa tahaksid <inviteText>kutsuda kedagi jututuppa</inviteText> või <nowarnText>lõpetada selle tühja jututoa hoiatuse kuvamise</nowarnText>?",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitust.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitus.",
+    "Fill screen": "Täida ekraan",
+    "No identity server is configured: add one in server settings to reset your password.": "Ühtegi isikutuvastusserverit pole seadistatud: salasõna taastamiseks määra see serveri sätetes.",
+    "Sign in instead": "Pigem logi sisse",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Kontrollimaks, et just sina sina ise sisestasid uue salasõna, siis saadame sulle kinnituskirja.",
+    "Send Reset Email": "Saada salasõna taastamise e-kiri",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Saatsime kirja %(emailAddress)s aadressile. Kui sa oled klõpsinud kirjas olnud linki, siis jätka alljärgnevaga.",
+    "I have verified my email address": "Ma olen teinud läbi oma e-posti aadressi kontrolli",
+    "Your password has been reset.": "Sinu salasõna on muudetud.",
+    "Dismiss read marker and jump to bottom": "Ära arvesta loetud sõnumite järjehoidjat ning mine kõige lõppu",
+    "Jump to oldest unread message": "Mine vanima lugemata sõnumi juurde",
+    "Upload a file": "Lae fail üles"
 }

From 89c33b2c389960eef07bb60683ccc6396aed6349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 3 Jun 2020 06:39:17 +0000
Subject: [PATCH 013/181] Translated using Weblate (French)

Currently translated at 100.0% (2303 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 1bd6fd254a..f5cedf902a 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2481,5 +2481,6 @@
     "Restart": "Redémarrer",
     "Upgrade your Riot": "Mettre à niveau votre Riot",
     "A new version of Riot is available!": "Une nouvelle version de Riot est disponible !",
-    "New version available. <a>Update now.</a>": "Nouvelle version disponible. <a>Faire la mise à niveau maintenant.</a>"
+    "New version available. <a>Update now.</a>": "Nouvelle version disponible. <a>Faire la mise à niveau maintenant.</a>",
+    "Emoji picker": "Sélecteur d’émojis"
 }

From 677c7aac451766f386d1a6a075cd816dfb59bc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 3 Jun 2020 11:30:33 +0000
Subject: [PATCH 014/181] Translated using Weblate (Estonian)

Currently translated at 57.8% (1304 of 2257 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index eccfec8ef5..0fdcca40d1 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1355,5 +1355,24 @@
     "Your password has been reset.": "Sinu salasõna on muudetud.",
     "Dismiss read marker and jump to bottom": "Ära arvesta loetud sõnumite järjehoidjat ning mine kõige lõppu",
     "Jump to oldest unread message": "Mine vanima lugemata sõnumi juurde",
-    "Upload a file": "Lae fail üles"
+    "Upload a file": "Lae fail üles",
+    "Read Marker lifetime (ms)": "Lugemise markeri iga (ms)",
+    "Read Marker off-screen lifetime (ms)": "Lugemise markeri iga, kui Riot pole fookuses (ms)",
+    "Unignore": "Lõpeta eiramine",
+    "<not supported>": "<ei ole toetatud>",
+    "Import E2E room keys": "Impordi E2E läbiva krüptimise võtmed jututubade jaoks",
+    "Cryptography": "Krüptimine",
+    "Session ID:": "Sessiooni tunnus:",
+    "Session key:": "Sessiooni võti:",
+    "Bulk options": "Masstoimingute seadistused",
+    "Accept all %(invitedRooms)s invites": "Võta vastu kõik %(invitedRooms)s kutsed",
+    "Reject all %(invitedRooms)s invites": "Lükka tagasi kõik %(invitedRooms)s kutsed",
+    "Key backup": "Võtmete varundus",
+    "Cross-signing": "Risttunnustamine",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Hoiatus</b>: Jututoa versiooni uuendamine <i>ei koli jututoa liikmeid automaatselt uude jututoa olekusse.</i> Vanas jututoa versioonis saab olema viide uuele versioonile ning kõik liikmed peavad seda viidet klõpsama.",
+    "Uploaded sound": "Üleslaetud heli",
+    "Sounds": "Helid",
+    "Notification sound": "Teavitusheli",
+    "Reset": "Taasta algolek",
+    "Set a new custom sound": "Seadista uus kohandatud heli"
 }

From 003e75968ac40e5ad77a15059a29c8062ff1ab01 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 3 Jun 2020 12:32:57 +0000
Subject: [PATCH 015/181] Translated using Weblate (Italian)

Currently translated at 100.0% (2257 of 2257 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index e5c1b890d7..37c5159546 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2476,5 +2476,6 @@
     "Restart": "Riavvia",
     "Upgrade your Riot": "Aggiorna Riot",
     "A new version of Riot is available!": "È disponibile una nuova versione di Riot!",
-    "New version available. <a>Update now.</a>": "Nuova versione disponibile. <a>Aggiorna ora.</a>"
+    "New version available. <a>Update now.</a>": "Nuova versione disponibile. <a>Aggiorna ora.</a>",
+    "Emoji picker": "Selettore emoji"
 }

From 520bb1e6fad4ca31db472257724df2ef895fb516 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 3 Jun 2020 14:40:22 +0000
Subject: [PATCH 016/181] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2257 of 2257 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 5252deba23..74cf3629bb 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2455,5 +2455,6 @@
     "Restart": "Restartigi",
     "Upgrade your Riot": "Gradaltigi vian Rioton",
     "A new version of Riot is available!": "Nova versio de Riot estas disponebla!",
-    "New version available. <a>Update now.</a>": "Nova versio estas disponebla. <a>Ĝisdatigu nun.</a>"
+    "New version available. <a>Update now.</a>": "Nova versio estas disponebla. <a>Ĝisdatigu nun.</a>",
+    "Emoji picker": "Elektilo de bildsignoj"
 }

From ed2eca52b23d83c43e46bd94a9c51d8c1113a363 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Wed, 3 Jun 2020 18:05:40 -0500
Subject: [PATCH 017/181] Don't show FormatBar if composer is empty

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/rooms/BasicMessageComposer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index ba1be6a125..82f61e0e1f 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -359,6 +359,8 @@ export default class BasicMessageEditor extends React.Component {
     }
 
     _onSelectionChange = () => {
+        const {isEmpty} = this.props.model;
+
         this._refreshLastCaretIfNeeded();
         const selection = document.getSelection();
         if (this._hasTextSelected && selection.isCollapsed) {
@@ -366,7 +368,7 @@ export default class BasicMessageEditor extends React.Component {
             if (this._formatBarRef) {
                 this._formatBarRef.hide();
             }
-        } else if (!selection.isCollapsed) {
+        } else if (!selection.isCollapsed && !isEmpty) {
             this._hasTextSelected = true;
             if (this._formatBarRef) {
                 const selectionRect = selection.getRangeAt(0).getBoundingClientRect();

From c07b5ebe9a789eaca974cb79090f97474774d09f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 3 Jun 2020 15:07:12 -0600
Subject: [PATCH 018/181] Initial experiments with resizing of room lists

---
 res/css/views/rooms/_RoomList.scss          |  8 ++
 src/components/views/rooms/RoomList2.tsx    | 76 ++++++++++--------
 src/components/views/rooms/RoomSublist2.tsx | 13 ++--
 src/stores/room-list/RoomListLayoutStore.ts | 85 +++++++++++++++++++++
 src/stores/room-list/RoomListStore2.ts      |  3 +
 5 files changed, 145 insertions(+), 40 deletions(-)
 create mode 100644 src/stores/room-list/RoomListLayoutStore.ts

diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 50a9e7ee1f..7abf86cb0e 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -15,6 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_RoomList2_resizer {
+    cursor: ns-resize;
+}
+
+.mx_RoomList.mx_RoomList2 {
+    overflow-y: auto;
+}
+
 .mx_RoomList {
     /* take up remaining space below TopLeftMenu */
     flex: 1;
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index e732e70edf..5e9f6ffb23 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -21,14 +21,13 @@ import { _t, _td } from "../../../languageHandler";
 import { Layout } from '../../../resizer/distributors/roomsublist2';
 import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
 import { ResizeNotifier } from "../../../utils/ResizeNotifier";
-import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore2";
+import RoomListStore, { LISTS_UPDATE_EVENT, RoomListStore2 } from "../../../stores/room-list/RoomListStore2";
 import { ITagMap } from "../../../stores/room-list/algorithms/models";
 import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 import { Dispatcher } from "flux";
 import dis from "../../../dispatcher/dispatcher";
 import RoomSublist2 from "./RoomSublist2";
 import { ActionPayload } from "../../../dispatcher/payloads";
-import { IFilterCondition } from "../../../stores/room-list/filters/IFilterCondition";
 import { NameFilterCondition } from "../../../stores/room-list/filters/NameFilterCondition";
 
 /*******************************************************************
@@ -50,6 +49,7 @@ interface IProps {
 
 interface IState {
     sublists: ITagMap;
+    heights: Map<TagID, number>;
 }
 
 const TAG_ORDER: TagID[] = [
@@ -133,13 +133,16 @@ export default class RoomList2 extends React.Component<IProps, IState> {
     private unfilteredLayout: Layout;
     private filteredLayout: Layout;
     private searchFilter: NameFilterCondition = new NameFilterCondition();
+    private currentTagResize: TagID = null;
 
     constructor(props: IProps) {
         super(props);
 
-        this.state = {sublists: {}};
+        this.state = {
+            sublists: {},
+            heights: new Map<TagID, number>(),
+        };
         this.loadSublistSizes();
-        this.prepareLayouts();
     }
 
     public componentDidUpdate(prevProps: Readonly<IProps>): void {
@@ -158,9 +161,16 @@ export default class RoomList2 extends React.Component<IProps, IState> {
     }
 
     public componentDidMount(): void {
-        RoomListStore.instance.on(LISTS_UPDATE_EVENT, (store) => {
-            console.log("new lists", store.orderedLists);
-            this.setState({sublists: store.orderedLists});
+        RoomListStore.instance.on(LISTS_UPDATE_EVENT, (store: RoomListStore2) => {
+            const newLists = store.orderedLists;
+            console.log("new lists", newLists);
+
+            const heightMap = new Map<TagID, number>();
+            for (const tagId of Object.keys(newLists)) {
+                heightMap.set(tagId, store.layout.getPixelHeight(tagId));
+            }
+
+            this.setState({sublists: newLists, heights: heightMap});
         });
     }
 
@@ -177,32 +187,24 @@ export default class RoomList2 extends React.Component<IProps, IState> {
         window.localStorage.setItem("mx_roomlist_collapsed", JSON.stringify(this.sublistCollapseStates));
     }
 
-    private prepareLayouts() {
-        // TODO: Change layout engine for FTUE support
-        this.unfilteredLayout = new Layout((tagId: string, height: number) => {
-            const sublist = this.sublistRefs[tagId];
-            if (sublist) sublist.current.setHeight(height);
+    private onResizerMouseDown = (ev: React.MouseEvent) => {
+        const hr = ev.target as HTMLHRElement;
+        this.currentTagResize = hr.getAttribute("data-id");
+    };
 
-            // TODO: Check overflow (see old impl)
+    private onResizerMouseUp = (ev: React.MouseEvent) => {
+        this.currentTagResize = null;
+    };
 
-            // Don't store a height for collapsed sublists
-            if (!this.sublistCollapseStates[tagId]) {
-                this.sublistSizes[tagId] = height;
-                this.saveSublistSizes();
-            }
-        }, this.sublistSizes, this.sublistCollapseStates, {
-            allowWhitespace: false,
-            handleHeight: 1,
-        });
-
-        this.filteredLayout = new Layout((tagId: string, height: number) => {
-            const sublist = this.sublistRefs[tagId];
-            if (sublist) sublist.current.setHeight(height);
-        }, null, null, {
-            allowWhitespace: false,
-            handleHeight: 0,
-        });
-    }
+    private onMouseMove = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        if (this.currentTagResize) {
+            const pixelHeight = this.state.heights.get(this.currentTagResize);
+            RoomListStore.instance.layout.setPixelHeight(this.currentTagResize, pixelHeight + ev.movementY);
+            this.state.heights.set(this.currentTagResize, RoomListStore.instance.layout.getPixelHeight(this.currentTagResize));
+            this.forceUpdate();
+        }
+    };
 
     private renderSublists(): React.ReactElement[] {
         const components: React.ReactElement[] = [];
@@ -235,6 +237,14 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                 onAddRoom={onAddRoomFn}
                 addRoomLabel={aesthetics.addRoomLabel}
                 isInvite={aesthetics.isInvite}
+                height={this.state.heights.get(orderedTagId)}
+            />);
+            components.push(<hr
+                key={`resizer-${orderedTagId}`}
+                data-id={orderedTagId}
+                className="mx_RoomList2_resizer"
+                onMouseDown={this.onResizerMouseDown}
+                onMouseUp={this.onResizerMouseUp}
             />);
         }
 
@@ -250,7 +260,9 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                         onFocus={this.props.onFocus}
                         onBlur={this.props.onBlur}
                         onKeyDown={onKeyDownHandler}
-                        className="mx_RoomList"
+                        onMouseUp={this.onResizerMouseUp}
+                        onMouseMove={this.onMouseMove}
+                        className="mx_RoomList mx_RoomList2"
                         role="tree"
                         aria-label={_t("Rooms")}
                         // Firefox sometimes makes this element focusable due to
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index e2f489b959..2b5b131393 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -45,9 +45,9 @@ interface IProps {
     onAddRoom?: () => void;
     addRoomLabel: string;
     isInvite: boolean;
+    height: number; // pixels
 
     // TODO: Collapsed state
-    // TODO: Height
     // TODO: Group invites
     // TODO: Calls
     // TODO: forceExpand?
@@ -61,10 +61,6 @@ interface IState {
 export default class RoomSublist2 extends React.Component<IProps, IState> {
     private headerButton = createRef();
 
-    public setHeight(size: number) {
-        // TODO: Do a thing (maybe - height changes are different in FTUE)
-    }
-
     private hasTiles(): boolean {
         return this.numTiles > 0;
     }
@@ -205,9 +201,10 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
             // TODO: Lazy list rendering
             // TODO: Whatever scrolling magic needs to happen here
             content = (
-                <IndicatorScrollbar className='mx_RoomSubList_scroll'>
-                    {tiles}
-                </IndicatorScrollbar>
+                <IndicatorScrollbar
+                    className='mx_RoomSubList_scroll'
+                    style={{height: `${this.props.height}px`}}
+                >{tiles}</IndicatorScrollbar>
             )
         }
 
diff --git a/src/stores/room-list/RoomListLayoutStore.ts b/src/stores/room-list/RoomListLayoutStore.ts
new file mode 100644
index 0000000000..cbd570b579
--- /dev/null
+++ b/src/stores/room-list/RoomListLayoutStore.ts
@@ -0,0 +1,85 @@
+/*
+Copyright 2020 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.
+*/
+
+// TODO: Simplify the class load when we pick an approach for the list layout
+
+import { TagID } from "./models";
+
+const TILE_HEIGHT_PX = 34;
+
+export class LayoutUnit {
+    constructor(public readonly multiplier: number) {
+    }
+
+    public convert(val: number): number {
+        return Math.ceil(val * this.multiplier);
+    }
+
+    public normalizePixels(pixels: number): number {
+        return this.convert(Math.ceil(pixels / this.multiplier));
+    }
+
+    public forNumTiles(n: number): number {
+        const unitsPerTile = TILE_HEIGHT_PX / this.multiplier;
+        return unitsPerTile * n;
+    }
+}
+
+export const SMOOTH_RESIZE = new LayoutUnit(1);
+export const CHUNKED_RESIZE = new LayoutUnit(TILE_HEIGHT_PX);
+
+export class RoomListLayoutStore {
+    public unit: LayoutUnit = SMOOTH_RESIZE;
+    public minTilesShown = 1;
+
+    /**
+     * Minimum list height in pixels.
+     */
+    public get minListHeight(): number {
+        return this.unit.forNumTiles(this.minTilesShown);
+    }
+
+    private getStorageKey(tagId: TagID) {
+        return `mx_rlls_${tagId}_m_${this.unit.multiplier}`;
+    }
+
+    public setPixelHeight(tagId: TagID, pixels: number): void {
+        localStorage.setItem(this.getStorageKey(tagId), JSON.stringify({pixels}));
+    }
+
+    public getPixelHeight(tagId: TagID): number {
+        const stored = JSON.parse(localStorage.getItem(this.getStorageKey(tagId)));
+        let storedHeight = 0;
+        if (stored && stored.pixels) {
+            storedHeight = stored.pixels;
+        }
+        return this.unit.normalizePixels(Math.max(this.minListHeight, storedHeight));
+    }
+
+    // TODO: Remove helper functions for design iteration
+
+    public beSmooth() {
+        this.unit = SMOOTH_RESIZE;
+    }
+
+    public beChunked() {
+        this.unit = CHUNKED_RESIZE;
+    }
+
+    public beDifferent(multiplier: number) {
+        this.unit = new LayoutUnit(multiplier);
+    }
+}
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index af9970d3cc..84033b5cca 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -29,6 +29,7 @@ import defaultDispatcher from "../../dispatcher/dispatcher";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { IFilterCondition } from "./filters/IFilterCondition";
 import { TagWatcher } from "./TagWatcher";
+import { RoomListLayoutStore } from "./RoomListLayoutStore";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -44,6 +45,8 @@ interface IState {
 export const LISTS_UPDATE_EVENT = "lists_update";
 
 export class RoomListStore2 extends AsyncStore<ActionPayload> {
+    public readonly layout = new RoomListLayoutStore();
+
     private _matrixClient: MatrixClient;
     private initialListsGenerated = false;
     private enabled = false;

From dbf996439bb5cd0e09835f427db97b00046e8d6a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 3 Jun 2020 21:16:53 -0600
Subject: [PATCH 019/181] Wedge t3chguy's resizer prototype into the sublist

---
 package.json                                |  1 +
 res/css/_components.scss                    |  1 +
 res/css/views/rooms/_RoomSublist2.scss      | 17 +++++
 src/components/views/rooms/RoomList2.tsx    | 73 +++++-------------
 src/components/views/rooms/RoomSublist2.tsx | 37 +++++++--
 src/stores/room-list/ListLayout.ts          | 65 ++++++++++++++++
 src/stores/room-list/RoomListLayoutStore.ts | 85 ---------------------
 src/stores/room-list/RoomListStore2.ts      |  3 -
 yarn.lock                                   | 20 ++++-
 9 files changed, 152 insertions(+), 150 deletions(-)
 create mode 100644 res/css/views/rooms/_RoomSublist2.scss
 create mode 100644 src/stores/room-list/ListLayout.ts
 delete mode 100644 src/stores/room-list/RoomListLayoutStore.ts

diff --git a/package.json b/package.json
index 11906452e7..1029efaccd 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,7 @@
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^16.9.0",
     "react-focus-lock": "^2.2.1",
+    "react-resizable": "^1.10.1",
     "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.18.4",
     "text-encoding-utf-8": "^1.0.1",
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 5a7630a51f..b047519d99 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -179,6 +179,7 @@
 @import "./views/rooms/_RoomList.scss";
 @import "./views/rooms/_RoomPreviewBar.scss";
 @import "./views/rooms/_RoomRecoveryReminder.scss";
+@import "./views/rooms/_RoomSublist2.scss";
 @import "./views/rooms/_RoomTile.scss";
 @import "./views/rooms/_RoomUpgradeWarningBar.scss";
 @import "./views/rooms/_SearchBar.scss";
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
new file mode 100644
index 0000000000..bb760e7e6e
--- /dev/null
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 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 "../../../../node_modules/react-resizable/css/styles.css";
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 5e9f6ffb23..b6fe37589c 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -18,7 +18,6 @@ limitations under the License.
 
 import * as React from "react";
 import { _t, _td } from "../../../languageHandler";
-import { Layout } from '../../../resizer/distributors/roomsublist2';
 import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
 import { ResizeNotifier } from "../../../utils/ResizeNotifier";
 import RoomListStore, { LISTS_UPDATE_EVENT, RoomListStore2 } from "../../../stores/room-list/RoomListStore2";
@@ -29,6 +28,7 @@ import dis from "../../../dispatcher/dispatcher";
 import RoomSublist2 from "./RoomSublist2";
 import { ActionPayload } from "../../../dispatcher/payloads";
 import { NameFilterCondition } from "../../../stores/room-list/filters/NameFilterCondition";
+import { ListLayout } from "../../../stores/room-list/ListLayout";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -49,7 +49,7 @@ interface IProps {
 
 interface IState {
     sublists: ITagMap;
-    heights: Map<TagID, number>;
+    layouts: Map<TagID, ListLayout>;
 }
 
 const TAG_ORDER: TagID[] = [
@@ -127,20 +127,16 @@ const TAG_AESTHETICS: {
 };
 
 export default class RoomList2 extends React.Component<IProps, IState> {
-    private sublistRefs: { [tagId: string]: React.RefObject<RoomSublist2> } = {};
     private sublistSizes: { [tagId: string]: number } = {};
     private sublistCollapseStates: { [tagId: string]: boolean } = {};
-    private unfilteredLayout: Layout;
-    private filteredLayout: Layout;
     private searchFilter: NameFilterCondition = new NameFilterCondition();
-    private currentTagResize: TagID = null;
 
     constructor(props: IProps) {
         super(props);
 
         this.state = {
             sublists: {},
-            heights: new Map<TagID, number>(),
+            layouts: new Map<TagID, ListLayout>(),
         };
         this.loadSublistSizes();
     }
@@ -165,12 +161,12 @@ export default class RoomList2 extends React.Component<IProps, IState> {
             const newLists = store.orderedLists;
             console.log("new lists", newLists);
 
-            const heightMap = new Map<TagID, number>();
+            const layoutMap = new Map<TagID, ListLayout>();
             for (const tagId of Object.keys(newLists)) {
-                heightMap.set(tagId, store.layout.getPixelHeight(tagId));
+                layoutMap.set(tagId, new ListLayout(tagId));
             }
 
-            this.setState({sublists: newLists, heights: heightMap});
+            this.setState({sublists: newLists, layouts: layoutMap});
         });
     }
 
@@ -182,30 +178,6 @@ export default class RoomList2 extends React.Component<IProps, IState> {
         if (collapsedJson) this.sublistCollapseStates = JSON.parse(collapsedJson);
     }
 
-    private saveSublistSizes() {
-        window.localStorage.setItem("mx_roomlist_sizes", JSON.stringify(this.sublistSizes));
-        window.localStorage.setItem("mx_roomlist_collapsed", JSON.stringify(this.sublistCollapseStates));
-    }
-
-    private onResizerMouseDown = (ev: React.MouseEvent) => {
-        const hr = ev.target as HTMLHRElement;
-        this.currentTagResize = hr.getAttribute("data-id");
-    };
-
-    private onResizerMouseUp = (ev: React.MouseEvent) => {
-        this.currentTagResize = null;
-    };
-
-    private onMouseMove = (ev: React.MouseEvent) => {
-        ev.preventDefault();
-        if (this.currentTagResize) {
-            const pixelHeight = this.state.heights.get(this.currentTagResize);
-            RoomListStore.instance.layout.setPixelHeight(this.currentTagResize, pixelHeight + ev.movementY);
-            this.state.heights.set(this.currentTagResize, RoomListStore.instance.layout.getPixelHeight(this.currentTagResize));
-            this.forceUpdate();
-        }
-    };
-
     private renderSublists(): React.ReactElement[] {
         const components: React.ReactElement[] = [];
 
@@ -228,24 +200,19 @@ export default class RoomList2 extends React.Component<IProps, IState> {
             if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
 
             const onAddRoomFn = aesthetics.onAddRoom ? () => aesthetics.onAddRoom(dis) : null;
-            components.push(<RoomSublist2
-                key={`sublist-${orderedTagId}`}
-                forRooms={true}
-                rooms={orderedRooms}
-                startAsHidden={aesthetics.defaultHidden}
-                label={_t(aesthetics.sectionLabel)}
-                onAddRoom={onAddRoomFn}
-                addRoomLabel={aesthetics.addRoomLabel}
-                isInvite={aesthetics.isInvite}
-                height={this.state.heights.get(orderedTagId)}
-            />);
-            components.push(<hr
-                key={`resizer-${orderedTagId}`}
-                data-id={orderedTagId}
-                className="mx_RoomList2_resizer"
-                onMouseDown={this.onResizerMouseDown}
-                onMouseUp={this.onResizerMouseUp}
-            />);
+            components.push(
+                <RoomSublist2
+                    key={`sublist-${orderedTagId}`}
+                    forRooms={true}
+                    rooms={orderedRooms}
+                    startAsHidden={aesthetics.defaultHidden}
+                    label={_t(aesthetics.sectionLabel)}
+                    onAddRoom={onAddRoomFn}
+                    addRoomLabel={aesthetics.addRoomLabel}
+                    isInvite={aesthetics.isInvite}
+                    layout={this.state.layouts.get(orderedTagId)}
+                />
+            );
         }
 
         return components;
@@ -260,8 +227,6 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                         onFocus={this.props.onFocus}
                         onBlur={this.props.onBlur}
                         onKeyDown={onKeyDownHandler}
-                        onMouseUp={this.onResizerMouseUp}
-                        onMouseMove={this.onMouseMove}
                         className="mx_RoomList mx_RoomList2"
                         role="tree"
                         aria-label={_t("Rooms")}
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 2b5b131393..6705448764 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -20,7 +20,6 @@ import * as React from "react";
 import { createRef } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
 import classNames from 'classnames';
-import IndicatorScrollbar from "../../structures/IndicatorScrollbar";
 import * as RoomNotifs from '../../../RoomNotifs';
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import { _t } from "../../../languageHandler";
@@ -28,6 +27,8 @@ import AccessibleButton from "../../views/elements/AccessibleButton";
 import AccessibleTooltipButton from "../../views/elements/AccessibleTooltipButton";
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import RoomTile2 from "./RoomTile2";
+import { ResizableBox, ResizeCallbackData } from "react-resizable";
+import { ListLayout } from "../../../stores/room-list/ListLayout";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -45,7 +46,7 @@ interface IProps {
     onAddRoom?: () => void;
     addRoomLabel: string;
     isInvite: boolean;
-    height: number; // pixels
+    layout: ListLayout;
 
     // TODO: Collapsed state
     // TODO: Group invites
@@ -183,6 +184,12 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         );
     }
 
+    private onResize = (e: React.MouseEvent, data: ResizeCallbackData) => {
+        const tileDiff = e.movementY < 0 ? -1 : +1;
+        this.props.layout.visibleTiles += tileDiff;
+        this.forceUpdate(); // because the layout doesn't trigger a re-render
+    };
+
     public render(): React.ReactElement {
         // TODO: Proper rendering
         // TODO: Error boundary
@@ -200,11 +207,29 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         if (tiles.length > 0) {
             // TODO: Lazy list rendering
             // TODO: Whatever scrolling magic needs to happen here
+            const layout = this.props.layout; // to shorten calls
+            const minTilesPx = layout.tilesToPixels(Math.min(tiles.length, layout.minVisibleTiles));
+            const maxTilesPx = layout.tilesToPixels(tiles.length);
+            const tilesPx = layout.tilesToPixels(Math.min(tiles.length, layout.visibleTiles));
+            let handles = ['s'];
+            if (layout.visibleTiles >= tiles.length && tiles.length <= layout.minVisibleTiles) {
+                handles = []; // no handles, we're at a minimum
+            }
+            const visibleTiles = tiles.slice(0, layout.visibleTiles);
             content = (
-                <IndicatorScrollbar
-                    className='mx_RoomSubList_scroll'
-                    style={{height: `${this.props.height}px`}}
-                >{tiles}</IndicatorScrollbar>
+                <ResizableBox
+                    width={-1}
+                    height={tilesPx}
+                    axis="y"
+                    minConstraints={[-1, minTilesPx]}
+                    maxConstraints={[-1, maxTilesPx]}
+                    draggableOpts={{grid: [-1, layout.tileHeight]}}
+                    resizeHandles={handles}
+                    onResize={this.onResize}
+                    className="mx_RoomSublist2_resizeBox"
+                >
+                    {visibleTiles}
+                </ResizableBox>
             )
         }
 
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
new file mode 100644
index 0000000000..af6abe3297
--- /dev/null
+++ b/src/stores/room-list/ListLayout.ts
@@ -0,0 +1,65 @@
+/*
+Copyright 2020 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.
+*/
+
+const TILE_HEIGHT_PX = 34;
+
+interface ISerializedListLayout {
+    numTiles: number;
+}
+
+export class ListLayout {
+    private _n = 0;
+
+    constructor(public readonly tagId) {
+        const serialized = localStorage.getItem(this.key);
+        if (serialized) {
+            // We don't use the setters as they cause writes.
+            const parsed = <ISerializedListLayout>JSON.parse(serialized);
+            this._n = parsed.numTiles;
+        }
+    }
+
+    public get tileHeight(): number {
+        return TILE_HEIGHT_PX;
+    }
+
+    private get key(): string {
+        return `mx_sublist_layout_${this.tagId}_boxed`;
+    }
+
+    public get visibleTiles(): number {
+        return Math.max(this._n, this.minVisibleTiles);
+    }
+
+    public set visibleTiles(v: number) {
+        this._n = v;
+        localStorage.setItem(this.key, JSON.stringify(this.serialize()));
+    }
+
+    public get minVisibleTiles(): number {
+        return 3;
+    }
+
+    public tilesToPixels(n: number): number {
+        return n * this.tileHeight;
+    }
+
+    private serialize(): ISerializedListLayout {
+        return {
+            numTiles: this.visibleTiles,
+        };
+    }
+}
diff --git a/src/stores/room-list/RoomListLayoutStore.ts b/src/stores/room-list/RoomListLayoutStore.ts
deleted file mode 100644
index cbd570b579..0000000000
--- a/src/stores/room-list/RoomListLayoutStore.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2020 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.
-*/
-
-// TODO: Simplify the class load when we pick an approach for the list layout
-
-import { TagID } from "./models";
-
-const TILE_HEIGHT_PX = 34;
-
-export class LayoutUnit {
-    constructor(public readonly multiplier: number) {
-    }
-
-    public convert(val: number): number {
-        return Math.ceil(val * this.multiplier);
-    }
-
-    public normalizePixels(pixels: number): number {
-        return this.convert(Math.ceil(pixels / this.multiplier));
-    }
-
-    public forNumTiles(n: number): number {
-        const unitsPerTile = TILE_HEIGHT_PX / this.multiplier;
-        return unitsPerTile * n;
-    }
-}
-
-export const SMOOTH_RESIZE = new LayoutUnit(1);
-export const CHUNKED_RESIZE = new LayoutUnit(TILE_HEIGHT_PX);
-
-export class RoomListLayoutStore {
-    public unit: LayoutUnit = SMOOTH_RESIZE;
-    public minTilesShown = 1;
-
-    /**
-     * Minimum list height in pixels.
-     */
-    public get minListHeight(): number {
-        return this.unit.forNumTiles(this.minTilesShown);
-    }
-
-    private getStorageKey(tagId: TagID) {
-        return `mx_rlls_${tagId}_m_${this.unit.multiplier}`;
-    }
-
-    public setPixelHeight(tagId: TagID, pixels: number): void {
-        localStorage.setItem(this.getStorageKey(tagId), JSON.stringify({pixels}));
-    }
-
-    public getPixelHeight(tagId: TagID): number {
-        const stored = JSON.parse(localStorage.getItem(this.getStorageKey(tagId)));
-        let storedHeight = 0;
-        if (stored && stored.pixels) {
-            storedHeight = stored.pixels;
-        }
-        return this.unit.normalizePixels(Math.max(this.minListHeight, storedHeight));
-    }
-
-    // TODO: Remove helper functions for design iteration
-
-    public beSmooth() {
-        this.unit = SMOOTH_RESIZE;
-    }
-
-    public beChunked() {
-        this.unit = CHUNKED_RESIZE;
-    }
-
-    public beDifferent(multiplier: number) {
-        this.unit = new LayoutUnit(multiplier);
-    }
-}
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 84033b5cca..af9970d3cc 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -29,7 +29,6 @@ import defaultDispatcher from "../../dispatcher/dispatcher";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { IFilterCondition } from "./filters/IFilterCondition";
 import { TagWatcher } from "./TagWatcher";
-import { RoomListLayoutStore } from "./RoomListLayoutStore";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -45,8 +44,6 @@ interface IState {
 export const LISTS_UPDATE_EVENT = "lists_update";
 
 export class RoomListStore2 extends AsyncStore<ActionPayload> {
-    public readonly layout = new RoomListLayoutStore();
-
     private _matrixClient: MatrixClient;
     private initialListsGenerated = false;
     private enabled = false;
diff --git a/yarn.lock b/yarn.lock
index 56cf596fcf..ded8aa13f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2458,7 +2458,7 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.1.2:
+classnames@^2.1.2, classnames@^2.2.5:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
@@ -6858,7 +6858,7 @@ prop-types-exact@^1.2.0:
     object.assign "^4.1.0"
     reflect.ownkeys "^0.2.0"
 
-prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@15.x, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -7062,6 +7062,14 @@ react-dom@^16.9.0:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
+react-draggable@^4.0.3:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.2.tgz#f3cefecee25f467f865144cda0d066e5f05f94a0"
+  integrity sha512-zLQs4R4bnBCGnCVTZiD8hPsHtkiJxgMpGDlRESM+EHQo8ysXhKJ2GKdJ8UxxLJdRVceX1j19jy+hQS2wHislPQ==
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+
 react-focus-lock@^2.2.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.3.1.tgz#9d5d85899773609c7eefa4fc54fff6a0f5f2fc47"
@@ -7106,6 +7114,14 @@ react-redux@^5.0.6:
     react-is "^16.6.0"
     react-lifecycles-compat "^3.0.0"
 
+react-resizable@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/react-resizable/-/react-resizable-1.10.1.tgz#f0c2cf1d83b3470b87676ce6d6b02bbe3f4d8cd4"
+  integrity sha512-Jd/bKOKx6+19NwC4/aMLRu/J9/krfxlDnElP41Oc+oLiUWs/zwV1S9yBfBZRnqAwQb6vQ/HRSk3bsSWGSgVbpw==
+  dependencies:
+    prop-types "15.x"
+    react-draggable "^4.0.3"
+
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1"

From be4f75bca920b0a9f45414aea9cc39d8701aba7a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 3 Jun 2020 21:52:05 -0600
Subject: [PATCH 020/181] Add a 'show more' button to room lists

---
 src/components/views/rooms/RoomSublist2.tsx | 44 ++++++++++++++++++---
 src/i18n/strings/en_EN.json                 |  1 +
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 6705448764..a9852dd3d3 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -76,6 +76,17 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         if (this.props.onAddRoom) this.props.onAddRoom();
     };
 
+    private onResize = (e: React.MouseEvent, data: ResizeCallbackData) => {
+        const tileDiff = e.movementY < 0 ? -1 : +1;
+        this.props.layout.visibleTiles += tileDiff;
+        this.forceUpdate(); // because the layout doesn't trigger a re-render
+    };
+
+    private onShowAllClick = () => {
+        this.props.layout.visibleTiles = this.numTiles;
+        this.forceUpdate(); // because the layout doesn't trigger a re-render
+    };
+
     private renderTiles(): React.ReactElement[] {
         const tiles: React.ReactElement[] = [];
 
@@ -184,12 +195,6 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         );
     }
 
-    private onResize = (e: React.MouseEvent, data: ResizeCallbackData) => {
-        const tileDiff = e.movementY < 0 ? -1 : +1;
-        this.props.layout.visibleTiles += tileDiff;
-        this.forceUpdate(); // because the layout doesn't trigger a re-render
-    };
-
     public render(): React.ReactElement {
         // TODO: Proper rendering
         // TODO: Error boundary
@@ -216,6 +221,33 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 handles = []; // no handles, we're at a minimum
             }
             const visibleTiles = tiles.slice(0, layout.visibleTiles);
+            console.log({n: tiles.length, c: layout.visibleTiles});
+
+            // If we're hiding rooms, show a 'show more' button to the user. This button
+            // replaces the last visible tile, so will always show 2+ rooms. We do this
+            // because if it said "show 1 more room" we had might as well show that room
+            // instead. We also replace the last item so we don't have to adjust our math
+            // on pixel heights, etc. It's much easier to pretend the button is a tile.
+            if (tiles.length > layout.visibleTiles) {
+                // we have a cutoff condition - add the button to show all
+
+                // we +1 to account for the room we're about to hide with our 'show more' button
+                const numMissing = (tiles.length - visibleTiles.length) + 1;
+
+                // TODO: Copy TBD
+                // TODO: CSS TBD
+                // TODO: Show N more instead of infinity more?
+                // TODO: Safely use the same height of a tile, not hardcoded hacks
+                visibleTiles.splice(visibleTiles.length - 1, 1, (
+                    <div
+                        onClick={this.onShowAllClick}
+                        style={{height: '34px', lineHeight: '34px', backgroundColor: 'green', cursor: 'pointer'}}
+                        key='showall'
+                    >
+                        {_t("Show %(n)s more rooms", {n: numMissing})}
+                    </div>
+                ));
+            }
             content = (
                 <ResizableBox
                     width={-1}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index eaa34278e7..884192b22a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1136,6 +1136,7 @@
     "Jump to first unread room.": "Jump to first unread room.",
     "Jump to first invite.": "Jump to first invite.",
     "Add room": "Add room",
+    "Show %(n)s more rooms": "Show %(n)s more rooms",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",

From 30027a655629f14e5d2f0287a9a251a45d37be8c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 3 Jun 2020 21:53:58 -0600
Subject: [PATCH 021/181] Remove debugging

---
 src/components/views/rooms/RoomSublist2.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index a9852dd3d3..f2e5329ab0 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -221,7 +221,6 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 handles = []; // no handles, we're at a minimum
             }
             const visibleTiles = tiles.slice(0, layout.visibleTiles);
-            console.log({n: tiles.length, c: layout.visibleTiles});
 
             // If we're hiding rooms, show a 'show more' button to the user. This button
             // replaces the last visible tile, so will always show 2+ rooms. We do this

From 39dcc9f23ca67873dabbe0831d1935cd97bc114b Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 4 Jun 2020 01:01:54 +0000
Subject: [PATCH 022/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2258 of 2258 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9022acca08..e4f9faa56b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2481,5 +2481,6 @@
     "Upgrade your Riot": "升級您的 Riot",
     "A new version of Riot is available!": "已有新版的 Riot！",
     "New version available. <a>Update now.</a>": "有可用的新版本。<a>立刻更新。</a>",
-    "Emoji picker": "顏文字挑選器"
+    "Emoji picker": "顏文字挑選器",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。"
 }

From db6d60566bfcfb03a22215e19f7205fca31f1935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 4 Jun 2020 06:46:15 +0000
Subject: [PATCH 023/181] Translated using Weblate (French)

Currently translated at 100.0% (2258 of 2258 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f5cedf902a..45345e5c7d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2482,5 +2482,6 @@
     "Upgrade your Riot": "Mettre à niveau votre Riot",
     "A new version of Riot is available!": "Une nouvelle version de Riot est disponible !",
     "New version available. <a>Update now.</a>": "Nouvelle version disponible. <a>Faire la mise à niveau maintenant.</a>",
-    "Emoji picker": "Sélecteur d’émojis"
+    "Emoji picker": "Sélecteur d’émojis",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les messages directs."
 }

From 9c93e487481d710da5127f7b6e2b608da68e2c28 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 4 Jun 2020 07:33:11 +0000
Subject: [PATCH 024/181] Translated using Weblate (Italian)

Currently translated at 100.0% (2258 of 2258 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 37c5159546..6f97e61560 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2477,5 +2477,6 @@
     "Upgrade your Riot": "Aggiorna Riot",
     "A new version of Riot is available!": "È disponibile una nuova versione di Riot!",
     "New version available. <a>Update now.</a>": "Nuova versione disponibile. <a>Aggiorna ora.</a>",
-    "Emoji picker": "Selettore emoji"
+    "Emoji picker": "Selettore emoji",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti."
 }

From 82eb80f0c63e5291c25302aac9f9f54d3d457586 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 4 Jun 2020 12:57:18 +0000
Subject: [PATCH 025/181] Translated using Weblate (Galician)

Currently translated at 52.7% (1189 of 2258 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index d37abfb890..6ae8289889 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1253,5 +1253,11 @@
     "Add theme": "Engadir decorado",
     "Theme": "Decorado",
     "Language and region": "Idioma e rexión",
-    "Your theme": "O teu decorado"
+    "Your theme": "O teu decorado",
+    "Use the improved room list (in development - refresh to apply changes)": "Usar a lista mellorada de salas (en desenvolvemento - actualiza para aplicar)",
+    "Support adding custom themes": "Permitir engadir decorados personalizados",
+    "Use IRC layout": "Usar disposición IRC",
+    "Font size": "Tamaño da letra",
+    "Custom font size": "Tamaño letra personalizado",
+    "Enable Emoji suggestions while typing": "Activar suxestión de Emoji ao escribir"
 }

From 47df8f2ac0e8834597ba5b7862c41dfb3fd882a8 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 4 Jun 2020 12:59:42 +0000
Subject: [PATCH 026/181] Translated using Weblate (Galician)

Currently translated at 53.5% (1208 of 2258 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 6ae8289889..ba67879d14 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1259,5 +1259,24 @@
     "Use IRC layout": "Usar disposición IRC",
     "Font size": "Tamaño da letra",
     "Custom font size": "Tamaño letra personalizado",
-    "Enable Emoji suggestions while typing": "Activar suxestión de Emoji ao escribir"
+    "Enable Emoji suggestions while typing": "Activar suxestión de Emoji ao escribir",
+    "Show a placeholder for removed messages": "Resaltar o lugar das mensaxes eliminadas",
+    "Show avatar changes": "Mostrar cambios de avatar",
+    "Show display name changes": "Mostrar cambios do nome mostrado",
+    "Show read receipts sent by other users": "Mostrar resgardo de lectura enviados por outras usuarias",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar recordatorio para activar Recuperación Segura de Mensaxes en salas cifradas",
+    "Show avatars in user and room mentions": "Mostrar avatares nas mencións de salas e usuarias",
+    "Enable big emoji in chat": "Activar Emojis grandes na conversa",
+    "Send typing notifications": "Enviar notificación de escritura",
+    "Show typing notifications": "Mostrar notificacións de escritura",
+    "Allow Peer-to-Peer for 1:1 calls": "Permitir Par-a-Par para chamadas 1:1",
+    "Never send encrypted messages to unverified sessions from this session": "Non enviar nunca desde esta sesión mensaxes cifradas a sesións non verificadas",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Non enviar mensaxes cifradas desde esta sesión a sesións non verificadas nesta sala",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Avisar antes de enviar convites a IDs de Matrix potencialmente incorrectos",
+    "Show developer tools": "Mostrar ferramentas de desenvolvemento",
+    "Order rooms by name": "Ordenar salas por nome",
+    "Show rooms with unread notifications first": "Mostrar primeiro as salas que teñen notificacións sen ler",
+    "Show shortcuts to recently viewed rooms above the room list": "Mostrar atallos a salas vistas recentemente enriba da lista de salas",
+    "Show hidden events in timeline": "Mostrar na cronoloxía eventos ocultos",
+    "Low bandwidth mode": "Modo de ancho de banda reducido"
 }

From 83df79aab92f7d4e1c69580f848cb59328cc01a9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 09:19:03 -0600
Subject: [PATCH 027/181] Try variable resizing

---
 src/components/views/rooms/RoomSublist2.tsx | 5 +++--
 src/stores/room-list/ListLayout.ts          | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index f2e5329ab0..9c034ce749 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -77,7 +77,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
     };
 
     private onResize = (e: React.MouseEvent, data: ResizeCallbackData) => {
-        const tileDiff = e.movementY < 0 ? -1 : +1;
+        const direction = e.movementY < 0 ? -1 : +1;
+        const tileDiff = this.props.layout.pixelsToTiles(Math.abs(e.movementY)) * direction;
         this.props.layout.visibleTiles += tileDiff;
         this.forceUpdate(); // because the layout doesn't trigger a re-render
     };
@@ -254,7 +255,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     axis="y"
                     minConstraints={[-1, minTilesPx]}
                     maxConstraints={[-1, maxTilesPx]}
-                    draggableOpts={{grid: [-1, layout.tileHeight]}}
+                    draggableOpts={{grid: [-1, 1]}}
                     resizeHandles={handles}
                     onResize={this.onResize}
                     className="mx_RoomSublist2_resizeBox"
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index af6abe3297..fd57a03ca1 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -57,6 +57,10 @@ export class ListLayout {
         return n * this.tileHeight;
     }
 
+    public pixelsToTiles(px: number): number {
+        return px / this.tileHeight;
+    }
+
     private serialize(): ISerializedListLayout {
         return {
             numTiles: this.visibleTiles,

From f6504d67ba0a09379c1291a2000dac1dae9697aa Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 4 Jun 2020 16:23:28 +0100
Subject: [PATCH 028/181] Use 10px instead

---
 res/css/_common.scss                 |   2 +-
 res/css/_font-sizes.scss             | 112 +++++++++++++--------------
 src/settings/watchers/FontWatcher.ts |   4 +-
 3 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index c562c3e95f..77a8ff9f4a 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -19,7 +19,7 @@ limitations under the License.
 @import "./_font-sizes.scss";
 
 :root {
-    font-size: 20px;
+    font-size: 10px;
 }
 
 html {
diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index c4a223d66c..5b876ab11d 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -14,59 +14,59 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-$font-1px: 0.05rem;
-$font-1-5px: 0.075rem;
-$font-2px: 0.1rem;
-$font-3px: 0.15rem;
-$font-4px: 0.2rem;
-$font-5px: 0.25rem;
-$font-6px: 0.3rem;
-$font-7px: 0.35rem;
-$font-8px: 0.4rem;
-$font-9px: 0.45rem;
-$font-10px: 0.5rem;
-$font-10-4px: 0.52rem;
-$font-11px: 0.55rem;
-$font-12px: 0.6rem;
-$font-13px: 0.65rem;
-$font-14px: 0.7rem;
-$font-15px: 0.75rem;
-$font-16px: 0.8rem;
-$font-17px: 0.85rem;
-$font-18px: 0.9rem;
-$font-19px: 0.95rem;
-$font-20px: 1.0rem;
-$font-21px: 1.05rem;
-$font-22px: 1.1rem;
-$font-23px: 1.15rem;
-$font-24px: 1.2rem;
-$font-25px: 1.25rem;
-$font-26px: 1.3rem;
-$font-27px: 1.35rem;
-$font-28px: 1.4rem;
-$font-29px: 1.45rem;
-$font-30px: 1.5rem;
-$font-31px: 1.55rem;
-$font-32px: 1.6rem;
-$font-33px: 1.65rem;
-$font-34px: 1.7rem;
-$font-35px: 1.75rem;
-$font-36px: 1.8rem;
-$font-37px: 1.85rem;
-$font-38px: 1.9rem;
-$font-39px: 1.95rem;
-$font-40px: 2.0rem;
-$font-41px: 2.05rem;
-$font-42px: 2.1rem;
-$font-43px: 2.15rem;
-$font-44px: 2.2rem;
-$font-45px: 2.25rem;
-$font-46px: 2.3rem;
-$font-47px: 2.35rem;
-$font-48px: 2.4rem;
-$font-49px: 2.45rem;
-$font-50px: 2.5rem;
-$font-51px: 2.55rem;
-$font-52px: 2.6rem;
-$font-88px: 4.4rem;
-$font-400px: 20rem;
+$font-1px: 0.1rem;
+$font-1-5px: 0.15rem;
+$font-2px: 0.2rem;
+$font-3px: 0.3rem;
+$font-4px: 0.4rem;
+$font-5px: 0.5rem;
+$font-6px: 0.6rem;
+$font-7px: 0.7rem;
+$font-8px: 0.8rem;
+$font-9px: 0.9rem;
+$font-10px: 1.0rem;
+$font-10-4px: 1.04rem;
+$font-11px: 1.1rem;
+$font-12px: 1.2rem;
+$font-13px: 1.3rem;
+$font-14px: 1.4rem;
+$font-15px: 1.5rem;
+$font-16px: 1.6rem;
+$font-17px: 1.7rem;
+$font-18px: 1.8rem;
+$font-19px: 1.9rem;
+$font-20px: 2.0rem;
+$font-21px: 2.1rem;
+$font-22px: 2.2rem;
+$font-23px: 2.3rem;
+$font-24px: 2.4rem;
+$font-25px: 2.5rem;
+$font-26px: 2.6rem;
+$font-27px: 2.7rem;
+$font-28px: 2.8rem;
+$font-29px: 2.9rem;
+$font-30px: 3.0rem;
+$font-31px: 3.1rem;
+$font-32px: 3.2rem;
+$font-33px: 3.3rem;
+$font-34px: 3.4rem;
+$font-35px: 3.5rem;
+$font-36px: 3.6rem;
+$font-37px: 3.7rem;
+$font-38px: 3.8rem;
+$font-39px: 3.9rem;
+$font-40px: 4.0rem;
+$font-41px: 4.1rem;
+$font-42px: 4.2rem;
+$font-43px: 4.3rem;
+$font-44px: 4.4rem;
+$font-45px: 4.5rem;
+$font-46px: 4.6rem;
+$font-47px: 4.7rem;
+$font-48px: 4.8rem;
+$font-49px: 4.9rem;
+$font-50px: 5.0rem;
+$font-51px: 5.1rem;
+$font-52px: 5.2rem;
+$font-88px: 8.8rem;
+$font-400px: 40rem;
diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index 08a809f869..5d7c601fa1 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -45,8 +45,8 @@ export class FontWatcher implements IWatcher {
     };
 
     private setRootFontSize = (size) => {
-        // Externally we tell the user the font is size 15. Internally we use 20.
-        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE) + 5;
+        // Externally we tell the user the font is size 15. Internally we use 10.
+        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE) - 5;
 
         if (fontSize !== size) {
             SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);

From a3fdd643d79ec3b2eb725380991b8d08d9db1c0c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 09:57:16 -0600
Subject: [PATCH 029/181] Add hacky math support

---
 src/components/views/rooms/RoomSublist2.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 9c034ce749..cc56f92769 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -221,14 +221,20 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
             if (layout.visibleTiles >= tiles.length && tiles.length <= layout.minVisibleTiles) {
                 handles = []; // no handles, we're at a minimum
             }
-            const visibleTiles = tiles.slice(0, layout.visibleTiles);
+
+            let nVisible = Math.floor(layout.visibleTiles);
+            if (localStorage.getItem("mx_rl_mathfn")) {
+                nVisible = Math[localStorage.getItem("mx_rl_mathfn")](layout.visibleTiles);
+            }
+            console.log({nVisible})
+            const visibleTiles = tiles.slice(0, nVisible);
 
             // If we're hiding rooms, show a 'show more' button to the user. This button
             // replaces the last visible tile, so will always show 2+ rooms. We do this
             // because if it said "show 1 more room" we had might as well show that room
             // instead. We also replace the last item so we don't have to adjust our math
             // on pixel heights, etc. It's much easier to pretend the button is a tile.
-            if (tiles.length > layout.visibleTiles) {
+            if (tiles.length > nVisible) {
                 // we have a cutoff condition - add the button to show all
 
                 // we +1 to account for the room we're about to hide with our 'show more' button

From 2fe56276f2bdf2f24fbe64149993710122e83549 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 10:07:41 -0600
Subject: [PATCH 030/181] css for vis

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

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index bb760e7e6e..abc3133fc1 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -15,3 +15,8 @@ limitations under the License.
 */
 
 @import "../../../../node_modules/react-resizable/css/styles.css";
+
+.mx_RoomList2 .mx_RoomSubList_labelContainer {
+  z-index: 12;
+  background-color: purple;
+}

From 2ec47ecc743593ef816b1b7e7f7e903428b065f3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 4 Jun 2020 17:50:56 +0100
Subject: [PATCH 031/181] Use different setting flag print expected values

---
 .../tabs/user/AppearanceUserSettingsTab.tsx        | 12 +++++++++---
 src/settings/Settings.js                           |  4 ++--
 src/settings/watchers/FontWatcher.ts               | 14 ++++++++------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index bcd87b290a..9b77493c4f 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -62,7 +62,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         super(props);
 
         this.state = {
-            fontSize: SettingsStore.getValue("fontSize", null).toString(),
+            fontSize: (SettingsStore.getValue("baseFontSize", null) + FontWatcher.SIZE_DIFF).toString(),
             ...this.calculateThemeState(),
             customThemeUrl: "",
             customThemeMessage: {isError: false, text: ""},
@@ -132,7 +132,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
 
     private onFontSizeChanged = (size: number): void => {
         this.setState({fontSize: size.toString()});
-        SettingsStore.setValue("fontSize", null, SettingLevel.DEVICE, size);
+        SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, size - FontWatcher.SIZE_DIFF);
     };
 
     private onValidateFontSize = async ({value}: Pick<IFieldState, "value">): Promise<IValidationResult> => {
@@ -151,7 +151,13 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             };
         }
 
-        SettingsStore.setValue("fontSize", null, SettingLevel.DEVICE, value);
+        SettingsStore.setValue(
+            "baseFontSize",
+            null,
+            SettingLevel.DEVICE,
+            parseInt(value, 10) - FontWatcher.SIZE_DIFF
+        );
+
         return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
     }
 
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 7cb4421a4f..da80a041bd 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -177,10 +177,10 @@ export const SETTINGS = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
-    "fontSize": {
+    "baseFontSize": {
         displayName: _td("Font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 20,
+        default: 10,
         controller: new FontSizeController(),
     },
     "useCustomFontSize": {
diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index 5d7c601fa1..1eb0af9f3e 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -20,8 +20,10 @@ import IWatcher from "./Watcher";
 import { toPx } from '../../utils/units';
 
 export class FontWatcher implements IWatcher {
-    public static readonly MIN_SIZE = 13;
-    public static readonly MAX_SIZE = 20;
+    public static readonly MIN_SIZE = 8;
+    public static readonly MAX_SIZE = 15;
+    // Externally we tell the user the font is size 15. Internally we use 10.
+    public static readonly SIZE_DIFF = 5;
 
     private dispatcherRef: string;
 
@@ -30,7 +32,7 @@ export class FontWatcher implements IWatcher {
     }
 
     public start() {
-        this.setRootFontSize(SettingsStore.getValue("fontSize"));
+        this.setRootFontSize(SettingsStore.getValue("baseFontSize") + FontWatcher.SIZE_DIFF);
         this.dispatcherRef = dis.register(this.onAction);
     }
 
@@ -45,11 +47,11 @@ export class FontWatcher implements IWatcher {
     };
 
     private setRootFontSize = (size) => {
-        // Externally we tell the user the font is size 15. Internally we use 10.
-        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE) - 5;
+        console.log({size})
+        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE);
 
         if (fontSize !== size) {
-            SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);
+            SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, fontSize);
         }
         (<HTMLElement>document.querySelector(":root")).style.fontSize = toPx(fontSize);
     };

From bba6767608cea9444d927b02195794f48111c3f5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 4 Jun 2020 18:00:22 +0100
Subject: [PATCH 032/181] Update displayed min and max

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.tsx    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 9b77493c4f..2b58e0e28e 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -137,8 +137,8 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
 
     private onValidateFontSize = async ({value}: Pick<IFieldState, "value">): Promise<IValidationResult> => {
         const parsedSize = parseFloat(value);
-        const min = FontWatcher.MIN_SIZE;
-        const max = FontWatcher.MAX_SIZE;
+        const min = FontWatcher.MIN_SIZE + FontWatcher.SIZE_DIFF;
+        const max = FontWatcher.MAX_SIZE + FontWatcher.SIZE_DIFF;
 
         if (isNaN(parsedSize)) {
             return {valid: false, feedback: _t("Size must be a number")};

From f3011f00f78a3de7a34868fc506b462472154b7c Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 4 Jun 2020 19:43:35 +0100
Subject: [PATCH 033/181] Remove debug

---
 src/settings/watchers/FontWatcher.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index 1eb0af9f3e..05c707a57b 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -47,7 +47,6 @@ export class FontWatcher implements IWatcher {
     };
 
     private setRootFontSize = (size) => {
-        console.log({size})
         const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE);
 
         if (fontSize !== size) {

From 434f6ea4d470ac6d1de2cd16c7663ebc8030d97c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 16:36:14 -0600
Subject: [PATCH 034/181] Remove legacy sublist sizing

---
 src/components/views/rooms/RoomList2.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index b6fe37589c..15aa880109 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -127,8 +127,6 @@ const TAG_AESTHETICS: {
 };
 
 export default class RoomList2 extends React.Component<IProps, IState> {
-    private sublistSizes: { [tagId: string]: number } = {};
-    private sublistCollapseStates: { [tagId: string]: boolean } = {};
     private searchFilter: NameFilterCondition = new NameFilterCondition();
 
     constructor(props: IProps) {
@@ -138,7 +136,6 @@ export default class RoomList2 extends React.Component<IProps, IState> {
             sublists: {},
             layouts: new Map<TagID, ListLayout>(),
         };
-        this.loadSublistSizes();
     }
 
     public componentDidUpdate(prevProps: Readonly<IProps>): void {
@@ -170,14 +167,6 @@ export default class RoomList2 extends React.Component<IProps, IState> {
         });
     }
 
-    private loadSublistSizes() {
-        const sizesJson = window.localStorage.getItem("mx_roomlist_sizes");
-        if (sizesJson) this.sublistSizes = JSON.parse(sizesJson);
-
-        const collapsedJson = window.localStorage.getItem("mx_roomlist_collapsed");
-        if (collapsedJson) this.sublistCollapseStates = JSON.parse(collapsedJson);
-    }
-
     private renderSublists(): React.ReactElement[] {
         const components: React.ReactElement[] = [];
 

From 4c1bc50649afcf31f403b7b887ecbdc95ba31772 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 16:34:04 -0600
Subject: [PATCH 035/181] Initial styling for new room list

This is a work in progress, but covers the coarse areas. This uses all-new classes to better describe what everything is, and to reduce the number of selectors we keep track of.

This is primarily layout for the list and not actually the final structure. For example, some buttons are missing and other areas are not styled correctly - the idea in this commit was to get things roughly in the right place and work on it.
---
 res/css/_components.scss                    |  3 +
 res/css/structures/_LeftPanel.scss          |  8 --
 res/css/structures/_LeftPanel2.scss         | 91 +++++++++++++++++++++
 res/css/structures/_MatrixChat.scss         |  2 +-
 res/css/views/rooms/_RoomList2.scss         | 23 ++++++
 res/css/views/rooms/_RoomSublist2.scss      |  2 +-
 res/css/views/rooms/_RoomTile2.scss         | 18 ++++
 src/components/structures/LeftPanel2.tsx    | 63 +++++++++-----
 src/components/views/rooms/RoomList2.tsx    |  2 +-
 src/components/views/rooms/RoomSublist2.tsx | 21 +++--
 src/components/views/rooms/RoomTile2.tsx    | 32 ++++----
 11 files changed, 205 insertions(+), 60 deletions(-)
 create mode 100644 res/css/structures/_LeftPanel2.scss
 create mode 100644 res/css/views/rooms/_RoomList2.scss
 create mode 100644 res/css/views/rooms/_RoomTile2.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index b047519d99..62bec5ad62 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -12,6 +12,7 @@
 @import "./structures/_HeaderButtons.scss";
 @import "./structures/_HomePage.scss";
 @import "./structures/_LeftPanel.scss";
+@import "./structures/_LeftPanel2.scss";
 @import "./structures/_MainSplit.scss";
 @import "./structures/_MatrixChat.scss";
 @import "./structures/_MyGroups.scss";
@@ -177,10 +178,12 @@
 @import "./views/rooms/_RoomDropTarget.scss";
 @import "./views/rooms/_RoomHeader.scss";
 @import "./views/rooms/_RoomList.scss";
+@import "./views/rooms/_RoomList2.scss";
 @import "./views/rooms/_RoomPreviewBar.scss";
 @import "./views/rooms/_RoomRecoveryReminder.scss";
 @import "./views/rooms/_RoomSublist2.scss";
 @import "./views/rooms/_RoomTile.scss";
+@import "./views/rooms/_RoomTile2.scss";
 @import "./views/rooms/_RoomUpgradeWarningBar.scss";
 @import "./views/rooms/_SearchBar.scss";
 @import "./views/rooms/_SendMessageComposer.scss";
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 899824bc57..35d9f0e7da 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -23,14 +23,6 @@ limitations under the License.
     flex: 0 0 auto;
 }
 
-// TODO: Remove temporary indicator of new room list implementation.
-// This border is meant to visually distinguish between the two components when the
-// user has turned on the new room list implementation, at least until the designs
-// themselves give it away.
-.mx_LeftPanel2 .mx_LeftPanel {
-    border-left: 5px #e26dff solid;
-}
-
 .mx_LeftPanel_container.collapsed {
     min-width: unset;
     /* Collapsed LeftPanel 50px */
diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
new file mode 100644
index 0000000000..52ee4f16ac
--- /dev/null
+++ b/res/css/structures/_LeftPanel2.scss
@@ -0,0 +1,91 @@
+/*
+Copyright 2020 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.
+*/
+
+$tagPanelWidth: 70px;
+$roomListMinimizedWidth: 50px;
+
+.mx_LeftPanel2 {
+    background-color: $header-panel-bg-color;
+    min-width: 260px;
+    max-width: 50%;
+
+    // Create a row-based flexbox for the TagPanel and the room list
+    display: flex;
+
+    .mx_LeftPanel2_tagPanelContainer {
+        flex-grow: 0;
+        flex-shrink: 0;
+        flex-basis: $tagPanelWidth;
+        height: 100%;
+
+        // Create another flexbox so the TagPanel fills the container
+        display: flex;
+
+        // TagPanel handles its own CSS
+    }
+
+    // Note: The 'room list' in this context is actually everything that isn't the tag
+    // panel, such as the menu options, breadcrumbs, filtering, etc
+    .mx_LeftPanel2_roomListContainer {
+        width: calc(100% - $tagPanelWidth);
+
+        // Create another flexbox (this time a column) for the room list components
+        display: flex;
+        flex-direction: column;
+
+        .mx_LeftPanel2_userHeader {
+            padding: 14px 12px 20px; // 14px top, 12px sides, 20px bottom
+
+            // Create another flexbox column for the rows to stack within
+            display: flex;
+            flex-direction: column;
+
+            // There's 2 rows when breadcrumbs are present: the top bit and the breadcrumbs
+            .mx_LeftPanel2_headerRow {
+                // Create yet another flexbox, this time within the row, to ensure items stay
+                // aligned correctly. This is also a row-based flexbox.
+                display: flex;
+                align-items: center;
+            }
+
+            .mx_LeftPanel2_userAvatarContainer {
+                position: relative; // to make default avatars work
+                margin-right: 8px;
+            }
+
+            .mx_LeftPanel2_userName {
+                font-weight: 600;
+                font-size: $font-15px;
+                line-height: $font-20px;
+            }
+
+            .mx_LeftPanel2_breadcrumbsContainer {
+                // TODO: Improve CSS for breadcrumbs (currently shoved into the view rather than placed)
+                width: 100%;
+                overflow: hidden;
+            }
+        }
+
+        .mx_LeftPanel2_filterContainer {
+            // TODO: Improve CSS for filtering and its input
+        }
+
+        .mx_LeftPanel2_actualRoomListContainer {
+            flex-grow: 1; // fill the available space
+            overflow-y: auto;
+        }
+    }
+}
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index 05c703ab6d..08ed9e5559 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -66,7 +66,7 @@ limitations under the License.
 }
 
 /* not the left panel, and not the resize handle, so the roomview/groupview/... */
-.mx_MatrixChat > :not(.mx_LeftPanel_container):not(.mx_ResizeHandle) {
+.mx_MatrixChat > :not(.mx_LeftPanel_container):not(.mx_LeftPanel2):not(.mx_ResizeHandle) {
     background-color: $primary-bg-color;
 
     flex: 1 1 0;
diff --git a/res/css/views/rooms/_RoomList2.scss b/res/css/views/rooms/_RoomList2.scss
new file mode 100644
index 0000000000..add7214468
--- /dev/null
+++ b/res/css/views/rooms/_RoomList2.scss
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 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_RoomList2 {
+    // Create a column-based flexbox for the sublists. That's pretty much all we have to
+    // worry about in this stylesheet.
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+}
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index abc3133fc1..55b16843b3 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 @import "../../../../node_modules/react-resizable/css/styles.css";
 
-.mx_RoomList2 .mx_RoomSubList_labelContainer {
+.mx_RoomList2 .mx_RoomSubList2_labelContainer {
   z-index: 12;
   background-color: purple;
 }
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
new file mode 100644
index 0000000000..6577f1ce25
--- /dev/null
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 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_RoomTile2 {
+}
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index c9a4948539..bf0e72beeb 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -24,6 +24,9 @@ import SearchBox from "./SearchBox";
 import RoomList2 from "../views/rooms/RoomList2";
 import TopLeftMenuButton from "./TopLeftMenuButton";
 import { Action } from "../../dispatcher/actions";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import BaseAvatar from '../views/avatars/BaseAvatar';
+import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -82,24 +85,44 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         }
     }
 
+    private renderHeader(): React.ReactNode {
+        // TODO: Use real profile info
+        // TODO: Presence
+        // TODO: Breadcrumbs toggle
+        // TODO: Menu button
+        const avatarSize = 32;
+        return (
+            <div className="mx_LeftPanel2_userHeader">
+                <div className="mx_LeftPanel2_headerRow">
+                    <span className="mx_LeftPanel2_userAvatarContainer">
+                        <BaseAvatar
+                            idName={MatrixClientPeg.get().getUserId()}
+                            name={"TODO: Display Name"}
+                            url={null}
+                            width={avatarSize}
+                            height={avatarSize}
+                            resizeMethod="crop"
+                            className="mx_LeftPanel2_userAvatar"
+                        />
+                    </span>
+                    <span className="mx_LeftPanel2_userName">Irene</span>
+                </div>
+                <div className="mx_LeftPanel2_headerRow mx_LeftPanel2_breadcrumbsContainer">
+                    <RoomBreadcrumbs />
+                </div>
+            </div>
+        );
+    }
+
     public render(): React.ReactNode {
         const tagPanel = (
-            <div className="mx_LeftPanel_tagPanelContainer">
+            <div className="mx_LeftPanel2_tagPanelContainer">
                 <TagPanel/>
             </div>
         );
 
-        const exploreButton = (
-            <div
-                className={classNames("mx_LeftPanel_explore", {"mx_LeftPanel_explore_hidden": this.state.searchExpanded})}>
-                <AccessibleButton onClick={() => dis.dispatch({action: 'view_room_directory'})}>
-                    {_t("Explore")}
-                </AccessibleButton>
-            </div>
-        );
-
         const searchBox = (<SearchBox
-            className="mx_LeftPanel_filterRooms"
+            className="mx_LeftPanel2_TODO_filterRooms"
             enableRoomSearchFocus={true}
             blurredPlaceholder={_t('Filter')}
             placeholder={_t('Filter rooms…')}
@@ -124,29 +147,25 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         // TODO: Conference handling / calls
 
         const containerClasses = classNames({
-            "mx_LeftPanel_container": true,
-            "mx_fadable": true,
-            "collapsed": false, // TODO: Collapsed support
-            "mx_LeftPanel_container_hasTagPanel": true, // TODO: TagPanel support
-            "mx_fadable_faded": false,
-            "mx_LeftPanel2": true, // TODO: Remove flag when RoomList2 ships (used as an indicator)
+            "mx_LeftPanel2": true,
         });
 
         return (
             <div className={containerClasses}>
                 {tagPanel}
-                <aside className="mx_LeftPanel dark-panel">
-                    <TopLeftMenuButton collapsed={false}/>
+                <aside className="mx_LeftPanel2_roomListContainer">
+                    {this.renderHeader()}
                     <div
-                        className="mx_LeftPanel_exploreAndFilterRow"
+                        className="mx_LeftPanel2_filterContainer"
                         onKeyDown={() => {/*TODO*/}}
                         onFocus={() => {/*TODO*/}}
                         onBlur={() => {/*TODO*/}}
                     >
-                        {exploreButton}
                         {searchBox}
                     </div>
-                    {roomList}
+                    <div className="mx_LeftPanel2_actualRoomListContainer">
+                        {roomList}
+                    </div>
                 </aside>
             </div>
         );
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 15aa880109..af366e9685 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -216,7 +216,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                         onFocus={this.props.onFocus}
                         onBlur={this.props.onBlur}
                         onKeyDown={onKeyDownHandler}
-                        className="mx_RoomList mx_RoomList2"
+                        className="mx_RoomList2"
                         role="tree"
                         aria-label={_t("Rooms")}
                         // Firefox sometimes makes this element focusable due to
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index cc56f92769..e7682a9bb4 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -113,9 +113,9 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         let chevron = null;
         if (this.hasTiles()) {
             const chevronClasses = classNames({
-                'mx_RoomSubList_chevron': true,
-                'mx_RoomSubList_chevronRight': false, // isCollapsed
-                'mx_RoomSubList_chevronDown': true, // !isCollapsed
+                'mx_RoomSublist2_chevron': true,
+                'mx_RoomSublist2_chevronRight': false, // isCollapsed
+                'mx_RoomSublist2_chevronDown': true, // !isCollapsed
             });
             chevron = (<div className={chevronClasses}/>);
         }
@@ -130,8 +130,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     let badge;
                     if (true) { // !isCollapsed
                         const badgeClasses = classNames({
-                            'mx_RoomSubList_badge': true,
-                            'mx_RoomSubList_badgeHighlight': notifHighlight,
+                            'mx_RoomSublist2_badge': true,
+                            'mx_RoomSublist2_badgeHighlight': notifHighlight,
                         });
                         // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
                         if (notifCount > 0) {
@@ -168,7 +168,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                             <AccessibleTooltipButton
                                 tabIndex={tabIndex}
                                 onClick={this.onAddRoom}
-                                className="mx_RoomSubList_addRoom"
+                                className="mx_RoomSublist2_addButton"
                                 title={this.props.addRoomLabel || _t("Add room")}
                             />
                         );
@@ -176,11 +176,11 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
                     // TODO: a11y (see old component)
                     return (
-                        <div className={"mx_RoomSubList_labelContainer"}>
+                        <div className={"mx_RoomSublist2_headerContainer"}>
                             <AccessibleButton
                                 inputRef={ref}
                                 tabIndex={tabIndex}
-                                className={"mx_RoomSubList_label"}
+                                className={"mx_RoomSublist2_headerText"}
                                 role="treeitem"
                                 aria-level="1"
                             >
@@ -204,9 +204,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
         const classes = classNames({
             // TODO: Proper collapse support
-            'mx_RoomSubList': true,
-            'mx_RoomSubList_hidden': false, // len && isCollapsed
-            'mx_RoomSubList_nonEmpty': this.hasTiles(), // len && !isCollapsed
+            'mx_RoomSublist2': true,
+            'mx_RoomSublist2_collapsed': false, // len && isCollapsed
         });
 
         let content = null;
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index c95cd108dc..40c7bcbc12 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -195,28 +195,28 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         const hasBadge = this.state.notificationState.color > NotificationColor.Bold;
         const isUnread = this.state.notificationState.color > NotificationColor.None;
         const classes = classNames({
-            'mx_RoomTile': true,
+            'mx_RoomTile2': true,
             // 'mx_RoomTile_selected': this.state.selected,
-            'mx_RoomTile_unread': isUnread,
-            'mx_RoomTile_unreadNotify': this.state.notificationState.color >= NotificationColor.Grey,
-            'mx_RoomTile_highlight': this.state.notificationState.color >= NotificationColor.Red,
-            'mx_RoomTile_invited': this.roomIsInvite,
+            'mx_RoomTile2_unread': isUnread,
+            'mx_RoomTile2_unreadNotify': this.state.notificationState.color >= NotificationColor.Grey,
+            'mx_RoomTile2_highlight': this.state.notificationState.color >= NotificationColor.Red,
+            'mx_RoomTile2_invited': this.roomIsInvite,
             // 'mx_RoomTile_menuDisplayed': isMenuDisplayed,
-            'mx_RoomTile_noBadges': !hasBadge,
+            'mx_RoomTile2_noBadges': !hasBadge,
             // 'mx_RoomTile_transparent': this.props.transparent,
             // 'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
         });
 
         const avatarClasses = classNames({
-            'mx_RoomTile_avatar': true,
+            'mx_RoomTile2_avatar': true,
         });
 
 
         let badge;
         if (hasBadge) {
             const badgeClasses = classNames({
-                'mx_RoomTile_badge': true,
-                'mx_RoomTile_badgeButton': false, // this.state.badgeHover || isMenuDisplayed
+                'mx_RoomTile2_badge': true,
+                'mx_RoomTile2_badgeButton': false, // this.state.badgeHover || isMenuDisplayed
             });
             badge = <div className={badgeClasses}>{this.state.notificationState.symbol}</div>;
         }
@@ -227,16 +227,16 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
         const nameClasses = classNames({
-            'mx_RoomTile_name': true,
-            'mx_RoomTile_invite': this.roomIsInvite,
-            'mx_RoomTile_badgeShown': hasBadge,
+            'mx_RoomTile2_name': true,
+            'mx_RoomTile2_invite': this.roomIsInvite,
+            'mx_RoomTile2_badgeShown': hasBadge,
         });
 
         // TODO: Support collapsed state properly
         let tooltip = null;
         if (false) { // isCollapsed
             if (this.state.hover) {
-                tooltip = <Tooltip className="mx_RoomTile_tooltip" label={this.props.room.name} />
+                tooltip = <Tooltip className="mx_RoomTile2_tooltip" label={this.props.room.name} />
             }
         }
 
@@ -255,12 +255,12 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                             role="treeitem"
                         >
                             <div className={avatarClasses}>
-                                <div className="mx_RoomTile_avatar_container">
+                                <div className="mx_RoomTile2_avatarContainer">
                                     <RoomAvatar room={this.props.room} width={24} height={24}/>
                                 </div>
                             </div>
-                            <div className="mx_RoomTile_nameContainer">
-                                <div className="mx_RoomTile_labelContainer">
+                            <div className="mx_RoomTile2_nameContainer">
+                                <div className="mx_RoomTile2_labelContainer">
                                     <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
                                         {name}
                                     </div>

From 0c15b2bdb6c332713b8e95cb907c6b50adeaeeda Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 21:21:04 -0600
Subject: [PATCH 036/181] Simple structuring of the room list itself

This covers the larger parts of the design, but doesn't deal with the nuances of hover states, badge sizing, etc.
---
 res/css/views/rooms/_RoomSublist2.scss      |  26 +++-
 res/css/views/rooms/_RoomTile2.scss         |  76 +++++++++++
 res/themes/light/css/_light.scss            |   5 +
 src/components/views/rooms/RoomList2.tsx    |   3 +-
 src/components/views/rooms/RoomSublist2.tsx | 135 ++++++++++----------
 src/components/views/rooms/RoomTile2.tsx    |  65 ++++------
 src/i18n/strings/en_EN.json                 |   9 +-
 src/stores/room-list/ListLayout.ts          |   2 +-
 8 files changed, 205 insertions(+), 116 deletions(-)

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 55b16843b3..4d8c3fffff 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -16,7 +16,27 @@ limitations under the License.
 
 @import "../../../../node_modules/react-resizable/css/styles.css";
 
-.mx_RoomList2 .mx_RoomSubList2_labelContainer {
-  z-index: 12;
-  background-color: purple;
+.mx_RoomSublist2 {
+    // The sublist is a column of rows, essentially
+    display: flex;
+    flex-direction: column;
+
+    margin-left: 8px;
+    margin-top: 12px;
+    margin-bottom: 12px;
+
+    .mx_RoomSublist2_headerContainer {
+        text-transform: uppercase;
+        opacity: 0.5;
+        line-height: $font-16px;
+        font-size: $font-12px;
+        padding-bottom: 8px;
+    }
+
+    .mx_RoomSublist2_resizeBox {
+        // Create another flexbox column for the tiles
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+    }
 }
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 6577f1ce25..bb27942f81 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -14,5 +14,81 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Note: the room tile expects to be in a flexbox column container
 .mx_RoomTile2 {
+    width: 100%;
+    padding-bottom: 12px;
+
+    // The tile is also a flexbox row itself
+    display: flex;
+    flex-wrap: wrap;
+
+    .mx_RoomTile2_avatarContainer {
+        margin-right: 8px;
+    }
+
+    .mx_RoomTile2_nameContainer {
+        // Create a new column layout flexbox for the name parts
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+
+        .mx_RoomTile2_name,
+        .mx_RoomTile2_messagePreview {
+            margin: 0 2px;
+        }
+
+        // TODO: Ellipsis on the name and preview
+
+        .mx_RoomTile2_name {
+            font-weight: 600;
+            font-size: $font-14px;
+            line-height: $font-19px;
+        }
+
+        .mx_RoomTile2_messagePreview {
+            font-size: $font-13px;
+            line-height: $font-18px;
+            color: $roomtile2-preview-color;
+        }
+    }
+
+    .mx_RoomTile2_badgeContainer {
+        flex-grow: 1;
+
+        // Create another flexbox row because it's super easy to position the badge at
+        // the end this way.
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .mx_RoomTile2_badge {
+            background-color: $roomtile2-badge-color;
+
+            &:not(.mx_RoomTile2_badgeEmpty) {
+                border-radius: 16px;
+                font-size: $font-10px;
+                line-height: $font-14px;
+                text-align: center;
+                font-weight: bold;
+                margin-right: 14px;
+                color: #fff; // TODO: Variable
+
+                // TODO: Confirm padding on counted badges
+                padding: 2px 5px;
+            }
+
+            &.mx_RoomTile2_badgeEmpty {
+                width: 6px;
+                height: 6px;
+                border-radius: 6px;
+                margin-right: 18px;
+            }
+
+            &.mx_RoomTile2_badgeHighlight {
+                // TODO: Use a more specific variable
+                background-color: $warning-color;
+            }
+        }
+    }
 }
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 78fe2a74c5..683c02528d 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -172,6 +172,11 @@ $header-divider-color: #91A1C0;
 
 // ********************
 
+// TODO: Update variables for new room list
+// TODO: Dark theme
+$roomtile2-preview-color: #9e9e9e;
+$roomtile2-badge-color: #61708b;
+
 $roomtile-name-color: #61708b;
 $roomtile-badge-fg-color: $accent-fg-color;
 $roomtile-selected-color: #212121;
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index af366e9685..ce1956f68d 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -96,7 +96,7 @@ const TAG_AESTHETICS: {
         defaultHidden: false,
     },
     [DefaultTagID.DM]: {
-        sectionLabel: _td("Direct Messages"),
+        sectionLabel: _td("People"),
         isInvite: false,
         defaultHidden: false,
         addRoomLabel: _td("Start chat"),
@@ -200,6 +200,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                     addRoomLabel={aesthetics.addRoomLabel}
                     isInvite={aesthetics.isInvite}
                     layout={this.state.layouts.get(orderedTagId)}
+                    showMessagePreviews={orderedTagId === DefaultTagID.DM}
                 />
             );
         }
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index e7682a9bb4..84bcb1ea4d 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -20,15 +20,13 @@ import * as React from "react";
 import { createRef } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
 import classNames from 'classnames';
-import * as RoomNotifs from '../../../RoomNotifs';
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../../views/elements/AccessibleButton";
-import AccessibleTooltipButton from "../../views/elements/AccessibleTooltipButton";
-import * as FormattingUtils from '../../../utils/FormattingUtils';
 import RoomTile2 from "./RoomTile2";
 import { ResizableBox, ResizeCallbackData } from "react-resizable";
 import { ListLayout } from "../../../stores/room-list/ListLayout";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -43,6 +41,7 @@ interface IProps {
     rooms?: Room[];
     startAsHidden: boolean;
     label: string;
+    showMessagePreviews: boolean;
     onAddRoom?: () => void;
     addRoomLabel: string;
     isInvite: boolean;
@@ -93,7 +92,13 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
         if (this.props.rooms) {
             for (const room of this.props.rooms) {
-                tiles.push(<RoomTile2 room={room} key={`room-${room.roomId}`}/>);
+                tiles.push(
+                    <RoomTile2
+                        room={room}
+                        key={`room-${room.roomId}`}
+                        showMessagePreview={this.props.showMessagePreviews}
+                    />
+                );
             }
         }
 
@@ -101,25 +106,16 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
     }
 
     private renderHeader(): React.ReactElement {
-        const notifications = !this.props.isInvite
-            ? RoomNotifs.aggregateNotificationCount(this.props.rooms)
-            : {count: 0, highlight: true};
-        const notifCount = notifications.count;
-        const notifHighlight = notifications.highlight;
+        // TODO: Handle badge count
+        // const notifications = !this.props.isInvite
+        //     ? RoomNotifs.aggregateNotificationCount(this.props.rooms)
+        //     : {count: 0, highlight: true};
+        // const notifCount = notifications.count;
+        // const notifHighlight = notifications.highlight;
 
         // TODO: Title on collapsed
         // TODO: Incoming call box
 
-        let chevron = null;
-        if (this.hasTiles()) {
-            const chevronClasses = classNames({
-                'mx_RoomSublist2_chevron': true,
-                'mx_RoomSublist2_chevronRight': false, // isCollapsed
-                'mx_RoomSublist2_chevronDown': true, // !isCollapsed
-            });
-            chevron = (<div className={chevronClasses}/>);
-        }
-
         return (
             <RovingTabIndexWrapper inputRef={this.headerButton}>
                 {({onFocus, isActive, ref}) => {
@@ -127,52 +123,55 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     const tabIndex = isActive ? 0 : -1;
 
                     // TODO: Collapsed state
-                    let badge;
-                    if (true) { // !isCollapsed
-                        const badgeClasses = classNames({
-                            'mx_RoomSublist2_badge': true,
-                            'mx_RoomSublist2_badgeHighlight': notifHighlight,
-                        });
-                        // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
-                        if (notifCount > 0) {
-                            badge = (
-                                <AccessibleButton
-                                    tabIndex={tabIndex}
-                                    className={badgeClasses}
-                                    aria-label={_t("Jump to first unread room.")}
-                                >
-                                    <div>
-                                        {FormattingUtils.formatCount(notifCount)}
-                                    </div>
-                                </AccessibleButton>
-                            );
-                        } else if (this.props.isInvite && this.hasTiles()) {
-                            // Render the `!` badge for invites
-                            badge = (
-                                <AccessibleButton
-                                    tabIndex={tabIndex}
-                                    className={badgeClasses}
-                                    aria-label={_t("Jump to first invite.")}
-                                >
-                                    <div>
-                                        {FormattingUtils.formatCount(this.numTiles)}
-                                    </div>
-                                </AccessibleButton>
-                            );
-                        }
-                    }
+                    // TODO: Handle badge count
+                    // let badge;
+                    // if (true) { // !isCollapsed
+                    //     const showCount = localStorage.getItem("mx_rls_count") || notifHighlight;
+                    //     const badgeClasses = classNames({
+                    //         'mx_RoomSublist2_badge': true,
+                    //         'mx_RoomSublist2_badgeHighlight': notifHighlight,
+                    //         'mx_RoomSublist2_badgeEmpty': !showCount,
+                    //     });
+                    //     // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
+                    //     if (notifCount > 0) {
+                    //         const count = <div>{FormattingUtils.formatCount(notifCount)}</div>;
+                    //         badge = (
+                    //             <AccessibleButton
+                    //                 tabIndex={tabIndex}
+                    //                 className={badgeClasses}
+                    //                 aria-label={_t("Jump to first unread room.")}
+                    //             >
+                    //                 {showCount ? count : null}
+                    //             </AccessibleButton>
+                    //         );
+                    //     } else if (this.props.isInvite && this.hasTiles()) {
+                    //         // Render the `!` badge for invites
+                    //         badge = (
+                    //             <AccessibleButton
+                    //                 tabIndex={tabIndex}
+                    //                 className={badgeClasses}
+                    //                 aria-label={_t("Jump to first invite.")}
+                    //             >
+                    //                 <div>
+                    //                     {FormattingUtils.formatCount(this.numTiles)}
+                    //                 </div>
+                    //             </AccessibleButton>
+                    //         );
+                    //     }
+                    // }
 
-                    let addRoomButton = null;
-                    if (!!this.props.onAddRoom) {
-                        addRoomButton = (
-                            <AccessibleTooltipButton
-                                tabIndex={tabIndex}
-                                onClick={this.onAddRoom}
-                                className="mx_RoomSublist2_addButton"
-                                title={this.props.addRoomLabel || _t("Add room")}
-                            />
-                        );
-                    }
+                    // TODO: Aux button
+                    // let addRoomButton = null;
+                    // if (!!this.props.onAddRoom) {
+                    //     addRoomButton = (
+                    //         <AccessibleTooltipButton
+                    //             tabIndex={tabIndex}
+                    //             onClick={this.onAddRoom}
+                    //             className="mx_RoomSublist2_addButton"
+                    //             title={this.props.addRoomLabel || _t("Add room")}
+                    //         />
+                    //     );
+                    // }
 
                     // TODO: a11y (see old component)
                     return (
@@ -184,11 +183,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                                 role="treeitem"
                                 aria-level="1"
                             >
-                                {chevron}
                                 <span>{this.props.label}</span>
                             </AccessibleButton>
-                            {badge}
-                            {addRoomButton}
                         </div>
                     );
                 }}
@@ -243,13 +239,14 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 // TODO: CSS TBD
                 // TODO: Show N more instead of infinity more?
                 // TODO: Safely use the same height of a tile, not hardcoded hacks
+                const moreTileHeightPx = `${layout.tileHeight}px`;
                 visibleTiles.splice(visibleTiles.length - 1, 1, (
                     <div
                         onClick={this.onShowAllClick}
-                        style={{height: '34px', lineHeight: '34px', backgroundColor: 'green', cursor: 'pointer'}}
+                        style={{height: moreTileHeightPx, lineHeight: moreTileHeightPx, backgroundColor: 'transparent', cursor: 'pointer'}}
                         key='showall'
                     >
-                        {_t("Show %(n)s more rooms", {n: numMissing})}
+                        {_t("Show %(n)s more", {n: numMissing})}
                     </div>
                 ));
             }
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 40c7bcbc12..8a51327ae2 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -51,6 +51,7 @@ enum NotificationColor {
 
 interface IProps {
     room: Room;
+    showMessagePreview: boolean;
 
     // TODO: Allow falsifying counts (for invites and stuff)
     // TODO: Transparency? Was this ever used?
@@ -192,33 +193,22 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         // TODO: a11y proper
         // TODO: Render more than bare minimum
 
-        const hasBadge = this.state.notificationState.color > NotificationColor.Bold;
-        const isUnread = this.state.notificationState.color > NotificationColor.None;
         const classes = classNames({
             'mx_RoomTile2': true,
-            // 'mx_RoomTile_selected': this.state.selected,
-            'mx_RoomTile2_unread': isUnread,
-            'mx_RoomTile2_unreadNotify': this.state.notificationState.color >= NotificationColor.Grey,
-            'mx_RoomTile2_highlight': this.state.notificationState.color >= NotificationColor.Red,
-            'mx_RoomTile2_invited': this.roomIsInvite,
-            // 'mx_RoomTile_menuDisplayed': isMenuDisplayed,
-            'mx_RoomTile2_noBadges': !hasBadge,
-            // 'mx_RoomTile_transparent': this.props.transparent,
-            // 'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
         });
 
-        const avatarClasses = classNames({
-            'mx_RoomTile2_avatar': true,
-        });
-
-
         let badge;
+        const hasBadge = this.state.notificationState.color > NotificationColor.Bold;
         if (hasBadge) {
+            const hasNotif = this.state.notificationState.color >= NotificationColor.Red;
+            const isEmptyBadge = !localStorage.getItem("mx_rl_rt_badgeCount");
             const badgeClasses = classNames({
                 'mx_RoomTile2_badge': true,
-                'mx_RoomTile2_badgeButton': false, // this.state.badgeHover || isMenuDisplayed
+                'mx_RoomTile2_badgeHighlight': hasNotif,
+                'mx_RoomTile2_badgeEmpty': isEmptyBadge,
             });
-            badge = <div className={badgeClasses}>{this.state.notificationState.symbol}</div>;
+            const symbol = this.state.notificationState.symbol;
+            badge = <div className={badgeClasses}>{isEmptyBadge ? null : symbol}</div>;
         }
 
         // TODO: the original RoomTile uses state for the room name. Do we need to?
@@ -226,20 +216,21 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         if (typeof name !== 'string') name = '';
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
-        const nameClasses = classNames({
-            'mx_RoomTile2_name': true,
-            'mx_RoomTile2_invite': this.roomIsInvite,
-            'mx_RoomTile2_badgeShown': hasBadge,
-        });
-
         // TODO: Support collapsed state properly
-        let tooltip = null;
-        if (false) { // isCollapsed
-            if (this.state.hover) {
-                tooltip = <Tooltip className="mx_RoomTile2_tooltip" label={this.props.room.name} />
-            }
+        // TODO: Tooltip?
+
+        let messagePreview = null;
+        if (this.props.showMessagePreview) {
+            // TODO: Actually get the real message preview from state
+            messagePreview = <div className="mx_RoomTile2_messagePreview">I just ate a pie.</div>;
         }
 
+        const nameClasses = classNames({
+            "mx_RoomTile2_name": true,
+            "mx_RoomTile2_nameWithPreview": !!messagePreview,
+        });
+
+        const avatarSize = 32;
         return (
             <React.Fragment>
                 <RovingTabIndexWrapper inputRef={this.roomTile}>
@@ -254,20 +245,18 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                             onClick={this.onTileClick}
                             role="treeitem"
                         >
-                            <div className={avatarClasses}>
-                                <div className="mx_RoomTile2_avatarContainer">
-                                    <RoomAvatar room={this.props.room} width={24} height={24}/>
-                                </div>
+                            <div className="mx_RoomTile2_avatarContainer">
+                                <RoomAvatar room={this.props.room} width={avatarSize} height={avatarSize}/>
                             </div>
                             <div className="mx_RoomTile2_nameContainer">
-                                <div className="mx_RoomTile2_labelContainer">
-                                    <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
-                                        {name}
-                                    </div>
+                                <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
+                                    {name}
                                 </div>
+                                {messagePreview}
+                            </div>
+                            <div className="mx_RoomTile2_badgeContainer">
                                 {badge}
                             </div>
-                            {tooltip}
                         </AccessibleButton>
                     }
                 </RovingTabIndexWrapper>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 884192b22a..cf6dc2431a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1090,6 +1090,7 @@
     "Low priority": "Low priority",
     "Historical": "Historical",
     "System Alerts": "System Alerts",
+    "People": "People",
     "This room": "This room",
     "Joining room …": "Joining room …",
     "Loading …": "Loading …",
@@ -1133,10 +1134,7 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
-    "Jump to first unread room.": "Jump to first unread room.",
-    "Jump to first invite.": "Jump to first invite.",
-    "Add room": "Add room",
-    "Show %(n)s more rooms": "Show %(n)s more rooms",
+    "Show %(n)s more": "Show %(n)s more",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",
@@ -2017,6 +2015,9 @@
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
     "Active call": "Active call",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?",
+    "Jump to first unread room.": "Jump to first unread room.",
+    "Jump to first invite.": "Jump to first invite.",
+    "Add room": "Add room",
     "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
     "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
     "Search failed": "Search failed",
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index fd57a03ca1..ee51230a61 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const TILE_HEIGHT_PX = 34;
+const TILE_HEIGHT_PX = 44;
 
 interface ISerializedListLayout {
     numTiles: number;

From f347019cf86bf8243fb643c949fa804ce6c6a0c4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 21:37:10 -0600
Subject: [PATCH 037/181] Remove obviously questionable color choices

---
 res/css/views/rooms/_RoomSublist2.scss      | 1 -
 src/components/views/rooms/RoomSublist2.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index abc3133fc1..1dfaf3fb1a 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -18,5 +18,4 @@ limitations under the License.
 
 .mx_RoomList2 .mx_RoomSubList_labelContainer {
   z-index: 12;
-  background-color: purple;
 }
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index cc56f92769..3aa1ea3566 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -247,7 +247,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 visibleTiles.splice(visibleTiles.length - 1, 1, (
                     <div
                         onClick={this.onShowAllClick}
-                        style={{height: '34px', lineHeight: '34px', backgroundColor: 'green', cursor: 'pointer'}}
+                        style={{height: '34px', lineHeight: '34px', cursor: 'pointer'}}
                         key='showall'
                     >
                         {_t("Show %(n)s more rooms", {n: numMissing})}

From 0694637b06af0288b268deec4e271b4026395640 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 21:38:06 -0600
Subject: [PATCH 038/181] Remove debug

---
 src/components/views/rooms/RoomSublist2.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 3aa1ea3566..a64f4bf6ba 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -226,7 +226,6 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
             if (localStorage.getItem("mx_rl_mathfn")) {
                 nVisible = Math[localStorage.getItem("mx_rl_mathfn")](layout.visibleTiles);
             }
-            console.log({nVisible})
             const visibleTiles = tiles.slice(0, nVisible);
 
             // If we're hiding rooms, show a 'show more' button to the user. This button

From e90e70bd77f9de1ad408a8f714c60b2ccec62d4c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 21:43:33 -0600
Subject: [PATCH 039/181] Misc cleanup

---
 res/css/views/rooms/_RoomList.scss          | 4 ----
 res/css/views/rooms/_RoomSublist2.scss      | 2 +-
 src/components/views/rooms/RoomSublist2.tsx | 7 ++-----
 src/i18n/strings/en_EN.json                 | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 7abf86cb0e..c23c19699d 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -15,10 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_RoomList2_resizer {
-    cursor: ns-resize;
-}
-
 .mx_RoomList.mx_RoomList2 {
     overflow-y: auto;
 }
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 1dfaf3fb1a..9ab1785566 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -17,5 +17,5 @@ limitations under the License.
 @import "../../../../node_modules/react-resizable/css/styles.css";
 
 .mx_RoomList2 .mx_RoomSubList_labelContainer {
-  z-index: 12;
+    z-index: 12;
 }
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index a64f4bf6ba..548166815f 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -239,17 +239,15 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 // we +1 to account for the room we're about to hide with our 'show more' button
                 const numMissing = (tiles.length - visibleTiles.length) + 1;
 
-                // TODO: Copy TBD
                 // TODO: CSS TBD
-                // TODO: Show N more instead of infinity more?
-                // TODO: Safely use the same height of a tile, not hardcoded hacks
+                // TODO: Make this an actual tile
                 visibleTiles.splice(visibleTiles.length - 1, 1, (
                     <div
                         onClick={this.onShowAllClick}
                         style={{height: '34px', lineHeight: '34px', cursor: 'pointer'}}
                         key='showall'
                     >
-                        {_t("Show %(n)s more rooms", {n: numMissing})}
+                        {_t("Show %(n)s more", {n: numMissing})}
                     </div>
                 ));
             }
@@ -260,7 +258,6 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     axis="y"
                     minConstraints={[-1, minTilesPx]}
                     maxConstraints={[-1, maxTilesPx]}
-                    draggableOpts={{grid: [-1, 1]}}
                     resizeHandles={handles}
                     onResize={this.onResize}
                     className="mx_RoomSublist2_resizeBox"
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 884192b22a..0aa4c3779e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1136,7 +1136,7 @@
     "Jump to first unread room.": "Jump to first unread room.",
     "Jump to first invite.": "Jump to first invite.",
     "Add room": "Add room",
-    "Show %(n)s more rooms": "Show %(n)s more rooms",
+    "Show %(n)s more": "Show %(n)s more",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",

From 1f11298aa327d15067ea0b14d10ecd6d50c14d3e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Jun 2020 21:45:32 -0600
Subject: [PATCH 040/181] Annotate hacky math

---
 src/components/views/rooms/RoomSublist2.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 548166815f..e20a36d6ce 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -222,6 +222,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 handles = []; // no handles, we're at a minimum
             }
 
+            // TODO: Remove Math hacks
             let nVisible = Math.floor(layout.visibleTiles);
             if (localStorage.getItem("mx_rl_mathfn")) {
                 nVisible = Math[localStorage.getItem("mx_rl_mathfn")](layout.visibleTiles);

From 0a1080de5a49c8bf1b390a2eb004e4746207e5b9 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 4 Jun 2020 21:20:26 +0000
Subject: [PATCH 041/181] Translated using Weblate (Lithuanian)

Currently translated at 67.4% (1522 of 2258 strings)

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

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index d885c6fd7d..08f7c9f33d 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1254,12 +1254,12 @@
     "Report Content": "Pranešti",
     "Nice, strong password!": "Puiku, stiprus slaptažodis!",
     "Old cryptography data detected": "Aptikti seni kriptografijos duomenys",
-    "Verify this login": "Patvirtinti šį prisijungimą",
+    "Verify this login": "Patvirtinkite šį prisijungimą",
     "Registration has been disabled on this homeserver.": "Registracija šiame serveryje išjungta.",
     "You can now close this window or <a>log in</a> to your new account.": "Jūs galite uždaryti šį langą arba <a>prisijungti</a> į savo naują paskyrą.",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Patvirtinkite savo tapatybę verifikuodami šį prisijungimą viename iš kitų jūsų seansų, suteikdami jam prieigą prie šifruotų žinučių.",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Identifikuokite save patvirtindami šį prisijungimą viename iš kitų jūsų seansų ir suteikdami jam prieigą prie šifruotų žinučių.",
     "This requires the latest Riot on your other devices:": "Tam reikia naujausios Riot versijos kituose jūsų įrenginiuose:",
-    "or another cross-signing capable Matrix client": "arba kitą kryžminį pasirašymą palaikantį Matrix klientą",
+    "or another cross-signing capable Matrix client": "arba kito kryžminį pasirašymą palaikančio Matrix kliento",
     "Use Recovery Passphrase or Key": "Naudoti atgavimo slaptafrazę arba raktą",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atnaujinkite šį seansą, kad jam būtų leista patvirtinti kitus seansus, suteikiant jiems prieigą prie šifruotų žinučių ir juos pažymint kaip patikimus kitiems vartotojams.",
     "Use Single Sign On to continue": "Norėdami tęsti naudokite Vieno Prisijungimo sistemą",
@@ -1426,7 +1426,7 @@
     "Enable desktop notifications for this session": "Įjungti darbalaukio pranešimus šiam seansui",
     "Enable audible notifications for this session": "Įjungti garsinius pranešimus šiam seansui",
     "wait and try again later": "palaukite ir bandykite vėliau dar kartą",
-    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Jei jūs nenorite naudoti <server /> radimui ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, žemiau įveskite kitą tapatybės serverį.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Jei jūs nenorite naudoti <server /> serverio radimui ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, žemiau įveskite kitą tapatybės serverį.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Tapatybės serverio naudojimas yra pasirinktinis. Jei jūs pasirinksite jo nenaudoti, jūs nebūsite randamas kitų vartotojų ir neturėsite galimybės pakviesti kitų nurodydamas el. paštą ar telefoną.",
     "Do not use an identity server": "Nenaudoti tapatybės serverio",
     "Cross-signing": "Kryžminis pasirašymas",
@@ -1462,7 +1462,7 @@
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Pasiekite savo saugių žinučių istoriją ir kryžminio pasirašymo tapatybę, naudojamą kitų seansų patvirtinimui, įvesdami savo atgavimo raktą.",
     "Session verified": "Seansas patvirtintas",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neįmanoma prisijungti prie serverio per HTTP, kai naršyklės juostoje yra HTTPS URL. Naudokite HTTPS arba <a>įjunkite nesaugias rašmenas</a>.",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jūsų naujas seansas dabar yra patvirtintas. Jis turi prieigą prie jūsų šifruotų žinučių ir kiti vartotojai matys jį kaip patikimą.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jūsų naujas seansas buvo patvirtintas. Jis turi prieigą prie jūsų šifruotų žinučių ir kiti vartotojai matys jį kaip patikimą.",
     "Your new session is now verified. Other users will see it as trusted.": "Jūsų naujas seansas dabar yra patvirtintas. Kiti vartotojai matys jį kaip patikimą.",
     "NOT verified": "Nepatvirtinta",
     "verified": "patvirtinta",
@@ -1588,5 +1588,36 @@
     "Click the button below to confirm setting up encryption.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šifravimo nustatymą.",
     "Restore your key backup to upgrade your encryption": "Atstatykite savo raktų atsarginę kopiją, kad atnaujintumėte šifravimą",
     "Upgrade your encryption": "Atnaujinkite savo šifravimą",
-    "Failed to set topic": "Nepavyko nustatyti temos"
+    "Failed to set topic": "Nepavyko nustatyti temos",
+    "Show typing notifications": "Rodyti spausdinimo pranešimus",
+    "Show hidden events in timeline": "Rodyti paslėptus įvykius laiko juostoje",
+    "Session backup key:": "Seanso atsarginės kopijos raktas:",
+    "Unable to load key backup status": "Nepavyko įkelti rakto atsarginės kopijos būklės",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Prieš atsijungdami susiekite šį seansą prie rakto atsarginės kopijos, kad išvengtumėte praradimo raktų, kurie gali būti tik šiame seanse.",
+    "Connect this session to Key Backup": "Susieti šį seansą su rakto atsargine kopija",
+    "Backup key stored: ": "Atsarginė rakto kopija saugoma: ",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, jūs šiuo metu naudojate <server></server> tapatybės serverį. Jį pakeisti galite žemiau.",
+    "Identity Server": "Tapatybės serveris",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Šiuo metu jūs nenaudojate tapatybės serverio. Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, pridėkite jį žemiau.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Atsijungimas nuo tapatybės serverio reikš, kad jūs nebebūsite randamas kitų vartotojų ir jūs nebegalėsite pakviesti kitų, naudodami jų el. paštą arba telefoną.",
+    "Appearance": "Išvaizda",
+    "Deactivate account": "Deaktyvuoti paskyrą",
+    "Identity Server is": "Tapatybės serveris yra",
+    "Timeline": "Laiko juosta",
+    "Key backup": "Atsarginė rakto kopija",
+    "Where you’re logged in": "Kur esate prisijungę",
+    "A session's public name is visible to people you communicate with": "Seanso viešas vardas yra matomas žmonių su kuriais jūs bendraujate",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Pabandykite slinkti aukštyn laiko juostoje, kad sužinotumėte, ar yra ankstesnių.",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Tai visam laikui padarys jūsų paskyrą nebetinkama naudoti. Jūs nebegalėsite prisijungti ir niekas nebegalės iš naujo užregistruoti to pačio vartotojo ID. Jūsų paskyra išeis iš visų kambarių, kuriuose ji dalyvauja ir pašalins jūsų paskyros detales iš jūsų tapatybės serverio. <b>Šis veiksmas neatšaukiamas.</b>",
+    "Unable to validate homeserver/identity server": "Neįmanoma patvirtinti serverio/tapatybės serverio",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nėra sukonfigūruota jokio tapatybės serverio, tad jūs negalite pridėti el. pašto adreso, tam, kad galėtumėte iš naujo nustatyti savo slaptažodį ateityje.",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Įveskite savo pasirinktinio tapatybės serverio URL <a>Ką tai reiškia?</a>",
+    "Identity Server URL": "Tapatybės serverio URL",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Bandyta įkelti konkrečią vietą šio kambario laiko juostoje, bet jūs neturite leidimo peržiūrėti tos žinutės.",
+    "Failed to load timeline position": "Nepavyko įkelti laiko juostos pozicijos",
+    "Your Matrix account on %(serverName)s": "Jūsų Matrix paskyra %(serverName)s serveryje",
+    "Your Matrix account on <underlinedServerName />": "Jūsų Matrix paskyra <underlinedServerName /> serveryje",
+    "No identity server is configured: add one in server settings to reset your password.": "Nesukonfigūruotas joks tapatybės serveris: pridėkite jį serverio nustatymuose, kad iš naujo nustatytumėte slaptažodį.",
+    "Identity server URL does not appear to be a valid identity server": "Tapatybės serverio URL neatrodo kaip tinkamas tapatybės serveris",
+    "Scroll up/down in the timeline": "Slinkite aukštyn/žemyn laiko juostoje"
 }

From 211ad66fea90e3c488a890fb9c7c71e3d24cf1ad Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 08:39:38 -0600
Subject: [PATCH 042/181] Fix i18n

---
 src/i18n/strings/en_EN.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1f70edc5d1..cf6dc2431a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1134,9 +1134,6 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
-    "Jump to first unread room.": "Jump to first unread room.",
-    "Jump to first invite.": "Jump to first invite.",
-    "Add room": "Add room",
     "Show %(n)s more": "Show %(n)s more",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",

From 6752c2832ee8a21e95ce105888b2257ec5bfce2a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 08:40:32 -0600
Subject: [PATCH 043/181] Add missing var

---
 src/components/views/rooms/RoomSublist2.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 15a0ff801b..1a58b67377 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -237,6 +237,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
                 // TODO: CSS TBD
                 // TODO: Make this an actual tile
+                const moreTileHeightPx = layout.tileHeight;
                 visibleTiles.splice(visibleTiles.length - 1, 1, (
                     <div
                         onClick={this.onShowAllClick}

From 475ba616710e4b32b41d1d96483326ec05c2778b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 08:48:23 -0600
Subject: [PATCH 044/181] Give the show more button some real CSS

This is still somewhat placeholder.
---
 res/css/views/rooms/_RoomSublist2.scss      | 9 +++++++++
 src/components/views/rooms/RoomSublist2.tsx | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 4d8c3fffff..da1c23b664 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -38,5 +38,14 @@ limitations under the License.
         display: flex;
         flex-direction: column;
         overflow: hidden;
+
+        .mx_RoomSublist2_showMoreButton {
+            height: 44px; // 1 room tile high
+            cursor: pointer;
+
+            // We create a flexbox to cheat at alignment
+            display: flex;
+            align-items: center;
+        }
     }
 }
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 1a58b67377..90231596fe 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -237,11 +237,10 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
                 // TODO: CSS TBD
                 // TODO: Make this an actual tile
-                const moreTileHeightPx = layout.tileHeight;
                 visibleTiles.splice(visibleTiles.length - 1, 1, (
                     <div
                         onClick={this.onShowAllClick}
-                        style={{height: moreTileHeightPx, lineHeight: moreTileHeightPx, cursor: 'pointer'}}
+                        className='mx_RoomSublist2_showMoreButton'
                         key='showall'
                     >
                         {_t("Show %(n)s more", {n: numMissing})}

From 51038b0c02d934ae14a94fddeb9d889acdc8d6d0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 11:03:18 -0600
Subject: [PATCH 045/181] Replace math hacks with temporary placeholder

---
 src/components/views/rooms/RoomSublist2.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index e20a36d6ce..dd0d591c53 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -222,11 +222,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 handles = []; // no handles, we're at a minimum
             }
 
-            // TODO: Remove Math hacks
-            let nVisible = Math.floor(layout.visibleTiles);
-            if (localStorage.getItem("mx_rl_mathfn")) {
-                nVisible = Math[localStorage.getItem("mx_rl_mathfn")](layout.visibleTiles);
-            }
+            // TODO: This might need adjustment, however for now it is fine as a round.
+            const nVisible = Math.round(layout.visibleTiles);
             const visibleTiles = tiles.slice(0, nVisible);
 
             // If we're hiding rooms, show a 'show more' button to the user. This button
@@ -242,6 +239,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
                 // TODO: CSS TBD
                 // TODO: Make this an actual tile
+                // TODO: This is likely to pop out of the list, consider that.
                 visibleTiles.splice(visibleTiles.length - 1, 1, (
                     <div
                         onClick={this.onShowAllClick}

From e93a41c5fb654fc09d6a97644185154f0ee55a26 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 13:14:44 -0600
Subject: [PATCH 046/181] Minor clarity

---
 src/components/views/rooms/RoomSublist2.tsx | 1 +
 src/stores/room-list/ListLayout.ts          | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index dd0d591c53..d3bb19729d 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -235,6 +235,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 // we have a cutoff condition - add the button to show all
 
                 // we +1 to account for the room we're about to hide with our 'show more' button
+                // this results in the button always being 1+, and not needing an i18n `count`.
                 const numMissing = (tiles.length - visibleTiles.length) + 1;
 
                 // TODO: CSS TBD
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index fd57a03ca1..b41d56be3e 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { TagID } from "./models";
+
 const TILE_HEIGHT_PX = 34;
 
 interface ISerializedListLayout {
@@ -23,7 +25,7 @@ interface ISerializedListLayout {
 export class ListLayout {
     private _n = 0;
 
-    constructor(public readonly tagId) {
+    constructor(public readonly tagId: TagID) {
         const serialized = localStorage.getItem(this.key);
         if (serialized) {
             // We don't use the setters as they cause writes.

From 1d8833e9f83a50e9223b04c59b8e216b86c56f04 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 14:08:20 -0600
Subject: [PATCH 047/181] Selected state, cleanup, and profile display

---
 res/css/structures/_LeftPanel2.scss      |  3 +++
 res/css/views/rooms/_RoomList2.scss      |  2 ++
 res/css/views/rooms/_RoomSublist2.scss   |  2 ++
 res/css/views/rooms/_RoomTile2.scss      | 13 +++++++++++--
 res/themes/light/css/_light.scss         |  1 +
 src/ActiveRoomObserver.js                | 14 +++++++++-----
 src/components/structures/LeftPanel2.tsx | 17 +++++++++++++----
 src/components/views/rooms/RoomTile2.tsx | 11 ++++++++++-
 8 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
index 52ee4f16ac..822a5ac399 100644
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -14,6 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: Rename to mx_LeftPanel during replacement of old component
+
+// TODO: Put these variables in the right place, or namespace them.
 $tagPanelWidth: 70px;
 $roomListMinimizedWidth: 50px;
 
diff --git a/res/css/views/rooms/_RoomList2.scss b/res/css/views/rooms/_RoomList2.scss
index add7214468..89760958f9 100644
--- a/res/css/views/rooms/_RoomList2.scss
+++ b/res/css/views/rooms/_RoomList2.scss
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: Rename to mx_RoomList during replacement of old component
+
 .mx_RoomList2 {
     // Create a column-based flexbox for the sublists. That's pretty much all we have to
     // worry about in this stylesheet.
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index da1c23b664..3b3eccfd60 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: Rename to mx_RoomSublist during replacement of old component
+
 @import "../../../../node_modules/react-resizable/css/styles.css";
 
 .mx_RoomSublist2 {
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index bb27942f81..3151bb8716 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -14,15 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: Rename to mx_RoomTile during replacement of old component
+
 // Note: the room tile expects to be in a flexbox column container
 .mx_RoomTile2 {
-    width: 100%;
-    padding-bottom: 12px;
+    width: calc(100% - 11px); // 8px for padding (4px on either side), 3px for margin
+    margin-bottom: 4px;
+    margin-right: 3px;
+    padding: 4px;
 
     // The tile is also a flexbox row itself
     display: flex;
     flex-wrap: wrap;
 
+    &.mx_RoomTile2_selected {
+        background-color: $roomtile2-selected-bg-color;
+        border-radius: 32px;
+    }
+
     .mx_RoomTile2_avatarContainer {
         margin-right: 8px;
     }
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 683c02528d..5aeb125774 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -176,6 +176,7 @@ $header-divider-color: #91A1C0;
 // TODO: Dark theme
 $roomtile2-preview-color: #9e9e9e;
 $roomtile2-badge-color: #61708b;
+$roomtile2-selected-bg-color: #FFF;
 
 $roomtile-name-color: #61708b;
 $roomtile-badge-fg-color: $accent-fg-color;
diff --git a/src/ActiveRoomObserver.js b/src/ActiveRoomObserver.js
index d6fbb460b5..b7695d401d 100644
--- a/src/ActiveRoomObserver.js
+++ b/src/ActiveRoomObserver.js
@@ -27,7 +27,7 @@ import RoomViewStore from './stores/RoomViewStore';
  */
 class ActiveRoomObserver {
     constructor() {
-        this._listeners = {};
+        this._listeners = {}; // key=roomId, value=function(isActive:boolean)
 
         this._activeRoomId = RoomViewStore.getRoomId();
         // TODO: We could self-destruct when the last listener goes away, or at least
@@ -35,6 +35,10 @@ class ActiveRoomObserver {
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate.bind(this));
     }
 
+    get activeRoomId(): string {
+        return this._activeRoomId;
+    }
+
     addListener(roomId, listener) {
         if (!this._listeners[roomId]) this._listeners[roomId] = [];
         this._listeners[roomId].push(listener);
@@ -51,23 +55,23 @@ class ActiveRoomObserver {
         }
     }
 
-    _emit(roomId) {
+    _emit(roomId, isActive: boolean) {
         if (!this._listeners[roomId]) return;
 
         for (const l of this._listeners[roomId]) {
-            l.call();
+            l.call(null, isActive);
         }
     }
 
     _onRoomViewStoreUpdate() {
         // emit for the old room ID
-        if (this._activeRoomId) this._emit(this._activeRoomId);
+        if (this._activeRoomId) this._emit(this._activeRoomId, false);
 
         // update our cache
         this._activeRoomId = RoomViewStore.getRoomId();
 
         // and emit for the new one
-        if (this._activeRoomId) this._emit(this._activeRoomId);
+        if (this._activeRoomId) this._emit(this._activeRoomId, true);
     }
 }
 
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index bf0e72beeb..00419465eb 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -86,26 +86,35 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
     }
 
     private renderHeader(): React.ReactNode {
-        // TODO: Use real profile info
+        // TODO: Update when profile info changes
         // TODO: Presence
         // TODO: Breadcrumbs toggle
         // TODO: Menu button
         const avatarSize = 32;
+        // TODO: Don't do this profile lookup in render()
+        const client = MatrixClientPeg.get();
+        let displayName = client.getUserId();
+        let avatarUrl: string = null;
+        const myUser = client.getUser(client.getUserId());
+        if (myUser) {
+            displayName = myUser.rawDisplayName;
+            avatarUrl = myUser.avatarUrl;
+        }
         return (
             <div className="mx_LeftPanel2_userHeader">
                 <div className="mx_LeftPanel2_headerRow">
                     <span className="mx_LeftPanel2_userAvatarContainer">
                         <BaseAvatar
                             idName={MatrixClientPeg.get().getUserId()}
-                            name={"TODO: Display Name"}
-                            url={null}
+                            name={displayName}
+                            url={avatarUrl}
                             width={avatarSize}
                             height={avatarSize}
                             resizeMethod="crop"
                             className="mx_LeftPanel2_userAvatar"
                         />
                     </span>
-                    <span className="mx_LeftPanel2_userName">Irene</span>
+                    <span className="mx_LeftPanel2_userName">{displayName}</span>
                 </div>
                 <div className="mx_LeftPanel2_headerRow mx_LeftPanel2_breadcrumbsContainer">
                     <RoomBreadcrumbs />
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 8a51327ae2..09d7b46ba5 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -23,7 +23,6 @@ import classNames from "classnames";
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import AccessibleButton from "../../views/elements/AccessibleButton";
 import RoomAvatar from "../../views/avatars/RoomAvatar";
-import Tooltip from "../../views/elements/Tooltip";
 import dis from '../../../dispatcher/dispatcher';
 import { Key } from "../../../Keyboard";
 import * as RoomNotifs from '../../../RoomNotifs';
@@ -32,6 +31,7 @@ import * as Unread from '../../../Unread';
 import * as FormattingUtils from "../../../utils/FormattingUtils";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import ActiveRoomObserver from "../../../ActiveRoomObserver";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -66,6 +66,7 @@ interface INotificationState {
 interface IState {
     hover: boolean;
     notificationState: INotificationState;
+    selected: boolean;
 }
 
 export default class RoomTile2 extends React.Component<IProps, IState> {
@@ -88,12 +89,14 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         this.state = {
             hover: false,
             notificationState: this.getNotificationState(),
+            selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
         };
 
         this.props.room.on("Room.receipt", this.handleRoomEventUpdate);
         this.props.room.on("Room.timeline", this.handleRoomEventUpdate);
         this.props.room.on("Room.redaction", this.handleRoomEventUpdate);
         MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
+        ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
     }
 
     public componentWillUnmount() {
@@ -101,6 +104,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             this.props.room.removeListener("Room.receipt", this.handleRoomEventUpdate);
             this.props.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
             this.props.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
+            ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
         }
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
@@ -187,6 +191,10 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         });
     };
 
+    private onActiveRoomUpdate = (isActive: boolean) => {
+        this.setState({selected: isActive});
+    };
+
     public render(): React.ReactElement {
         // TODO: Collapsed state
         // TODO: Invites
@@ -195,6 +203,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         const classes = classNames({
             'mx_RoomTile2': true,
+            'mx_RoomTile2_selected': this.state.selected,
         });
 
         let badge;

From 829bf3c774498bacad2aadbaecc582821457ccab Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 14:11:04 -0600
Subject: [PATCH 048/181] Add another TODO comment

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

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 3b3eccfd60..e6e5af3b48 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -16,6 +16,8 @@ limitations under the License.
 
 // TODO: Rename to mx_RoomSublist during replacement of old component
 
+// TODO: Just use the 3 selectors we need from this instead of importing it.
+// We're going to end up with heavy modifications anyways.
 @import "../../../../node_modules/react-resizable/css/styles.css";
 
 .mx_RoomSublist2 {

From 2806c8c18ba4f8bf864b981b54011c5211c333ab Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 14:13:28 -0600
Subject: [PATCH 049/181] Fix temporary class

---
 src/components/structures/LeftPanel2.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index 00419465eb..c66c0a6799 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -131,7 +131,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         );
 
         const searchBox = (<SearchBox
-            className="mx_LeftPanel2_TODO_filterRooms"
+            className="mx_LeftPanel2_filterRoomsSearch"
             enableRoomSearchFocus={true}
             blurredPlaceholder={_t('Filter')}
             placeholder={_t('Filter rooms…')}

From 69ea6353983225f0dc85720db982faa5d8d72718 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jun 2020 23:19:00 +0100
Subject: [PATCH 050/181] Allow searching the emoji picker using other emoji

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json |  4 ++--
 src/emoji.ts |  4 ++--
 yarn.lock    | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index eae83d3878..93d59a4fa6 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "create-react-class": "^15.6.0",
     "diff-dom": "^4.1.3",
     "diff-match-patch": "^1.0.4",
-    "emojibase-data": "^4.0.2",
-    "emojibase-regex": "^3.0.0",
+    "emojibase-data": "^5.0.1",
+    "emojibase-regex": "^4.0.1",
     "escape-html": "^1.0.3",
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
diff --git a/src/emoji.ts b/src/emoji.ts
index c0a755145a..753b808f4a 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// @ts-ignore - import * as EMOJIBASE actually breaks this
 import EMOJIBASE from 'emojibase-data/en/compact.json';
 
 export interface IEmoji {
@@ -70,7 +69,8 @@ EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
         DATA_BY_CATEGORY[categoryId].push(emoji);
     }
     // This is used as the string to match the query against when filtering emojis
-    emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase();
+    emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}\n` +
+        `${emoji.unicode.split("\u200D").join("\n")}`.toLowerCase();
 
     // Add mapping from unicode to Emoji object
     // The 'unicode' field that we use in emojibase has either
diff --git a/yarn.lock b/yarn.lock
index 393b89ba26..7e444a0e0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3155,15 +3155,15 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^4.0.2:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
-  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
+emojibase-data@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
+  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
 
-emojibase-regex@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
-  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
+emojibase-regex@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
+  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
 
 emojis-list@^2.0.0:
   version "2.1.0"

From 0c32daa162e7f3b273f7b09efc1ce3b230398c21 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jun 2020 23:34:04 +0100
Subject: [PATCH 051/181] label ZWJ as such

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/emoji.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/emoji.ts b/src/emoji.ts
index 753b808f4a..53625f3026 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -62,6 +62,8 @@ export const DATA_BY_CATEGORY = {
     "flags": [],
 };
 
+const ZERO_WIDTH_JOINER = "\u200D";
+
 // Store various mappings from unicode/emoticon/shortcode to the Emoji objects
 EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
     const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
@@ -70,7 +72,7 @@ EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
     }
     // This is used as the string to match the query against when filtering emojis
     emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}\n` +
-        `${emoji.unicode.split("\u200D").join("\n")}`.toLowerCase();
+        `${emoji.unicode.split(ZERO_WIDTH_JOINER).join("\n")}`.toLowerCase();
 
     // Add mapping from unicode to Emoji object
     // The 'unicode' field that we use in emojibase has either

From 6548748d7c3663cc0e3cb4df65bb88f07e208cba Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 18:44:05 -0600
Subject: [PATCH 052/181] Introduce sticky rooms to the new room list

Originally this was intended to be done only in the importance algorithm, however it is clear that all algorithms will need to deal with this. As such, it has been put into the base class to deal with as we may override it in the future.

This commit should be self-documenting enough to describe what is going on, though the major highlight is that the handling of the sticky room is done by lying to the underlying algorithm.

This has not been optimized for performance yet.

For https://github.com/vector-im/riot-web/issues/13635
---
 src/stores/room-list/README.md                |  38 ++---
 src/stores/room-list/RoomListStore2.ts        |  20 +++
 .../algorithms/list-ordering/Algorithm.ts     | 136 +++++++++++++++++-
 .../list-ordering/ImportanceAlgorithm.ts      |  26 ++--
 .../list-ordering/NaturalAlgorithm.ts         |   8 +-
 src/stores/room-list/models.ts                |   1 +
 6 files changed, 193 insertions(+), 36 deletions(-)

diff --git a/src/stores/room-list/README.md b/src/stores/room-list/README.md
index f4a56130ca..ba34691d34 100644
--- a/src/stores/room-list/README.md
+++ b/src/stores/room-list/README.md
@@ -74,29 +74,29 @@ gets applied to each category in a sub-sub-list fashion. This should result in t
 being sorted alphabetically amongst each other as well as the grey rooms sorted amongst each other, but 
 collectively the tag will be sorted into categories with red being at the top.
 
-<!-- TODO: Implement sticky rooms as described below -->
+### Sticky rooms
 
-The algorithm also has a concept of a 'sticky' room which is the room the user is currently viewing.
-The sticky room will remain in position on the room list regardless of other factors going on as typically
-clicking on a room will cause it to change categories into 'idle'. This is done by preserving N rooms
-above the selected room at all times, where N is the number of rooms above the selected rooms when it was
-selected.
+When the user visits a room, that room becomes 'sticky' in the list, regardless of ordering algorithm.
+From a code perspective, the underlying algorithm is not aware of a sticky room and instead the base class
+manages which room is sticky. This is to ensure that all algorithms handle it the same.
 
-For example, if the user has 3 red rooms and selects the middle room, they will always see exactly one
-room above their selection at all times. If they receive another notification, and the tag ordering is 
-specified as Recent, they'll see the new notification go to the top position, and the one that was previously
-there fall behind the sticky room.
+The sticky flag is simply to say it will not move higher or lower down the list while it is active. For
+example, if using the importance algorithm, the room would naturally become idle once viewed and thus
+would normally fly down the list out of sight. The sticky room concept instead holds it in place, never
+letting it fly down until the user moves to another room.
 
-The sticky room's category is technically 'idle' while being viewed and is explicitly pulled out of the
-tag sorting algorithm's input as it must maintain its position in the list. When the user moves to another
-room, the previous sticky room gets recalculated to determine which category it needs to be in as the user
-could have been scrolled up while new messages were received.
+Only one room can be sticky at a time. Room updates around the sticky room will still hold the sticky
+room in place. The best example of this is the importance algorithm: if the user has 3 red rooms and
+selects the middle room, they will see exactly one room above their selection at all times. If they
+receive another notification which causes the room to move into the topmost position, the room that was
+above the sticky room will move underneath to allow for the new room to take the top slot, maintaining
+the sticky room's position.
 
-Further, the sticky room is not aware of category boundaries and thus the user can see a shift in what 
-kinds of rooms move around their selection. An example would be the user having 4 red rooms, the user 
-selecting the third room (leaving 2 above it), and then having the rooms above it read on another device. 
-This would result in 1 red room and 1 other kind of room above the sticky room as it will try to maintain 
-2 rooms above the sticky room.
+Though only applicable to the importance algorithm, the sticky room is not aware of category boundaries 
+and thus the user can see a shift in what kinds of rooms move around their selection. An example would 
+be the user having 4 red rooms, the user selecting the third room (leaving 2 above it), and then having 
+the rooms above it read on another device. This would result in 1 red room and 1 other kind of room 
+above the sticky room as it will try to maintain 2 rooms above the sticky room.
 
 An exception for the sticky room placement is when there's suddenly not enough rooms to maintain the placement
 exactly. This typically happens if the user selects a room and leaves enough rooms where it cannot maintain
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index af9970d3cc..7f7d2da0f6 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -29,6 +29,7 @@ import defaultDispatcher from "../../dispatcher/dispatcher";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { IFilterCondition } from "./filters/IFilterCondition";
 import { TagWatcher } from "./TagWatcher";
+import RoomViewStore from "../RoomViewStore";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -62,6 +63,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
 
         this.checkEnabled();
         for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
+        RoomViewStore.addListener(this.onRVSUpdate);
     }
 
     public get orderedLists(): ITagMap {
@@ -93,6 +95,23 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
         this.setAlgorithmClass();
     }
 
+    private onRVSUpdate = () => {
+        if (!this.enabled) return; // TODO: Remove enabled flag when RoomListStore2 takes over
+        if (!this.matrixClient) return; // We assume there won't be RVS updates without a client
+
+        const activeRoomId = RoomViewStore.getRoomId();
+        if (!activeRoomId && this.algorithm.stickyRoom) {
+            this.algorithm.stickyRoom = null;
+        } else if (activeRoomId) {
+            const activeRoom = this.matrixClient.getRoom(activeRoomId);
+            if (!activeRoom) throw new Error(`${activeRoomId} is current in RVS but missing from client`);
+            if (activeRoom !== this.algorithm.stickyRoom) {
+                console.log(`Changing sticky room to ${activeRoomId}`);
+                this.algorithm.stickyRoom = activeRoom;
+            }
+        }
+    };
+
     protected async onDispatch(payload: ActionPayload) {
         if (payload.action === 'MatrixActions.sync') {
             // Filter out anything that isn't the first PREPARED sync.
@@ -110,6 +129,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
             console.log("Regenerating room lists: Startup");
             await this.readAndCacheSettingsFromStore();
             await this.regenerateAllLists();
+            this.onRVSUpdate(); // fake an RVS update to adjust sticky room, if needed
         }
 
         // TODO: Remove this once the RoomListStore becomes default
diff --git a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
index 3921bb6221..e8058a2964 100644
--- a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
@@ -22,6 +22,7 @@ import { ITagMap, ITagSortingMap } from "../models";
 import DMRoomMap from "../../../../utils/DMRoomMap";
 import { FILTER_CHANGED, IFilterCondition } from "../../filters/IFilterCondition";
 import { EventEmitter } from "events";
+import { UPDATE_EVENT } from "../../../AsyncStore";
 
 // TODO: Add locking support to avoid concurrent writes?
 
@@ -30,6 +31,12 @@ import { EventEmitter } from "events";
  */
 export const LIST_UPDATED_EVENT = "list_updated_event";
 
+interface IStickyRoom {
+    room: Room;
+    position: number;
+    tag: TagID;
+}
+
 /**
  * Represents a list ordering algorithm. This class will take care of tag
  * management (which rooms go in which tags) and ask the implementation to
@@ -37,7 +44,9 @@ export const LIST_UPDATED_EVENT = "list_updated_event";
  */
 export abstract class Algorithm extends EventEmitter {
     private _cachedRooms: ITagMap = {};
+    private _cachedStickyRooms: ITagMap = {}; // a clone of the _cachedRooms, with the sticky room
     private filteredRooms: ITagMap = {};
+    private _stickyRoom: IStickyRoom = null;
 
     protected sortAlgorithms: ITagSortingMap;
     protected rooms: Room[] = [];
@@ -51,6 +60,73 @@ export abstract class Algorithm extends EventEmitter {
         super();
     }
 
+    public get stickyRoom(): Room {
+        return this._stickyRoom ? this._stickyRoom.room : null;
+    }
+
+    public set stickyRoom(val: Room) {
+        // We wrap this in a closure because we can't use async setters.
+        // We need async so we can wait for handleRoomUpdate() to do its thing, otherwise
+        // we risk duplicating rooms.
+        (async () => {
+            // It's possible to have no selected room. In that case, clear the sticky room
+            if (!val) {
+                if (this._stickyRoom) {
+                    // Lie to the algorithm and re-add the room to the algorithm
+                    await this.handleRoomUpdate(this._stickyRoom.room, RoomUpdateCause.NewRoom);
+                }
+                this._stickyRoom = null;
+                return;
+            }
+
+            // When we do have a room though, we expect to be able to find it
+            const tag = this.roomIdsToTags[val.roomId][0];
+            if (!tag) throw new Error(`${val.roomId} does not belong to a tag and cannot be sticky`);
+            let position = this.cachedRooms[tag].indexOf(val);
+            if (position < 0) throw new Error(`${val.roomId} does not appear to be known and cannot be sticky`);
+
+            // 🐉 Here be dragons.
+            // Before we can go through with lying to the underlying algorithm about a room
+            // we need to ensure that when we do we're ready for the innevitable sticky room
+            // update we'll receive. To prepare for that, we first remove the sticky room and
+            // recalculate the state ourselves so that when the underlying algorithm calls for
+            // the same thing it no-ops. After we're done calling the algorithm, we'll issue
+            // a new update for ourselves.
+            const lastStickyRoom = this._stickyRoom;
+            console.log(`Last sticky room:`, lastStickyRoom);
+            this._stickyRoom = null;
+            this.recalculateStickyRoom();
+
+            // When we do have the room, re-add the old room (if needed) to the algorithm
+            // and remove the sticky room from the algorithm. This is so the underlying
+            // algorithm doesn't try and confuse itself with the sticky room concept.
+            if (lastStickyRoom) {
+                // Lie to the algorithm and re-add the room to the algorithm
+                await this.handleRoomUpdate(lastStickyRoom.room, RoomUpdateCause.NewRoom);
+            }
+            // Lie to the algorithm and remove the room from it's field of view
+            await this.handleRoomUpdate(val, RoomUpdateCause.RoomRemoved);
+
+            // Now that we're done lying to the algorithm, we need to update our position
+            // marker only if the user is moving further down the same list. If they're switching
+            // lists, or moving upwards, the position marker will splice in just fine but if
+            // they went downwards in the same list we'll be off by 1 due to the shifting rooms.
+            if (lastStickyRoom && lastStickyRoom.tag === tag && lastStickyRoom.position <= position) {
+                position++;
+            }
+
+            this._stickyRoom = {
+                room: val,
+                position: position,
+                tag: tag,
+            };
+            this.recalculateStickyRoom();
+
+            // Finally, trigger an update
+            this.emit(LIST_UPDATED_EVENT);
+        })();
+    }
+
     protected get hasFilters(): boolean {
         return this.allowedByFilter.size > 0;
     }
@@ -58,9 +134,14 @@ export abstract class Algorithm extends EventEmitter {
     protected set cachedRooms(val: ITagMap) {
         this._cachedRooms = val;
         this.recalculateFilteredRooms();
+        this.recalculateStickyRoom();
     }
 
     protected get cachedRooms(): ITagMap {
+        // 🐉 Here be dragons.
+        // Note: this is used by the underlying algorithm classes, so don't make it return
+        // the sticky room cache. If it ends up returning the sticky room cache, we end up
+        // corrupting our caches and confusing them.
         return this._cachedRooms;
     }
 
@@ -154,6 +235,59 @@ export abstract class Algorithm extends EventEmitter {
         console.log(`[DEBUG] ${filteredRooms.length}/${rooms.length} rooms filtered into ${tagId}`);
     }
 
+    /**
+     * Recalculate the sticky room position. If this is being called in relation to
+     * a specific tag being updated, it should be given to this function to optimize
+     * the call.
+     * @param updatedTag The tag that was updated, if possible.
+     */
+    protected recalculateStickyRoom(updatedTag: TagID = null): void {
+        // 🐉 Here be dragons.
+        // This function does far too much for what it should, and is called by many places.
+        // Not only is this responsible for ensuring the sticky room is held in place at all
+        // times, it is also responsible for ensuring our clone of the cachedRooms is up to
+        // date. If either of these desyncs, we see weird behaviour like duplicated rooms,
+        // outdated lists, and other nonsensical issues that aren't necessarily obvious.
+
+        if (!this._stickyRoom) {
+            // If there's no sticky room, just do nothing useful.
+            if (!!this._cachedStickyRooms) {
+                // Clear the cache if we won't be needing it
+                this._cachedStickyRooms = null;
+                this.emit(LIST_UPDATED_EVENT);
+            }
+            return;
+        }
+
+        if (!this._cachedStickyRooms || !updatedTag) {
+            console.log(`Generating clone of cached rooms for sticky room handling`);
+            const stickiedTagMap: ITagMap = {};
+            for (const tagId of Object.keys(this.cachedRooms)) {
+                stickiedTagMap[tagId] = this.cachedRooms[tagId].map(r => r); // shallow clone
+            }
+            this._cachedStickyRooms = stickiedTagMap;
+        }
+
+        if (updatedTag) {
+            // Update the tag indicated by the caller, if possible. This is mostly to ensure
+            // our cache is up to date.
+            console.log(`Replacing cached sticky rooms for ${updatedTag}`);
+            this._cachedStickyRooms[updatedTag] = this.cachedRooms[updatedTag].map(r => r); // shallow clone
+        }
+
+        // Now try to insert the sticky room, if we need to.
+        // We need to if there's no updated tag (we regenned the whole cache) or if the tag
+        // we might have updated from the cache is also our sticky room.
+        const sticky = this._stickyRoom;
+        if (!updatedTag || updatedTag === sticky.tag) {
+            console.log(`Inserting sticky room ${sticky.room.roomId} at position ${sticky.position} in ${sticky.tag}`);
+            this._cachedStickyRooms[sticky.tag].splice(sticky.position, 0, sticky.room);
+        }
+
+        // Finally, trigger an update
+        this.emit(LIST_UPDATED_EVENT);
+    }
+
     /**
      * Asks the Algorithm to regenerate all lists, using the tags given
      * as reference for which lists to generate and which way to generate
@@ -174,7 +308,7 @@ export abstract class Algorithm extends EventEmitter {
      */
     public getOrderedRooms(): ITagMap {
         if (!this.hasFilters) {
-            return this.cachedRooms;
+            return this._cachedStickyRooms || this.cachedRooms;
         }
         return this.filteredRooms;
     }
diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
index 6c4498dad3..ae288a4847 100644
--- a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -17,7 +17,7 @@ limitations under the License.
 
 import { Algorithm } from "./Algorithm";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { DefaultTagID, RoomUpdateCause, TagID } from "../../models";
+import { RoomUpdateCause, TagID } from "../../models";
 import { ITagMap, SortAlgorithm } from "../models";
 import { sortRoomsWithAlgorithm } from "../tag-sorting";
 import * as Unread from '../../../../Unread';
@@ -82,15 +82,14 @@ export class ImportanceAlgorithm extends Algorithm {
     // HOW THIS WORKS
     // --------------
     //
-    // This block of comments assumes you've read the README one level higher.
+    // This block of comments assumes you've read the README two levels higher.
     // You should do that if you haven't already.
     //
     // Tags are fed into the algorithmic functions from the Algorithm superclass,
     // which cause subsequent updates to the room list itself. Categories within
     // those tags are tracked as index numbers within the array (zero = top), with
     // each sticky room being tracked separately. Internally, the category index
-    // can be found from `this.indices[tag][category]` and the sticky room information
-    // from `this.stickyRoom`.
+    // can be found from `this.indices[tag][category]`.
     //
     // The room list store is always provided with the `this.cachedRooms` results, which are
     // updated as needed and not recalculated often. For example, when a room needs to
@@ -102,17 +101,6 @@ export class ImportanceAlgorithm extends Algorithm {
         [tag: TagID]: ICategoryIndex;
     } = {};
 
-    // TODO: Use this (see docs above)
-    private stickyRoom: {
-        roomId: string;
-        tag: TagID;
-        fromTop: number;
-    } = {
-        roomId: null,
-        tag: null,
-        fromTop: 0,
-    };
-
     constructor() {
         super();
         console.log("Constructed an ImportanceAlgorithm");
@@ -195,6 +183,12 @@ export class ImportanceAlgorithm extends Algorithm {
             return;
         }
 
+        if (cause === RoomUpdateCause.RoomRemoved) {
+            // TODO: Be smarter and splice rather than regen the planet.
+            await this.setKnownRooms(this.rooms.filter(r => r !== room));
+            return;
+        }
+
         let tags = this.roomIdsToTags[room.roomId];
         if (!tags) {
             console.warn(`No tags known for "${room.name}" (${room.roomId})`);
@@ -251,6 +245,8 @@ export class ImportanceAlgorithm extends Algorithm {
             taggedRooms.splice(startIdx, 0, ...sorted);
 
             // Finally, flag that we've done something
+            this.recalculateFilteredRoomsForTag(tag); // update filter to re-sort the list
+            this.recalculateStickyRoom(tag); // update sticky room to make sure it appears if needed
             changed = true;
         }
         return changed;
diff --git a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
index e129e98e6f..d544b1196f 100644
--- a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
@@ -46,11 +46,17 @@ export class NaturalAlgorithm extends Algorithm {
             console.warn(`No tags known for "${room.name}" (${room.roomId})`);
             return false;
         }
+        let changed = false;
         for (const tag of tags) {
             // TODO: Optimize this loop to avoid useless operations
             // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
             this.cachedRooms[tag] = await sortRoomsWithAlgorithm(this.cachedRooms[tag], tag, this.sortAlgorithms[tag]);
+
+            // Flag that we've done something
+            this.recalculateFilteredRoomsForTag(tag); // update filter to re-sort the list
+            this.recalculateStickyRoom(tag); // update sticky room to make sure it appears if needed
+            changed = true;
         }
-        return true; // assume we changed something
+        return changed;
     }
 }
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index 9a27569db4..188e23f7d7 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -40,4 +40,5 @@ export enum RoomUpdateCause {
     Timeline = "TIMELINE",
     RoomRead = "ROOM_READ", // TODO: Use this.
     NewRoom = "NEW_ROOM",
+    RoomRemoved = "ROOM_REMOVED",
 }

From 0bb1eefdea6cf566f0a3ed4972c420700d938f65 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 19:47:15 -0600
Subject: [PATCH 053/181] Remove view_room listener as it isn't needed

We use the RoomViewStore
---
 src/stores/room-list/RoomListStore2.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 7f7d2da0f6..882da2b62d 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -226,9 +226,6 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
             // const roomPayload = (<any>payload); // TODO: Type out the dispatcher types
             // console.log(`[RoomListDebug] Handling new room ${roomPayload.room.roomId}`);
             // await this.algorithm.handleRoomUpdate(roomPayload.room, RoomUpdateCause.NewRoom);
-        } else if (payload.action === 'view_room') {
-            // TODO: Update sticky room
-            console.log(payload);
         }
     }
 

From 9b928b5a5dac48d2c13ed4d09bebea0c96e6aa80 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Jun 2020 20:12:32 -0600
Subject: [PATCH 054/181] Handle remaining cases for room updates in new room
 list

For https://github.com/vector-im/riot-web/issues/13635

This adds support for:
* Tag changes
* DM changes
* Marking our own rooms as read
* Our own membership changes

The remaining branch we didn't need was the alternate 'new room' branch, so it was removed.

This is not optimized - optimization is deferred.
---
 src/stores/room-list/RoomListStore2.ts        | 52 +++++++++++++------
 .../list-ordering/ImportanceAlgorithm.ts      |  7 +++
 src/stores/room-list/models.ts                |  3 +-
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index af9970d3cc..e71a8185bf 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -145,13 +145,19 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
             // First see if the receipt event is for our own user. If it was, trigger
             // a room update (we probably read the room on a different device).
             if (readReceiptChangeIsFor(payload.event, this.matrixClient)) {
-                // TODO: Update room now that it's been read
-                console.log(payload);
+                console.log(`[RoomListDebug] Got own read receipt in ${payload.event.roomId}`);
+                const room = this.matrixClient.getRoom(payload.event.roomId);
+                if (!room) {
+                    console.warn(`Own read receipt was in unknown room ${payload.event.roomId}`);
+                    return;
+                }
+                await this.handleRoomUpdate(room, RoomUpdateCause.ReadReceipt);
                 return;
             }
         } else if (payload.action === 'MatrixActions.Room.tags') {
-            // TODO: Update room from tags
-            console.log(payload);
+            const roomPayload = (<any>payload); // TODO: Type out the dispatcher types
+            console.log(`[RoomListDebug] Got tag change in ${roomPayload.room.roomId}`);
+            await this.handleRoomUpdate(roomPayload.room, RoomUpdateCause.PossibleTagChange);
         } else if (payload.action === 'MatrixActions.Room.timeline') {
             const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
 
@@ -189,23 +195,39 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
             // cause inaccuracies with the list ordering. We may have to decrypt the last N messages of every room :(
             await this.handleRoomUpdate(room, RoomUpdateCause.Timeline);
         } else if (payload.action === 'MatrixActions.accountData' && payload.event_type === 'm.direct') {
-            // TODO: Update DMs
-            console.log(payload);
+            const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
+            console.log(`[RoomListDebug] Received updated DM map`);
+            const dmMap = eventPayload.event.getContent();
+            for (const userId of Object.keys(dmMap)) {
+                const roomIds = dmMap[userId];
+                for (const roomId of roomIds) {
+                    const room = this.matrixClient.getRoom(roomId);
+                    if (!room) {
+                        console.warn(`${roomId} was found in DMs but the room is not in the store`);
+                        continue;
+                    }
+
+                    // We expect this RoomUpdateCause to no-op if there's no change, and we don't expect
+                    // the user to have hundreds of rooms to update in one event. As such, we just hammer
+                    // away at updates until the problem is solved. If we were expecting more than a couple
+                    // of rooms to be updated at once, we would consider batching the rooms up.
+                    await this.handleRoomUpdate(room, RoomUpdateCause.PossibleTagChange);
+                }
+            }
         } else if (payload.action === 'MatrixActions.Room.myMembership') {
-            // TODO: Improve new room check
             const membershipPayload = (<any>payload); // TODO: Type out the dispatcher types
-            if (!membershipPayload.oldMembership && membershipPayload.membership === "join") {
+            if (membershipPayload.oldMembership !== "join" && membershipPayload.membership === "join") {
                 console.log(`[RoomListDebug] Handling new room ${membershipPayload.room.roomId}`);
                 await this.algorithm.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
+                return;
             }
 
-            // TODO: Update room from membership change
-            console.log(payload);
-        } else if (payload.action === 'MatrixActions.Room') {
-            // TODO: Improve new room check
-            // const roomPayload = (<any>payload); // TODO: Type out the dispatcher types
-            // console.log(`[RoomListDebug] Handling new room ${roomPayload.room.roomId}`);
-            // await this.algorithm.handleRoomUpdate(roomPayload.room, RoomUpdateCause.NewRoom);
+            // If it's not a join, it's transitioning into a different list (possibly historical)
+            if (membershipPayload.oldMembership !== membershipPayload.membership) {
+                console.log(`[RoomListDebug] Handling membership change in ${membershipPayload.room.roomId}`);
+                await this.algorithm.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.PossibleTagChange);
+                return;
+            }
         } else if (payload.action === 'view_room') {
             // TODO: Update sticky room
             console.log(payload);
diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
index 6c4498dad3..fe13e1972b 100644
--- a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -189,6 +189,13 @@ export class ImportanceAlgorithm extends Algorithm {
     }
 
     public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+        if (cause === RoomUpdateCause.PossibleTagChange) {
+            // TODO: Be smarter and splice rather than regen the planet.
+            // TODO: No-op if no change.
+            await this.setKnownRooms(this.rooms);
+            return;
+        }
+
         if (cause === RoomUpdateCause.NewRoom) {
             // TODO: Be smarter and insert rather than regen the planet.
             await this.setKnownRooms([room, ...this.rooms]);
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index 9a27569db4..43320809d9 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -38,6 +38,7 @@ export type TagID = string | DefaultTagID;
 
 export enum RoomUpdateCause {
     Timeline = "TIMELINE",
-    RoomRead = "ROOM_READ", // TODO: Use this.
+    PossibleTagChange = "POSSIBLE_TAG_CHANGE",
+    ReadReceipt = "READ_RECEIPT",
     NewRoom = "NEW_ROOM",
 }

From e8c614d01e117a0721264452d4144fd87eb50767 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 6 Jun 2020 02:39:02 +0000
Subject: [PATCH 055/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2259 of 2259 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e4f9faa56b..6e808dd951 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2482,5 +2482,6 @@
     "A new version of Riot is available!": "已有新版的 Riot！",
     "New version available. <a>Update now.</a>": "有可用的新版本。<a>立刻更新。</a>",
     "Emoji picker": "顏文字挑選器",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。"
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。",
+    "Show %(n)s more": "顯示另外 %(n)s 個"
 }

From d960d5772198ed73328741ef130bebfd0ab5a0bb Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 6 Jun 2020 15:44:39 +0000
Subject: [PATCH 056/181] Translated using Weblate (Esperanto)

Currently translated at 99.9% (2258 of 2259 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 74cf3629bb..fa4fe703b6 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2456,5 +2456,6 @@
     "Upgrade your Riot": "Gradaltigi vian Rioton",
     "A new version of Riot is available!": "Nova versio de Riot estas disponebla!",
     "New version available. <a>Update now.</a>": "Nova versio estas disponebla. <a>Ĝisdatigu nun.</a>",
-    "Emoji picker": "Elektilo de bildsignoj"
+    "Emoji picker": "Elektilo de bildsignoj",
+    "Show %(n)s more": "Montri %(n)s pliajn"
 }

From 1af375ab0ef9fff44aabc816175f8646751a8405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 6 Jun 2020 08:10:54 +0000
Subject: [PATCH 057/181] Translated using Weblate (French)

Currently translated at 100.0% (2259 of 2259 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 45345e5c7d..5d19cb31e8 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2483,5 +2483,6 @@
     "A new version of Riot is available!": "Une nouvelle version de Riot est disponible !",
     "New version available. <a>Update now.</a>": "Nouvelle version disponible. <a>Faire la mise à niveau maintenant.</a>",
     "Emoji picker": "Sélecteur d’émojis",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les messages directs."
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les messages directs.",
+    "Show %(n)s more": "En montrer %(n)s de plus"
 }

From 36597e23edd02902aa77f43c0389b04bcf900c53 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Sat, 6 Jun 2020 04:43:48 +0000
Subject: [PATCH 058/181] Translated using Weblate (Galician)

Currently translated at 67.3% (1521 of 2259 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index ba67879d14..f479b4f038 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1278,5 +1278,318 @@
     "Show rooms with unread notifications first": "Mostrar primeiro as salas que teñen notificacións sen ler",
     "Show shortcuts to recently viewed rooms above the room list": "Mostrar atallos a salas vistas recentemente enriba da lista de salas",
     "Show hidden events in timeline": "Mostrar na cronoloxía eventos ocultos",
-    "Low bandwidth mode": "Modo de ancho de banda reducido"
+    "Low bandwidth mode": "Modo de ancho de banda reducido",
+    "Straight rows of keys are easy to guess": "Palabras de letras contiguas son doadas de adiviñar",
+    "Short keyboard patterns are easy to guess": "Patróns curtos de teclas son doados de adiviñar",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permitir o servidor de apoio para chamadas turn.matrix.org cando o servidor propio non ofreza un (o teu IP compartirase durante a chamada)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar resgardos de lectura para as mensaxes (require servidor compatible para desactivar)",
+    "Show previews/thumbnails for images": "Mostrar miniaturas/vista previa das imaxes",
+    "Enable message search in encrypted rooms": "Activar a busca de mensaxes en salas cifradas",
+    "Keep recovery passphrase in memory for this session": "Manter a frase de paso de recuperación en memoria para esta sesión",
+    "How fast should messages be downloaded.": "Velocidade á que deberían descargarse as mensaxes.",
+    "Manually verify all remote sessions": "Verificar manualmente todas as sesións remotas",
+    "IRC display name width": "Ancho do nome mostrado de IRC",
+    "Messages containing my username": "Mensaxes que conteñen o meu nome de usuaria",
+    "Messages containing @room": "Mensaxes que conteñen @room",
+    "Encrypted messages in one-to-one chats": "Mensaxes cifradas en conversas 1:1",
+    "Encrypted messages in group chats": "Mensaxes cifradas en convesas en grupo",
+    "When rooms are upgraded": "Cando se actualizan as salas",
+    "My Ban List": "Listaxe de bloqueo",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Esta é a listaxe de usuarias/servidores que ti bloqueaches - non deixes a sala!",
+    "The other party cancelled the verification.": "A outra parte cancelou a verificación.",
+    "Verified!": "Verificada!",
+    "You've successfully verified this user.": "Verificaches esta usuaria.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "As mensaxes seguras con esta usuaria están cifradas extremo-a-extremo e non son lexibles por terceiras.",
+    "Got It": "Vale",
+    "Verify this session by completing one of the following:": "Verifica esta sesión completando un dos seguintes:",
+    "Scan this unique code": "Escanea este código único",
+    "or": "ou",
+    "Compare unique emoji": "Compara os emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Compara o conxunto único de emoticonas se non tes cámara no outro dispositivo",
+    "Start": "Comezar",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirma que as emoticonas se mostran nas dúas sesións, na mesma orde:",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifica a usuaria confirmando que as emoticonas aparecen na súa pantalla.",
+    "Verify this session by confirming the following number appears on its screen.": "Verifica esta sesión confirmando que o seguinte número aparece na súa pantalla.",
+    "Verify this user by confirming the following number appears on their screen.": "Verifica esta usuaria confirmando que o seguinte número aparece na súa pantalla.",
+    "Unable to find a supported verification method.": "Non se atopa un método de verificación válido.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Agardando pola outra sesión, %(deviceName)s %(deviceId)s, para verificar…",
+    "Waiting for your other session to verify…": "Agardando pola túa outra sesión para verificar…",
+    "Waiting for %(displayName)s to verify…": "Agardando por %(displayName)s para verificar…",
+    "Cancelling…": "Cancelando…",
+    "They match": "Concordan",
+    "They don't match": "Non concordan",
+    "To be secure, do this in person or use a trusted way to communicate.": "Para estar seguro, fai esto en persoa ou utiliza un xeito seguro para comunicarte.",
+    "Dog": "Can",
+    "Cat": "Gato",
+    "Lion": "León",
+    "Horse": "Cabalo",
+    "Unicorn": "Unicorno",
+    "Pig": "Porco",
+    "Elephant": "Elefante",
+    "Rabbit": "Coello",
+    "Panda": "Panda",
+    "Rooster": "Galo",
+    "Penguin": "Pingüino",
+    "Turtle": "Tartaruga",
+    "Fish": "Peixe",
+    "Octopus": "Polbo",
+    "Butterfly": "Bolboreta",
+    "Flower": "Flor",
+    "Tree": "Árbore",
+    "Cactus": "Cactus",
+    "Mushroom": "Cogomelo",
+    "Globe": "Globo",
+    "Moon": "Lúa",
+    "Cloud": "Nube",
+    "Fire": "Lume",
+    "Banana": "Plátano",
+    "Apple": "Mazá",
+    "Strawberry": "Amorodo",
+    "Corn": "Millo",
+    "Pizza": "Pizza",
+    "Cake": "Biscoito",
+    "Heart": "Corazón",
+    "Smiley": "Sorriso",
+    "Robot": "Robot",
+    "Hat": "Sombreiro",
+    "Glasses": "Gafas",
+    "Spanner": "Ferramenta",
+    "Santa": "Nöel",
+    "Thumbs up": "Oká",
+    "Umbrella": "Paraugas",
+    "Hourglass": "Reloxo area",
+    "Clock": "Reloxo",
+    "Gift": "Agasallo",
+    "Light bulb": "Lámpada",
+    "Book": "Libro",
+    "Pencil": "Lápis",
+    "Paperclip": "Prendedor",
+    "Scissors": "Tesoiras",
+    "Lock": "Cadeado",
+    "Key": "Chave",
+    "Hammer": "Martelo",
+    "Telephone": "Teléfono",
+    "Flag": "Bandeira",
+    "Train": "Tren",
+    "Bicycle": "Bicicleta",
+    "Aeroplane": "Aeroplano",
+    "Rocket": "Foguete",
+    "Trophy": "Trofeo",
+    "Ball": "Bola",
+    "Guitar": "Guitarra",
+    "Trumpet": "Trompeta",
+    "Bell": "Campá",
+    "Anchor": "Áncora",
+    "Headphones": "Auriculares",
+    "Folder": "Cartafol",
+    "Pin": "Pin",
+    "From %(deviceName)s (%(deviceId)s)": "Desde %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Rexeitar (%(counter)s)",
+    "Accept <policyLink /> to continue:": "Acepta <policyLink /> para continuar:",
+    "Upload": "Subir",
+    "This bridge was provisioned by <user />.": "Esta ponte está proporcionada por <user />.",
+    "This bridge is managed by <user />.": "Esta ponte está xestionada por <user />.",
+    "Workspace: %(networkName)s": "Espazo de traballo: %(networkName)s",
+    "Channel: %(channelName)s": "Canal: %(channelName)s",
+    "Show less": "Mostrar menos",
+    "Show more": "Mostrar máis",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ao cambiar o contrasinal vas restablecer todas as chaves de cifrado extremo-a-extremo en tódalas sesións, facendo que o historial de conversa cifrado non sexa lexible, a menos que primeiro exportes todas as chaves das salas e as importes posteriormente. No futuro melloraremos o procedemento.",
+    "Your homeserver does not support cross-signing.": "O teu servidor non soporta a sinatura cruzada.",
+    "Cross-signing and secret storage are enabled.": "A sinatura cruzada e o almacenaxe segredo está activados.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "A túa conta ten unha identidade de sinatura cruzada no almacenaxe segredo, pero aínda non confiaches nela nesta sesión.",
+    "Cross-signing and secret storage are not yet set up.": "A sinatura cruzada e almacenaxe segredo aínda non se configuraron.",
+    "Reset cross-signing and secret storage": "Restablecer sinatura cruzada e almacenaxe segredo",
+    "Bootstrap cross-signing and secret storage": "Configurar sinatura cruzada e almacenaxe segredo",
+    "well formed": "ben formado",
+    "unexpected type": "tipo non agardado",
+    "Cross-signing public keys:": "Chaves públicas da sinatura cruzada:",
+    "in memory": "en memoria",
+    "not found": "non atopado",
+    "Cross-signing private keys:": "Chaves privadas da sinatura cruzada:",
+    "in secret storage": "no almacenaxe segredo",
+    "Self signing private key:": "Auto asinado da chave privada:",
+    "cached locally": "na caché local",
+    "not found locally": "non se atopa localmente",
+    "User signing private key:": "Chave privada de sinatura da usuaria:",
+    "Session backup key:": "Chave de apoio da sesión:",
+    "Secret storage public key:": "Chave pública da almacenaxe segreda:",
+    "in account data": "nos datos da conta",
+    "Homeserver feature support:": "Soporte de funcións do servidor:",
+    "exists": "existe",
+    "Your homeserver does not support session management.": "O teu servidor non soporta a xestión da sesión.",
+    "Unable to load session list": "Non se puido cargar a lista de sesións",
+    "Confirm deleting these sessions": "Confirma o borrado destas sesións",
+    "Click the button below to confirm deleting these sessions.|other": "Preme no botón inferior para confirmar o borrado das sesións.",
+    "Click the button below to confirm deleting these sessions.|one": "Preme no botón inferior para confirmar o borrado da sesión.",
+    "Delete sessions|other": "Borrar sesións",
+    "Delete sessions|one": "Borrar sesión",
+    "Delete %(count)s sessions|other": "Borrar %(count)s sesións",
+    "Delete %(count)s sessions|one": "Borrar %(count)s sesión",
+    "ID": "ID",
+    "Public Name": "Nome público",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verificar individualmente cada sesión utilizada pola usuaria para marcala como confiable, non confiando en dispositivos con sinatura cruzada.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Gardar de xeito seguro na caché mensaxes cifradas para que aparezan nos resultados de busca, usando ",
+    " to store messages from ": " para gardar mensaxes de ",
+    "rooms.": "salas.",
+    "Manage": "Xestionar",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Gardar de xeito seguro mensaxes cifradas na caché local para que aparezan nos resultados de buscas.",
+    "Enable": "Activar",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Falta un compoñente de Riot requerido para almacenar localmente mensaxes cifradas na caché. Se queres experimentar con esta función, compila unha versión personalizada de Riot Desktop <nativeLink>cos compoñentes de busca engadidos</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot non pode gardar de xeito seguro localmente as mensaxes cifradas se se executa nun navegador. Usa <riotLink>Riot Desktop</riotLink> para que as mensaxes cifradas aparezan nas buscas.",
+    "Connecting to integration manager...": "Conectando co xestor de integración...",
+    "Cannot connect to integration manager": "Non se puido conectar co xestor de intregración",
+    "The integration manager is offline or it cannot reach your homeserver.": "O xestor de integración non está en liña ou non é accesible desde o teu servidor.",
+    "Delete Backup": "Borrar copia de apoio",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Estás seguro? Perderás as mensaxes cifradas se non tes unha copia de apoio das chaves de cifrado.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensaxes cifradas están seguras con cifrado de extremo-a-extremo. Só ti e o correpondente(s) tedes as chaves para ler as mensaxes.",
+    "Unable to load key backup status": "Non se puido cargar o estado das chaves de apoio",
+    "Restore from Backup": "Restaurar desde copia de apoio",
+    "This session is backing up your keys. ": "Esta sesión está gardando as túas chaves. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Esta sesión <b>non está facendo copia das chaves</b>, pero tes unha copia de apoio existente que podes restablecer e engadir para seguir adiante.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Conecta esta sesión ao gardado das chaves antes de desconectarte para evitar perder calquera chave que só puidese estar nesta sesión.",
+    "Connect this session to Key Backup": "Conecta esta sesión a Copia de Apoio de chaves",
+    "not stored": "non gardado",
+    "Backing up %(sessionsRemaining)s keys...": "Copiando %(sessionsRemaining)s chaves...",
+    "All keys backed up": "Copiaronse todas as chaves",
+    "Backup has a <validity>valid</validity> signature from this user": "A copia ten unha sinatura <validity>válida</validity> desta usuaria",
+    "Backup has a <validity>invalid</validity> signature from this user": "A copia ten una sinatura <validity>non válida</validity> desta usuaria",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "A copia ten unha sinatura dunha usuaria <verify>descoñecida</verify> con ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "A copia ten unha sinatura dunha sesión <verify>descoñecida</verify> con ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "A copia ten unha sinatura <validity>válida</validity> desde esta sesión",
+    "Backup has an <validity>invalid</validity> signature from this session": "A copia ten unha sinatura <validity>non válida</validity> desde esta sesión",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "A copia ten unha sinatura <validity>válida</validity> desde a sesión <verify>verificada</verify> en <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "A copia ten unha sinatura <validity>válida</validity> desde a sesión <verify>non verificada</verify> en <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "A copia ten unha sinatura <validity>non válida</validity> desde a sesión <verify>verificada</verify> en <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "A copia ten unha sinatura <validity>non válida</validity> desde a sesión <verify>non verificada</verify> en <device></device>",
+    "Backup is not signed by any of your sessions": "A copia non está asinada por ningunha das túas sesións",
+    "This backup is trusted because it has been restored on this session": "Esta copia é de confianza porque foi restaurada nesta sesión",
+    "Backup version: ": "Versión da copia: ",
+    "Algorithm: ": "Algoritmo: ",
+    "Backup key stored: ": "Chave de apoio gardada: ",
+    "Your keys are <b>not being backed up from this session</b>.": "As túas chaves <b>non están a ser copiadas desde esta sesión</b>.",
+    "Back up your keys before signing out to avoid losing them.": "Fai unha copia de apoio das chaves antes de desconectarte para evitar perdelas.",
+    "Start using Key Backup": "Fai unha Copia de apoio das chaves",
+    "Clear notifications": "Eliminar notificacións",
+    "Add an email address to configure email notifications": "Engade un enderezo de email para configurar as notificacións por email",
+    "Enable desktop notifications for this session": "Activa as notificacións de escritorio para esta sesión",
+    "Enable audible notifications for this session": "Activa as notificacións por son para esta sesión",
+    "<a>Upgrade</a> to your own domain": "<a>Mellora</a> e usa un dominio propio",
+    "Display Name": "Nome mostrado",
+    "Profile picture": "Imaxe de perfil",
+    "Identity Server URL must be HTTPS": "O URL do servidor de identidade debe comezar HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "Servidor de Identidade non válido (código de estado %(code)s)",
+    "Could not connect to Identity Server": "Non hai conexión co Servidor de Identidade",
+    "Checking server": "Comprobando servidor",
+    "Change identity server": "Cambiar de servidor de identidade",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Desconectar do servidor de identidade <current /> e conectar con <new />?",
+    "Terms of service not accepted or the identity server is invalid.": "Non se aceptaron os Termos do servizo ou o servidor de identidade non é válido.",
+    "The identity server you have chosen does not have any terms of service.": "O servidor de identidade escollido non ten establecidos termos do servizo.",
+    "Disconnect identity server": "Desconectar servidor de identidade",
+    "Disconnect from the identity server <idserver />?": "Desconectar do servidor de identidade <idserver />?",
+    "Disconnect": "Desconectar",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Deberías <b>eliminar os datos personais</b> do servidor de identidade <idserver /> antes de desconectar. Desgraciadamente, o servidor <idserver /> non está en liña e no se pode acceder.",
+    "You should:": "Deberías:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "comprobar os engadidos do navegador por algún está bloqueando o servidor de identidade (como Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "contactar coa administración do servidor de identidade <idserver />",
+    "wait and try again later": "agardar e probar máis tarde",
+    "Disconnect anyway": "Desconectar igualmente",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Aínda estás <b>compartindo datos personais</b> no servidor de identidade <idserver />.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Recomendámosche que elimines os teus enderezos de email e números de teléfono do servidor de identidade antes de desconectar del.",
+    "Go back": "Atrás",
+    "Identity Server (%(server)s)": "Servidor de Identidade (%(server)s)",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Neste intre usas <server></server> para atopar e ser atopado polos contactos existentes que coñeces. Aquí abaixo podes cambiar de servidor de identidade.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Se non queres usar <server /> para atopar e ser atopado polos contactos existentes que coñeces, escribe embaixo outro servidor de identidade.",
+    "Identity Server": "Servidor de Identidade",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Non estás a usar un servidor de identidade. Para atopar e ser atopado polos contactos existentes que coñeces, engade un embaixo.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ao desconectar do teu servidor de identidade non te poderán atopar as outras usuarias e non poderás convidar a outras polo seu email ou teléfono.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Usar un servidor de identidade é optativo. Se escolles non usar un, non poderás ser atopado por outras usuarias e non poderás convidar a outras polo seu email ou teléfono.",
+    "Do not use an identity server": "Non usar un servidor de identidade",
+    "Enter a new identity server": "Escribe o novo servidor de identidade",
+    "Change": "Cambiar",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integración <b>(%(serverName)s)</b> para xestionar bots, widgets e paquetes de pegatinas.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integracións para xestionar bots, widgets e paquetes de pegatinas.",
+    "Manage integrations": "Xestionar integracións",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Os xestores de integracións reciben datos de configuración, e poden modificar os widgets, enviar convites das salas, e establecer roles no teu nome.",
+    "New version available. <a>Update now.</a>": "Nova versión dispoñible. <a>Actualiza.</a>",
+    "Size must be a number": "O tamaño ten que ser un número",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "O tamaño da fonte só pode estar entre %(min)s pt e %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Usa entre %(min)s pt e %(max)s pt",
+    "Appearance": "Aparencia",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Cambiouse o contrasinal. Non recibirás notificacións push noutras sesións ata que desconectes e voltes a conectar nelas",
+    "Email addresses": "Enderezos de email",
+    "Phone numbers": "Número de teléfono",
+    "Set a new account password...": "Establecer novo contrasinal da conta...",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Acepta os Termos do Servizo do servidor (%(serverName)s) para permitir que te atopen polo enderezo de email ou número de teléfono.",
+    "Account management": "Xestión da conta",
+    "Deactivating your account is a permanent action - be careful!": "A desactivación da conta será permanente - ten coidado!",
+    "Credits": "Créditos",
+    "Chat with Riot Bot": "Chat co Bot Riot",
+    "Bug reporting": "Informar de fallos",
+    "Clear cache and reload": "Baleirar caché e recargar",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Para informar dun asunto relacionado coa seguridade de Matrix, le a <a>Política de Revelación de Privacidade</a> de Matrix.org.",
+    "FAQ": "PMF",
+    "Keyboard Shortcuts": "Atallos de teclado",
+    "Versions": "Versións",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliza a túa experiencia con características experimentais. <a>Coñecer máis</a>.",
+    "Ignored/Blocked": "Ignorado/Bloqueado",
+    "Error adding ignored user/server": "Fallo ao engadir a ignorado usuaria/servidor",
+    "Something went wrong. Please try again or view your console for hints.": "Algo fallou. Inténtao outra vez o mira na consola para ter algunha pista.",
+    "Error subscribing to list": "Fallo ao subscribirse a lista",
+    "Please verify the room ID or address and try again.": "Comproba o ID da sala ou enderezo e proba outra vez.",
+    "Error removing ignored user/server": "Fallo ao eliminar a usuaria/servidor de ignorados",
+    "Error unsubscribing from list": "Fallo ao retirar a susbscrición a lista",
+    "Please try again or view your console for hints.": "Inténtao outra vez ou mira na consola para ter algunha pista.",
+    "None": "Nada",
+    "Ban list rules - %(roomName)s": "Regras de bloqueo - %(roomName)s",
+    "Server rules": "Regras do servidor",
+    "User rules": "Regras da usuaria",
+    "You have not ignored anyone.": "Non ignoraches a ninguén.",
+    "You are currently ignoring:": "Estás a ignorar a:",
+    "You are not subscribed to any lists": "Non estás subscrita a ningunha lista",
+    "Unsubscribe": "Baixa na subscrición",
+    "View rules": "Ver regras",
+    "You are currently subscribed to:": "Estas subscrito a:",
+    "Ignored users": "Usuarias ignoradas",
+    "⚠ These settings are meant for advanced users.": "⚠ Estos axustes van dirixidos a usuarias avanzadas.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Engade aquí usuarias e servidores que desexas ignorar. Usa asterisco que Riot usará como comodín. Exemplo, <code>@bot*</code> ignorará todas as usuarias de calquera servidor que teñan 'bot' no nome.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignorar a persoas faise a través de listaxes de bloqueo que conteñen regras. Subscribíndote a unha listaxe de bloqueo fará que esas usuarias/servidores sexan inaccesibles para ti.",
+    "Personal ban list": "Lista personal de bloqueo",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "A túa listaxe personal de bloqueo acolle as usuarias/servidores que personalmente non desexas ver. Tras ignorar a túa primeira usuaria/servidor, unha nova sala chamada 'Listaxe de bloqueos' aparecerá na listaxe de salas - non saias desta sala para que o bloqueo siga surtindo efecto.",
+    "Server or user ID to ignore": "ID de usuaria ou servidor a ignorar",
+    "eg: @bot:* or example.org": "ex: @bot:* ou exemplo.org",
+    "Subscribed lists": "Listaxes subscritas",
+    "If this isn't what you want, please use a different tool to ignore users.": "Se esto non é o que queres, usa unha ferramenta diferente para ignorar usuarias.",
+    "Room ID or address of ban list": "ID da sala ou enderezo da listaxe de bloqueo",
+    "Subscribe": "Subscribir",
+    "Always show the window menu bar": "Mostrar sempre a barra de menú da ventá",
+    "Show tray icon and minimize window to it on close": "Mostrar icona na bandexa do sistema e minizar nela ao pechar",
+    "Preferences": "Preferencias",
+    "Room list": "Listaxe de Salas",
+    "Composer": "Editor",
+    "Timeline": "Cronoloxía",
+    "Autocomplete delay (ms)": "Retraso no autocompletado (ms)",
+    "Read Marker lifetime (ms)": "Duración do marcador de lectura (ms)",
+    "Read Marker off-screen lifetime (ms)": "Duración do marcador de lectura fóra de pantall (ms)",
+    "Session ID:": "ID da sesión:",
+    "Session key:": "Chave da sesión:",
+    "Bulk options": "Opcións agrupadas",
+    "Accept all %(invitedRooms)s invites": "Aceptar os %(invitedRooms)s convites",
+    "Key backup": "Copia da Chave",
+    "Message search": "Buscar mensaxe",
+    "Cross-signing": "Sinatura cruzada",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "A administración do servidor desactivou por omisión o cifrado extremo-a-extremo en salas privadas e Mensaxes Directas.",
+    "A session's public name is visible to people you communicate with": "Un nome público de sesión é visible para a xente coa que te comunicas",
+    "Missing media permissions, click the button below to request.": "Falta permiso acceso multimedia, preme o botón para solicitalo.",
+    "Request media permissions": "Solicitar permiso a multimedia",
+    "Voice & Video": "Voz e Vídeo",
+    "Upgrade this room to the recommended room version": "Actualiza esta sala á versión recomendada",
+    "this room": "esta sala",
+    "View older messages in %(roomName)s.": "Ver mensaxes antigas en %(roomName)s.",
+    "Room information": "Información da sala",
+    "Internal room ID:": "ID interno da sala:",
+    "Room version": "Versión da sala",
+    "Room version:": "Versión da sala:",
+    "Developer options": "Opcións desenvolvemento",
+    "Open Devtools": "Open Devtools",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Esta sala está enviando mensaxes ás seguintes plataformas. <a>Coñece máis.</a>"
 }

From d029696049bca0fc8a490ababc2e4d353f1774ac Mon Sep 17 00:00:00 2001
From: notramo <notramo@protonmail.com>
Date: Sat, 6 Jun 2020 10:02:11 +0000
Subject: [PATCH 059/181] Translated using Weblate (Hungarian)

Currently translated at 99.9% (2256 of 2259 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 81526c2c69..896d9e8b24 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2415,7 +2415,7 @@
     "Waiting for your other session to verify…": "A másik munkameneted ellenőrzésére várunk…",
     "You've successfully verified your device!": "Sikeresen ellenőrizted az eszközödet!",
     "Message deleted": "Üzenet törölve",
-    "Message deleted by %(name)s": "Üzenetet törölte: %(name)s",
+    "Message deleted by %(name)s": "%(name)s törölte az üzenetet",
     "QR Code": "QR kód",
     "To continue, use Single Sign On to prove your identity.": "A folytatáshoz a személyazonosságod megerősítéséhez használd az egyszeri bejelentkezést.",
     "Confirm to continue": "Erősítsd meg a továbblépéshez",

From 43be2430338d39d5bf0e0767a3ea19c8373412bd Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Sun, 7 Jun 2020 18:23:20 +0000
Subject: [PATCH 060/181] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 56.8% (1283 of 2259 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 8554e3d86b..c26cf7abeb 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1344,5 +1344,10 @@
     "Repeat your recovery passphrase...": "Gjenta gjenopprettingspassfrasen din …",
     "Other users may not trust it": "Andre brukere kan kanskje mistro den",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagerte med %(content)s</reactedWith>",
-    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reagerte med %(shortName)s</reactedWith>"
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reagerte med %(shortName)s</reactedWith>",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikke forhåndsvises. Vil du bli med i den?",
+    "Messages in this room are end-to-end encrypted.": "Meldinger i dette rommet er start-til-slutt-kryptert.",
+    "Messages in this room are not end-to-end encrypted.": "Meldinger i dette rommet er ikke start-til-slutt-kryptert.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meldinger i dette rommet er start-til-slutt-kryptert. Lær mer og verifiser denne brukeren i brukerprofilen deres.",
+    "Use a different passphrase?": "Vil du bruke en annen passfrase?"
 }

From 8dfed9e597452664449d8c3243fffafa680afaa3 Mon Sep 17 00:00:00 2001
From: Nils Haugen <nils@gaupne.net>
Date: Sun, 7 Jun 2020 10:33:15 +0000
Subject: [PATCH 061/181] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 56.6% (1278 of 2259 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 16d2fd276d..52b2c2e83d 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -13,7 +13,7 @@
     "Answer": "Svar",
     "You are already in a call.": "Du er allereie i ei samtale.",
     "VoIP is unsupported": "VoIP er ikkje støtta",
-    "You cannot place VoIP calls in this browser.": "Du kan ikkje utføre med anrop med VoIP i denne nettlesaren.",
+    "You cannot place VoIP calls in this browser.": "Du kan ikkje utføra samtalar med VoIP i denne nettlesaren.",
     "You cannot place a call with yourself.": "Du kan ikkje samtala med deg sjølv.",
     "Could not connect to the integration server": "Kunne ikkje kopla til integreringstenaren",
     "Call in Progress": "Ei Samtale er i Gang",
@@ -167,7 +167,7 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget lagt til av %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget fjerna av %(senderName)s",
     "Failure to create room": "Klarte ikkje å laga rommet",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Serveren er kanskje utilgjengeleg, overlasta elles så traff du ein bug.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Tenaren er kanskje utilgjengeleg, overlasta elles så traff du ein bug.",
     "Send anyway": "Send likevel",
     "Send": "Send",
     "Unnamed Room": "Rom utan namn",
@@ -305,7 +305,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tilgangsnivå %(powerLevelNumber)s)",
     "Attachment": "Vedlegg",
     "Hangup": "Legg på",
-    "Voice call": "Taleanrop",
+    "Voice call": "Talesamtale",
     "Video call": "Videosamtale",
     "Upload file": "Last opp fil",
     "Send an encrypted reply…": "Send eit kryptert svar…",
@@ -762,7 +762,7 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Send alle på nytt</resendText> eller <cancelText>avbryt alle</cancelText>. Du kan og markere enkelte meldingar for å sende på nytt eller avbryte.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Send melding på nytt</resendText> eller <cancelText>avbryt</cancelText>.",
     "Connectivity to the server has been lost.": "Tilkoplinga til tenaren vart tapt.",
-    "Sent messages will be stored until your connection has returned.": "Sendte meldingar vil blir lagra lokalt fram til nettverket er oppe igjen.",
+    "Sent messages will be stored until your connection has returned.": "Sende meldingar vil lagrast lokalt fram til nettverket er oppe att.",
     "Active call": "Pågåande samtale",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det er ingen andre her! Vil du <inviteText>invitera andre</inviteText> eller <nowarnText>skru av varselet om det tomme rommet?</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Det ser ut til at du lastar opp filer, er du sikker på at du vil avslutte?",
@@ -825,8 +825,8 @@
     "Incorrect username and/or password.": "Feil brukarnamn og/eller passord.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Merk deg at du loggar inn på %(hs)s-tenaren, ikkje matrix.org.",
     "The phone number entered looks invalid": "Det innskrivne telefonnummeret virkar å vere ugyldig",
-    "Error: Problem communicating with the given homeserver.": "Feil: Det gjekk ikkje an å kommunisere med den spesifiserte heimeserveren.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan ikkje koble til heimeserveren via HTTP fordi URL-adressa i nettlesaren er HTTPS. Bruk HTTPS, eller <a>aktiver usikre skript</a>.",
+    "Error: Problem communicating with the given homeserver.": "Feil: Det gjekk ikkje an å kommunisera med den spesifiserte heimetenaren.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan ikkje kobla til heimetenaren via HTTP fordi URL-adressa i nettlesaren er HTTPS. Bruk HTTPS, eller <a>aktiver usikre skript</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Kan ikkje kopla til heimtenaren - ver venleg og sjekk tilkoplinga di, og sjå til at <a>heimtenaren din sitt CCL-sertifikat</a> er stolt på og at ein nettlesartillegg ikkje hindrar førespurnader.",
     "Failed to fetch avatar URL": "Klarte ikkje å henta avatar-URLen",
     "Set a display name:": "Set eit visningsnamn:",
@@ -894,7 +894,7 @@
     "Clear filter": "Tøm filter",
     "Profile": "Brukar",
     "Access Token:": "Tilgangs-token:",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Heimeserveren tilbyr ingen påloggingsmetodar som er støtta av denne klienten.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Heimetenaren tilbyr ingen innloggingsmetodar som er støtta av denne klienten.",
     "Claimed Ed25519 fingerprint key": "Gjorde krav på Ed25519-fingeravtrykksnøkkel",
     "Export room keys": "Eksporter romnøklar",
     "Export": "Eksporter",
@@ -915,10 +915,10 @@
     "Whether or not you're logged in (we don't record your username)": "Uansett om du er innlogga eller ikkje (så lagrar vi ikkje brukarnamnet ditt)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Fila %(fileName)s er større enn heimetenaren si grense for opplastningar",
     "Unable to load! Check your network connectivity and try again.": "Klarte ikkje lasta! Sjå på nettilkoplinga di og prøv igjen.",
-    "Your Riot is misconfigured": "Riot-klienten din er feilkonfiguert",
+    "Your Riot is misconfigured": "Riot-klienten din er sett opp feil",
     "Sign In": "Logg inn",
     "Explore rooms": "Utforsk romma",
-    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Meldingen din vart ikkje sent for denne heimeserveren har nådd grensa for maksimalt aktive brukarar pr. månad. Kontakt <a>systemadministratoren</a> for å kunne vidare nytte denne tenesten.",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Meldinga di vart ikkje send, for denne heimetenaren har nådd grensa for maksimalt aktive brukarar pr. månad. Kontakt <a>systemadministratoren</a> for å vidare nytte denne tenesta.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Denne meldingen vart ikkje sendt fordi heimeserveren har nådd grensa for tilgjengelege systemressursar. Kontakt <a>systemadministratoren</a> for å vidare nytte denne tenesten.",
     "Add room": "Legg til rom",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Du har %(count)s uleste varslingar i ein tidligare versjon av dette rommet.",
@@ -928,23 +928,23 @@
     "Could not load user profile": "Klarde ikkje å laste brukarprofilen",
     "Your Matrix account on %(serverName)s": "Din Matrix-konto på %(serverName)s",
     "Your Matrix account on <underlinedServerName />": "Din Matrix-konto på <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "Ingen identitetsserver er konfigurert: legg til ein i innstillingane for å nullstille passordet ditt.",
+    "No identity server is configured: add one in server settings to reset your password.": "Ingen identitetstenar er satt opp: legg til ein i innstillingane for å nullstille passordet ditt.",
     "Sign in instead": "Logg inn istaden",
     "A verification email will be sent to your inbox to confirm setting your new password.": "For å stadfeste tilbakestilling av passordet, vil ein e-post vil bli sendt til din innboks.",
     "Your password has been reset.": "Passodet ditt vart nullstilt.",
     "Set a new password": "Sett nytt passord",
-    "Invalid homeserver discovery response": "Ugyldig svar frå heimeserveren (discovery response)",
-    "Failed to get autodiscovery configuration from server": "Kladte ikkje å hente automatisk oppsett frå server",
-    "Invalid base_url for m.homeserver": "Ugyldig base_url for m.homeserver",
-    "Homeserver URL does not appear to be a valid Matrix homeserver": "URL-adressa virkar ikkje til å vere ein gyldig Matrix-heimeserver",
-    "Invalid identity server discovery response": "Ugyldig svar frå identitetsserveren (discovery response)",
-    "Invalid base_url for m.identity_server": "Ugyldig base_url for m.identity_server",
-    "Identity server URL does not appear to be a valid identity server": "URL-adressa virkar ikkje til å vere ein gyldig identitetsserver",
+    "Invalid homeserver discovery response": "Feil svar frå heimetenaren (discovery response)",
+    "Failed to get autodiscovery configuration from server": "Klarde ikkje å hente automatisk oppsett frå tenaren",
+    "Invalid base_url for m.homeserver": "Feil base_url for m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "URL-adressa virkar ikkje til å vere ein gyldig Matrix-heimetenar",
+    "Invalid identity server discovery response": "Feil svar frå identitetstenaren (discovery response)",
+    "Invalid base_url for m.identity_server": "Feil base_url for m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "URL-adressa virkar ikkje til å vere ein gyldig identitetstenar",
     "General failure": "Generell feil",
-    "This homeserver does not support login using email address.": "Denne heimeserveren støttar ikkje innloggingar med e-postadresser.",
+    "This homeserver does not support login using email address.": "Denne heimetenaren støttar ikkje innloggingar med e-postadresser.",
     "Please <a>contact your service administrator</a> to continue using this service.": "<a>Kontakt din systemadministrator</a> for å vidare å bruke tenesta.",
     "This account has been deactivated.": "Denne kontoen har blitt deaktivert.",
-    "Failed to perform homeserver discovery": "Fekk ikkje til å utforske heimeserveren",
+    "Failed to perform homeserver discovery": "Fekk ikkje til å utforska heimetenaren",
     "Sign in with single sign-on": "Logg på med Single-Sign-On",
     "Create account": "Lag konto",
     "Registration has been disabled on this homeserver.": "Registrering er deaktivert på denne heimeserveren.",
@@ -955,7 +955,7 @@
     "You can now close this window or <a>log in</a> to your new account.": "Du kan lukke dette vindauget eller<a>logge inn</a> med din nye konto.",
     "Registration Successful": "Registrering fullført",
     "Create your account": "Lag din konto",
-    "Failed to re-authenticate due to a homeserver problem": "Fekk ikkje til å re-authentisere grunna ein feil på heimeserveren",
+    "Failed to re-authenticate due to a homeserver problem": "Fekk ikkje til å re-authentisere grunna ein feil på heimetenaren",
     "Failed to re-authenticate": "Fekk ikkje til å re-autentisere",
     "Enter your password to sign in and regain access to your account.": "Skriv inn ditt passord for å logge på og ta tilbake tilgang til kontoen din.",
     "Forgotten your password?": "Gløymt passord ?",
@@ -1014,7 +1014,7 @@
     "Replying With Files": "Send svar med filer",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Nett no er det ikkje mogleg å senda svar med ei fil. Vil du lasta opp denne fila utan å senda svaret?",
     "The file '%(fileName)s' failed to upload.": "Fila '%(fileName)s' vart ikkje lasta opp.",
-    "The server does not support the room version specified.": "Serveren støttar ikkje den spesifikke versjonen av rommet.",
+    "The server does not support the room version specified.": "Tenaren støttar ikkje den spesifikke versjonen av rommet.",
     "Name or Matrix ID": "Namn eller Matrix ID",
     "Registration Required": "Registrering er obligatorisk",
     "You need to register to do this. Would you like to register now?": "Du må registrera for å gjera dette. Ynskjer du å registrera no?",
@@ -1062,7 +1062,7 @@
     "Encryption upgrade available": "Kryptering kan oppgraderast",
     "Set up encryption": "Sett opp kryptering",
     "Unverified session": "Uverifisert sesjon",
-    "Identity server has no terms of service": "Identitetsserveren manglar bruksvilkår",
+    "Identity server has no terms of service": "Identitetstenaren manglar bruksvilkår",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlinga krev kommunikasjon mot <server />(standard identitetsserver) for å verifisere e-post eller telefonnummer, men serveren manglar bruksvilkår.",
     "Only continue if you trust the owner of the server.": "Gå vidare så lenge du har tillit til eigar av serveren.",
     "Trust": "Tillat",
@@ -1094,13 +1094,13 @@
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s la til %(addedAddresses)s og tok vekk %(removedAddresses)s som adresser for dette rommet.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s satte standardadressa for dette rommet til %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s fjerna standardadressa for dette rommet.",
-    "%(senderName)s placed a voice call.": "%(senderName)s starta eit taleanrop.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s starta eit taleanrop. (ikkje støtta av denne nettlesaren)",
+    "%(senderName)s placed a voice call.": "%(senderName)s starta ein talesamtale.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s starta ein talesamtale. (ikkje støtta av denne nettlesaren)",
     "%(senderName)s placed a video call.": "%(senderName)s starta ein videosamtale.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s starta ein videosamtale. (ikkje støtta av denne nettlesaren)",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s trekte tilbake invitasjonen for at %(targetDisplayName)s kan bli medlem i rommet.",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du er administrator for dette fellesskapet. Du kan ikkje melde deg inn igjen utan at du har invitasjon frå ein annan administrator.",
-    "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen server</a>",
+    "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen tenar</a>",
     "Sign In or Create Account": "Logg inn eller opprett konto",
     "Create Account": "Opprett konto",
     "Sends the given emote coloured as a rainbow": "Sendar emojien med regnbogefargar",
@@ -1197,12 +1197,12 @@
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Hint: Start meldinga med <code>//</code> for å starte den med skråstrek.",
     "Send as message": "Send som melding",
     "Failed to revoke invite": "Fekk ikkje til å trekke invitasjonen",
-    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Fekk ikkje til å trekke invitasjonen. Det kan ha oppstått eit midlertidig problem på serveren, eller så har ikkje du tilstrekkelege rettigheiter for å trekke invitasjonen.",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Fekk ikkje til å ta attende invitasjonen. Det kan ha oppstått ein mellombels feil på tenaren, eller så har ikkje du tilstrekkelege rettar for å ta attende invitasjonen.",
     "Revoke invite": "Trekk invitasjon",
     "Invited by %(sender)s": "Invitert av %(sender)s",
     "Mark all as read": "Merk alle som lesne",
     "Error updating main address": "Feil under oppdatering av hovedadresse",
-    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppdatering av hovedadressa for rommet. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppdatering av hovudadressa for rommet. Det kan hende at dette er ein mellombels feil, eller at det ikkje er tillate på tenaren.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Feil under oppdatering av sekundæradresse. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
     "Error creating alias": "Feil under oppretting av alias",
     "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppretting av dette aliaset. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
@@ -1212,12 +1212,12 @@
     "Main address": "Hovudadresse",
     "Local address": "Lokal adresse",
     "Published Addresses": "Publisert adresse",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publiserte adresser kan bli brukt av alle uansett server for å bli med i rommet. For å publisere ei adresse, må den vere sett som ei lokal adresse fyrst.",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publiserte adresser kan bli brukt av alle uansett tenar for å bli med i rommet. For å publisera ei adresse, må den vere sett som ei lokal adresse fyrst.",
     "Other published addresses:": "Andre publiserte adresser:",
     "No other published addresses yet, add one below": "Ingen publiserte adresser til no, legg til ei under",
-    "New published address (e.g. #alias:server)": "Ny publisert adresse  (t.d. #alias:server)",
+    "New published address (e.g. #alias:server)": "Ny publisert adresse  (t.d. #alias:tenar)",
     "Local Addresses": "Lokale adresser",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Sett adresse for dette rommet, slik at brukarar kan finne rommet på din heimeserver (%(localDomain)s)",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Sett adresse for dette rommet, slik at brukarar kan finne rommet på din heimetenar (%(localDomain)s)",
     "Error updating flair": "Oppdatering av etikett gjekk gale",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Feil under oppdatering av etikett for dette rommet. Dette kan vere deaktivert på server , eller så oppstod det ein feil.",
     "Room Name": "Romnamn",
@@ -1231,7 +1231,7 @@
     "Match system theme": "Følg systemtema",
     "Show shortcuts to recently viewed rooms above the room list": "Vis snarvegar til sist synte rom over romkatalogen",
     "Show hidden events in timeline": "Vis skjulte hendelsar i historikken",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Dette er di liste over brukarar/serverar du har blokkert - ikkje forlat rommet!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dette er di liste over brukarar/tenarar du har blokkert - ikkje forlat rommet!",
     "Upload": "Last opp",
     "Show less": "Vis mindre",
     "Show more": "Vis meir",
@@ -1270,7 +1270,7 @@
     "Select the roles required to change various parts of the room": "Juster roller som er påkrevd for å endre ulike deler av rommet",
     "Once enabled, encryption cannot be disabled.": "Etter aktivering, kan ikkje kryptering bli deaktivert.",
     "Your display name": "Ditt visningsnamn",
-    "Can't find this server or its room list": "Klarde ikkje å finne serveren eller romkatalogen til den",
+    "Can't find this server or its room list": "Klarde ikkje å finna tenaren eller romkatalogen til den",
     "Upload completed": "Opplasting fullført",
     "Cancelled signature upload": "Kansellerte opplasting av signatur",
     "Unabled to upload": "Klarte ikkje å laste opp",
@@ -1290,7 +1290,7 @@
     "Enable Emoji suggestions while typing": "Aktiver Emoji-forslag under skriving",
     "Show a placeholder for removed messages": "Vis ein plassholdar for sletta meldingar",
     "Show avatar changes": "Vis avatar-endringar",
-    "Show read receipts sent by other users": "Vis lest-rapportar sendt av andre brukarar",
+    "Show read receipts sent by other users": "Vis lese-rapportar sendt av andre brukarar",
     "Enable big emoji in chat": "Aktiver store emolji-ar i samtalen",
     "Send typing notifications": "Kringkast \"skriv...\"-status til andre",
     "Show typing notifications": "Vis \"skriv...\"-status frå andre",
@@ -1321,7 +1321,7 @@
     "Jump to start/end of the composer": "Hopp til start/slutt av teksteditoren",
     "Navigate composer history": "Naviger historikk for teksteditor",
     "Use Single Sign On to continue": "Bruk Single-sign-on for å fortsette",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Stadfest at du legger til denne e-postadressa, ved å bruke Single-sign-on for å bevise identiteten din.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Stadfest at du legger til denne e-postadressa, ved å bruke Single-sign-on for å stadfeste identiteten din.",
     "Single Sign On": "Single-sign-on",
     "Review Sessions": "Sjå gjennom økter",
     "Capitalization doesn't help very much": "Store bokstavar hjelp dessverre lite",
@@ -1330,7 +1330,7 @@
     "Keep secret storage passphrase in memory for this session": "Hald passfrase for hemmeleg lager i systemminnet for denne økta",
     "Cross-signing and secret storage are enabled.": "Krysssignering og hemmeleg lager er aktivert.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Kontoen din har ein kryss-signert identitet det hemmelege lageret, økta di stolar ikkje på denne enno.",
-    "Cross-signing and secret storage are not yet set up.": "Krysssignering og hemmeleg lager er endå ikkje konfiguert.",
+    "Cross-signing and secret storage are not yet set up.": "Krysssignering og hemmeleg lager er endå ikkje sett opp.",
     "Reset cross-signing and secret storage": "Tilbakestill krysssignering og hemmeleg lager",
     "Bootstrap cross-signing and secret storage": "Førebur krysssignering og hemmeleg lager",
     "in secret storage": "i hemmeleg lager",
@@ -1338,10 +1338,10 @@
     "Secret Storage key format:": "Nøkkel-format for hemmeleg lager:",
     "Keyboard Shortcuts": "Tastatursnarvegar",
     "Ignored users": "Ignorerte brukarar",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Legg til brukarar og serverar du vil ignorera her. Bruk stjerne/wildcard (*) for at markere eitkvart teikn. Til dømes, <code>@bot*</code> vil ignorere alle brukarar med namn 'bot' på uansett server.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Legg til brukarar og tenarar du vil ignorera her. Bruk stjerne/wildcard (*) for at markere eitkvart teikn. Til dømes, <code>@bot*</code> vil ignorere alle brukarar med namn 'bot' på uansett tenar.",
     "Server or user ID to ignore": "Server eller brukar-ID for å ignorere",
     "If this isn't what you want, please use a different tool to ignore users.": "Om det ikkje var dette du ville, bruk eit anna verktøy til å ignorera brukarar.",
-    "Enter the name of a new server you want to explore.": "Skriv inn namn på ny server du ynskjer å utforske.",
+    "Enter the name of a new server you want to explore.": "Skriv inn namn på ny tenar du ynskjer å utforske.",
     "Matrix rooms": "Matrix-rom",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Om du har meir info rundt korleis problemet oppstod, som kva du prøvde å gjere på det tidspunktet, brukar-IDar m.m ,inkluder gjerne den informasjonen her.",
     "Topic (optional)": "Emne (valfritt)",
@@ -1364,7 +1364,7 @@
     "Explore": "Utforsk",
     "%(creator)s created and configured the room.": "%(creator)s oppretta og konfiguerte dette rommet.",
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot klarde ikkje å hente protokolllister frå heimeserveren. Det kan hende at serveren er for gammal til å støtte tredjeparts-nettverk",
-    "The homeserver may be unavailable or overloaded.": "Heimeserveren kan vere overlasta eller utilgjengeleg.",
+    "The homeserver may be unavailable or overloaded.": "Heimetenaren kan vere overlasta eller utilgjengeleg.",
     "Preview": "Førehandsvis",
     "View": "Vis",
     "Find a room…": "Finn eit rom…",
@@ -1382,5 +1382,32 @@
     "Unable to set up secret storage": "Oppsett av hemmeleg lager feila",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Denne økta har oppdaga at gjenopprettingspassfrasen og nøkkelen for sikre meldingar vart fjerna.",
     "Toggle microphone mute": "Slå av/på demping av mikrofon",
-    "Confirm": "Stadfest"
+    "Confirm": "Stadfest",
+    "Confirm adding email": "Stadfest at du ynskjer å legga til e-postadressa",
+    "Click the button below to confirm adding this email address.": "Trykk på knappen under for å stadfesta at du ynskjer å legga til denne e-postadressa.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Stadfest dette telefonnummeret for å bruka Single-sign-on for å bevisa din identitet.",
+    "Confirm adding phone number": "Stadfest dette telefonnummeret",
+    "Click the button below to confirm adding this phone number.": "Trykk på knappen nedanfor for å legge til dette telefonnummeret.",
+    "Room name or address": "Romnamn eller adresse",
+    "%(name)s is requesting verification": "%(name)s spør etter verifikasjon",
+    "Use your account or create a new one to continue.": "Bruk kontoen din eller opprett ein ny for å halda fram.",
+    "Sends a message as html, without interpreting it as markdown": "Sender melding som HTML, utan å tolka den som markdown",
+    "Failed to set topic": "Fekk ikkje til å setta emne",
+    "Joins room with given address": "Legg saman rom med spesifisert adresse",
+    "Unrecognised room address:": "Rom-adressa vart ikkje kjend att:",
+    "Command failed": "Kommandoen feila",
+    "Could not find user in room": "Klarde ikkje å finna brukaren i rommet",
+    "Please supply a widget URL or embed code": "Oppgje ein widget-URL eller innebygd kode",
+    "Displays information about a user": "Viser informasjon om ein brukar",
+    "Send a bug report with logs": "Send ein feilrapport med loggar",
+    "Opens chat with the given user": "Opna ein samtale med den spesifiserte brukaren",
+    "Sends a message to the given user": "Send ein melding til den spesifiserte brukaren",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s endra romnamnet frå %(oldRoomName)s til %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s la til dei alternative adressene %(addresses)s for dette rommet.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s la til ei alternativ adresse %(addresses)s for dette rommet.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tok vekk dei alternative adressene %(addresses)s for dette rommet.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tok vekk den alternative adressa %(addresses)s for dette rommet.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s endre den alternative adressa for dette rommet.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s endra hovud- og alternativ-adressene for dette rommet.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s endre adressene for dette rommet."
 }

From 760333a0ae954d37822e18bf534be0155a1c011b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 7 Jun 2020 13:08:25 -0600
Subject: [PATCH 062/181] Move function to a private function

---
 .../algorithms/list-ordering/Algorithm.ts     | 123 +++++++++---------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
index e8058a2964..c3ac8c150f 100644
--- a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
@@ -65,66 +65,8 @@ export abstract class Algorithm extends EventEmitter {
     }
 
     public set stickyRoom(val: Room) {
-        // We wrap this in a closure because we can't use async setters.
-        // We need async so we can wait for handleRoomUpdate() to do its thing, otherwise
-        // we risk duplicating rooms.
-        (async () => {
-            // It's possible to have no selected room. In that case, clear the sticky room
-            if (!val) {
-                if (this._stickyRoom) {
-                    // Lie to the algorithm and re-add the room to the algorithm
-                    await this.handleRoomUpdate(this._stickyRoom.room, RoomUpdateCause.NewRoom);
-                }
-                this._stickyRoom = null;
-                return;
-            }
-
-            // When we do have a room though, we expect to be able to find it
-            const tag = this.roomIdsToTags[val.roomId][0];
-            if (!tag) throw new Error(`${val.roomId} does not belong to a tag and cannot be sticky`);
-            let position = this.cachedRooms[tag].indexOf(val);
-            if (position < 0) throw new Error(`${val.roomId} does not appear to be known and cannot be sticky`);
-
-            // 🐉 Here be dragons.
-            // Before we can go through with lying to the underlying algorithm about a room
-            // we need to ensure that when we do we're ready for the innevitable sticky room
-            // update we'll receive. To prepare for that, we first remove the sticky room and
-            // recalculate the state ourselves so that when the underlying algorithm calls for
-            // the same thing it no-ops. After we're done calling the algorithm, we'll issue
-            // a new update for ourselves.
-            const lastStickyRoom = this._stickyRoom;
-            console.log(`Last sticky room:`, lastStickyRoom);
-            this._stickyRoom = null;
-            this.recalculateStickyRoom();
-
-            // When we do have the room, re-add the old room (if needed) to the algorithm
-            // and remove the sticky room from the algorithm. This is so the underlying
-            // algorithm doesn't try and confuse itself with the sticky room concept.
-            if (lastStickyRoom) {
-                // Lie to the algorithm and re-add the room to the algorithm
-                await this.handleRoomUpdate(lastStickyRoom.room, RoomUpdateCause.NewRoom);
-            }
-            // Lie to the algorithm and remove the room from it's field of view
-            await this.handleRoomUpdate(val, RoomUpdateCause.RoomRemoved);
-
-            // Now that we're done lying to the algorithm, we need to update our position
-            // marker only if the user is moving further down the same list. If they're switching
-            // lists, or moving upwards, the position marker will splice in just fine but if
-            // they went downwards in the same list we'll be off by 1 due to the shifting rooms.
-            if (lastStickyRoom && lastStickyRoom.tag === tag && lastStickyRoom.position <= position) {
-                position++;
-            }
-
-            this._stickyRoom = {
-                room: val,
-                position: position,
-                tag: tag,
-            };
-            this.recalculateStickyRoom();
-
-            // Finally, trigger an update
-            this.emit(LIST_UPDATED_EVENT);
-        })();
+        // setters can't be async, so we call a private function to do the work
+        this.updateStickyRoom(val);
     }
 
     protected get hasFilters(): boolean {
@@ -175,6 +117,67 @@ export abstract class Algorithm extends EventEmitter {
         }
     }
 
+    private async updateStickyRoom(val: Room) {
+        // Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
+        // otherwise we risk duplicating rooms.
+
+        // It's possible to have no selected room. In that case, clear the sticky room
+        if (!val) {
+            if (this._stickyRoom) {
+                // Lie to the algorithm and re-add the room to the algorithm
+                await this.handleRoomUpdate(this._stickyRoom.room, RoomUpdateCause.NewRoom);
+            }
+            this._stickyRoom = null;
+            return;
+        }
+
+        // When we do have a room though, we expect to be able to find it
+        const tag = this.roomIdsToTags[val.roomId][0];
+        if (!tag) throw new Error(`${val.roomId} does not belong to a tag and cannot be sticky`);
+        let position = this.cachedRooms[tag].indexOf(val);
+        if (position < 0) throw new Error(`${val.roomId} does not appear to be known and cannot be sticky`);
+
+        // 🐉 Here be dragons.
+        // Before we can go through with lying to the underlying algorithm about a room
+        // we need to ensure that when we do we're ready for the innevitable sticky room
+        // update we'll receive. To prepare for that, we first remove the sticky room and
+        // recalculate the state ourselves so that when the underlying algorithm calls for
+        // the same thing it no-ops. After we're done calling the algorithm, we'll issue
+        // a new update for ourselves.
+        const lastStickyRoom = this._stickyRoom;
+        console.log(`Last sticky room:`, lastStickyRoom);
+        this._stickyRoom = null;
+        this.recalculateStickyRoom();
+
+        // When we do have the room, re-add the old room (if needed) to the algorithm
+        // and remove the sticky room from the algorithm. This is so the underlying
+        // algorithm doesn't try and confuse itself with the sticky room concept.
+        if (lastStickyRoom) {
+            // Lie to the algorithm and re-add the room to the algorithm
+            await this.handleRoomUpdate(lastStickyRoom.room, RoomUpdateCause.NewRoom);
+        }
+        // Lie to the algorithm and remove the room from it's field of view
+        await this.handleRoomUpdate(val, RoomUpdateCause.RoomRemoved);
+
+        // Now that we're done lying to the algorithm, we need to update our position
+        // marker only if the user is moving further down the same list. If they're switching
+        // lists, or moving upwards, the position marker will splice in just fine but if
+        // they went downwards in the same list we'll be off by 1 due to the shifting rooms.
+        if (lastStickyRoom && lastStickyRoom.tag === tag && lastStickyRoom.position <= position) {
+            position++;
+        }
+
+        this._stickyRoom = {
+            room: val,
+            position: position,
+            tag: tag,
+        };
+        this.recalculateStickyRoom();
+
+        // Finally, trigger an update
+        this.emit(LIST_UPDATED_EVENT);
+    }
+
     protected recalculateFilteredRooms() {
         if (!this.hasFilters) {
             return;

From 8e0247afe5ed1970e653aab6ec7083fb0e09d159 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 7 Jun 2020 22:06:41 -0600
Subject: [PATCH 063/181] Add most of the UI for the new room list's menu
 button

Incomplete implementation: buttons don't work, some text is missing, etc
---
 res/css/_components.scss                      |   1 +
 res/css/structures/_LeftPanel2.scss           |   5 +
 res/css/structures/_UserMenuButton.scss       | 157 +++++++++++++
 res/img/feather-customised/archive.svg        |   1 +
 .../feather-customised/more-horizontal.svg    |   1 +
 res/img/feather-customised/sun.svg            |   1 +
 res/themes/light/css/_light.scss              |   1 +
 src/components/structures/LeftPanel2.tsx      |   5 +-
 src/components/structures/LoggedInView.tsx    |   4 +-
 .../structures/TopLeftMenuButton.js           |   3 +-
 src/components/structures/UserMenuButton.tsx  | 211 ++++++++++++++++++
 src/dispatcher/actions.ts                     |   5 +
 src/i18n/strings/en_EN.json                   |   7 +
 13 files changed, 397 insertions(+), 5 deletions(-)
 create mode 100644 res/css/structures/_UserMenuButton.scss
 create mode 100644 res/img/feather-customised/archive.svg
 create mode 100644 res/img/feather-customised/more-horizontal.svg
 create mode 100644 res/img/feather-customised/sun.svg
 create mode 100644 src/components/structures/UserMenuButton.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 62bec5ad62..de4c1c677c 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -29,6 +29,7 @@
 @import "./structures/_ToastContainer.scss";
 @import "./structures/_TopLeftMenuButton.scss";
 @import "./structures/_UploadBar.scss";
+@import "./structures/_UserMenuButton.scss";
 @import "./structures/_ViewSource.scss";
 @import "./structures/auth/_CompleteSecurity.scss";
 @import "./structures/auth/_Login.scss";
diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
index 822a5ac399..d335df305f 100644
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -73,6 +73,11 @@ $roomListMinimizedWidth: 50px;
                 font-weight: 600;
                 font-size: $font-15px;
                 line-height: $font-20px;
+                flex: 1;
+            }
+
+            .mx_LeftPanel2_headerButtons {
+                // No special styles: the rest of the layout happens to make it work.
             }
 
             .mx_LeftPanel2_breadcrumbsContainer {
diff --git a/res/css/structures/_UserMenuButton.scss b/res/css/structures/_UserMenuButton.scss
new file mode 100644
index 0000000000..f7097311c9
--- /dev/null
+++ b/res/css/structures/_UserMenuButton.scss
@@ -0,0 +1,157 @@
+/*
+Copyright 2020 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_UserMenuButton {
+    // No special styles on the button itself
+}
+
+.mx_UserMenuButton_contextMenu {
+    width: 231px;
+
+    // Put 20px of padding around the whole menu. We do this instead of a
+    // simple `padding: 20px` rule so the horizontal rules added by the
+    // optionLists is rendered correctly (full width).
+    >* {
+        padding-left: 20px;
+        padding-right: 20px;
+
+        &:first-child {
+            padding-top: 20px;
+        }
+
+        &:last-child {
+            padding-bottom: 20px;
+        }
+    }
+
+    .mx_UserMenuButton_contextMenu_header {
+        // Create a flexbox to organize the header a bit easier
+        display: flex;
+        align-items: center;
+
+        .mx_UserMenuButton_contextMenu_name {
+            // Create another flexbox of columns to handle large user IDs
+            display: flex;
+            flex-direction: column;
+
+            // fit the container
+            flex: 1;
+            width: calc(100% - 40px); // 40px = 32px theme button + 8px margin to theme button
+
+            * {
+                // Automatically grow all subelements to fit the container
+                flex: 1;
+                width: 100%;
+
+                // Ellipsize any text overflow
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+
+            .mx_UserMenuButton_contextMenu_displayName {
+                font-weight: bold;
+                font-size: $font-15px;
+                line-height: $font-20px;
+            }
+
+            .mx_UserMenuButton_contextMenu_userId {
+                font-size: $font-15px;
+                line-height: $font-24px;
+            }
+        }
+
+        .mx_UserMenuButton_contextMenu_themeButton {
+            min-width: 32px;
+            max-width: 32px;
+            width: 32px;
+            height: 32px;
+            margin-left: 8px;
+            border-radius: 32px;
+            background-color: $theme-button-bg-color;
+            cursor: pointer;
+
+            // to make alignment easier, create flexbox for the image
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+
+    .mx_UserMenuButton_contextMenu_optionList {
+        margin-top: 20px;
+
+        // This is a bit of a hack when we could just use a simple border-top property,
+        // however we have a (kinda) good reason for doing it this way: we need opacity.
+        // To get the right color, we need an opacity modifier which means we have to work
+        // around the problem. PostCSS doesn't support the opacity() function, and if we
+        // use something like postcss-functions we quickly run into an issue where the
+        // function we would define gets passed a CSS variable for custom themes, which
+        // can't be converted easily even when considering https://stackoverflow.com/a/41265350/7037379
+        //
+        // Therefore, we just hack in a line and border the thing ourselves
+        &::before {
+            border-top: 1px solid $primary-fg-color;
+            opacity: 0.1;
+            content: '';
+
+            // Counteract the padding problems (width: 100% ignores the 40px padding,
+            // unless we position it absolutely then it does the right thing).
+            width: 100%;
+            position: absolute;
+            left: 0;
+        }
+
+        ul {
+            list-style: none;
+            margin: 0;
+            padding: 0;
+
+            li {
+                margin: 0;
+                padding: 20px 0 0;
+
+                a {
+                    text-decoration: none;
+                    color: $primary-fg-color;
+                    font-size: $font-15px;
+                    line-height: $font-24px;
+
+                    // Create a flexbox to more easily define the list items
+                    display: flex;
+                    align-items: center;
+
+                    img { // icons
+                        width: 16px;
+                        min-width: 16px;
+                        max-width: 16px;
+                    }
+
+                    span { // labels
+                        padding-left: 14px;
+                        width: 100%;
+                        flex: 1;
+
+                        // Ellipsize any text overflow
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                        white-space: nowrap;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/res/img/feather-customised/archive.svg b/res/img/feather-customised/archive.svg
new file mode 100644
index 0000000000..428882c87b
--- /dev/null
+++ b/res/img/feather-customised/archive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-archive"><polyline points="21 8 21 21 3 21 3 8"></polyline><rect x="1" y="3" width="22" height="5"></rect><line x1="10" y1="12" x2="14" y2="12"></line></svg>
\ No newline at end of file
diff --git a/res/img/feather-customised/more-horizontal.svg b/res/img/feather-customised/more-horizontal.svg
new file mode 100644
index 0000000000..dc6a85564e
--- /dev/null
+++ b/res/img/feather-customised/more-horizontal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-horizontal"><circle cx="12" cy="12" r="1"></circle><circle cx="19" cy="12" r="1"></circle><circle cx="5" cy="12" r="1"></circle></svg>
\ No newline at end of file
diff --git a/res/img/feather-customised/sun.svg b/res/img/feather-customised/sun.svg
new file mode 100644
index 0000000000..7f51b94d1c
--- /dev/null
+++ b/res/img/feather-customised/sun.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-sun"><circle cx="12" cy="12" r="5"></circle><line x1="12" y1="1" x2="12" y2="3"></line><line x1="12" y1="21" x2="12" y2="23"></line><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"></line><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"></line><line x1="1" y1="12" x2="3" y2="12"></line><line x1="21" y1="12" x2="23" y2="12"></line><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"></line><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"></line></svg>
\ No newline at end of file
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 5aeb125774..a50c34cf03 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -177,6 +177,7 @@ $header-divider-color: #91A1C0;
 $roomtile2-preview-color: #9e9e9e;
 $roomtile2-badge-color: #61708b;
 $roomtile2-selected-bg-color: #FFF;
+$theme-button-bg-color: #e3e8f0;
 
 $roomtile-name-color: #61708b;
 $roomtile-badge-fg-color: $accent-fg-color;
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index c66c0a6799..2fd8612ff5 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -27,6 +27,7 @@ import { Action } from "../../dispatcher/actions";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import BaseAvatar from '../views/avatars/BaseAvatar';
 import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
+import UserMenuButton from "./UserMenuButton";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -49,7 +50,6 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
     // TODO: Properly support TagPanel
     // TODO: Properly support searching/filtering
     // TODO: Properly support breadcrumbs
-    // TODO: Properly support TopLeftMenu (User Settings)
     // TODO: a11y
     // TODO: actually make this useful in general (match design proposals)
     // TODO: Fadable support (is this still needed?)
@@ -115,6 +115,9 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
                         />
                     </span>
                     <span className="mx_LeftPanel2_userName">{displayName}</span>
+                    <span className="mx_LeftPanel2_headerButtons">
+                        <UserMenuButton />
+                    </span>
                 </div>
                 <div className="mx_LeftPanel2_headerRow mx_LeftPanel2_breadcrumbsContainer">
                     <RoomBreadcrumbs />
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 0504e3a76a..19edf505e0 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -452,9 +452,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
                 // composer, so CTRL+` it is
 
                 if (ctrlCmdOnly) {
-                    dis.dispatch({
-                        action: 'toggle_top_left_menu',
-                    });
+                    dis.fire(Action.ToggleUserMenu);
                     handled = true;
                 }
                 break;
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
index 234dc661f9..71e7e61406 100644
--- a/src/components/structures/TopLeftMenuButton.js
+++ b/src/components/structures/TopLeftMenuButton.js
@@ -24,6 +24,7 @@ import * as Avatar from '../../Avatar';
 import { _t } from '../../languageHandler';
 import dis from "../../dispatcher/dispatcher";
 import {ContextMenu, ContextMenuButton} from "./ContextMenu";
+import {Action} from "../../dispatcher/actions";
 
 const AVATAR_SIZE = 28;
 
@@ -75,7 +76,7 @@ export default class TopLeftMenuButton extends React.Component {
 
     onAction = (payload) => {
         // For accessibility
-        if (payload.action === "toggle_top_left_menu") {
+        if (payload.action === Action.ToggleUserMenu) {
             if (this._buttonRef) this._buttonRef.click();
         }
     };
diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
new file mode 100644
index 0000000000..0968e0bdb6
--- /dev/null
+++ b/src/components/structures/UserMenuButton.tsx
@@ -0,0 +1,211 @@
+/*
+Copyright 2020 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 {User} from "matrix-js-sdk/src/models/user";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { ActionPayload } from "../../dispatcher/payloads";
+import { Action } from "../../dispatcher/actions";
+import { createRef } from "react";
+import { _t } from "../../languageHandler";
+import {ContextMenu, ContextMenuButton} from "./ContextMenu";
+
+interface IProps {
+}
+
+interface IState {
+    user: User;
+    menuDisplayed: boolean;
+}
+
+export default class UserMenuButton extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
+    private buttonRef: React.RefObject<HTMLButtonElement> = createRef();
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            menuDisplayed: false,
+            user: MatrixClientPeg.get().getUser(MatrixClientPeg.get().getUserId()),
+        };
+    }
+
+    private get displayName(): string {
+        if (MatrixClientPeg.get().isGuest()) {
+            return _t("Guest");
+        } else if (this.state.user) {
+            return this.state.user.displayName;
+        } else {
+            return MatrixClientPeg.get().getUserId();
+        }
+    }
+
+    public componentDidMount() {
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+    }
+
+    private onAction = (ev: ActionPayload) => {
+        if (ev.action !== Action.ToggleUserMenu) return; // not interested
+
+        // For accessibility
+        if (this.buttonRef.current) this.buttonRef.current.click();
+    };
+
+    private onOpenMenuClick = (ev: InputEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({menuDisplayed: true});
+    };
+
+    private onCloseMenu = () => {
+        this.setState({menuDisplayed: false});
+    };
+
+    private onSwitchThemeClick = () => {
+        console.log("TODO: Switch theme");
+    };
+
+    private onSettingsOpen = (ev: React.MouseEvent, tabRef: string) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        console.log("TODO: Open settings", tabRef);
+    };
+
+    private onShowArchived = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        console.log("TODO: Show archived rooms");
+    };
+
+    private onProvideFeedback = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        console.log("TODO: Show feedback");
+    };
+
+    private onSignOutClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        console.log("TODO: Sign out");
+    };
+
+    public render() {
+        let contextMenu;
+        if (this.state.menuDisplayed) {
+            const elementRect = this.buttonRef.current.getBoundingClientRect();
+            contextMenu = (
+                <ContextMenu
+                    chevronFace="none"
+                    left={elementRect.left}
+                    top={elementRect.top + elementRect.height}
+                    onFinished={this.onCloseMenu}
+                >
+                    <div className="mx_UserMenuButton_contextMenu">
+                        <div className="mx_UserMenuButton_contextMenu_header">
+                            <div className="mx_UserMenuButton_contextMenu_name">
+                                <span className="mx_UserMenuButton_contextMenu_displayName">
+                                    {this.displayName}
+                                </span>
+                                <span className="mx_UserMenuButton_contextMenu_userId">
+                                    {MatrixClientPeg.get().getUserId()}
+                                </span>
+                            </div>
+                            <div
+                                className="mx_UserMenuButton_contextMenu_themeButton"
+                                onClick={this.onSwitchThemeClick}
+                                title={_t("Switch to dark mode")}
+                            >
+                                <img
+                                    src={require("../../../res/img/feather-customised/sun.svg")}
+                                    alt={_t("Switch theme")}
+                                    width={16}
+                                />
+                            </div>
+                        </div>
+                        <div className="mx_UserMenuButton_contextMenu_header">
+                            TODO: Upgrade prompt
+                        </div>
+                        <div className="mx_UserMenuButton_contextMenu_optionList">
+                            <ul>
+                                <li>
+                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'notifications')}>
+                                        <img src={require("../../../res/img/feather-customised/notifications.svg")} width={16} />
+                                        <span>{_t("Notification settings")}</span>
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'security')}>
+                                        <img src={require("../../../res/img/feather-customised/lock.svg")} width={16} />
+                                        <span>{_t("Security & privacy")}</span>
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'all')}>
+                                        <img src={require("../../../res/img/feather-customised/settings.svg")} width={16} />
+                                        <span>{_t("All settings")}</span>
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"#"} onClick={this.onShowArchived}>
+                                        <img src={require("../../../res/img/feather-customised/archive.svg")} width={16} />
+                                        <span>{_t("Archived rooms")}</span>
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"#"} onClick={this.onShowArchived}>
+                                        <img src={require("../../../res/img/feather-customised/message-circle.svg")} width={16} />
+                                        <span>{_t("Feedback")}</span>
+                                    </a>
+                                </li>
+                            </ul>
+                        </div>
+                        <div className="mx_UserMenuButton_contextMenu_optionList">
+                            <ul>
+                                <li>
+                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'notifications')}>
+                                        <img src={require("../../../res/img/feather-customised/sign-out.svg")} width={16} />
+                                        <span>{_t("Sign out")}</span>
+                                    </a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </ContextMenu>
+            );
+        }
+
+        return (
+            <React.Fragment>
+                <ContextMenuButton
+                    className="mx_UserMenuButton"
+                    onClick={this.onOpenMenuClick}
+                    inputRef={this.buttonRef}
+                    label={_t("Account settings")}
+                    isExpanded={this.state.menuDisplayed}
+                >
+                    <img src={require("../../../res/img/feather-customised/more-horizontal.svg")} alt="..." width={14} />
+                </ContextMenuButton>
+                {contextMenu}
+            </React.Fragment>
+        )
+    }
+}
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 71493d6e44..60ef61a6e9 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -58,4 +58,9 @@ export enum Action {
      * Focuses the user's cursor to the composer. No additional payload information required.
      */
     FocusComposer = "focus_composer",
+
+    /**
+     * Opens the user menu (previously known as the top left menu). No additional payload information required.
+     */
+    ToggleUserMenu = "toggle_user_menu",
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cf6dc2431a..8575b3a258 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2042,6 +2042,13 @@
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
+    "Switch to dark mode": "Switch to dark mode",
+    "Switch theme": "Switch theme",
+    "Security & privacy": "Security & privacy",
+    "All settings": "All settings",
+    "Archived rooms": "Archived rooms",
+    "Feedback": "Feedback",
+    "Account settings": "Account settings",
     "Could not load user profile": "Could not load user profile",
     "Verify this login": "Verify this login",
     "Session verified": "Session verified",

From 8b6b117fbfe95f3f896972d30ca9fa08a410807a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 7 Jun 2020 22:15:54 -0600
Subject: [PATCH 064/181] Appease the linter

---
 res/css/structures/_UserMenuButton.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_UserMenuButton.scss b/res/css/structures/_UserMenuButton.scss
index f7097311c9..aca5f4253a 100644
--- a/res/css/structures/_UserMenuButton.scss
+++ b/res/css/structures/_UserMenuButton.scss
@@ -24,7 +24,7 @@ limitations under the License.
     // Put 20px of padding around the whole menu. We do this instead of a
     // simple `padding: 20px` rule so the horizontal rules added by the
     // optionLists is rendered correctly (full width).
-    >* {
+    > * {
         padding-left: 20px;
         padding-right: 20px;
 

From f05a1e532b5652d0fe2236b6a2794b889c43149d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 7 Jun 2020 22:17:02 -0600
Subject: [PATCH 065/181] Point buttons at the right functions

---
 src/components/structures/UserMenuButton.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index 0968e0bdb6..abf4689aa1 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -171,7 +171,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                                     </a>
                                 </li>
                                 <li>
-                                    <a href={"#"} onClick={this.onShowArchived}>
+                                    <a href={"#"} onClick={this.onProvideFeedback}>
                                         <img src={require("../../../res/img/feather-customised/message-circle.svg")} width={16} />
                                         <span>{_t("Feedback")}</span>
                                     </a>
@@ -181,7 +181,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                         <div className="mx_UserMenuButton_contextMenu_optionList">
                             <ul>
                                 <li>
-                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'notifications')}>
+                                    <a href={"#"} onClick={this.onSignOutClick}>
                                         <img src={require("../../../res/img/feather-customised/sign-out.svg")} width={16} />
                                         <span>{_t("Sign out")}</span>
                                     </a>

From 1315ed503b165c521a794218b5cf4eb6ad237098 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 5 Jun 2020 16:59:24 +0100
Subject: [PATCH 066/181] Upgrade deps

---
 yarn.lock | 1497 +++++++++++++++++++++++++++--------------------------
 1 file changed, 752 insertions(+), 745 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7e444a0e0f..333c5ccf20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,9 +3,9 @@
 
 
 "@babel/cli@^7.7.5":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.8.4.tgz#505fb053721a98777b2b175323ea4f090b7d3c1c"
-  integrity sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.1.tgz#b6e5cd43a17b8f639442ab027976408ebe6d79a0"
+  integrity sha512-cVB+dXeGhMOqViIaZs3A9OUAe4pKw4SBNdMw6yHJMYR7s4TB+Cei7ThquV/84O19PdIFWuwe03vxxES0BHUm5g==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
@@ -18,35 +18,35 @@
   optionalDependencies:
     chokidar "^2.1.8"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1", "@babel/code-frame@^7.5.5":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
+  integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
   dependencies:
-    "@babel/highlight" "^7.8.3"
+    "@babel/highlight" "^7.10.1"
 
-"@babel/compat-data@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
-  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
+"@babel/compat-data@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
+  integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
   dependencies:
-    browserslist "^4.11.1"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     semver "^5.5.0"
 
 "@babel/core@>=7.2.2", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
+  integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/code-frame" "^7.10.1"
+    "@babel/generator" "^7.10.2"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helpers" "^7.10.1"
+    "@babel/parser" "^7.10.2"
+    "@babel/template" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.2"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -56,338 +56,346 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+"@babel/generator@^7.10.1", "@babel/generator@^7.10.2", "@babel/generator@^7.4.0":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
+  integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
   dependencies:
-    "@babel/types" "^7.9.6"
+    "@babel/types" "^7.10.2"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+"@babel/helper-annotate-as-pure@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
+  integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059"
+  integrity sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-react-jsx-experimental@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz#0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"
-  integrity sha512-HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg==
+"@babel/helper-builder-react-jsx-experimental@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz#9a7d58ad184d3ac3bafb1a452cec2bad7e4a0bc8"
+  integrity sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-react-jsx@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
-  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
+"@babel/helper-builder-react-jsx@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz#a327f0cf983af5554701b1215de54a019f09b532"
+  integrity sha512-KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/types" "^7.9.0"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-compilation-targets@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
-  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
+"@babel/helper-compilation-targets@^7.10.2":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285"
+  integrity sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==
   dependencies:
-    "@babel/compat-data" "^7.9.6"
-    browserslist "^4.11.1"
+    "@babel/compat-data" "^7.10.1"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.8.3", "@babel/helper-create-class-features-plugin@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz#965c8b0a9f051801fd9d3b372ca0ccf200a90897"
-  integrity sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==
+"@babel/helper-create-class-features-plugin@^7.10.1":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67"
+  integrity sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==
   dependencies:
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.9.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/helper-member-expression-to-functions" "^7.10.1"
+    "@babel/helper-optimise-call-expression" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-split-export-declaration" "^7.10.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+"@babel/helper-create-regexp-features-plugin@^7.10.1", "@babel/helper-create-regexp-features-plugin@^7.8.3":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"
+  integrity sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-regex" "^7.10.1"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+"@babel/helper-define-map@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
+  integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/types" "^7.10.1"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-explode-assignable-expression@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e"
+  integrity sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+"@babel/helper-function-name@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
+  integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-get-function-arity" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@babel/helper-get-function-arity@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
+  integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+"@babel/helper-hoist-variables@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
+  integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-member-expression-to-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
+  integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+"@babel/helper-module-imports@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
+  integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+"@babel/helper-module-transforms@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
+  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-simple-access" "^7.10.1"
+    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+"@babel/helper-optimise-call-expression@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
+  integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
+  integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
 
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+"@babel/helper-regex@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96"
+  integrity sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+"@babel/helper-remap-async-to-generator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"
+  integrity sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-wrap-function" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6", "@babel/helper-replace-supers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
-  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
+"@babel/helper-replace-supers@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
+  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/helper-member-expression-to-functions" "^7.10.1"
+    "@babel/helper-optimise-call-expression" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@babel/helper-simple-access@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
+  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+"@babel/helper-split-export-declaration@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
+  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+"@babel/helper-validator-identifier@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
+  integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@babel/helper-wrap-function@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9"
+  integrity sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helpers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
-  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
+"@babel/helpers@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
+  integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/template" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+"@babel/highlight@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
+  integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
+    "@babel/helper-validator-identifier" "^7.10.1"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.10.1", "@babel/parser@^7.10.2", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
+  integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"
+  integrity sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-remap-async-to-generator" "^7.10.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+"@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.7.4":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01"
+  integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-proposal-decorators@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
-  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.1.tgz#9373c2d8db45345c6e30452ad77b469758e5c8f7"
+  integrity sha512-xBfteh352MTke2U1NpclzMDmAmCdQ2fBZjhZQQfGTjXw6qcRYMkt528sA1U8o0ThDCSeuETXIj5bOGdxN+5gkw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-decorators" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-decorators" "^7.10.1"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+"@babel/plugin-proposal-dynamic-import@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz#e36979dc1dc3b73f6d6816fc4951da2363488ef0"
+  integrity sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
 "@babel/plugin-proposal-export-default-from@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.8.3.tgz#4cb7c2fdeaed490b60d9bfd3dc8a20f81f9c2e7c"
-  integrity sha512-PYtv2S2OdCdp7GSPDg5ndGZFm9DmWFvuLoS5nBxZCgOBggluLnhTScspJxng96alHQzPyrrHxvC9/w4bFuspeA==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.10.1.tgz#59ea2a4f09dbb0358c73dab27def3d21a27bd370"
+  integrity sha512-Xfc1CfHapIkwZ/+AI+j4Ha3g233ol0EEdy6SmnUuQQiZX78SfQXHd8tmntc5zqCkwPnIHoiZa6l6p0OAvxYXHw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-export-default-from" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-export-default-from" "^7.10.1"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@babel/plugin-proposal-json-strings@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz#b1e691ee24c651b5a5e32213222b2379734aff09"
+  integrity sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78"
+  integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.7.4", "@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+"@babel/plugin-proposal-numeric-separator@^7.10.1", "@babel/plugin-proposal-numeric-separator@^7.7.4":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123"
+  integrity sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
 
-"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
-  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
+"@babel/plugin-proposal-object-rest-spread@^7.10.1", "@babel/plugin-proposal-object-rest-spread@^7.7.4":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
+  integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-parameters" "^7.10.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+"@babel/plugin-proposal-optional-catch-binding@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2"
+  integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@babel/plugin-proposal-optional-chaining@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c"
+  integrity sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
-  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+"@babel/plugin-proposal-private-methods@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz#ed85e8058ab0fe309c3f448e5e1b73ca89cdb598"
+  integrity sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.10.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f"
+  integrity sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
   version "7.8.4"
@@ -396,12 +404,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-decorators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
-  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
+"@babel/plugin-syntax-class-properties@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz#d5bc0645913df5b17ad7eda0fa2308330bde34c5"
+  integrity sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+
+"@babel/plugin-syntax-decorators@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.1.tgz#16b869c4beafc9a442565147bda7ce0967bd4f13"
+  integrity sha512-a9OAbQhKOwSle1Vr0NJu/ISg1sPfdEkfRKWpgPuzhnWWzForou2gIeUIIwjAMHRekhhpJ7eulZlYs0H14Cbi+g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
@@ -410,19 +425,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.8.3.tgz#f1e55ce850091442af4ba9c2550106035b29d678"
-  integrity sha512-a1qnnsr73KLNIQcQlcQ4ZHxqqfBKM6iNQZW2OMTyxNbA2WC7SHWHtGVpFzWtQAuS2pspkWVzdEBXXx8Ik0Za4w==
+"@babel/plugin-syntax-export-default-from@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.10.1.tgz#634f58f36b5d6320d80f75441fdc61e1c05c33b0"
+  integrity sha512-+rcL4S/mN1Ss4zhSCbxzv1Wsf12eauvgTjWi0krXEeX1zd6qSxYnJoniE5Ssr5w2WPt61oUCJyXIFQIqO/29zw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-flow@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz#f2c883bd61a6316f2c89380ae5122f923ba4527f"
-  integrity sha512-innAx3bUbA0KSYj2E2MNFSn9hiCeowOFLxlsuhXzw8hMQnzkDomUr9QCD7E9VF60NmnG1sNTuuv6Qf4f8INYsg==
+"@babel/plugin-syntax-flow@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.1.tgz#cd4bbca62fb402babacb174f64f8734310d742f0"
+  integrity sha512-b3pWVncLBYoPP60UOTc7NMlbtsHQ6ITim78KQejNHK6WJ2mzV5kCcg4mIWpasAfJEgwVTibwo2e+FU7UEIKQUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-syntax-json-strings@^7.8.0":
   version "7.8.3"
@@ -431,12 +446,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz#521b06c83c40480f1e58b4fd33b92eceb1d6ea94"
-  integrity sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==
+"@babel/plugin-syntax-jsx@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz#0ae371134a42b91d5418feb3c8c8d43e1565d2da"
+  integrity sha512-+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.3"
@@ -445,12 +460,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+"@babel/plugin-syntax-numeric-separator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99"
+  integrity sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
@@ -473,184 +488,184 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+"@babel/plugin-syntax-top-level-await@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362"
+  integrity sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
-  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+"@babel/plugin-syntax-typescript@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.1.tgz#5e82bc27bb4202b93b949b029e699db536733810"
+  integrity sha512-X/d8glkrAtra7CaQGMiGs/OGa6XgUzqPcBXCIGFCpCqnfGlT0Wfbzo/B89xHhnInTaItPK8LALblVXcUOEh95Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+"@babel/plugin-transform-arrow-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b"
+  integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+"@babel/plugin-transform-async-to-generator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz#e5153eb1a3e028f79194ed8a7a4bf55f862b2062"
+  integrity sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-remap-async-to-generator" "^7.10.1"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+"@babel/plugin-transform-block-scoped-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz#146856e756d54b20fff14b819456b3e01820b85d"
+  integrity sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+"@babel/plugin-transform-block-scoping@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e"
+  integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+"@babel/plugin-transform-classes@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
+  integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-define-map" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/helper-optimise-call-expression" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-split-export-declaration" "^7.10.1"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+"@babel/plugin-transform-computed-properties@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07"
+  integrity sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+"@babel/plugin-transform-destructuring@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907"
+  integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
-  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+"@babel/plugin-transform-dotall-regex@^7.10.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"
+  integrity sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+"@babel/plugin-transform-duplicate-keys@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz#c900a793beb096bc9d4d0a9d0cde19518ffc83b9"
+  integrity sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+"@babel/plugin-transform-exponentiation-operator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3"
+  integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-transform-flow-comments@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.8.3.tgz#0a7e6c49224ac24271e4da25774da0600605ef2c"
-  integrity sha512-SEmbGPsaUig0x3QkB/Nai3Snk1sRxODBN2EGjdQqgBb5TMcbEejV2TtMGi2XiLmw9Cy/BvJX7CAnfJMctuyglg==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.10.1.tgz#1befb98f8d37245b70770a1f83c67057e41bd4a9"
+  integrity sha512-A1yDAD/3pU+NyCHRvm+GQE2xiyRV6mGDyhMdTKPqgs5aRcc2MR4wmnHJJIB91f8NwMNl8dxmN6nmj/7FCr6Jgw==
   dependencies:
-    "@babel/generator" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-flow" "^7.8.3"
+    "@babel/generator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-flow" "^7.10.1"
 
-"@babel/plugin-transform-flow-strip-types@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392"
-  integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==
+"@babel/plugin-transform-flow-strip-types@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.1.tgz#59eafbff9ae85ec8932d4c16c068654be814ec5e"
+  integrity sha512-i4o0YwiJBIsIx7/liVCZ3Q2WkWr1/Yu39PksBOnh/khW2SwIFsGa5Ze+MSon5KbDfrEHP9NeyefAgvUSXzaEkw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-flow" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-flow" "^7.10.1"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+"@babel/plugin-transform-for-of@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5"
+  integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+"@babel/plugin-transform-function-name@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d"
+  integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+"@babel/plugin-transform-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a"
+  integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+"@babel/plugin-transform-member-expression-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz#90347cba31bca6f394b3f7bd95d2bbfd9fce2f39"
+  integrity sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
-  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
+"@babel/plugin-transform-modules-amd@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a"
+  integrity sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
-  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
+"@babel/plugin-transform-modules-commonjs@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301"
+  integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-simple-access" "^7.10.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
-  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
+"@babel/plugin-transform-modules-systemjs@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
+  integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-hoist-variables" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+"@babel/plugin-transform-modules-umd@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz#ea080911ffc6eb21840a5197a39ede4ee67b1595"
+  integrity sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
   version "7.8.3"
@@ -659,229 +674,248 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-new-target@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz#6ee41a5e648da7632e22b6fb54012e87f612f324"
+  integrity sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@babel/plugin-transform-object-super@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz#2e3016b0adbf262983bf0d5121d676a5ed9c4fde"
+  integrity sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-replace-supers" "^7.10.1"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-parameters@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd"
+  integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@babel/plugin-transform-property-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz#cffc7315219230ed81dc53e4625bf86815b6050d"
+  integrity sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-react-display-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz#70ded987c91609f78353dd76d2fb2a0bb991e8e5"
-  integrity sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==
+"@babel/plugin-transform-react-display-name@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.1.tgz#e6a33f6d48dfb213dda5e007d0c7ff82b6a3d8ef"
+  integrity sha512-rBjKcVwjk26H3VX8pavMxGf33LNlbocMHdSeldIEswtQ/hrjyTG8fKKILW1cSkODyRovckN/uZlGb2+sAV9JUQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-react-jsx-development@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
-  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
+"@babel/plugin-transform-react-jsx-development@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.1.tgz#1ac6300d8b28ef381ee48e6fec430cc38047b7f3"
+  integrity sha512-XwDy/FFoCfw9wGFtdn5Z+dHh6HXKHkC6DwKNWpN74VWinUagZfDcEJc3Y8Dn5B3WMVnAllX8Kviaw7MtC5Epwg==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx-experimental" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-jsx" "^7.10.1"
 
-"@babel/plugin-transform-react-jsx-self@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
-  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
+"@babel/plugin-transform-react-jsx-self@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.1.tgz#22143e14388d72eb88649606bb9e46f421bc3821"
+  integrity sha512-4p+RBw9d1qV4S749J42ZooeQaBomFPrSxa9JONLHJ1TxCBo3TzJ79vtmG2S2erUT8PDDrPdw4ZbXGr2/1+dILA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-jsx" "^7.10.1"
 
-"@babel/plugin-transform-react-jsx-source@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
-  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
+"@babel/plugin-transform-react-jsx-source@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz#30db3d4ee3cdebbb26a82a9703673714777a4273"
+  integrity sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-jsx" "^7.10.1"
 
-"@babel/plugin-transform-react-jsx@^7.9.4":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
-  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
+"@babel/plugin-transform-react-jsx@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz#91f544248ba131486decb5d9806da6a6e19a2896"
+  integrity sha512-MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.9.0"
-    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx" "^7.10.1"
+    "@babel/helper-builder-react-jsx-experimental" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-jsx" "^7.10.1"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@babel/plugin-transform-react-pure-annotations@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.1.tgz#f5e7c755d3e7614d4c926e144f501648a5277b70"
+  integrity sha512-mfhoiai083AkeewsBHUpaS/FM1dmUENHBMpS/tugSJ7VXqXO5dCN1Gkint2YvM1Cdv1uhmAKt1ZOuAjceKmlLA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+
+"@babel/plugin-transform-regenerator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"
+  integrity sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+"@babel/plugin-transform-reserved-words@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz#0fc1027312b4d1c3276a57890c8ae3bcc0b64a86"
+  integrity sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-transform-runtime@^7.8.3":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
-  integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz#fd1887f749637fb2ed86dc278e79eb41df37f4b1"
+  integrity sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+"@babel/plugin-transform-shorthand-properties@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3"
+  integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+"@babel/plugin-transform-spread@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8"
+  integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+"@babel/plugin-transform-sticky-regex@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00"
+  integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-regex" "^7.10.1"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+"@babel/plugin-transform-template-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628"
+  integrity sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+"@babel/plugin-transform-typeof-symbol@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz#60c0239b69965d166b80a84de7315c1bc7e0bb0e"
+  integrity sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-typescript@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz#2248971416a506fc78278fc0c0ea3179224af1e9"
-  integrity sha512-8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ==
+"@babel/plugin-transform-typescript@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.1.tgz#2c54daea231f602468686d9faa76f182a94507a6"
+  integrity sha512-v+QWKlmCnsaimLeqq9vyCsVRMViZG1k2SZTlcZvB+TqyH570Zsij8nvVUZzOASCRiQFUxkLrn9Wg/kH0zgy5OQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.9.6"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-typescript" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-typescript" "^7.10.1"
 
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+"@babel/plugin-transform-unicode-escapes@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz#add0f8483dab60570d9e03cecef6c023aa8c9940"
+  integrity sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+
+"@babel/plugin-transform-unicode-regex@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f"
+  integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/preset-env@^7.7.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
-  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb"
+  integrity sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==
   dependencies:
-    "@babel/compat-data" "^7.9.6"
-    "@babel/helper-compilation-targets" "^7.9.6"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/compat-data" "^7.10.1"
+    "@babel/helper-compilation-targets" "^7.10.2"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.1"
+    "@babel/plugin-proposal-class-properties" "^7.10.1"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.1"
+    "@babel/plugin-proposal-json-strings" "^7.10.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.10.1"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.10.1"
+    "@babel/plugin-proposal-private-methods" "^7.10.1"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.10.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
+    "@babel/plugin-syntax-top-level-await" "^7.10.1"
+    "@babel/plugin-transform-arrow-functions" "^7.10.1"
+    "@babel/plugin-transform-async-to-generator" "^7.10.1"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.1"
+    "@babel/plugin-transform-block-scoping" "^7.10.1"
+    "@babel/plugin-transform-classes" "^7.10.1"
+    "@babel/plugin-transform-computed-properties" "^7.10.1"
+    "@babel/plugin-transform-destructuring" "^7.10.1"
+    "@babel/plugin-transform-dotall-regex" "^7.10.1"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.1"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.1"
+    "@babel/plugin-transform-for-of" "^7.10.1"
+    "@babel/plugin-transform-function-name" "^7.10.1"
+    "@babel/plugin-transform-literals" "^7.10.1"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.1"
+    "@babel/plugin-transform-modules-amd" "^7.10.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.1"
+    "@babel/plugin-transform-modules-umd" "^7.10.1"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.10.1"
+    "@babel/plugin-transform-object-super" "^7.10.1"
+    "@babel/plugin-transform-parameters" "^7.10.1"
+    "@babel/plugin-transform-property-literals" "^7.10.1"
+    "@babel/plugin-transform-regenerator" "^7.10.1"
+    "@babel/plugin-transform-reserved-words" "^7.10.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.1"
+    "@babel/plugin-transform-spread" "^7.10.1"
+    "@babel/plugin-transform-sticky-regex" "^7.10.1"
+    "@babel/plugin-transform-template-literals" "^7.10.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.1"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.1"
+    "@babel/plugin-transform-unicode-regex" "^7.10.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.6"
-    browserslist "^4.11.1"
+    "@babel/types" "^7.10.2"
+    browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
     semver "^5.5.0"
 
 "@babel/preset-flow@^7.7.4":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.9.0.tgz#fee847c3e090b0b2d9227c1949e4da1d1379280d"
-  integrity sha512-88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.10.1.tgz#29498ec23baf9aa6dae50c568ceba09d71692b82"
+  integrity sha512-FuQsibb5PaX07fF1XUO5gjjxdEZbcJv8+ugPDaeFEsBIvUTib8hCtEJow/c2F0jq9ZUjpHCQ8IQKNHRvKE1kJQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-flow-strip-types" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-transform-flow-strip-types" "^7.10.1"
 
 "@babel/preset-modules@^0.1.3":
   version "0.1.3"
@@ -895,29 +929,30 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.7.4":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
-  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.1.tgz#e2ab8ae9a363ec307b936589f07ed753192de041"
+  integrity sha512-Rw0SxQ7VKhObmFjD/cUcKhPTtzpeviEFX1E6PgP+cYOhQ98icNqtINNFANlsdbQHrmeWnqdxA4Tmnl1jy5tp3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.9.4"
-    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-transform-react-display-name" "^7.10.1"
+    "@babel/plugin-transform-react-jsx" "^7.10.1"
+    "@babel/plugin-transform-react-jsx-development" "^7.10.1"
+    "@babel/plugin-transform-react-jsx-self" "^7.10.1"
+    "@babel/plugin-transform-react-jsx-source" "^7.10.1"
+    "@babel/plugin-transform-react-pure-annotations" "^7.10.1"
 
 "@babel/preset-typescript@^7.7.4":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
-  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.1.tgz#a8d8d9035f55b7d99a2461a0bdc506582914d07e"
+  integrity sha512-m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-typescript" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-transform-typescript" "^7.10.1"
 
 "@babel/register@^7.7.4":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.9.0.tgz#02464ede57548bddbb5e9f705d263b7c3f43d48b"
-  integrity sha512-Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.1.tgz#b6567c5cb5049f44bbf8c35d6ff68ca3c43238ed"
+  integrity sha512-sl96+kB3IA2B9EzpwwBmYadOT14vw3KaXOknGDbJaZCOj52GDA4Tivudq9doCJcB+bEIKCEARZYwRgBBsCGXyg==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -926,50 +961,50 @@
     source-map-support "^0.5.16"
 
 "@babel/runtime-corejs3@^7.8.3":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71"
-  integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz#3511797ddf9a3d6f3ce46b99cc835184817eaa4e"
+  integrity sha512-+a2M/u7r15o3dV1NEizr9bRi+KUVnrs/qYxF0Z06DAPx/4VCWaz1WA7EcbE+uqGgt39lp5akWGmHsTseIkHkHg==
   dependencies:
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
-  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
+  integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.4.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+"@babel/template@^7.10.1", "@babel/template@^7.4.0":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
+  integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/code-frame" "^7.10.1"
+    "@babel/parser" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.1", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
+  integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/code-frame" "^7.10.1"
+    "@babel/generator" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/parser" "^7.10.1"
+    "@babel/types" "^7.10.1"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
-  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
+"@babel/types@^7.0.0", "@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
+  integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
+    "@babel/helper-validator-identifier" "^7.10.1"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
@@ -1143,9 +1178,9 @@
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
 "@peculiar/asn1-schema@^2.0.1", "@peculiar/asn1-schema@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.3.tgz#c6c097e842ebb8a07d198b68cd49f2cf9f3571b5"
-  integrity sha512-STqC+Tfx2dTiIGRmokjsKOeqsfhoV6WaBwFr7BVicSfHLAVSPrZXiugyD8AELrjQdJ9INWpL3N7YSJyU5a1ZwA==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.5.tgz#ba6c5a107eec16a23804d0176a3595837b53c0e9"
+  integrity sha512-VIKJjsgMkv+yyWx3C+D4xo6/NeCg0XFBgNlavtkxELijV+aKAq53du5KkOJbeZtm1nn9CinQKny2PqL8zCfpeA==
   dependencies:
     "@types/asn1js" "^0.0.1"
     asn1js "^2.0.26"
@@ -1185,9 +1220,9 @@
     "@types/pvutils" "*"
 
 "@types/babel__core@^7.1.0":
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
-  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
+  version "7.1.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.8.tgz#057f725aca3641f49fc11c7a87a9de5ec588a5d7"
+  integrity sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1211,9 +1246,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz#1ae3010e8bf8851d324878b42acec71986486d18"
-  integrity sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.12.tgz#22f49a028e69465390f87bb103ebd61bd086b8f5"
+  integrity sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1222,11 +1257,6 @@
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.10.tgz#cc658ca319b6355399efc1f5b9e818f1a24bf999"
   integrity sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
 "@types/fbemitter@*":
   version "2.0.32"
   resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
@@ -1241,11 +1271,10 @@
     "@types/react" "*"
 
 "@types/glob@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987"
+  integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==
   dependencies:
-    "@types/events" "*"
     "@types/minimatch" "*"
     "@types/node" "*"
 
@@ -1275,9 +1304,9 @@
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
 "@types/lodash@^4.14.152":
-  version "4.14.152"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.152.tgz#7e7679250adce14e749304cdb570969f77ec997c"
-  integrity sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==
+  version "4.14.155"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.155.tgz#e2b4514f46a261fd11542e47519c20ebce7bc23a"
+  integrity sha512-vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg==
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -1290,14 +1319,14 @@
   integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
 
 "@types/node@*":
-  version "14.0.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
-  integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
+  version "14.0.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.11.tgz#61d4886e2424da73b7b25547f59fdcb534c165a3"
+  integrity sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg==
 
 "@types/node@^12.12.41":
-  version "12.12.42"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.42.tgz#d0d1149336bd07540dd1ea576692829d575dec34"
-  integrity sha512-R/9QdYFLL9dE9l5cWWzWIZByVGFd7lk7JVOJ7KD+E1SJ4gni7XJRLz9QTjyYQiHIqEAgku9VgxdLjMlhhUaAFg==
+  version "12.12.44"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.44.tgz#0d400a1453adcb359b133acceae4dd8bb0e0a159"
+  integrity sha512-jM6QVv0Sm5d3nW+nUD5jSzPcO6oPqboitSNcwgBay9hifVq/Rauq1PYnROnsmuw45JMBiTnsPAno0bKu2e2xrg==
 
 "@types/prop-types@*":
   version "15.7.3"
@@ -2158,7 +2187,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.11.1, browserslist@^4.12.0, browserslist@^4.8.5:
+browserslist@^4.12.0, browserslist@^4.8.5:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
   integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
@@ -2322,9 +2351,9 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
-  version "1.0.30001065"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001065.tgz#e8d7fef61cdfd8a7107493ad6bf551a4eb59c68f"
-  integrity sha512-DDxCLgJ266YnAHQv0jS1wdOaihRFF52Zgmlag39sQJVy2H46oROpJp4hITstqhdB8qnHSrKNoAEkQA9L/oYF9A==
+  version "1.0.30001079"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz#ed3e5225cd9a6850984fdd88bf24ce45d69b9c22"
+  integrity sha512-2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3128,9 +3157,9 @@ ecc-jsbn@~0.1.1:
     safer-buffer "^2.1.0"
 
 electron-to-chromium@^1.3.413:
-  version "1.3.451"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz#0c075af3e2f06d706670bde0279432802ca8c83f"
-  integrity sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==
+  version "1.3.464"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.464.tgz#fe13feaa08f6f865d3c89d5d72e54c194f463aa5"
+  integrity sha512-Oo+0+CN9d2z6FToQW6Hwvi9ez09Y/usKwr0tsDsyg43a871zVJCi1nR0v03djLbRNcaCKjtrnVf2XJhTxEpPCg==
 
 elliptic@^6.0.0, elliptic@^6.5.2:
   version "6.5.2"
@@ -3213,9 +3242,9 @@ entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 entities@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436"
-  integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
+  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
 enzyme-adapter-react-16@^1.15.1:
   version "1.15.2"
@@ -3361,9 +3390,9 @@ escape-string-regexp@^1.0.5:
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
-  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz#14ab71bf5026c2aa08173afba22c6f3173284a84"
+  integrity sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==
   dependencies:
     esprima "^4.0.1"
     estraverse "^4.2.0"
@@ -3392,9 +3421,9 @@ eslint-plugin-flowtype@^2.30.0:
     lodash "^4.17.10"
 
 eslint-plugin-jest@^23.0.4:
-  version "23.13.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.13.1.tgz#b2ce83f76064ad8ba1f1f26f322b86a86e44148e"
-  integrity sha512-TRLJH6M6EDvGocD98a7yVThrAOCK9WJfo9phuUb0MJptcrOYZeCKzC9aOzZCD93sxXCsiJVZywaTHdI/mAi0FQ==
+  version "23.13.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.13.2.tgz#7b7993b4e09be708c696b02555083ddefd7e4cc7"
+  integrity sha512-qZit+moTXTyZFNDqSIR88/L3rdBlTU7CuW6XmyErD2FfHEkdoLgThkRbiQjzgYnX6rfgLx3Ci4eJmF4Ui5v1Cw==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 
@@ -3434,9 +3463,9 @@ eslint-scope@^4.0.3:
     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==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
+  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3456,9 +3485,9 @@ eslint-utils@^2.0.0:
     eslint-visitor-keys "^1.1.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==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz#74415ac884874495f78ec2a97349525344c981fa"
+  integrity sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==
 
 eslint@^5.12.0:
   version "5.16.0"
@@ -3704,9 +3733,9 @@ extsprintf@^1.2.0:
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^2.2.6:
   version "2.2.7"
@@ -4428,9 +4457,9 @@ ignore@^4.0.3, ignore@^4.0.6:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.4:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.6.tgz#643194ad4bf2712f37852e386b6998eff0db2106"
-  integrity sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 immutable@^3.7.4:
   version "3.8.2"
@@ -4658,9 +4687,9 @@ is-buffer@^2.0.0:
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
 is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
+  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -4850,11 +4879,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
     isobject "^3.0.1"
 
 is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
+  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
   dependencies:
-    has "^1.0.3"
+    has-symbols "^1.0.1"
 
 is-regexp@^1.0.0:
   version "1.0.0"
@@ -5629,21 +5658,11 @@ lodash-es@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
   integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
   integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
 
-lodash.escaperegexp@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-  integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
-
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -5654,21 +5673,6 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
-lodash.mergewith@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -5900,9 +5904,9 @@ merge-stream@^2.0.0:
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
-  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
@@ -6167,9 +6171,9 @@ node-notifier@^5.4.2:
     which "^1.3.0"
 
 node-releases@^1.1.53:
-  version "1.1.56"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.56.tgz#bc054a417d316e3adac90eafb7e1932802f28705"
-  integrity sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==
+  version "1.1.58"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
+  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
@@ -6582,9 +6586,9 @@ path-type@^3.0.0:
     pify "^3.0.0"
 
 pbkdf2@^3.0.3:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+  integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -6770,9 +6774,9 @@ postcss-value-parser@^4.1.0:
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
 postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.6, postcss@^7.0.7:
-  version "7.0.30"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
-  integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -7004,7 +7008,7 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -7256,9 +7260,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
+  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
@@ -7638,17 +7642,13 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sanitize-html@^1.18.4:
-  version "1.24.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.24.0.tgz#9cd42f236512bfcf6259424e958551148c165a7f"
-  integrity sha512-TAIFx39V/y06jDd4YUz7ntCdMUXN5Z28pSG7sTP2BCLXwHA9+ermacDpQs35Evo4p6YSgmaPdSbGiX4Fgptuuw==
+  version "1.26.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.26.0.tgz#ab38d671526b9b7c08aa7af7f9ad5a73fcc1bbe4"
+  integrity sha512-xriDBT2FbfN0ZKCcX6H6svkh1bZpO2e5ny05RQGZY6vFOMAU13La2L5YYf3XpcjXSksCYXzPj7YPvyGp5wbaUA==
   dependencies:
     chalk "^2.4.1"
     htmlparser2 "^4.1.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.escaperegexp "^4.1.2"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.2"
+    lodash "^4.17.15"
     postcss "^7.0.27"
     srcset "^2.0.1"
     xtend "^4.0.1"
@@ -7700,6 +7700,13 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
+serialize-javascript@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+  dependencies:
+    randombytes "^2.1.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -8318,15 +8325,15 @@ tapable@^1.0.0, tapable@^1.1.3:
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 terser-webpack-plugin@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
-  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f"
+  integrity sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^2.1.2"
+    serialize-javascript "^3.1.0"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
@@ -8558,9 +8565,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.7.3:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
-  integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
+  version "3.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
+  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
 
 ua-parser-js@^0.7.18:
   version "0.7.21"
@@ -8741,9 +8748,9 @@ url@^0.11.0:
     querystring "0.2.0"
 
 use-callback-ref@^1.2.1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.3.tgz#9f939dfb5740807bbf9dd79cdd4e99d27e827756"
-  integrity sha512-DPBPh1i2adCZoIArRlTuKRy7yue7QogtEnfv0AKrWsY+GA+4EKe37zhRDouNnyWMoNQFYZZRF+2dLHsWE4YvJA==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.4.tgz#d86d1577bfd0b955b6e04aaf5971025f406bea3c"
+  integrity sha512-rXpsyvOnqdScyied4Uglsp14qzag1JIemLeTWGKbwpotWht57hbP78aNT+Q4wdFKQfQibbUX4fb6Qb4y11aVOQ==
 
 use-sidecar@^1.0.1:
   version "1.0.2"
@@ -8964,9 +8971,9 @@ webpack@^4.20.2:
     webpack-sources "^1.4.1"
 
 what-input@^5.2.6:
-  version "5.2.9"
-  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.9.tgz#e484628c00404d2ad5d747ac2f0fb22008f7757a"
-  integrity sha512-/tuM/4ngvfYB1QF3yekJsmFpIhkiHEDKCl/VYDikyHZVxoFn3U/lNgiNt7aqC8RerkoPUMxc9ihKsW9KwAx2Rg==
+  version "5.2.10"
+  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.10.tgz#f79f5b65cf95d75e55e6d580bb0a6b98174cad4e"
+  integrity sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"

From dbc2f9cbfc5b1ee6aea5bdb61970d2832f1021a5 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Mon, 8 Jun 2020 08:27:12 +0000
Subject: [PATCH 067/181] Translated using Weblate (German)

Currently translated at 99.7% (2253 of 2259 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f55d94f8fc..d51ef94814 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1569,7 +1569,7 @@
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Ihr Passwort wurde erfolgreich geändert. Sie erhalten keine Push-Benachrichtigungen zu anderen Sitzungen, bis Sie sich wieder bei diesen anmelden",
     "Sessions": "Sitzungen",
     "Notification sound": "Benachrichtigungston",
-    "Set a new custom sound": "Setze einen neuen benutzerdefinierten Sound",
+    "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton",
     "Browse": "Durchsuche",
     "Direct Messages": "Direktnachrichten",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Sie können <code>/help</code> benutzen, um verfügbare Befehle aufzulisten. Wollten Sie dies als Nachricht senden?",
@@ -1584,8 +1584,8 @@
     "To help us prevent this in future, please <a>send us logs</a>.": "Um uns zu helfen, dies in Zukunft zu vermeiden, <a>senden Sie uns bitte Logs</a>.",
     "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen Ihnen, den Verifizierungsprozess für jede Sitzung zu durchlaufen, um zu bestätigen, dass sie ihrem rechtmäßigen Eigentümer gehören, aber Sie können die Nachricht auch ohne Verifizierung erneut senden, wenn Sie dies bevorzugen.",
     "Notification settings": "Benachrichtigungseinstellungen",
-    "Help": "Hilfe",
-    "Filter": "Filter",
+    "Help": "Hilf uns",
+    "Filter": "Filtern",
     "Filter rooms…": "Räume filtern…",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Sie haben %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
     "Go Back": "Gehe zurück",
@@ -2389,5 +2389,37 @@
     "Create room": "Raum erstellen",
     "Jump to oldest unread message": "Zur ältesten ungelesenen Nachricht springen",
     "Upload a file": "Eine Datei hochladen",
-    "Dismiss read marker and jump to bottom": "Entferne Lesemarker und springe nach unten"
+    "Dismiss read marker and jump to bottom": "Entferne Lesemarker und springe nach unten",
+    "Room name or address": "Raumname oder -adresse",
+    "Joins room with given address": "Tritt dem Raum unter der angegebenen Adresse bei",
+    "Unrecognised room address:": "Unbekannte Raumadresse:",
+    "Help us improve Riot": "Hilf uns Riot zu verbessern",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Hilf uns Riot zu verbessern, indem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein <PolicyLink>Cookie</PolicyLink> verwenden.",
+    "I want to help": "Ich möchte helfen",
+    "Your homeserver has exceeded its user limit.": "Dein Heimserver hat das Benutzerlimit erreicht.",
+    "Your homeserver has exceeded one of its resource limits.": "Dein Heimserver hat eine seiner Ressourcengrenzen erreicht.",
+    "Contact your <a>server admin</a>.": "Kontaktiere deinen <a>Heimserver Administrator</a>.",
+    "Ok": "Ok",
+    "Set password": "Setze Passwort",
+    "To return to your account in future you need to set a password": "Um dein Konto zukünftig wieder verwenden zu können, setze ein Passwort",
+    "Restart": "Neustarten",
+    "Upgrade your Riot": "Aktualisiere dein Riot",
+    "A new version of Riot is available!": "Eine neue Version von Riot ist verfügbar!",
+    "New version available. <a>Update now.</a>": "Neue Version verfügbar. <a>Jetzt aktualisieren.</a>",
+    "Please verify the room ID or address and try again.": "Bitte überprüfe die Raum-ID oder -adresse und versuche es erneut.",
+    "To link to this room, please add an address.": "Um den Raum zu verlinken, füge bitte eine Adresse hinzu.",
+    "Emoji picker": "Emoji Auswahl",
+    "Show %(n)s more": "%(n)s weitere anzeigen",
+    "Error creating address": "Fehler beim Anlegen der Adresse",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Anlegen der Adresse. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
+    "You don't have permission to delete the address.": "Du hast nicht die Berechtigung die Adresse zu löschen.",
+    "Error removing address": "Fehler beim Löschen der Adresse",
+    "Categories": "Kategorien",
+    "Room address": "Raumadresse",
+    "Please provide a room address": "Bitte gib eine Raumadresse an",
+    "This address is available to use": "Diese Adresse ist verfügbar",
+    "This address is already in use": "Diese Adresse wird bereits verwendet",
+    "Address (optional)": "Adresse (optional)",
+    "delete the address.": "lösche die Adresse.",
+    "Use a different passphrase?": "Eine andere Passphrase verwenden?"
 }

From 4b920c88dc9cbd5e99d627ce1c5a7969fd9db95d Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Mon, 8 Jun 2020 08:55:02 +0000
Subject: [PATCH 068/181] Translated using Weblate (Slovak)

Currently translated at 68.7% (1552 of 2259 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 0fe60e4321..0756f8d3e8 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1565,7 +1565,7 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odstránil/a alternatívne adresy %(addresses)s pre túto miestnosť.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odstránil/a alternatívnu adresu %(addresses)s pre túto miestnosť.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s zmenil/a alternatívne adresy pre túto miestnosť.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s zmenil/a hlavnú a alternatívnu/e adresy pre túto miestnosť.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s zmenil/a hlavnú a alternatívne adresy pre túto miestnosť.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s zmenil/a adresy pre túto miestnosť.",
     "You signed in to a new session without verifying it:": "Prihlásili ste sa do novej relácie bez jej overenia:",
     "Verify your other session using one of the options below.": "Overte svoje ostatné relácie pomocou jednej z nižšie uvedených možností.",
@@ -1708,7 +1708,7 @@
     "Manage": "Spravovať",
     "Securely cache encrypted messages locally for them to appear in search results.": "Bezpečne cachovať šifrované správy lokálne, aby sa mohli zobraziť vo vyhľadávaní.",
     "Enable": "Povoliť",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riotu chýbajú niektoré komponenty potrebné na bezpečné cachovanie šifrovaných správ lokálne. Pokiaľ chcete experimentovať s touto funkciou, spravte si svoj vlastný Riot Desktop <nativeLink>s pridanými vyhľadávacími komponentami</nativeLink>.",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riotu chýbajú niektoré komponenty potrebné na bezpečné cachovanie šifrovaných správ lokálne. Pokiaľ chcete experimentovať s touto funkciou, spravte si svoj vlastný Riot Desktop s <nativeLink>pridanými vyhľadávacími komponentami</nativeLink>.",
     "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riotu nemôže bezpečne cachovať šifrované správy lokálne keď beží v prehliadači. Použite <riotLink>Riot Desktop</riotLink>, aby sa šifrované správy zobrazili vo vyhľadávaní.",
     "This session is backing up your keys. ": "Táto relácia zálohuje vaše kľúče. ",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Táto relácia <b>nezálohuje vaše kľúče</b>, ale už máte jednu existujúcu zálohu z ktorej sa môžete obnoviť a postupne pridávať.",
@@ -1727,5 +1727,17 @@
     "Enable desktop notifications for this session": "Povoliť desktopové notifikácie pre túto reláciu",
     "Enable audible notifications for this session": "Povoliť zvukové notifikácie pre túto reláciu",
     "Size must be a number": "Veľkosť musí byť číslo",
-    "Custom font size can only be between %(min)s pt and %(max)s pt": "Vlastná veľkosť písma môže byť len v rozmedzí %(min)s pt až %(max)s pt"
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Vlastná veľkosť písma môže byť len v rozmedzí %(min)s pt až %(max)s pt",
+    "Help us improve Riot": "Pomôžte nám zlepšovať Riot",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Posielať <UsageDataLink>anonymné dáta o používaní</UsageDataLink>, ktoré nám pomôžu zlepšiť Riot. Toto bude vyžadovať <PolicyLink>sušienku</PolicyLink>.",
+    "I want to help": "Chcem pomôcť",
+    "Your homeserver has exceeded its user limit.": "Na vašom domovskom serveri bol prekročený limit počtu používateľov.",
+    "Your homeserver has exceeded one of its resource limits.": "Na vašom domovskom serveri bol prekročený jeden z limitov systémových zdrojov.",
+    "Contact your <a>server admin</a>.": "Kontaktujte svojho <a>administrátora serveru</a>.",
+    "Ok": "Ok",
+    "Set password": "Nastaviť heslo",
+    "To return to your account in future you need to set a password": "Aby ste sa k účtu mohli vrátiť aj neskôr, je potrebné nastaviť heslo",
+    "Restart": "Reštartovať",
+    "Upgrade your Riot": "Upgradujte svoj Riot",
+    "A new version of Riot is available!": "Nová verzia Riotu je dostupná!"
 }

From 6fe5196a193ca3b1c814cf27463a86db0563186b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 8 Jun 2020 11:43:50 +0100
Subject: [PATCH 069/181] send state of lowBandwidth in rageshakes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/rageshake/submit-rageshake.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index 9f9d7898cb..64a1ea0c33 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -145,6 +145,10 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
     if (enabledLabs.length) {
         body.append('enabled_labs', enabledLabs.join(', '));
     }
+    // if low bandwidth mode is enabled, say so over rageshake, it causes many issues
+    if (SettingsStore.getValue("lowBandwidth")) {
+        body.append("lowBandwidth", "enabled");
+    }
 
     // add storage persistence/quota information
     if (navigator.storage && navigator.storage.persisted) {

From 458bea20bebdbff420643306b0f1217f38964e3a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 8 Jun 2020 14:31:53 +0100
Subject: [PATCH 070/181] Load correct fonstSize default value

---
 src/settings/watchers/FontWatcher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index 05c707a57b..5527284cd0 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -32,7 +32,7 @@ export class FontWatcher implements IWatcher {
     }
 
     public start() {
-        this.setRootFontSize(SettingsStore.getValue("baseFontSize") + FontWatcher.SIZE_DIFF);
+        this.setRootFontSize(SettingsStore.getValue("baseFontSize"));
         this.dispatcherRef = dis.register(this.onAction);
     }
 

From a7bc722b3fb15fc87abcfb41d0b5be1d1ba5ccc4 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 8 Jun 2020 14:45:12 +0100
Subject: [PATCH 071/181] Use px where images use px width

---
 src/components/views/rooms/ReadReceiptMarker.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 2fe577377d..1c490f019e 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,7 +23,7 @@ import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";
 import * as sdk from "../../../index";
-import {toRem} from "../../../utils/units";
+import {toPx} from "../../../utils/units";
 
 let bounce = false;
 try {
@@ -149,7 +149,7 @@ export default createReactClass({
             // start at the old height and in the old h pos
 
             startStyles.push({ top: startTopOffset+"px",
-                               left: toRem(oldInfo.left) });
+                               left: toPx(oldInfo.left) });
 
             const reorderTransitionOpts = {
                 duration: 100,
@@ -182,7 +182,7 @@ export default createReactClass({
         }
 
         const style = {
-            left: toRem(this.props.leftOffset),
+            left: toPx(this.props.leftOffset),
             top: '0px',
             visibility: this.props.hidden ? 'hidden' : 'visible',
         };

From de18af35ff58b8ffd4f323a47130ff4f05b331ed Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 08:20:15 -0600
Subject: [PATCH 072/181] Support minimum to open user settings to a particular
 tab

Tabs now have IDs, and we use those IDs to open things. This doesn't do any conversion to typescript, and doesn't add the same feature to the room settings out of concern for the size of diff.
---
 src/components/structures/MatrixChat.tsx      |  8 +++--
 src/components/structures/TabbedView.tsx      | 30 ++++++++-----------
 src/components/structures/UserMenuButton.tsx  | 14 +++++----
 .../views/dialogs/RoomSettingsDialog.js       | 13 ++++++++
 .../views/dialogs/UserSettingsDialog.js       | 24 ++++++++++++++-
 src/dispatcher/actions.ts                     |  1 +
 src/dispatcher/payloads/OpenToTabPayload.ts   | 27 +++++++++++++++++
 7 files changed, 92 insertions(+), 25 deletions(-)
 create mode 100644 src/dispatcher/payloads/OpenToTabPayload.ts

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 69f91047b7..e08381d8fa 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -72,6 +72,7 @@ import {
     hideToast as hideAnalyticsToast
 } from "../../toasts/AnalyticsToast";
 import {showToast as showNotificationsToast} from "../../toasts/DesktopNotificationsToast";
+import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -604,9 +605,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.viewIndexedRoom(payload.roomIndex);
                 break;
             case Action.ViewUserSettings: {
+                const tabPayload = payload as OpenToTabPayload;
                 const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
-                Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {},
-                    /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+                Modal.createTrackedDialog('User settings', '', UserSettingsDialog,
+                    {initialTabId: tabPayload.initialTabId},
+                    /*className=*/null, /*isPriority=*/false, /*isStatic=*/true
+                );
 
                 // View the welcome or home page if we need something to look at
                 this.viewSomethingBehindModal();
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index c0e0e58db8..704dbf8832 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -27,25 +27,20 @@ import { ReactNode } from "react";
  * Represents a tab for the TabbedView.
  */
 export class Tab {
-    public label: string;
-    public icon: string;
-    public body: React.ReactNode;
-
     /**
      * Creates a new tab.
-     * @param {string} tabLabel The untranslated tab label.
-     * @param {string} tabIconClass The class for the tab icon. This should be a simple mask.
-     * @param {React.ReactNode} tabJsx The JSX for the tab container.
+     * @param {string} id The tab's ID.
+     * @param {string} label The untranslated tab label.
+     * @param {string} icon The class for the tab icon. This should be a simple mask.
+     * @param {React.ReactNode} body The JSX for the tab container.
      */
-    constructor(tabLabel: string, tabIconClass: string, tabJsx: React.ReactNode) {
-        this.label = tabLabel;
-        this.icon = tabIconClass;
-        this.body = tabJsx;
+    constructor(public id: string, public label: string, public icon: string, public body: React.ReactNode) {
     }
 }
 
 interface IProps {
     tabs: Tab[];
+    initialTabId?: string;
 }
 
 interface IState {
@@ -53,16 +48,17 @@ interface IState {
 }
 
 export default class TabbedView extends React.Component<IProps, IState> {
-    static propTypes = {
-        // The tabs to show
-        tabs: PropTypes.arrayOf(PropTypes.instanceOf(Tab)).isRequired,
-    };
-
     constructor(props: IProps) {
         super(props);
 
+        let activeTabIndex = 0;
+        if (props.initialTabId) {
+            const tabIndex = props.tabs.findIndex(t => t.id === props.initialTabId);
+            if (tabIndex >= 0) activeTabIndex = tabIndex;
+        }
+
         this.state = {
-            activeTabIndex: 0,
+            activeTabIndex,
         };
     }
 
diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index abf4689aa1..827a279d98 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -23,6 +23,8 @@ import { Action } from "../../dispatcher/actions";
 import { createRef } from "react";
 import { _t } from "../../languageHandler";
 import {ContextMenu, ContextMenuButton} from "./ContextMenu";
+import {USER_NOTIFICATIONS_TAB, USER_SECURITY_TAB} from "../views/dialogs/UserSettingsDialog";
+import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 
 interface IProps {
 }
@@ -80,11 +82,13 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         console.log("TODO: Switch theme");
     };
 
-    private onSettingsOpen = (ev: React.MouseEvent, tabRef: string) => {
+    private onSettingsOpen = (ev: React.MouseEvent, tabId: string) => {
         ev.preventDefault();
         ev.stopPropagation();
 
-        console.log("TODO: Open settings", tabRef);
+        const payload: OpenToTabPayload = {action: Action.ViewUserSettings, initialTabId: tabId};
+        defaultDispatcher.dispatch(payload);
+        this.setState({menuDisplayed: false}); // also close the menu
     };
 
     private onShowArchived = (ev: React.MouseEvent) => {
@@ -147,19 +151,19 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                         <div className="mx_UserMenuButton_contextMenu_optionList">
                             <ul>
                                 <li>
-                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'notifications')}>
+                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}>
                                         <img src={require("../../../res/img/feather-customised/notifications.svg")} width={16} />
                                         <span>{_t("Notification settings")}</span>
                                     </a>
                                 </li>
                                 <li>
-                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'security')}>
+                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, USER_SECURITY_TAB)}>
                                         <img src={require("../../../res/img/feather-customised/lock.svg")} width={16} />
                                         <span>{_t("Security & privacy")}</span>
                                     </a>
                                 </li>
                                 <li>
-                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, 'all')}>
+                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, null)}>
                                         <img src={require("../../../res/img/feather-customised/settings.svg")} width={16} />
                                         <span>{_t("All settings")}</span>
                                     </a>
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index c2b98cd9f3..7ad1001f75 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -30,6 +30,13 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 
+export const ROOM_GENERAL_TAB = "ROOM_GENERAL_TAB";
+export const ROOM_SECURITY_TAB = "ROOM_SECURITY_TAB";
+export const ROOM_ROLES_TAB = "ROOM_ROLES_TAB";
+export const ROOM_NOTIFICATIONS_TAB = "ROOM_NOTIFICATIONS_TAB";
+export const ROOM_BRIDGES_TAB = "ROOM_BRIDGES_TAB";
+export const ROOM_ADVANCED_TAB = "ROOM_ADVANCED_TAB";
+
 export default class RoomSettingsDialog extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
@@ -56,21 +63,25 @@ export default class RoomSettingsDialog extends React.Component {
         const tabs = [];
 
         tabs.push(new Tab(
+            ROOM_GENERAL_TAB,
             _td("General"),
             "mx_RoomSettingsDialog_settingsIcon",
             <GeneralRoomSettingsTab roomId={this.props.roomId} />,
         ));
         tabs.push(new Tab(
+            ROOM_SECURITY_TAB,
             _td("Security & Privacy"),
             "mx_RoomSettingsDialog_securityIcon",
             <SecurityRoomSettingsTab roomId={this.props.roomId} />,
         ));
         tabs.push(new Tab(
+            ROOM_ROLES_TAB,
             _td("Roles & Permissions"),
             "mx_RoomSettingsDialog_rolesIcon",
             <RolesRoomSettingsTab roomId={this.props.roomId} />,
         ));
         tabs.push(new Tab(
+            ROOM_NOTIFICATIONS_TAB,
             _td("Notifications"),
             "mx_RoomSettingsDialog_notificationsIcon",
             <NotificationSettingsTab roomId={this.props.roomId} />,
@@ -78,6 +89,7 @@ export default class RoomSettingsDialog extends React.Component {
 
         if (SettingsStore.isFeatureEnabled("feature_bridge_state")) {
             tabs.push(new Tab(
+                ROOM_BRIDGES_TAB,
                 _td("Bridges"),
                 "mx_RoomSettingsDialog_bridgesIcon",
                 <BridgeSettingsTab roomId={this.props.roomId} />,
@@ -85,6 +97,7 @@ export default class RoomSettingsDialog extends React.Component {
         }
 
         tabs.push(new Tab(
+            ROOM_ADVANCED_TAB,
             _td("Advanced"),
             "mx_RoomSettingsDialog_warningIcon",
             <AdvancedRoomSettingsTab roomId={this.props.roomId} closeSettingsFn={this.props.onFinished} />,
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index 4592d921a9..1f1a8d1523 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -33,9 +33,21 @@ import * as sdk from "../../../index";
 import SdkConfig from "../../../SdkConfig";
 import MjolnirUserSettingsTab from "../settings/tabs/user/MjolnirUserSettingsTab";
 
+export const USER_GENERAL_TAB = "USER_GENERAL_TAB";
+export const USER_APPEARANCE_TAB = "USER_APPEARANCE_TAB";
+export const USER_FLAIR_TAB = "USER_FLAIR_TAB";
+export const USER_NOTIFICATIONS_TAB = "USER_NOTIFICATIONS_TAB";
+export const USER_PREFERENCES_TAB = "USER_PREFERENCES_TAB";
+export const USER_VOICE_TAB = "USER_VOICE_TAB";
+export const USER_SECURITY_TAB = "USER_SECURITY_TAB";
+export const USER_LABS_TAB = "USER_LABS_TAB";
+export const USER_MJOLNIR_TAB = "USER_MJOLNIR_TAB";
+export const USER_HELP_TAB = "USER_HELP_TAB";
+
 export default class UserSettingsDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
+        initialTabId: PropTypes.string,
     };
 
     constructor() {
@@ -63,42 +75,50 @@ export default class UserSettingsDialog extends React.Component {
         const tabs = [];
 
         tabs.push(new Tab(
+            USER_GENERAL_TAB,
             _td("General"),
             "mx_UserSettingsDialog_settingsIcon",
             <GeneralUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
         tabs.push(new Tab(
+            USER_APPEARANCE_TAB,
             _td("Appearance"),
             "mx_UserSettingsDialog_appearanceIcon",
             <AppearanceUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_FLAIR_TAB,
             _td("Flair"),
             "mx_UserSettingsDialog_flairIcon",
             <FlairUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_NOTIFICATIONS_TAB,
             _td("Notifications"),
             "mx_UserSettingsDialog_bellIcon",
             <NotificationUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_PREFERENCES_TAB,
             _td("Preferences"),
             "mx_UserSettingsDialog_preferencesIcon",
             <PreferencesUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_VOICE_TAB,
             _td("Voice & Video"),
             "mx_UserSettingsDialog_voiceIcon",
             <VoiceUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_SECURITY_TAB,
             _td("Security & Privacy"),
             "mx_UserSettingsDialog_securityIcon",
             <SecurityUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
         if (SdkConfig.get()['showLabsSettings'] || SettingsStore.getLabsFeatures().length > 0) {
             tabs.push(new Tab(
+                USER_LABS_TAB,
                 _td("Labs"),
                 "mx_UserSettingsDialog_labsIcon",
                 <LabsUserSettingsTab />,
@@ -106,12 +126,14 @@ export default class UserSettingsDialog extends React.Component {
         }
         if (this.state.mjolnirEnabled) {
             tabs.push(new Tab(
+                USER_MJOLNIR_TAB,
                 _td("Ignored users"),
                 "mx_UserSettingsDialog_mjolnirIcon",
                 <MjolnirUserSettingsTab />,
             ));
         }
         tabs.push(new Tab(
+            USER_HELP_TAB,
             _td("Help & About"),
             "mx_UserSettingsDialog_helpIcon",
             <HelpUserSettingsTab closeSettingsFn={this.props.onFinished} />,
@@ -127,7 +149,7 @@ export default class UserSettingsDialog extends React.Component {
             <BaseDialog className='mx_UserSettingsDialog' hasCancel={true}
                         onFinished={this.props.onFinished} title={_t("Settings")}>
                 <div className='ms_SettingsDialog_content'>
-                    <TabbedView tabs={this._getTabs()} />
+                    <TabbedView tabs={this._getTabs()} initialTabId={this.props.initialTabId} />
                 </div>
             </BaseDialog>
         );
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 60ef61a6e9..c9b5d9e3ad 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -36,6 +36,7 @@ export enum Action {
 
     /**
      * Open the user settings. No additional payload information required.
+     * Optionally can include an OpenToTabPayload.
      */
     ViewUserSettings = "view_user_settings",
 
diff --git a/src/dispatcher/payloads/OpenToTabPayload.ts b/src/dispatcher/payloads/OpenToTabPayload.ts
new file mode 100644
index 0000000000..2877ee053e
--- /dev/null
+++ b/src/dispatcher/payloads/OpenToTabPayload.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface OpenToTabPayload extends ActionPayload {
+    action: Action.ViewUserSettings | string, // TODO: Add room settings action
+
+    /**
+     * The tab ID to open in the settings view to start, if possible.
+     */
+    initialTabId?: string;
+}

From acf78ae475799d955eac3b03017a0278c29ce600 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 09:04:43 -0600
Subject: [PATCH 073/181] Wire up the remaining dialogs

---
 src/components/structures/UserMenuButton.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index 827a279d98..35b5cc4d4e 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -25,6 +25,9 @@ import { _t } from "../../languageHandler";
 import {ContextMenu, ContextMenuButton} from "./ContextMenu";
 import {USER_NOTIFICATIONS_TAB, USER_SECURITY_TAB} from "../views/dialogs/UserSettingsDialog";
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
+import RedesignFeedbackDialog from "../views/dialogs/RedesignFeedbackDialog";
+import Modal from "../../Modal";
+import LogoutDialog from "../views/dialogs/LogoutDialog";
 
 interface IProps {
 }
@@ -95,6 +98,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         ev.preventDefault();
         ev.stopPropagation();
 
+        // TODO: Archived room view (deferred)
         console.log("TODO: Show archived rooms");
     };
 
@@ -102,14 +106,16 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         ev.preventDefault();
         ev.stopPropagation();
 
-        console.log("TODO: Show feedback");
+        Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
+        this.setState({menuDisplayed: false}); // also close the menu
     };
 
     private onSignOutClick = (ev: React.MouseEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
-        console.log("TODO: Sign out");
+        Modal.createTrackedDialog('Logout from LeftPanel', '', LogoutDialog);
+        this.setState({menuDisplayed: false}); // also close the menu
     };
 
     public render() {

From 94ce23aa4b9e835be45df49d4889f9639592b3b4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 09:24:08 -0600
Subject: [PATCH 074/181] Wire up theme changer

---
 src/components/structures/UserMenuButton.tsx | 31 ++++++++++++++++++--
 src/theme.js                                 |  2 +-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index 35b5cc4d4e..40b53a35fb 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -28,6 +28,8 @@ import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import RedesignFeedbackDialog from "../views/dialogs/RedesignFeedbackDialog";
 import Modal from "../../Modal";
 import LogoutDialog from "../views/dialogs/LogoutDialog";
+import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import {getCustomTheme} from "../../theme";
 
 interface IProps {
 }
@@ -35,10 +37,12 @@ interface IProps {
 interface IState {
     user: User;
     menuDisplayed: boolean;
+    isDarkTheme: boolean;
 }
 
 export default class UserMenuButton extends React.Component<IProps, IState> {
     private dispatcherRef: string;
+    private themeWatcherRef: string;
     private buttonRef: React.RefObject<HTMLButtonElement> = createRef();
 
     constructor(props: IProps) {
@@ -47,6 +51,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         this.state = {
             menuDisplayed: false,
             user: MatrixClientPeg.get().getUser(MatrixClientPeg.get().getUserId()),
+            isDarkTheme: this.isUserOnDarkTheme(),
         };
     }
 
@@ -62,8 +67,26 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
 
     public componentDidMount() {
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        this.themeWatcherRef = SettingsStore.watchSetting("theme", null, this.onThemeChanged);
     }
 
+    public componentWillUnmount() {
+        if (this.themeWatcherRef) SettingsStore.unwatchSetting(this.themeWatcherRef);
+        if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
+    }
+
+    private isUserOnDarkTheme(): boolean {
+        const theme = SettingsStore.getValue("theme");
+        if (theme.startsWith("custom-")) {
+            return getCustomTheme(theme.substring(0, 7)).is_dark;
+        }
+        return theme === "dark";
+    }
+
+    private onThemeChanged = () => {
+        this.setState({isDarkTheme: this.isUserOnDarkTheme()});
+    };
+
     private onAction = (ev: ActionPayload) => {
         if (ev.action !== Action.ToggleUserMenu) return; // not interested
 
@@ -82,7 +105,11 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
     };
 
     private onSwitchThemeClick = () => {
-        console.log("TODO: Switch theme");
+        // Disable system theme matching if the user hits this button
+        SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, false);
+
+        const newTheme = this.state.isDarkTheme ? "light" : "dark";
+        SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme);
     };
 
     private onSettingsOpen = (ev: React.MouseEvent, tabId: string) => {
@@ -142,7 +169,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                             <div
                                 className="mx_UserMenuButton_contextMenu_themeButton"
                                 onClick={this.onSwitchThemeClick}
-                                title={_t("Switch to dark mode")}
+                                title={this.state.isDarkTheme ? _t("Switch to light mode") : _t("Switch to dark mode")}
                             >
                                 <img
                                     src={require("../../../res/img/feather-customised/sun.svg")}
diff --git a/src/theme.js b/src/theme.js
index ccb753d601..6ed0657bbc 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -62,7 +62,7 @@ function setCustomThemeVars(customTheme) {
     }
 }
 
-function getCustomTheme(themeName) {
+export function getCustomTheme(themeName) {
     // set css variables
     const customThemes = SettingsStore.getValue("custom_themes");
     if (!customThemes) {

From 50673496c3713b8f265140de3c0645544c5b2196 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 09:32:16 -0600
Subject: [PATCH 075/181] Add hosting link

---
 res/css/structures/_UserMenuButton.scss      |  5 ++++
 src/components/structures/UserMenuButton.tsx | 27 +++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_UserMenuButton.scss b/res/css/structures/_UserMenuButton.scss
index aca5f4253a..0d35c1cbb2 100644
--- a/res/css/structures/_UserMenuButton.scss
+++ b/res/css/structures/_UserMenuButton.scss
@@ -42,6 +42,11 @@ limitations under the License.
         display: flex;
         align-items: center;
 
+        &:nth-child(n + 1) {
+            // The first header will have appropriate padding, subsequent ones need a margin.
+            margin-top: 10px;
+        }
+
         .mx_UserMenuButton_contextMenu_name {
             // Create another flexbox of columns to handle large user IDs
             display: flex;
diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index 40b53a35fb..dc4415ea54 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -30,6 +30,7 @@ import Modal from "../../Modal";
 import LogoutDialog from "../views/dialogs/LogoutDialog";
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import {getCustomTheme} from "../../theme";
+import {getHostingLink} from "../../utils/HostingLink";
 
 interface IProps {
 }
@@ -148,6 +149,28 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
     public render() {
         let contextMenu;
         if (this.state.menuDisplayed) {
+            let hostingLink;
+            const signupLink = getHostingLink("user-context-menu");
+            if (signupLink) {
+                hostingLink = (
+                    <div className="mx_UserMenuButton_contextMenu_header">
+                        {_t(
+                            "<a>Upgrade</a> to your own domain", {},
+                            {
+                                a: sub => (
+                                    <a
+                                        href={signupLink}
+                                        target="_blank"
+                                        rel="noreferrer noopener"
+                                        tabIndex={-1}
+                                    >{sub}</a>
+                                ),
+                            },
+                        )}
+                    </div>
+                );
+            }
+
             const elementRect = this.buttonRef.current.getBoundingClientRect();
             contextMenu = (
                 <ContextMenu
@@ -178,9 +201,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                                 />
                             </div>
                         </div>
-                        <div className="mx_UserMenuButton_contextMenu_header">
-                            TODO: Upgrade prompt
-                        </div>
+                        {hostingLink}
                         <div className="mx_UserMenuButton_contextMenu_optionList">
                             <ul>
                                 <li>

From fd8c056200723a3a9e1aa82e5436e93aa1e16b09 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 09:40:03 -0600
Subject: [PATCH 076/181] Fix i18n

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8575b3a258..3520446c2b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2042,6 +2042,7 @@
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
+    "Switch to light mode": "Switch to light mode",
     "Switch to dark mode": "Switch to dark mode",
     "Switch theme": "Switch theme",
     "Security & privacy": "Security & privacy",

From 35ecaff3995751fde12bdc152a65e34fd588d827 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 8 Jun 2020 16:48:32 +0100
Subject: [PATCH 077/181] Move Settings flag to ts

---
 ...cessibleButton.js => AccessibleButton.tsx} | 65 ++++++++--------
 .../{SettingsFlag.js => SettingsFlag.tsx}     | 76 ++++++++++++-------
 .../{ToggleSwitch.js => ToggleSwitch.tsx}     | 17 ++---
 3 files changed, 89 insertions(+), 69 deletions(-)
 rename src/components/views/elements/{AccessibleButton.js => AccessibleButton.tsx} (71%)
 rename src/components/views/elements/{SettingsFlag.js => SettingsFlag.tsx} (54%)
 rename src/components/views/elements/{ToggleSwitch.js => ToggleSwitch.tsx} (82%)

diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.tsx
similarity index 71%
rename from src/components/views/elements/AccessibleButton.js
rename to src/components/views/elements/AccessibleButton.tsx
index d708a44ab2..f35cd52734 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -15,7 +15,6 @@
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import {Key} from '../../../Keyboard';
 
@@ -27,11 +26,20 @@ import {Key} from '../../../Keyboard';
  * @param {Object} props  react element properties
  * @returns {Object} rendered react
  */
-export default function AccessibleButton(props) {
-    const {element, onClick, children, kind, disabled, ...restProps} = props;
+export default function AccessibleButton({
+    element,
+    onClick,
+    children,
+    kind,
+    disabled,
+    inputRef,
+    className,
+    ...restProps
+}: IProps) {
 
+    const newProps: IAccessibleButtonProps = restProps;
     if (!disabled) {
-        restProps.onClick = onClick;
+        newProps.onClick = onClick,
         // We need to consume enter onKeyDown and space onKeyUp
         // otherwise we are risking also activating other keyboard focusable elements
         // that might receive focus as a result of the AccessibleButtonClick action
@@ -39,7 +47,7 @@ export default function AccessibleButton(props) {
         // And divs which we report as role button to assistive technologies.
         // Browsers handle space and enter keypresses differently and we are only adjusting to the
         // inconsistencies here
-        restProps.onKeyDown = function(e) {
+        newProps.onKeyDown = (e) => {
             if (e.key === Key.ENTER) {
                 e.stopPropagation();
                 e.preventDefault();
@@ -49,8 +57,8 @@ export default function AccessibleButton(props) {
                 e.stopPropagation();
                 e.preventDefault();
             }
-        };
-        restProps.onKeyUp = function(e) {
+        },
+        newProps.onKeyUp = (e) => {
             if (e.key === Key.SPACE) {
                 e.stopPropagation();
                 e.preventDefault();
@@ -60,26 +68,26 @@ export default function AccessibleButton(props) {
                 e.stopPropagation();
                 e.preventDefault();
             }
-        };
+        }
     }
 
     // Pass through the ref - used for keyboard shortcut access to some buttons
-    restProps.ref = restProps.inputRef;
-    delete restProps.inputRef;
+    newProps.ref = inputRef;
 
-    restProps.className = (restProps.className ? restProps.className + " " : "") + "mx_AccessibleButton";
+    newProps.className = (className ? className + " " : "") + "mx_AccessibleButton";
 
     if (kind) {
         // We apply a hasKind class to maintain backwards compatibility with
         // buttons which might not know about kind and break
-        restProps.className += " mx_AccessibleButton_hasKind mx_AccessibleButton_kind_" + kind;
+        newProps.className += " mx_AccessibleButton_hasKind mx_AccessibleButton_kind_" + kind;
     }
 
     if (disabled) {
-        restProps.className += " mx_AccessibleButton_disabled";
-        restProps["aria-disabled"] = true;
+        newProps.className += " mx_AccessibleButton_disabled";
+        newProps["aria-disabled"] = true;
     }
 
+    // React.createElement expects InputHTMLAttributes
     return React.createElement(element, restProps, children);
 }
 
@@ -89,28 +97,25 @@ export default function AccessibleButton(props) {
  * onClick:  (required) Event handler for button activation. Should be
  *           implemented exactly like a normal onClick handler.
  */
-AccessibleButton.propTypes = {
-    children: PropTypes.node,
-    inputRef: PropTypes.oneOfType([
-        // Either a function
-        PropTypes.func,
-        // Or the instance of a DOM native element
-        PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
-    ]),
-    element: PropTypes.string,
-    onClick: PropTypes.func.isRequired,
-
+interface IProps extends React.InputHTMLAttributes<HTMLElement> {
+    inputRef?: React.Ref<HTMLElement>,
+    element?: string;
     // The kind of button, similar to how Bootstrap works.
     // See available classes for AccessibleButton for options.
-    kind: PropTypes.string,
+    kind?: string,
     // The ARIA role
-    role: PropTypes.string,
+    role?: string,
     // The tabIndex
-    tabIndex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-
-    disabled: PropTypes.bool,
+    tabIndex?: number,
+    disabled?: boolean,
+    className?: string,
+    onClick(e?: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>): void;
 };
 
+interface IAccessibleButtonProps extends React.InputHTMLAttributes<HTMLElement> {
+    ref?: React.Ref<HTMLElement>,
+}
+
 AccessibleButton.defaultProps = {
     element: 'div',
     role: 'button',
diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.tsx
similarity index 54%
rename from src/components/views/elements/SettingsFlag.js
rename to src/components/views/elements/SettingsFlag.tsx
index 15f17805a8..2ae9bc3d87 100644
--- a/src/components/views/elements/SettingsFlag.js
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -21,58 +21,76 @@ import createReactClass from 'create-react-class';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
+import StyledCheckbox from "./StyledCheckbox";
 
-export default createReactClass({
-    displayName: 'SettingsFlag',
-    propTypes: {
-        name: PropTypes.string.isRequired,
-        level: PropTypes.string.isRequired,
-        roomId: PropTypes.string, // for per-room settings
-        label: PropTypes.string, // untranslated
-        onChange: PropTypes.func,
-        isExplicit: PropTypes.bool,
-    },
+interface IProps {
+    name: string,
+    level: string,
+    roomId?: string, // for per-room settings
+    label?: string, // untranslated
+    isExplicit: boolean,
+    // XXX: once design replaces all toggles make this the default
+    useCheckbox?: boolean,
+    onChange(checked: boolean): void,
+}
 
-    getInitialState: function() {
-        return {
+interface IState {
+    // XXX: make this generic when the settings store is typed
+    value: any;
+}
+
+export default class SettingsFlag extends React.Component<IProps, IState> {
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
             value: SettingsStore.getValueAt(
                 this.props.level,
                 this.props.name,
                 this.props.roomId,
                 this.props.isExplicit,
             ),
-        };
-    },
-
-    onChange: function(checked) {
-        if (this.props.group && !checked) return;
+        }
+    }
 
+    private onChange = (checked: boolean): void => {
         this.save(checked);
         this.setState({ value: checked });
         if (this.props.onChange) this.props.onChange(checked);
-    },
+    }
 
-    save: function(val = undefined) {
+    private checkBoxOnChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        this.onChange(e.target.checked);
+    }
+
+    private save = (val?: any): void => {
         return SettingsStore.setValue(
             this.props.name,
             this.props.roomId,
             this.props.level,
             val !== undefined ? val : this.state.value,
         );
-    },
+    }
 
-    render: function() {
+    public render() {
         const canChange = SettingsStore.canSetValue(this.props.name, this.props.roomId, this.props.level);
 
         let label = this.props.label;
         if (!label) label = SettingsStore.getDisplayName(this.props.name, this.props.level);
         else label = _t(label);
 
-        return (
-            <div className="mx_SettingsFlag">
-                <span className="mx_SettingsFlag_label">{label}</span>
-                <ToggleSwitch checked={this.state.value} onChange={this.onChange} disabled={!canChange} aria-label={label} />
-            </div>
-        );
-    },
-});
+        if (this.props.useCheckbox) {
+            return <StyledCheckbox checked={this.state.value} onChange={this.checkBoxOnChange} disabled={!canChange} >
+                {label}
+            </StyledCheckbox>;
+        } else {
+            return (
+                <div className="mx_SettingsFlag">
+                    <span className="mx_SettingsFlag_label">{label}</span>
+                    <ToggleSwitch checked={this.state.value} onChange={this.onChange} disabled={!canChange} aria-label={label} />
+                </div>
+            );
+        }
+    }
+}
diff --git a/src/components/views/elements/ToggleSwitch.js b/src/components/views/elements/ToggleSwitch.tsx
similarity index 82%
rename from src/components/views/elements/ToggleSwitch.js
rename to src/components/views/elements/ToggleSwitch.tsx
index bea1a85555..4cb2fa1ef1 100644
--- a/src/components/views/elements/ToggleSwitch.js
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -15,14 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
-import PropTypes from "prop-types";
+import React, { EventHandler } from "react";
 import classNames from "classnames";
 import * as sdk from "../../../index";
 
 // Controlled Toggle Switch element, written with Accessibility in mind
-const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => {
-    const _onClick = (e) => {
+export default ({checked, disabled=false, onChange, ...props}: IProps) => {
+    const _onClick = () => {
         if (disabled) return;
         onChange(!checked);
     };
@@ -47,15 +46,13 @@ const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => {
     );
 };
 
-ToggleSwitch.propTypes = {
+interface IProps {
     // Whether or not this toggle is in the 'on' position.
-    checked: PropTypes.bool.isRequired,
+    checked: boolean,
 
     // Whether or not the user can interact with the switch
-    disabled: PropTypes.bool,
+    disabled: boolean,
 
     // Called when the checked state changes. First argument will be the new state.
-    onChange: PropTypes.func.isRequired,
+    onChange(checked: boolean): void,
 };
-
-export default ToggleSwitch;

From 26eaef848b7649a7796fabb3ebb668099a6e70f5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 8 Jun 2020 16:53:19 +0100
Subject: [PATCH 078/181] Use Element instead of HTMLElement

---
 src/components/views/elements/AccessibleButton.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index f35cd52734..6dcadaf63f 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -97,8 +97,8 @@ export default function AccessibleButton({
  * onClick:  (required) Event handler for button activation. Should be
  *           implemented exactly like a normal onClick handler.
  */
-interface IProps extends React.InputHTMLAttributes<HTMLElement> {
-    inputRef?: React.Ref<HTMLElement>,
+interface IProps extends React.InputHTMLAttributes<Element> {
+    inputRef?: React.Ref<Element>,
     element?: string;
     // The kind of button, similar to how Bootstrap works.
     // See available classes for AccessibleButton for options.
@@ -109,11 +109,11 @@ interface IProps extends React.InputHTMLAttributes<HTMLElement> {
     tabIndex?: number,
     disabled?: boolean,
     className?: string,
-    onClick(e?: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>): void;
+    onClick(e?: React.MouseEvent<Element> | React.KeyboardEvent<Element>): void;
 };
 
-interface IAccessibleButtonProps extends React.InputHTMLAttributes<HTMLElement> {
-    ref?: React.Ref<HTMLElement>,
+interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
+    ref?: React.Ref<Element>,
 }
 
 AccessibleButton.defaultProps = {

From d6a532040ec60bc2e752703f98276f1b1d92a602 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 8 Jun 2020 16:57:39 +0100
Subject: [PATCH 079/181] lint

---
 src/components/views/elements/AccessibleButton.tsx | 2 +-
 src/components/views/elements/ToggleSwitch.tsx     | 2 +-
 src/components/views/rooms/RoomSublist2.tsx        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 6dcadaf63f..ecd4847d0d 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -109,7 +109,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
     tabIndex?: number,
     disabled?: boolean,
     className?: string,
-    onClick(e?: React.MouseEvent<Element> | React.KeyboardEvent<Element>): void;
+    onClick?(e?: React.MouseEvent<Element> | React.KeyboardEvent<Element>): void;
 };
 
 interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
diff --git a/src/components/views/elements/ToggleSwitch.tsx b/src/components/views/elements/ToggleSwitch.tsx
index 4cb2fa1ef1..902538052b 100644
--- a/src/components/views/elements/ToggleSwitch.tsx
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -20,7 +20,7 @@ import classNames from "classnames";
 import * as sdk from "../../../index";
 
 // Controlled Toggle Switch element, written with Accessibility in mind
-export default ({checked, disabled=false, onChange, ...props}: IProps) => {
+export default ({checked, disabled = false, onChange, ...props}: IProps) => {
     const _onClick = () => {
         if (disabled) return;
         onChange(!checked);
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index d3bb19729d..590c38931e 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -182,7 +182,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                                 tabIndex={tabIndex}
                                 className={"mx_RoomSubList_label"}
                                 role="treeitem"
-                                aria-level="1"
+                                aria-level={1}
                             >
                                 {chevron}
                                 <span>{this.props.label}</span>

From bd58f6ea7bfe77decb86f20bcfa5b696a6240cdc Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 8 Jun 2020 17:38:07 +0100
Subject: [PATCH 080/181] Hide checkbox on dark backgrounds

---
 res/css/views/elements/_StyledCheckbox.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/css/views/elements/_StyledCheckbox.scss b/res/css/views/elements/_StyledCheckbox.scss
index 14081f1e99..9cb82349ca 100644
--- a/res/css/views/elements/_StyledCheckbox.scss
+++ b/res/css/views/elements/_StyledCheckbox.scss
@@ -48,6 +48,8 @@ limitations under the License.
             border-radius: $border-radius;
 
             img {
+                display: none;
+
                 height: 100%;
                 width: 100%;
                 filter: invert(100%);
@@ -57,6 +59,10 @@ limitations under the License.
         &:checked + label > .mx_Checkbox_background {
             background: $accent-color;
             border-color: $accent-color;
+
+            img {
+                display: block;
+            }
         }
 
         & + label > *:not(.mx_Checkbox_background) {

From de4c2fe3d9b2fb09e07daf0ff9190d7f838a98a6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 11:06:21 -0600
Subject: [PATCH 081/181] Use real buttons in user menu

---
 res/css/structures/_UserMenuButton.scss      |  2 +-
 src/components/structures/UserMenuButton.tsx | 25 ++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/res/css/structures/_UserMenuButton.scss b/res/css/structures/_UserMenuButton.scss
index 0d35c1cbb2..1f4183f8d6 100644
--- a/res/css/structures/_UserMenuButton.scss
+++ b/res/css/structures/_UserMenuButton.scss
@@ -129,7 +129,7 @@ limitations under the License.
                 margin: 0;
                 padding: 20px 0 0;
 
-                a {
+                .mx_AccessibleButton {
                     text-decoration: none;
                     color: $primary-fg-color;
                     font-size: $font-15px;
diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index dc4415ea54..d8f96d4a91 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -31,6 +31,7 @@ import LogoutDialog from "../views/dialogs/LogoutDialog";
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import {getCustomTheme} from "../../theme";
 import {getHostingLink} from "../../utils/HostingLink";
+import AccessibleButton from "../views/elements/AccessibleButton";
 
 interface IProps {
 }
@@ -205,44 +206,44 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                         <div className="mx_UserMenuButton_contextMenu_optionList">
                             <ul>
                                 <li>
-                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}>
+                                    <AccessibleButton onClick={(e) => this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}>
                                         <img src={require("../../../res/img/feather-customised/notifications.svg")} width={16} />
                                         <span>{_t("Notification settings")}</span>
-                                    </a>
+                                    </AccessibleButton>
                                 </li>
                                 <li>
-                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, USER_SECURITY_TAB)}>
+                                    <AccessibleButton onClick={(e) => this.onSettingsOpen(e, USER_SECURITY_TAB)}>
                                         <img src={require("../../../res/img/feather-customised/lock.svg")} width={16} />
                                         <span>{_t("Security & privacy")}</span>
-                                    </a>
+                                    </AccessibleButton>
                                 </li>
                                 <li>
-                                    <a href={"#"} onClick={(e) => this.onSettingsOpen(e, null)}>
+                                    <AccessibleButton onClick={(e) => this.onSettingsOpen(e, null)}>
                                         <img src={require("../../../res/img/feather-customised/settings.svg")} width={16} />
                                         <span>{_t("All settings")}</span>
-                                    </a>
+                                    </AccessibleButton>
                                 </li>
                                 <li>
-                                    <a href={"#"} onClick={this.onShowArchived}>
+                                    <AccessibleButton onClick={this.onShowArchived}>
                                         <img src={require("../../../res/img/feather-customised/archive.svg")} width={16} />
                                         <span>{_t("Archived rooms")}</span>
-                                    </a>
+                                    </AccessibleButton>
                                 </li>
                                 <li>
-                                    <a href={"#"} onClick={this.onProvideFeedback}>
+                                    <AccessibleButton onClick={this.onProvideFeedback}>
                                         <img src={require("../../../res/img/feather-customised/message-circle.svg")} width={16} />
                                         <span>{_t("Feedback")}</span>
-                                    </a>
+                                    </AccessibleButton>
                                 </li>
                             </ul>
                         </div>
                         <div className="mx_UserMenuButton_contextMenu_optionList">
                             <ul>
                                 <li>
-                                    <a href={"#"} onClick={this.onSignOutClick}>
+                                    <AccessibleButton onClick={this.onSignOutClick}>
                                         <img src={require("../../../res/img/feather-customised/sign-out.svg")} width={16} />
                                         <span>{_t("Sign out")}</span>
-                                    </a>
+                                    </AccessibleButton>
                                 </li>
                             </ul>
                         </div>

From b4bdb23f5f7bf88205c7f2a50508f9840ff81b0b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 8 Jun 2020 19:02:36 +0100
Subject: [PATCH 082/181] Clean up font scaling appearance

---
 .../settings/tabs/user/_AppearanceUserSettingsTab.scss      | 4 ++++
 .../views/settings/tabs/user/AppearanceUserSettingsTab.tsx  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index e82ae3c575..7308bb7177 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -43,3 +43,7 @@ limitations under the License.
     padding-left: 20px;
     padding-right: 5px;
 }
+
+.mx_SettingsTab_customFontSizeField {
+    margin-left: calc($font-16px + 10px);
+}
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 2b58e0e28e..e7f22d5ea2 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -281,7 +281,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                     values={[13, 15, 16, 18, 20]}
                     value={parseInt(this.state.fontSize, 10)}
                     onSelectionChange={this.onFontSizeChanged}
-                    displayFunc={value => ""}
+                    displayFunc={_ => ""}
                     disabled={this.state.useCustomFontSize}
                 />
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_largeText">Aa</div>
@@ -290,9 +290,10 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                 name="useCustomFontSize"
                 level={SettingLevel.ACCOUNT}
                 onChange={(checked) => this.setState({useCustomFontSize: checked})}
+                useCheckbox={true}
             />
             <Field
-                type="text"
+                type="number"
                 label={_t("Font size")}
                 autoComplete="off"
                 placeholder={this.state.fontSize.toString()}
@@ -301,6 +302,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                 onValidate={this.onValidateFontSize}
                 onChange={(value) => this.setState({fontSize: value.target.value})}
                 disabled={!this.state.useCustomFontSize}
+                className="mx_SettingsTab_customFontSizeField"
             />
         </div>;
     }

From 21c8611300e27ef6d731b6f60a4b5b21115165d9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 12:14:10 -0600
Subject: [PATCH 083/181] Convert FormattingUtils to TypeScript and add badge
 utility function

The new function is to be used in the new room list.
---
 ...{FormattingUtils.js => FormattingUtils.ts} | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)
 rename src/utils/{FormattingUtils.js => FormattingUtils.ts} (81%)

diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.ts
similarity index 81%
rename from src/utils/FormattingUtils.js
rename to src/utils/FormattingUtils.ts
index b932214530..ed1727d190 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 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.
@@ -21,8 +21,8 @@ import { _t } from '../languageHandler';
  * formats numbers to fit into ~3 characters, suitable for badge counts
  * e.g: 999, 9.9K, 99K, 0.9M, 9.9M, 99M, 0.9B, 9.9B
  */
-export function formatCount(count) {
-   if (count < 1000) return count;
+export function formatCount(count: number): string {
+   if (count < 1000) return count.toString();
    if (count < 10000) return (count / 1000).toFixed(1) + "K";
    if (count < 100000) return (count / 1000).toFixed(0) + "K";
    if (count < 10000000) return (count / 1000000).toFixed(1) + "M";
@@ -34,7 +34,7 @@ export function formatCount(count) {
  * Format a count showing the whole number but making it a bit more readable.
  * e.g: 1000 => 1,000
  */
-export function formatCountLong(count) {
+export function formatCountLong(count: number): string {
     const formatter = new Intl.NumberFormat();
     return formatter.format(count)
 }
@@ -43,7 +43,7 @@ export function formatCountLong(count) {
  * format a size in bytes into a human readable form
  * e.g: 1024 -> 1.00 KB
  */
-export function formatBytes(bytes, decimals = 2) {
+export function formatBytes(bytes: number, decimals = 2): string {
     if (bytes === 0) return '0 Bytes';
 
     const k = 1024;
@@ -62,7 +62,7 @@ export function formatBytes(bytes, decimals = 2) {
  *
  * @return {string}
  */
-export function formatCryptoKey(key) {
+export function formatCryptoKey(key: string): string {
     return key.match(/.{1,4}/g).join(" ");
 }
 /**
@@ -72,7 +72,7 @@ export function formatCryptoKey(key) {
  *
  * @return {number}
  */
-export function hashCode(str) {
+export function hashCode(str: string): number {
     let hash = 0;
     let i;
     let chr;
@@ -87,7 +87,7 @@ export function hashCode(str) {
     return Math.abs(hash);
 }
 
-export function getUserNameColorClass(userId) {
+export function getUserNameColorClass(userId: string): string {
     const colorNumber = (hashCode(userId) % 8) + 1;
     return `mx_Username_color${colorNumber}`;
 }
@@ -103,7 +103,7 @@ export function getUserNameColorClass(userId) {
  * @returns {string} a string constructed by joining `items` with a comma
  * between each item, but with the last item appended as " and [lastItem]".
  */
-export function formatCommaSeparatedList(items, itemLimit) {
+export function formatCommaSeparatedList(items: string[], itemLimit?: number): string {
     const remaining = itemLimit === undefined ? 0 : Math.max(
         items.length - itemLimit, 0,
     );
@@ -119,3 +119,13 @@ export function formatCommaSeparatedList(items, itemLimit) {
         return _t("%(items)s and %(lastItem)s", { items: items.join(', '), lastItem: lastItem });
     }
 }
+
+/**
+ * Formats a number into a 'minimal' badge count (9, 99, 99+).
+ * @param count The number to convert
+ * @returns The badge count, stringified.
+ */
+export function formatMinimalBadgeCount(count: number): string {
+    if (count < 100) return count.toString();
+    return "99+";
+}

From 086b9101fa8720f698644b934e6886ad1563e567 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 13:42:18 -0600
Subject: [PATCH 084/181] Add sublist badge counts to new room list

Also add IDLE state to rooms
---
 res/css/_components.scss                      |   1 +
 res/css/views/rooms/_NotificationBadge.scss   |  72 +++++
 res/css/views/rooms/_RoomSublist2.scss        |  35 ++-
 res/css/views/rooms/_RoomTile2.scss           |  34 +--
 .../views/rooms/NotificationBadge.tsx         | 279 ++++++++++++++++++
 src/components/views/rooms/RoomSublist2.tsx   |  64 ++--
 src/components/views/rooms/RoomTile2.tsx      | 109 +------
 7 files changed, 408 insertions(+), 186 deletions(-)
 create mode 100644 res/css/views/rooms/_NotificationBadge.scss
 create mode 100644 src/components/views/rooms/NotificationBadge.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 62bec5ad62..61e3018725 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -170,6 +170,7 @@
 @import "./views/rooms/_MemberList.scss";
 @import "./views/rooms/_MessageComposer.scss";
 @import "./views/rooms/_MessageComposerFormatBar.scss";
+@import "./views/rooms/_NotificationBadge.scss";
 @import "./views/rooms/_PinnedEventTile.scss";
 @import "./views/rooms/_PinnedEventsPanel.scss";
 @import "./views/rooms/_PresenceLabel.scss";
diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss
new file mode 100644
index 0000000000..609e41c583
--- /dev/null
+++ b/res/css/views/rooms/_NotificationBadge.scss
@@ -0,0 +1,72 @@
+/*
+Copyright 2020 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_NotificationBadge {
+    &:not(.mx_NotificationBadge_visible) {
+        display: none;
+    }
+
+    // Badges are structured a bit weirdly to work around issues with non-monospace
+    // font styles. The badge pill is actually a background div and the count floats
+    // within that. For example:
+    //
+    //  ( 99+ ) <-- Rounded pill is a _bg class.
+    //     ^- The count is an element floating within that.
+
+    &.mx_NotificationBadge_visible {
+        background-color: $roomtile2-badge-color;
+        margin-right: 14px;
+
+        // Create a flexbox to order the count a bit easier
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        &.mx_NotificationBadge_highlighted {
+            // TODO: Use a more specific variable
+            background-color: $warning-color;
+        }
+
+        // These are the 3 background types
+
+        &.mx_NotificationBadge_dot {
+            width: 6px;
+            height: 6px;
+            border-radius: 6px;
+            margin-right: 18px;
+        }
+
+        &.mx_NotificationBadge_2char {
+            width: 16px;
+            height: 16px;
+            border-radius: 16px;
+        }
+
+        &.mx_NotificationBadge_3char {
+            width: 26px;
+            height: 16px;
+            border-radius: 16px;
+        }
+
+        // The following is the floating badge
+
+        .mx_NotificationBadge_count {
+            font-size: $font-10px;
+            line-height: $font-14px;
+            color: #fff; // TODO: Variable
+        }
+    }
+}
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index e6e5af3b48..cfb9bc3b6d 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -30,11 +30,36 @@ limitations under the License.
     margin-bottom: 12px;
 
     .mx_RoomSublist2_headerContainer {
-        text-transform: uppercase;
-        opacity: 0.5;
-        line-height: $font-16px;
-        font-size: $font-12px;
-        padding-bottom: 8px;
+        // Create a flexbox to make ordering easy
+        display: flex;
+        align-items: center;
+
+        .mx_RoomSublist2_badgeContainer {
+            opacity: 0.8;
+            padding-right: 7px;
+
+            // Create another flexbox row because it's super easy to position the badge at
+            // the end this way.
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+        }
+
+        .mx_RoomSublist2_headerText {
+            text-transform: uppercase;
+            opacity: 0.5;
+            line-height: $font-16px;
+            font-size: $font-12px;
+            padding-bottom: 8px;
+
+            width: 100%;
+            flex: 1;
+
+            // Ellipsize any text overflow
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
     }
 
     .mx_RoomSublist2_resizeBox {
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 3151bb8716..41c9469bc1 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -50,11 +50,14 @@ limitations under the License.
         // TODO: Ellipsis on the name and preview
 
         .mx_RoomTile2_name {
-            font-weight: 600;
             font-size: $font-14px;
             line-height: $font-19px;
         }
 
+        .mx_RoomTile2_name.mx_RoomTile2_nameHasUnreadEvents {
+            font-weight: 600;
+        }
+
         .mx_RoomTile2_messagePreview {
             font-size: $font-13px;
             line-height: $font-18px;
@@ -70,34 +73,5 @@ limitations under the License.
         display: flex;
         align-items: center;
         justify-content: flex-end;
-
-        .mx_RoomTile2_badge {
-            background-color: $roomtile2-badge-color;
-
-            &:not(.mx_RoomTile2_badgeEmpty) {
-                border-radius: 16px;
-                font-size: $font-10px;
-                line-height: $font-14px;
-                text-align: center;
-                font-weight: bold;
-                margin-right: 14px;
-                color: #fff; // TODO: Variable
-
-                // TODO: Confirm padding on counted badges
-                padding: 2px 5px;
-            }
-
-            &.mx_RoomTile2_badgeEmpty {
-                width: 6px;
-                height: 6px;
-                border-radius: 6px;
-                margin-right: 18px;
-            }
-
-            &.mx_RoomTile2_badgeHighlight {
-                // TODO: Use a more specific variable
-                background-color: $warning-color;
-            }
-        }
     }
 }
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
new file mode 100644
index 0000000000..a77d2fc8d0
--- /dev/null
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -0,0 +1,279 @@
+/*
+Copyright 2020 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 classNames from "classnames";
+import { formatMinimalBadgeCount } from "../../../utils/FormattingUtils";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
+import AccessibleButton from "../../views/elements/AccessibleButton";
+import RoomAvatar from "../../views/avatars/RoomAvatar";
+import dis from '../../../dispatcher/dispatcher';
+import { Key } from "../../../Keyboard";
+import * as RoomNotifs from '../../../RoomNotifs';
+import { EffectiveMembership, getEffectiveMembership } from "../../../stores/room-list/membership";
+import * as Unread from '../../../Unread';
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import ActiveRoomObserver from "../../../ActiveRoomObserver";
+import { EventEmitter } from "events";
+import { arrayDiff } from "../../../utils/arrays";
+
+export const NOTIFICATION_STATE_UPDATE = "update";
+
+export enum NotificationColor {
+    // Inverted (None -> Red) because we do integer comparisons on this
+    None, // nothing special
+    Bold, // no badge, show as unread
+    Grey, // unread notified messages
+    Red,  // unread pings
+}
+
+export interface INotificationState extends EventEmitter {
+    symbol?: string;
+    count: number;
+    color: NotificationColor;
+}
+
+interface IProps {
+    notification: INotificationState;
+
+    /**
+     * If true, the badge will conditionally display a badge without count for the user.
+     */
+    allowNoCount: boolean;
+}
+
+interface IState {
+}
+
+export default class NotificationBadge extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+        this.props.notification.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+    }
+
+    public componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (prevProps.notification) {
+            prevProps.notification.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+        }
+
+        this.props.notification.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+    }
+
+    private onNotificationUpdate = () => {
+        this.forceUpdate(); // notification state changed - update
+    };
+
+    public render(): React.ReactElement {
+        // Don't show a badge if we don't need to
+        if (this.props.notification.color <= NotificationColor.Bold) return null;
+
+        const hasNotif = this.props.notification.color >= NotificationColor.Red;
+        const hasCount = this.props.notification.color >= NotificationColor.Grey;
+        const isEmptyBadge = this.props.allowNoCount && !localStorage.getItem("mx_rl_rt_badgeCount");
+
+        let symbol = this.props.notification.symbol || formatMinimalBadgeCount(this.props.notification.count);
+        if (isEmptyBadge) symbol = "";
+
+        const classes = classNames({
+            'mx_NotificationBadge': true,
+            'mx_NotificationBadge_visible': hasCount,
+            'mx_NotificationBadge_highlighted': hasNotif,
+            'mx_NotificationBadge_dot': isEmptyBadge,
+            'mx_NotificationBadge_2char': symbol.length > 0 && symbol.length < 3,
+            'mx_NotificationBadge_3char': symbol.length > 2,
+        });
+
+        return (
+            <div className={classes}>
+                <span className="mx_NotificationBadge_count">{symbol}</span>
+            </div>
+        );
+    }
+}
+
+export class RoomNotificationState extends EventEmitter {
+    private _symbol: string;
+    private _count: number;
+    private _color: NotificationColor;
+
+    constructor(private room: Room) {
+        super();
+        this.room.on("Room.receipt", this.handleRoomEventUpdate);
+        this.room.on("Room.timeline", this.handleRoomEventUpdate);
+        this.room.on("Room.redaction", this.handleRoomEventUpdate);
+        MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
+        this.updateNotificationState();
+    }
+
+    public get symbol(): string {
+        return this._symbol;
+    }
+
+    public get count(): number {
+        return this._count;
+    }
+
+    public get color(): NotificationColor {
+        return this._color;
+    }
+
+    private get roomIsInvite(): boolean {
+        return getEffectiveMembership(this.room.getMyMembership()) === EffectiveMembership.Invite;
+    }
+
+    public dispose(): void {
+        this.room.removeListener("Room.receipt", this.handleRoomEventUpdate);
+        this.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
+        this.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
+        }
+    }
+
+    private handleRoomEventUpdate = (event: MatrixEvent) => {
+        const roomId = event.getRoomId();
+
+        if (roomId !== this.room.roomId) return; // ignore - not for us
+        this.updateNotificationState();
+    };
+
+    private updateNotificationState() {
+        const before = {count: this.count, symbol: this.symbol, color: this.color};
+
+        if (this.roomIsInvite) {
+            this._color = NotificationColor.Red;
+            this._symbol = "!";
+            this._count = 1; // not used, technically
+        } else {
+            const redNotifs = RoomNotifs.getUnreadNotificationCount(this.room, 'highlight');
+            const greyNotifs = RoomNotifs.getUnreadNotificationCount(this.room, 'total');
+
+            // For a 'true count' we pick the grey notifications first because they include the
+            // red notifications. If we don't have a grey count for some reason we use the red
+            // count. If that count is broken for some reason, assume zero. This avoids us showing
+            // a badge for 'NaN' (which formats as 'NaNB' for NaN Billion).
+            const trueCount = greyNotifs ? greyNotifs : (redNotifs ? redNotifs : 0);
+
+            // Note: we only set the symbol if we have an actual count. We don't want to show
+            // zero on badges.
+
+            if (redNotifs > 0) {
+                this._color = NotificationColor.Red;
+                this._count = trueCount;
+                this._symbol = null; // symbol calculated by component
+            } else if (greyNotifs > 0) {
+                this._color = NotificationColor.Grey;
+                this._count = trueCount;
+                this._symbol = null; // symbol calculated by component
+            } else {
+                // We don't have any notified messages, but we might have unread messages. Let's
+                // find out.
+                const hasUnread = Unread.doesRoomHaveUnreadMessages(this.room);
+                if (hasUnread) {
+                    this._color = NotificationColor.Bold;
+                } else {
+                    this._color = NotificationColor.None;
+                }
+
+                // no symbol or count for this state
+                this._count = 0;
+                this._symbol = null;
+            }
+        }
+
+        // finally, publish an update if needed
+        const after = {count: this.count, symbol: this.symbol, color: this.color};
+        if (JSON.stringify(before) !== JSON.stringify(after)) {
+            this.emit(NOTIFICATION_STATE_UPDATE);
+        }
+    }
+}
+
+export class ListNotificationState extends EventEmitter {
+    private _count: number;
+    private _color: NotificationColor;
+    private rooms: Room[] = [];
+    private states: { [roomId: string]: RoomNotificationState } = {};
+
+    constructor(private byTileCount = false) {
+        super();
+    }
+
+    public get symbol(): string {
+        return null; // This notification state doesn't support symbols
+    }
+
+    public get count(): number {
+        return this._count;
+    }
+
+    public get color(): NotificationColor {
+        return this._color;
+    }
+
+    public setRooms(rooms: Room[]) {
+        // If we're only concerned about the tile count, don't bother setting up listeners.
+        if (this.byTileCount) {
+            this.rooms = rooms;
+            this.calculateTotalState();
+            return;
+        }
+
+        const oldRooms = this.rooms;
+        const diff = arrayDiff(oldRooms, rooms);
+        for (const oldRoom of diff.removed) {
+            const state = this.states[oldRoom.roomId];
+            delete this.states[oldRoom.roomId];
+            state.off(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
+            state.dispose();
+        }
+        for (const newRoom of diff.added) {
+            const state = new RoomNotificationState(newRoom);
+            state.on(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
+            this.states[newRoom.roomId] = state;
+        }
+
+        this.calculateTotalState();
+    }
+
+    private onRoomNotificationStateUpdate = () => {
+        this.calculateTotalState();
+    };
+
+    private calculateTotalState() {
+        const before = {count: this.count, symbol: this.symbol, color: this.color};
+
+        if (this.byTileCount) {
+            this._color = NotificationColor.Red;
+            this._count = this.rooms.length;
+        } else {
+            this._count = 0;
+            this._color = NotificationColor.None;
+            for (const state of Object.values(this.states)) {
+                this._count += state.count;
+                this._color = Math.max(this.color, state.color);
+            }
+        }
+
+        // finally, publish an update if needed
+        const after = {count: this.count, symbol: this.symbol, color: this.color};
+        if (JSON.stringify(before) !== JSON.stringify(after)) {
+            this.emit(NOTIFICATION_STATE_UPDATE);
+        }
+    }
+}
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 650a3ae645..cd27156cbd 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -26,7 +26,7 @@ import AccessibleButton from "../../views/elements/AccessibleButton";
 import RoomTile2 from "./RoomTile2";
 import { ResizableBox, ResizeCallbackData } from "react-resizable";
 import { ListLayout } from "../../../stores/room-list/ListLayout";
-import { DefaultTagID, TagID } from "../../../stores/room-list/models";
+import NotificationBadge, { ListNotificationState } from "./NotificationBadge";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -56,13 +56,19 @@ interface IProps {
 }
 
 interface IState {
+    notificationState: ListNotificationState;
 }
 
 export default class RoomSublist2 extends React.Component<IProps, IState> {
     private headerButton = createRef();
 
-    private hasTiles(): boolean {
-        return this.numTiles > 0;
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            notificationState: new ListNotificationState(this.props.isInvite),
+        };
+        this.state.notificationState.setRooms(this.props.rooms);
     }
 
     private get numTiles(): number {
@@ -70,6 +76,10 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         return (this.props.rooms || []).length;
     }
 
+    public componentDidUpdate() {
+        this.state.notificationState.setRooms(this.props.rooms);
+    }
+
     private onAddRoom = (e) => {
         e.stopPropagation();
         if (this.props.onAddRoom) this.props.onAddRoom();
@@ -106,13 +116,6 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
     }
 
     private renderHeader(): React.ReactElement {
-        // TODO: Handle badge count
-        // const notifications = !this.props.isInvite
-        //     ? RoomNotifs.aggregateNotificationCount(this.props.rooms)
-        //     : {count: 0, highlight: true};
-        // const notifCount = notifications.count;
-        // const notifHighlight = notifications.highlight;
-
         // TODO: Title on collapsed
         // TODO: Incoming call box
 
@@ -123,42 +126,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     const tabIndex = isActive ? 0 : -1;
 
                     // TODO: Collapsed state
-                    // TODO: Handle badge count
-                    // let badge;
-                    // if (true) { // !isCollapsed
-                    //     const showCount = localStorage.getItem("mx_rls_count") || notifHighlight;
-                    //     const badgeClasses = classNames({
-                    //         'mx_RoomSublist2_badge': true,
-                    //         'mx_RoomSublist2_badgeHighlight': notifHighlight,
-                    //         'mx_RoomSublist2_badgeEmpty': !showCount,
-                    //     });
-                    //     // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
-                    //     if (notifCount > 0) {
-                    //         const count = <div>{FormattingUtils.formatCount(notifCount)}</div>;
-                    //         badge = (
-                    //             <AccessibleButton
-                    //                 tabIndex={tabIndex}
-                    //                 className={badgeClasses}
-                    //                 aria-label={_t("Jump to first unread room.")}
-                    //             >
-                    //                 {showCount ? count : null}
-                    //             </AccessibleButton>
-                    //         );
-                    //     } else if (this.props.isInvite && this.hasTiles()) {
-                    //         // Render the `!` badge for invites
-                    //         badge = (
-                    //             <AccessibleButton
-                    //                 tabIndex={tabIndex}
-                    //                 className={badgeClasses}
-                    //                 aria-label={_t("Jump to first invite.")}
-                    //             >
-                    //                 <div>
-                    //                     {FormattingUtils.formatCount(this.numTiles)}
-                    //                 </div>
-                    //             </AccessibleButton>
-                    //         );
-                    //     }
-                    // }
+
+                    const badge = <NotificationBadge allowNoCount={false} notification={this.state.notificationState}/>;
 
                     // TODO: Aux button
                     // let addRoomButton = null;
@@ -185,6 +154,9 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                             >
                                 <span>{this.props.label}</span>
                             </AccessibleButton>
+                            <div className="mx_RoomSublist2_badgeContainer">
+                                {badge}
+                            </div>
                         </div>
                     );
                 }}
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 09d7b46ba5..d4f64e4571 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -25,13 +25,8 @@ import AccessibleButton from "../../views/elements/AccessibleButton";
 import RoomAvatar from "../../views/avatars/RoomAvatar";
 import dis from '../../../dispatcher/dispatcher';
 import { Key } from "../../../Keyboard";
-import * as RoomNotifs from '../../../RoomNotifs';
-import { EffectiveMembership, getEffectiveMembership } from "../../../stores/room-list/membership";
-import * as Unread from '../../../Unread';
-import * as FormattingUtils from "../../../utils/FormattingUtils";
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import ActiveRoomObserver from "../../../ActiveRoomObserver";
+import NotificationBadge, { INotificationState, NotificationColor, RoomNotificationState } from "./NotificationBadge";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -41,14 +36,6 @@ import ActiveRoomObserver from "../../../ActiveRoomObserver";
  * warning disappears.                                             *
  *******************************************************************/
 
-enum NotificationColor {
-    // Inverted (None -> Red) because we do integer comparisons on this
-    None, // nothing special
-    Bold, // no badge, show as unread
-    Grey, // unread notified messages
-    Red,  // unread pings
-}
-
 interface IProps {
     room: Room;
     showMessagePreview: boolean;
@@ -58,11 +45,6 @@ interface IProps {
     // TODO: Incoming call boxes?
 }
 
-interface INotificationState {
-    symbol: string;
-    color: NotificationColor;
-}
-
 interface IState {
     hover: boolean;
     notificationState: INotificationState;
@@ -88,89 +70,17 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         this.state = {
             hover: false,
-            notificationState: this.getNotificationState(),
+            notificationState: new RoomNotificationState(this.props.room),
             selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
         };
 
-        this.props.room.on("Room.receipt", this.handleRoomEventUpdate);
-        this.props.room.on("Room.timeline", this.handleRoomEventUpdate);
-        this.props.room.on("Room.redaction", this.handleRoomEventUpdate);
-        MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
         ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
     }
 
     public componentWillUnmount() {
         if (this.props.room) {
-            this.props.room.removeListener("Room.receipt", this.handleRoomEventUpdate);
-            this.props.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
-            this.props.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
             ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
         }
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
-        }
-    }
-
-    // XXX: This is a bit of an awful-looking hack. We should probably be using state for
-    // this, but instead we're kinda forced to either duplicate the code or thread a variable
-    // through the code paths. This feels like the least evil option.
-    private get roomIsInvite(): boolean {
-        return getEffectiveMembership(this.props.room.getMyMembership()) === EffectiveMembership.Invite;
-    }
-
-    private handleRoomEventUpdate = (event: MatrixEvent) => {
-        const roomId = event.getRoomId();
-
-        // Sanity check: should never happen
-        if (roomId !== this.props.room.roomId) return;
-
-        this.updateNotificationState();
-    };
-
-    private updateNotificationState() {
-        this.setState({notificationState: this.getNotificationState()});
-    }
-
-    private getNotificationState(): INotificationState {
-        const state: INotificationState = {
-            color: NotificationColor.None,
-            symbol: null,
-        };
-
-        if (this.roomIsInvite) {
-            state.color = NotificationColor.Red;
-            state.symbol = "!";
-        } else {
-            const redNotifs = RoomNotifs.getUnreadNotificationCount(this.props.room, 'highlight');
-            const greyNotifs = RoomNotifs.getUnreadNotificationCount(this.props.room, 'total');
-
-            // For a 'true count' we pick the grey notifications first because they include the
-            // red notifications. If we don't have a grey count for some reason we use the red
-            // count. If that count is broken for some reason, assume zero. This avoids us showing
-            // a badge for 'NaN' (which formats as 'NaNB' for NaN Billion).
-            const trueCount = greyNotifs ? greyNotifs : (redNotifs ? redNotifs : 0);
-
-            // Note: we only set the symbol if we have an actual count. We don't want to show
-            // zero on badges.
-
-            if (redNotifs > 0) {
-                state.color = NotificationColor.Red;
-                state.symbol = FormattingUtils.formatCount(trueCount);
-            } else if (greyNotifs > 0) {
-                state.color = NotificationColor.Grey;
-                state.symbol = FormattingUtils.formatCount(trueCount);
-            } else {
-                // We don't have any notified messages, but we might have unread messages. Let's
-                // find out.
-                const hasUnread = Unread.doesRoomHaveUnreadMessages(this.props.room);
-                if (hasUnread) {
-                    state.color = NotificationColor.Bold;
-                    // no symbol for this state
-                }
-            }
-        }
-
-        return state;
     }
 
     private onTileMouseEnter = () => {
@@ -206,19 +116,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             'mx_RoomTile2_selected': this.state.selected,
         });
 
-        let badge;
-        const hasBadge = this.state.notificationState.color > NotificationColor.Bold;
-        if (hasBadge) {
-            const hasNotif = this.state.notificationState.color >= NotificationColor.Red;
-            const isEmptyBadge = !localStorage.getItem("mx_rl_rt_badgeCount");
-            const badgeClasses = classNames({
-                'mx_RoomTile2_badge': true,
-                'mx_RoomTile2_badgeHighlight': hasNotif,
-                'mx_RoomTile2_badgeEmpty': isEmptyBadge,
-            });
-            const symbol = this.state.notificationState.symbol;
-            badge = <div className={badgeClasses}>{isEmptyBadge ? null : symbol}</div>;
-        }
+        const badge = <NotificationBadge notification={this.state.notificationState} allowNoCount={true} />;
 
         // TODO: the original RoomTile uses state for the room name. Do we need to?
         let name = this.props.room.name;
@@ -237,6 +135,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         const nameClasses = classNames({
             "mx_RoomTile2_name": true,
             "mx_RoomTile2_nameWithPreview": !!messagePreview,
+            "mx_RoomTile2_nameHasUnreadEvents": this.state.notificationState.color >= NotificationColor.Bold,
         });
 
         const avatarSize = 32;

From 0354bf9b6d432354c4c11f376a1c82b4a9705e0e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 17:11:58 -0600
Subject: [PATCH 085/181] Reimplement breadcrumbs for new room list

This all-new component handles breadcrumbs a bit more smoothly for the app by always listening to changes even if the component isn't present. This allows the breadcrumbs to remain up to date for when the user re-enables breadcrumbs.

The new behaviour is that we turn breadcrumbs on once the user has a room, and we don't turn it back off for them.

This also introduces a new animation which is more stable and not laggy, though instead of sliding the breadcrumbs pop. This might be undesirable - to be reviewed.
---
 res/css/_components.scss                      |   1 +
 res/css/structures/_LeftPanel2.scss           |   2 +-
 res/css/views/rooms/_RoomBreadcrumbs2.scss    |  53 ++++++
 src/components/structures/LeftPanel2.tsx      |  34 +++-
 .../views/rooms/RoomBreadcrumbs2.tsx          |  90 ++++++++++
 src/i18n/strings/en_EN.json                   |   1 +
 src/settings/SettingsStore.js                 |   2 +
 src/stores/AsyncStoreWithClient.ts            |  53 ++++++
 src/stores/BreadcrumbsStore.ts                | 154 ++++++++++++++++++
 9 files changed, 384 insertions(+), 6 deletions(-)
 create mode 100644 res/css/views/rooms/_RoomBreadcrumbs2.scss
 create mode 100644 src/components/views/rooms/RoomBreadcrumbs2.tsx
 create mode 100644 src/stores/AsyncStoreWithClient.ts
 create mode 100644 src/stores/BreadcrumbsStore.ts

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 62bec5ad62..8958aee2fc 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -175,6 +175,7 @@
 @import "./views/rooms/_PresenceLabel.scss";
 @import "./views/rooms/_ReplyPreview.scss";
 @import "./views/rooms/_RoomBreadcrumbs.scss";
+@import "./views/rooms/_RoomBreadcrumbs2.scss";
 @import "./views/rooms/_RoomDropTarget.scss";
 @import "./views/rooms/_RoomHeader.scss";
 @import "./views/rooms/_RoomList.scss";
diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
index 822a5ac399..502ed18a87 100644
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -76,9 +76,9 @@ $roomListMinimizedWidth: 50px;
             }
 
             .mx_LeftPanel2_breadcrumbsContainer {
-                // TODO: Improve CSS for breadcrumbs (currently shoved into the view rather than placed)
                 width: 100%;
                 overflow: hidden;
+                margin-top: 8px;
             }
         }
 
diff --git a/res/css/views/rooms/_RoomBreadcrumbs2.scss b/res/css/views/rooms/_RoomBreadcrumbs2.scss
new file mode 100644
index 0000000000..aa0b0ecb08
--- /dev/null
+++ b/res/css/views/rooms/_RoomBreadcrumbs2.scss
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 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.
+*/
+
+@keyframes breadcrumb-popin {
+  0% {
+      // Ideally we'd use `width` instead of `opacity`, but we only
+      // have 16 nanoseconds to render the frame, and width is expensive.
+      opacity: 0;
+      transform: scale(0);
+  }
+  100% {
+      opacity: 1;
+      transform: scale(1);
+  }
+}
+
+.mx_RoomBreadcrumbs2 {
+    // Create a flexbox for the crumbs
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    width: 100%;
+
+    .mx_RoomBreadcrumbs2_crumb {
+        margin-right: 8px;
+        width: 32px;
+
+        // React loves to add elements, so only target the one we want to animate
+        &:first-child {
+            animation: breadcrumb-popin 0.3s;
+        }
+    }
+
+    .mx_RoomBreadcrumbs2_placeholder {
+        font-weight: 600;
+        font-size: $font-14px;
+        line-height: 32px; // specifically to match the height this is not scaled
+        height: 32px;
+    }
+}
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index c66c0a6799..b42da0be09 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -26,7 +26,9 @@ import TopLeftMenuButton from "./TopLeftMenuButton";
 import { Action } from "../../dispatcher/actions";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import BaseAvatar from '../views/avatars/BaseAvatar';
-import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
+import RoomBreadcrumbs2 from "../views/rooms/RoomBreadcrumbs2";
+import { BreadcrumbsStore } from "../../stores/BreadcrumbsStore";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -43,6 +45,7 @@ interface IProps {
 interface IState {
     searchExpanded: boolean;
     searchFilter: string; // TODO: Move search into room list?
+    showBreadcrumbs: boolean;
 }
 
 export default class LeftPanel2 extends React.Component<IProps, IState> {
@@ -60,7 +63,14 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         this.state = {
             searchExpanded: false,
             searchFilter: "",
+            showBreadcrumbs: BreadcrumbsStore.instance.visible,
         };
+
+        BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+    }
+
+    public componentWillUnmount() {
+        BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
     }
 
     private onSearch = (term: string): void => {
@@ -85,6 +95,13 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         }
     }
 
+    private onBreadcrumbsUpdate = () => {
+        const newVal = BreadcrumbsStore.instance.visible;
+        if (newVal !== this.state.showBreadcrumbs) {
+            this.setState({showBreadcrumbs: newVal});
+        }
+    };
+
     private renderHeader(): React.ReactNode {
         // TODO: Update when profile info changes
         // TODO: Presence
@@ -100,6 +117,16 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
             displayName = myUser.rawDisplayName;
             avatarUrl = myUser.avatarUrl;
         }
+
+        let breadcrumbs;
+        if (this.state.showBreadcrumbs) {
+            breadcrumbs = (
+                <div className="mx_LeftPanel2_headerRow mx_LeftPanel2_breadcrumbsContainer">
+                    <RoomBreadcrumbs2 />
+                </div>
+            );
+        }
+
         return (
             <div className="mx_LeftPanel2_userHeader">
                 <div className="mx_LeftPanel2_headerRow">
@@ -116,9 +143,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
                     </span>
                     <span className="mx_LeftPanel2_userName">{displayName}</span>
                 </div>
-                <div className="mx_LeftPanel2_headerRow mx_LeftPanel2_breadcrumbsContainer">
-                    <RoomBreadcrumbs />
-                </div>
+                {breadcrumbs}
             </div>
         );
     }
@@ -152,7 +177,6 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
             onBlur={() => {/*TODO*/}}
         />;
 
-        // TODO: Breadcrumbs
         // TODO: Conference handling / calls
 
         const containerClasses = classNames({
diff --git a/src/components/views/rooms/RoomBreadcrumbs2.tsx b/src/components/views/rooms/RoomBreadcrumbs2.tsx
new file mode 100644
index 0000000000..195757ccf0
--- /dev/null
+++ b/src/components/views/rooms/RoomBreadcrumbs2.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 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 { BreadcrumbsStore } from "../../../stores/BreadcrumbsStore";
+import AccessibleButton from "../elements/AccessibleButton";
+import RoomAvatar from "../avatars/RoomAvatar";
+import { _t } from "../../../languageHandler";
+import { Room } from "matrix-js-sdk/src/models/room";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import Analytics from "../../../Analytics";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+
+/*******************************************************************
+ *   CAUTION                                                       *
+ *******************************************************************
+ * This is a work in progress implementation and isn't complete or *
+ * even useful as a component. Please avoid using it until this    *
+ * warning disappears.                                             *
+ *******************************************************************/
+
+interface IProps {
+}
+
+interface IState {
+}
+
+export default class RoomBreadcrumbs2 extends React.PureComponent<IProps, IState> {
+    private isMounted = true;
+
+    constructor(props: IProps) {
+        super(props);
+
+        BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+    }
+
+    public componentWillUnmount() {
+        this.isMounted = false;
+        BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+    }
+
+    private onBreadcrumbsUpdate = () => {
+        if (!this.isMounted) return;
+        this.forceUpdate(); // we have no state, so this is the best we can do
+    };
+
+    private viewRoom = (room: Room, index: number) => {
+        Analytics.trackEvent("Breadcrumbs", "click_node", index);
+        defaultDispatcher.dispatch({action: "view_room", room_id: room.roomId});
+    };
+
+    public render(): React.ReactElement {
+        // TODO: Decorate crumbs with icons
+        const tiles = BreadcrumbsStore.instance.rooms.map((r, i) => {
+            return (
+                <AccessibleButton
+                    className="mx_RoomBreadcrumbs2_crumb"
+                    key={r.roomId}
+                    onClick={() => this.viewRoom(r, i)}
+                    aria-label={_t("Room %(name)s", {name: r.name})}
+                >
+                    <RoomAvatar room={r} width={32} height={32}/>
+                </AccessibleButton>
+            )
+        });
+
+        if (tiles.length === 0) {
+            tiles.push(
+                <div className="mx_RoomBreadcrumbs2_placeholder">
+                    {_t("No recently visited rooms")}
+                </div>
+            );
+        }
+
+        return <div className='mx_RoomBreadcrumbs2'>{tiles}</div>;
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cf6dc2431a..75caf5b593 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1069,6 +1069,7 @@
     "Replying": "Replying",
     "Room %(name)s": "Room %(name)s",
     "Recent rooms": "Recent rooms",
+    "No recently visited rooms": "No recently visited rooms",
     "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",
     "World readable": "World readable",
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 4b18a27c6c..dcdde46631 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -181,6 +181,8 @@ export default class SettingsStore {
      * @param {String} roomId The room ID to monitor for changes in. Use null for all rooms.
      */
     static monitorSetting(settingName, roomId) {
+        roomId = roomId || null; // the thing wants null specifically to work, so appease it.
+
         if (!this._monitors[settingName]) this._monitors[settingName] = {};
 
         const registerWatcher = () => {
diff --git a/src/stores/AsyncStoreWithClient.ts b/src/stores/AsyncStoreWithClient.ts
new file mode 100644
index 0000000000..ce7fd45eec
--- /dev/null
+++ b/src/stores/AsyncStoreWithClient.ts
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 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 { MatrixClient } from "matrix-js-sdk/src/client";
+import { AsyncStore } from "./AsyncStore";
+import { ActionPayload } from "../dispatcher/payloads";
+
+
+export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<T> {
+    protected matrixClient: MatrixClient;
+
+    protected abstract async onAction(payload: ActionPayload);
+
+    protected async onReady() {
+        // Default implementation is to do nothing.
+    }
+
+    protected async onNotReady() {
+        // Default implementation is to do nothing.
+    }
+
+    protected async onDispatch(payload: ActionPayload) {
+        await this.onAction(payload);
+
+        if (payload.action === 'MatrixActions.sync') {
+            // Filter out anything that isn't the first PREPARED sync.
+            if (!(payload.prevState === 'PREPARED' && payload.state !== 'PREPARED')) {
+                return;
+            }
+
+            this.matrixClient = payload.matrixClient;
+            await this.onReady();
+        } else if (payload.action === 'on_client_not_viable' || payload.action === 'on_logged_out') {
+            if (this.matrixClient) {
+                await this.onNotReady();
+                this.matrixClient = null;
+            }
+        }
+    }
+}
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
new file mode 100644
index 0000000000..783b38e62f
--- /dev/null
+++ b/src/stores/BreadcrumbsStore.ts
@@ -0,0 +1,154 @@
+/*
+Copyright 2020 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 SettingsStore, { SettingLevel } from "../settings/SettingsStore";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { arrayHasDiff } from "../utils/arrays";
+
+const MAX_ROOMS = 20; // arbitrary
+const AUTOJOIN_WAIT_THRESHOLD_MS = 90000; // 90s, the time we wait for an autojoined room to show up
+
+interface IState {
+    enabled?: boolean;
+    rooms?: Room[];
+}
+
+export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance = new BreadcrumbsStore();
+
+    private waitingRooms: { roomId: string, addedTs: number }[] = [];
+
+    private constructor() {
+        super(defaultDispatcher);
+
+        SettingsStore.monitorSetting("breadcrumb_rooms", null);
+        SettingsStore.monitorSetting("breadcrumbs", null);
+    }
+
+    public static get instance(): BreadcrumbsStore {
+        return BreadcrumbsStore.internalInstance;
+    }
+
+    public get rooms(): Room[] {
+        return this.state.rooms || [];
+    }
+
+    public get visible(): boolean {
+        return this.state.enabled;
+    }
+
+    protected async onAction(payload: ActionPayload) {
+        if (!this.matrixClient) return;
+
+        if (payload.action === 'setting_updated') {
+            if (payload.settingName === 'breadcrumb_rooms') {
+                await this.updateRooms();
+            } else if (payload.settingName === 'breadcrumbs') {
+                await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+            }
+        } else if (payload.action === 'view_room') {
+            if (payload.auto_join && !this.matrixClient.getRoom(payload.room_id)) {
+                // Queue the room instead of pushing it immediately. We're probably just
+                // waiting for a room join to complete.
+                this.waitingRooms.push({roomId: payload.room_id, addedTs: Date.now()});
+            } else {
+                await this.appendRoom(this.matrixClient.getRoom(payload.room_id));
+            }
+        }
+    }
+
+    protected async onReady() {
+        await this.updateRooms();
+        await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+
+        this.matrixClient.on("Room.myMembership", this.onMyMembership);
+        this.matrixClient.on("Room", this.onRoom);
+    }
+
+    protected async onNotReady() {
+        this.matrixClient.removeListener("Room.myMembership", this.onMyMembership);
+        this.matrixClient.removeListener("Room", this.onRoom);
+    }
+
+    private onMyMembership = async (room: Room) => {
+        // We turn on breadcrumbs by default once the user has at least 1 room to show.
+        if (!this.state.enabled) {
+            await SettingsStore.setValue("breadcrumbs", null, SettingLevel.ACCOUNT, true);
+        }
+    };
+
+    private onRoom = async (room: Room) => {
+        const waitingRoom = this.waitingRooms.find(r => r.roomId === room.roomId);
+        if (!waitingRoom) return;
+        this.waitingRooms.splice(this.waitingRooms.indexOf(waitingRoom), 1);
+
+        if ((Date.now() - waitingRoom.addedTs) > AUTOJOIN_WAIT_THRESHOLD_MS) return; // Too long ago.
+        await this.appendRoom(room);
+    };
+
+    private async updateRooms() {
+        let roomIds = SettingsStore.getValue("breadcrumb_rooms");
+        if (!roomIds || roomIds.length === 0) roomIds = [];
+
+        const rooms = roomIds.map(r => this.matrixClient.getRoom(r)).filter(r => !!r);
+        const currentRooms = this.state.rooms || [];
+        if (!arrayHasDiff(rooms, currentRooms)) return; // no change (probably echo)
+        await this.updateState({rooms});
+    }
+
+    private async appendRoom(room: Room) {
+        const rooms = this.state.rooms.slice(); // cheap clone
+
+        // If the room is upgraded, use that room instead. We'll also splice out
+        // any children of the room.
+        const history = this.matrixClient.getRoomUpgradeHistory(room.roomId);
+        if (history.length > 1) {
+            room = history[history.length - 1]; // Last room is most recent in history
+
+            // Take out any room that isn't the most recent room
+            for (let i = 0; i < history.length - 1; i++) {
+                const idx = rooms.findIndex(r => r.roomId === history[i].roomId);
+                if (idx !== -1) rooms.splice(idx, 1);
+            }
+        }
+
+        // Remove the existing room, if it is present
+        const existingIdx = rooms.findIndex(r => r.roomId === room.roomId);
+        if (existingIdx !== -1) {
+            rooms.splice(existingIdx, 1);
+        }
+
+        // Splice the room to the start of the list
+        rooms.splice(0, 0, room);
+
+        if (rooms.length > MAX_ROOMS) {
+            // This looks weird, but it's saying to start at the MAX_ROOMS point in the
+            // list and delete everything after it.
+            rooms.splice(MAX_ROOMS, rooms.length - MAX_ROOMS);
+        }
+
+        // Update the breadcrumbs
+        await this.updateState({rooms});
+        const roomIds = rooms.map(r => r.roomId);
+        if (roomIds.length > 0) {
+            await SettingsStore.setValue("breadcrumb_rooms", null, SettingLevel.ACCOUNT, roomIds);
+        }
+    }
+
+}

From 04566e12b202c50d10045fda65bdaf0e288bfecc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 17:14:40 -0600
Subject: [PATCH 086/181] Fix indentation in styles

---
 res/css/views/rooms/_RoomBreadcrumbs2.scss | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/css/views/rooms/_RoomBreadcrumbs2.scss b/res/css/views/rooms/_RoomBreadcrumbs2.scss
index aa0b0ecb08..2db0fdca08 100644
--- a/res/css/views/rooms/_RoomBreadcrumbs2.scss
+++ b/res/css/views/rooms/_RoomBreadcrumbs2.scss
@@ -15,16 +15,16 @@ limitations under the License.
 */
 
 @keyframes breadcrumb-popin {
-  0% {
-      // Ideally we'd use `width` instead of `opacity`, but we only
-      // have 16 nanoseconds to render the frame, and width is expensive.
-      opacity: 0;
-      transform: scale(0);
-  }
-  100% {
-      opacity: 1;
-      transform: scale(1);
-  }
+    0% {
+        // Ideally we'd use `width` instead of `opacity`, but we only
+        // have 16 nanoseconds to render the frame, and width is expensive.
+        opacity: 0;
+        transform: scale(0);
+    }
+    100% {
+        opacity: 1;
+        transform: scale(1);
+    }
 }
 
 .mx_RoomBreadcrumbs2 {

From 8292ce56b0edda8fd44f23827d5d35c08c20314b Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Mon, 8 Jun 2020 18:06:28 +0000
Subject: [PATCH 087/181] Translated using Weblate (Dutch)

Currently translated at 90.1% (2036 of 2259 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 | 49 ++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index b4bb5dc5bd..69909e942e 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -350,7 +350,7 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zo te zien is uw e-mailadres op deze thuisserver niet aan een Matrix-ID gekoppeld.",
     "You seem to be in a call, are you sure you want to quit?": "Het ziet er naar uit dat u in gesprek bent, weet u zeker dat u wilt afsluiten?",
     "You seem to be uploading files, are you sure you want to quit?": "Het ziet er naar uit dat u bestanden aan het uploaden bent, weet u zeker dat u wilt afsluiten?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U kunt deze veranderingen niet ongedaan maken aangezien u de gebruiker tot hetzelfde niveau als uzelf promoveert.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U zult deze veranderingen niet terug kunnen draaien, daar u de gebruiker tot uw eigen niveau promoveert.",
     "This server does not support authentication with a phone number.": "Deze server biedt geen ondersteuning voor authenticatie met een telefoonnummer.",
     "An error occurred: %(error_string)s": "Er is een fout opgetreden: %(error_string)s",
     "Make Moderator": "Benoemen tot moderator",
@@ -382,7 +382,7 @@
     "Failed to invite": "Uitnodigen is mislukt",
     "Failed to invite the following users to the %(roomName)s room:": "Kon de volgende gebruikers niet uitnodigen voor gesprek %(roomName)s:",
     "Confirm Removal": "Verwijdering bevestigen",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Weet u zeker dat u deze gebeurtenis wilt verwijderen? Wees u er wel van bewust dat als u een gespreksnaam of onderwerpswijziging verwijdert, u de verandering mogelijk ongedaan maakt.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Weet u zeker dat u deze gebeurtenis wilt verwijderen? Besef wel dat het verwijderen van een van een gespreksnaams- of onderwerpswijziging die wijziging mogelijk teniet doet.",
     "Unknown error": "Onbekende fout",
     "Incorrect password": "Onjuist wachtwoord",
     "To continue, please enter your password.": "Voer uw wachtwoord in om verder te gaan.",
@@ -501,7 +501,7 @@
     "Unban this user?": "Deze gebruiker ontbannen?",
     "Ban this user?": "Deze gebruiker verbannen?",
     "Mirror local video feed": "Lokale videoaanvoer ook elders opslaan (spiegelen)",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "U kunt deze actie niet ongedaan maken omdat u zichzelf degradeert. Als u de laatste bevoorrechte gebruiker in het gesprek bent, is het onmogelijk deze rechten terug te krijgen.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Zelfdegradatie is onomkeerbaar.  Als u de laatste bevoorrechte gebruiker in het gesprek bent zullen deze rechten voorgoed verloren gaan.",
     "Unignore": "Niet meer negeren",
     "Ignore": "Negeren",
     "Jump to read receipt": "Naar het laatst gelezen bericht gaan",
@@ -952,7 +952,7 @@
     "User %(userId)s is already in the room": "De gebruiker %(userId)s is al aanwezig",
     "User %(user_id)s does not exist": "Er bestaat geen gebruiker ‘%(user_id)s’",
     "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen gebruiker ‘%(user_id)s’",
-    "The user must be unbanned before they can be invited.": "De gebruiker kan niet uitgenodigd worden voordat diens ban ongedaan is gemaakt.",
+    "The user must be unbanned before they can be invited.": "De gebruiker kan niet uitgenodigd worden voordat diens ban teniet is gedaan.",
     "Unknown server error": "Onbekende serverfout",
     "Use a few words, avoid common phrases": "Gebruik enkele woorden - maar geen bekende uitdrukkingen",
     "No need for symbols, digits, or uppercase letters": "Hoofdletters, cijfers of speciale tekens hoeven niet, mogen wel",
@@ -1107,7 +1107,7 @@
     "Language and region": "Taal en regio",
     "Theme": "Thema",
     "Account management": "Accountbeheer",
-    "Deactivating your account is a permanent action - be careful!": "Pas op!  Het sluiten van uw account kan niet ongedaan gemaakt worden!",
+    "Deactivating your account is a permanent action - be careful!": "Pas op!  Het sluiten van uw account is onherroepelijk!",
     "General": "Algemeen",
     "Legal": "Wettelijk",
     "Credits": "Met dank aan",
@@ -1356,7 +1356,7 @@
     "Adds a custom widget by URL to the room": "Voegt met een URL een aangepaste widget toe aan het gesprek",
     "Please supply a https:// or http:// widget URL": "Voer een https://- of http://-widget-URL in",
     "You cannot modify widgets in this room.": "U kunt de widgets in dit gesprek niet aanpassen.",
-    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging voor %(targetDisplayName)s om toe te treden tot het gesprek ingetrokken.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging aan %(targetDisplayName)s  toe te treden tot het gesprek ingetrokken.",
     "Upgrade this room to the recommended room version": "Werk dit gesprek bij tot de aanbevolen versie",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek draait op groepsgespreksversie <roomVersion />, die door deze thuisserver als <i>onstabiel</i> is gemarkeerd.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Bijwerken zal de huidige versie van dit gesprek sluiten, en onder dezelfde naam een bijgewerkte versie starten.",
@@ -1477,7 +1477,7 @@
     "Cannot reach homeserver": "Kan thuisserver niet bereiken",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Zorg dat u een stabiele internetverbinding heeft, of neem contact op met de systeembeheerder",
     "Your Riot is misconfigured": "Uw Riot is onjuist geconfigureerd",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Vraag uw Riot-beheerder om <a>uw configuratie</a> na te kijken op onjuiste of duplicate items.",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Vraag uw Riot-beheerder <a>uw configuratie</a> na te kijken op onjuiste of dubbele items.",
     "Unexpected error resolving identity server configuration": "Onverwachte fout bij het oplossen van de identiteitsserverconfiguratie",
     "Use lowercase letters, numbers, dashes and underscores only": "Gebruik enkel letters, cijfers, streepjes en underscores",
     "Cannot reach identity server": "Kan identiteitsserver niet bereiken",
@@ -1572,8 +1572,8 @@
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Gebruik een identiteitsserver om uit te nodigen via e-mail. Klik op ‘Doorgaan’ om de standaardidentiteitsserver (%(defaultIdentityServerName)s) te gebruiken, of beheer de server in de instellingen.",
     "Use an identity server to invite by email. Manage in Settings.": "Gebruik een identiteitsserver om uit te nodigen via e-mail. Beheer de server in de instellingen.",
     "Multiple integration managers": "Meerdere integratiebeheerders",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Verstuur leesbevestigingen voor berichten (vereist compatibele thuisserver om uit te schakelen)",
-    "Accept <policyLink /> to continue:": "Aanvaard <policyLink /> om verder te gaan:",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Verstuur leesbevestigingen voor berichten (uitschakelen vereist een compatibele thuisserver)",
+    "Accept <policyLink /> to continue:": "Aanvaard <policyLink /> om door te gaan:",
     "ID": "ID",
     "Public Name": "Openbare naam",
     "Change identity server": "Identiteitsserver wisselen",
@@ -1599,11 +1599,11 @@
     "No recent messages by %(user)s found": "Geen recente berichten door %(user)s gevonden",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Probeer omhoog te scrollen in de tijdslijn om te kijken of er eerdere zijn.",
     "Remove recent messages by %(user)s": "Recente berichten door %(user)s verwijderen",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "U staat op het punt %(count)s berichten door %(user)s te verwijderen. Dit kan niet ongedaan worden gemaakt. Wilt u doorgaan?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "U staat op het punt %(count)s berichten door %(user)s te verwijderen. Dit is onherroepelijk. Wilt u doorgaan?",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Bij een groot aantal berichten kan dit even duren. Herlaad uw cliënt niet gedurende deze tijd.",
     "Remove %(count)s messages|other": "%(count)s berichten verwijderen",
     "Deactivate user?": "Gebruiker deactiveren?",
-    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deze gebruiker deactiveren zal hem/haar afmelden en verhinderen dat hij/zij zich weer aanmeldt. Bovendien zal hij/zij alle gesprekken waaraan hij/zij deelneemt verlaten. Deze actie kan niet ongedaan worden gemaakt. Weet u zeker dat u deze gebruiker wilt deactiveren?",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deze gebruiker deactiveren zal hem/haar afmelden en verhinderen dat hij/zij zich weer aanmeldt. Bovendien zal hij/zij alle gesprekken waaraan hij/zij deelneemt verlaten. Deze actie is onherroepelijk. Weet u zeker dat u deze gebruiker wilt deactiveren?",
     "Deactivate user": "Gebruiker deactiveren",
     "Remove recent messages": "Recente berichten verwijderen",
     "Bold": "Vet",
@@ -1638,7 +1638,7 @@
     "Explore rooms": "Gesprekken ontdekken",
     "Show previews/thumbnails for images": "Toon voorbeelden voor afbeeldingen",
     "Clear cache and reload": "Cache wissen en herladen",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit kan niet ongedaan gemaakt worden. Wilt u doorgaan?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit is onherroepelijk. Wilt u doorgaan?",
     "Remove %(count)s messages|one": "1 bericht verwijderen",
     "%(count)s unread messages including mentions.|other": "%(count)s ongelezen berichten, inclusief vermeldingen.",
     "%(count)s unread messages.|other": "%(count)s ongelezen berichten.",
@@ -1791,7 +1791,7 @@
     "Compare unique emoji": "Vergelijk unieke emoji",
     "Compare a unique set of emoji if you don't have a camera on either device": "Vergelijk een unieke lijst met emoji als geen van beide apparaten een camera heeft",
     "Start": "Start",
-    "Securely cache encrypted messages locally for them to appear in search results.": "Sla versleutelde berichten beveiligd op om ze weer te geven in zoekresultaten.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Sla versleutelde berichten veilig lokaal op om ze doorzoekbaar te maken.",
     "Enable": "Inschakelen",
     "Connecting to integration manager...": "Verbinding maken met de integratiebeheerder…",
     "Cannot connect to integration manager": "Kan geen verbinding maken met de integratiebeheerder",
@@ -1873,7 +1873,7 @@
     "in secret storage": "in de sleutelopslag",
     "Secret storage public key:": "Sleutelopslag publieke sleutel:",
     "in account data": "in accountinformatie",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sla versleutelde berichten beveiligd op om ze weer te geven in de zoekresultaten, door gebruik te maken van ",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sla versleutelde berichten veilig lokaal op opdat ze doorzocht kunnen worden, middels ",
     " to store messages from ": " om berichten op te slaan van ",
     "Manage": "Beheren",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbind deze sessie met de sleutelback-up voordat u zich afmeldt. Dit voorkomt dat u sleutels verliest die alleen op deze sessie voorkomen.",
@@ -1905,8 +1905,8 @@
     "Show rooms with unread notifications first": "Gesprekken met ongelezen meldingen eerst tonen",
     "Show shortcuts to recently viewed rooms above the room list": "Snelkoppelingen naar de gesprekken die u recent heeft bekeken bovenaan de gesprekslijst weergeven",
     "Cancelling…": "Bezig met annuleren…",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot beschikt niet over alle onderdelen die nodig zijn om versleutelde berichten veilig in het lokale cachegeheugen te bewaren. Als u deze functie wilt uittesten, kunt u een aangepaste versie van Riot Desktop compileren, waarbij <nativeLink>de zoekonderdelen toegevoegd zijn</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot kan versleutelde berichten niet veilig bewaren in het lokale cachegeheugen wanneer het uitgevoerd wordt in een webbrowser. Gebruik <riotLink>Riot Desktop</riotLink> om versleutelde berichten in de zoekresultaten te laten verschijnen.",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "In Riot ontbreken enige modulen vereist voor het veilig lokaal bewaren van versleutelde berichten.  Wilt u deze functie uittesten, compileer dan een aangepaste versie van Riot Desktop <nativeLink>die de zoekmodulen bevat</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Als Riot in een webbrowser draait kan het versleutelde berichten niet veilig lokaal bewaren.  Gebruik <riotLink>Riot Desktop</riotLink> om versleutelde berichten doorzoekbaar te maken.",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Deze sessie <b>maakt geen back-ups van uw sleutels</b>, maar u beschikt over een reeds bestaande back-up waaruit u kunt herstellen en waaraan u nieuwe sleutels vanaf nu kunt toevoegen.",
     "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Er is een back-upsleutel opgeslagen in de geheime opslag, maar deze functie is niet ingeschakeld voor deze sessie. Schakel kruiselings ondertekenen in in de experimentele instellingen om de sleutelback-upstatus te wijzigen.",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliseer uw ervaring met experimentele functies. <a>Klik hier voor meer informatie</a>.",
@@ -1952,7 +1952,7 @@
     "Yours, or the other users’ session": "De sessie van uzelf of de andere gebruiker",
     "Not Trusted": "Niet vertrouwd",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s%(userId)s heeft zich aangemeld bij een nieuwe sessie zonder deze te verifiëren:",
-    "Ask this user to verify their session, or manually verify it below.": "Vraag deze gebruiker om zijn/haar sessie te verifiëren, of verifieer deze hieronder handmatig.",
+    "Ask this user to verify their session, or manually verify it below.": "Vraag deze gebruiker haar/zijn sessie te verifiëren, of verifieer die hieronder handmatig.",
     "Done": "Klaar",
     "Manually Verify": "Handmatig verifiëren",
     "Trusted": "Vertrouwd",
@@ -2028,10 +2028,10 @@
     "More options": "Meer opties",
     "Language Dropdown": "Taalselectie",
     "Destroy cross-signing keys?": "Sleutels voor kruiselings ondertekenen verwijderen?",
-    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Het verwijderen van sleutels voor kruiselings ondertekenen kan niet ongedaan gemaakt worden. Iedereen waarmee u geverifieerd heeft zal beveiligingswaarschuwingen te zien krijgen. U wilt dit hoogstwaarschijnlijk niet doen, tenzij u alle apparaten heeft verloren waarmee u kruiselings kon ondertekenen.",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Het verwijderen van sleutels voor kruiselings ondertekenen is onherroepelijk. Iedereen waarmee u geverifieerd heeft zal beveiligingswaarschuwingen te zien krijgen. U wilt dit hoogstwaarschijnlijk niet doen, tenzij u alle apparaten heeft verloren waarmee u kruiselings kon ondertekenen.",
     "Clear cross-signing keys": "Sleutels voor kruiselings ondertekenen wissen",
     "Clear all data in this session?": "Alle gegevens in deze sessie verwijderen?",
-    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Het verwijderen van alle gegevens in deze sessie kan niet ongedaan gemaakt worden. Versleutelde berichten zullen verloren gaan, tenzij u een back-up van hun sleutels heeft.",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Het verwijderen van alle gegevens in deze sessie is onherroepelijk. Versleutelde berichten zullen verloren gaan, tenzij u een back-up van hun sleutels heeft.",
     "Verify session": "Sessie verifiëren",
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Controleer of de sleutel in de gebruikersinstellingen op het apparaat overeenkomt met onderstaande sleutel om te verifiëren dat de sessie vertrouwd kan worden:",
     "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Neem contact op met de eigenaar op een andere manier (bv. onder vier ogen of met een telefoongesprek) en vraag of de sleutel in zijn/haar gebruikersinstellingen overeenkomt met onderstaande sleutel om te verifiëren dat de sessie vertrouwd kan worden:",
@@ -2209,5 +2209,14 @@
     "Verify the new login accessing your account: %(name)s": "Verifieer de nieuwe aanmelding op uw account: %(name)s",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bevestig uw intentie deze account te sluiten door met Single Sign On uw identiteit te bewijzen.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Weet u zeker dat u uw account wil sluiten?  Dit is onomkeerbaar.",
-    "Confirm account deactivation": "Bevestig accountsluiting"
+    "Confirm account deactivation": "Bevestig accountsluiting",
+    "Room name or address": "Gespreksnaam of -adres",
+    "Joins room with given address": "Treedt tot het gesprek met het opgegeven adres toe",
+    "Unrecognised room address:": "Gespreksadres niet herkend:",
+    "Help us improve Riot": "Help ons Riot nog beter te maken",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Stuur <UsageDataLink>anonieme gebruiksinformatie</UsageDataLink> waarmee we Riot kunnen verbeteren.  Dit plaatst een <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "Ik wil helpen",
+    "Your homeserver has exceeded its user limit.": "Uw thuisserver heeft het maximaal aantal gebruikers overschreden.",
+    "Your homeserver has exceeded one of its resource limits.": "Uw thuisserver heeft een van zijn limieten overschreden.",
+    "Ok": "Oké"
 }

From 0e6e76ad85fa70b3c56438ab83492c9634282136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Mon, 8 Jun 2020 15:31:40 +0000
Subject: [PATCH 088/181] Translated using Weblate (Estonian)

Currently translated at 58.1% (1312 of 2259 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 0fdcca40d1..5ffcd11f16 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1374,5 +1374,13 @@
     "Sounds": "Helid",
     "Notification sound": "Teavitusheli",
     "Reset": "Taasta algolek",
-    "Set a new custom sound": "Seadista uus kohandatud heli"
+    "Set a new custom sound": "Seadista uus kohandatud heli",
+    "Jump to message": "Mine sõnumi juurde",
+    "were invited %(count)s times|other": "said kutse %(count)s korda",
+    "were invited %(count)s times|one": "said kutse",
+    "was invited %(count)s times|other": "sai kutse %(count)s korda",
+    "was invited %(count)s times|one": "sai kutse",
+    "%(severalUsers)schanged their name %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma nime %(count)s korda",
+    "%(severalUsers)schanged their name %(count)s times|one": "Mitu kasutajat %(severalUsers)s muutsid oma nime",
+    "%(oneUser)schanged their name %(count)s times|other": "Kasutaja %(oneUser)s muutis oma nime %(count)s korda"
 }

From 87d5988d53faaf650aa89eece7898762b4b050f3 Mon Sep 17 00:00:00 2001
From: Nils Haugen <nils@gaupne.net>
Date: Mon, 8 Jun 2020 15:52:42 +0000
Subject: [PATCH 089/181] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 58.5% (1322 of 2259 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 52b2c2e83d..8a5407967a 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -919,7 +919,7 @@
     "Sign In": "Logg inn",
     "Explore rooms": "Utforsk romma",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Meldinga di vart ikkje send, for denne heimetenaren har nådd grensa for maksimalt aktive brukarar pr. månad. Kontakt <a>systemadministratoren</a> for å vidare nytte denne tenesta.",
-    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Denne meldingen vart ikkje sendt fordi heimeserveren har nådd grensa for tilgjengelege systemressursar. Kontakt <a>systemadministratoren</a> for å vidare nytte denne tenesten.",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Denne meldingen vart ikkje send fordi heimetenaren har nådd grensa for tilgjengelege systemressursar. Kontakt <a>systemadministratoren</a> for å vidare nytta denne tenesta.",
     "Add room": "Legg til rom",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Du har %(count)s uleste varslingar i ein tidligare versjon av dette rommet.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Du har %(count)s ulest varsel i ein tidligare versjon av dette rommet.",
@@ -947,7 +947,7 @@
     "Failed to perform homeserver discovery": "Fekk ikkje til å utforska heimetenaren",
     "Sign in with single sign-on": "Logg på med Single-Sign-On",
     "Create account": "Lag konto",
-    "Registration has been disabled on this homeserver.": "Registrering er deaktivert på denne heimeserveren.",
+    "Registration has been disabled on this homeserver.": "Registrering er skrudd av for denne heimetenaren.",
     "Unable to query for supported registration methods.": "Klarte ikkje å spørre etter støtta registreringsmetodar.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Kontoen din %(newAccountId)s er no registrert, men du er frå tidligare logga på med ein annan konto (%(loggedInUserId)s).",
     "Continue with previous account": "Fortsett med tidligare konto",
@@ -1007,7 +1007,7 @@
     "Add Email Address": "Legg til e-postadresse",
     "Add Phone Number": "Legg til telefonnummer",
     "Call failed due to misconfigured server": "Kallet gjekk gale fordi tenaren er oppsatt feil",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Spør administratoren for din heimetenar<code>%(homeserverDomain)s</code> om å setje opp ein \"TURN-server\" slik at heimetenaren svarar korrekt.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Spør administratoren for din heimetenar<code>%(homeserverDomain)s</code> om å setje opp ein \"TURN-server\" slik at talesamtalar fungerer på rett måte.",
     "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.": "Alternativt, kan du prøva å nytta den offentlege tenaren på <code>turn.matrix.org</code>, men det kan vera mindre stabilt og IP-adressa di vil bli delt med den tenaren. Du kan og endra på det under Innstillingar.",
     "Try using turn.matrix.org": "Prøv med å nytta turn.matrix.org",
     "A conference call could not be started because the integrations server is not available": "Ein konferansesamtale kunne ikkje starta fordi integrasjons-tenaren er utilgjengeleg",
@@ -1063,12 +1063,12 @@
     "Set up encryption": "Sett opp kryptering",
     "Unverified session": "Uverifisert sesjon",
     "Identity server has no terms of service": "Identitetstenaren manglar bruksvilkår",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlinga krev kommunikasjon mot <server />(standard identitetsserver) for å verifisere e-post eller telefonnummer, men serveren manglar bruksvilkår.",
-    "Only continue if you trust the owner of the server.": "Gå vidare så lenge du har tillit til eigar av serveren.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlinga krev kommunikasjon mot <server />(standard identitetstenar) for å verifisere e-post eller telefonnummer, men tenaren manglar bruksvilkår.",
+    "Only continue if you trust the owner of the server.": "Gå vidare så lenge du har tillit til eigar av tenaren.",
     "Trust": "Tillat",
     "Custom (%(level)s)": "Tilpassa (%(level)s)",
     "Error upgrading room": "Feil ved oppgradering av rom",
-    "Double check that your server supports the room version chosen and try again.": "Sjekk at server støttar romversjon, og prøv på nytt.",
+    "Double check that your server supports the room version chosen and try again.": "Sjekk at tenar støttar denne romversjonen, og prøv på nytt.",
     "Verifies a user, session, and pubkey tuple": "Verifiser brukar, økt eller public-key objekt (pubkey tuple)",
     "Unknown (user, session) pair:": "Ukjent (brukar,økt) par:",
     "Session already verified!": "Sesjon er tidligare verifisert!",
@@ -1183,7 +1183,7 @@
     "You're previewing %(roomName)s. Want to join it?": "Du førehandsviser %(roomName)s. Ynskjer du å bli med ?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikkje førehandsvisast. Ynskjer du å bli med ?",
     "This room doesn't exist. Are you sure you're at the right place?": "Dette rommet eksisterar ikkje. Er du sikker på at du er på rett plass?",
-    "Try again later, or ask a room admin to check if you have access.": "Prøv igjen seinare, eller spør ein rom-administrator om du har tilgang.",
+    "Try again later, or ask a room admin to check if you have access.": "Prøv om att seinare, eller spør ein rom-administrator om du har tilgang.",
     "Never lose encrypted messages": "Aldri la krypterte meldingar gå tapt",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Meldingane i rommet er sikra med ende-til-ende kryptering. Berre du og mottakarane har krypteringsnøklane for desse meldingane.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Kopier nøklane dine for å unngå i miste dei. <a>Les meir.</a>",
@@ -1203,7 +1203,7 @@
     "Mark all as read": "Merk alle som lesne",
     "Error updating main address": "Feil under oppdatering av hovedadresse",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppdatering av hovudadressa for rommet. Det kan hende at dette er ein mellombels feil, eller at det ikkje er tillate på tenaren.",
-    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Feil under oppdatering av sekundæradresse. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Feil under oppdatering av alternativ adresse. Det kan hende at dette er mellombels, eller at det ikkje er tillate på tenaren.",
     "Error creating alias": "Feil under oppretting av alias",
     "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppretting av dette aliaset. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
     "You don't have permission to delete the alias.": "Du har ikkje lov å slette aliaset.",
@@ -1219,7 +1219,7 @@
     "Local Addresses": "Lokale adresser",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Sett adresse for dette rommet, slik at brukarar kan finne rommet på din heimetenar (%(localDomain)s)",
     "Error updating flair": "Oppdatering av etikett gjekk gale",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Feil under oppdatering av etikett for dette rommet. Dette kan vere deaktivert på server , eller så oppstod det ein feil.",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Feil under oppdatering av etikett for dette rommet. Dette kan vere deaktivert på tenaren, eller så oppstod det ein feil.",
     "Room Name": "Romnamn",
     "Room Topic": "Romemne",
     "Room avatar": "Rom-avatar",
@@ -1339,7 +1339,7 @@
     "Keyboard Shortcuts": "Tastatursnarvegar",
     "Ignored users": "Ignorerte brukarar",
     "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Legg til brukarar og tenarar du vil ignorera her. Bruk stjerne/wildcard (*) for at markere eitkvart teikn. Til dømes, <code>@bot*</code> vil ignorere alle brukarar med namn 'bot' på uansett tenar.",
-    "Server or user ID to ignore": "Server eller brukar-ID for å ignorere",
+    "Server or user ID to ignore": "Tenar eller brukar-ID for å ignorere",
     "If this isn't what you want, please use a different tool to ignore users.": "Om det ikkje var dette du ville, bruk eit anna verktøy til å ignorera brukarar.",
     "Enter the name of a new server you want to explore.": "Skriv inn namn på ny tenar du ynskjer å utforske.",
     "Matrix rooms": "Matrix-rom",
@@ -1363,7 +1363,7 @@
     "Help": "Hjelp",
     "Explore": "Utforsk",
     "%(creator)s created and configured the room.": "%(creator)s oppretta og konfiguerte dette rommet.",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot klarde ikkje å hente protokolllister frå heimeserveren. Det kan hende at serveren er for gammal til å støtte tredjeparts-nettverk",
+    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot klarde ikkje å hente protokolllister frå heimetenaren. Det kan hende at tenaren er for gammal til å støtte tredjeparts-nettverk",
     "The homeserver may be unavailable or overloaded.": "Heimetenaren kan vere overlasta eller utilgjengeleg.",
     "Preview": "Førehandsvis",
     "View": "Vis",
@@ -1409,5 +1409,54 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tok vekk den alternative adressa %(addresses)s for dette rommet.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s endre den alternative adressa for dette rommet.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s endra hovud- og alternativ-adressene for dette rommet.",
-    "%(senderName)s changed the addresses for this room.": "%(senderName)s endre adressene for dette rommet."
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s endre adressene for dette rommet.",
+    "Review where you’re logged in": "Sjå over kvar du er logga inn",
+    "Later": "Seinare",
+    "Allow Peer-to-Peer for 1:1 calls": "Tillat peer-to-peer (P2P) for ein-til-ein samtalar",
+    "Never send encrypted messages to unverified sessions from this session": "Aldri send krypterte meldingar til ikkje-verifiserte sesjonar frå denne sesjonen",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Aldri send krypterte meldingar i dette rommet til ikkje-verifiserte sesjonar frå denne sesjonen",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Tillat å bruke assistansetenaren turn.matrix.org for talesamtalar viss heimetenaren din ikkje tilbyr dette (IP-adressa di vil bli delt under talesamtalen)",
+    "Enable message search in encrypted rooms": "Aktiver søk etter meldingar i krypterte rom",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sikre meldingar med denne brukaren er ende-til-ende krypterte og kan ikkje lesast av tredjepart.",
+    "Public Name": "Offentleg namn",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Er du sikker? Alle dine krypterte meldingar vil gå tapt viss nøklane dine ikkje er sikkerheitskopierte.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Krypterte meldingar er sikra med ende-til-ende kryptering. Berre du og mottakar(ane) har nøklane for å lese desse meldingane.",
+    "wait and try again later": "vent og prøv om att seinare",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "For å rapportere eit Matrix-relatert sikkerheitsproblem, les Matrix.org sin <a>Security Disclosure Policy</a>.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Tenaradministratoren din har deaktivert ende-til-ende kryptering som standard i direktemeldingar og private rom.",
+    "Where you’re logged in": "Stader du er innlogga",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Handter namn på eller logg ut av sesjonane dine nedanfor eller <a>verifiser dei under brukarprofilen din</a>.",
+    "A session's public name is visible to people you communicate with": "Ein sesjon sitt offentlege namn, er synleg for andre du kommuniserar med",
+    "Reset": "Nullstill",
+    "Set a new custom sound": "Set ein ny tilpassa lyd",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Når kryptering er aktivert for eit rom, kan ein ikkje deaktivere det. Meldingar som blir sende i eit kryptert rom kan ikkje bli lesne av tenaren, men berre av deltakarane i rommet. Aktivering av kryptering kan hindre mange botar og bruer frå å fungera på rett måte. <a>Les meir om kryptering her.</a>",
+    "Encrypted": "Kryptert",
+    "This room is end-to-end encrypted": "Dette rommet er ende-til-ende kryptert",
+    "Encrypted by an unverified session": "Kryptert av ein ikkje-verifisert sesjon",
+    "Encrypted by a deleted session": "Kryptert av ein sletta sesjon",
+    "Create room": "Lag rom",
+    "Messages in this room are end-to-end encrypted.": "Meldingar i dette rommet er ende-til-ende kryptert.",
+    "Messages in this room are not end-to-end encrypted.": "Meldingar i dette rommet er ikkje ende-til-ende kryptert.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Når du nyttar krypterte rom er meldingane din sikra. Berre du og mottakaren har unike nøklar som kan gjere meldingane lesbare.",
+    "This client does not support end-to-end encryption.": "Denne klienten støttar ikkje ende-til-ende kryptering.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Når du nyttar krypterte rom, verifiser alle brukarar for å vere trygg på at det er sikkert.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meldingar i dette rommet er ende-til-ende krypterte. Meir om dette, samt verifisering av denne brukaren finn du under deira brukarprofil.",
+    "Join": "Bli med",
+    "Remove server": "Ta vekk tenar",
+    "Matrix": "Matrix",
+    "Add a new server": "Legg til ein ny tenar",
+    "Add a new server...": "Legg til ein ny tenar",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Tømming av data frå denne sesjonen er permanent. Krypterte meldingar vil gå tapt med mindre krypteringsnøklane har blitt sikkerheitskopierte.",
+    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, brukarar kan berre bli med viss dei har ein invitasjon",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kan ikkje skru av dette seinare. Bruer og dei fleste botar vil ikkje fungere enno.",
+    "Enable end-to-end encryption": "Skru på ende-til-ende kryptering",
+    "Create a private room": "Lag eit privat rom",
+    "Make this room public": "Gjer dette rommet offentleg",
+    "Hide advanced": "Gøym avanserte alternativ",
+    "Show advanced": "Vis avanserte alternativ",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Utesteng brukarar på andre Matrix heimetenarar frå å koma inn i rommet (Dette kan endrast seinare!)",
+    "I don't want my encrypted messages": "Eg treng ikkje mine krypterte meldingar",
+    "You'll lose access to your encrypted messages": "Du vil miste tilgangen til dine krypterte meldingar",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ingen identitetstenar er konfiguert, så i framtida kan ikkje legge til ei e-postadresse for å nullstille passordet.",
+    "Join millions for free on the largest public server": "Kom ihop med millionar av andre på den største offentlege tenaren"
 }

From eff97e6c205ecdcce0bc40714fe51ca6f4e6d960 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 18:18:34 -0600
Subject: [PATCH 090/181] Fix the tests

---
 src/stores/BreadcrumbsStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index 783b38e62f..5944091d00 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -113,7 +113,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
     }
 
     private async appendRoom(room: Room) {
-        const rooms = this.state.rooms.slice(); // cheap clone
+        const rooms = (this.state.rooms || []).slice(); // cheap clone
 
         // If the room is upgraded, use that room instead. We'll also splice out
         // any children of the room.

From 5083811deb8a2a1fc53acd331c667a0926bc5bce Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 18:26:43 -0600
Subject: [PATCH 091/181] Appease the tests

---
 src/stores/BreadcrumbsStore.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index 5944091d00..f0f2dad91b 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -68,7 +68,9 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
                 // waiting for a room join to complete.
                 this.waitingRooms.push({roomId: payload.room_id, addedTs: Date.now()});
             } else {
-                await this.appendRoom(this.matrixClient.getRoom(payload.room_id));
+                // The tests might not result in a valid room object.
+                const room = this.matrixClient.getRoom(payload.room_id);
+                if (room) await this.appendRoom(room);
             }
         }
     }

From 708c65cd965f9da3fd8ada635a71a116d710b292 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 19:08:18 -0600
Subject: [PATCH 092/181] Disable new breadcrumb store when old room list is in
 use

---
 src/stores/BreadcrumbsStore.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index f0f2dad91b..332fa7fe2e 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -20,6 +20,7 @@ import { ActionPayload } from "../dispatcher/payloads";
 import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
 import defaultDispatcher from "../dispatcher/dispatcher";
 import { arrayHasDiff } from "../utils/arrays";
+import { RoomListStoreTempProxy } from "./room-list/RoomListStoreTempProxy";
 
 const MAX_ROOMS = 20; // arbitrary
 const AUTOJOIN_WAIT_THRESHOLD_MS = 90000; // 90s, the time we wait for an autojoined room to show up
@@ -56,6 +57,9 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
     protected async onAction(payload: ActionPayload) {
         if (!this.matrixClient) return;
 
+        // TODO: Remove when new room list is made the default
+        if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
         if (payload.action === 'setting_updated') {
             if (payload.settingName === 'breadcrumb_rooms') {
                 await this.updateRooms();
@@ -76,6 +80,9 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
     }
 
     protected async onReady() {
+        // TODO: Remove when new room list is made the default
+        if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
         await this.updateRooms();
         await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
 
@@ -84,6 +91,9 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
     }
 
     protected async onNotReady() {
+        // TODO: Remove when new room list is made the default
+        if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
         this.matrixClient.removeListener("Room.myMembership", this.onMyMembership);
         this.matrixClient.removeListener("Room", this.onRoom);
     }

From 5114c37b82374429c7a7cb1f5889efbd2b1651d7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 20:33:21 -0600
Subject: [PATCH 093/181] Add filtering and exploring to the new room list

This is per the designs. Animation doesn't feel required here.

Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
---
 res/css/_components.scss                      |   1 +
 res/css/structures/_LeftPanel2.scss           |  39 ++++-
 res/css/structures/_RoomSearch.scss           |  70 +++++++++
 res/img/feather-customised/compass.svg        |   1 +
 src/components/structures/HomePage.tsx        |   3 +-
 src/components/structures/LeftPanel.js        |   2 +-
 src/components/structures/LeftPanel2.tsx      |  61 +++-----
 src/components/structures/MatrixChat.tsx      |   6 +-
 src/components/structures/RoomSearch.tsx      | 143 ++++++++++++++++++
 src/components/structures/RoomView.js         |   4 +-
 .../views/elements/RoomDirectoryButton.js     |   3 +-
 src/dispatcher/actions.ts                     |   5 +
 12 files changed, 287 insertions(+), 51 deletions(-)
 create mode 100644 res/css/structures/_RoomSearch.scss
 create mode 100644 res/img/feather-customised/compass.svg
 create mode 100644 src/components/structures/RoomSearch.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index de4c1c677c..66af2ba00f 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -19,6 +19,7 @@
 @import "./structures/_NotificationPanel.scss";
 @import "./structures/_RightPanel.scss";
 @import "./structures/_RoomDirectory.scss";
+@import "./structures/_RoomSearch.scss";
 @import "./structures/_RoomStatusBar.scss";
 @import "./structures/_RoomSubList.scss";
 @import "./structures/_RoomView.scss";
diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
index d335df305f..d9a2b1dd5c 100644
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -88,7 +88,44 @@ $roomListMinimizedWidth: 50px;
         }
 
         .mx_LeftPanel2_filterContainer {
-            // TODO: Improve CSS for filtering and its input
+            margin-left: 12px;
+            margin-right: 12px;
+
+            // Create a flexbox to organize the inputs
+            display: flex;
+            align-items: center;
+
+            .mx_RoomSearch_expanded + .mx_LeftPanel2_exploreButton {
+                // Cheaty way to return the occupied space to the filter input
+                margin: 0;
+                width: 0;
+
+                // Don't forget to hide the masked ::before icon
+                visibility: hidden;
+            }
+
+            .mx_LeftPanel2_exploreButton {
+                width: 28px;
+                height: 28px;
+                border-radius: 20px;
+                background-color: #fff; // TODO: Variable and theme
+                position: relative;
+                margin-left: 8px;
+
+                &::before {
+                    content: '';
+                    position: absolute;
+                    top: 6px;
+                    left: 6px;
+                    width: 16px;
+                    height: 16px;
+                    mask-image: url('$(res)/img/feather-customised/compass.svg');
+                    mask-position: center;
+                    mask-size: contain;
+                    mask-repeat: no-repeat;
+                    background: $primary-fg-color;
+                }
+            }
         }
 
         .mx_LeftPanel2_actualRoomListContainer {
diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
new file mode 100644
index 0000000000..d078031090
--- /dev/null
+++ b/res/css/structures/_RoomSearch.scss
@@ -0,0 +1,70 @@
+/*
+Copyright 2020 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.
+*/
+
+// Note: this component expects to be contained within a flexbox
+.mx_RoomSearch {
+    flex: 1;
+    border-radius: 20px;
+    background-color: #fff; // TODO: Variable & theme
+    height: 26px;
+    padding: 2px;
+
+    // Create a flexbox for the icons (easier to manage)
+    display: flex;
+    align-items: center;
+
+    .mx_RoomSearch_icon {
+        width: 16px;
+        height: 16px;
+        mask: url('$(res)/img/feather-customised/search-input.svg');
+        mask-repeat: no-repeat;
+        background: $primary-fg-color;
+        margin-left: 7px;
+    }
+
+    .mx_RoomSearch_input {
+        border: none !important; // !important to override default app-wide styles
+        flex: 1 !important; // !important to override default app-wide styles
+        color: $primary-fg-color !important; // !important to override default app-wide styles
+        padding: 0;
+        height: 100%;
+        width: 100%;
+        font-size: $font-12px;
+        line-height: $font-16px;
+
+        &:not(.mx_RoomSearch_inputExpanded)::placeholder {
+            color: $primary-fg-color !important; // !important to override default app-wide styles
+        }
+    }
+
+    &.mx_RoomSearch_expanded {
+        .mx_RoomSearch_clearButton {
+            width: 16px;
+            height: 16px;
+            mask-image: url('$(res)/img/feather-customised/x.svg');
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $primary-fg-color;
+            margin-right: 8px;
+        }
+    }
+
+    .mx_RoomSearch_clearButton {
+        width: 0;
+        height: 0;
+    }
+}
diff --git a/res/img/feather-customised/compass.svg b/res/img/feather-customised/compass.svg
new file mode 100644
index 0000000000..3296260803
--- /dev/null
+++ b/res/img/feather-customised/compass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-compass"><circle cx="12" cy="12" r="10"></circle><polygon points="16.24 7.76 14.12 14.12 7.76 16.24 9.88 9.88 16.24 7.76"></polygon></svg>
\ No newline at end of file
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index ff8d35a114..209f219598 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -22,9 +22,10 @@ import { _t } from "../../languageHandler";
 import SdkConfig from "../../SdkConfig";
 import * as sdk from "../../index";
 import dis from "../../dispatcher/dispatcher";
+import { Action } from "../../dispatcher/actions";
 
 const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
-const onClickExplore = () => dis.dispatch({action: 'view_room_directory'});
+const onClickExplore = () => dis.fire(Action.ViewRoomDirectory);
 const onClickNewRoom = () => dis.dispatch({action: 'view_create_room'});
 
 const HomePage = () => {
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 05cd97df2a..bae69b5631 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -252,7 +252,7 @@ const LeftPanel = createReactClass({
         if (!this.props.collapsed) {
             exploreButton = (
                 <div className={classNames("mx_LeftPanel_explore", {"mx_LeftPanel_explore_hidden": this.state.searchExpanded})}>
-                    <AccessibleButton onClick={() => dis.dispatch({action: 'view_room_directory'})}>{_t("Explore")}</AccessibleButton>
+                    <AccessibleButton onClick={() => dis.fire(Action.ViewRoomDirectory)}>{_t("Explore")}</AccessibleButton>
                 </div>
             );
         }
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index 2fd8612ff5..f417dc99b1 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -18,16 +18,16 @@ import * as React from "react";
 import TagPanel from "./TagPanel";
 import classNames from "classnames";
 import dis from "../../dispatcher/dispatcher";
-import AccessibleButton from "../views/elements/AccessibleButton";
 import { _t } from "../../languageHandler";
 import SearchBox from "./SearchBox";
 import RoomList2 from "../views/rooms/RoomList2";
-import TopLeftMenuButton from "./TopLeftMenuButton";
 import { Action } from "../../dispatcher/actions";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import BaseAvatar from '../views/avatars/BaseAvatar';
 import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
 import UserMenuButton from "./UserMenuButton";
+import RoomSearch from "./RoomSearch";
+import AccessibleButton from "../views/elements/AccessibleButton";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -42,7 +42,6 @@ interface IProps {
 }
 
 interface IState {
-    searchExpanded: boolean;
     searchFilter: string; // TODO: Move search into room list?
 }
 
@@ -58,7 +57,6 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         super(props);
 
         this.state = {
-            searchExpanded: false,
             searchFilter: "",
         };
     }
@@ -67,24 +65,10 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         this.setState({searchFilter: term});
     };
 
-    private onSearchCleared = (source: string): void => {
-        if (source === "keyboard") {
-            dis.fire(Action.FocusComposer);
-        }
-        this.setState({searchExpanded: false});
-    }
-
-    private onSearchFocus = (): void => {
-        this.setState({searchExpanded: true});
+    private onExplore = () => {
+        dis.fire(Action.ViewRoomDirectory);
     };
 
-    private onSearchBlur = (event: FocusEvent): void => {
-        const target = event.target as HTMLInputElement;
-        if (target.value.length === 0) {
-            this.setState({searchExpanded: false});
-        }
-    }
-
     private renderHeader(): React.ReactNode {
         // TODO: Update when profile info changes
         // TODO: Presence
@@ -126,6 +110,22 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         );
     }
 
+    private renderSearchExplore(): React.ReactNode {
+        // TODO: Collapsed support
+
+        return (
+            <div className="mx_LeftPanel2_filterContainer">
+                <RoomSearch onQueryUpdate={this.onSearch} />
+                <AccessibleButton
+                    tabIndex={-1}
+                    className='mx_LeftPanel2_exploreButton'
+                    onClick={this.onExplore}
+                    alt={_t("Explore rooms")}
+                />
+            </div>
+        );
+    }
+
     public render(): React.ReactNode {
         const tagPanel = (
             <div className="mx_LeftPanel2_tagPanelContainer">
@@ -133,18 +133,6 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
             </div>
         );
 
-        const searchBox = (<SearchBox
-            className="mx_LeftPanel2_filterRoomsSearch"
-            enableRoomSearchFocus={true}
-            blurredPlaceholder={_t('Filter')}
-            placeholder={_t('Filter rooms…')}
-            onKeyDown={() => {/*TODO*/}}
-            onSearch={this.onSearch}
-            onCleared={this.onSearchCleared}
-            onFocus={this.onSearchFocus}
-            onBlur={this.onSearchBlur}
-            collapsed={false}/>); // TODO: Collapsed support
-
         // TODO: Improve props for RoomList2
         const roomList = <RoomList2
             onKeyDown={() => {/*TODO*/}}
@@ -167,14 +155,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
                 {tagPanel}
                 <aside className="mx_LeftPanel2_roomListContainer">
                     {this.renderHeader()}
-                    <div
-                        className="mx_LeftPanel2_filterContainer"
-                        onKeyDown={() => {/*TODO*/}}
-                        onFocus={() => {/*TODO*/}}
-                        onBlur={() => {/*TODO*/}}
-                    >
-                        {searchBox}
-                    </div>
+                    {this.renderSearchExplore()}
                     <div className="mx_LeftPanel2_actualRoomListContainer">
                         {roomList}
                     </div>
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index e08381d8fa..634e13b103 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -624,7 +624,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 Modal.createTrackedDialog('Create Community', '', CreateGroupDialog);
                 break;
             }
-            case 'view_room_directory': {
+            case Action.ViewRoomDirectory: {
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
                 Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
                     'mx_RoomDirectory_dialogWrapper', false, true);
@@ -1611,9 +1611,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 action: 'require_registration',
             });
         } else if (screen === 'directory') {
-            dis.dispatch({
-                action: 'view_room_directory',
-            });
+            dis.fire(Action.ViewRoomDirectory);
         } else if (screen === 'groups') {
             dis.dispatch({
                 action: 'view_my_groups',
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
new file mode 100644
index 0000000000..671cd89e08
--- /dev/null
+++ b/src/components/structures/RoomSearch.tsx
@@ -0,0 +1,143 @@
+/*
+Copyright 2020 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 { createRef } from "react";
+import classNames from "classnames";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { _t } from "../../languageHandler";
+import { ActionPayload } from "../../dispatcher/payloads";
+import { throttle } from 'lodash';
+import { Key } from "../../Keyboard";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import { Action } from "../../dispatcher/actions";
+
+/*******************************************************************
+ *   CAUTION                                                       *
+ *******************************************************************
+ * This is a work in progress implementation and isn't complete or *
+ * even useful as a component. Please avoid using it until this    *
+ * warning disappears.                                             *
+ *******************************************************************/
+
+interface IProps {
+    onQueryUpdate: (newQuery: string) => void;
+}
+
+interface IState {
+    query: string;
+    focused: boolean;
+}
+
+export default class RoomSearch extends React.PureComponent<IProps, IState> {
+    private dispatcherRef: string;
+    private inputRef: React.RefObject<HTMLInputElement> = createRef();
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            query: "",
+            focused: false,
+        };
+
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+    }
+
+    public componentWillUnmount() {
+        defaultDispatcher.unregister(this.dispatcherRef);
+    }
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === 'view_room' && payload.clear_search) {
+            this.clearInput();
+        } else if (payload.action === 'focus_room_filter' && this.inputRef.current) {
+            this.inputRef.current.focus();
+        }
+    };
+
+    private clearInput = () => {
+        if (!this.inputRef.current) return;
+        this.inputRef.current.value = "";
+        this.onChange();
+    };
+
+    private onChange = () => {
+        if (!this.inputRef.current) return;
+        this.setState({query: this.inputRef.current.value});
+        this.onSearchUpdated();
+    };
+
+    // it wants this at the top of the file, but we know better
+    // tslint:disable-next-line
+    private onSearchUpdated = throttle(() => {
+            // We can't use the state variable because it can lag behind the input.
+            // The lag is most obvious when deleting/clearing text with the keyboard.
+            this.props.onQueryUpdate(this.inputRef.current.value);
+        }, 200, {trailing: true, leading: true},
+    );
+
+    private onFocus = (ev: React.FocusEvent<HTMLInputElement>) => {
+        this.setState({focused: true});
+        ev.target.select();
+    };
+
+    private onBlur = () => {
+        this.setState({focused: false});
+    };
+
+    private onKeyDown = (ev: React.KeyboardEvent) => {
+        if (ev.key === Key.ESCAPE) {
+            this.clearInput();
+            defaultDispatcher.fire(Action.FocusComposer);
+        }
+    };
+
+    public render(): React.ReactNode {
+        const classes = classNames({
+            'mx_RoomSearch': true,
+            'mx_RoomSearch_expanded': this.state.query || this.state.focused,
+        });
+
+        const inputClasses = classNames({
+            'mx_RoomSearch_input': true,
+            'mx_RoomSearch_inputExpanded': this.state.query || this.state.focused,
+        });
+
+        return (
+            <div className={classes}>
+                <div className='mx_RoomSearch_icon'/>
+                <input
+                    type="text"
+                    ref={this.inputRef}
+                    className={inputClasses}
+                    value={this.state.query}
+                    onFocus={this.onFocus}
+                    onBlur={this.onBlur}
+                    onChange={this.onChange}
+                    onKeyDown={this.onKeyDown}
+                    placeholder={_t("Search")}
+                    autoComplete="off"
+                />
+                <AccessibleButton
+                    tabIndex={-1}
+                    className='mx_RoomSearch_clearButton'
+                    onClick={this.clearInput}
+                />
+            </div>
+        );
+    }
+}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 0ff997ee09..ab3da035c4 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1458,9 +1458,7 @@ export default createReactClass({
         // using /leave rather than /join. In the short term though, we
         // just ignore them.
         // https://github.com/vector-im/vector-web/issues/1134
-        dis.dispatch({
-            action: 'view_room_directory',
-        });
+        dis.fire(Action.ViewRoomDirectory);
     },
 
     onSearchClick: function() {
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
index d0bff4beeb..e9de6f8d15 100644
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ b/src/components/views/elements/RoomDirectoryButton.js
@@ -18,11 +18,12 @@ import React from 'react';
 import * as sdk from '../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
+import {Action} from "../../../dispatcher/actions";
 
 const RoomDirectoryButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
-        <ActionButton action="view_room_directory"
+        <ActionButton action={Action.ViewRoomDirectory}
             mouseOverAction={props.callout ? "callout_room_directory" : null}
             label={_t("Room directory")}
             iconPath={require("../../../../res/img/icons-directory.svg")}
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index c9b5d9e3ad..5f7ca1293c 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -40,6 +40,11 @@ export enum Action {
      */
     ViewUserSettings = "view_user_settings",
 
+    /**
+     * Opens the room directory. No additional payload information required.
+     */
+    ViewRoomDirectory = "view_room_directory",
+
     /**
      * Sets the current tooltip. Should be use with ViewTooltipPayload.
      */

From 6c4c581f8f06418c5adb24bd31e2ed9ea75f0fe7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 20:51:51 -0600
Subject: [PATCH 094/181] i18n

---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3520446c2b..8a1d112e5d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1958,6 +1958,7 @@
     "Explore": "Explore",
     "Filter": "Filter",
     "Filter rooms…": "Filter rooms…",
+    "Explore rooms": "Explore rooms",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
@@ -2003,7 +2004,6 @@
     "Find a room…": "Find a room…",
     "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.",
-    "Explore rooms": "Explore rooms",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.",

From 3fcd5505b3ac21ad8298e9ee31ea5ad1b5b9425d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 21:38:56 -0600
Subject: [PATCH 095/181] Support prioritized room list filters

This is to fix an issue where when using both the community filter panel and the search box it's an AND rather than further refining the results.

This makes the search box further refine the community filter panel results.
---
 .../algorithms/list-ordering/Algorithm.ts     | 28 ++++++---
 .../filters/CommunityFilterCondition.ts       |  7 ++-
 .../room-list/filters/IFilterCondition.ts     | 12 ++++
 .../room-list/filters/NameFilterCondition.ts  |  7 ++-
 src/utils/arrays.ts                           | 60 +++++++++++++++++++
 src/utils/enums.ts                            | 29 +++++++++
 6 files changed, 134 insertions(+), 9 deletions(-)
 create mode 100644 src/utils/enums.ts

diff --git a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
index c3ac8c150f..a8512c0bd6 100644
--- a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
@@ -20,9 +20,11 @@ import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { EffectiveMembership, splitRoomsByMembership } from "../../membership";
 import { ITagMap, ITagSortingMap } from "../models";
 import DMRoomMap from "../../../../utils/DMRoomMap";
-import { FILTER_CHANGED, IFilterCondition } from "../../filters/IFilterCondition";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "../../filters/IFilterCondition";
 import { EventEmitter } from "events";
 import { UPDATE_EVENT } from "../../../AsyncStore";
+import { ArrayUtil } from "../../../../utils/arrays";
+import { getEnumValues } from "../../../../utils/enums";
 
 // TODO: Add locking support to avoid concurrent writes?
 
@@ -184,22 +186,33 @@ export abstract class Algorithm extends EventEmitter {
         }
 
         console.warn("Recalculating filtered room list");
-        const allowedByFilters = new Set<Room>();
         const filters = Array.from(this.allowedByFilter.keys());
+        const orderedFilters = new ArrayUtil(filters)
+            .groupBy(f => f.relativePriority)
+            .orderBy(getEnumValues(FilterPriority))
+            .value;
         const newMap: ITagMap = {};
         for (const tagId of Object.keys(this.cachedRooms)) {
             // Cheaply clone the rooms so we can more easily do operations on the list.
             // We optimize our lookups by trying to reduce sample size as much as possible
             // to the rooms we know will be deduped by the Set.
             const rooms = this.cachedRooms[tagId];
-            const remainingRooms = rooms.map(r => r).filter(r => !allowedByFilters.has(r));
-            const allowedRoomsInThisTag = [];
-            for (const filter of filters) {
+            let remainingRooms = rooms.map(r => r);
+            let allowedRoomsInThisTag = [];
+            let lastFilterPriority = orderedFilters[0].relativePriority;
+            for (const filter of orderedFilters) {
+                if (filter.relativePriority !== lastFilterPriority) {
+                    // Every time the filter changes priority, we want more specific filtering.
+                    // To accomplish that, reset the variables to make it look like the process
+                    // has started over, but using the filtered rooms as the seed.
+                    remainingRooms = allowedRoomsInThisTag;
+                    allowedRoomsInThisTag = [];
+                    lastFilterPriority = filter.relativePriority;
+                }
                 const filteredRooms = remainingRooms.filter(r => filter.isVisible(r));
                 for (const room of filteredRooms) {
                     const idx = remainingRooms.indexOf(room);
                     if (idx >= 0) remainingRooms.splice(idx, 1);
-                    allowedByFilters.add(room);
                     allowedRoomsInThisTag.push(room);
                 }
             }
@@ -207,7 +220,8 @@ export abstract class Algorithm extends EventEmitter {
             console.log(`[DEBUG] ${newMap[tagId].length}/${rooms.length} rooms filtered into ${tagId}`);
         }
 
-        this.allowedRoomsByFilters = allowedByFilters;
+        const allowedRooms = Object.values(newMap).reduce((rv, v) => { rv.push(...v); return rv; }, <Room[]>[]);
+        this.allowedRoomsByFilters = new Set(allowedRooms);
         this.filteredRooms = newMap;
         this.emit(LIST_UPDATED_EVENT);
     }
diff --git a/src/stores/room-list/filters/CommunityFilterCondition.ts b/src/stores/room-list/filters/CommunityFilterCondition.ts
index 13d0084ae1..3dfaffee3b 100644
--- a/src/stores/room-list/filters/CommunityFilterCondition.ts
+++ b/src/stores/room-list/filters/CommunityFilterCondition.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { Room } from "matrix-js-sdk/src/models/room";
-import { FILTER_CHANGED, IFilterCondition } from "./IFilterCondition";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
 import { Group } from "matrix-js-sdk/src/models/group";
 import { EventEmitter } from "events";
 import GroupStore from "../../GroupStore";
@@ -37,6 +37,11 @@ export class CommunityFilterCondition extends EventEmitter implements IFilterCon
         this.onStoreUpdate(); // trigger a false update to seed the store
     }
 
+    public get relativePriority(): FilterPriority {
+        // Lowest priority so we can coarsely find rooms.
+        return FilterPriority.Lowest;
+    }
+
     public isVisible(room: Room): boolean {
         return this.roomIds.includes(room.roomId);
     }
diff --git a/src/stores/room-list/filters/IFilterCondition.ts b/src/stores/room-list/filters/IFilterCondition.ts
index f7f0f61194..3b054eaece 100644
--- a/src/stores/room-list/filters/IFilterCondition.ts
+++ b/src/stores/room-list/filters/IFilterCondition.ts
@@ -19,6 +19,12 @@ import { EventEmitter } from "events";
 
 export const FILTER_CHANGED = "filter_changed";
 
+export enum FilterPriority {
+    Lowest,
+    // in the middle would be Low, Normal, and High if we had a need
+    Highest,
+}
+
 /**
  * A filter condition for the room list, determining if a room
  * should be shown or not.
@@ -32,6 +38,12 @@ export const FILTER_CHANGED = "filter_changed";
  * as a change in the user's input), this emits FILTER_CHANGED.
  */
 export interface IFilterCondition extends EventEmitter {
+    /**
+     * The relative priority that this filter should be applied with.
+     * Lower priorities get applied first.
+     */
+    relativePriority: FilterPriority;
+
     /**
      * Determines if a given room should be visible under this
      * condition.
diff --git a/src/stores/room-list/filters/NameFilterCondition.ts b/src/stores/room-list/filters/NameFilterCondition.ts
index 6a76569df3..f238cdeb09 100644
--- a/src/stores/room-list/filters/NameFilterCondition.ts
+++ b/src/stores/room-list/filters/NameFilterCondition.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { Room } from "matrix-js-sdk/src/models/room";
-import { FILTER_CHANGED, IFilterCondition } from "./IFilterCondition";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
 import { EventEmitter } from "events";
 
 /**
@@ -29,6 +29,11 @@ export class NameFilterCondition extends EventEmitter implements IFilterConditio
         super();
     }
 
+    public get relativePriority(): FilterPriority {
+        // We want this one to be at the highest priority so it can search within other filters.
+        return FilterPriority.Highest;
+    }
+
     public get search(): string {
         return this._search;
     }
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
index 3a84990b56..fea376afcd 100644
--- a/src/utils/arrays.ts
+++ b/src/utils/arrays.ts
@@ -45,3 +45,63 @@ export function arrayDiff<T>(a: T[], b: T[]): { added: T[], removed: T[] } {
         removed: a.filter(i => !b.includes(i)),
     };
 }
+
+/**
+ * Helper functions to perform LINQ-like queries on arrays.
+ */
+export class ArrayUtil<T> {
+    /**
+     * Create a new array helper.
+     * @param a The array to help. Can be modified in-place.
+     */
+    constructor(private a: T[]) {
+    }
+
+    /**
+     * The value of this array, after all appropriate alterations.
+     */
+    public get value(): T[] {
+        return this.a;
+    }
+
+    /**
+     * Groups an array by keys.
+     * @param fn The key-finding function.
+     * @returns This.
+     */
+    public groupBy<K>(fn: (a: T) => K): GroupedArray<K, T> {
+        const obj = this.a.reduce((rv: Map<K, T[]>, val: T) => {
+            const k = fn(val);
+            if (!rv.has(k)) rv.set(k, []);
+            rv.get(k).push(val);
+            return rv;
+        }, new Map<K, T[]>());
+        return new GroupedArray(obj);
+    }
+}
+
+/**
+ * Helper functions to perform LINQ-like queries on groups (maps).
+ */
+export class GroupedArray<K, T> {
+    /**
+     * Creates a new group helper.
+     * @param val The group to help. Can be modified in-place.
+     */
+    constructor(private val: Map<K, T[]>) {
+    }
+
+    /**
+     * Orders the grouping into an array using the provided key order.
+     * @param keyOrder The key order.
+     * @returns An array helper of the result.
+     */
+    public orderBy(keyOrder: K[]): ArrayUtil<T> {
+        const a: T[] = [];
+        for (const k of keyOrder) {
+            if (!this.val.has(k)) continue;
+            a.push(...this.val.get(k));
+        }
+        return new ArrayUtil(a);
+    }
+}
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
new file mode 100644
index 0000000000..42abaa0269
--- /dev/null
+++ b/src/utils/enums.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2020 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.
+*/
+
+export type EnumValue = string | number;
+
+/**
+ * Get the values for an enum.
+ * @param e The enum.
+ * @returns The enum values.
+ */
+export function getEnumValues<T>(e: any): T[] {
+    const keys = Object.keys(e);
+    return keys
+        .filter(k => ['string', 'number'].includes(typeof(e[k])))
+        .map(k => e[k]);
+}

From 1f82396ec54fd0d0228227e4c4924c4c5830e036 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Jun 2020 21:40:25 -0600
Subject: [PATCH 096/181] Remove unused type

---
 src/utils/enums.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/utils/enums.ts b/src/utils/enums.ts
index 42abaa0269..79656d7675 100644
--- a/src/utils/enums.ts
+++ b/src/utils/enums.ts
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export type EnumValue = string | number;
-
 /**
  * Get the values for an enum.
  * @param e The enum.

From ee5b9be34d477cc08483a4d7b628281ba0340d3b Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 9 Jun 2020 00:57:09 +0000
Subject: [PATCH 097/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2260 of 2260 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6e808dd951..ee2b19d2fb 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2483,5 +2483,6 @@
     "New version available. <a>Update now.</a>": "有可用的新版本。<a>立刻更新。</a>",
     "Emoji picker": "顏文字挑選器",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。",
-    "Show %(n)s more": "顯示另外 %(n)s 個"
+    "Show %(n)s more": "顯示另外 %(n)s 個",
+    "People": "夥伴"
 }

From c0b147e76fbb7fc71a3e0f1ec093682949e6d1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 9 Jun 2020 07:54:23 +0000
Subject: [PATCH 098/181] Translated using Weblate (French)

Currently translated at 100.0% (2260 of 2260 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5d19cb31e8..da93e28ddb 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2484,5 +2484,6 @@
     "New version available. <a>Update now.</a>": "Nouvelle version disponible. <a>Faire la mise à niveau maintenant.</a>",
     "Emoji picker": "Sélecteur d’émojis",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les messages directs.",
-    "Show %(n)s more": "En montrer %(n)s de plus"
+    "Show %(n)s more": "En montrer %(n)s de plus",
+    "People": "Personnes"
 }

From 5c4229433661dfb2cddb4a502412797354b9f3d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 9 Jun 2020 13:53:27 +0200
Subject: [PATCH 099/181] EventIndex: Store and restore the encryption info for
 encrypted events.

---
 src/Searching.js           | 20 ++++++++++++++++++++
 src/indexing/EventIndex.js | 33 +++++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/Searching.js b/src/Searching.js
index 663328fe41..fb59cc563d 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -107,6 +107,26 @@ async function localSearch(searchTerm, roomId = undefined) {
     const result = MatrixClientPeg.get()._processRoomEventsSearch(
         emptyResult, response);
 
+    // Restore our encryption info so we can properly re-verify the events.
+    for (let i = 0; i < result.results.length; i++) {
+        const timeline = result.results[i].context.getTimeline();
+
+        for (let j = 0; j < timeline.length; j++) {
+            const ev = timeline[j];
+            if (ev.event.curve25519Key) {
+                ev.makeEncrypted(
+                    "m.room.encrypted",
+                    { algorithm: ev.event.algorithm },
+                    ev.event.curve25519Key,
+                    ev.event.ed25519Key,
+                );
+                ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
+
+                delete ev.event.curve25519Key;
+            }
+        }
+    }
+
     return result;
 }
 
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index fac7c92b65..d4e8ab0117 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -290,6 +290,33 @@ export default class EventIndex extends EventEmitter {
         return validEventType && validMsgType && hasContentValue;
     }
 
+    eventToJson(ev) {
+        const jsonEvent = ev.toJSON();
+        const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+
+        if (ev.isEncrypted()) {
+            // Let us store some additional data so we can re-verify the event.
+            // The js-sdk checks if an event is encrypted using the algorithm,
+            // the sender key and ed25519 signing key are used to find the
+            // correct device that sent the event which allows us to check the
+            // verification state of the event, either directly or using cross
+            // signing.
+            e.curve25519Key = ev.getSenderKey();
+            e.ed25519Key = ev.getClaimedEd25519Key();
+            e.algorithm = ev.getWireContent().algorithm;
+            e.forwardingCurve25519KeyChain = ev.getForwardingCurve25519KeyChain();
+        } else {
+            // Make sure that unencrypted events don't contain any of that data,
+            // despite what the server might give to us.
+            delete e.curve25519Key;
+            delete e.ed25519Key;
+            delete e.algorithm;
+            delete e.forwardingCurve25519KeyChain;
+        }
+
+        return e;
+    }
+
     /**
      * Queue up live events to be added to the event index.
      *
@@ -300,8 +327,7 @@ export default class EventIndex extends EventEmitter {
 
         if (!this.isValidEvent(ev)) return;
 
-        const jsonEvent = ev.toJSON();
-        const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+        const e = this.eventToJson(ev);
 
         const profile = {
             displayname: ev.sender.rawDisplayName,
@@ -477,8 +503,7 @@ export default class EventIndex extends EventEmitter {
             // Let us convert the events back into a format that EventIndex can
             // consume.
             const events = filteredEvents.map((ev) => {
-                const jsonEvent = ev.toJSON();
-                const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+                const e = this.eventToJson(ev);
 
                 let profile = {};
                 if (e.sender in profiles) profile = profiles[e.sender];

From ae8b75214a49cb8aceae64cfc61161e45a8299ce Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 07:58:39 -0600
Subject: [PATCH 100/181] Balance out the throttle

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

diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index 671cd89e08..ebfb4e6056 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -83,7 +83,8 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
 
     // it wants this at the top of the file, but we know better
     // tslint:disable-next-line
-    private onSearchUpdated = throttle(() => {
+    private onSearchUpdated = throttle(
+        () => {
             // We can't use the state variable because it can lag behind the input.
             // The lag is most obvious when deleting/clearing text with the keyboard.
             this.props.onQueryUpdate(this.inputRef.current.value);

From 8faa0936c9b8dc008c03bb3b11b8b37a31feb058 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 08:01:03 -0600
Subject: [PATCH 101/181] 98 -> 99+

---
 src/utils/FormattingUtils.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/FormattingUtils.ts b/src/utils/FormattingUtils.ts
index ed1727d190..21b50da4ca 100644
--- a/src/utils/FormattingUtils.ts
+++ b/src/utils/FormattingUtils.ts
@@ -121,11 +121,12 @@ export function formatCommaSeparatedList(items: string[], itemLimit?: number): s
 }
 
 /**
- * Formats a number into a 'minimal' badge count (9, 99, 99+).
+ * Formats a number into a 'minimal' badge count (9, 98, 99+).
  * @param count The number to convert
  * @returns The badge count, stringified.
  */
 export function formatMinimalBadgeCount(count: number): string {
-    if (count < 100) return count.toString();
+    // we specifically go from "98" to "99+"
+    if (count < 99) return count.toString();
     return "99+";
 }

From 8632d56e97a9cb7d032ce97c3bf12f9273220ec2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 08:05:35 -0600
Subject: [PATCH 102/181] dispose -> destroy

---
 src/components/views/rooms/NotificationBadge.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index a77d2fc8d0..50af2ee1d0 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -136,7 +136,7 @@ export class RoomNotificationState extends EventEmitter {
         return getEffectiveMembership(this.room.getMyMembership()) === EffectiveMembership.Invite;
     }
 
-    public dispose(): void {
+    public destroy(): void {
         this.room.removeListener("Room.receipt", this.handleRoomEventUpdate);
         this.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
         this.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
@@ -240,7 +240,7 @@ export class ListNotificationState extends EventEmitter {
             const state = this.states[oldRoom.roomId];
             delete this.states[oldRoom.roomId];
             state.off(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
-            state.dispose();
+            state.destroy();
         }
         for (const newRoom of diff.added) {
             const state = new RoomNotificationState(newRoom);

From eefc40e0f89c00aa46763391abdb7943cd0ad90c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 08:08:39 -0600
Subject: [PATCH 103/181] Use IDestroyable instead of IDisposable

For consistency within our project
---
 src/components/views/rooms/NotificationBadge.tsx         | 3 ++-
 src/stores/room-list/filters/CommunityFilterCondition.ts | 6 +++---
 src/utils/{IDisposable.ts => IDestroyable.ts}            | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename src/utils/{IDisposable.ts => IDestroyable.ts} (91%)

diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 50af2ee1d0..65a56691bf 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -31,6 +31,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import ActiveRoomObserver from "../../../ActiveRoomObserver";
 import { EventEmitter } from "events";
 import { arrayDiff } from "../../../utils/arrays";
+import { IDestroyable } from "../../../utils/IDestroyable";
 
 export const NOTIFICATION_STATE_UPDATE = "update";
 
@@ -106,7 +107,7 @@ export default class NotificationBadge extends React.PureComponent<IProps, IStat
     }
 }
 
-export class RoomNotificationState extends EventEmitter {
+export class RoomNotificationState extends EventEmitter implements IDestroyable {
     private _symbol: string;
     private _count: number;
     private _color: NotificationColor;
diff --git a/src/stores/room-list/filters/CommunityFilterCondition.ts b/src/stores/room-list/filters/CommunityFilterCondition.ts
index 3dfaffee3b..b7ff8e686d 100644
--- a/src/stores/room-list/filters/CommunityFilterCondition.ts
+++ b/src/stores/room-list/filters/CommunityFilterCondition.ts
@@ -20,13 +20,13 @@ import { Group } from "matrix-js-sdk/src/models/group";
 import { EventEmitter } from "events";
 import GroupStore from "../../GroupStore";
 import { arrayHasDiff } from "../../../utils/arrays";
-import { IDisposable } from "../../../utils/IDisposable";
+import { IDestroyable } from "../../../utils/IDestroyable";
 
 /**
  * A filter condition for the room list which reveals rooms which
  * are a member of a given community.
  */
-export class CommunityFilterCondition extends EventEmitter implements IFilterCondition, IDisposable {
+export class CommunityFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable {
     private roomIds: string[] = [];
 
     constructor(private community: Group) {
@@ -57,7 +57,7 @@ export class CommunityFilterCondition extends EventEmitter implements IFilterCon
         }
     };
 
-    public dispose(): void {
+    public destroy(): void {
         GroupStore.off("update", this.onStoreUpdate);
     }
 }
diff --git a/src/utils/IDisposable.ts b/src/utils/IDestroyable.ts
similarity index 91%
rename from src/utils/IDisposable.ts
rename to src/utils/IDestroyable.ts
index bf03e3bc85..f58fffb299 100644
--- a/src/utils/IDisposable.ts
+++ b/src/utils/IDestroyable.ts
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export interface IDisposable {
-    dispose(): void;
+export interface IDestroyable {
+    destroy(): void;
 }

From 1467191a5d8d3fd9aefa5639aa77aebdd81d0dd9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 15:06:54 -0600
Subject: [PATCH 104/181] Update the CSS transition for breadcrumbs

The actual transition length might need adjusting, but this is fairly close to what was requested.
---
 package.json                                  |  2 +
 res/css/views/rooms/_RoomBreadcrumbs2.scss    | 34 ++++++-------
 .../views/rooms/RoomBreadcrumbs2.tsx          | 49 ++++++++++++++++---
 tsconfig.json                                 |  3 +-
 yarn.lock                                     | 29 ++++++++++-
 5 files changed, 89 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 93d59a4fa6..966119d1eb 100644
--- a/package.json
+++ b/package.json
@@ -94,6 +94,7 @@
     "react-dom": "^16.9.0",
     "react-focus-lock": "^2.2.1",
     "react-resizable": "^1.10.1",
+    "react-transition-group": "^4.4.1",
     "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.18.4",
     "text-encoding-utf-8": "^1.0.1",
@@ -126,6 +127,7 @@
     "@types/qrcode": "^1.3.4",
     "@types/react": "^16.9",
     "@types/react-dom": "^16.9.8",
+    "@types/react-transition-group": "^4.4.0",
     "@types/zxcvbn": "^4.4.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
diff --git a/res/css/views/rooms/_RoomBreadcrumbs2.scss b/res/css/views/rooms/_RoomBreadcrumbs2.scss
index 2db0fdca08..68cf7d7500 100644
--- a/res/css/views/rooms/_RoomBreadcrumbs2.scss
+++ b/res/css/views/rooms/_RoomBreadcrumbs2.scss
@@ -14,34 +14,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-@keyframes breadcrumb-popin {
-    0% {
-        // Ideally we'd use `width` instead of `opacity`, but we only
-        // have 16 nanoseconds to render the frame, and width is expensive.
-        opacity: 0;
-        transform: scale(0);
-    }
-    100% {
-        opacity: 1;
-        transform: scale(1);
-    }
-}
-
 .mx_RoomBreadcrumbs2 {
+    width: 100%;
+
     // Create a flexbox for the crumbs
     display: flex;
     flex-direction: row;
     align-items: flex-start;
-    width: 100%;
 
     .mx_RoomBreadcrumbs2_crumb {
         margin-right: 8px;
         width: 32px;
+    }
 
-        // React loves to add elements, so only target the one we want to animate
-        &:first-child {
-            animation: breadcrumb-popin 0.3s;
-        }
+    // These classes come from the CSSTransition component. There's many more classes we
+    // could care about, but this is all we worried about for now. The animation works by
+    // first triggering the enter state with the newest breadcrumb off screen (-40px) then
+    // sliding it into view.
+    &.mx_RoomBreadcrumbs2-enter {
+        margin-left: -40px; // 32px for the avatar, 8px for the margin
+    }
+    &.mx_RoomBreadcrumbs2-enter-active {
+        margin-left: 0;
+
+        // Timing function is as-requested by design.
+        // NOTE: The transition time MUST match the value passed to CSSTransition!
+        transition: margin-left 300ms cubic-bezier(0.66, 0.02, 0.36, 1);
     }
 
     .mx_RoomBreadcrumbs2_placeholder {
diff --git a/src/components/views/rooms/RoomBreadcrumbs2.tsx b/src/components/views/rooms/RoomBreadcrumbs2.tsx
index 195757ccf0..197170018a 100644
--- a/src/components/views/rooms/RoomBreadcrumbs2.tsx
+++ b/src/components/views/rooms/RoomBreadcrumbs2.tsx
@@ -23,6 +23,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import Analytics from "../../../Analytics";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+import { CSSTransition, TransitionGroup } from "react-transition-group";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -36,6 +37,14 @@ interface IProps {
 }
 
 interface IState {
+    // Both of these control the animation for the breadcrumbs. For details on the
+    // actual animation, see the CSS.
+    //
+    // doAnimation is to lie to the CSSTransition component (see onBreadcrumbsUpdate
+    // for info). skipFirst is used to try and reduce jerky animation - also see the
+    // breadcrumb update function for info on that.
+    doAnimation: boolean;
+    skipFirst: boolean;
 }
 
 export default class RoomBreadcrumbs2 extends React.PureComponent<IProps, IState> {
@@ -44,6 +53,11 @@ export default class RoomBreadcrumbs2 extends React.PureComponent<IProps, IState
     constructor(props: IProps) {
         super(props);
 
+        this.state = {
+            doAnimation: true, // technically we want animation on mount, but it won't be perfect
+            skipFirst: false, // render the thing, as boring as it is
+        };
+
         BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
     }
 
@@ -54,7 +68,16 @@ export default class RoomBreadcrumbs2 extends React.PureComponent<IProps, IState
 
     private onBreadcrumbsUpdate = () => {
         if (!this.isMounted) return;
-        this.forceUpdate(); // we have no state, so this is the best we can do
+
+        // We need to trick the CSSTransition component into updating, which means we need to
+        // tell it to not animate, then to animate a moment later. This causes two updates
+        // which means two renders. The skipFirst change is so that our don't-animate state
+        // doesn't show the breadcrumb we're about to reveal as it causes a visual jump/jerk.
+        // The second update, on the next available tick, causes the "enter" animation to start
+        // again and this time we want to show the newest breadcrumb because it'll be hidden
+        // off screen for the animation.
+        this.setState({doAnimation: false, skipFirst: true});
+        setTimeout(() => this.setState({doAnimation: true, skipFirst: false}), 0);
     };
 
     private viewRoom = (room: Room, index: number) => {
@@ -77,14 +100,26 @@ export default class RoomBreadcrumbs2 extends React.PureComponent<IProps, IState
             )
         });
 
-        if (tiles.length === 0) {
-            tiles.push(
-                <div className="mx_RoomBreadcrumbs2_placeholder">
-                    {_t("No recently visited rooms")}
+        if (tiles.length > 0) {
+            // NOTE: The CSSTransition timeout MUST match the timeout in our CSS!
+            return (
+                <CSSTransition
+                    appear={true} in={this.state.doAnimation} timeout={300}
+                    classNames='mx_RoomBreadcrumbs2'
+                >
+                    <div className='mx_RoomBreadcrumbs2'>
+                        {tiles.slice(this.state.skipFirst ? 1 : 0)}
+                    </div>
+                </CSSTransition>
+            );
+        } else {
+            return (
+                <div className='mx_RoomBreadcrumbs2'>
+                    <div className="mx_RoomBreadcrumbs2_placeholder">
+                        {_t("No recently visited rooms")}
+                    </div>
                 </div>
             );
         }
-
-        return <div className='mx_RoomBreadcrumbs2'>{tiles}</div>;
     }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 8a01ca335e..db040d1f31 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,8 @@
     "types": [
       "node",
       "react",
-      "flux"
+      "flux",
+      "react-transition-group"
     ]
   },
   "include": [
diff --git a/yarn.lock b/yarn.lock
index 333c5ccf20..32f8d3093e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -968,7 +968,7 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.10.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
   integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
@@ -1352,6 +1352,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-transition-group@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d"
+  integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*", "@types/react@^16.9":
   version "16.9.35"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
@@ -2835,7 +2842,7 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-csstype@^2.2.0:
+csstype@^2.2.0, csstype@^2.6.7:
   version "2.6.10"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
   integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
@@ -3054,6 +3061,14 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-helpers@^5.0.1:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b"
+  integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==
+  dependencies:
+    "@babel/runtime" "^7.8.7"
+    csstype "^2.6.7"
+
 dom-serializer@0, dom-serializer@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -7136,6 +7151,16 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
     react-is "^16.8.6"
     scheduler "^0.19.1"
 
+react-transition-group@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
+  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+
 react@^16.9.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"

From db23aaad8366f04bbecf4daf2be7acfc9bd5a5b2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 15:22:37 -0600
Subject: [PATCH 105/181] Destroy old CommunityFilterConditions when they
 aren't needed

Fixes https://github.com/vector-im/riot-web/issues/13971
---
 src/stores/room-list/TagWatcher.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/stores/room-list/TagWatcher.ts b/src/stores/room-list/TagWatcher.ts
index 1fb5223e00..22302b695d 100644
--- a/src/stores/room-list/TagWatcher.ts
+++ b/src/stores/room-list/TagWatcher.ts
@@ -74,6 +74,11 @@ export class TagWatcher {
                 this.store.removeFilter(filter);
             }
 
+            // Destroy any and all old filter conditions to prevent resource leaks
+            for (const filter of this.filters.values()) {
+                filter.destroy();
+            }
+
             this.filters = newFilters;
         }
     };

From fed52f274e796fc28586ee49614b51fd0128df25 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 15:23:34 -0600
Subject: [PATCH 106/181] Fix custom theme use with new room list

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

We were grabbing "custom-" instead of the actual theme name.
---
 src/components/structures/UserMenuButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index d8f96d4a91..5fbab796a6 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -80,7 +80,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
     private isUserOnDarkTheme(): boolean {
         const theme = SettingsStore.getValue("theme");
         if (theme.startsWith("custom-")) {
-            return getCustomTheme(theme.substring(0, 7)).is_dark;
+            return getCustomTheme(theme.substring("custom-".length)).is_dark;
         }
         return theme === "dark";
     }

From c3608006314eba7defd1c27b0a550c2eb15ad3f6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 15:26:13 -0600
Subject: [PATCH 107/181] Add token.remove() handling to room list temp proxy

Fixes https://github.com/vector-im/riot-web/issues/13930
---
 .../room-list/RoomListStoreTempProxy.ts       | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
index 0268cf0a46..13129f4bdb 100644
--- a/src/stores/room-list/RoomListStoreTempProxy.ts
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -31,11 +31,14 @@ export class RoomListStoreTempProxy {
         return SettingsStore.isFeatureEnabled("feature_new_room_list");
     }
 
-    public static addListener(handler: () => void) {
+    public static addListener(handler: () => void): RoomListStoreTempToken {
         if (RoomListStoreTempProxy.isUsingNewStore()) {
-            return RoomListStore.instance.on(UPDATE_EVENT, handler);
+            const offFn = () => RoomListStore.instance.off(UPDATE_EVENT, handler);
+            RoomListStore.instance.on(UPDATE_EVENT, handler);
+            return new RoomListStoreTempToken(offFn);
         } else {
-            return OldRoomListStore.addListener(handler);
+            const token = OldRoomListStore.addListener(handler);
+            return new RoomListStoreTempToken(() => token.remove());
         }
     }
 
@@ -47,3 +50,13 @@ export class RoomListStoreTempProxy {
         }
     }
 }
+
+
+export class RoomListStoreTempToken {
+    constructor(private offFn: () => void) {
+    }
+
+    public remove(): void {
+        this.offFn();
+    }
+}

From 84174cc44061d713c9fafad100790249a9a4b574 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 15:30:03 -0600
Subject: [PATCH 108/181] Remove 1 extra line

---
 src/stores/room-list/RoomListStoreTempProxy.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
index 13129f4bdb..0a173d53a9 100644
--- a/src/stores/room-list/RoomListStoreTempProxy.ts
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -51,7 +51,6 @@ export class RoomListStoreTempProxy {
     }
 }
 
-
 export class RoomListStoreTempToken {
     constructor(private offFn: () => void) {
     }

From b84af372b9800225f06d45077da87a2d13182e20 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 15:35:07 -0600
Subject: [PATCH 109/181] Bump animation time for breadcrumbs up to 640ms

This matches the design, unlike the 300ms which was too fast.
---
 res/css/views/rooms/_RoomBreadcrumbs2.scss      | 2 +-
 src/components/views/rooms/RoomBreadcrumbs2.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_RoomBreadcrumbs2.scss b/res/css/views/rooms/_RoomBreadcrumbs2.scss
index 68cf7d7500..ac5a9fc34e 100644
--- a/res/css/views/rooms/_RoomBreadcrumbs2.scss
+++ b/res/css/views/rooms/_RoomBreadcrumbs2.scss
@@ -39,7 +39,7 @@ limitations under the License.
 
         // Timing function is as-requested by design.
         // NOTE: The transition time MUST match the value passed to CSSTransition!
-        transition: margin-left 300ms cubic-bezier(0.66, 0.02, 0.36, 1);
+        transition: margin-left 640ms cubic-bezier(0.66, 0.02, 0.36, 1);
     }
 
     .mx_RoomBreadcrumbs2_placeholder {
diff --git a/src/components/views/rooms/RoomBreadcrumbs2.tsx b/src/components/views/rooms/RoomBreadcrumbs2.tsx
index 197170018a..1b912b39d6 100644
--- a/src/components/views/rooms/RoomBreadcrumbs2.tsx
+++ b/src/components/views/rooms/RoomBreadcrumbs2.tsx
@@ -104,7 +104,7 @@ export default class RoomBreadcrumbs2 extends React.PureComponent<IProps, IState
             // NOTE: The CSSTransition timeout MUST match the timeout in our CSS!
             return (
                 <CSSTransition
-                    appear={true} in={this.state.doAnimation} timeout={300}
+                    appear={true} in={this.state.doAnimation} timeout={640}
                     classNames='mx_RoomBreadcrumbs2'
                 >
                     <div className='mx_RoomBreadcrumbs2'>

From 5f8b7187cf2859471b6d88a445dd979288dc0280 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 19:48:31 -0600
Subject: [PATCH 110/181] Update resize handle for new designs

The diff should have information on what this does and how it is supposed to work.
---
 res/css/views/rooms/_RoomSublist2.scss      | 71 +++++++++++++++++--
 src/components/views/rooms/RoomSublist2.tsx | 76 +++++++++++++--------
 src/i18n/strings/en_EN.json                 |  3 +-
 src/stores/room-list/ListLayout.ts          | 19 +++++-
 4 files changed, 132 insertions(+), 37 deletions(-)

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index cfb9bc3b6d..b550b2f002 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -16,10 +16,6 @@ limitations under the License.
 
 // TODO: Rename to mx_RoomSublist during replacement of old component
 
-// TODO: Just use the 3 selectors we need from this instead of importing it.
-// We're going to end up with heavy modifications anyways.
-@import "../../../../node_modules/react-resizable/css/styles.css";
-
 .mx_RoomSublist2 {
     // The sublist is a column of rows, essentially
     display: flex;
@@ -63,18 +59,83 @@ limitations under the License.
     }
 
     .mx_RoomSublist2_resizeBox {
+        margin-bottom: 4px; // for the resize handle
+        position: relative;
+
         // Create another flexbox column for the tiles
         display: flex;
         flex-direction: column;
         overflow: hidden;
 
         .mx_RoomSublist2_showMoreButton {
-            height: 44px; // 1 room tile high
             cursor: pointer;
+            font-size: $font-13px;
+            line-height: $font-18px;
+            color: $roomtile2-preview-color;
+
+            // This is the same color as the left panel background because it needs
+            // to occlude the lastmost tile in the list.
+            background-color: $header-panel-bg-color;
+
+            // Update the render() function for RoomSublist2 if these change
+            // Update the ListLayout class for minVisibleTiles if these change.
+            //
+            // At 24px high and 8px padding on the top this equates to 0.65 of
+            // a tile due to how the padding calculations work.
+            height: 24px;
+            padding-top: 8px;
+
+            // We force this to the bottom so it will overlap rooms as needed.
+            // We account for the space it takes up (24px) in the code through padding.
+            position: absolute;
+            bottom: 4px; // the height of the resize handle
+            left: 0;
+            right: 0;
 
             // We create a flexbox to cheat at alignment
             display: flex;
             align-items: center;
+
+            .mx_RoomSublist2_showMoreButtonChevron {
+                position: relative;
+                width: 16px;
+                height: 16px;
+                margin-left: 12px;
+                margin-right: 18px;
+                mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+                mask-position: center;
+                mask-size: contain;
+                mask-repeat: no-repeat;
+                background: $roomtile2-preview-color;
+            }
+        }
+
+        // Class name comes from the ResizableBox component
+        // The hover state needs to use the whole sublist, not just the resizable box,
+        // so that selector is below and one level higher.
+        .react-resizable-handle {
+            cursor: ns-resize;
+            border-radius: 2px;
+
+            // This is positioned directly below the 'show more' button.
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+
+            // This is to visually align the bar in the list. Should be 12px from
+            // either side of the list. We define this after the positioning to
+            // trick the browser.
+            margin-left: 4px;
+            margin-right: 8px;
         }
     }
+
+    // The aforementioned selector for the hover state.
+    &:hover .react-resizable-handle {
+        opacity: 0.2;
+
+        // Update the render() function for RoomSublist2 if this changes
+        border: 2px solid $primary-fg-color;
+    }
 }
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index cd27156cbd..4ad803d046 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -178,46 +178,61 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
         let content = null;
         if (tiles.length > 0) {
+            const layout = this.props.layout; // to shorten calls
+
             // TODO: Lazy list rendering
             // TODO: Whatever scrolling magic needs to happen here
-            const layout = this.props.layout; // to shorten calls
-            const minTilesPx = layout.tilesToPixels(Math.min(tiles.length, layout.minVisibleTiles));
-            const maxTilesPx = layout.tilesToPixels(tiles.length);
-            const tilesPx = layout.tilesToPixels(Math.min(tiles.length, layout.visibleTiles));
+
+            const nVisible = Math.floor(layout.visibleTiles);
+            const visibleTiles = tiles.slice(0, nVisible);
+
+            // If we're hiding rooms, show a 'show more' button to the user. This button
+            // floats above the resize handle, if we have one present
+            let showMoreButton = null;
+            if (tiles.length > nVisible) {
+                // we have a cutoff condition - add the button to show all
+                const numMissing = tiles.length - visibleTiles.length;
+                showMoreButton = (
+                    <div onClick={this.onShowAllClick} className='mx_RoomSublist2_showMoreButton'>
+                        <span className='mx_RoomSublist2_showMoreButtonChevron'>
+                            {/* set by CSS masking */}
+                        </span>
+                        <span className='mx_RoomSublist2_showMoreButtonText'>
+                            {_t("Show %(count)s more", {count: numMissing})}
+                        </span>
+                    </div>
+                );
+            }
+
+            // Figure out if we need a handle
             let handles = ['s'];
             if (layout.visibleTiles >= tiles.length && tiles.length <= layout.minVisibleTiles) {
                 handles = []; // no handles, we're at a minimum
             }
 
-            // TODO: This might need adjustment, however for now it is fine as a round.
-            const nVisible = Math.round(layout.visibleTiles);
-            const visibleTiles = tiles.slice(0, nVisible);
+            // We have to account for padding so we can accommodate a 'show more' button and
+            // the resize handle, which are pinned to the bottom of the container. This is the
+            // easiest way to have a resize handle below the button as otherwise we're writing
+            // our own resize handling and that doesn't sound fun.
+            //
+            // The layout class has some helpers for dealing with padding, as we don't want to
+            // apply it in all cases. If we apply it in all cases, the resizing feels like it
+            // goes backwards and can become wildly incorrect (visibleTiles says 18 when there's
+            // only mathematically 7 possible).
 
-            // If we're hiding rooms, show a 'show more' button to the user. This button
-            // replaces the last visible tile, so will always show 2+ rooms. We do this
-            // because if it said "show 1 more room" we had might as well show that room
-            // instead. We also replace the last item so we don't have to adjust our math
-            // on pixel heights, etc. It's much easier to pretend the button is a tile.
-            if (tiles.length > nVisible) {
-                // we have a cutoff condition - add the button to show all
+            const showMoreHeight = 32; // As defined by CSS
+            const resizeHandleHeight = 4; // As defined by CSS
 
-                // we +1 to account for the room we're about to hide with our 'show more' button
-                // this results in the button always being 1+, and not needing an i18n `count`.
-                const numMissing = (tiles.length - visibleTiles.length) + 1;
+            // The padding is variable though, so figure out what we need padding for.
+            let padding = 0;
+            if (showMoreButton) padding += showMoreHeight;
+            if (handles.length > 0) padding += resizeHandleHeight;
+
+            const minTilesPx = layout.calculateTilesToPixelsMin(tiles.length, layout.minVisibleTiles, padding);
+            const maxTilesPx = layout.tilesToPixelsWithPadding(tiles.length, padding);
+            const tilesWithoutPadding = Math.min(tiles.length, layout.visibleTiles);
+            const tilesPx = layout.calculateTilesToPixelsMin(tiles.length, tilesWithoutPadding, padding);
 
-                // TODO: CSS TBD
-                // TODO: Make this an actual tile
-                // TODO: This is likely to pop out of the list, consider that.
-                visibleTiles.splice(visibleTiles.length - 1, 1, (
-                    <div
-                        onClick={this.onShowAllClick}
-                        className='mx_RoomSublist2_showMoreButton'
-                        key='showall'
-                    >
-                        {_t("Show %(n)s more", {n: numMissing})}
-                    </div>
-                ));
-            }
             content = (
                 <ResizableBox
                     width={-1}
@@ -230,6 +245,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     className="mx_RoomSublist2_resizeBox"
                 >
                     {visibleTiles}
+                    {showMoreButton}
                 </ResizableBox>
             )
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8a1d112e5d..f4880804b4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1134,7 +1134,8 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
-    "Show %(n)s more": "Show %(n)s more",
+    "Show %(count)s more|one": "Show %(count)s more",
+    "Show %(count)s more|other": "Show %(count)s more",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index a6abb7d37a..afcab8e12a 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -52,7 +52,24 @@ export class ListLayout {
     }
 
     public get minVisibleTiles(): number {
-        return 3;
+        // the .65 comes from the CSS where the show more button is
+        // mathematically 65% of a tile when floating.
+        return 4.65;
+    }
+
+    public calculateTilesToPixelsMin(maxTiles: number, n: number, possiblePadding: number): number {
+        // Only apply the padding if we're about to use maxTiles as we need to
+        // plan for the padding. If we're using n, the padding is already accounted
+        // for by the resizing stuff.
+        let padding = 0;
+        if (maxTiles < n) {
+            padding = possiblePadding;
+        }
+        return this.tilesToPixels(Math.min(maxTiles, n)) + padding;
+    }
+
+    public tilesToPixelsWithPadding(n: number, padding: number): number {
+        return this.tilesToPixels(n) + padding;
     }
 
     public tilesToPixels(n: number): number {

From 8ec6d4ce7627fb6865e21526ce958359cfd8274b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 19:53:07 -0600
Subject: [PATCH 111/181] Appease i18n

---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f4880804b4..1771e0d16c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1134,8 +1134,8 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
-    "Show %(count)s more|one": "Show %(count)s more",
     "Show %(count)s more|other": "Show %(count)s more",
+    "Show %(count)s more|one": "Show %(count)s more",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",

From 111394df6d928b786aea732b6ae3f0d0fef70a77 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 21:12:49 -0600
Subject: [PATCH 112/181] Add hover states and basic context menu to new room
 list

The 'sort by' radio buttons are blocked by https://github.com/matrix-org/matrix-react-sdk/pull/4731 as it contains the styles needed.

The 'unread rooms' checkbox is intentionally not hooked up. This is a more complicated refactoring that needs to be done.

The message preview checkbox works, though the previews remain hardcoded in this change. The primary intent of this change is to have a good enough context menu and the hover states.

The hover states are as described in the design.
---
 res/css/views/rooms/_RoomSublist2.scss      | 102 +++++++++++++++++
 res/css/views/rooms/_RoomTile2.scss         |   6 +-
 res/themes/light/css/_light.scss            |   1 +
 src/components/views/rooms/RoomSublist2.tsx | 116 +++++++++++++++++---
 src/i18n/strings/en_EN.json                 |   8 +-
 src/stores/room-list/ListLayout.ts          |  19 +++-
 6 files changed, 234 insertions(+), 18 deletions(-)

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index cfb9bc3b6d..04a718524c 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -45,6 +45,36 @@ limitations under the License.
             justify-content: flex-end;
         }
 
+        // Both of these buttons are hidden by default until the list is hovered
+        .mx_RoomSublist2_auxButton,
+        .mx_RoomSublist2_menuButton {
+            width: 0;
+            margin: 0;
+            visibility: hidden;
+            position: relative;
+
+            &::before {
+                content: '';
+                width: 16px;
+                height: 16px;
+                position: absolute;
+                top: 4px;
+                left: 4px;
+                mask-position: center;
+                mask-size: contain;
+                mask-repeat: no-repeat;
+                background: $muted-fg-color;
+            }
+        }
+
+        .mx_RoomSublist2_auxButton::before {
+            mask-image: url('$(res)/img/feather-customised/plus.svg');
+        }
+
+        .mx_RoomSublist2_menuButton::before {
+            mask-image: url('$(res)/img/feather-customised/more-horizontal.svg');
+        }
+
         .mx_RoomSublist2_headerText {
             text-transform: uppercase;
             opacity: 0.5;
@@ -77,4 +107,76 @@ limitations under the License.
             align-items: center;
         }
     }
+
+    &:hover, &.mx_RoomSublist2_hasMenuOpen {
+        .mx_RoomSublist2_headerContainer {
+            // If the header doesn't have an aux button we still need to hide the badge for
+            // the menu button.
+            .mx_RoomSublist2_badgeContainer {
+                // Completely hide the badge
+                width: 0;
+                margin: 0;
+                visibility: hidden;
+            }
+
+            &:not(.mx_RoomSublist2_headerContainer_withAux) {
+                // The menu button will be the rightmost button, so make it correctly aligned.
+                .mx_RoomSublist2_menuButton {
+                    margin-right: 16px;
+                }
+            }
+
+            // Both of these buttons have circled backgrounds and are visible at this point,
+            // so make them so.
+            .mx_RoomSublist2_auxButton,
+            .mx_RoomSublist2_menuButton {
+                width: 24px;
+                height: 24px;
+                border-radius: 32px;
+                margin-left: 16px;
+                background-color: #fff; // TODO: Variable and theme
+                visibility: visible;
+            }
+        }
+    }
+}
+
+// We have a hover style on the room list with no specific list hovered, so account for that
+.mx_RoomList2:hover .mx_RoomSublist2,
+.mx_RoomSublist2_hasMenuOpen {
+    .mx_RoomSublist2_headerContainer_withAux {
+        .mx_RoomSublist2_badgeContainer {
+            // Completely hide the badge
+            width: 0;
+            margin: 0;
+            visibility: hidden;
+        }
+
+        .mx_RoomSublist2_auxButton {
+            // Show the aux button, but not the list button
+            width: 24px;
+            height: 24px;
+            margin-right: 16px;
+            visibility: visible;
+        }
+    }
+}
+
+.mx_RoomSublist2_contextMenu {
+    padding: 20px 16px;
+    width: 250px;
+
+    hr {
+        margin-top: 16px;
+        margin-bottom: 16px;
+        margin-right: 16px; // additional 16px
+        border: 1px solid $roomsublist2-divider-color;
+    }
+
+    .mx_RoomSublist2_contextMenu_title {
+        font-size: $font-15px;
+        line-height: $font-20px;
+        font-weight: 600;
+        margin-bottom: 12px;
+    }
 }
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 41c9469bc1..d5ae053f6f 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -51,7 +51,7 @@ limitations under the License.
 
         .mx_RoomTile2_name {
             font-size: $font-14px;
-            line-height: $font-19px;
+            line-height: $font-18px;
         }
 
         .mx_RoomTile2_name.mx_RoomTile2_nameHasUnreadEvents {
@@ -63,6 +63,10 @@ limitations under the License.
             line-height: $font-18px;
             color: $roomtile2-preview-color;
         }
+
+        .mx_RoomTile2_nameWithPreview {
+            margin-top: -4px; // shift the name up a bit more
+        }
     }
 
     .mx_RoomTile2_badgeContainer {
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index a50c34cf03..3c6f6aa5a4 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -178,6 +178,7 @@ $roomtile2-preview-color: #9e9e9e;
 $roomtile2-badge-color: #61708b;
 $roomtile2-selected-bg-color: #FFF;
 $theme-button-bg-color: #e3e8f0;
+$roomsublist2-divider-color: #e9eaeb;
 
 $roomtile-name-color: #61708b;
 $roomtile-badge-fg-color: $accent-fg-color;
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index cd27156cbd..c1653aba15 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -27,6 +27,8 @@ import RoomTile2 from "./RoomTile2";
 import { ResizableBox, ResizeCallbackData } from "react-resizable";
 import { ListLayout } from "../../../stores/room-list/ListLayout";
 import NotificationBadge, { ListNotificationState } from "./NotificationBadge";
+import {ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
+import StyledCheckbox from "../elements/StyledCheckbox";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -41,7 +43,6 @@ interface IProps {
     rooms?: Room[];
     startAsHidden: boolean;
     label: string;
-    showMessagePreviews: boolean;
     onAddRoom?: () => void;
     addRoomLabel: string;
     isInvite: boolean;
@@ -57,16 +58,19 @@ interface IProps {
 
 interface IState {
     notificationState: ListNotificationState;
+    menuDisplayed: boolean;
 }
 
 export default class RoomSublist2 extends React.Component<IProps, IState> {
     private headerButton = createRef();
+    private menuButtonRef: React.RefObject<HTMLButtonElement> = createRef();
 
     constructor(props: IProps) {
         super(props);
 
         this.state = {
             notificationState: new ListNotificationState(this.props.isInvite),
+            menuDisplayed: false,
         };
         this.state.notificationState.setRooms(this.props.rooms);
     }
@@ -97,6 +101,26 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         this.forceUpdate(); // because the layout doesn't trigger a re-render
     };
 
+    private onOpenMenuClick = (ev: InputEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({menuDisplayed: true});
+    };
+
+    private onCloseMenu = () => {
+        this.setState({menuDisplayed: false});
+    };
+
+    private onUnreadFirstChanged = () => {
+        // TODO: Support per-list algorithm changes
+        console.log("Unread first changed");
+    };
+
+    private onMessagePreviewChanged = () => {
+        this.props.layout.showPreviews = !this.props.layout.showPreviews;
+        this.forceUpdate(); // because the layout doesn't trigger a re-render
+    };
+
     private renderTiles(): React.ReactElement[] {
         const tiles: React.ReactElement[] = [];
 
@@ -106,7 +130,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     <RoomTile2
                         room={room}
                         key={`room-${room.roomId}`}
-                        showMessagePreview={this.props.showMessagePreviews}
+                        showMessagePreview={this.props.layout.showPreviews}
                     />
                 );
             }
@@ -115,6 +139,61 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         return tiles;
     }
 
+    private renderMenu(): React.ReactElement {
+        let contextMenu = null;
+        if (this.state.menuDisplayed) {
+            const elementRect = this.menuButtonRef.current.getBoundingClientRect();
+            contextMenu = (
+                <ContextMenu
+                    chevronFace="none"
+                    left={elementRect.left}
+                    top={elementRect.top + elementRect.height}
+                    onFinished={this.onCloseMenu}
+                >
+                    <div className="mx_RoomSublist2_contextMenu">
+                        <div>
+                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Sort by")}</div>
+                            TODO: Radios are blocked by https://github.com/matrix-org/matrix-react-sdk/pull/4731
+                        </div>
+                        <hr />
+                        <div>
+                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Unread rooms")}</div>
+                            <StyledCheckbox
+                                onChange={this.onUnreadFirstChanged}
+                                checked={false/*TODO*/}
+                            >
+                                {_t("Always show first")}
+                            </StyledCheckbox>
+                        </div>
+                        <hr />
+                        <div>
+                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Show")}</div>
+                            <StyledCheckbox
+                                onChange={this.onMessagePreviewChanged}
+                                checked={this.props.layout.showPreviews}
+                            >
+                                {_t("Message preview")}
+                            </StyledCheckbox>
+                        </div>
+                    </div>
+                </ContextMenu>
+            );
+        }
+
+        return (
+            <React.Fragment>
+                <ContextMenuButton
+                    className="mx_RoomSublist2_menuButton"
+                    onClick={this.onOpenMenuClick}
+                    inputRef={this.menuButtonRef}
+                    label={_t("List options")}
+                    isExpanded={this.state.menuDisplayed}
+                />
+                {contextMenu}
+            </React.Fragment>
+        );
+    }
+
     private renderHeader(): React.ReactElement {
         // TODO: Title on collapsed
         // TODO: Incoming call box
@@ -129,22 +208,26 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
 
                     const badge = <NotificationBadge allowNoCount={false} notification={this.state.notificationState}/>;
 
-                    // TODO: Aux button
-                    // let addRoomButton = null;
-                    // if (!!this.props.onAddRoom) {
-                    //     addRoomButton = (
-                    //         <AccessibleTooltipButton
-                    //             tabIndex={tabIndex}
-                    //             onClick={this.onAddRoom}
-                    //             className="mx_RoomSublist2_addButton"
-                    //             title={this.props.addRoomLabel || _t("Add room")}
-                    //         />
-                    //     );
-                    // }
+                    let addRoomButton = null;
+                    if (!!this.props.onAddRoom) {
+                        addRoomButton = (
+                            <AccessibleButton
+                                tabIndex={tabIndex}
+                                onClick={this.onAddRoom}
+                                className="mx_RoomSublist2_auxButton"
+                                aria-label={this.props.addRoomLabel || _t("Add room")}
+                            />
+                        );
+                    }
+
+                    const classes = classNames({
+                        'mx_RoomSublist2_headerContainer': true,
+                        'mx_RoomSublist2_headerContainer_withAux': !!addRoomButton,
+                    });
 
                     // TODO: a11y (see old component)
                     return (
-                        <div className={"mx_RoomSublist2_headerContainer"}>
+                        <div className={classes}>
                             <AccessibleButton
                                 inputRef={ref}
                                 tabIndex={tabIndex}
@@ -157,6 +240,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                             <div className="mx_RoomSublist2_badgeContainer">
                                 {badge}
                             </div>
+                            {this.renderMenu()}
+                            {addRoomButton}
                         </div>
                     );
                 }}
@@ -174,6 +259,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
             // TODO: Proper collapse support
             'mx_RoomSublist2': true,
             'mx_RoomSublist2_collapsed': false, // len && isCollapsed
+            'mx_RoomSublist2_hasMenuOpen': this.state.menuDisplayed,
         });
 
         let content = null;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8a1d112e5d..c0a1f9f26b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1134,6 +1134,13 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
+    "Sort by": "Sort by",
+    "Unread rooms": "Unread rooms",
+    "Always show first": "Always show first",
+    "Show": "Show",
+    "Message preview": "Message preview",
+    "List options": "List options",
+    "Add room": "Add room",
     "Show %(n)s more": "Show %(n)s more",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
@@ -2017,7 +2024,6 @@
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?",
     "Jump to first unread room.": "Jump to first unread room.",
     "Jump to first invite.": "Jump to first invite.",
-    "Add room": "Add room",
     "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
     "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
     "Search failed": "Search failed",
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index a6abb7d37a..7fceb84123 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -20,10 +20,12 @@ const TILE_HEIGHT_PX = 44;
 
 interface ISerializedListLayout {
     numTiles: number;
+    showPreviews: boolean;
 }
 
 export class ListLayout {
     private _n = 0;
+    private _previews = false;
 
     constructor(public readonly tagId: TagID) {
         const serialized = localStorage.getItem(this.key);
@@ -31,9 +33,19 @@ export class ListLayout {
             // We don't use the setters as they cause writes.
             const parsed = <ISerializedListLayout>JSON.parse(serialized);
             this._n = parsed.numTiles;
+            this._previews = parsed.showPreviews;
         }
     }
 
+    public get showPreviews(): boolean {
+        return this._previews;
+    }
+
+    public set showPreviews(v: boolean) {
+        this._previews = v;
+        this.save();
+    }
+
     public get tileHeight(): number {
         return TILE_HEIGHT_PX;
     }
@@ -48,7 +60,7 @@ export class ListLayout {
 
     public set visibleTiles(v: number) {
         this._n = v;
-        localStorage.setItem(this.key, JSON.stringify(this.serialize()));
+        this.save();
     }
 
     public get minVisibleTiles(): number {
@@ -63,9 +75,14 @@ export class ListLayout {
         return px / this.tileHeight;
     }
 
+    private save() {
+        localStorage.setItem(this.key, JSON.stringify(this.serialize()));
+    }
+
     private serialize(): ISerializedListLayout {
         return {
             numTiles: this.visibleTiles,
+            showPreviews: this.showPreviews,
         };
     }
 }

From 2180a56074f3698fc0241c309a72ba6cad802d1c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 21:15:38 -0600
Subject: [PATCH 113/181] Remove irrelevant property

---
 src/components/views/rooms/RoomList2.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index ce1956f68d..42fb829b25 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -200,7 +200,6 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                     addRoomLabel={aesthetics.addRoomLabel}
                     isInvite={aesthetics.isInvite}
                     layout={this.state.layouts.get(orderedTagId)}
-                    showMessagePreviews={orderedTagId === DefaultTagID.DM}
                 />
             );
         }

From 0755b4c14898d6b28d9ac58c6f61d17efd4046b1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 23:09:15 -0600
Subject: [PATCH 114/181] Add a context menu to rooms in the new room list

The tag options are not implemented out of concern for diff size.

This splits the context menu classes out to a new "iconized" style which is common across a number of context menus, including the UserMenu.

Some of the badge/sublist styles had to change to better accommodate the menu icon lining up.

This also contains the framework required for https://github.com/vector-im/riot-web/issues/13961
---
 res/css/_common.scss                         | 115 ++++++++++++++++
 res/css/structures/_UserMenuButton.scss      |  80 ------------
 res/css/views/rooms/_NotificationBadge.scss  |   2 +-
 res/css/views/rooms/_RoomSublist2.scss       |   3 +-
 res/css/views/rooms/_RoomTile2.scss          | 111 +++++++++++++++-
 res/img/feather-customised/arrow-down.svg    |   1 +
 res/img/feather-customised/star.svg          |   1 +
 src/components/structures/UserMenuButton.tsx |   6 +-
 src/components/views/rooms/RoomTile2.tsx     | 130 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                  |   8 +-
 10 files changed, 362 insertions(+), 95 deletions(-)
 create mode 100644 res/img/feather-customised/arrow-down.svg
 create mode 100644 res/img/feather-customised/star.svg

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 77a8ff9f4a..e83c6aaeda 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -581,3 +581,118 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     // So it fits in the space provided by the page
     max-width: 120px;
 }
+
+// A context menu that largely fits the | [icon]    [label] | format.
+.mx_IconizedContextMenu {
+    // Put 20px of padding around the whole menu. We do this instead of a
+    // simple `padding: 20px` rule so the horizontal rules added by the
+    // optionLists is rendered correctly (full width).
+    > * {
+        padding-left: 20px;
+        padding-right: 20px;
+
+        &:first-child {
+            padding-top: 20px;
+        }
+
+        &:last-child {
+            padding-bottom: 20px;
+        }
+    }
+
+    .mx_IconizedContextMenu_optionList {
+        // the notFirst class is for cases where the optionList might be under a header of sorts.
+        &:nth-child(n + 2), .mx_IconizedContextMenu_optionList_notFirst {
+            margin-top: 20px;
+
+            // This is a bit of a hack when we could just use a simple border-top property,
+            // however we have a (kinda) good reason for doing it this way: we need opacity.
+            // To get the right color, we need an opacity modifier which means we have to work
+            // around the problem. PostCSS doesn't support the opacity() function, and if we
+            // use something like postcss-functions we quickly run into an issue where the
+            // function we would define gets passed a CSS variable for custom themes, which
+            // can't be converted easily even when considering https://stackoverflow.com/a/41265350/7037379
+            //
+            // Therefore, we just hack in a line and border the thing ourselves
+            &::before {
+                border-top: 1px solid $primary-fg-color;
+                opacity: 0.1;
+                content: '';
+
+                // Counteract the padding problems (width: 100% ignores the 40px padding,
+                // unless we position it absolutely then it does the right thing).
+                width: 100%;
+                position: absolute;
+                left: 0;
+            }
+        }
+
+        ul {
+            list-style: none;
+            margin: 0;
+            padding: 0;
+
+            li {
+                margin: 0;
+                padding: 20px 0 0;
+
+                .mx_AccessibleButton {
+                    text-decoration: none;
+                    color: $primary-fg-color;
+                    font-size: $font-15px;
+                    line-height: $font-24px;
+
+                    // Create a flexbox to more easily define the list items
+                    display: flex;
+                    align-items: center;
+
+                    img, .mx_IconizedContextMenu_icon { // icons
+                        width: 16px;
+                        min-width: 16px;
+                        max-width: 16px;
+                    }
+
+                    span:last-child { // labels
+                        padding-left: 14px;
+                        width: 100%;
+                        flex: 1;
+
+                        // Ellipsize any text overflow
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                        white-space: nowrap;
+                    }
+                }
+            }
+        }
+    }
+
+    &.mx_IconizedContextMenu_compact {
+        > * {
+            padding-left: 11px;
+            padding-right: 16px;
+
+            &:first-child {
+                padding-top: 13px;
+            }
+
+            &:last-child {
+                padding-bottom: 13px;
+            }
+        }
+
+        .mx_IconizedContextMenu_optionList {
+            &:nth-child(n + 2), .mx_IconizedContextMenu_optionList_notFirst {
+                margin-top: 10px;
+
+                li:first-child {
+                    padding-top: 10px;
+                }
+            }
+
+            li:first-child {
+                padding-top: 0;
+            }
+        }
+    }
+}
diff --git a/res/css/structures/_UserMenuButton.scss b/res/css/structures/_UserMenuButton.scss
index 1f4183f8d6..a173e468e1 100644
--- a/res/css/structures/_UserMenuButton.scss
+++ b/res/css/structures/_UserMenuButton.scss
@@ -21,22 +21,6 @@ limitations under the License.
 .mx_UserMenuButton_contextMenu {
     width: 231px;
 
-    // Put 20px of padding around the whole menu. We do this instead of a
-    // simple `padding: 20px` rule so the horizontal rules added by the
-    // optionLists is rendered correctly (full width).
-    > * {
-        padding-left: 20px;
-        padding-right: 20px;
-
-        &:first-child {
-            padding-top: 20px;
-        }
-
-        &:last-child {
-            padding-bottom: 20px;
-        }
-    }
-
     .mx_UserMenuButton_contextMenu_header {
         // Create a flexbox to organize the header a bit easier
         display: flex;
@@ -95,68 +79,4 @@ limitations under the License.
             justify-content: center;
         }
     }
-
-    .mx_UserMenuButton_contextMenu_optionList {
-        margin-top: 20px;
-
-        // This is a bit of a hack when we could just use a simple border-top property,
-        // however we have a (kinda) good reason for doing it this way: we need opacity.
-        // To get the right color, we need an opacity modifier which means we have to work
-        // around the problem. PostCSS doesn't support the opacity() function, and if we
-        // use something like postcss-functions we quickly run into an issue where the
-        // function we would define gets passed a CSS variable for custom themes, which
-        // can't be converted easily even when considering https://stackoverflow.com/a/41265350/7037379
-        //
-        // Therefore, we just hack in a line and border the thing ourselves
-        &::before {
-            border-top: 1px solid $primary-fg-color;
-            opacity: 0.1;
-            content: '';
-
-            // Counteract the padding problems (width: 100% ignores the 40px padding,
-            // unless we position it absolutely then it does the right thing).
-            width: 100%;
-            position: absolute;
-            left: 0;
-        }
-
-        ul {
-            list-style: none;
-            margin: 0;
-            padding: 0;
-
-            li {
-                margin: 0;
-                padding: 20px 0 0;
-
-                .mx_AccessibleButton {
-                    text-decoration: none;
-                    color: $primary-fg-color;
-                    font-size: $font-15px;
-                    line-height: $font-24px;
-
-                    // Create a flexbox to more easily define the list items
-                    display: flex;
-                    align-items: center;
-
-                    img { // icons
-                        width: 16px;
-                        min-width: 16px;
-                        max-width: 16px;
-                    }
-
-                    span { // labels
-                        padding-left: 14px;
-                        width: 100%;
-                        flex: 1;
-
-                        // Ellipsize any text overflow
-                        text-overflow: ellipsis;
-                        overflow: hidden;
-                        white-space: nowrap;
-                    }
-                }
-            }
-        }
-    }
 }
diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss
index 609e41c583..500a7b7e05 100644
--- a/res/css/views/rooms/_NotificationBadge.scss
+++ b/res/css/views/rooms/_NotificationBadge.scss
@@ -46,7 +46,7 @@ limitations under the License.
             width: 6px;
             height: 6px;
             border-radius: 6px;
-            margin-right: 18px;
+            margin-right: 8px;
         }
 
         &.mx_NotificationBadge_2char {
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index cfb9bc3b6d..b92200500a 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -25,9 +25,10 @@ limitations under the License.
     display: flex;
     flex-direction: column;
 
-    margin-left: 8px;
+    padding-left: 8px;
     margin-top: 12px;
     margin-bottom: 12px;
+    width: 100%;
 
     .mx_RoomSublist2_headerContainer {
         // Create a flexbox to make ordering easy
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 41c9469bc1..48389adfc8 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -18,7 +18,7 @@ limitations under the License.
 
 // Note: the room tile expects to be in a flexbox column container
 .mx_RoomTile2 {
-    width: calc(100% - 11px); // 8px for padding (4px on either side), 3px for margin
+    width: calc(100% - 21px); // 8px for padding (4px on either side), 3px for margin
     margin-bottom: 4px;
     margin-right: 3px;
     padding: 4px;
@@ -27,7 +27,7 @@ limitations under the License.
     display: flex;
     flex-wrap: wrap;
 
-    &.mx_RoomTile2_selected {
+    &.mx_RoomTile2_selected, &:hover, &.mx_RoomTile2_hasMenuOpen {
         background-color: $roomtile2-selected-bg-color;
         border-radius: 32px;
     }
@@ -37,6 +37,9 @@ limitations under the License.
     }
 
     .mx_RoomTile2_nameContainer {
+        flex-grow: 1;
+        max-width: calc(100% - 58px); // 32px avatar, 18px badge area, 8px margin on avatar
+
         // Create a new column layout flexbox for the name parts
         display: flex;
         flex-direction: column;
@@ -45,9 +48,13 @@ limitations under the License.
         .mx_RoomTile2_name,
         .mx_RoomTile2_messagePreview {
             margin: 0 2px;
-        }
+            width: 100%;
 
-        // TODO: Ellipsis on the name and preview
+            // Ellipsize any text overflow
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
 
         .mx_RoomTile2_name {
             font-size: $font-14px;
@@ -66,7 +73,8 @@ limitations under the License.
     }
 
     .mx_RoomTile2_badgeContainer {
-        flex-grow: 1;
+        width: 18px;
+        height: 32px;
 
         // Create another flexbox row because it's super easy to position the badge at
         // the end this way.
@@ -74,4 +82,97 @@ limitations under the License.
         align-items: center;
         justify-content: flex-end;
     }
+
+    // The menu button is hidden by default
+    // TODO: [Notifications] Add your bell icon class here, similar to the following approach:
+    // https://github.com/matrix-org/matrix-react-sdk/blob/2180a56074f3698fc0241c309a72ba6cad802d1c/res/css/views/rooms/_RoomSublist2.scss#L48-L76
+    // You'll need to do the same down below on the &:hover selector for the tile.
+    // ... also remove this 4 line TODO comment.
+    .mx_RoomTile2_menuButton {
+        width: 0;
+        height: 0;
+        visibility: hidden;
+        position: relative;
+
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            position: absolute;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $primary-fg-color;
+        }
+    }
+
+    .mx_RoomTile2_menuButton::before {
+        top: 8px;
+        left: -1px; // this is off-center to align it with the badges
+        mask-image: url('$(res)/img/feather-customised/more-horizontal.svg');
+    }
+
+    &:hover, &.mx_RoomTile2_hasMenuOpen {
+        // Hide the badge container on hover because it'll be a menu button
+        .mx_RoomTile2_badgeContainer {
+            width: 0;
+            height: 0;
+            visibility: hidden;
+        }
+
+        .mx_RoomTile2_menuButton {
+            width: 18px;
+            height: 32px;
+            visibility: visible;
+        }
+    }
+}
+
+.mx_RoomTile2_contextMenu {
+    .mx_RoomTile2_contextMenu_redRow {
+        .mx_AccessibleButton {
+            color: $warning-color !important; // !important to override styles from context menu
+        }
+
+        .mx_IconizedContextMenu_icon::before {
+            background-color: $warning-color;
+        }
+    }
+
+    .mx_IconizedContextMenu_icon {
+        position: relative;
+        width: 16px;
+        height: 16px;
+
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            position: absolute;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $primary-fg-color;
+        }
+    }
+
+    .mx_RoomTile2_iconStar::before {
+        mask-image: url('$(res)/img/feather-customised/star.svg');
+    }
+
+    .mx_RoomTile2_iconArrowDown::before {
+        mask-image: url('$(res)/img/feather-customised/arrow-down.svg');
+    }
+
+    .mx_RoomTile2_iconUser::before {
+        mask-image: url('$(res)/img/feather-customised/user.svg');
+    }
+
+    .mx_RoomTile2_iconSettings::before {
+        mask-image: url('$(res)/img/feather-customised/settings.svg');
+    }
+
+    .mx_RoomTile2_iconSignOut::before {
+        mask-image: url('$(res)/img/feather-customised/sign-out.svg');
+    }
 }
diff --git a/res/img/feather-customised/arrow-down.svg b/res/img/feather-customised/arrow-down.svg
new file mode 100644
index 0000000000..4f84f627bd
--- /dev/null
+++ b/res/img/feather-customised/arrow-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-arrow-down"><line x1="12" y1="5" x2="12" y2="19"></line><polyline points="19 12 12 19 5 12"></polyline></svg>
\ No newline at end of file
diff --git a/res/img/feather-customised/star.svg b/res/img/feather-customised/star.svg
new file mode 100644
index 0000000000..bcdc31aa47
--- /dev/null
+++ b/res/img/feather-customised/star.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-star"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"></polygon></svg>
\ No newline at end of file
diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index d8f96d4a91..ff8491864a 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -180,7 +180,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                     top={elementRect.top + elementRect.height}
                     onFinished={this.onCloseMenu}
                 >
-                    <div className="mx_UserMenuButton_contextMenu">
+                    <div className="mx_IconizedContextMenu mx_UserMenuButton_contextMenu">
                         <div className="mx_UserMenuButton_contextMenu_header">
                             <div className="mx_UserMenuButton_contextMenu_name">
                                 <span className="mx_UserMenuButton_contextMenu_displayName">
@@ -203,7 +203,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                             </div>
                         </div>
                         {hostingLink}
-                        <div className="mx_UserMenuButton_contextMenu_optionList">
+                        <div className="mx_IconizedContextMenu_optionList mx_IconizedContextMenu_optionList_notFirst">
                             <ul>
                                 <li>
                                     <AccessibleButton onClick={(e) => this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}>
@@ -237,7 +237,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
                                 </li>
                             </ul>
                         </div>
-                        <div className="mx_UserMenuButton_contextMenu_optionList">
+                        <div className="mx_IconizedContextMenu_optionList">
                             <ul>
                                 <li>
                                     <AccessibleButton onClick={this.onSignOutClick}>
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index d4f64e4571..7778b5be4b 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -27,6 +27,9 @@ import dis from '../../../dispatcher/dispatcher';
 import { Key } from "../../../Keyboard";
 import ActiveRoomObserver from "../../../ActiveRoomObserver";
 import NotificationBadge, { INotificationState, NotificationColor, RoomNotificationState } from "./NotificationBadge";
+import { _t } from "../../../languageHandler";
+import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -49,10 +52,12 @@ interface IState {
     hover: boolean;
     notificationState: INotificationState;
     selected: boolean;
+    generalMenuDisplayed: boolean;
 }
 
 export default class RoomTile2 extends React.Component<IProps, IState> {
-    private roomTile = createRef();
+    private roomTileRef: React.RefObject<HTMLDivElement> = createRef();
+    private generalMenuButtonRef: React.RefObject<HTMLButtonElement> = createRef();
 
     // TODO: Custom status
     // TODO: Lock icon
@@ -72,6 +77,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             hover: false,
             notificationState: new RoomNotificationState(this.props.room),
             selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
+            generalMenuDisplayed: false,
         };
 
         ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
@@ -105,6 +111,124 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         this.setState({selected: isActive});
     };
 
+    private onGeneralMenuOpenClick = (ev: InputEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({generalMenuDisplayed: true});
+    };
+
+    private onCloseGeneralMenu = (ev: InputEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({generalMenuDisplayed: false});
+    };
+
+    private onTagRoom = (ev: React.MouseEvent, tagId: TagID) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (tagId === DefaultTagID.DM) {
+            // TODO: DM Flagging
+        } else {
+            // TODO: XOR favourites and low priority
+        }
+    };
+
+    private onLeaveRoomClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        dis.dispatch({
+            action: 'leave_room',
+            room_id: this.props.room.roomId,
+        });
+        this.setState({generalMenuDisplayed: false}); // hide the menu
+    };
+
+    private onOpenRoomSettings = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        dis.dispatch({
+            action: 'open_room_settings',
+            room_id: this.props.room.roomId,
+        });
+        this.setState({generalMenuDisplayed: false}); // hide the menu
+    };
+
+    private renderGeneralMenu(): React.ReactElement {
+        let contextMenu = null;
+        if (this.state.generalMenuDisplayed) {
+            // The context menu appears within the list, so use the room tile as a reference point
+            const elementRect = this.roomTileRef.current.getBoundingClientRect();
+            contextMenu = (
+                <ContextMenu
+                    chevronFace="none"
+                    left={elementRect.left}
+                    top={elementRect.top + elementRect.height + 8}
+                    onFinished={this.onCloseGeneralMenu}
+                >
+                    <div
+                        className="mx_IconizedContextMenu mx_IconizedContextMenu_compact mx_RoomTile2_contextMenu"
+                        style={{width: elementRect.width}}
+                    >
+                        <div className="mx_IconizedContextMenu_optionList">
+                            <ul>
+                                <li>
+                                    <AccessibleButton onClick={(e) => this.onTagRoom(e, DefaultTagID.Favourite)}>
+                                        <span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconStar" />
+                                        <span>{_t("Favourite")}</span>
+                                    </AccessibleButton>
+                                </li>
+                                <li>
+                                    <AccessibleButton onClick={(e) => this.onTagRoom(e, DefaultTagID.LowPriority)}>
+                                        <span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconArrowDown" />
+                                        <span>{_t("Low Priority")}</span>
+                                    </AccessibleButton>
+                                </li>
+                                <li>
+                                    <AccessibleButton onClick={(e) => this.onTagRoom(e, DefaultTagID.DM)}>
+                                        <span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconUser" />
+                                        <span>{_t("Direct Chat")}</span>
+                                    </AccessibleButton>
+                                </li>
+                                <li>
+                                    <AccessibleButton onClick={this.onOpenRoomSettings}>
+                                        <span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconSettings" />
+                                        <span>{_t("Settings")}</span>
+                                    </AccessibleButton>
+                                </li>
+                            </ul>
+                        </div>
+                        <div className="mx_IconizedContextMenu_optionList">
+                            <ul>
+                                <li className="mx_RoomTile2_contextMenu_redRow">
+                                    <AccessibleButton onClick={this.onLeaveRoomClick}>
+                                        <span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconSignOut" />
+                                        <span>{_t("Leave Room")}</span>
+                                    </AccessibleButton>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </ContextMenu>
+            );
+        }
+
+        return (
+            <React.Fragment>
+                <ContextMenuButton
+                    className="mx_RoomTile2_menuButton"
+                    onClick={this.onGeneralMenuOpenClick}
+                    inputRef={this.generalMenuButtonRef}
+                    label={_t("Room options")}
+                    isExpanded={this.state.generalMenuDisplayed}
+                />
+                {contextMenu}
+            </React.Fragment>
+        )
+    }
+
     public render(): React.ReactElement {
         // TODO: Collapsed state
         // TODO: Invites
@@ -114,6 +238,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         const classes = classNames({
             'mx_RoomTile2': true,
             'mx_RoomTile2_selected': this.state.selected,
+            'mx_RoomTile2_hasMenuOpen': this.state.generalMenuDisplayed,
         });
 
         const badge = <NotificationBadge notification={this.state.notificationState} allowNoCount={true} />;
@@ -141,7 +266,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         const avatarSize = 32;
         return (
             <React.Fragment>
-                <RovingTabIndexWrapper inputRef={this.roomTile}>
+                <RovingTabIndexWrapper inputRef={this.roomTileRef}>
                     {({onFocus, isActive, ref}) =>
                         <AccessibleButton
                             onFocus={onFocus}
@@ -165,6 +290,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                             <div className="mx_RoomTile2_badgeContainer">
                                 {badge}
                             </div>
+                            {this.renderGeneralMenu()}
                         </AccessibleButton>
                     }
                 </RovingTabIndexWrapper>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8a1d112e5d..aca7795c4e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1142,6 +1142,11 @@
     "%(count)s unread messages.|one": "1 unread message.",
     "Unread mentions.": "Unread mentions.",
     "Unread messages.": "Unread messages.",
+    "Favourite": "Favourite",
+    "Low Priority": "Low Priority",
+    "Direct Chat": "Direct Chat",
+    "Leave Room": "Leave Room",
+    "Room options": "Room options",
     "Add a topic": "Add a topic",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
     "This room has already been upgraded.": "This room has already been upgraded.",
@@ -1817,9 +1822,6 @@
     "Mentions only": "Mentions only",
     "Leave": "Leave",
     "Forget": "Forget",
-    "Favourite": "Favourite",
-    "Low Priority": "Low Priority",
-    "Direct Chat": "Direct Chat",
     "Clear status": "Clear status",
     "Update status": "Update status",
     "Set status": "Set status",

From 175fc0e2a1df8954d2b13f75373e8b23a93ce805 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jun 2020 23:13:57 -0600
Subject: [PATCH 115/181] Appease the style linter

---
 res/css/views/rooms/_RoomTile2.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 48389adfc8..609cf53062 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -84,11 +84,12 @@ limitations under the License.
     }
 
     // The menu button is hidden by default
-    // TODO: [Notifications] Add your bell icon class here, similar to the following approach:
+    // TODO: [Notifications] Use mx_RoomTile2_notificationsButton, similar to the following approach:
     // https://github.com/matrix-org/matrix-react-sdk/blob/2180a56074f3698fc0241c309a72ba6cad802d1c/res/css/views/rooms/_RoomSublist2.scss#L48-L76
     // You'll need to do the same down below on the &:hover selector for the tile.
     // ... also remove this 4 line TODO comment.
-    .mx_RoomTile2_menuButton {
+    .mx_RoomTile2_menuButton,
+    .mx_RoomTile2_notificationsButton {
         width: 0;
         height: 0;
         visibility: hidden;

From f70ada4d6d592285d2d627cda4b0dc4110502538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 10 Jun 2020 12:58:08 +0200
Subject: [PATCH 116/181] Searching: Delete all the fields that we use to get
 back event verification.

---
 src/Searching.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Searching.js b/src/Searching.js
index fb59cc563d..9631afc36b 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -123,6 +123,9 @@ async function localSearch(searchTerm, roomId = undefined) {
                 ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
 
                 delete ev.event.curve25519Key;
+                delete ev.event.ed25519Key;
+                delete ev.event.algorithm;
+                delete ev.event.forwardingCurve25519KeyChain;
             }
         }
     }

From 1ef5da1e4b9c8784ec40ef2ecccf28036bf1193f Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 9 Jun 2020 16:48:17 +0000
Subject: [PATCH 117/181] Translated using Weblate (Albanian)

Currently translated at 99.9% (2266 of 2268 strings)

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

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 2acdf199c2..110b0852b6 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2470,5 +2470,18 @@
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Të fshihet adresa e dhomës %(alias)s dhe të hiqet %(name)s nga drejtoria?",
     "delete the address.": "fshije adresën.",
     "Use a different passphrase?": "Të përdoret një frazëkalim tjetër?",
-    "New version available. <a>Update now.</a>": "Version i ri gati. <a>Përditësojeni tani.</a>"
+    "New version available. <a>Update now.</a>": "Version i ri gati. <a>Përditësojeni tani.</a>",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Përgjegjësi i shërbyesit tuaj ka çaktivizuar fshehtëzimin skaj-më-skaj, si parazgjedhje, në dhoma private & Mesazhe të Drejtpërdrejtë.",
+    "Emoji picker": "Zgjedhës emoji-sh",
+    "People": "Persona",
+    "Show %(n)s more": "Shfaq %(n)s të tjerë",
+    "Recently Direct Messaged": "Me Mesazhe të Drejtpërdrejtë Së Fundi",
+    "Switch to light mode": "Kalo nën mënyrën e çelët",
+    "Switch to dark mode": "Kalo nën mënyrën e errët",
+    "Switch theme": "Ndërroni temën",
+    "Security & privacy": "Siguri & privatësi",
+    "All settings": "Krejt rregullimet",
+    "Archived rooms": "Dhoma të arkivuara",
+    "Feedback": "Mendime",
+    "Account settings": "Rregullime llogarie"
 }

From 2ae5d4d6c67d645307d5f505835c3c255b806144 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 10 Jun 2020 04:37:09 +0000
Subject: [PATCH 118/181] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (2268 of 2268 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 | 115 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 114 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 3d9bb8653c..da8fdbed6a 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2324,5 +2324,118 @@
     "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Покажи сесиите</showSessionsText>, <sendAnywayText>изпрати така или иначе</sendAnywayText> или <cancelText>откажи</cancelText>.",
     "Verify this login": "Потвърди тази сесия",
     "Session verified": "Сесията беше потвърдена",
-    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Промяната на паролата ще нулира всички ключове за шифроване от-край-до-край по всички ваши сесии, правейки шифрованата история на чата нечетима. Настройте резервно копие на ключовете или експортирайте ключовете на стаите от друга сесия преди да промените паролата си."
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Промяната на паролата ще нулира всички ключове за шифроване от-край-до-край по всички ваши сесии, правейки шифрованата история на чата нечетима. Настройте резервно копие на ключовете или експортирайте ключовете на стаите от друга сесия преди да промените паролата си.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Администраторът на сървъра е изключиш шифроване от край-до-край по подразбиране за лични стаи и за директни съобщения.",
+    "Emoji picker": "Избор на емоджи",
+    "People": "Хора",
+    "Show %(n)s more": "Покажи още %(n)s",
+    "Switch to light mode": "Смени на светъл режим",
+    "Switch to dark mode": "Смени на тъмен режим",
+    "Switch theme": "Смени темата",
+    "Security & privacy": "Сигурност и поверителност",
+    "All settings": "Всички настройки",
+    "Archived rooms": "Архивирани стаи",
+    "Feedback": "Обратна връзка",
+    "Account settings": "Настройки на профила",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Излязохте от всички сесии и вече няма да получавате push уведомления. За да включите уведомленията пак, влезте наново от всяко устройство.",
+    "Syncing...": "Синхронизиране...",
+    "Signing In...": "Влизане...",
+    "If you've joined lots of rooms, this might take a while": "Това може да отнеме известно време, ако сте в много стаи",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Потвърдете идентичността на този вход чрез верифицирането му от някоя от другите ви сесии, давайки достъп до шифрованите съобщения.",
+    "This requires the latest Riot on your other devices:": "Това изисква най-новата версия на Riot на другите ви устройства:",
+    "or another cross-signing capable Matrix client": "или друг Matrix клиент поддържащ кръстосано-подписване",
+    "Use Recovery Passphrase or Key": "Използвай парола за възстановяване или ключ",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Сесията ви е потвърдена. Тя има достъп до шифрованите ви съобщения. Други потребители я виждат като доверена.",
+    "Your new session is now verified. Other users will see it as trusted.": "Новата ви сесия е потвърдена. Другите потребители ще я виждат като доверена.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Без да повишите сигурността на тази сесия, няма да имате достъп до шифрованите съобщения.",
+    "Go Back": "Върни се",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Възвърнете достъп до профила си и до ключовете за шифроване съхранени в тази сесия. Без тях няма да можете да четете всички защитени съобщения в коя да е сесия.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Внимание: личните ви данни (включително ключове за шифроване) все още се съхраняват в тази сесия. Изчистете ги, ако сте приключили със сесията или искате да влезете в друг профил.",
+    "Confirm encryption setup": "Потвърждение на настройки за шифроване",
+    "Click the button below to confirm setting up encryption.": "Кликнете бутона по-долу за да потвърдите настройването на шифроване.",
+    "Enter your account password to confirm the upgrade:": "Въведете паролата за профила си за да потвърдите обновлението:",
+    "Restore your key backup to upgrade your encryption": "Възстановете резервното копие на ключа за да обновите шифроването",
+    "Restore": "Възстанови",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Ще трябва да се автентикирате пред сървъра за да потвърдите обновяването.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Обновете тази сесия, за да може да потвърждава други сесии, давайки им достъп до шифрованите съобщения и маркирайки ги като доверени за другите потребители.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Настройте парола за възстановяване за да защитите шифрованата информация и за да я възстановите, ако излезете от профила. По-добре е да използвате парола различна от тази за профила ви:",
+    "Enter a recovery passphrase": "Въведете парола за възстановяване",
+    "Great! This recovery passphrase looks strong enough.": "Чудесно! Тази парола за възстановяване изглежда достатъчно силна.",
+    "Back up encrypted message keys": "Правене на резервно копие на ключовете за шифроване",
+    "Use a different passphrase?": "Използвай друга парола?",
+    "Enter your recovery passphrase a second time to confirm it.": "Въведете паролата за възстановяване още веднъж за да потвърдите.",
+    "Confirm your recovery passphrase": "Потвърдете паролата за възстановяване",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Ключа за възстановяване е допълнителна гаранция - може да го използвате вместо паролата за възстановяване за да възстановите достъп до шифрованите съобщения.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Направете копие на сигурно място, например password manager или сейф.",
+    "Your recovery key": "Ключът ви за възстановяване",
+    "Copy": "Копирай",
+    "Unable to query secret storage status": "Неуспешно допитване за състоянието на секретното складиране",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Вече може да потвърждавате другите си устройства и другите потребители, за да пазите чатовете си сигурни.",
+    "Upgrade your encryption": "Обновете шифроването",
+    "Confirm recovery passphrase": "Потвърдете паролата за възстановяване",
+    "Make a copy of your recovery key": "Направете копие на ключа за възстановяване",
+    "You're done!": "Готови сте!",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Ще съхраним шифровано копие на ключовете ви на сървъра. Защитете резервното копие с парола за възстановяване.",
+    "Please enter your recovery passphrase a second time to confirm.": "Въведете паролата за възстановяване отново за да потвърдите.",
+    "Repeat your recovery passphrase...": "Повторете паролата си за възстановяване...",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ако не настройте защитено възстановяване на съобщения, няма да можете да възстановите историята на шифрованите си съобщения при излизане от профила или при използване на друга сесия.",
+    "Secure your backup with a recovery passphrase": "Защитете профила си с парола за възстановяване",
+    "Create key backup": "Създай резервно копие на ключовете",
+    "This session is encrypting history using the new recovery method.": "Тази сесия шифрова историята използвайки новия метод за възстановяване.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Тази сесия установи, че паролата за възстановяване и ключа за сигурни съобщения са били премахнати.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ако сте направили това без да искате, може да настройте защитени съобщения за тази сесия, което ще зашифрова наново историята на съобщенията използвайки новия метод за възстановяване.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Ако е изключено, съобщения от шифровани стаи няма да се показват в резултатите от търсения.",
+    "Disable": "Изключи",
+    "Not currently indexing messages for any room.": "В момента не се индексират съобщения в нито една стая.",
+    "Currently indexing: %(currentRoom)s": "В момента се индексира: %(currentRoom)s",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot кешира шифровани съобщения локално по сигурен начин, за да може те да се появяват в резултати от търсения:",
+    "Space used:": "Използвано пространство:",
+    "Indexed messages:": "Индексирани съобщения:",
+    "Indexed rooms:": "Индексирани стаи:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s от %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Период на пауза между свалянията на съобщения (ms)",
+    "Navigation": "Навигация",
+    "Calls": "Обаждания",
+    "Room List": "Списък със стаи",
+    "Autocomplete": "Подсказване",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Превключи удебеляването",
+    "Toggle Italics": "Превключи накланянето",
+    "Toggle Quote": "Превключи цитирането",
+    "New line": "Нов ред",
+    "Navigate recent messages to edit": "Движение из скорошни съобщения за редактиране",
+    "Jump to start/end of the composer": "Прескачане в началото/края на полето за писане",
+    "Navigate composer history": "Движение из историята на полето за писане",
+    "Cancel replying to a message": "Отказване на отговарянето на съобщение",
+    "Toggle microphone mute": "Превключване на заглушаването на микрофона",
+    "Toggle video on/off": "Превключване на видеото (вкл./изкл.)",
+    "Scroll up/down in the timeline": "Движение нагоре/надолу из съобщенията",
+    "Dismiss read marker and jump to bottom": "Игнориране на маркера за прочитане и отиване най-долу",
+    "Jump to oldest unread message": "Прескачане до най-старото непрочетено съобщение",
+    "Upload a file": "Качване на файл",
+    "Jump to room search": "Търсене на стаи",
+    "Navigate up/down in the room list": "Движение нагоре/надолу в списъка със стаи",
+    "Select room from the room list": "Избор на стая от списъка",
+    "Collapse room list section": "Свиване на раздел със стаи",
+    "Expand room list section": "Разширение на раздел със стаи",
+    "Clear room list filter field": "Изчистване на полето за филтрирането на списъка със стаи",
+    "Previous/next unread room or DM": "Предишна/следваща непрочетена стая или директно съобщение",
+    "Previous/next room or DM": "Предишна/следваща стая или директно съобщение",
+    "Toggle the top left menu": "Превключва основното меню (горе в ляво)",
+    "Close dialog or context menu": "Затваряне на прозорец или контекстно меню",
+    "Activate selected button": "Активиране на избрания бутон",
+    "Toggle right panel": "Превключване на десния панел",
+    "Toggle this dialog": "Превключване на този прозорец",
+    "Move autocomplete selection up/down": "Движение нагоре/надолу из подсказките",
+    "Cancel autocomplete": "Отказване на подсказките",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Space",
+    "End": "End"
 }

From ac2ca579cf2caae57b4fc3edb4979af72a09b31d Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 10 Jun 2020 00:54:29 +0000
Subject: [PATCH 119/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2268 of 2268 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ee2b19d2fb..d9ce9b49f3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2484,5 +2484,13 @@
     "Emoji picker": "顏文字挑選器",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。",
     "Show %(n)s more": "顯示另外 %(n)s 個",
-    "People": "夥伴"
+    "People": "夥伴",
+    "Switch to light mode": "切換至淺色模式",
+    "Switch to dark mode": "切換至深色模式",
+    "Switch theme": "切換佈景主題",
+    "Security & privacy": "安全性與隱私權",
+    "All settings": "所有設定",
+    "Archived rooms": "已封存的聊天室",
+    "Feedback": "回饋",
+    "Account settings": "帳號設定"
 }

From 288b3ff46ccafc96d9ef504196d2680705928205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 10 Jun 2020 06:11:50 +0000
Subject: [PATCH 120/181] Translated using Weblate (Estonian)

Currently translated at 58.0% (1315 of 2268 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 5ffcd11f16..7052f68308 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1382,5 +1382,8 @@
     "was invited %(count)s times|one": "sai kutse",
     "%(severalUsers)schanged their name %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma nime %(count)s korda",
     "%(severalUsers)schanged their name %(count)s times|one": "Mitu kasutajat %(severalUsers)s muutsid oma nime",
-    "%(oneUser)schanged their name %(count)s times|other": "Kasutaja %(oneUser)s muutis oma nime %(count)s korda"
+    "%(oneUser)schanged their name %(count)s times|other": "Kasutaja %(oneUser)s muutis oma nime %(count)s korda",
+    "You cannot place VoIP calls in this browser.": "Selle brauseriga ei saa VoIP kõnet teha.",
+    "You cannot place a call with yourself.": "Sa ei saa iseendale helistada.",
+    "You do not have permission to start a conference call in this room": "Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet"
 }

From 0a09b60eeb58e26cb9ff7ba55b2c62416c02f1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 10 Jun 2020 06:50:20 +0000
Subject: [PATCH 121/181] Translated using Weblate (French)

Currently translated at 100.0% (2268 of 2268 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index da93e28ddb..5775e4f706 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2485,5 +2485,13 @@
     "Emoji picker": "Sélecteur d’émojis",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les messages directs.",
     "Show %(n)s more": "En montrer %(n)s de plus",
-    "People": "Personnes"
+    "People": "Personnes",
+    "Switch to light mode": "Passer au mode clair",
+    "Switch to dark mode": "Passer au mode sombre",
+    "Switch theme": "Changer le thème",
+    "Security & privacy": "Sécurité & vie privée",
+    "All settings": "Tous les paramètres",
+    "Archived rooms": "Salons archivés",
+    "Feedback": "Commentaire",
+    "Account settings": "Paramètres du compte"
 }

From 18d5b4c769c22320bd578556204d14b72107b879 Mon Sep 17 00:00:00 2001
From: jadiof <jadiof@mailbox.org>
Date: Tue, 9 Jun 2020 21:33:29 +0000
Subject: [PATCH 122/181] Translated using Weblate (German)

Currently translated at 99.8% (2264 of 2268 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d51ef94814..c1d3f4a2a3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1793,7 +1793,7 @@
     "Use Single Sign On to continue": "Benutze „Single Sign-On“ (Einmalanmeldung) um fortzufahren",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse mit „Single Sign-On“, um deine Identität nachzuweisen.",
     "Single Sign On": "Single Sign-On",
-    "Confirm adding email": "Bestätige das Hinzufügen der Email-Adresse",
+    "Confirm adding email": "Hinzufügen der E-Mail-Adresse bestätigen",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnummer, indem du deine Identität mittels „Single Sign-On“ nachweist.",
     "Click the button below to confirm adding this phone number.": "Klicke unten die Schaltfläche, um die hinzugefügte Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
@@ -1802,7 +1802,7 @@
     "Command failed": "Befehl fehlgeschlagen",
     "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
     "Click the button below to confirm adding this email address.": "Klicke unten auf die Schaltfläche, um die hinzugefügte E-Mail-Adresse zu bestätigen.",
-    "Confirm adding phone number": "Bestätige das Hinzufügen der Telefonnummer",
+    "Confirm adding phone number": "Hinzufügen der Telefonnummer bestätigen",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "Not Trusted": "Nicht vertrauenswürdig",
@@ -2421,5 +2421,19 @@
     "This address is already in use": "Diese Adresse wird bereits verwendet",
     "Address (optional)": "Adresse (optional)",
     "delete the address.": "lösche die Adresse.",
-    "Use a different passphrase?": "Eine andere Passphrase verwenden?"
+    "Use a different passphrase?": "Eine andere Passphrase verwenden?",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Dein Server-Administrator hat die Ende-zu-Ende-Verschlüsselung für private Räume und Direktnachrichten standardmäßig deaktiviert.",
+    "People": "Personen",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Beim Entfernen dieser Adresse ist ein Fehler aufgetreten. Vielleicht existiert diese nicht mehr oder es kam zu einem temporären Fehler.",
+    "Set a room address to easily share your room with other people.": "Vergebe eine Raum-Adresse, um diesen Raum auf einfache Weise mit anderen Personen teilen zu können.",
+    "You've previously used a newer version of Riot with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Du hast für diese Sitzung zuvor eine neuere Version von Riot verwendet. Um diese Version mit Ende-zu-Ende-Verschlüsselung wieder zu benutzen, musst du dich erst ab- und dann wieder anmelden.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Soll die Raum-Adresse %(alias)s gelöscht und %(name)s aus dem Raum-Verzeichnis entfernt werden?",
+    "Switch to light mode": "Zum Light Mode wechseln",
+    "Switch to dark mode": "Zum Dark Mode wechseln",
+    "Switch theme": "Design ändern",
+    "Security & privacy": "Sicherheit & Datenschutz",
+    "All settings": "Alle Einstellungen",
+    "Archived rooms": "Archivierte Räume",
+    "Feedback": "Feedback",
+    "Account settings": "Konto-Einstellungen"
 }

From c9f0da975dd94da9d022ea67c2a47e5dd5ab5929 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Wed, 10 Jun 2020 09:12:27 +0000
Subject: [PATCH 123/181] Translated using Weblate (German)

Currently translated at 99.8% (2264 of 2268 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c1d3f4a2a3..f6f3d67d9b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -412,7 +412,7 @@
     "Seen by %(userName)s at %(dateTime)s": "Gesehen von %(userName)s um %(dateTime)s",
     "Send anyway": "Trotzdem senden",
     "Start authentication": "Authentifizierung beginnen",
-    "This room": "In diesem Raum",
+    "This room": "diesen Raum",
     "unknown caller": "Unbekannter Anrufer",
     "Unnamed Room": "Unbenannter Raum",
     "Upload new:": "Neue(s) hochladen:",
@@ -1985,7 +1985,7 @@
     "This invite to %(roomName)s was sent to %(email)s": "Diese Einladung zu %(roomName)s wurde an %(email)s gesendet",
     "Use an identity server in Settings to receive invites directly in Riot.": "Verknüpfe einen Identitätsserver in den Einstellungen um die Einladungen direkt in Riot zu erhalten.",
     "Share this email in Settings to receive invites directly in Riot.": "Teile diese E-Mail-Adresse in den Einstellungen um Einladungen direkt in Riot zu erhalten.",
-    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kann keine Vorschau erzeugt werden. Möchtest du den Raum betreten?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "Für %(roomName)s kann keine Vorschau erzeugt werden. Möchtest du den Raum betreten?",
     "This room doesn't exist. Are you sure you're at the right place?": "Dieser Raum existiert nicht. Bist du sicher dass du hier richtig bist?",
     "Try again later, or ask a room admin to check if you have access.": "Versuche es später erneut oder bitte einen Raum-Administrator deine Zutrittsrechte zu überprüfen.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Beim Betreten des Raums ist ein Fehler aufgetreten %(errcode)s. Wenn du denkst dass diese Meldung nicht korrekt ist <issueLink>sende bitte einen Fehlerbericht</issueLink>.",
@@ -2435,5 +2435,6 @@
     "All settings": "Alle Einstellungen",
     "Archived rooms": "Archivierte Räume",
     "Feedback": "Feedback",
-    "Account settings": "Konto-Einstellungen"
+    "Account settings": "Konto-Einstellungen",
+    "Room ID or address of ban list": "Raum-ID oder Adresse der Verbotsliste"
 }

From 5e0b30edbc793168ac6c1eb6f34ef4a1b658fdca Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 10 Jun 2020 10:01:54 +0000
Subject: [PATCH 124/181] Translated using Weblate (Italian)

Currently translated at 100.0% (2268 of 2268 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 6f97e61560..1410b6c70b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2478,5 +2478,15 @@
     "A new version of Riot is available!": "È disponibile una nuova versione di Riot!",
     "New version available. <a>Update now.</a>": "Nuova versione disponibile. <a>Aggiorna ora.</a>",
     "Emoji picker": "Selettore emoji",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti."
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti.",
+    "People": "Persone",
+    "Show %(n)s more": "Mostra altri %(n)s",
+    "Switch to light mode": "Passa alla modalità chiara",
+    "Switch to dark mode": "Passa alla modalità scura",
+    "Switch theme": "Cambia tema",
+    "Security & privacy": "Sicurezza e privacy",
+    "All settings": "Tutte le impostazioni",
+    "Archived rooms": "Stanze archiviate",
+    "Feedback": "Feedback",
+    "Account settings": "Impostazioni account"
 }

From 05f8a6271f48e7dbb8e78aaa053e2cda73e6905b Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Tue, 9 Jun 2020 18:16:13 +0000
Subject: [PATCH 125/181] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 56.8% (1288 of 2268 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index c26cf7abeb..fe4fbf12ee 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1349,5 +1349,10 @@
     "Messages in this room are end-to-end encrypted.": "Meldinger i dette rommet er start-til-slutt-kryptert.",
     "Messages in this room are not end-to-end encrypted.": "Meldinger i dette rommet er ikke start-til-slutt-kryptert.",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meldinger i dette rommet er start-til-slutt-kryptert. Lær mer og verifiser denne brukeren i brukerprofilen deres.",
-    "Use a different passphrase?": "Vil du bruke en annen passfrase?"
+    "Use a different passphrase?": "Vil du bruke en annen passfrase?",
+    "Emoji picker": "Emojivelger",
+    "Jump to read receipt": "Hopp til lesekvitteringen",
+    "Mention": "Nevn",
+    "Community Name": "Samfunnets navn",
+    "Dismiss read marker and jump to bottom": "Avføy lesekvitteringen og hopp ned til bunnen"
 }

From 0fb6846c9dd12d61ce07405b5eb53a4747576509 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:03:00 +0100
Subject: [PATCH 126/181] Radio buttons

---
 res/css/_components.scss                      |  1 +
 .../views/elements/_StyledRadioButton.scss    | 95 +++++++++++++++++++
 .../views/elements/StyledRadioButton.tsx      | 38 ++++++++
 3 files changed, 134 insertions(+)
 create mode 100644 res/css/views/elements/_StyledRadioButton.scss
 create mode 100644 src/components/views/elements/StyledRadioButton.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index f0073eff81..fb804ad09d 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -118,6 +118,7 @@
 @import "./views/elements/_Slider.scss";
 @import "./views/elements/_Spinner.scss";
 @import "./views/elements/_StyledCheckbox.scss";
+@import "./views/elements/_StyledRadioButton.scss";
 @import "./views/elements/_SyntaxHighlight.scss";
 @import "./views/elements/_TextWithTooltip.scss";
 @import "./views/elements/_ToggleSwitch.scss";
diff --git a/res/css/views/elements/_StyledRadioButton.scss b/res/css/views/elements/_StyledRadioButton.scss
new file mode 100644
index 0000000000..4fcb598498
--- /dev/null
+++ b/res/css/views/elements/_StyledRadioButton.scss
@@ -0,0 +1,95 @@
+/*
+Copyright 2020 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.
+*/
+
+/**
+* This component expects the parent to specify a positive padding and
+* width
+*/
+
+.mx_RadioButton {
+
+    $radio-circle-color: $muted-fg-color;
+    $active-radio-circle-color: $accent-color;
+    position: relative;
+
+    display: flex;
+    align-items: center;
+    flex-grow: 1;
+
+    > span {
+        flex-grow: 1;
+
+        display: flex;
+
+        margin-left: 10px;
+        margin-right: 10px;
+    }
+
+    .mx_RadioButton_spacer {
+        flex-shrink: 0;
+        flex-grow: 0;
+
+        height: $font-16px;
+        width: $font-16px;
+    }
+
+    > input[type=radio] {
+        // Remove the OS's representation
+        margin: 0;
+        padding: 0;
+        display: none;
+
+        + div {
+            flex-shrink: 0;
+            flex-grow: 0;
+
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            box-sizing: border-box;
+            height: $font-16px;
+            width: $font-16px;
+
+            border: $font-1-5px solid $radio-circle-color;
+            border-radius: $font-16px;
+
+            > div {
+                box-sizing: border-box;
+
+                height: $font-8px;
+                width: $font-8px;
+
+                border-radius: $font-8px;
+            }
+        }
+    }
+
+    > input[type=radio]:checked {
+        + div {
+            border-color: $active-radio-circle-color;
+
+            > div {
+                background: $active-radio-circle-color;
+            }
+        }
+    }
+
+    > input[type=radio]:disabled {
+        + div {
+            > div {
+                display: none;
+            }
+        }
+    }
+}
diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
new file mode 100644
index 0000000000..3636d46b7a
--- /dev/null
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -0,0 +1,38 @@
+/*
+Copyright 2020 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 classnames from 'classnames';
+
+interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
+}
+
+interface IState {
+}
+
+export default class StyledRadioButton extends React.PureComponent<IProps, IState> {
+    public static readonly defaultProps = {
+        className: '',
+    }
+
+    public render() {
+        const { children, className, ...otherProps } = this.props;
+        return <label className={classnames('mx_RadioButton', className)}>
+            <input type='radio' {...otherProps} />
+            {/* Used to render the radio button circle */}
+            <div><div></div></div>
+            <span>{children}</span>
+            <div className="mx_RadioButton_spacer" />
+        </label>
+    }
+}

From 3bea64e95014aa57047d45ebb41b0c3ebf185843 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:06:17 +0100
Subject: [PATCH 127/181] smaller margin

---
 res/css/views/elements/_StyledRadioButton.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/elements/_StyledRadioButton.scss b/res/css/views/elements/_StyledRadioButton.scss
index 4fcb598498..07d95aeced 100644
--- a/res/css/views/elements/_StyledRadioButton.scss
+++ b/res/css/views/elements/_StyledRadioButton.scss
@@ -31,8 +31,8 @@ limitations under the License.
 
         display: flex;
 
-        margin-left: 10px;
-        margin-right: 10px;
+        margin-left: 8px;
+        margin-right: 8px;
     }
 
     .mx_RadioButton_spacer {

From 8fc6289290a948338c5abc46987de43aa2300505 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:37:09 +0100
Subject: [PATCH 128/181] Use appearance instad of display for accessibility

---
 res/css/views/elements/_StyledRadioButton.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_StyledRadioButton.scss b/res/css/views/elements/_StyledRadioButton.scss
index 07d95aeced..0ed2464dc1 100644
--- a/res/css/views/elements/_StyledRadioButton.scss
+++ b/res/css/views/elements/_StyledRadioButton.scss
@@ -47,7 +47,7 @@ limitations under the License.
         // Remove the OS's representation
         margin: 0;
         padding: 0;
-        display: none;
+        appearance: none;
 
         + div {
             flex-shrink: 0;

From 70fe7ce6194d4989def0ee8326a4d89113a90b77 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:39:28 +0100
Subject: [PATCH 129/181] fix licensing info

---
 res/css/views/elements/_StyledRadioButton.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/css/views/elements/_StyledRadioButton.scss b/res/css/views/elements/_StyledRadioButton.scss
index 0ed2464dc1..ebb8fb7603 100644
--- a/res/css/views/elements/_StyledRadioButton.scss
+++ b/res/css/views/elements/_StyledRadioButton.scss
@@ -1,9 +1,12 @@
 /*
 Copyright 2020 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
+
+    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.
@@ -11,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+
+
 /**
 * This component expects the parent to specify a positive padding and
 * width

From a2294a73a448ea0aa66442e2db409c08b3c374ac Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:41:34 +0100
Subject: [PATCH 130/181] Make checkboxes a11y friendly

---
 res/css/views/elements/_StyledCheckbox.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_StyledCheckbox.scss b/res/css/views/elements/_StyledCheckbox.scss
index 14081f1e99..ee91c69846 100644
--- a/res/css/views/elements/_StyledCheckbox.scss
+++ b/res/css/views/elements/_StyledCheckbox.scss
@@ -24,7 +24,7 @@ limitations under the License.
     align-items: flex-start;
 
     input[type=checkbox] {
-        display: none;
+        appearance: none;
 
         & + label {
             display: flex;

From ab47e0ed24d1dd102697a897c449f9ed67a65e4e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:49:03 +0100
Subject: [PATCH 131/181] lint lines

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

diff --git a/res/css/views/elements/_StyledRadioButton.scss b/res/css/views/elements/_StyledRadioButton.scss
index ebb8fb7603..a3ae823079 100644
--- a/res/css/views/elements/_StyledRadioButton.scss
+++ b/res/css/views/elements/_StyledRadioButton.scss
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
-
 /**
 * This component expects the parent to specify a positive padding and
 * width

From 0ec0bbecda5cfe33f6bd030145694a7b70524134 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:49:52 +0100
Subject: [PATCH 132/181] lint more lines

---
 src/components/views/elements/StyledRadioButton.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
index 3636d46b7a..cb48561953 100644
--- a/src/components/views/elements/StyledRadioButton.tsx
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -1,16 +1,20 @@
 /*
 Copyright 2020 The Matrix.org Foundation C.I.C.
-Licensed under the Apache License, Version 2.0 (the 'License');
+
+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,
+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 classnames from 'classnames';
 

From 9787b4d640131457e3b602871a2834ef2ff0cc2d Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 13:50:09 +0100
Subject: [PATCH 133/181] Even more lines

---
 src/components/views/elements/StyledRadioButton.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
index cb48561953..7d84f68c49 100644
--- a/src/components/views/elements/StyledRadioButton.tsx
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 import React from 'react';
 import classnames from 'classnames';
 

From 04d91ae0af4bfb6e04090ad75f09ef562da3bbfc Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 14:11:36 +0100
Subject: [PATCH 134/181] Fix code review issues

- interfaces go to the top
- fix comma conflation
- value no generic
- optionalised props
- line lints
---
 .../views/elements/AccessibleButton.tsx       | 147 +++++++++---------
 .../views/elements/SettingsFlag.tsx           |  13 +-
 .../views/elements/ToggleSwitch.tsx           |  24 +--
 3 files changed, 91 insertions(+), 93 deletions(-)

diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index ecd4847d0d..ec8e1b250a 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -17,79 +17,7 @@
 import React from 'react';
 
 import {Key} from '../../../Keyboard';
-
-/**
- * AccessibleButton is a generic wrapper for any element that should be treated
- * as a button.  Identifies the element as a button, setting proper tab
- * indexing and keyboard activation behavior.
- *
- * @param {Object} props  react element properties
- * @returns {Object} rendered react
- */
-export default function AccessibleButton({
-    element,
-    onClick,
-    children,
-    kind,
-    disabled,
-    inputRef,
-    className,
-    ...restProps
-}: IProps) {
-
-    const newProps: IAccessibleButtonProps = restProps;
-    if (!disabled) {
-        newProps.onClick = onClick,
-        // We need to consume enter onKeyDown and space onKeyUp
-        // otherwise we are risking also activating other keyboard focusable elements
-        // that might receive focus as a result of the AccessibleButtonClick action
-        // It's because we are using html buttons at a few places e.g. inside dialogs
-        // And divs which we report as role button to assistive technologies.
-        // Browsers handle space and enter keypresses differently and we are only adjusting to the
-        // inconsistencies here
-        newProps.onKeyDown = (e) => {
-            if (e.key === Key.ENTER) {
-                e.stopPropagation();
-                e.preventDefault();
-                return onClick(e);
-            }
-            if (e.key === Key.SPACE) {
-                e.stopPropagation();
-                e.preventDefault();
-            }
-        },
-        newProps.onKeyUp = (e) => {
-            if (e.key === Key.SPACE) {
-                e.stopPropagation();
-                e.preventDefault();
-                return onClick(e);
-            }
-            if (e.key === Key.ENTER) {
-                e.stopPropagation();
-                e.preventDefault();
-            }
-        }
-    }
-
-    // Pass through the ref - used for keyboard shortcut access to some buttons
-    newProps.ref = inputRef;
-
-    newProps.className = (className ? className + " " : "") + "mx_AccessibleButton";
-
-    if (kind) {
-        // We apply a hasKind class to maintain backwards compatibility with
-        // buttons which might not know about kind and break
-        newProps.className += " mx_AccessibleButton_hasKind mx_AccessibleButton_kind_" + kind;
-    }
-
-    if (disabled) {
-        newProps.className += " mx_AccessibleButton_disabled";
-        newProps["aria-disabled"] = true;
-    }
-
-    // React.createElement expects InputHTMLAttributes
-    return React.createElement(element, restProps, children);
-}
+import classnames from 'classnames';
 
 /**
  * children: React's magic prop. Represents all children given to the element.
@@ -116,6 +44,79 @@ interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
     ref?: React.Ref<Element>,
 }
 
+/**
+ * AccessibleButton is a generic wrapper for any element that should be treated
+ * as a button.  Identifies the element as a button, setting proper tab
+ * indexing and keyboard activation behavior.
+ *
+ * @param {Object} props  react element properties
+ * @returns {Object} rendered react
+ */
+export default function AccessibleButton({
+    element,
+    onClick,
+    children,
+    kind,
+    disabled,
+    inputRef,
+    className,
+    ...restProps
+}: IProps) {
+
+    const newProps: IAccessibleButtonProps = restProps;
+    if (!disabled) {
+        newProps.onClick = onClick;
+        // We need to consume enter onKeyDown and space onKeyUp
+        // otherwise we are risking also activating other keyboard focusable elements
+        // that might receive focus as a result of the AccessibleButtonClick action
+        // It's because we are using html buttons at a few places e.g. inside dialogs
+        // And divs which we report as role button to assistive technologies.
+        // Browsers handle space and enter keypresses differently and we are only adjusting to the
+        // inconsistencies here
+        newProps.onKeyDown = (e) => {
+            if (e.key === Key.ENTER) {
+                e.stopPropagation();
+                e.preventDefault();
+                return onClick(e);
+            }
+            if (e.key === Key.SPACE) {
+                e.stopPropagation();
+                e.preventDefault();
+            }
+        };
+        newProps.onKeyUp = (e) => {
+            if (e.key === Key.SPACE) {
+                e.stopPropagation();
+                e.preventDefault();
+                return onClick(e);
+            }
+            if (e.key === Key.ENTER) {
+                e.stopPropagation();
+                e.preventDefault();
+            }
+        };
+    }
+
+    // Pass through the ref - used for keyboard shortcut access to some buttons
+    newProps.ref = inputRef;
+
+    newProps.className = classnames("mx_AccessibleButton", className);
+
+    if (kind) {
+        // We apply a hasKind class to maintain backwards compatibility with
+        // buttons which might not know about kind and break
+        newProps.className += " mx_AccessibleButton_hasKind mx_AccessibleButton_kind_" + kind;
+    }
+
+    if (disabled) {
+        newProps.className += " mx_AccessibleButton_disabled";
+        newProps["aria-disabled"] = true;
+    }
+
+    // React.createElement expects InputHTMLAttributes
+    return React.createElement(element, restProps, children);
+}
+
 AccessibleButton.defaultProps = {
     element: 'div',
     role: 'button',
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
index 2ae9bc3d87..ac11e080f6 100644
--- a/src/components/views/elements/SettingsFlag.tsx
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -16,31 +16,28 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
 import StyledCheckbox from "./StyledCheckbox";
 
 interface IProps {
+    // The setting must be a boolean
     name: string,
     level: string,
     roomId?: string, // for per-room settings
     label?: string, // untranslated
-    isExplicit: boolean,
+    isExplicit?: boolean,
     // XXX: once design replaces all toggles make this the default
     useCheckbox?: boolean,
-    onChange(checked: boolean): void,
+    onChange?(checked: boolean): void,
 }
 
 interface IState {
-    // XXX: make this generic when the settings store is typed
-    value: any;
+    value: boolean;
 }
 
 export default class SettingsFlag extends React.Component<IProps, IState> {
-
     constructor(props: IProps) {
         super(props);
 
@@ -64,7 +61,7 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
         this.onChange(e.target.checked);
     }
 
-    private save = (val?: any): void => {
+    private save = (val?: boolean): void => {
         return SettingsStore.setValue(
             this.props.name,
             this.props.roomId,
diff --git a/src/components/views/elements/ToggleSwitch.tsx b/src/components/views/elements/ToggleSwitch.tsx
index 902538052b..9d092c58a7 100644
--- a/src/components/views/elements/ToggleSwitch.tsx
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -15,10 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { EventHandler } from "react";
+import React from "react";
 import classNames from "classnames";
 import * as sdk from "../../../index";
 
+interface IProps {
+    // Whether or not this toggle is in the 'on' position.
+    checked: boolean,
+
+    // Whether or not the user can interact with the switch
+    disabled: boolean,
+
+    // Called when the checked state changes. First argument will be the new state.
+    onChange(checked: boolean): void,
+};
+
 // Controlled Toggle Switch element, written with Accessibility in mind
 export default ({checked, disabled = false, onChange, ...props}: IProps) => {
     const _onClick = () => {
@@ -45,14 +56,3 @@ export default ({checked, disabled = false, onChange, ...props}: IProps) => {
         </AccessibleButton>
     );
 };
-
-interface IProps {
-    // Whether or not this toggle is in the 'on' position.
-    checked: boolean,
-
-    // Whether or not the user can interact with the switch
-    disabled: boolean,
-
-    // Called when the checked state changes. First argument will be the new state.
-    onChange(checked: boolean): void,
-};

From b1fdfb51cdb1a6183e590f86f3c5a2f9338e1a84 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 07:43:13 -0600
Subject: [PATCH 135/181] Fix i18n

---
 src/i18n/strings/en_EN.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7277d8ed2e..61c5210fe0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1142,7 +1142,6 @@
     "Message preview": "Message preview",
     "List options": "List options",
     "Add room": "Add room",
-    "Show %(n)s more": "Show %(n)s more",
     "Show %(count)s more|other": "Show %(count)s more",
     "Show %(count)s more|one": "Show %(count)s more",
     "Options": "Options",

From 58db992382d4114bef5221c352cbeff893c316dd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 07:45:52 -0600
Subject: [PATCH 136/181] Add 10px to comment

---
 res/css/views/rooms/_RoomTile2.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 609cf53062..f2ee8c55c7 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -18,7 +18,7 @@ limitations under the License.
 
 // Note: the room tile expects to be in a flexbox column container
 .mx_RoomTile2 {
-    width: calc(100% - 21px); // 8px for padding (4px on either side), 3px for margin
+    width: calc(100% - 21px); // 10px for alignment/inset, 8px for padding on sides, 3px for margin
     margin-bottom: 4px;
     margin-right: 3px;
     padding: 4px;

From 11d85f167bbffcd017fd6e9d4e545f2a2628ae7a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 15:21:36 +0100
Subject: [PATCH 137/181] Fix read-receipt alignment

---
 res/css/views/rooms/_GroupLayout.scss | 6 +++---
 res/css/views/rooms/_IRCLayout.scss   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index de4a5538cd..44eb8c1e89 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -108,12 +108,12 @@ $left-gutter: 65px;
             top: 27px;
         }
 
-        .mx_EventTile_continuation .mx_EventTile_readAvatars,
-        .mx_EventTile_emote .mx_EventTile_readAvatars {
+        &.mx_EventTile_continuation .mx_EventTile_readAvatars,
+        &.mx_EventTile_emote .mx_EventTile_readAvatars {
             top: 5px;
         }
 
-        .mx_EventTile_info .mx_EventTile_readAvatars {
+        &.mx_EventTile_info .mx_EventTile_readAvatars {
             top: 4px;
         }
 
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index a8eb35eeed..f2c7fab9f1 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -43,6 +43,10 @@ $irc-line-height: $font-18px;
         > .mx_EventTile_msgOption {
             order: 5;
             flex-shrink: 0;
+
+            .mx_EventTile_readAvatars {
+                top: 7px;
+            }
         }
 
         > .mx_SenderProfile {

From 52c7577972631bfd02af02762cb09a01de1627f6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 15:57:28 +0100
Subject: [PATCH 138/181] Clean up interfaces and classname

---
 .../views/elements/AccessibleButton.tsx       | 34 +++++++++----------
 .../views/elements/SettingsFlag.tsx           | 14 ++++----
 .../views/elements/ToggleSwitch.tsx           |  6 ++--
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index ec8e1b250a..363a82b9fb 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -26,22 +26,22 @@ import classnames from 'classnames';
  *           implemented exactly like a normal onClick handler.
  */
 interface IProps extends React.InputHTMLAttributes<Element> {
-    inputRef?: React.Ref<Element>,
+    inputRef?: React.Ref<Element>;
     element?: string;
     // The kind of button, similar to how Bootstrap works.
     // See available classes for AccessibleButton for options.
-    kind?: string,
+    kind?: string;
     // The ARIA role
-    role?: string,
+    role?: string;
     // The tabIndex
-    tabIndex?: number,
-    disabled?: boolean,
-    className?: string,
+    tabIndex?: number;
+    disabled?: boolean;
+    className?: string;
     onClick?(e?: React.MouseEvent<Element> | React.KeyboardEvent<Element>): void;
 };
 
 interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
-    ref?: React.Ref<Element>,
+    ref?: React.Ref<Element>;
 }
 
 /**
@@ -100,18 +100,16 @@ export default function AccessibleButton({
     // Pass through the ref - used for keyboard shortcut access to some buttons
     newProps.ref = inputRef;
 
-    newProps.className = classnames("mx_AccessibleButton", className);
-
-    if (kind) {
-        // We apply a hasKind class to maintain backwards compatibility with
-        // buttons which might not know about kind and break
-        newProps.className += " mx_AccessibleButton_hasKind mx_AccessibleButton_kind_" + kind;
-    }
-
-    if (disabled) {
-        newProps.className += " mx_AccessibleButton_disabled";
-        newProps["aria-disabled"] = true;
+    let classNameBooleans = {
+        "mx_AccessibleButton_hasKind": kind,
+        "mx_AccessibleButton_disabled": disabled,
     }
+    classNameBooleans["mx_AccessibleButton_kind_" + kind] = kind;
+    newProps.className = classnames(
+        "mx_AccessibleButton",
+        className,
+        classNameBooleans,
+    );
 
     // React.createElement expects InputHTMLAttributes
     return React.createElement(element, restProps, children);
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
index ac11e080f6..bda15ebaab 100644
--- a/src/components/views/elements/SettingsFlag.tsx
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -23,14 +23,14 @@ import StyledCheckbox from "./StyledCheckbox";
 
 interface IProps {
     // The setting must be a boolean
-    name: string,
-    level: string,
-    roomId?: string, // for per-room settings
-    label?: string, // untranslated
-    isExplicit?: boolean,
+    name: string;
+    level: string;
+    roomId?: string; // for per-room settings
+    label?: string; // untranslated
+    isExplicit?: boolean;
     // XXX: once design replaces all toggles make this the default
-    useCheckbox?: boolean,
-    onChange?(checked: boolean): void,
+    useCheckbox?: boolean;
+    onChange?(checked: boolean): void;
 }
 
 interface IState {
diff --git a/src/components/views/elements/ToggleSwitch.tsx b/src/components/views/elements/ToggleSwitch.tsx
index 9d092c58a7..7b690899ac 100644
--- a/src/components/views/elements/ToggleSwitch.tsx
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -21,13 +21,13 @@ import * as sdk from "../../../index";
 
 interface IProps {
     // Whether or not this toggle is in the 'on' position.
-    checked: boolean,
+    checked: boolean;
 
     // Whether or not the user can interact with the switch
-    disabled: boolean,
+    disabled: boolean;
 
     // Called when the checked state changes. First argument will be the new state.
-    onChange(checked: boolean): void,
+    onChange(checked: boolean): void;
 };
 
 // Controlled Toggle Switch element, written with Accessibility in mind

From 737fc46b87846eb0cc3ecbe49fbdd4f3f15a57ee Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 10 Jun 2020 16:48:34 +0100
Subject: [PATCH 139/181] Inline kind classnames

---
 src/components/views/elements/AccessibleButton.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 363a82b9fb..3a542387c5 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -100,15 +100,14 @@ export default function AccessibleButton({
     // Pass through the ref - used for keyboard shortcut access to some buttons
     newProps.ref = inputRef;
 
-    let classNameBooleans = {
-        "mx_AccessibleButton_hasKind": kind,
-        "mx_AccessibleButton_disabled": disabled,
-    }
-    classNameBooleans["mx_AccessibleButton_kind_" + kind] = kind;
     newProps.className = classnames(
         "mx_AccessibleButton",
         className,
-        classNameBooleans,
+        {
+            "mx_AccessibleButton_hasKind": kind,
+            [`mx_AccessibleButton_kind_${kind}`]: kind,
+            "mx_AccessibleButton_disabled": disabled,
+        },
     );
 
     // React.createElement expects InputHTMLAttributes

From 601e8209d8ad53e5f807f4342394896a09fd8196 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jun 2020 21:48:39 +0100
Subject: [PATCH 140/181] Prioritize text on the clipboard over file

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/SendMessageComposer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 25ad192ea4..130135f641 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -427,7 +427,9 @@ export default class SendMessageComposer extends React.Component {
 
     _onPaste = (event) => {
         const {clipboardData} = event;
-        if (clipboardData.files.length) {
+        // Prioritize text on the clipboard over files as Office on macOS puts a bitmap
+        // in the clipboard as well as the content being copied.
+        if (clipboardData.files.length && !clipboardData.types.some(t => t === "text/plain")) {
             // This actually not so much for 'files' as such (at time of writing
             // neither chrome nor firefox let you paste a plain file copied
             // from Finder) but more images copied from a different website

From be366bdd7f6fcbd28d13966dd1d86541c4bff140 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 15:05:17 -0600
Subject: [PATCH 141/181] Fix various layout concerns with the new room list

It had ~32px of overflow causing a horizontal scrollbar. Turns out the layout engine gets confused when hidden elements are at the end of a flexbox, so we just move them higher in the DOM (where they logically still make sense).

The remaining changes are all alignment and misc changes in that respect, and probably not obvious.
---
 res/css/structures/_LeftPanel2.scss         |  5 +++++
 res/css/views/rooms/_NotificationBadge.scss |  2 --
 res/css/views/rooms/_RoomSublist2.scss      | 19 ++++++++++---------
 res/css/views/rooms/_RoomTile2.scss         |  4 +---
 src/components/views/rooms/RoomSublist2.tsx |  4 ++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
index 65d23fc23a..bd2a3ba96e 100644
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -131,6 +131,11 @@ $roomListMinimizedWidth: 50px;
         .mx_LeftPanel2_actualRoomListContainer {
             flex-grow: 1; // fill the available space
             overflow-y: auto;
+            width: 100%;
+            max-width: 100%;
+
+            // Create a flexbox to trick the layout engine
+            display: flex;
         }
     }
 }
diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss
index 500a7b7e05..9f9698bac5 100644
--- a/res/css/views/rooms/_NotificationBadge.scss
+++ b/res/css/views/rooms/_NotificationBadge.scss
@@ -28,7 +28,6 @@ limitations under the License.
 
     &.mx_NotificationBadge_visible {
         background-color: $roomtile2-badge-color;
-        margin-right: 14px;
 
         // Create a flexbox to order the count a bit easier
         display: flex;
@@ -46,7 +45,6 @@ limitations under the License.
             width: 6px;
             height: 6px;
             border-radius: 6px;
-            margin-right: 8px;
         }
 
         &.mx_NotificationBadge_2char {
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 53a01088c9..2c34f28721 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -21,7 +21,7 @@ limitations under the License.
     display: flex;
     flex-direction: column;
 
-    padding-left: 8px;
+    margin-left: 8px;
     margin-top: 12px;
     margin-bottom: 12px;
     width: 100%;
@@ -30,16 +30,18 @@ limitations under the License.
         // Create a flexbox to make ordering easy
         display: flex;
         align-items: center;
+        padding-bottom: 8px;
+        height: 24px;
 
         .mx_RoomSublist2_badgeContainer {
             opacity: 0.8;
-            padding-right: 7px;
+            width: 16px;
+            margin-right: 5px; // aligns with the room tile's badge
 
-            // Create another flexbox row because it's super easy to position the badge at
-            // the end this way.
+            // Create another flexbox row because it's super easy to position the badge this way.
             display: flex;
             align-items: center;
-            justify-content: flex-end;
+            justify-content: center;
         }
 
         // Both of these buttons are hidden by default until the list is hovered
@@ -77,10 +79,9 @@ limitations under the License.
             opacity: 0.5;
             line-height: $font-16px;
             font-size: $font-12px;
-            padding-bottom: 8px;
 
-            width: 100%;
             flex: 1;
+            max-width: calc(100% - 16px); // 16px is the badge width
 
             // Ellipsize any text overflow
             text-overflow: ellipsis;
@@ -184,7 +185,7 @@ limitations under the License.
             &:not(.mx_RoomSublist2_headerContainer_withAux) {
                 // The menu button will be the rightmost button, so make it correctly aligned.
                 .mx_RoomSublist2_menuButton {
-                    margin-right: 16px;
+                    margin-right: 1px; // line it up with the badges on the room tiles
                 }
             }
 
@@ -218,7 +219,7 @@ limitations under the License.
             // Show the aux button, but not the list button
             width: 24px;
             height: 24px;
-            margin-right: 16px;
+            margin-right: 1px; // line it up with the badges on the room tiles
             visibility: visible;
         }
     }
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index b1fd813655..67b1470550 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -18,9 +18,7 @@ limitations under the License.
 
 // Note: the room tile expects to be in a flexbox column container
 .mx_RoomTile2 {
-    width: calc(100% - 21px); // 10px for alignment/inset, 8px for padding on sides, 3px for margin
     margin-bottom: 4px;
-    margin-right: 3px;
     padding: 4px;
 
     // The tile is also a flexbox row itself
@@ -84,7 +82,7 @@ limitations under the License.
         // the end this way.
         display: flex;
         align-items: center;
-        justify-content: flex-end;
+        justify-content: center;
     }
 
     // The menu button is hidden by default
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 0df9c2ad73..12f3e96bac 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -237,11 +237,11 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                             >
                                 <span>{this.props.label}</span>
                             </AccessibleButton>
+                            {this.renderMenu()}
+                            {addRoomButton}
                             <div className="mx_RoomSublist2_badgeContainer">
                                 {badge}
                             </div>
-                            {this.renderMenu()}
-                            {addRoomButton}
                         </div>
                     );
                 }}

From ed7f4755cc297aafb077cf1cdb09fc17bc5124a9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jun 2020 22:05:29 +0100
Subject: [PATCH 142/181] use ButtonEvent instead of MouseEvent | KeyboardEvent
 for AccessibleButton (make CI happy)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserMenuButton.tsx       | 10 +++++-----
 src/components/views/elements/AccessibleButton.tsx |  4 +++-
 src/components/views/rooms/RoomTile2.tsx           |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index a8a6535805..41b2c3ab60 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -31,7 +31,7 @@ import LogoutDialog from "../views/dialogs/LogoutDialog";
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import {getCustomTheme} from "../../theme";
 import {getHostingLink} from "../../utils/HostingLink";
-import AccessibleButton from "../views/elements/AccessibleButton";
+import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
 
 interface IProps {
 }
@@ -114,7 +114,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme);
     };
 
-    private onSettingsOpen = (ev: React.MouseEvent, tabId: string) => {
+    private onSettingsOpen = (ev: ButtonEvent, tabId: string) => {
         ev.preventDefault();
         ev.stopPropagation();
 
@@ -123,7 +123,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         this.setState({menuDisplayed: false}); // also close the menu
     };
 
-    private onShowArchived = (ev: React.MouseEvent) => {
+    private onShowArchived = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
@@ -131,7 +131,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         console.log("TODO: Show archived rooms");
     };
 
-    private onProvideFeedback = (ev: React.MouseEvent) => {
+    private onProvideFeedback = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
@@ -139,7 +139,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
         this.setState({menuDisplayed: false}); // also close the menu
     };
 
-    private onSignOutClick = (ev: React.MouseEvent) => {
+    private onSignOutClick = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 3a542387c5..18dd43ad02 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -19,6 +19,8 @@ import React from 'react';
 import {Key} from '../../../Keyboard';
 import classnames from 'classnames';
 
+export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element>
+
 /**
  * children: React's magic prop. Represents all children given to the element.
  * element:  (optional) The base element type. "div" by default.
@@ -37,7 +39,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
     tabIndex?: number;
     disabled?: boolean;
     className?: string;
-    onClick?(e?: React.MouseEvent<Element> | React.KeyboardEvent<Element>): void;
+    onClick?(e?: ButtonEvent): void;
 };
 
 interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 7778b5be4b..e8056349e2 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -21,7 +21,7 @@ import React, { createRef } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
 import classNames from "classnames";
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
-import AccessibleButton from "../../views/elements/AccessibleButton";
+import AccessibleButton, {ButtonEvent} from "../../views/elements/AccessibleButton";
 import RoomAvatar from "../../views/avatars/RoomAvatar";
 import dis from '../../../dispatcher/dispatcher';
 import { Key } from "../../../Keyboard";
@@ -123,7 +123,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         this.setState({generalMenuDisplayed: false});
     };
 
-    private onTagRoom = (ev: React.MouseEvent, tagId: TagID) => {
+    private onTagRoom = (ev: ButtonEvent, tagId: TagID) => {
         ev.preventDefault();
         ev.stopPropagation();
 
@@ -134,7 +134,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         }
     };
 
-    private onLeaveRoomClick = (ev: React.MouseEvent) => {
+    private onLeaveRoomClick = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
@@ -145,7 +145,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         this.setState({generalMenuDisplayed: false}); // hide the menu
     };
 
-    private onOpenRoomSettings = (ev: React.MouseEvent) => {
+    private onOpenRoomSettings = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 

From 6c31bf1a618b5e5301c2d824684cd4554419529f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 15:15:58 -0600
Subject: [PATCH 143/181] Fix layout when resizing the list width

---
 res/css/views/rooms/_RoomList2.scss    | 2 ++
 res/css/views/rooms/_RoomSublist2.scss | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomList2.scss b/res/css/views/rooms/_RoomList2.scss
index 89760958f9..40549d25b4 100644
--- a/res/css/views/rooms/_RoomList2.scss
+++ b/res/css/views/rooms/_RoomList2.scss
@@ -17,6 +17,8 @@ limitations under the License.
 // TODO: Rename to mx_RoomList during replacement of old component
 
 .mx_RoomList2 {
+    width: calc(100% - 16px); // 16px of artificial right-side margin (8px is overflowed from the sublists)
+
     // Create a column-based flexbox for the sublists. That's pretty much all we have to
     // worry about in this stylesheet.
     display: flex;
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 2c34f28721..ed17c071b6 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -159,7 +159,7 @@ limitations under the License.
             // either side of the list. We define this after the positioning to
             // trick the browser.
             margin-left: 4px;
-            margin-right: 8px;
+            margin-right: 4px;
         }
     }
 

From 1d84b4668126180a1e81eff2d10af605f157611c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 15:22:17 -0600
Subject: [PATCH 144/181] Fix vertical height causing sublists to wrap

---
 res/css/views/rooms/_RoomList2.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomList2.scss b/res/css/views/rooms/_RoomList2.scss
index 40549d25b4..5b78020626 100644
--- a/res/css/views/rooms/_RoomList2.scss
+++ b/res/css/views/rooms/_RoomList2.scss
@@ -23,5 +23,5 @@ limitations under the License.
     // worry about in this stylesheet.
     display: flex;
     flex-direction: column;
-    flex-wrap: wrap;
+    flex-wrap: nowrap; // let the column overflow
 }

From b545d55e7bfb46d201a981d2a4767f9df52abc9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 10 Jun 2020 21:21:17 +0000
Subject: [PATCH 145/181] Translated using Weblate (Estonian)

Currently translated at 57.9% (1319 of 2278 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 7052f68308..6888590d9e 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1385,5 +1385,9 @@
     "%(oneUser)schanged their name %(count)s times|other": "Kasutaja %(oneUser)s muutis oma nime %(count)s korda",
     "You cannot place VoIP calls in this browser.": "Selle brauseriga ei saa VoIP kõnet teha.",
     "You cannot place a call with yourself.": "Sa ei saa iseendale helistada.",
-    "You do not have permission to start a conference call in this room": "Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet"
+    "You do not have permission to start a conference call in this room": "Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti %(count)s korda",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti",
+    "%(oneUser)schanged their avatar %(count)s times|other": "Kasutaja %(oneUser)s muutis oma tunnuspilti %(count)s korda",
+    "%(oneUser)schanged their avatar %(count)s times|one": "Kasutaja %(oneUser)s muutis oma tunnuspilti"
 }

From d1c2ecb6cc49f53ab9783b3c223f45948fd1bf44 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 16:04:27 -0600
Subject: [PATCH 146/181] Add some resource leak protection to new room list
 badges

Most of the leaks were because we never set `this.rooms` in the notification state, which meant we were constantly triggering the `diff.added` loop.
---
 src/components/views/rooms/NotificationBadge.tsx | 15 ++++++++++++++-
 src/components/views/rooms/RoomSublist2.tsx      |  4 ++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 65a56691bf..af5a84ed92 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -205,7 +205,7 @@ export class RoomNotificationState extends EventEmitter implements IDestroyable
     }
 }
 
-export class ListNotificationState extends EventEmitter {
+export class ListNotificationState extends EventEmitter implements IDestroyable {
     private _count: number;
     private _color: NotificationColor;
     private rooms: Room[] = [];
@@ -237,6 +237,7 @@ export class ListNotificationState extends EventEmitter {
 
         const oldRooms = this.rooms;
         const diff = arrayDiff(oldRooms, rooms);
+        this.rooms = rooms;
         for (const oldRoom of diff.removed) {
             const state = this.states[oldRoom.roomId];
             delete this.states[oldRoom.roomId];
@@ -246,12 +247,24 @@ export class ListNotificationState extends EventEmitter {
         for (const newRoom of diff.added) {
             const state = new RoomNotificationState(newRoom);
             state.on(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
+            if (this.states[newRoom.roomId]) {
+                // "Should never happen" disclaimer.
+                console.warn("Overwriting notification state for room:", newRoom.roomId);
+                this.states[newRoom.roomId].destroy();
+            }
             this.states[newRoom.roomId] = state;
         }
 
         this.calculateTotalState();
     }
 
+    public destroy() {
+        for (const state of Object.values(this.states)) {
+            state.destroy();
+        }
+        this.states = {};
+    }
+
     private onRoomNotificationStateUpdate = () => {
         this.calculateTotalState();
     };
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 0df9c2ad73..2282a03757 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -84,6 +84,10 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         this.state.notificationState.setRooms(this.props.rooms);
     }
 
+    public componentWillUnmount() {
+        this.state.notificationState.destroy();
+    }
+
     private onAddRoom = (e) => {
         e.stopPropagation();
         if (this.props.onAddRoom) this.props.onAddRoom();

From 6ccb56658722473c7277069fed444c6e04554b8c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 18:37:59 -0600
Subject: [PATCH 147/181] Show message previews on the new room list tiles

They're heavily cached.
---
 src/TextForEvent.js                      |  23 ++--
 src/components/views/rooms/RoomTile2.tsx |  14 ++-
 src/i18n/strings/en_EN.json              |   2 +
 src/stores/AsyncStore.ts                 |   6 +-
 src/stores/MessagePreviewStore.ts        | 132 +++++++++++++++++++++++
 5 files changed, 166 insertions(+), 11 deletions(-)
 create mode 100644 src/stores/MessagePreviewStore.ts

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 3607d7a676..09cfb67de7 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -265,13 +265,22 @@ function textForServerACLEvent(ev) {
     return text + changes.join(" ");
 }
 
-function textForMessageEvent(ev) {
+function textForMessageEvent(ev, skipUserPrefix) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     let message = senderDisplayName + ': ' + ev.getContent().body;
-    if (ev.getContent().msgtype === "m.emote") {
-        message = "* " + senderDisplayName + " " + message;
-    } else if (ev.getContent().msgtype === "m.image") {
-        message = _t('%(senderDisplayName)s sent an image.', {senderDisplayName});
+    if (skipUserPrefix) {
+        message = ev.getContent().body;
+        if (ev.getContent().msgtype === "m.emote") {
+            message = senderDisplayName + " " + message;
+        } else if (ev.getContent().msgtype === "m.image") {
+            message = _t('sent an image.');
+        }
+    } else {
+        if (ev.getContent().msgtype === "m.emote") {
+            message = "* " + senderDisplayName + " " + message;
+        } else if (ev.getContent().msgtype === "m.image") {
+            message = _t('%(senderDisplayName)s sent an image.', {senderDisplayName});
+        }
     }
     return message;
 }
@@ -612,8 +621,8 @@ for (const evType of ALL_RULE_TYPES) {
     stateHandlers[evType] = textForMjolnirEvent;
 }
 
-export function textForEvent(ev) {
+export function textForEvent(ev, skipUserPrefix) {
     const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
-    if (handler) return handler(ev);
+    if (handler) return handler(ev, skipUserPrefix);
     return '';
 }
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index e8056349e2..2b1c418294 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -30,6 +30,7 @@ import NotificationBadge, { INotificationState, NotificationColor, RoomNotificat
 import { _t } from "../../../languageHandler";
 import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
 import { DefaultTagID, TagID } from "../../../stores/room-list/models";
+import { MessagePreviewStore } from "../../../stores/MessagePreviewStore";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -253,8 +254,17 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         let messagePreview = null;
         if (this.props.showMessagePreview) {
-            // TODO: Actually get the real message preview from state
-            messagePreview = <div className="mx_RoomTile2_messagePreview">I just ate a pie.</div>;
+            // The preview store heavily caches this info, so should be safe to hammer.
+            const text = MessagePreviewStore.instance.getPreviewForRoom(this.props.room);
+
+            // Only show the preview if there is one to show.
+            if (text) {
+                messagePreview = (
+                    <div className="mx_RoomTile2_messagePreview">
+                        {text}
+                    </div>
+                );
+            }
         }
 
         const nameClasses = classNames({
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dcd6819368..81577d740e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -246,6 +246,7 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s enabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
+    "sent an image.": "sent an image.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
@@ -419,6 +420,7 @@
     "Restart": "Restart",
     "Upgrade your Riot": "Upgrade your Riot",
     "A new version of Riot is available!": "A new version of Riot is available!",
+    "You: %(message)s": "You: %(message)s",
     "There was an error joining the room": "There was an error joining the room",
     "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
diff --git a/src/stores/AsyncStore.ts b/src/stores/AsyncStore.ts
index 3519050078..1977e808dc 100644
--- a/src/stores/AsyncStore.ts
+++ b/src/stores/AsyncStore.ts
@@ -42,18 +42,20 @@ export const UPDATE_EVENT = "update";
  * help prevent lock conflicts.
  */
 export abstract class AsyncStore<T extends Object> extends EventEmitter {
-    private storeState: T = <T>{};
+    private storeState: T;
     private lock = new AwaitLock();
     private readonly dispatcherRef: string;
 
     /**
      * Creates a new AsyncStore using the given dispatcher.
      * @param {Dispatcher<ActionPayload>} dispatcher The dispatcher to rely upon.
+     * @param {T} initialState The initial state for the store.
      */
-    protected constructor(private dispatcher: Dispatcher<ActionPayload>) {
+    protected constructor(private dispatcher: Dispatcher<ActionPayload>, initialState: T = <T>{}) {
         super();
 
         this.dispatcherRef = dispatcher.register(this.onDispatch.bind(this));
+        this.storeState = initialState;
     }
 
     /**
diff --git a/src/stores/MessagePreviewStore.ts b/src/stores/MessagePreviewStore.ts
new file mode 100644
index 0000000000..d0d4664951
--- /dev/null
+++ b/src/stores/MessagePreviewStore.ts
@@ -0,0 +1,132 @@
+/*
+Copyright 2020 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 { Room } from "matrix-js-sdk/src/models/room";
+import { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { RoomListStoreTempProxy } from "./room-list/RoomListStoreTempProxy";
+import { textForEvent } from "../TextForEvent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/Event";
+import { _t } from "../languageHandler";
+
+const PREVIEWABLE_EVENTS = [
+    // This is the same list from RiotX
+    {type: "m.room.message", isState: false},
+    {type: "m.room.name", isState: true},
+    {type: "m.room.topic", isState: true},
+    {type: "m.room.member", isState: true},
+    {type: "m.room.history_visibility", isState: true},
+    {type: "m.call.invite", isState: false},
+    {type: "m.call.hangup", isState: false},
+    {type: "m.call.answer", isState: false},
+    {type: "m.room.encrypted", isState: false},
+    {type: "m.room.encryption", isState: true},
+    {type: "m.room.third_party_invite", isState: true},
+    {type: "m.sticker", isState: false},
+    {type: "m.room.create", isState: true},
+];
+
+interface IState {
+    [roomId: string]: string;
+}
+
+export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance = new MessagePreviewStore();
+
+    private constructor() {
+        super(defaultDispatcher, {});
+    }
+
+    public static get instance(): MessagePreviewStore {
+        return MessagePreviewStore.internalInstance;
+    }
+
+    /**
+     * Gets the pre-translated preview for a given room
+     * @param room The room to get the preview for.
+     * @returns The preview, or null if none present.
+     */
+    public getPreviewForRoom(room: Room): string {
+        if (!room) return null; // invalid room, just return nothing
+
+        // It's faster to do a lookup this way than it is to use Object.keys().includes()
+        const val = this.state[room.roomId];
+        if (val !== null && typeof(val) !== "string") {
+            this.generatePreview(room);
+        }
+
+        return this.state[room.roomId];
+    }
+
+    private generatePreview(room: Room) {
+        const maxEventsBackwards = 50; // any further and we just assume there's nothing important
+
+        const timeline = room.getLiveTimeline();
+        if (!timeline) return; // usually only happens in tests
+        const events = timeline.getEvents();
+
+        for (let i = events.length - 1; i >= 0; i--) {
+            if (i === events.length - maxEventsBackwards) return; // limit reached
+
+            const event = events[i];
+            const preview = this.generatePreviewForEvent(event);
+            if (preview.isPreviewable) {
+                // noinspection JSIgnoredPromiseFromCall - the AsyncStore handles concurrent calls
+                this.updateState({[room.roomId]: preview.preview});
+                return; // break - we found some text
+            }
+        }
+
+        // if we didn't find anything, subscribe ourselves to an update
+        // noinspection JSIgnoredPromiseFromCall - the AsyncStore handles concurrent calls
+        this.updateState({[room.roomId]: null});
+    }
+
+    protected async onAction(payload: ActionPayload) {
+        if (!this.matrixClient) return;
+
+        // TODO: Remove when new room list is made the default
+        if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
+        if (payload.action === 'MatrixActions.Room.timeline' || payload.action === 'MatrixActions.Event.decrypted') {
+            const event = payload.event; // TODO: Type out the dispatcher
+            if (!Object.keys(this.state).includes(event.getRoomId())) return; // not important
+
+            const preview = this.generatePreviewForEvent(event);
+            if (preview.isPreviewable) {
+                await this.updateState({[event.getRoomId()]: preview.preview});
+                return; // break - we found some text
+            }
+        }
+    }
+
+    private generatePreviewForEvent(event: MatrixEvent): { isPreviewable: boolean, preview: string } {
+        if (PREVIEWABLE_EVENTS.some(p => p.type === event.getType() && p.isState === event.isState())) {
+            const isSelf = event.getSender() === this.matrixClient.getUserId();
+            let text = textForEvent(event, /*skipUserPrefix=*/isSelf);
+            if (!text || text.trim().length === 0) text = null; // force null if useless to us
+            if (text && isSelf) {
+                // XXX: i18n doesn't really work here if the language doesn't support prefixing.
+                // We'd ideally somehow route the `You:` bit to the textForEvent call, however
+                // threading that through is non-trivial.
+                text = _t("You: %(message)s", {message: text});
+            }
+            return {isPreviewable: true, preview: text};
+        }
+        return {isPreviewable: false, preview: null};
+    }
+}

From 853ae6d5bf3a60d689708e8d10e52bd9d3eba6a3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Jun 2020 18:56:21 -0600
Subject: [PATCH 148/181] misc code quality improvements

---
 src/stores/MessagePreviewStore.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/stores/MessagePreviewStore.ts b/src/stores/MessagePreviewStore.ts
index d0d4664951..64d65a72f3 100644
--- a/src/stores/MessagePreviewStore.ts
+++ b/src/stores/MessagePreviewStore.ts
@@ -20,7 +20,7 @@ import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
 import defaultDispatcher from "../dispatcher/dispatcher";
 import { RoomListStoreTempProxy } from "./room-list/RoomListStoreTempProxy";
 import { textForEvent } from "../TextForEvent";
-import { MatrixEvent } from "matrix-js-sdk/src/models/Event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { _t } from "../languageHandler";
 
 const PREVIEWABLE_EVENTS = [
@@ -40,8 +40,11 @@ const PREVIEWABLE_EVENTS = [
     {type: "m.room.create", isState: true},
 ];
 
+// The maximum number of events we're willing to look back on to get a preview.
+const MAX_EVENTS_BACKWARDS = 50;
+
 interface IState {
-    [roomId: string]: string;
+    [roomId: string]: string | null; // null indicates the preview is empty
 }
 
 export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
@@ -64,6 +67,8 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
         if (!room) return null; // invalid room, just return nothing
 
         // It's faster to do a lookup this way than it is to use Object.keys().includes()
+        // We only want to generate a preview if there's one actually missing and not explicitly
+        // set as 'none'.
         const val = this.state[room.roomId];
         if (val !== null && typeof(val) !== "string") {
             this.generatePreview(room);
@@ -73,14 +78,12 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
     }
 
     private generatePreview(room: Room) {
-        const maxEventsBackwards = 50; // any further and we just assume there's nothing important
-
         const timeline = room.getLiveTimeline();
         if (!timeline) return; // usually only happens in tests
         const events = timeline.getEvents();
 
         for (let i = events.length - 1; i >= 0; i--) {
-            if (i === events.length - maxEventsBackwards) return; // limit reached
+            if (i === events.length - MAX_EVENTS_BACKWARDS) return; // limit reached
 
             const event = events[i];
             const preview = this.generatePreviewForEvent(event);

From 07d3b3f354b822e7db31327b556599c70da0483e Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 11 Jun 2020 00:02:27 +0000
Subject: [PATCH 149/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2278 of 2278 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 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d9ce9b49f3..a0e963c57b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2492,5 +2492,16 @@
     "All settings": "所有設定",
     "Archived rooms": "已封存的聊天室",
     "Feedback": "回饋",
-    "Account settings": "帳號設定"
+    "Account settings": "帳號設定",
+    "No recently visited rooms": "沒有最近造訪過的聊天室",
+    "Sort by": "排序方式",
+    "Unread rooms": "未讀聊天室",
+    "Always show first": "一律先顯示",
+    "Show": "顯示",
+    "Message preview": "訊息預覽",
+    "List options": "列表選項",
+    "Show %(count)s more|other": "再顯示 %(count)s 個",
+    "Show %(count)s more|one": "再顯示 %(count)s 個",
+    "Leave Room": "離開聊天室",
+    "Room options": "聊天室選項"
 }

From b36d7d48cc38df43bb39d6d1a4e0a0ff2d511a6b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 11 Jun 2020 10:36:52 +0100
Subject: [PATCH 150/181] Center read reaceipts on irc-ui

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

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index f2c7fab9f1..9f8d684c96 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -45,7 +45,7 @@ $irc-line-height: $font-18px;
             flex-shrink: 0;
 
             .mx_EventTile_readAvatars {
-                top: 7px;
+                top: 0.2rem; // ($irc-line-height - avatar height) / 2
             }
         }
 
@@ -82,7 +82,7 @@ $irc-line-height: $font-18px;
             align-items: center;
 
             // Need to use important to override the js provided height and width values.
-            > .mx_BaseAvatar, .mx_BaseAvatar > * {
+            > .mx_BaseAvatar, > .mx_BaseAvatar > * {
                 height: $font-14px !important;
                 width: $font-14px !important;
                 font-size: $font-10px !important;

From 872103fb8a1f98dbf5a037bb9e8b8117d68f439c Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 11 Jun 2020 11:44:11 +0100
Subject: [PATCH 151/181] Fix e2e bade alignment

---
 res/css/views/rooms/_IRCLayout.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index a8eb35eeed..6561356ea8 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -96,10 +96,16 @@ $irc-line-height: $font-18px;
             position: relative;
             right: unset;
             left: unset;
+            top: 0;
+
             padding: 0;
-            order: 3;
+
             flex-shrink: 0;
             flex-grow: 0;
+
+            height: $font-18px;
+
+            background-position: center;
         }
 
         .mx_EventTile_line {

From 51537a527b697bfb8854e2043be1b737614871e0 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Thu, 11 Jun 2020 08:05:15 +0000
Subject: [PATCH 152/181] Translated using Weblate (Albanian)

Currently translated at 99.9% (2278 of 2280 strings)

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

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 110b0852b6..727fa0306b 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2483,5 +2483,18 @@
     "All settings": "Krejt rregullimet",
     "Archived rooms": "Dhoma të arkivuara",
     "Feedback": "Mendime",
-    "Account settings": "Rregullime llogarie"
+    "Account settings": "Rregullime llogarie",
+    "sent an image.": "dërgoi një figurë.",
+    "You: %(message)s": "Ju: %(message)s",
+    "No recently visited rooms": "S’ka dhoma të vizituara së fundi",
+    "Sort by": "Renditi sipas",
+    "Unread rooms": "Dhoma të palexuara",
+    "Always show first": "Shfaq përherë të parën",
+    "Show": "Shfaqe",
+    "Message preview": "Paraparje mesazhi",
+    "List options": "Mundësi liste",
+    "Show %(count)s more|other": "Shfaq %(count)s të tjera",
+    "Show %(count)s more|one": "Shfaq %(count)s tjetër",
+    "Leave Room": "Dil Nga Dhoma",
+    "Room options": "Mundësi dhome"
 }

From 42855cf9d8b0fc6e241edc06c6226dc479fd2520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 11 Jun 2020 08:35:38 +0000
Subject: [PATCH 153/181] Translated using Weblate (French)

Currently translated at 100.0% (2280 of 2280 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5775e4f706..2fb7c7e9bb 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2493,5 +2493,18 @@
     "All settings": "Tous les paramètres",
     "Archived rooms": "Salons archivés",
     "Feedback": "Commentaire",
-    "Account settings": "Paramètres du compte"
+    "Account settings": "Paramètres du compte",
+    "sent an image.": "a envoyé une image.",
+    "You: %(message)s": "Vous : %(message)s",
+    "No recently visited rooms": "Aucun salon visité récemment",
+    "Sort by": "Trier par",
+    "Unread rooms": "Salons non lus",
+    "Always show first": "Toujours afficher en premier",
+    "Show": "Afficher",
+    "Message preview": "Aperçu de message",
+    "List options": "Options de liste",
+    "Show %(count)s more|other": "En afficher %(count)s de plus",
+    "Show %(count)s more|one": "En afficher %(count)s de plus",
+    "Leave Room": "Quitter le salon",
+    "Room options": "Options du salon"
 }

From 8839a862889cb1c64ca4b6d08d8ce4b84764ad3c Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 11 Jun 2020 07:38:37 +0000
Subject: [PATCH 154/181] Translated using Weblate (Galician)

Currently translated at 69.7% (1590 of 2280 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index f479b4f038..51b1f7fa25 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1591,5 +1591,74 @@
     "Room version:": "Versión da sala:",
     "Developer options": "Opcións desenvolvemento",
     "Open Devtools": "Open Devtools",
-    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Esta sala está enviando mensaxes ás seguintes plataformas. <a>Coñece máis.</a>"
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Esta sala está enviando mensaxes ás seguintes plataformas. <a>Coñece máis.</a>",
+    "sent an image.": "enviou unha imaxe.",
+    "You: %(message)s": "Ti: %(message)s",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Esta sala non está enviando mensaxes a outras plataformas. <a>Saber máis.</a>",
+    "Bridges": "Pontes",
+    "Uploaded sound": "Audio subido",
+    "Sounds": "Audios",
+    "Notification sound": "Ton de notificación",
+    "Reset": "Restablecer",
+    "Set a new custom sound": "Establecer novo ton personalizado",
+    "Browse": "Buscar",
+    "Change room avatar": "Cambiar avatar da sala",
+    "Change main address for the room": "Cambiar enderezo principal da sala",
+    "Change history visibility": "Cambiar visibilidade do historial",
+    "Change permissions": "Cambiar permisos",
+    "Change topic": "Cambiar tema",
+    "Upgrade the room": "Actualizar a sala",
+    "Enable room encryption": "Activar cifrado da sala",
+    "Modify widgets": "Modificar widgets",
+    "Error changing power level requirement": "Erro ao cambiar o requerimento de nivel de responsabilidade",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Algo fallou ao cambiar os requerimentos de nivel de responsabilidade na sala. Asegúrate de ter os permisos suficientes e volve a intentalo.",
+    "Error changing power level": "Erro ao cambiar nivel de responsabilidade",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Algo fallou ao cambiar o nivel de responsabilidade da usuaria. Asegúrate de ter permiso suficiente e inténtao outra vez.",
+    "Default role": "Rol por omsión",
+    "Send messages": "Enviar mensaxes",
+    "Invite users": "Convidar usuarias",
+    "Change settings": "Cambiar axustes",
+    "Kick users": "Expulsar usuarias",
+    "Ban users": "Bloquear usuarias",
+    "Remove messages": "Eliminar mensaxes",
+    "Notify everyone": "Notificar a todas",
+    "Send %(eventType)s events": "Enviar %(eventType)s eventos",
+    "Select the roles required to change various parts of the room": "Escolle os roles requeridos para cambiar determinadas partes da sala",
+    "Enable encryption?": "Activar cifrado?",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Unha vez activado, non se pode desactivar o cifrado da sala. As mensaxes enviadas nunha sala cifrada non poder ser vistas polo servidor, só polas participantes da sala. Ao activar o cifrado poderías causar que bots e pontes deixen de funcionar correctamente. <a>Coñece máis sobre o cifrado.</a>",
+    "To link to this room, please add an address.": "Para ligar a esta sala, engade un enderezo.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Os cambios sobre quen pode ler o historial só se aplicarán as mensaxes futuras nesta sala. A visibilidade do historial precedente non cambiará.",
+    "Encryption": "Cifrado",
+    "Once enabled, encryption cannot be disabled.": "Unha vez activado, non se pode desactivar.",
+    "Encrypted": "Cifrado",
+    "Unable to revoke sharing for email address": "Non se puido revogar a compartición para o enderezo de correo",
+    "Unable to share email address": "Non se puido compartir co enderezo de email",
+    "Your email address hasn't been verified yet": "O teu enderezo de email aínda non foi verificado",
+    "Click the link in the email you received to verify and then click continue again.": "Preme na ligazón do email recibido para verificalo e após preme en continuar outra vez.",
+    "Verify the link in your inbox": "Verifica a ligazón na túa caixa de correo",
+    "Complete": "Completar",
+    "Revoke": "Revogar",
+    "Share": "Compartir",
+    "Discovery options will appear once you have added an email above.": "As opcións de descubrimento aparecerán após ti engadas un email.",
+    "Unable to revoke sharing for phone number": "Non se puido  revogar a compartición do número de teléfono",
+    "Unable to share phone number": "Non se puido compartir o número de teléfono",
+    "Unable to verify phone number.": "Non se puido verificar o número de teléfono.",
+    "Please enter verification code sent via text.": "Escribe o código de verificación enviado no SMS.",
+    "Verification code": "Código de verificación",
+    "Discovery options will appear once you have added a phone number above.": "As opción para atoparte aparecerán cando engadas un número de teléfono.",
+    "Remove %(email)s?": "Eliminar %(email)s?",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Enviamosche un email para verificar o enderezo. Segue as instrucións incluídas e após preme no botón inferior.",
+    "Email Address": "Enderezo de Email",
+    "Remove %(phone)s?": "Eliminar %(phone)s?",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Enviamosche un SMS ao +%(msisdn)s. Escribe o código de verificación que contén.",
+    "Phone Number": "Número de teléfono",
+    "This user has not verified all of their sessions.": "Esta usuaria non verificou ningunha das súas sesións.",
+    "You have not verified this user.": "Non verificaches esta usuaria.",
+    "You have verified this user. This user has verified all of their sessions.": "Verificaches esta usuaria. A usuaria verificou todas as súas sesións.",
+    "Someone is using an unknown session": "Alguén está a usar unha sesión descoñecida",
+    "This room is end-to-end encrypted": "Esta sala está cifrada extremo-a-extremo",
+    "Everyone in this room is verified": "Todas nesta sala están verificadas",
+    "Edit message": "Editar mensaxe",
+    "Mod": "Mod",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Enviouse a solicitude de compartir chave - comproba as túas outras sesións para solicitudes de compartir chave."
 }

From 2e99143b79ec204adb2579703fa18884d7cbd453 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 11 Jun 2020 07:44:41 +0000
Subject: [PATCH 155/181] Translated using Weblate (Italian)

Currently translated at 99.9% (2279 of 2280 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 1410b6c70b..81ac0a8dcf 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2488,5 +2488,17 @@
     "All settings": "Tutte le impostazioni",
     "Archived rooms": "Stanze archiviate",
     "Feedback": "Feedback",
-    "Account settings": "Impostazioni account"
+    "Account settings": "Impostazioni account",
+    "sent an image.": "ha inviato un'immagine.",
+    "You: %(message)s": "Tu: %(message)s",
+    "No recently visited rooms": "Nessuna stanza visitata di recente",
+    "Sort by": "Ordina per",
+    "Unread rooms": "Stanze non lette",
+    "Show": "Mostra",
+    "Message preview": "Anteprima messaggio",
+    "List options": "Opzioni lista",
+    "Show %(count)s more|other": "Mostra altri %(count)s",
+    "Show %(count)s more|one": "Mostra %(count)s altro",
+    "Leave Room": "Lascia stanza",
+    "Room options": "Opzioni stanza"
 }

From f540c83af8c2f22191b4f6b486cd8d4855289b6a Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 11 Jun 2020 16:34:49 +0000
Subject: [PATCH 156/181] Translated using Weblate (Lithuanian)

Currently translated at 68.6% (1565 of 2280 strings)

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

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 08f7c9f33d..f2291e3a84 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1017,10 +1017,10 @@
     "Show read receipts sent by other users": "Rodyti kitų vartotojų siųstus perskaitymo kvitus",
     "Order rooms by name": "Rūšiuoti kambarius pagal pavadinimą",
     "The other party cancelled the verification.": "Kita šalis atšaukė patvirtinimą.",
-    "Public Name": "Viešas Vardas",
+    "Public Name": "Viešas pavadinimas",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Užšifruotos žinutės yra apsaugotos visapusiu šifravimu. Tik jūs ir gavėjas(-ai) turi raktus šioms žinutėms perskaityti.",
     "Back up your keys before signing out to avoid losing them.": "Prieš atsijungdami sukurkite atsarginę savo raktų kopiją, kad išvengtumėte jų praradimo.",
-    "Start using Key Backup": "Pradėti naudoti Atsarginę Raktų Kopiją",
+    "Start using Key Backup": "Pradėti naudoti atsarginę raktų kopiją",
     "Display Name": "Rodomas Vardas",
     "Please verify the room ID or alias and try again.": "Prašome patikrinti kambario ID arba slapyvardį ir bandyti dar kartą.",
     "Room %(name)s": "Kambarys %(name)s",
@@ -1409,19 +1409,19 @@
     "Accept <policyLink /> to continue:": "Sutikite su <policyLink />, kad tęstumėte:",
     "Upload": "Įkelti",
     "Your homeserver does not support cross-signing.": "Jūsų serveris nepalaiko kryžminio pasirašymo.",
-    "Cross-signing and secret storage are enabled.": "Kryžminis pasirašymas ir slapta saugykla yra įjungta.",
+    "Cross-signing and secret storage are enabled.": "Kryžminis pasirašymas ir slapta saugykla yra įjungti.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Jūsų paskyra slaptoje saugykloje turi kryžminio pasirašymo tapatybę, bet šis seansas dar ja nepasitiki.",
     "Cross-signing and secret storage are not yet set up.": "Kryžminis pasirašymas ir slapta saugykla dar nėra nustatyti.",
-    "Reset cross-signing and secret storage": "Atstatyti kryžminį pasirašymą ir slaptą saugyklą",
+    "Reset cross-signing and secret storage": "Iš naujo nustatyti kryžminį pasirašymą ir slaptą saugyklą",
     "Bootstrap cross-signing and secret storage": "Prikabinti kryžminį pasirašymą ir slaptą saugyklą",
     "Cross-signing public keys:": "Kryžminio pasirašymo vieši raktai:",
     "Cross-signing private keys:": "Kryžminio pasirašymo privatūs raktai:",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individualiai patikrinkite kiekvieną vartotojo naudojamą seansą, kad pažymėtumėte jį kaip patikimą, nepasitikint kryžminiu pasirašymu patvirtintais įrenginiais.",
     "Enable": "Įjungti",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> parašą iš <verify>patikrinto</verify> seanso <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> parašą iš <verify>nepatikrinto</verify> seanso <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> parašą iš <verify>patikrinto</verify> seanso <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> parašą iš <verify>nepatikrinto</verify> seanso <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> <verify>patvirtinto</verify> seanso <device></device> parašą",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> <verify>nepatvirtinto</verify> seanso <device></device> parašą",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> <verify>patvirtinto</verify> seanso <device></device> parašą",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> <verify>nepatvirtinto</verify> seanso <device></device> parašą",
     "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Atsarginė rakto kopija saugoma slaptoje saugykloje, bet ši funkcija nėra įjungta šiame seanse. Įjunkite kryžminį pasirašymą Laboratorijose, kad galėtumėte keisti atsarginės rakto kopijos būseną.",
     "Enable desktop notifications for this session": "Įjungti darbalaukio pranešimus šiam seansui",
     "Enable audible notifications for this session": "Įjungti garsinius pranešimus šiam seansui",
@@ -1484,9 +1484,9 @@
     "Send typing notifications": "Siųsti spausdinimo pranešimus",
     "Automatically replace plain text Emoji": "Automatiškai pakeisti paprasto teksto jaustukus",
     "Mirror local video feed": "Atkartoti lokalų video tiekimą",
-    "Allow Peer-to-Peer for 1:1 calls": "Leisti \"Peer-to-Peer\" 1:1 skambučiams",
+    "Allow Peer-to-Peer for 1:1 calls": "Leisti tiesioginį \"Peer-to-Peer\" sujungimą 1:1 skambučiams",
     "Prompt before sending invites to potentially invalid matrix IDs": "Klausti prieš siunčiant pakvietimus galimai netinkamiems matrix ID",
-    "Show rooms with unread notifications first": "Pirmiausia rodyti kambarius su neskaitytais pranešimais",
+    "Show rooms with unread notifications first": "Pirmiausia rodyti kambarius su neperskaitytais pranešimais",
     "Show shortcuts to recently viewed rooms above the room list": "Rodyti neseniai peržiūrėtų kambarių nuorodas virš kambarių sąrašo",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Leisti atsarginį skambučių pagalbos serverį turn.matrix.org, kai jūsų serveris to neteikia (jūsų IP adresas bus bendrintas pokalbio metu)",
     "Show previews/thumbnails for images": "Rodyti vaizdų peržiūras/miniatiūras",
@@ -1557,7 +1557,7 @@
     "Ask this user to verify their session, or manually verify it below.": "Paprašykite šio vartotojo patvirtinti savo seansą arba patvirtinkite jį rankiniu būdu žemiau.",
     "Encryption upgrade available": "Galimas šifravimo atnaujinimas",
     "Verify this user by confirming the following number appears on their screen.": "Patvirtinkite šį vartotoją įsitikindami, kad jo ekrane rodomas toliau esantis skaičius.",
-    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Atsarginė kopija turi <verify>nežinomo</verify> vartotojo parašą su %(deviceId)s ID",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Atsarginė kopija turi <verify>nežinomo</verify> vartotojo parašą su ID %(deviceId)s",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Tvarkykite savo seansų pavadinimus ir iš jų atsijunkite žemiau, arba <a>patvirtinkite juos savo Vartotojo Profilyje</a>.",
     "Please enter verification code sent via text.": "Įveskite patvirtinimo kodą išsiųstą teksto žinute.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Teksto žinutė buvo išsiųsta numeriu +%(msisdn)s. Įveskite joje esantį patvirtinimo kodą.",
@@ -1586,16 +1586,16 @@
     "View": "Žiūrėti",
     "Confirm encryption setup": "Patvirtinti šifravimo sąranką",
     "Click the button below to confirm setting up encryption.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šifravimo nustatymą.",
-    "Restore your key backup to upgrade your encryption": "Atstatykite savo raktų atsarginę kopiją, kad atnaujintumėte šifravimą",
+    "Restore your key backup to upgrade your encryption": "Atkurkite savo atsarginę raktų kopiją, kad atnaujintumėte šifravimą",
     "Upgrade your encryption": "Atnaujinkite savo šifravimą",
     "Failed to set topic": "Nepavyko nustatyti temos",
     "Show typing notifications": "Rodyti spausdinimo pranešimus",
     "Show hidden events in timeline": "Rodyti paslėptus įvykius laiko juostoje",
     "Session backup key:": "Seanso atsarginės kopijos raktas:",
-    "Unable to load key backup status": "Nepavyko įkelti rakto atsarginės kopijos būklės",
-    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Prieš atsijungdami susiekite šį seansą prie rakto atsarginės kopijos, kad išvengtumėte praradimo raktų, kurie gali būti tik šiame seanse.",
-    "Connect this session to Key Backup": "Susieti šį seansą su rakto atsargine kopija",
-    "Backup key stored: ": "Atsarginė rakto kopija saugoma: ",
+    "Unable to load key backup status": "Nepavyko įkelti atsarginės raktų kopijos būklės",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Prieš atsijungdami prijunkite šį seansą prie atsarginės raktų kopijos, kad neprarastumėte raktų, kurie gali būti tik šiame seanse.",
+    "Connect this session to Key Backup": "Prijungtii šį seansą prie atsarginės raktų kopijos",
+    "Backup key stored: ": "Atsarginės kopijos raktas saugomas: ",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, jūs šiuo metu naudojate <server></server> tapatybės serverį. Jį pakeisti galite žemiau.",
     "Identity Server": "Tapatybės serveris",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Šiuo metu jūs nenaudojate tapatybės serverio. Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, pridėkite jį žemiau.",
@@ -1604,9 +1604,9 @@
     "Deactivate account": "Deaktyvuoti paskyrą",
     "Identity Server is": "Tapatybės serveris yra",
     "Timeline": "Laiko juosta",
-    "Key backup": "Atsarginė rakto kopija",
+    "Key backup": "Atsarginė raktų kopija",
     "Where you’re logged in": "Kur esate prisijungę",
-    "A session's public name is visible to people you communicate with": "Seanso viešas vardas yra matomas žmonių su kuriais jūs bendraujate",
+    "A session's public name is visible to people you communicate with": "Seanso viešas pavadinimas yra matomas žmonėms su kuriais jūs bendraujate",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Pabandykite slinkti aukštyn laiko juostoje, kad sužinotumėte, ar yra ankstesnių.",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Tai visam laikui padarys jūsų paskyrą nebetinkama naudoti. Jūs nebegalėsite prisijungti ir niekas nebegalės iš naujo užregistruoti to pačio vartotojo ID. Jūsų paskyra išeis iš visų kambarių, kuriuose ji dalyvauja ir pašalins jūsų paskyros detales iš jūsų tapatybės serverio. <b>Šis veiksmas neatšaukiamas.</b>",
     "Unable to validate homeserver/identity server": "Neįmanoma patvirtinti serverio/tapatybės serverio",
@@ -1619,5 +1619,47 @@
     "Your Matrix account on <underlinedServerName />": "Jūsų Matrix paskyra <underlinedServerName /> serveryje",
     "No identity server is configured: add one in server settings to reset your password.": "Nesukonfigūruotas joks tapatybės serveris: pridėkite jį serverio nustatymuose, kad iš naujo nustatytumėte slaptažodį.",
     "Identity server URL does not appear to be a valid identity server": "Tapatybės serverio URL neatrodo kaip tinkamas tapatybės serveris",
-    "Scroll up/down in the timeline": "Slinkite aukštyn/žemyn laiko juostoje"
+    "Scroll up/down in the timeline": "Slinkite aukštyn/žemyn laiko juostoje",
+    "Show developer tools": "Rodyti vystytojo įrankius",
+    "Low bandwidth mode": "Žemo duomenų pralaidumo režimas",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Siųsti žinučių perskaitymo kvitus (norint išjungti reikalingas suderinamas serveris)",
+    "Keep recovery passphrase in memory for this session": "Šiam seansui atkūrimo slaptafrazę laikyti atmintyje",
+    "How fast should messages be downloaded.": "Kaip greitai žinutės turi būti parsiųstos.",
+    "Manually verify all remote sessions": "Rankiniu būdu patvirtinti visus nuotolinius seansus",
+    "well formed": "gerai suformuota",
+    "unexpected type": "netikėto tipo",
+    "in memory": "atmintyje",
+    "not found": "nerasta",
+    "in secret storage": "slaptoje saugykloje",
+    "Self signing private key:": "Savarankiško pasirašymo privatus raktas:",
+    "cached locally": "lokaliame podėlyje",
+    "not found locally": "lokaliai nerasta",
+    "User signing private key:": "Vartotojo pasirašymo privatus raktas:",
+    "Secret storage public key:": "Slaptos saugyklos viešas raktas:",
+    "in account data": "paskyros duomenyse",
+    "Homeserver feature support:": "Serverio funkcijų palaikymas:",
+    "exists": "yra",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot negali saugiai podėlyje talpinti užšifruotų žinučių, kol veikia interneto naršyklėje. Naudokite <riotLink>Riot Desktop</riotLink>, kad užšifruotos žinutės būtų rodomos paieškos rezultatuose.",
+    "This session is backing up your keys. ": "Šis seansas kuria atsargines jūsų raktų kopijas. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Šis seansas <b>nekuria atsarginių raktų kopijų</b>, bet jūs jau turite atsarginę kopiją iš kurios galite atstatyti ir pridėti.",
+    "All keys backed up": "Atsarginė kopija sukurta visiems raktams",
+    "Backup has a <validity>valid</validity> signature from this user": "Atsarginė kopija turi <validity>galiojantį</validity> šio vartotojo parašą",
+    "Backup has a <validity>invalid</validity> signature from this user": "Atsarginė kopija turi <validity>negaliojantį</validity> šio vartotojo parašą",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Atsarginė kopija turi <verify>nežinomo</verify> seanso parašą su ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Atsarginė kopija turi <validity>galiojantį</validity> šio seanso parašą",
+    "Backup has an <validity>invalid</validity> signature from this session": "Atsarginė kopija turi <validity>negaliojantį</validity> šio seanso parašą",
+    "This backup is trusted because it has been restored on this session": "Ši atsarginė kopija yra patikima, nes buvo atkurta šiame seanse",
+    "Message search": "Žinučių paieška",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Šio seanso duomenų išvalymas yra negrįžtamas. Šifruotos žinutės bus prarastos, nebent buvo sukurta jų raktų atsarginė kopija.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Trūksta kai kurių seanso duomenų, įskaitant šifruotų žinučių raktus. Atsijunkite ir prisijunkite, kad tai išspręstumėte, atkurdami raktus iš atsarginės kopijos.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atkūrimo slaptafrazę.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atkūrimo raktą.",
+    "Restoring keys from backup": "Raktų atkūrimas iš atsarginės kopijos",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Atsarginės kopijos nepavyko iššifruoti naudojant šį atkūrimo raktą: patikrinkite, ar įvedėte teisingą atkūrimo raktą.",
+    "Unable to query secret storage status": "Slaptos saugyklos būsenos užklausa neįmanoma",
+    "Unable to set up secret storage": "Neįmanoma nustatyti slaptos saugyklos",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Užšifruotą jūsų raktų kopiją saugosime savo serveryje. Apsaugokite savo atsarginę kopiją naudodami atkūrimo slaptafrazę.",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Kuriama jūsų raktų atsarginė kopija (pirmas atsarginės kopijos sukūrimas gali užtrukti kelias minutes).",
+    "Create key backup": "Sukurti atsarginę raktų kopiją",
+    "Unable to create key backup": "Nepavyko sukurti atsarginės raktų kopijos"
 }

From f300f498bba21a1fafd3325894e6ed7a1de233fe Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 11 Jun 2020 18:33:17 +0000
Subject: [PATCH 157/181] Translated using Weblate (Lithuanian)

Currently translated at 68.6% (1565 of 2280 strings)

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

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index f2291e3a84..3897f74ccc 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1661,5 +1661,6 @@
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Užšifruotą jūsų raktų kopiją saugosime savo serveryje. Apsaugokite savo atsarginę kopiją naudodami atkūrimo slaptafrazę.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Kuriama jūsų raktų atsarginė kopija (pirmas atsarginės kopijos sukūrimas gali užtrukti kelias minutes).",
     "Create key backup": "Sukurti atsarginę raktų kopiją",
-    "Unable to create key backup": "Nepavyko sukurti atsarginės raktų kopijos"
+    "Unable to create key backup": "Nepavyko sukurti atsarginės raktų kopijos",
+    "Your homeserver does not support session management.": "Jūsų serveris nepalaiko seansų tvarkymo."
 }

From 2c04a5678462fa9c95d9af9fd7dcd3c19706ef51 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jun 2020 14:39:28 -0600
Subject: [PATCH 158/181] Add a minimized view to the new room list

This covers everything except breadcrumbs, as those are somewhat undecided from a design perspective.
---
 res/css/structures/_LeftPanel2.scss         | 34 +++++++++
 res/css/structures/_RoomSearch.scss         | 11 +++
 res/css/views/rooms/_RoomSublist2.scss      | 82 +++++++++++++++++++--
 res/css/views/rooms/_RoomTile2.scss         | 39 +++++++---
 src/components/structures/LeftPanel2.tsx    | 25 +++++--
 src/components/structures/LoggedInView.tsx  |  2 +-
 src/components/structures/RoomSearch.tsx    | 62 +++++++++++-----
 src/components/views/rooms/RoomList2.tsx    |  2 +
 src/components/views/rooms/RoomSublist2.tsx | 13 +++-
 src/components/views/rooms/RoomTile2.tsx    | 23 ++++--
 10 files changed, 243 insertions(+), 50 deletions(-)

diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
index bd2a3ba96e..3b8fb58be5 100644
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -138,4 +138,38 @@ $roomListMinimizedWidth: 50px;
             display: flex;
         }
     }
+
+    // These styles override the defaults for the minimized (66px) layout
+    &.mx_LeftPanel2_minimized {
+        min-width: unset;
+
+        // We have to forcefully set the width to override the resizer's style attribute.
+        width: calc(68px + $tagPanelWidth) !important;
+
+        .mx_LeftPanel2_roomListContainer {
+            width: 68px;
+
+            .mx_LeftPanel2_userHeader {
+                .mx_LeftPanel2_headerRow {
+                    justify-content: center;
+                }
+
+                .mx_LeftPanel2_userAvatarContainer {
+                    margin-right: 0;
+                }
+            }
+
+            .mx_LeftPanel2_filterContainer {
+                // Organize the flexbox into a centered column layout
+                flex-direction: column;
+                justify-content: center;
+
+                .mx_LeftPanel2_exploreButton {
+                    margin-left: 0;
+                    margin-top: 8px;
+                    background-color: transparent;
+                }
+            }
+        }
+    }
 }
diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
index d078031090..31061f7a16 100644
--- a/res/css/structures/_RoomSearch.scss
+++ b/res/css/structures/_RoomSearch.scss
@@ -67,4 +67,15 @@ limitations under the License.
         width: 0;
         height: 0;
     }
+
+    &.mx_RoomSearch_minimized {
+        border-radius: 32px;
+        height: auto;
+        width: auto;
+        padding: 8px;
+
+        .mx_RoomSearch_icon {
+            margin-left: 0;
+        }
+    }
 }
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index ed17c071b6..d1e9c0459c 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -51,6 +51,7 @@ limitations under the License.
             margin: 0;
             visibility: hidden;
             position: relative;
+            border-radius: 32px;
 
             &::before {
                 content: '';
@@ -172,7 +173,7 @@ limitations under the License.
             border: 2px solid $primary-fg-color;
         }
 
-        .mx_RoomSublist2_headerContainer {
+        &:not(.mx_RoomSublist2_minimized) > .mx_RoomSublist2_headerContainer {
             // If the header doesn't have an aux button we still need to hide the badge for
             // the menu button.
             .mx_RoomSublist2_badgeContainer {
@@ -195,18 +196,89 @@ limitations under the License.
             .mx_RoomSublist2_menuButton {
                 width: 24px;
                 height: 24px;
-                border-radius: 32px;
                 margin-left: 16px;
-                background-color: #fff; // TODO: Variable and theme
                 visibility: visible;
+                background-color: #fff; // TODO: Variable and theme
+            }
+        }
+    }
+
+    &.mx_RoomSublist2_minimized {
+        .mx_RoomSublist2_headerContainer {
+            height: auto;
+            flex-direction: column;
+            position: relative;
+
+            .mx_RoomSublist2_badgeContainer {
+                order: 1;
+                align-self: flex-end;
+                margin-right: 0;
+            }
+
+            .mx_RoomSublist2_headerText {
+                order: 2;
+                max-width: 100%;
+            }
+
+            .mx_RoomSublist2_auxButton {
+                order: 4;
+                visibility: visible;
+                width: 32px !important; // !important to override hover styles
+                height: 32px !important; // !important to override hover styles
+                margin-left: 0 !important; // !important to override hover styles
+                background-color: #fff; // TODO: Variable and theme
+                margin-top: 8px;
+
+                &::before {
+                    top: 8px;
+                    left: 8px;
+                }
+            }
+        }
+
+        .mx_RoomSublist2_resizeBox {
+            align-items: center;
+
+            .mx_RoomSublist2_showMoreButton {
+                .mx_RoomSublist2_showMoreButtonChevron {
+                    margin-right: 12px; // to center
+                }
+            }
+        }
+
+        &:hover, &.mx_RoomSublist2_hasMenuOpen {
+            .mx_RoomSublist2_menuButton {
+                visibility: visible;
+                position: absolute;
+                bottom: 48px; // align to middle of name, 40px for aux button (with padding) and 8px for alignment
+                right: 0;
+                width: 16px;
+                height: 16px;
+                border-radius: 0;
+                z-index: 1; // occlude the list name
+
+                // This is the same color as the left panel background because it needs
+                // to occlude the sublist title
+                background-color: $header-panel-bg-color;
+
+                &::before {
+                    top: 0;
+                    left: 0;
+                }
+            }
+
+            .mx_RoomSublist2_headerContainer:not(.mx_RoomSublist2_headerContainer_withAux) {
+                .mx_RoomSublist2_menuButton {
+                    bottom: 8px; // align to the middle of name, 40px less than the `bottom` above.
+                }
             }
         }
     }
 }
 
 // We have a hover style on the room list with no specific list hovered, so account for that
-.mx_RoomList2:hover .mx_RoomSublist2,
-.mx_RoomSublist2_hasMenuOpen {
+.mx_RoomList2:hover .mx_RoomSublist2:not(.mx_RoomSublist2_minimized),
+.mx_RoomSublist2_hasMenuOpen:not(.mx_RoomSublist2_minimized) {
     .mx_RoomSublist2_headerContainer_withAux {
         .mx_RoomSublist2_badgeContainer {
             // Completely hide the badge
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 67b1470550..f74d0ff5a4 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -115,18 +115,37 @@ limitations under the License.
         mask-image: url('$(res)/img/feather-customised/more-horizontal.svg');
     }
 
-    &:hover, &.mx_RoomTile2_hasMenuOpen {
-        // Hide the badge container on hover because it'll be a menu button
-        .mx_RoomTile2_badgeContainer {
-            width: 0;
-            height: 0;
-            visibility: hidden;
+    &:not(.mx_RoomTile2_minimized) {
+        &:hover, &.mx_RoomTile2_hasMenuOpen {
+            // Hide the badge container on hover because it'll be a menu button
+            .mx_RoomTile2_badgeContainer {
+                width: 0;
+                height: 0;
+                visibility: hidden;
+            }
+
+            .mx_RoomTile2_menuButton {
+                width: 18px;
+                height: 32px;
+                visibility: visible;
+            }
+        }
+    }
+
+    &.mx_RoomTile2_minimized {
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+
+        .mx_RoomTile2_avatarContainer {
+            margin-right: 0;
         }
 
-        .mx_RoomTile2_menuButton {
-            width: 18px;
-            height: 32px;
-            visibility: visible;
+        .mx_RoomTile2_badgeContainer {
+            position: absolute;
+            top: 0;
+            right: 0;
+            height: 18px;
         }
     }
 }
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index 302d71afa8..a644aa4837 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -40,7 +40,7 @@ import { UPDATE_EVENT } from "../../stores/AsyncStore";
  *******************************************************************/
 
 interface IProps {
-    // TODO: Support collapsed state
+    isMinimized: boolean;
 }
 
 interface IState {
@@ -106,11 +106,22 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         if (this.state.showBreadcrumbs) {
             breadcrumbs = (
                 <div className="mx_LeftPanel2_headerRow mx_LeftPanel2_breadcrumbsContainer">
-                    <RoomBreadcrumbs2 />
+                    {this.props.isMinimized ? null : <RoomBreadcrumbs2 />}
                 </div>
             );
         }
 
+        let name = <span className="mx_LeftPanel2_userName">{displayName}</span>;
+        let buttons = (
+            <span className="mx_LeftPanel2_headerButtons">
+                <UserMenuButton />
+            </span>
+        );
+        if (this.props.isMinimized) {
+            name = null;
+            buttons = null;
+        }
+
         return (
             <div className="mx_LeftPanel2_userHeader">
                 <div className="mx_LeftPanel2_headerRow">
@@ -125,10 +136,8 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
                             className="mx_LeftPanel2_userAvatar"
                         />
                     </span>
-                    <span className="mx_LeftPanel2_userName">{displayName}</span>
-                    <span className="mx_LeftPanel2_headerButtons">
-                        <UserMenuButton />
-                    </span>
+                    {name}
+                    {buttons}
                 </div>
                 {breadcrumbs}
             </div>
@@ -140,7 +149,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
 
         return (
             <div className="mx_LeftPanel2_filterContainer">
-                <RoomSearch onQueryUpdate={this.onSearch} />
+                <RoomSearch onQueryUpdate={this.onSearch} isMinimized={this.props.isMinimized} />
                 <AccessibleButton
                     tabIndex={-1}
                     className='mx_LeftPanel2_exploreButton'
@@ -166,12 +175,14 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
             searchFilter={this.state.searchFilter}
             onFocus={() => {/*TODO*/}}
             onBlur={() => {/*TODO*/}}
+            isMinimized={this.props.isMinimized}
         />;
 
         // TODO: Conference handling / calls
 
         const containerClasses = classNames({
             "mx_LeftPanel2": true,
+            "mx_LeftPanel2_minimized": this.props.isMinimized,
         });
 
         return (
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 19edf505e0..f37f77b31b 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -677,7 +677,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         if (SettingsStore.isFeatureEnabled("feature_new_room_list")) {
             // TODO: Supply props like collapsed and disabled to LeftPanel2
             leftPanel = (
-                <LeftPanel2 />
+                <LeftPanel2 isMinimized={this.props.collapseLhs || false} />
             );
         }
 
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index ebfb4e6056..345cf83d31 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -35,6 +35,7 @@ import { Action } from "../../dispatcher/actions";
 
 interface IProps {
     onQueryUpdate: (newQuery: string) => void;
+    isMinimized: boolean;
 }
 
 interface IState {
@@ -75,6 +76,10 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
         this.onChange();
     };
 
+    private openSearch = () => {
+        defaultDispatcher.dispatch({action: "show_left_panel"});
+    };
+
     private onChange = () => {
         if (!this.inputRef.current) return;
         this.setState({query: this.inputRef.current.value});
@@ -111,6 +116,7 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
         const classes = classNames({
             'mx_RoomSearch': true,
             'mx_RoomSearch_expanded': this.state.query || this.state.focused,
+            'mx_RoomSearch_minimized': this.props.isMinimized,
         });
 
         const inputClasses = classNames({
@@ -118,26 +124,48 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
             'mx_RoomSearch_inputExpanded': this.state.query || this.state.focused,
         });
 
-        return (
-            <div className={classes}>
-                <div className='mx_RoomSearch_icon'/>
-                <input
-                    type="text"
-                    ref={this.inputRef}
-                    className={inputClasses}
-                    value={this.state.query}
-                    onFocus={this.onFocus}
-                    onBlur={this.onBlur}
-                    onChange={this.onChange}
-                    onKeyDown={this.onKeyDown}
-                    placeholder={_t("Search")}
-                    autoComplete="off"
-                />
+        let icon = (
+            <div className='mx_RoomSearch_icon'/>
+        );
+        let input = (
+            <input
+                type="text"
+                ref={this.inputRef}
+                className={inputClasses}
+                value={this.state.query}
+                onFocus={this.onFocus}
+                onBlur={this.onBlur}
+                onChange={this.onChange}
+                onKeyDown={this.onKeyDown}
+                placeholder={_t("Search")}
+                autoComplete="off"
+            />
+        );
+        let clearButton = (
+            <AccessibleButton
+                tabIndex={-1}
+                className='mx_RoomSearch_clearButton'
+                onClick={this.clearInput}
+            />
+        );
+
+        if (this.props.isMinimized) {
+            icon = (
                 <AccessibleButton
                     tabIndex={-1}
-                    className='mx_RoomSearch_clearButton'
-                    onClick={this.clearInput}
+                    className='mx_RoomSearch_icon'
+                    onClick={this.openSearch}
                 />
+            );
+            input = null;
+            clearButton = null;
+        }
+
+        return (
+            <div className={classes}>
+                {icon}
+                {input}
+                {clearButton}
             </div>
         );
     }
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 42fb829b25..4fdce360c1 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -45,6 +45,7 @@ interface IProps {
     resizeNotifier: ResizeNotifier;
     collapsed: boolean;
     searchFilter: string;
+    isMinimized: boolean;
 }
 
 interface IState {
@@ -200,6 +201,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                     addRoomLabel={aesthetics.addRoomLabel}
                     isInvite={aesthetics.isInvite}
                     layout={this.state.layouts.get(orderedTagId)}
+                    isMinimized={this.props.isMinimized}
                 />
             );
         }
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index fa37eef975..aea5b4ae23 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -47,6 +47,7 @@ interface IProps {
     addRoomLabel: string;
     isInvite: boolean;
     layout: ListLayout;
+    isMinimized: boolean;
 
     // TODO: Collapsed state
     // TODO: Group invites
@@ -135,6 +136,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                         room={room}
                         key={`room-${room.roomId}`}
                         showMessagePreview={this.props.layout.showPreviews}
+                        isMinimized={this.props.isMinimized}
                     />
                 );
             }
@@ -264,6 +266,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
             'mx_RoomSublist2': true,
             'mx_RoomSublist2_collapsed': false, // len && isCollapsed
             'mx_RoomSublist2_hasMenuOpen': this.state.menuDisplayed,
+            'mx_RoomSublist2_minimized': this.props.isMinimized,
         });
 
         let content = null;
@@ -282,14 +285,18 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
             if (tiles.length > nVisible) {
                 // we have a cutoff condition - add the button to show all
                 const numMissing = tiles.length - visibleTiles.length;
+                let showMoreText = (
+                    <span className='mx_RoomSublist2_showMoreButtonText'>
+                        {_t("Show %(count)s more", {count: numMissing})}
+                    </span>
+                );
+                if (this.props.isMinimized) showMoreText = null;
                 showMoreButton = (
                     <div onClick={this.onShowAllClick} className='mx_RoomSublist2_showMoreButton'>
                         <span className='mx_RoomSublist2_showMoreButtonChevron'>
                             {/* set by CSS masking */}
                         </span>
-                        <span className='mx_RoomSublist2_showMoreButtonText'>
-                            {_t("Show %(count)s more", {count: numMissing})}
-                        </span>
+                        {showMoreText}
                     </div>
                 );
             }
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 2b1c418294..10845d3840 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -43,6 +43,7 @@ import { MessagePreviewStore } from "../../../stores/MessagePreviewStore";
 interface IProps {
     room: Room;
     showMessagePreview: boolean;
+    isMinimized: boolean;
 
     // TODO: Allow falsifying counts (for invites and stuff)
     // TODO: Transparency? Was this ever used?
@@ -158,6 +159,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
     };
 
     private renderGeneralMenu(): React.ReactElement {
+        if (this.props.isMinimized) return null; // no menu when minimized
+
         let contextMenu = null;
         if (this.state.generalMenuDisplayed) {
             // The context menu appears within the list, so use the room tile as a reference point
@@ -240,6 +243,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             'mx_RoomTile2': true,
             'mx_RoomTile2_selected': this.state.selected,
             'mx_RoomTile2_hasMenuOpen': this.state.generalMenuDisplayed,
+            'mx_RoomTile2_minimized': this.props.isMinimized,
         });
 
         const badge = <NotificationBadge notification={this.state.notificationState} allowNoCount={true} />;
@@ -253,7 +257,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         // TODO: Tooltip?
 
         let messagePreview = null;
-        if (this.props.showMessagePreview) {
+        if (this.props.showMessagePreview && !this.props.isMinimized) {
             // The preview store heavily caches this info, so should be safe to hammer.
             const text = MessagePreviewStore.instance.getPreviewForRoom(this.props.room);
 
@@ -273,6 +277,16 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             "mx_RoomTile2_nameHasUnreadEvents": this.state.notificationState.color >= NotificationColor.Bold,
         });
 
+        let nameContainer = (
+            <div className="mx_RoomTile2_nameContainer">
+                <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
+                    {name}
+                </div>
+                {messagePreview}
+            </div>
+        );
+        if (this.props.isMinimized) nameContainer = null;
+
         const avatarSize = 32;
         return (
             <React.Fragment>
@@ -291,12 +305,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                             <div className="mx_RoomTile2_avatarContainer">
                                 <RoomAvatar room={this.props.room} width={avatarSize} height={avatarSize}/>
                             </div>
-                            <div className="mx_RoomTile2_nameContainer">
-                                <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
-                                    {name}
-                                </div>
-                                {messagePreview}
-                            </div>
+                            {nameContainer}
                             <div className="mx_RoomTile2_badgeContainer">
                                 {badge}
                             </div>

From 484dc366194f7468dbfd7b1a87979da6715c552b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jun 2020 14:41:35 -0600
Subject: [PATCH 159/181] Fix alignment of show more button

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

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index d1e9c0459c..95a0ba4cc5 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -240,6 +240,8 @@ limitations under the License.
             align-items: center;
 
             .mx_RoomSublist2_showMoreButton {
+                flex-direction: column;
+
                 .mx_RoomSublist2_showMoreButtonChevron {
                     margin-right: 12px; // to center
                 }

From 672c14763c5f4978f9322a6840dd11f8ae5c1409 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 11 Jun 2020 18:57:46 +0000
Subject: [PATCH 160/181] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2280 of 2280 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 | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 896d9e8b24..511dac34ac 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2470,5 +2470,29 @@
     "Address (optional)": "Cím (nem kötelező)",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Törlöd a szoba címét: %(alias)s és eltávolítod a könyvtárból ezt: %(name)s?",
     "delete the address.": "cím törlése.",
-    "Use a different passphrase?": "Másik jelmondat használata?"
+    "Use a different passphrase?": "Másik jelmondat használata?",
+    "sent an image.": "kép elküldve.",
+    "You: %(message)s": "Te: %(message)s",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "A szerver adminisztrátorod alapesetben kikapcsolta a végpontok közötti titkosítást a közvetlen beszélgetésekben.",
+    "Emoji picker": "Emodzsi választó",
+    "No recently visited rooms": "Nincsenek nemrégiben meglátogatott szobák",
+    "People": "Emberek",
+    "Sort by": "Rendezve:",
+    "Unread rooms": "Olvasatlan szobák",
+    "Always show first": "Mindig az elsőt mutatja",
+    "Show": "Mutat",
+    "Message preview": "Üzenet előnézet",
+    "List options": "Lista beállítások",
+    "Show %(count)s more|other": "Még %(count)s megjelenítése",
+    "Show %(count)s more|one": "Még %(count)s megjelenítése",
+    "Leave Room": "Szoba elhagyása",
+    "Room options": "Szoba beállítások",
+    "Switch to light mode": "Világos módra váltás",
+    "Switch to dark mode": "Sötét módra váltás",
+    "Switch theme": "Kinézet váltása",
+    "Security & privacy": "Biztonság és adatvédelem",
+    "All settings": "Minden beállítás",
+    "Archived rooms": "Archivált szobák",
+    "Feedback": "Visszajelzés",
+    "Account settings": "Fiók beállítása"
 }

From 9ab9e560dc6732d5ced8df510641a644a44c2f87 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 11 Jun 2020 18:33:49 +0000
Subject: [PATCH 161/181] Translated using Weblate (Lithuanian)

Currently translated at 72.4% (1650 of 2280 strings)

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

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 3897f74ccc..f739bd5485 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -6,7 +6,7 @@
     "The version of Riot.im": "Riot.im versija",
     "Your language of choice": "Jūsų pasirinkta kalba",
     "Which officially provided instance you are using, if any": "Kurią oficialiai teikiamą instanciją naudojate, jei tokių yra",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Nepriklausomai nuo to ar jūs naudojate Raiškiojo Teksto Redaktoriaus Raiškiojo Teksto režimą",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ar jūs naudojate Raiškiojo Teksto Redaktoriaus Raiškiojo Teksto režimą ar ne",
     "Your homeserver's URL": "Jūsų serverio URL",
     "Your identity server's URL": "Jūsų tapatybės serverio URL",
     "Analytics": "Statistika",
@@ -419,7 +419,7 @@
     "New passwords must match each other.": "Nauji slaptažodžiai privalo sutapti.",
     "I have verified my email address": "Aš patvirtinau savo el. pašto adresą",
     "Return to login screen": "Grįžti į prisijungimą",
-    "Send Reset Email": "Siųsti atstatymo el. laišką",
+    "Send Reset Email": "Siųsti nustatymo iš naujo el. laišką",
     "Incorrect username and/or password.": "Neteisingas vartotojo vardas ir/arba slaptažodis.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Atkreipkite dėmesį, kad jūs jungiatės prie %(hs)s serverio, o ne matrix.org.",
     "Failed to fetch avatar URL": "Nepavyko gauti pseudoportreto URL",
@@ -549,7 +549,7 @@
     "Token incorrect": "Neteisingas prieigos raktas",
     "Sign in with": "Prisijungti naudojant",
     "Sign in": "Prisijungti",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jeigu nenurodysite savo el. pašto adreso, negalėsite atstatyti savo slaptažodį. Ar esate tikri?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jeigu nenurodysite savo el. pašto adreso, negalėsite iš naujo nustatyti savo slaptažodžio. Ar esate tikri?",
     "Please <a>contact your service administrator</a> to continue using the service.": "Norėdami toliau naudotis šia paslauga, <a>susisiekite su savo paslaugos administratoriumi</a>.",
     "Create new room": "Sukurti naują kambarį",
     "No results": "Jokių rezultatų",
@@ -600,7 +600,7 @@
     "This homeserver has exceeded one of its resource limits.": "Šis serveris viršijo vieno iš savo išteklių limitą.",
     "Unable to connect to Homeserver. Retrying...": "Nepavyksta prisijungti prie serverio. Bandoma iš naujo...",
     "Enable widget screenshots on supported widgets": "Įjungti valdiklių ekrano kopijas palaikomuose valdikliuose",
-    "Export E2E room keys": "Eksportuoti E2E kambario raktus",
+    "Export E2E room keys": "Eksportuoti E2E kambarių raktus",
     "Last seen": "Paskutinį kartą matytas",
     "Unignore": "Nebeignoruoti",
     "and %(count)s others...|other": "ir %(count)s kitų...",
@@ -712,7 +712,7 @@
     "This doesn't appear to be a valid email address": "Tai nepanašu į teisingą el. pašto adresą",
     "Unable to add email address": "Nepavyko pridėti el. pašto adreso",
     "Unable to verify email address.": "Nepavyko patvirtinti el. pašto adreso.",
-    "This will allow you to reset your password and receive notifications.": "Tai jums leis atstatyti savo slaptažodį ir gauti pranešimus.",
+    "This will allow you to reset your password and receive notifications.": "Tai jums leis iš naujo nustatyti slaptažodį ir gauti pranešimus.",
     "Skip": "Praleisti",
     "Username not available": "Vartotojo vardas negalimas",
     "Username invalid: %(errMessage)s": "Neteisingas vartotojo vardas: %(errMessage)s",
@@ -750,15 +750,15 @@
     "Retry": "Bandyti dar kartą",
     "Add Email Address": "Pridėti el. pašto adresą",
     "Add Phone Number": "Pridėti telefono numerį",
-    "Whether or not you're logged in (we don't record your username)": "Nepriklausomai nuo to ar jūs prisijungę (mes neįrašome jūsų vartotojo vardo)",
+    "Whether or not you're logged in (we don't record your username)": "Ar jūs prisijungę ar ne (mes neįrašome jūsų vartotojo vardo)",
     "Chat with Riot Bot": "Kalbėtis su Riot Botu",
     "Sign In": "Prisijungti",
     "Explore rooms": "Žvalgyti kambarius",
     "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
     "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo Matrix paskyros %(serverName)s serveryje",
     "Sign in to your Matrix account on <underlinedServerName />": "Prisijunkite prie savo paskyros <underlinedServerName /> serveryje",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Nepriklausomai nuo to ar jūs naudojate 'duonos trupinių' funkciją (pseudoportretai virš kambarių sąrašo)",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kur šis puslapis įtraukia identifikuojamą informaciją, kaip kambarys, vartotojas ar grupės ID, tie duomenys yra pašalinami prieš siunčiant į serverį.",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ar jūs naudojate 'duonos trupinių' funkciją ar ne (pseudoportretai virš kambarių sąrašo)",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ten, kur šis puslapis įtraukia identifikuojamą informaciją, kaip kambarys, vartotojas ar grupės ID, tie duomenys yra pašalinami prieš siunčiant į serverį.",
     "The remote side failed to pick up": "Nuotolinėi pusėi nepavyko atsiliepti",
     "Call failed due to misconfigured server": "Skambutis nepavyko dėl neteisingai sukonfigūruoto serverio",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Paprašykite savo serverio administratoriaus (<code>%(homeserverDomain)s</code>) sukonfiguruoti TURN serverį, kad skambučiai veiktų patikimai.",
@@ -903,7 +903,7 @@
     "General failure": "Bendras triktis",
     "Messages containing my username": "Žinutės, kuriose yra mano vartotojo vardas",
     "Set a new account password...": "Nustatyti naują paskyros slaptažodį...",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Jei jūs pateikėte klaidą per GitHub, derinimo žurnalai (debug logs) gali padėti mums surasti problemą. Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Jei jūs pateikėte pranešimą apie klaidą per GitHub, derinimo žurnalai (debug logs) gali padėti mums surasti problemą. Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (galia %(powerLevelNumber)s)",
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
     "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Jei jūs negalite kažkieno surasti, paklauskite jų vartotojo vardo, pasidalinkite savo vartotojo vardu (%(userId)s) arba <a>profilio nuoroda</a>.",
@@ -916,8 +916,8 @@
     "Confirm": "Patvirtinti",
     "Create your Matrix account on %(serverName)s": "Sukurkite savo Matrix paskyrą %(serverName)s serveryje",
     "Create your Matrix account on <underlinedServerName />": "Sukurkite savo Matrix paskyrą <underlinedServerName /> serveryje",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą ar tel. nr. norėdami pasirinktinai būti aptinkami esamų kontaktų.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą norėdami pasirinktinai būti aptinkami esamų kontaktų.",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros atgavimui. Naudokite el. paštą ar tel. nr. norėdami pasirinktinai būti aptinkami esamų kontaktų.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros atgavimui. Naudokite el. paštą norėdami pasirinktinai būti aptinkami esamų kontaktų.",
     "Sign in instead": "Prisijungti",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Patvirtinimo laiškas bus išsiųstas į jūsų pašto dėžutę tam, kad patvirtintumėte naujo slaptažodžio nustatymą.",
     "Set a new password": "Nustatykite naują slaptažodį",
@@ -1064,7 +1064,7 @@
     "Server Name": "Serverio Pavadinimas",
     "Other servers": "Kiti serveriai",
     "Add room": "Sukurti kambarį",
-    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Slaptažodžio keitimas ištrins visų jūsų seansų šifravimo raktus, todėl nebebus galima perskaityti užšifruotos pokalbių istorijos. Sukurkite atsarginę raktų kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš atstatydami slaptažodį.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Slaptažodžio keitimas iš naujo nustatys visų jūsų seansų šifravimo raktus, todėl užšifruota pokalbių istorija taps neperskaitoma. Sukurkite atsarginę raktų kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš iš naujo nustatydami slaptažodį.",
     "Set a display name:": "Nustatyti rodomą vardą:",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Apsaugokite savo šifravimo raktus slaptafraze. Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio:",
     "Enter a passphrase": "Įveskite slaptafrazę",
@@ -1088,7 +1088,7 @@
     "Back up encrypted message keys": "Padaryti atsargines šifruotų žinučių raktų kopijas",
     "Set up with a recovery key": "Nustatyti su atgavimo raktu",
     "Enter your recovery passphrase a second time to confirm it.": "Įveskite atgavimo slaptafrazę antrą kartą, kad ją patvirtintumėte.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Jūsų atgavimo raktas yra atsarginė saugumo priemonė - jūs galite jį naudoti prieigos prie jūsų šifruotų žinučių atgavimui, jei pamiršite savo atgavimo slaptafrazę.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Jūsų atgavimo raktas yra atsarginė saugumo priemonė - jūs galite jį naudoti prieigos prie jūsų šifruotų žinučių atkūrimui, jei pamiršite savo atgavimo slaptafrazę.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Laikykite šio rakto kopiją saugioje vietoje, pavyzdžiui slaptažodžių tvarkyklėje arba seife.",
     "Your recovery key": "Jūsų atgavimo raktas",
     "Copy": "Kopijuoti",
@@ -1137,12 +1137,12 @@
     "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Įspėjimas</b>: Tai atlikite tik saugiame kompiuteryje.",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Pasiekite savo saugių žinučių istoriją ir kryžminio pasirašymo tapatybę, naudojamą kitų seansų patvirtinimui, įvesdami savo atgavimo slaptafrazę.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujas atgavimo parinktis</button2>",
     "Confirm your identity by entering your account password below.": "Patvirtinkite savo tapatybę žemiau įvesdami savo paskyros slaptažodį.",
     "Use an email address to recover your account": "Naudokite el. pašto adresą, kad prireikus galėtumėte atgauti paskyrą",
     "Passwords don't match": "Slaptažodžiai nesutampa",
     "Use lowercase letters, numbers, dashes and underscores only": "Naudokite tik mažąsias raides, brūkšnelius ir pabraukimus",
-    "Great! This recovery passphrase looks strong enough.": "Puiku! Ši slaptafrazė atrodo pakankamai stipri.",
+    "Great! This recovery passphrase looks strong enough.": "Puiku! Ši atgavimo slaptafrazė atrodo pakankamai stipri.",
     "That matches!": "Tai sutampa!",
     "That doesn't match.": "Tai nesutampa.",
     "Confirm your recovery passphrase": "Patvirtinti atgavimo slaptafrazę",
@@ -1154,7 +1154,7 @@
     "You can now verify your other devices, and other users to keep your chats safe.": "Jūs dabar galite patvirtinti kitus savo įrenginius ir kitus vartotojus, kad jūsų pokalbiai būtų saugūs.",
     "Confirm recovery passphrase": "Patvirtinkite atgavimo slaptafrazę",
     "You're done!": "Atlikta!",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pakeitus slaptažodį šiuo metu, visuose seansuose bus anuliuoti visapusio šifravimo raktai, tad šifruotų pokalbių istorija taps neperskaitoma, nebent jūs eksportuosite savo kambarių raktus ir po to importuosite juos atgal. Ateityje ši funkcija bus pataisyta.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pakeitus slaptažodį šiuo metu, visuose seansuose bus iš naujo nustatyti visapusio šifravimo raktai, tad šifruotų pokalbių istorija taps neperskaitoma, nebent jūs eksportuosite savo kambarių raktus ir po to importuosite juos atgal. Ateityje ši funkcija bus pataisyta.",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsų slaptažodis buvo sėkmingai pakeistas. Jūs kituose seansuose negausite pranešimų, kol iš naujo prie jų neprisijungsite",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "El. laiškas buvo išsiųstas į %(emailAddress)s. Kai paspausite jame esančią nuorodą, tada spauskite žemiau.",
     "Your password has been reset.": "Jūsų slaptažodis buvo iš naujo nustatytas.",
@@ -1285,8 +1285,8 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Jūs vis dar <b>dalijatės savo asmeniniais duomenimis</b> tapatybės serveryje <idserver />.",
     "Identity Server (%(server)s)": "Tapatybės serveris (%(server)s)",
     "Enter a new identity server": "Pridėkite naują tapatybės serverį",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Naudokite integracijų valdiklį <b>(%(serverName)s)</b> botų, valdiklių ir lipdukų valdymui.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Naudokite integracijų valdiklį botų, valdiklių ir lipdukų valdymui.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Naudokite integracijų tvarkytuvą <b>(%(serverName)s)</b> botų, valdiklių ir lipdukų valdymui.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Naudokite integracijų tvarkytuvą botų, valdiklių ir lipdukų valdymui.",
     "Manage integrations": "Valdyti integracijas",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integracijų valdikliai gauna konfigūracijos duomenis ir jūsų vardu gali keisti valdiklius, siųsti kambario pakvietimus ir nustatyti galios lygius.",
     "Invalid theme schema.": "Klaidinga temos schema.",
@@ -1309,19 +1309,19 @@
     "Your theme": "Jūsų tema",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Valdiklio ištrinimas pašalina jį visiems kambaryje esantiems vartotojams. Ar tikrai norite ištrinti šį valdiklį?",
     "Enable 'Manage Integrations' in Settings to do this.": "Įjunkite 'Valdyti integracijas' nustatymuose, kad tai atliktumėte.",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Jūsų Riot neleidžia jums naudoti integracijų valdiklio tam atlikti. Susisiekite su administratoriumi.",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Jūsų Riot neleidžia jums naudoti integracijų tvarkytuvo tam atlikti. Susisiekite su administratoriumi.",
     "Enter phone number (required on this homeserver)": "Įveskite telefono numerį (privaloma šiame serveryje)",
     "Doesn't look like a valid phone number": "Tai nepanašu į veikiantį telefono numerį",
     "Invalid homeserver discovery response": "Klaidingas serverio radimo atsakas",
     "Invalid identity server discovery response": "Klaidingas tapatybės serverio radimo atsakas",
     "The phone number entered looks invalid": "Įvestas telefono numeris atrodo klaidingas",
     "Double check that your server supports the room version chosen and try again.": "Dar kartą įsitikinkite, kad jūsų serveris palaiko pasirinktą kambario versiją ir bandykite iš naujo.",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Nesvarbu, ar naudojate „Riot“ įrenginyje, kuriame pagrindinis įvesties mechanizmas yra lietimas",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Ar naudojate Riot įrenginyje, kuriame pagrindinis įvesties mechanizmas yra lietimas",
     "Session already verified!": "Seansas jau patvirtintas!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ĮSPĖJIMAS: Seansas jau patvirtintas, bet raktai NESUTAMPA!",
     "Enable cross-signing to verify per-user instead of per-session": "Įjunkite kryžminį pasirašymą, kad patvirtintumėte vartotoją, o ne seansą",
     "Enable Emoji suggestions while typing": "Įjungti jaustukų pasiūlymus rašant",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Rodyti priminimą įjungti saugų žinučių atgavimą šifruotuose kambariuose",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Rodyti priminimą įjungti saugių žinučių atgavimą šifruotuose kambariuose",
     "Enable automatic language detection for syntax highlighting": "Įjungti automatinį kalbos aptikimą sintaksės paryškinimui",
     "Enable big emoji in chat": "Įjungti didelius jaustukus pokalbiuose",
     "Enable Community Filter Panel": "Įjungti bendruomenės filtrų skydelį",
@@ -1525,7 +1525,7 @@
     "Jump to start/end of the composer": "Peršokti į rašymo pradžią/pabaigą",
     "Navigate composer history": "Naršyti rašymo istoriją",
     "Navigate up/down in the room list": "Naršyti aukštyn/žemyn kambarių saraše",
-    "Select room from the room list": "Pasirinkite kambarį iš kambarių sąrašo",
+    "Select room from the room list": "Pasirinkti kambarį iš kambarių sąrašo",
     "Collapse room list section": "Sutraukti kambarių sąrašo skyrių",
     "Expand room list section": "Išplėsti kambarių sąrašo skyrių",
     "Clear room list filter field": "Išvalyti kambarių sąrašo filtro lauką",
@@ -1535,12 +1535,12 @@
     "Can't leave Server Notices room": "Negalima išeiti iš Serverio Pranešimų kambario",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Šis kambarys yra naudojamas svarbioms žinutėms iš serverio, todėl jūs negalite jo palikti.",
     "Terms and Conditions": "Taisyklės ir Sąlygos",
-    "Self-verification request": "Savipatvirtinimo užklausa",
+    "Self-verification request": "Savarankiško patvirtinimo užklausa",
     "Logout": "Atsijungti",
     "Reject & Ignore user": "Atmesti ir ignoruoti vartotoją",
     "Reject invitation": "Atmesti pakvietimą",
     "Unable to reject invite": "Nepavyko atmesti pakvietimo",
-    "Whether you're using Riot as an installed Progressive Web App": "Nesvarbu, ar naudojate Riot kaip įdiegtą progresyviąją žiniatinklio programą",
+    "Whether you're using Riot as an installed Progressive Web App": "Ar naudojate Riot kaip įdiegtą progresyviąją žiniatinklio programą",
     "Your user agent": "Jūsų vartotojo agentas",
     "The information being sent to us to help make Riot better includes:": "Informacija, siunčiama mums siekiant pagerinti Riot, yra:",
     "Invite only": "Tik pakviestiems",
@@ -1619,14 +1619,14 @@
     "Your Matrix account on <underlinedServerName />": "Jūsų Matrix paskyra <underlinedServerName /> serveryje",
     "No identity server is configured: add one in server settings to reset your password.": "Nesukonfigūruotas joks tapatybės serveris: pridėkite jį serverio nustatymuose, kad iš naujo nustatytumėte slaptažodį.",
     "Identity server URL does not appear to be a valid identity server": "Tapatybės serverio URL neatrodo kaip tinkamas tapatybės serveris",
-    "Scroll up/down in the timeline": "Slinkite aukštyn/žemyn laiko juostoje",
+    "Scroll up/down in the timeline": "Slinkti aukštyn/žemyn laiko juostoje",
     "Show developer tools": "Rodyti vystytojo įrankius",
     "Low bandwidth mode": "Žemo duomenų pralaidumo režimas",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Siųsti žinučių perskaitymo kvitus (norint išjungti reikalingas suderinamas serveris)",
-    "Keep recovery passphrase in memory for this session": "Šiam seansui atkūrimo slaptafrazę laikyti atmintyje",
+    "Keep recovery passphrase in memory for this session": "Šiam seansui atgavimo slaptafrazę laikyti atmintyje",
     "How fast should messages be downloaded.": "Kaip greitai žinutės turi būti parsiųstos.",
     "Manually verify all remote sessions": "Rankiniu būdu patvirtinti visus nuotolinius seansus",
-    "well formed": "gerai suformuota",
+    "well formed": "gerai suformuotas",
     "unexpected type": "netikėto tipo",
     "in memory": "atmintyje",
     "not found": "nerasta",
@@ -1641,7 +1641,7 @@
     "exists": "yra",
     "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot negali saugiai podėlyje talpinti užšifruotų žinučių, kol veikia interneto naršyklėje. Naudokite <riotLink>Riot Desktop</riotLink>, kad užšifruotos žinutės būtų rodomos paieškos rezultatuose.",
     "This session is backing up your keys. ": "Šis seansas kuria atsargines jūsų raktų kopijas. ",
-    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Šis seansas <b>nekuria atsarginių raktų kopijų</b>, bet jūs jau turite atsarginę kopiją iš kurios galite atstatyti ir pridėti.",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Šis seansas <b>nekuria atsarginių raktų kopijų</b>, bet jūs jau turite atsarginę kopiją iš kurios galite atkurti ir pridėti.",
     "All keys backed up": "Atsarginė kopija sukurta visiems raktams",
     "Backup has a <validity>valid</validity> signature from this user": "Atsarginė kopija turi <validity>galiojantį</validity> šio vartotojo parašą",
     "Backup has a <validity>invalid</validity> signature from this user": "Atsarginė kopija turi <validity>negaliojantį</validity> šio vartotojo parašą",
@@ -1652,15 +1652,100 @@
     "Message search": "Žinučių paieška",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Šio seanso duomenų išvalymas yra negrįžtamas. Šifruotos žinutės bus prarastos, nebent buvo sukurta jų raktų atsarginė kopija.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Trūksta kai kurių seanso duomenų, įskaitant šifruotų žinučių raktus. Atsijunkite ir prisijunkite, kad tai išspręstumėte, atkurdami raktus iš atsarginės kopijos.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atkūrimo slaptafrazę.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atkūrimo raktą.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atgavimo slaptafrazę.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atgavimo raktą.",
     "Restoring keys from backup": "Raktų atkūrimas iš atsarginės kopijos",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Atsarginės kopijos nepavyko iššifruoti naudojant šį atkūrimo raktą: patikrinkite, ar įvedėte teisingą atkūrimo raktą.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Atsarginės kopijos nepavyko iššifruoti naudojant šį atgavimo raktą: patikrinkite, ar įvedėte teisingą atgavimo raktą.",
     "Unable to query secret storage status": "Slaptos saugyklos būsenos užklausa neįmanoma",
     "Unable to set up secret storage": "Neįmanoma nustatyti slaptos saugyklos",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Užšifruotą jūsų raktų kopiją saugosime savo serveryje. Apsaugokite savo atsarginę kopiją naudodami atkūrimo slaptafrazę.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Užšifruotą jūsų raktų kopiją saugosime savo serveryje. Apsaugokite savo atsarginę kopiją naudodami atgavimo slaptafrazę.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Kuriama jūsų raktų atsarginė kopija (pirmas atsarginės kopijos sukūrimas gali užtrukti kelias minutes).",
     "Create key backup": "Sukurti atsarginę raktų kopiją",
     "Unable to create key backup": "Nepavyko sukurti atsarginės raktų kopijos",
-    "Your homeserver does not support session management.": "Jūsų serveris nepalaiko seansų tvarkymo."
+    "Your homeserver does not support session management.": "Jūsų serveris nepalaiko seansų tvarkymo.",
+    "Your homeserver has exceeded its user limit.": "Jūsų serveris pasiekė savo vartotojų limitą.",
+    "Your homeserver has exceeded one of its resource limits.": "Jūsų serveris pasiekė vieną iš savo resursų limitų.",
+    "Never send encrypted messages to unverified sessions from this session": "Niekada iš šio seanso nesiųsti šifruotų žinučių nepatvirtintiems seansams",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Niekada iš šio seanso nesiųsti šifruotų žinučių šiame kambaryje nepatvirtintiems seansams",
+    "Unable to load session list": "Neįmanoma įkelti seansų sąrašo",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Patvirtinkite šių seansų ištrinimą, naudodamiesi Vienu Prisijungimu, kad įrodytumėte savo tapatybę.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Patvirtinkite šio seanso ištrinimą, naudodamiesi Vienu Prisijungimu, kad įrodytumėte savo tapatybę.",
+    "Click the button below to confirm deleting these sessions.|other": "Paspauskite žemiau esantį mygtuką, kad patvirtintumėte šių seansų ištrynimą.",
+    "Click the button below to confirm deleting these sessions.|one": "Paspauskite žemiau esantį mygtuką, kad patvirtintumėte šio seanso ištrynimą.",
+    "Connecting to integration manager...": "Jungiamasi prie integracijų tvarkytuvo...",
+    "Cannot connect to integration manager": "Neįmanoma prisijungti prie integracijų tvarkytuvo",
+    "The integration manager is offline or it cannot reach your homeserver.": "Integracijų tvarkytuvas yra išjungtas arba negali pasiekti jūsų serverio.",
+    "Disconnect": "Atsijungti",
+    "Disconnect anyway": "Vis tiek atsijungti",
+    "Credits": "Padėka",
+    "For help with using Riot, click <a>here</a>.": "Norėdami gauti pagalbos naudojant Riot, paspauskite <a>čia</a>.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Norėdami gauti pagalbos naudojant Riot, paspauskite <a>čia</a> arba pradėkite pokalbį su mūsų botu pasinaudoję žemiau esančiu mygtuku.",
+    "Bug reporting": "Pranešti apie klaidą",
+    "Clear cache and reload": "Išvalyti podėlį ir perkrauti",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Norėdami pranešti apie su Matrix susijusią saugos problemą, perskaitykite Matrix.org <a>Saugumo Atskleidimo Poliiką</a>.",
+    "FAQ": "DUK",
+    "Keyboard Shortcuts": "Spartieji klavišai",
+    "Versions": "Versijos",
+    "Homeserver is": "Serveris yra",
+    "Import E2E room keys": "Importuoti E2E kambarių raktus",
+    "Session ID:": "Seanso ID:",
+    "Session key:": "Seanso raktas:",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot renka anoniminę analizę, kad galėtume patobulinti programą.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatumas mums yra svarbus, todėl mes nerenkame jokių asmeninių ar identifikuojamų duomenų savo analitikai.",
+    "Learn more about how we use analytics.": "Sužinokite daugiau apie tai, kaip mes naudojame analitiką.",
+    "Reset": "Iš naujo nustatyti",
+    "Failed to connect to integration manager": "Nepavyko prisijungti prie integracijų tvarkytuvo",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Naudojimasis šiuo valdikliu gali pasidalinti duomenimis <helpIcon /> su %(widgetDomain)s ir jūsų integracijų tvarkytuvu.",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Prašome <newIssueLink>sukurti naują problemą</newIssueLink> GitHub'e, kad mes galėtume ištirti šią klaidą.",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Pasakyite mums kas nutiko, arba, dar geriau, sukurkite GitHub problemą su jos apibūdinimu.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Prieš pateikiant žurnalus jūs turite <a>sukurti GitHub problemą</a>, kad apibūdintumėte savo problemą.",
+    "GitHub issue": "GitHub problema",
+    "Notes": "Pastabos",
+    "Integrations are disabled": "Integracijos yra išjungtos",
+    "Integrations not allowed": "Integracijos neleidžiamos",
+    "Integration Manager": "Integracijų tvarkytuvas",
+    "This looks like a valid recovery key!": "Tai panašu į galiojantį atgavimo raktą!",
+    "Not a valid recovery key": "Negaliojantis atgavimo raktas",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Jei pamiršote savo atgavimo raktą, galite <button>nustatyti naujas atgavimo parinktis</button>.",
+    "Recovery key mismatch": "Atgavimo rakto neatitikimas",
+    "Incorrect recovery passphrase": "Neteisinga atgavimo slaptafrazė",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Nepavyko iššifruoti atsarginės kopijos naudojant šią atgavimo slaptafrazę: patikrinkite, ar įvedėte teisingą atgavimo slaptafrazę.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Prieikite prie savo saugių žinučių istorijos ir nustatykite saugių žinučių siuntimą, įvesdami atgavimo slaptafrazę.",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Prieikite prie savo saugių žinučių istorijos ir nustatykite saugių žinučių siuntimą, įvesdami atgavimo raktą.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Jei pamiršote savo atgavimo raktą, galite <button>nustatyti naujas atgavimo parinktis</button>",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Susigrąžinkite prieigą prie savo paskyros ir atgaukite šifravimo raktus, saugomus šiame seanse. Be jų jūs negalėsite perskaityti visų savo saugių žinučių bet kuriame seanse.",
+    "Restore": "Atkurti",
+    "Use a different passphrase?": "Naudoti kitą slaptafrazę?",
+    "Repeat your recovery passphrase...": "Pakartokite savo atgavimo slaptafrazę...",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Nenustatę saugių žinučių atgavimo, negalėsite atkurti užšifruotų žinučių istorijos, jei atsijungsite ar naudosite kitą seansą.",
+    "Set up Secure Message Recovery": "Nustatyti saugių žinučių atgavimą",
+    "Secure your backup with a recovery passphrase": "Apsaugokite savo atsarginę kopiją atgavimo slaptafraze",
+    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Nenustatę saugių žinučių atgavimo, atsijungdami jūs prarasite savo saugių žinučių istoriją.",
+    "New Recovery Method": "Naujas atgavimo metodas",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Buvo aptikta nauja atgavimo slaptafrazė ir saugių žinučių raktas.",
+    "This session is encrypting history using the new recovery method.": "Šis seansas šifruoja istoriją naudodamas naują atgavimo metodą.",
+    "Recovery Method Removed": "Atgavimo metodas pašalintas",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ši seansas aptiko, kad buvo pašalinta jūsų atgavimo slaptafrazė ir saugių žinučių raktas.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Jei tai padarėte netyčia, šiame seanse galite nustatyti saugias žinutes, kurios pakartotinai užšifruos šio seanso žinučių istoriją nauju atgavimo metodu.",
+    "Toggle Bold": "Perjungti paryškinimą",
+    "Toggle Italics": "Perjungti kursyvą",
+    "Toggle Quote": "Perjungti citatą",
+    "New line": "Nauja eilutė",
+    "Navigate recent messages to edit": "Naršyti naujausius pranešimus redagavimui",
+    "Cancel replying to a message": "Atšaukti atsakymą į žinutę",
+    "Toggle microphone mute": "Perjungti mikrofono nutildymą",
+    "Toggle video on/off": "Perjungti vaizdo įjungimą/išjungimą",
+    "Dismiss read marker and jump to bottom": "Atsisakyti skaitymo žymeklio ir nušokti į apačią",
+    "Jump to oldest unread message": "Nušokti iki seniausios neperskaitytos žinutės",
+    "Upload a file": "Įkelti failą",
+    "Jump to room search": "Nušokti į kambarių paiešką",
+    "Previous/next unread room or DM": "Ankstesnis/sekantis neperskaitytas kambarys arba tiesioginė žinutė",
+    "Previous/next room or DM": "Ankstesnis/sekantis kambarys arba tiesioginė žinutė",
+    "Toggle the top left menu": "Perjungti viršutinį kairės pusės meniu",
+    "Close dialog or context menu": "Uždaryti dialogą arba kontekstinį meniu",
+    "Activate selected button": "Aktyvuoti pasirinktą mygtuką",
+    "Toggle right panel": "Perjungti dešinį skydelį",
+    "Toggle this dialog": "Perjungti šį dialogą",
+    "Move autocomplete selection up/down": "Perkelti automatinio užbaigimo pasirinkimą aukštyn/žemyn",
+    "Cancel autocomplete": "Atšaukti automatinį užbaigimą"
 }

From 966e2cad7ee1587f3d1118b2645c73ccb674ea6c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jun 2020 16:52:47 -0600
Subject: [PATCH 162/181] Update documentation for how this refactoring will go

---
 src/stores/room-list/README.md          |  43 +++++++++++++++---------
 src/stores/room-list/RoomListStore2.png | Bin 0 -> 76264 bytes
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 src/stores/room-list/RoomListStore2.png

diff --git a/src/stores/room-list/README.md b/src/stores/room-list/README.md
index ba34691d34..4608570ae9 100644
--- a/src/stores/room-list/README.md
+++ b/src/stores/room-list/README.md
@@ -2,20 +2,31 @@
 
 It's so complicated it needs its own README.
 
+![](./RoomListStore2.png)
+
+Legend:
+* Orange = External event.
+* Purple = Deterministic flow. 
+* Green = Algorithm definition.
+* Red = Exit condition/point.
+* Blue = Process definition.
+
 ## Algorithms involved
 
 There's two main kinds of algorithms involved in the room list store: list ordering and tag sorting.
 Throughout the code an intentional decision has been made to call them the List Algorithm and Sorting
-Algorithm respectively. The list algorithm determines the behaviour of the room list whereas the sorting
-algorithm determines how rooms get ordered within tags affected by the list algorithm.
+Algorithm respectively. The list algorithm determines the primary ordering of a given tag whereas the
+tag sorting defines how rooms within that tag get sorted, at the discretion of the list ordering.
+
+Behaviour of the overall room list (sticky rooms, etc) are determined by the generically-named Algorithm
+class. Here is where much of the coordination from the room list store is done to figure out which list
+algorithm to call, instead of having all the logic in the room list store itself.
 
-Behaviour of the room list takes the shape of determining what features the room list supports, as well
-as determining where and when to apply the sorting algorithm in a tag. The importance algorithm, which
-is described later in this doc, is an example of an algorithm which makes heavy behavioural changes
-to the room list.
 
 Tag sorting is effectively the comparator supplied to the list algorithm. This gives the list algorithm
-the power to decide when and how to apply the tag sorting, if at all.
+the power to decide when and how to apply the tag sorting, if at all. For example, The importance algorithm, 
+later described in this document, heavily uses the list ordering behaviour to break the tag into categories. 
+Each category then gets sorted by the appropriate tag sorting algorithm.
 
 ### Tag sorting algorithm: Alphabetical
 
@@ -70,11 +81,11 @@ Conveniently, each tag gets ordered by those categories as presented: red rooms
 above bold, etc.
 
 Once the algorithm has determined which rooms belong in which categories, the tag sorting algorithm
-gets applied to each category in a sub-sub-list fashion. This should result in the red rooms (for example)
+gets applied to each category in a sub-list fashion. This should result in the red rooms (for example)
 being sorted alphabetically amongst each other as well as the grey rooms sorted amongst each other, but 
 collectively the tag will be sorted into categories with red being at the top.
 
-### Sticky rooms
+## Sticky rooms
 
 When the user visits a room, that room becomes 'sticky' in the list, regardless of ordering algorithm.
 From a code perspective, the underlying algorithm is not aware of a sticky room and instead the base class
@@ -128,13 +139,13 @@ maintain the caching behaviour described above.
 
 ## Class breakdowns
 
-The `RoomListStore` is the major coordinator of various `Algorithm` implementations, which take care 
-of the various `ListAlgorithm` and `SortingAlgorithm` options. The `Algorithm` superclass is also 
-responsible for figuring out which tags get which rooms, as Matrix specifies them as a reverse map: 
-tags get defined on rooms and are not defined as a collection of rooms (unlike how they are presented 
-to the user). Various list-specific utilities are also included, though they are expected to move 
-somewhere more general when needed. For example, the `membership` utilities could easily be moved 
-elsewhere as needed.
+The `RoomListStore` is the major coordinator of various algorithm implementations, which take care 
+of the various `ListAlgorithm` and `SortingAlgorithm` options. The `Algorithm` class is responsible 
+for figuring out which tags get which rooms, as Matrix specifies them as a reverse map: tags get 
+defined on rooms and are not defined as a collection of rooms (unlike how they are presented to the 
+user). Various list-specific utilities are also included, though they are expected to move somewhere 
+more general when needed. For example, the `membership` utilities could easily be moved elsewhere 
+as needed.
 
 The various bits throughout the room list store should also have jsdoc of some kind to help describe
 what they do and how they work.
diff --git a/src/stores/room-list/RoomListStore2.png b/src/stores/room-list/RoomListStore2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9952d1c910f15eb2e8aebbe02b627204dc12d126
GIT binary patch
literal 76264
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

literal 0
HcmV?d00001


From 52b26deb2e281ac57f22d7054233b3c28c8688b8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jun 2020 16:56:12 -0600
Subject: [PATCH 163/181] Move room list store docs to docs directory

This pulls it away from the code, but the code is sufficiently involved enough where it doesn't need another file near it.
---
 .../room-list => docs/img}/RoomListStore2.png       | Bin
 .../room-list/README.md => docs/room-list-store.md  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {src/stores/room-list => docs/img}/RoomListStore2.png (100%)
 rename src/stores/room-list/README.md => docs/room-list-store.md (99%)

diff --git a/src/stores/room-list/RoomListStore2.png b/docs/img/RoomListStore2.png
similarity index 100%
rename from src/stores/room-list/RoomListStore2.png
rename to docs/img/RoomListStore2.png
diff --git a/src/stores/room-list/README.md b/docs/room-list-store.md
similarity index 99%
rename from src/stores/room-list/README.md
rename to docs/room-list-store.md
index 4608570ae9..82c83d3593 100644
--- a/src/stores/room-list/README.md
+++ b/docs/room-list-store.md
@@ -2,7 +2,7 @@
 
 It's so complicated it needs its own README.
 
-![](./RoomListStore2.png)
+![](img/RoomListStore2.png)
 
 Legend:
 * Orange = External event.

From fd029e8e8021cdf475d95ed13f65058900695d82 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jun 2020 21:24:25 -0600
Subject: [PATCH 164/181] Dumb down list algorithms in favour of smarter tags

This commit is a bit involved, as it factors the tag specific handling out of `/list-ordering` (and moves the `Algorithm` class one higher as a result), leaving it in the `Algorithm`. The algorithms for list ordering now only know how to handle a single tag, and this is managed by the `Algorithm` class - which is also no longer the base class for the list ordering. The list ordering algorithms now inherit from a generic `OrderingAlgorithm` base class which handles some rudimentary things.

Overall the logic hasn't changed much: the tag-specific stuff has been moved into the `Algorithm`, and the list ordering algorithms essentially just removed the iteration on tags. The `RoomListStore2` still shovels a bunch of information over to the `Algorithm`, which can lead to an awkward code flow however this commit is meant to keep the number of surfaces touched to a minimum.

The RoomListStore has also gained the ability to set per-list (tag) ordering and sorting, which is required for the new room list. The assumption that it defaults from the account-level settings is not reviewed by design, yet. This decision is deferred.
---
 src/stores/room-list/RoomListStore2.ts        |  98 +++++---
 .../{list-ordering => }/Algorithm.ts          | 153 ++++++++++---
 .../list-ordering/ImportanceAlgorithm.ts      | 210 +++++++-----------
 .../list-ordering/NaturalAlgorithm.ts         |  43 ++--
 .../list-ordering/OrderingAlgorithm.ts        |  72 ++++++
 .../algorithms/list-ordering/index.ts         |  21 +-
 src/stores/room-list/algorithms/models.ts     |  11 +
 7 files changed, 374 insertions(+), 234 deletions(-)
 rename src/stores/room-list/algorithms/{list-ordering => }/Algorithm.ts (76%)
 create mode 100644 src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts

diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 63a06dcf81..1c4e66c4b0 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -17,25 +17,21 @@ limitations under the License.
 
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import SettingsStore from "../../settings/SettingsStore";
-import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
-import { Algorithm, LIST_UPDATED_EVENT } from "./algorithms/list-ordering/Algorithm";
+import { OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
 import TagOrderStore from "../TagOrderStore";
 import { AsyncStore } from "../AsyncStore";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
-import { getListAlgorithmInstance } from "./algorithms/list-ordering";
+import { IListOrderingMap, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
 import { ActionPayload } from "../../dispatcher/payloads";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { IFilterCondition } from "./filters/IFilterCondition";
 import { TagWatcher } from "./TagWatcher";
 import RoomViewStore from "../RoomViewStore";
+import { Algorithm, LIST_UPDATED_EVENT } from "./algorithms/Algorithm";
 
 interface IState {
     tagsEnabled?: boolean;
-
-    preferredSort?: SortAlgorithm;
-    preferredAlgorithm?: ListAlgorithm;
 }
 
 /**
@@ -48,7 +44,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
     private _matrixClient: MatrixClient;
     private initialListsGenerated = false;
     private enabled = false;
-    private algorithm: Algorithm;
+    private algorithm = new Algorithm();
     private filterConditions: IFilterCondition[] = [];
     private tagWatcher = new TagWatcher(this);
 
@@ -64,6 +60,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
         this.checkEnabled();
         for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
         RoomViewStore.addListener(this.onRVSUpdate);
+        this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
     }
 
     public get orderedLists(): ITagMap {
@@ -85,14 +82,10 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
 
     private async readAndCacheSettingsFromStore() {
         const tagsEnabled = SettingsStore.isFeatureEnabled("feature_custom_tags");
-        const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
-        const orderAlphabetically = SettingsStore.getValue("RoomList.orderAlphabetically");
         await this.updateState({
             tagsEnabled,
-            preferredSort: orderAlphabetically ? SortAlgorithm.Alphabetic : SortAlgorithm.Recent,
-            preferredAlgorithm: orderByImportance ? ListAlgorithm.Importance : ListAlgorithm.Natural,
         });
-        this.setAlgorithmClass();
+        await this.updateAlgorithmInstances();
     }
 
     private onRVSUpdate = () => {
@@ -259,17 +252,57 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
         }
     }
 
-    private getSortAlgorithmFor(tagId: TagID): SortAlgorithm {
-        switch (tagId) {
-            case DefaultTagID.Invite:
-            case DefaultTagID.Untagged:
-            case DefaultTagID.Archived:
-            case DefaultTagID.LowPriority:
-            case DefaultTagID.DM:
-                return this.state.preferredSort;
-            case DefaultTagID.Favourite:
-            default:
-                return SortAlgorithm.Manual;
+    public async setTagSorting(tagId: TagID, sort: SortAlgorithm) {
+        await this.algorithm.setTagSorting(tagId, sort);
+        localStorage.setItem(`mx_tagSort_${tagId}`, sort);
+    }
+
+    public getTagSorting(tagId: TagID): SortAlgorithm {
+        return this.algorithm.getTagSorting(tagId);
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private getStoredTagSorting(tagId: TagID): SortAlgorithm {
+        return <SortAlgorithm>localStorage.getItem(`mx_tagSort_${tagId}`);
+    }
+
+    public async setListOrder(tagId: TagID, order: ListAlgorithm) {
+        await this.algorithm.setListOrdering(tagId, order);
+        localStorage.setItem(`mx_listOrder_${tagId}`, order);
+    }
+
+    public getListOrder(tagId: TagID): ListAlgorithm {
+        return this.algorithm.getListOrdering(tagId);
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private getStoredListOrder(tagId: TagID): ListAlgorithm {
+        return <ListAlgorithm>localStorage.getItem(`mx_listOrder_${tagId}`);
+    }
+
+    private async updateAlgorithmInstances() {
+        const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
+        const orderAlphabetically = SettingsStore.getValue("RoomList.orderAlphabetically");
+
+        const defaultSort = orderAlphabetically ? SortAlgorithm.Alphabetic : SortAlgorithm.Recent;
+        const defaultOrder = orderByImportance ? ListAlgorithm.Importance : ListAlgorithm.Natural;
+
+        for (const tag of Object.keys(this.orderedLists)) {
+            const definedSort = this.getTagSorting(tag);
+            const definedOrder = this.getListOrder(tag);
+
+            const storedSort = this.getStoredTagSorting(tag);
+            const storedOrder = this.getStoredListOrder(tag);
+
+            const tagSort = storedSort ? storedSort : (definedSort ? definedSort : defaultSort);
+            const listOrder = storedOrder ? storedOrder : (definedOrder ? definedOrder : defaultOrder);
+
+            if (tagSort !== definedSort) {
+                await this.setTagSorting(tag, tagSort);
+            }
+            if (listOrder !== definedOrder) {
+                await this.setListOrder(tag, listOrder);
+            }
         }
     }
 
@@ -279,15 +312,6 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
         await super.updateState(newState);
     }
 
-    private setAlgorithmClass() {
-        if (this.algorithm) {
-            this.algorithm.off(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
-        }
-        this.algorithm = getListAlgorithmInstance(this.state.preferredAlgorithm);
-        this.algorithm.setFilterConditions(this.filterConditions);
-        this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
-    }
-
     private onAlgorithmListUpdated = () => {
         console.log("Underlying algorithm has triggered a list update - refiring");
         this.emit(LISTS_UPDATE_EVENT, this);
@@ -296,9 +320,11 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
     private async regenerateAllLists() {
         console.warn("Regenerating all room lists");
 
-        const tags: ITagSortingMap = {};
+        const sorts: ITagSortingMap = {};
+        const orders: IListOrderingMap = {};
         for (const tagId of OrderedDefaultTagIDs) {
-            tags[tagId] = this.getSortAlgorithmFor(tagId);
+            sorts[tagId] = this.getStoredTagSorting(tagId) || SortAlgorithm.Alphabetic;
+            orders[tagId] = this.getStoredListOrder(tagId) || ListAlgorithm.Natural;
         }
 
         if (this.state.tagsEnabled) {
@@ -307,7 +333,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
             console.log("rtags", roomTags);
         }
 
-        await this.algorithm.populateTags(tags);
+        await this.algorithm.populateTags(sorts, orders);
         await this.algorithm.setKnownRooms(this.matrixClient.getRooms());
 
         this.initialListsGenerated = true;
diff --git a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
similarity index 76%
rename from src/stores/room-list/algorithms/list-ordering/Algorithm.ts
rename to src/stores/room-list/algorithms/Algorithm.ts
index a8512c0bd6..438ef78e7e 100644
--- a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -14,17 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { DefaultTagID, RoomUpdateCause, TagID } from "../../models";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
-import { EffectiveMembership, splitRoomsByMembership } from "../../membership";
-import { ITagMap, ITagSortingMap } from "../models";
-import DMRoomMap from "../../../../utils/DMRoomMap";
-import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "../../filters/IFilterCondition";
+import DMRoomMap from "../../../utils/DMRoomMap";
 import { EventEmitter } from "events";
-import { UPDATE_EVENT } from "../../../AsyncStore";
-import { ArrayUtil } from "../../../../utils/arrays";
-import { getEnumValues } from "../../../../utils/enums";
+import { arrayHasDiff, ArrayUtil } from "../../../utils/arrays";
+import { getEnumValues } from "../../../utils/enums";
+import { DefaultTagID, RoomUpdateCause, TagID } from "../models";
+import {
+    IListOrderingMap,
+    IOrderingAlgorithmMap,
+    ITagMap,
+    ITagSortingMap,
+    ListAlgorithm,
+    SortAlgorithm
+} from "./models";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "../filters/IFilterCondition";
+import { EffectiveMembership, splitRoomsByMembership } from "../membership";
+import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
+import { getListAlgorithmInstance } from "./list-ordering";
 
 // TODO: Add locking support to avoid concurrent writes?
 
@@ -44,21 +52,22 @@ interface IStickyRoom {
  * management (which rooms go in which tags) and ask the implementation to
  * deal with ordering mechanics.
  */
-export abstract class Algorithm extends EventEmitter {
+export class Algorithm extends EventEmitter {
     private _cachedRooms: ITagMap = {};
     private _cachedStickyRooms: ITagMap = {}; // a clone of the _cachedRooms, with the sticky room
     private filteredRooms: ITagMap = {};
     private _stickyRoom: IStickyRoom = null;
-
-    protected sortAlgorithms: ITagSortingMap;
-    protected rooms: Room[] = [];
-    protected roomIdsToTags: {
+    private sortAlgorithms: ITagSortingMap;
+    private listAlgorithms: IListOrderingMap;
+    private algorithms: IOrderingAlgorithmMap;
+    private rooms: Room[] = [];
+    private roomIdsToTags: {
         [roomId: string]: TagID[];
     } = {};
-    protected allowedByFilter: Map<IFilterCondition, Room[]> = new Map<IFilterCondition, Room[]>();
-    protected allowedRoomsByFilters: Set<Room> = new Set<Room>();
+    private allowedByFilter: Map<IFilterCondition, Room[]> = new Map<IFilterCondition, Room[]>();
+    private allowedRoomsByFilters: Set<Room> = new Set<Room>();
 
-    protected constructor() {
+    public constructor() {
         super();
     }
 
@@ -68,6 +77,7 @@ export abstract class Algorithm extends EventEmitter {
 
     public set stickyRoom(val: Room) {
         // setters can't be async, so we call a private function to do the work
+        // noinspection JSIgnoredPromiseFromCall
         this.updateStickyRoom(val);
     }
 
@@ -89,14 +99,38 @@ export abstract class Algorithm extends EventEmitter {
         return this._cachedRooms;
     }
 
-    /**
-     * Sets the filter conditions the Algorithm should use.
-     * @param filterConditions The filter conditions to use.
-     */
-    public setFilterConditions(filterConditions: IFilterCondition[]): void {
-        for (const filter of filterConditions) {
-            this.addFilterCondition(filter);
-        }
+    public getTagSorting(tagId: TagID): SortAlgorithm {
+        return this.sortAlgorithms[tagId];
+    }
+
+    public async setTagSorting(tagId: TagID, sort: SortAlgorithm) {
+        if (!tagId) throw new Error("Tag ID must be defined");
+        if (!sort) throw new Error("Algorithm must be defined");
+        this.sortAlgorithms[tagId] = sort;
+
+        const algorithm: OrderingAlgorithm = this.algorithms[tagId];
+        await algorithm.setSortAlgorithm(sort);
+        this._cachedRooms[tagId] = algorithm.orderedRooms;
+        this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
+        this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
+    }
+
+    public getListOrdering(tagId: TagID): ListAlgorithm {
+        return this.listAlgorithms[tagId];
+    }
+
+    public async setListOrdering(tagId: TagID, order: ListAlgorithm) {
+        if (!tagId) throw new Error("Tag ID must be defined");
+        if (!order) throw new Error("Algorithm must be defined");
+        this.listAlgorithms[tagId] = order;
+
+        const algorithm = getListAlgorithmInstance(order, tagId, this.sortAlgorithms[tagId]);
+        this.algorithms[tagId] = algorithm;
+
+        await algorithm.setRooms(this._cachedRooms[tagId])
+        this._cachedRooms[tagId] = algorithm.orderedRooms;
+        this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
+        this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
     }
 
     public addFilterCondition(filterCondition: IFilterCondition): void {
@@ -310,11 +344,21 @@ export abstract class Algorithm extends EventEmitter {
      * as reference for which lists to generate and which way to generate
      * them.
      * @param {ITagSortingMap} tagSortingMap The tags to generate.
+     * @param {IListOrderingMap} listOrderingMap The ordering of those tags.
      * @returns {Promise<*>} A promise which resolves when complete.
      */
-    public async populateTags(tagSortingMap: ITagSortingMap): Promise<any> {
-        if (!tagSortingMap) throw new Error(`Map cannot be null or empty`);
+    public async populateTags(tagSortingMap: ITagSortingMap, listOrderingMap: IListOrderingMap): Promise<any> {
+        if (!tagSortingMap) throw new Error(`Sorting map cannot be null or empty`);
+        if (!listOrderingMap) throw new Error(`Ordering ma cannot be null or empty`);
+        if (arrayHasDiff(Object.keys(tagSortingMap), Object.keys(listOrderingMap))) {
+            throw new Error(`Both maps must contain the exact same tags`);
+        }
         this.sortAlgorithms = tagSortingMap;
+        this.listAlgorithms = listOrderingMap;
+        this.algorithms = {};
+        for (const tag of Object.keys(tagSortingMap)) {
+            this.algorithms[tag] = getListAlgorithmInstance(this.listAlgorithms[tag], tag, this.sortAlgorithms[tag]);
+        }
         return this.setKnownRooms(this.rooms);
     }
 
@@ -428,7 +472,17 @@ export abstract class Algorithm extends EventEmitter {
      * be mutated in place.
      * @returns {Promise<*>} A promise which resolves when complete.
      */
-    protected abstract generateFreshTags(updatedTagMap: ITagMap): Promise<any>;
+    private async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
+        if (!this.algorithms) throw new Error("Not ready: no algorithms to determine tags from");
+
+        for (const tag of Object.keys(updatedTagMap)) {
+            const algorithm: OrderingAlgorithm = this.algorithms[tag];
+            if (!algorithm) throw new Error(`No algorithm for ${tag}`);
+
+            await algorithm.setRooms(updatedTagMap[tag]);
+            updatedTagMap[tag] = algorithm.orderedRooms;
+        }
+    }
 
     /**
      * Asks the Algorithm to update its knowledge of a room. For example, when
@@ -441,5 +495,48 @@ export abstract class Algorithm extends EventEmitter {
      * depending on whether or not getOrderedRooms() should be called after
      * processing.
      */
-    public abstract handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean>;
+    public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+        if (!this.algorithms) throw new Error("Not ready: no algorithms to determine tags from");
+
+        if (cause === RoomUpdateCause.PossibleTagChange) {
+            // TODO: Be smarter and splice rather than regen the planet.
+            // TODO: No-op if no change.
+            await this.setKnownRooms(this.rooms);
+            return true;
+        }
+
+        if (cause === RoomUpdateCause.NewRoom) {
+            // TODO: Be smarter and insert rather than regen the planet.
+            await this.setKnownRooms([room, ...this.rooms]);
+            return;
+        }
+
+        if (cause === RoomUpdateCause.RoomRemoved) {
+            // TODO: Be smarter and splice rather than regen the planet.
+            await this.setKnownRooms(this.rooms.filter(r => r !== room));
+            return true;
+        }
+
+        let tags = this.roomIdsToTags[room.roomId];
+        if (!tags) {
+            console.warn(`No tags known for "${room.name}" (${room.roomId})`);
+            return false;
+        }
+
+        let changed = false;
+        for (const tag of tags) {
+            const algorithm: OrderingAlgorithm = this.algorithms[tag];
+            if (!algorithm) throw new Error(`No algorithm for ${tag}`);
+
+            await algorithm.handleRoomUpdate(room, cause);
+            this.cachedRooms[tag] = algorithm.orderedRooms;
+
+            // Flag that we've done something
+            this.recalculateFilteredRoomsForTag(tag); // update filter to re-sort the list
+            this.recalculateStickyRoom(tag); // update sticky room to make sure it appears if needed
+            changed = true;
+        }
+
+        return true;
+    };
 }
diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
index 7cbcc504c2..2e24cb23f1 100644
--- a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Algorithm } from "./Algorithm";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomUpdateCause, TagID } from "../../models";
-import { ITagMap, SortAlgorithm } from "../models";
+import { SortAlgorithm } from "../models";
 import { sortRoomsWithAlgorithm } from "../tag-sorting";
 import * as Unread from '../../../../Unread';
+import { OrderingAlgorithm } from "./OrderingAlgorithm";
 
 /**
  * The determined category of a room.
@@ -77,32 +77,16 @@ const CATEGORY_ORDER = [Category.Red, Category.Grey, Category.Bold, Category.Idl
  * within the same category. For more information, see the comments contained
  * within the class.
  */
-export class ImportanceAlgorithm extends Algorithm {
+export class ImportanceAlgorithm extends OrderingAlgorithm {
+    // This tracks the category for the tag it represents by tracking the index of
+    // each category within the list, where zero is the top of the list. This then
+    // tracks when rooms change categories and splices the orderedRooms array as
+    // needed, preventing many ordering operations.
 
-    // HOW THIS WORKS
-    // --------------
-    //
-    // This block of comments assumes you've read the README two levels higher.
-    // You should do that if you haven't already.
-    //
-    // Tags are fed into the algorithmic functions from the Algorithm superclass,
-    // which cause subsequent updates to the room list itself. Categories within
-    // those tags are tracked as index numbers within the array (zero = top), with
-    // each sticky room being tracked separately. Internally, the category index
-    // can be found from `this.indices[tag][category]`.
-    //
-    // The room list store is always provided with the `this.cachedRooms` results, which are
-    // updated as needed and not recalculated often. For example, when a room needs to
-    // move within a tag, the array in `this.cachedRooms` will be spliced instead of iterated.
-    // The `indices` help track the positions of each category to make splicing easier.
+    private indices: ICategoryIndex = {};
 
-    private indices: {
-        // @ts-ignore - TS wants this to be a string but we know better than it
-        [tag: TagID]: ICategoryIndex;
-    } = {};
-
-    constructor() {
-        super();
+    public constructor(tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
+        super(tagId, initialSortingAlgorithm);
         console.log("Constructed an ImportanceAlgorithm");
     }
 
@@ -143,122 +127,81 @@ export class ImportanceAlgorithm extends Algorithm {
         return Category.Idle;
     }
 
-    protected async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
-        for (const tagId of Object.keys(updatedTagMap)) {
-            const unorderedRooms = updatedTagMap[tagId];
-
-            const sortBy = this.sortAlgorithms[tagId];
-            if (!sortBy) throw new Error(`${tagId} does not have a sorting algorithm`);
-
-            if (sortBy === SortAlgorithm.Manual) {
-                // Manual tags essentially ignore the importance algorithm, so don't do anything
-                // special about them.
-                updatedTagMap[tagId] = await sortRoomsWithAlgorithm(unorderedRooms, tagId, sortBy);
-            } else {
-                // Every other sorting type affects the categories, not the whole tag.
-                const categorized = this.categorizeRooms(unorderedRooms);
-                for (const category of Object.keys(categorized)) {
-                    const roomsToOrder = categorized[category];
-                    categorized[category] = await sortRoomsWithAlgorithm(roomsToOrder, tagId, sortBy);
-                }
-
-                const newlyOrganized: Room[] = [];
-                const newIndices: ICategoryIndex = {};
-
-                for (const category of CATEGORY_ORDER) {
-                    newIndices[category] = newlyOrganized.length;
-                    newlyOrganized.push(...categorized[category]);
-                }
-
-                this.indices[tagId] = newIndices;
-                updatedTagMap[tagId] = newlyOrganized;
+    public async setRooms(rooms: Room[]): Promise<any> {
+        if (this.sortingAlgorithm === SortAlgorithm.Manual) {
+            this.cachedOrderedRooms = await sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
+        } else {
+            // Every other sorting type affects the categories, not the whole tag.
+            const categorized = this.categorizeRooms(rooms);
+            for (const category of Object.keys(categorized)) {
+                const roomsToOrder = categorized[category];
+                categorized[category] = await sortRoomsWithAlgorithm(roomsToOrder, this.tagId, this.sortingAlgorithm);
             }
+
+            const newlyOrganized: Room[] = [];
+            const newIndices: ICategoryIndex = {};
+
+            for (const category of CATEGORY_ORDER) {
+                newIndices[category] = newlyOrganized.length;
+                newlyOrganized.push(...categorized[category]);
+            }
+
+            this.indices = newIndices;
+            this.cachedOrderedRooms = newlyOrganized;
         }
     }
 
     public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
-        if (cause === RoomUpdateCause.PossibleTagChange) {
-            // TODO: Be smarter and splice rather than regen the planet.
-            // TODO: No-op if no change.
-            await this.setKnownRooms(this.rooms);
-            return;
-        }
-
-        if (cause === RoomUpdateCause.NewRoom) {
-            // TODO: Be smarter and insert rather than regen the planet.
-            await this.setKnownRooms([room, ...this.rooms]);
-            return;
-        }
-
-        if (cause === RoomUpdateCause.RoomRemoved) {
-            // TODO: Be smarter and splice rather than regen the planet.
-            await this.setKnownRooms(this.rooms.filter(r => r !== room));
-            return;
-        }
-
-        let tags = this.roomIdsToTags[room.roomId];
-        if (!tags) {
-            console.warn(`No tags known for "${room.name}" (${room.roomId})`);
-            return false;
-        }
         const category = this.getRoomCategory(room);
-        let changed = false;
-        for (const tag of tags) {
-            if (this.sortAlgorithms[tag] === SortAlgorithm.Manual) {
-                continue; // Nothing to do here.
-            }
-
-            const taggedRooms = this.cachedRooms[tag];
-            const indices = this.indices[tag];
-            let roomIdx = taggedRooms.indexOf(room);
-            if (roomIdx === -1) {
-                console.warn(`Degrading performance to find missing room in "${tag}": ${room.roomId}`);
-                roomIdx = taggedRooms.findIndex(r => r.roomId === room.roomId);
-            }
-            if (roomIdx === -1) {
-                throw new Error(`Room ${room.roomId} has no index in ${tag}`);
-            }
-
-            // Try to avoid doing array operations if we don't have to: only move rooms within
-            // the categories if we're jumping categories
-            const oldCategory = this.getCategoryFromIndices(roomIdx, indices);
-            if (oldCategory !== category) {
-                // Move the room and update the indices
-                this.moveRoomIndexes(1, oldCategory, category, indices);
-                taggedRooms.splice(roomIdx, 1); // splice out the old index (fixed position)
-                taggedRooms.splice(indices[category], 0, room); // splice in the new room (pre-adjusted)
-                // Note: if moveRoomIndexes() is called after the splice then the insert operation
-                // will happen in the wrong place. Because we would have already adjusted the index
-                // for the category, we don't need to determine how the room is moving in the list.
-                // If we instead tried to insert before updating the indices, we'd have to determine
-                // whether the room was moving later (towards IDLE) or earlier (towards RED) from its
-                // current position, as it'll affect the category's start index after we remove the
-                // room from the array.
-            }
-
-            // The room received an update, so take out the slice and sort it. This should be relatively
-            // quick because the room is inserted at the top of the category, and most popular sorting
-            // algorithms will deal with trying to keep the active room at the top/start of the category.
-            // For the few algorithms that will have to move the thing quite far (alphabetic with a Z room
-            // for example), the list should already be sorted well enough that it can rip through the
-            // array and slot the changed room in quickly.
-            const nextCategoryStartIdx = category === CATEGORY_ORDER[CATEGORY_ORDER.length - 1]
-                ? Number.MAX_SAFE_INTEGER
-                : indices[CATEGORY_ORDER[CATEGORY_ORDER.indexOf(category) + 1]];
-            const startIdx = indices[category];
-            const numSort = nextCategoryStartIdx - startIdx; // splice() returns up to the max, so MAX_SAFE_INT is fine
-            const unsortedSlice = taggedRooms.splice(startIdx, numSort);
-            const sorted = await sortRoomsWithAlgorithm(unsortedSlice, tag, this.sortAlgorithms[tag]);
-            taggedRooms.splice(startIdx, 0, ...sorted);
-
-            // Finally, flag that we've done something
-            this.recalculateFilteredRoomsForTag(tag); // update filter to re-sort the list
-            this.recalculateStickyRoom(tag); // update sticky room to make sure it appears if needed
-            changed = true;
+        if (this.sortingAlgorithm === SortAlgorithm.Manual) {
+            return; // Nothing to do here.
         }
-        return changed;
+
+        let roomIdx = this.cachedOrderedRooms.indexOf(room);
+        if (roomIdx === -1) { // can only happen if the js-sdk's store goes sideways.
+            console.warn(`Degrading performance to find missing room in "${this.tagId}": ${room.roomId}`);
+            roomIdx = this.cachedOrderedRooms.findIndex(r => r.roomId === room.roomId);
+        }
+        if (roomIdx === -1) {
+            throw new Error(`Room ${room.roomId} has no index in ${this.tagId}`);
+        }
+
+        // Try to avoid doing array operations if we don't have to: only move rooms within
+        // the categories if we're jumping categories
+        const oldCategory = this.getCategoryFromIndices(roomIdx, this.indices);
+        if (oldCategory !== category) {
+            // Move the room and update the indices
+            this.moveRoomIndexes(1, oldCategory, category, this.indices);
+            this.cachedOrderedRooms.splice(roomIdx, 1); // splice out the old index (fixed position)
+            this.cachedOrderedRooms.splice(this.indices[category], 0, room); // splice in the new room (pre-adjusted)
+            // Note: if moveRoomIndexes() is called after the splice then the insert operation
+            // will happen in the wrong place. Because we would have already adjusted the index
+            // for the category, we don't need to determine how the room is moving in the list.
+            // If we instead tried to insert before updating the indices, we'd have to determine
+            // whether the room was moving later (towards IDLE) or earlier (towards RED) from its
+            // current position, as it'll affect the category's start index after we remove the
+            // room from the array.
+        }
+
+        // The room received an update, so take out the slice and sort it. This should be relatively
+        // quick because the room is inserted at the top of the category, and most popular sorting
+        // algorithms will deal with trying to keep the active room at the top/start of the category.
+        // For the few algorithms that will have to move the thing quite far (alphabetic with a Z room
+        // for example), the list should already be sorted well enough that it can rip through the
+        // array and slot the changed room in quickly.
+        const nextCategoryStartIdx = category === CATEGORY_ORDER[CATEGORY_ORDER.length - 1]
+            ? Number.MAX_SAFE_INTEGER
+            : this.indices[CATEGORY_ORDER[CATEGORY_ORDER.indexOf(category) + 1]];
+        const startIdx = this.indices[category];
+        const numSort = nextCategoryStartIdx - startIdx; // splice() returns up to the max, so MAX_SAFE_INT is fine
+        const unsortedSlice = this.cachedOrderedRooms.splice(startIdx, numSort);
+        const sorted = await sortRoomsWithAlgorithm(unsortedSlice, this.tagId, this.sortingAlgorithm);
+        this.cachedOrderedRooms.splice(startIdx, 0, ...sorted);
+
+        return true; // change made
     }
 
+    // noinspection JSMethodCanBeStatic
     private getCategoryFromIndices(index: number, indices: ICategoryIndex): Category {
         for (let i = 0; i < CATEGORY_ORDER.length; i++) {
             const category = CATEGORY_ORDER[i];
@@ -274,6 +217,7 @@ export class ImportanceAlgorithm extends Algorithm {
         throw new Error("Programming error: somehow you've ended up with an index that isn't in a category");
     }
 
+    // noinspection JSMethodCanBeStatic
     private moveRoomIndexes(nRooms: number, fromCategory: Category, toCategory: Category, indices: ICategoryIndex) {
         // We have to update the index of the category *after* the from/toCategory variables
         // in order to update the indices correctly. Because the room is moving from/to those
diff --git a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
index d544b1196f..2302768fbf 100644
--- a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
@@ -14,49 +14,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Algorithm } from "./Algorithm";
-import { ITagMap } from "../models";
+import { SortAlgorithm } from "../models";
 import { sortRoomsWithAlgorithm } from "../tag-sorting";
+import { OrderingAlgorithm } from "./OrderingAlgorithm";
+import { TagID } from "../../models";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 /**
  * Uses the natural tag sorting algorithm order to determine tag ordering. No
  * additional behavioural changes are present.
  */
-export class NaturalAlgorithm extends Algorithm {
+export class NaturalAlgorithm extends OrderingAlgorithm {
 
-    constructor() {
-        super();
+    public constructor(tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
+        super(tagId, initialSortingAlgorithm);
         console.log("Constructed a NaturalAlgorithm");
     }
 
-    protected async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
-        for (const tagId of Object.keys(updatedTagMap)) {
-            const unorderedRooms = updatedTagMap[tagId];
-
-            const sortBy = this.sortAlgorithms[tagId];
-            if (!sortBy) throw new Error(`${tagId} does not have a sorting algorithm`);
-
-            updatedTagMap[tagId] = await sortRoomsWithAlgorithm(unorderedRooms, tagId, sortBy);
-        }
+    public async setRooms(rooms: Room[]): Promise<any> {
+        this.cachedOrderedRooms = await sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
     }
 
     public async handleRoomUpdate(room, cause): Promise<boolean> {
-        const tags = this.roomIdsToTags[room.roomId];
-        if (!tags) {
-            console.warn(`No tags known for "${room.name}" (${room.roomId})`);
-            return false;
-        }
-        let changed = false;
-        for (const tag of tags) {
-            // TODO: Optimize this loop to avoid useless operations
-            // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
-            this.cachedRooms[tag] = await sortRoomsWithAlgorithm(this.cachedRooms[tag], tag, this.sortAlgorithms[tag]);
+        // TODO: Optimize this to avoid useless operations
+        // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
+        this.cachedOrderedRooms = await sortRoomsWithAlgorithm(this.cachedOrderedRooms, this.tagId, this.sortingAlgorithm);
 
-            // Flag that we've done something
-            this.recalculateFilteredRoomsForTag(tag); // update filter to re-sort the list
-            this.recalculateStickyRoom(tag); // update sticky room to make sure it appears if needed
-            changed = true;
-        }
-        return changed;
+        return true;
     }
 }
diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
new file mode 100644
index 0000000000..263e8a4cd4
--- /dev/null
+++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
@@ -0,0 +1,72 @@
+/*
+Copyright 2020 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 { Room } from "matrix-js-sdk/src/models/room";
+import { RoomUpdateCause, TagID } from "../../models";
+import { SortAlgorithm } from "../models";
+
+/**
+ * Represents a list ordering algorithm. Subclasses should populate the
+ * `cachedOrderedRooms` field.
+ */
+export abstract class OrderingAlgorithm {
+    protected cachedOrderedRooms: Room[];
+    protected sortingAlgorithm: SortAlgorithm;
+
+    protected constructor(protected tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
+        // noinspection JSIgnoredPromiseFromCall
+        this.setSortAlgorithm(initialSortingAlgorithm); // we use the setter for validation
+    }
+
+    /**
+     * The rooms as ordered by the algorithm.
+     */
+    public get orderedRooms(): Room[] {
+        return this.cachedOrderedRooms || [];
+    }
+
+    /**
+     * Sets the sorting algorithm to use within the list.
+     * @param newAlgorithm The new algorithm. Must be defined.
+     * @returns Resolves when complete.
+     */
+    public async setSortAlgorithm(newAlgorithm: SortAlgorithm) {
+        if (!newAlgorithm) throw new Error("A sorting algorithm must be defined");
+        this.sortingAlgorithm = newAlgorithm;
+
+        // Force regeneration of the rooms
+        await this.setRooms(this.orderedRooms);
+    }
+
+    /**
+     * Sets the rooms the algorithm should be handling, implying a reconstruction
+     * of the ordering.
+     * @param rooms The rooms to use going forward.
+     * @returns Resolves when complete.
+     */
+    public abstract setRooms(rooms: Room[]): Promise<any>;
+
+    /**
+     * Handle a room update. The Algorithm will only call this for causes which
+     * the list ordering algorithm can handle within the same tag. For example,
+     * tag changes will not be sent here.
+     * @param room The room where the update happened.
+     * @param cause The cause of the update.
+     * @returns True if the update requires the Algorithm to update the presentation layers.
+     */
+    // XXX: TODO: We assume this will only ever be a position update and NOT a NewRoom or RemoveRoom change!!
+    public abstract handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean>;
+}
diff --git a/src/stores/room-list/algorithms/list-ordering/index.ts b/src/stores/room-list/algorithms/list-ordering/index.ts
index bcccd150cd..8156c3a250 100644
--- a/src/stores/room-list/algorithms/list-ordering/index.ts
+++ b/src/stores/room-list/algorithms/list-ordering/index.ts
@@ -14,25 +14,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Algorithm } from "./Algorithm";
 import { ImportanceAlgorithm } from "./ImportanceAlgorithm";
-import { ListAlgorithm } from "../models";
+import { ListAlgorithm, SortAlgorithm } from "../models";
 import { NaturalAlgorithm } from "./NaturalAlgorithm";
+import { TagID } from "../../models";
+import { OrderingAlgorithm } from "./OrderingAlgorithm";
 
-const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => Algorithm } = {
-    [ListAlgorithm.Natural]: () => new NaturalAlgorithm(),
-    [ListAlgorithm.Importance]: () => new ImportanceAlgorithm(),
+interface AlgorithmFactory {
+    (tagId: TagID, initialSortingAlgorithm: SortAlgorithm): OrderingAlgorithm;
+}
+
+const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: AlgorithmFactory } = {
+    [ListAlgorithm.Natural]: (tagId, initSort) => new NaturalAlgorithm(tagId, initSort),
+    [ListAlgorithm.Importance]: (tagId, initSort) => new ImportanceAlgorithm(tagId, initSort),
 };
 
 /**
  * Gets an instance of the defined algorithm
  * @param {ListAlgorithm} algorithm The algorithm to get an instance of.
+ * @param {TagID} tagId The tag the algorithm is for.
+ * @param {SortAlgorithm} initSort The initial sorting algorithm for the ordering algorithm.
  * @returns {Algorithm} The algorithm instance.
  */
-export function getListAlgorithmInstance(algorithm: ListAlgorithm): Algorithm {
+export function getListAlgorithmInstance(algorithm: ListAlgorithm, tagId: TagID, initSort: SortAlgorithm): OrderingAlgorithm {
     if (!ALGORITHM_FACTORIES[algorithm]) {
         throw new Error(`${algorithm} is not a known algorithm`);
     }
 
-    return ALGORITHM_FACTORIES[algorithm]();
+    return ALGORITHM_FACTORIES[algorithm](tagId, initSort);
 }
diff --git a/src/stores/room-list/algorithms/models.ts b/src/stores/room-list/algorithms/models.ts
index 284600a776..943d833b67 100644
--- a/src/stores/room-list/algorithms/models.ts
+++ b/src/stores/room-list/algorithms/models.ts
@@ -16,6 +16,7 @@ limitations under the License.
 
 import { TagID } from "../models";
 import { Room } from "matrix-js-sdk/src/models/room";
+import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
 
 export enum SortAlgorithm {
     Manual = "MANUAL",
@@ -36,6 +37,16 @@ export interface ITagSortingMap {
     [tagId: TagID]: SortAlgorithm;
 }
 
+export interface IListOrderingMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: ListAlgorithm;
+}
+
+export interface IOrderingAlgorithmMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: OrderingAlgorithm;
+}
+
 export interface ITagMap {
     // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
     [tagId: TagID]: Room[];

From 4aa15ee19187d4e8f9b9bc22176a1919ab28cd81 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jun 2020 22:04:10 -0600
Subject: [PATCH 165/181] Wire up the context menu to the room list store

Updates are passed along magically to the sublist, so we don't need to listen for the room list store's response to our changes.

This just hits the functions introduced in the last commit.
---
 res/css/views/rooms/_RoomSublist2.scss      | 10 +++++-
 src/components/views/rooms/RoomSublist2.tsx | 35 +++++++++++++++++----
 src/i18n/strings/en_EN.json                 |  2 ++
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index ed17c071b6..afedf64e32 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -240,6 +240,14 @@ limitations under the License.
         font-size: $font-15px;
         line-height: $font-20px;
         font-weight: 600;
-        margin-bottom: 12px;
+        margin-bottom: 4px;
+    }
+
+    .mx_RadioButton, .mx_Checkbox {
+        margin-top: 8px;
+    }
+
+    .mx_Checkbox {
+        margin-left: -8px; // to counteract the indent from the component
     }
 }
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index fa37eef975..91baf4ff81 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -27,8 +27,11 @@ import RoomTile2 from "./RoomTile2";
 import { ResizableBox, ResizeCallbackData } from "react-resizable";
 import { ListLayout } from "../../../stores/room-list/ListLayout";
 import NotificationBadge, { ListNotificationState } from "./NotificationBadge";
-import {ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
+import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
 import StyledCheckbox from "../elements/StyledCheckbox";
+import StyledRadioButton from "../elements/StyledRadioButton";
+import RoomListStore from "../../../stores/room-list/RoomListStore2";
+import { ListAlgorithm, SortAlgorithm } from "../../../stores/room-list/algorithms/models";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -115,9 +118,14 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         this.setState({menuDisplayed: false});
     };
 
-    private onUnreadFirstChanged = () => {
-        // TODO: Support per-list algorithm changes
-        console.log("Unread first changed");
+    private onUnreadFirstChanged = async () => {
+        const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.layout.tagId) === ListAlgorithm.Importance;
+        const newAlgorithm = isUnreadFirst ? ListAlgorithm.Natural : ListAlgorithm.Importance;
+        await RoomListStore.instance.setListOrder(this.props.layout.tagId, newAlgorithm);
+    };
+
+    private onTagSortChanged = async (sort: SortAlgorithm) => {
+        await RoomListStore.instance.setTagSorting(this.props.layout.tagId, sort);
     };
 
     private onMessagePreviewChanged = () => {
@@ -147,6 +155,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         let contextMenu = null;
         if (this.state.menuDisplayed) {
             const elementRect = this.menuButtonRef.current.getBoundingClientRect();
+            const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.layout.tagId) === SortAlgorithm.Alphabetic;
+            const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.layout.tagId) === ListAlgorithm.Importance;
             contextMenu = (
                 <ContextMenu
                     chevronFace="none"
@@ -157,14 +167,27 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     <div className="mx_RoomSublist2_contextMenu">
                         <div>
                             <div className='mx_RoomSublist2_contextMenu_title'>{_t("Sort by")}</div>
-                            TODO: Radios are blocked by https://github.com/matrix-org/matrix-react-sdk/pull/4731
+                            <StyledRadioButton
+                                onChange={() => this.onTagSortChanged(SortAlgorithm.Recent)}
+                                checked={!isAlphabetical}
+                                name={`mx_${this.props.layout.tagId}_sortBy`}
+                            >
+                                {_t("Activity")}
+                            </StyledRadioButton>
+                            <StyledRadioButton
+                                onChange={() => this.onTagSortChanged(SortAlgorithm.Alphabetic)}
+                                checked={isAlphabetical}
+                                name={`mx_${this.props.layout.tagId}_sortBy`}
+                            >
+                                {_t("A-Z")}
+                            </StyledRadioButton>
                         </div>
                         <hr />
                         <div>
                             <div className='mx_RoomSublist2_contextMenu_title'>{_t("Unread rooms")}</div>
                             <StyledCheckbox
                                 onChange={this.onUnreadFirstChanged}
-                                checked={false/*TODO*/}
+                                checked={isUnreadFirst}
                             >
                                 {_t("Always show first")}
                             </StyledCheckbox>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 81577d740e..31da52a494 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1138,6 +1138,8 @@
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
     "Sort by": "Sort by",
+    "Activity": "Activity",
+    "A-Z": "A-Z",
     "Unread rooms": "Unread rooms",
     "Always show first": "Always show first",
     "Show": "Show",

From 39c28e2207831ce9e4af1afc987959d493003398 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 12 Jun 2020 14:17:06 +0100
Subject: [PATCH 166/181] Send read marker updates immediately after moving
 visually

The `TimelinePanel` uses two timers to coordinate read marker and read receipt
updates. When the read receipt timer fires, we advance the receipt and send the
latest state of both your receipt and marker to the server. When the read marker
timer fires, we advance the marker visually, but do not send anything to the
server: we were relying on the slightly different schedule of the read receipt
to actually send the updated read marker. This means there's a time window where
it's possible to visually advance the read marker without ever sending it to the
server (if you change rooms before the receipt timer fires again).

To simplify the behaviour here and ensure we always commit the updated marker
when we move it, this change sends an update to the server at the same time as
moving the marker.

It's possible this may improve some of the behaviour reported in
https://github.com/vector-im/riot-web/issues/12338.
---
 src/components/structures/TimelinePanel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 95dc42fcee..d469a41cc8 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -798,6 +798,9 @@ const TimelinePanel = createReactClass({
                 readMarkerVisible: false,
             });
         }
+
+        // Send the updated read marker (along with read receipt) to the server
+        this.sendReadReceipt();
     },
 
 

From cc17409943d03b92f38087b11584c592303454ca Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Jun 2020 08:37:08 -0600
Subject: [PATCH 167/181] Fix words

Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
---
 docs/room-list-store.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/room-list-store.md b/docs/room-list-store.md
index 82c83d3593..53f0527209 100644
--- a/docs/room-list-store.md
+++ b/docs/room-list-store.md
@@ -24,7 +24,7 @@ algorithm to call, instead of having all the logic in the room list store itself
 
 
 Tag sorting is effectively the comparator supplied to the list algorithm. This gives the list algorithm
-the power to decide when and how to apply the tag sorting, if at all. For example, The importance algorithm, 
+the power to decide when and how to apply the tag sorting, if at all. For example, the importance algorithm, 
 later described in this document, heavily uses the list ordering behaviour to break the tag into categories. 
 Each category then gets sorted by the appropriate tag sorting algorithm.
 

From c6f9fae455c1d6b3c240568c0115c9307400522b Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 12 Jun 2020 01:02:47 +0000
Subject: [PATCH 168/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2280 of 2280 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 a0e963c57b..c9a92061b6 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2503,5 +2503,7 @@
     "Show %(count)s more|other": "再顯示 %(count)s 個",
     "Show %(count)s more|one": "再顯示 %(count)s 個",
     "Leave Room": "離開聊天室",
-    "Room options": "聊天室選項"
+    "Room options": "聊天室選項",
+    "sent an image.": "傳送圖片。",
+    "You: %(message)s": "您：%(message)s"
 }

From 0508806a8095fb7d52dceb43c1e4323c2a6c2f85 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Fri, 12 Jun 2020 08:56:56 +0000
Subject: [PATCH 169/181] Translated using Weblate (German)

Currently translated at 99.8% (2276 of 2280 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f6f3d67d9b..c559447757 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2436,5 +2436,18 @@
     "Archived rooms": "Archivierte Räume",
     "Feedback": "Feedback",
     "Account settings": "Konto-Einstellungen",
-    "Room ID or address of ban list": "Raum-ID oder Adresse der Verbotsliste"
+    "Room ID or address of ban list": "Raum-ID oder Adresse der Verbotsliste",
+    "sent an image.": "hat ein Bild gesendet.",
+    "You: %(message)s": "Du: %(message)s",
+    "No recently visited rooms": "Keine kürzlich besuchten Räume",
+    "Sort by": "Sortieren nach",
+    "Unread rooms": "Ungelesene Räume",
+    "Always show first": "Zeige immer zuerst",
+    "Show": "Zeige",
+    "Message preview": "Nachrichtenvorschau",
+    "List options": "Optionen anzeigen",
+    "Show %(count)s more|other": "Zeige %(count)s weitere",
+    "Show %(count)s more|one": "Zeige %(count)s weitere",
+    "Leave Room": "Verlasse Raum",
+    "Room options": "Raumoptionen"
 }

From 6b54c3a492a26a20213a19660b6b2486b664eb50 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Jun 2020 08:39:59 -0600
Subject: [PATCH 170/181] Throw if the update cause is unsupported

---
 .../algorithms/list-ordering/ImportanceAlgorithm.ts        | 5 +++++
 .../room-list/algorithms/list-ordering/NaturalAlgorithm.ts | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
index 2e24cb23f1..325aaf19e6 100644
--- a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -152,6 +152,11 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
     }
 
     public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+        // TODO: Handle NewRoom and RoomRemoved
+        if (cause !== RoomUpdateCause.Timeline && cause !== RoomUpdateCause.ReadReceipt) {
+            throw new Error(`Unsupported update cause: ${cause}`);
+        }
+
         const category = this.getRoomCategory(room);
         if (this.sortingAlgorithm === SortAlgorithm.Manual) {
             return; // Nothing to do here.
diff --git a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
index 2302768fbf..cce7372986 100644
--- a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
@@ -17,7 +17,7 @@ limitations under the License.
 import { SortAlgorithm } from "../models";
 import { sortRoomsWithAlgorithm } from "../tag-sorting";
 import { OrderingAlgorithm } from "./OrderingAlgorithm";
-import { TagID } from "../../models";
+import { RoomUpdateCause, TagID } from "../../models";
 import { Room } from "matrix-js-sdk/src/models/room";
 
 /**
@@ -36,6 +36,11 @@ export class NaturalAlgorithm extends OrderingAlgorithm {
     }
 
     public async handleRoomUpdate(room, cause): Promise<boolean> {
+        // TODO: Handle NewRoom and RoomRemoved
+        if (cause !== RoomUpdateCause.Timeline && cause !== RoomUpdateCause.ReadReceipt) {
+            throw new Error(`Unsupported update cause: ${cause}`);
+        }
+
         // TODO: Optimize this to avoid useless operations
         // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
         this.cachedOrderedRooms = await sortRoomsWithAlgorithm(this.cachedOrderedRooms, this.tagId, this.sortingAlgorithm);

From 6de6d94f7c8c2ff7adcea554d98dcd8707d61651 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Jun 2020 08:40:08 -0600
Subject: [PATCH 171/181] Fix return type

---
 src/stores/room-list/algorithms/Algorithm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 438ef78e7e..e8b167c1ba 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -508,7 +508,7 @@ export class Algorithm extends EventEmitter {
         if (cause === RoomUpdateCause.NewRoom) {
             // TODO: Be smarter and insert rather than regen the planet.
             await this.setKnownRooms([room, ...this.rooms]);
-            return;
+            return true;
         }
 
         if (cause === RoomUpdateCause.RoomRemoved) {

From 510f98b8b047ac92a856056311f9b0b7d9921d09 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Jun 2020 10:29:42 -0600
Subject: [PATCH 172/181] Bump width of user menu to account for 16px overlap

---
 res/css/structures/_UserMenuButton.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_UserMenuButton.scss b/res/css/structures/_UserMenuButton.scss
index a173e468e1..1fbbbb5fd8 100644
--- a/res/css/structures/_UserMenuButton.scss
+++ b/res/css/structures/_UserMenuButton.scss
@@ -19,7 +19,7 @@ limitations under the License.
 }
 
 .mx_UserMenuButton_contextMenu {
-    width: 231px;
+    width: 247px;
 
     .mx_UserMenuButton_contextMenu_header {
         // Create a flexbox to organize the header a bit easier

From f9a4151a6e55117c92748f835d6c959a496622b2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Jun 2020 13:52:54 -0600
Subject: [PATCH 173/181] Add rudimentary dark theme support

---
 res/css/structures/_LeftPanel2.scss         |  8 +++-----
 res/css/structures/_RoomSearch.scss         |  2 +-
 res/css/views/rooms/_NotificationBadge.scss |  2 +-
 res/css/views/rooms/_RoomSublist2.scss      |  8 ++++----
 res/themes/dark/css/_dark.scss              | 18 ++++++++++++++++++
 res/themes/light/css/_light.scss            | 18 +++++++++++++-----
 6 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/res/css/structures/_LeftPanel2.scss b/res/css/structures/_LeftPanel2.scss
index 3b8fb58be5..eca50bb639 100644
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -16,12 +16,10 @@ limitations under the License.
 
 // TODO: Rename to mx_LeftPanel during replacement of old component
 
-// TODO: Put these variables in the right place, or namespace them.
-$tagPanelWidth: 70px;
-$roomListMinimizedWidth: 50px;
+$tagPanelWidth: 70px; // only applies in this file, used for calculations
 
 .mx_LeftPanel2 {
-    background-color: $header-panel-bg-color;
+    background-color: $roomlist2-bg-color;
     min-width: 260px;
     max-width: 50%;
 
@@ -108,7 +106,7 @@ $roomListMinimizedWidth: 50px;
                 width: 28px;
                 height: 28px;
                 border-radius: 20px;
-                background-color: #fff; // TODO: Variable and theme
+                background-color: $roomlist2-button-bg-color;
                 position: relative;
                 margin-left: 8px;
 
diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
index 31061f7a16..eddc4cd064 100644
--- a/res/css/structures/_RoomSearch.scss
+++ b/res/css/structures/_RoomSearch.scss
@@ -18,7 +18,7 @@ limitations under the License.
 .mx_RoomSearch {
     flex: 1;
     border-radius: 20px;
-    background-color: #fff; // TODO: Variable & theme
+    background-color: $roomlist2-button-bg-color;
     height: 26px;
     padding: 2px;
 
diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss
index 9f9698bac5..521f1dfc20 100644
--- a/res/css/views/rooms/_NotificationBadge.scss
+++ b/res/css/views/rooms/_NotificationBadge.scss
@@ -27,7 +27,7 @@ limitations under the License.
     //     ^- The count is an element floating within that.
 
     &.mx_NotificationBadge_visible {
-        background-color: $roomtile2-badge-color;
+        background-color: $roomtile2-default-badge-bg-color;
 
         // Create a flexbox to order the count a bit easier
         display: flex;
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index e57f03cefc..3f5f654494 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -108,7 +108,7 @@ limitations under the License.
 
             // This is the same color as the left panel background because it needs
             // to occlude the lastmost tile in the list.
-            background-color: $header-panel-bg-color;
+            background-color: $roomlist2-bg-color;
 
             // Update the render() function for RoomSublist2 if these change
             // Update the ListLayout class for minVisibleTiles if these change.
@@ -198,7 +198,7 @@ limitations under the License.
                 height: 24px;
                 margin-left: 16px;
                 visibility: visible;
-                background-color: #fff; // TODO: Variable and theme
+                background-color: $roomlist2-button-bg-color;
             }
         }
     }
@@ -226,7 +226,7 @@ limitations under the License.
                 width: 32px !important; // !important to override hover styles
                 height: 32px !important; // !important to override hover styles
                 margin-left: 0 !important; // !important to override hover styles
-                background-color: #fff; // TODO: Variable and theme
+                background-color: $roomlist2-button-bg-color;
                 margin-top: 8px;
 
                 &::before {
@@ -261,7 +261,7 @@ limitations under the License.
 
                 // This is the same color as the left panel background because it needs
                 // to occlude the sublist title
-                background-color: $header-panel-bg-color;
+                background-color: $roomlist2-bg-color;
 
                 &::before {
                     top: 0;
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 9fb36ef1a3..50f3c08782 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -103,6 +103,24 @@ $eventtile-meta-color: $roomtopic-color;
 
 $header-divider-color: $header-panel-text-primary-color;
 
+// ********************
+
+// V2 Room List
+// TODO: Remove the 2 from all of these when the new list takes over
+
+$theme-button-bg-color: #e3e8f0;
+
+$roomlist2-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
+$roomlist2-bg-color: $header-panel-bg-color;
+
+$roomsublist2-divider-color: #e9eaeb;
+
+$roomtile2-preview-color: #9e9e9e;
+$roomtile2-default-badge-bg-color: #61708b;
+$roomtile2-selected-bg-color: #1A1D23;
+
+// ********************
+
 $roomtile-name-color: $header-panel-text-primary-color;
 $roomtile-selected-color: $text-primary-color;
 $roomtile-notified-color: $text-primary-color;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 3c6f6aa5a4..18a25b2663 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -172,14 +172,22 @@ $header-divider-color: #91A1C0;
 
 // ********************
 
-// TODO: Update variables for new room list
-// TODO: Dark theme
-$roomtile2-preview-color: #9e9e9e;
-$roomtile2-badge-color: #61708b;
-$roomtile2-selected-bg-color: #FFF;
+// V2 Room List
+// TODO: Remove the 2 from all of these when the new list takes over
+
 $theme-button-bg-color: #e3e8f0;
+
+$roomlist2-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
+$roomlist2-bg-color: $header-panel-bg-color;
+
 $roomsublist2-divider-color: #e9eaeb;
 
+$roomtile2-preview-color: #9e9e9e;
+$roomtile2-default-badge-bg-color: #61708b;
+$roomtile2-selected-bg-color: #FFF;
+
+// ********************
+
 $roomtile-name-color: #61708b;
 $roomtile-badge-fg-color: $accent-fg-color;
 $roomtile-selected-color: #212121;

From bb4d5f2ae951adf076073c5079f6018fa3f47944 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Sat, 13 Jun 2020 09:09:55 +0000
Subject: [PATCH 174/181] Translated using Weblate (Albanian)

Currently translated at 99.8% (2278 of 2282 strings)

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

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 727fa0306b..ed66bbb362 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1382,7 +1382,7 @@
     "Failed to revoke invite": "S’u arrit të shfuqizohej ftesa",
     "Revoke invite": "Shfuqizoje ftesën",
     "Invited by %(sender)s": "Ftuar nga %(sender)s",
-    "edited": "përpunoi",
+    "edited": "e përpunuar",
     "Maximize apps": "Maksimizoni aplikacione",
     "Rotate Left": "Rrotulloje Majtas",
     "Rotate counter-clockwise": "Rrotulloje në kah kundërorar",

From 3d2f4cd747733dc7a8c352a296badc3844faea86 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 14 Jun 2020 14:34:11 +0000
Subject: [PATCH 175/181] Translated using Weblate (Basque)

Currently translated at 100.0% (2282 of 2282 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 6624fa99bb..0d1b05987e 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2425,5 +2425,66 @@
     "Click the button below to confirm setting up encryption.": "Sakatu azpiko botoia zifratze-ezarpena berresteko.",
     "Dismiss read marker and jump to bottom": "Baztertu irakurtze-marka eta jauzi beheraino",
     "Jump to oldest unread message": "Jauzi irakurri gabeko mezu zaharrenera",
-    "Upload a file": "Igo fitxategia"
+    "Upload a file": "Igo fitxategia",
+    "Room name or address": "Gelaren izena edo helbidea",
+    "Joins room with given address": "Emandako helbidea duen gelara elkartzen da",
+    "Unrecognised room address:": "Gela helbide ezezaguna:",
+    "sent an image.": "irudi bat bidali du.",
+    "Help us improve Riot": "Lagundu gaitzazu Riot hobetzen",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Bidali <UsageDataLink>erabilera datu anonimoak</UsageDataLink> Riot hobetzen laguntzeko. Honek <PolicyLink>cookie</PolicyLink> bat darabil.",
+    "I want to help": "Lagundu nahi dut",
+    "Your homeserver has exceeded its user limit.": "Zure hasiera-zerbitzariak erabiltzaile muga gainditu du.",
+    "Your homeserver has exceeded one of its resource limits.": "Zure hasiera-zerbitzariak bere baliabide mugetako bat gainditu du.",
+    "Contact your <a>server admin</a>.": "Jarri kontaktuan <a>zerbitzariaren administratzailearekin</a>.",
+    "Ok": "Ados",
+    "Set password": "Ezarri pasahitza",
+    "To return to your account in future you need to set a password": "Zure kontura etorkizunean itzultzeko pasahitza ezarri behar duzu",
+    "Restart": "Berrasi",
+    "Upgrade your Riot": "Eguneratu zure Riot",
+    "A new version of Riot is available!": "Riot bertsio berria eskuragarri dago!",
+    "You: %(message)s": "Zu: %(message)s",
+    "New version available. <a>Update now.</a>": "Bertsio berri eskuragarri. <a>Eguneratu orain.</a>",
+    "Please verify the room ID or address and try again.": "Egiaztatu gelaren ID-a edo helbidea eta saiatu berriro.",
+    "Room ID or address of ban list": "Debeku zerrendaren gelaren IDa edo helbidea",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Zure zerbitzariko administratzaileak muturretik muturrerako zifratzea desgaitu du lehenetsita gela probatuetan eta mezu zuzenetan.",
+    "To link to this room, please add an address.": "Gela hau estekatzeko, gehitu helbide bat.",
+    "Emoji picker": "Emoji hautatzailea",
+    "No recently visited rooms": "Ez dago azkenaldian bisitatutako gelarik",
+    "People": "Jendea",
+    "Sort by": "Ordenatu honela",
+    "Activity": "Jarduera",
+    "A-Z": "A-Z",
+    "Unread rooms": "Irakurri gabeko gelak",
+    "Always show first": "Erakutsi lehenbizi",
+    "Show": "Erakutsi",
+    "Message preview": "Mezu-aurrebista",
+    "List options": "Zerrenda-aukerak",
+    "Show %(count)s more|other": "Erakutsi %(count)s gehiago",
+    "Show %(count)s more|one": "Erakutsi %(count)s gehiago",
+    "Leave Room": "Atera gelatik",
+    "Room options": "Gelaren aukerak",
+    "Error creating address": "Errorea helbidea sortzean",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Errorea gertatu da helbidea sortzean. Agian ez du zerbitzariak onartzen edo behin behineko arazo bat egon da.",
+    "You don't have permission to delete the address.": "Ez duzu helbidea ezabatzeko baimenik.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Errorea gertatu da helbidea kentzean. Agian ez dago jada edo behin behineko arazo bat egon da.",
+    "Error removing address": "Errorea helbidea kentzean",
+    "Categories": "Kategoriak",
+    "Room address": "Gelaren helbidea",
+    "Please provide a room address": "Eman gelaren helbidea",
+    "This address is available to use": "Gelaren helbide hau erabilgarri dago",
+    "This address is already in use": "Gelaren helbide hau erabilita dago",
+    "Set a room address to easily share your room with other people.": "Ezarri gelaren helbide bat zure gela besteekin erraz partekatzeko.",
+    "You've previously used a newer version of Riot with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Riot bertsio berriago bat erabili duzu saio honekin. Berriro bertsio hau muturretik muturrerako zifratzearekin erabiltzeko, saioa amaitu eta berriro hasi beharko duzu.",
+    "Address (optional)": "Helbidea (aukerakoa)",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ezabatu %(alias)s gelaren helbidea eta kendu %(name)s direktoriotik?",
+    "delete the address.": "ezabatu helbidea.",
+    "Switch to light mode": "Aldatu modu argira",
+    "Switch to dark mode": "Aldatu modu ilunera",
+    "Switch theme": "Aldatu azala",
+    "Security & privacy": "Segurtasuna eta pribatutasuna",
+    "All settings": "Ezarpen guztiak",
+    "Archived rooms": "Artxibatutako gelak",
+    "Feedback": "Iruzkinak",
+    "Account settings": "Kontuaren ezarpenak",
+    "Use a different passphrase?": "Erabili pasa-esaldi desberdin bat?"
 }

From ab0cf5dba7018c608fbe5c6563f1ce72c6f5f43b Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sat, 13 Jun 2020 04:28:34 +0000
Subject: [PATCH 176/181] Translated using Weblate (Bulgarian)

Currently translated at 99.7% (2276 of 2282 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index da8fdbed6a..89edf90c8b 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2437,5 +2437,14 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End"
+    "End": "End",
+    "sent an image.": "изпрати снимка.",
+    "You: %(message)s": "Вие: %(message)s",
+    "No recently visited rooms": "Няма наскоро-посетени стаи",
+    "Sort by": "Подреди по",
+    "Activity": "Активност",
+    "A-Z": "Азбучен ред",
+    "Unread rooms": "Непрочетени стаи",
+    "Show %(count)s more|other": "Покажи още %(count)s",
+    "Show %(count)s more|one": "Покажи още %(count)s"
 }

From efe2540090c4ba9226b161b3164829c0d6f3df6f Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sun, 14 Jun 2020 03:18:20 +0000
Subject: [PATCH 177/181] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2282 of 2282 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 c9a92061b6..65f90f2c13 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2505,5 +2505,7 @@
     "Leave Room": "離開聊天室",
     "Room options": "聊天室選項",
     "sent an image.": "傳送圖片。",
-    "You: %(message)s": "您：%(message)s"
+    "You: %(message)s": "您：%(message)s",
+    "Activity": "活動",
+    "A-Z": "A-Z"
 }

From 523da0de72a6c74e1b4c9ffed4aeef501e04309f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sun, 14 Jun 2020 10:17:22 +0000
Subject: [PATCH 178/181] Translated using Weblate (Estonian)

Currently translated at 59.7% (1362 of 2282 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 6888590d9e..66bdeb551f 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1389,5 +1389,48 @@
     "%(severalUsers)schanged their avatar %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti %(count)s korda",
     "%(severalUsers)schanged their avatar %(count)s times|one": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti",
     "%(oneUser)schanged their avatar %(count)s times|other": "Kasutaja %(oneUser)s muutis oma tunnuspilti %(count)s korda",
-    "%(oneUser)schanged their avatar %(count)s times|one": "Kasutaja %(oneUser)s muutis oma tunnuspilti"
+    "%(oneUser)schanged their avatar %(count)s times|one": "Kasutaja %(oneUser)s muutis oma tunnuspilti",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Palu oma koduserveri haldajat (<code>%(homeserverDomain)s</code>), et ta seadistaks kõnede kindlamaks toimimiseks TURN serveri.",
+    "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.": "Alternatiivina võid sa kasutada avalikku serverit <code>turn.matrix.org</code>, kuid see ei pruugi olla piisavalt töökindel ning sa jagaad ka oma IP-aadressi selle serveriga. Täpsemalt saad seda määrata seadistustes.",
+    "Try using turn.matrix.org": "Proovi kasutada turn.matrix.org serverit",
+    "OK": "Sobib",
+    "Unable to capture screen": "Ekraanipildi hõive ei õnnestunud",
+    "Existing Call": "Käimasolev kõne",
+    "You are already in a call.": "Sinul on juba kõne pooleli.",
+    "VoIP is unsupported": "VoIP ei ole toetatud",
+    "Call in Progress": "Kõne on pooleli",
+    "A call is currently being placed!": "Kõne algatamine on just käimas!",
+    "A call is already in progress!": "Kõne on juba pooleli!",
+    "Permission Required": "Vaja on täiendavaid õigusi",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Hetkel ei ole võimalik vastata failiga. Kas sa sooviksid seda faili lihtsalt üles laadida?",
+    "Continue": "Jätka",
+    "The file '%(fileName)s' failed to upload.": "Faili '%(fileName)s' üleslaadimine ei õnnestunud.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Faili '%(fileName)s' suurus ületab serveris seadistatud üleslaadimise piiri",
+    "Upload Failed": "Üleslaadimine ei õnnestunud",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server kas pole võrgus või on üle koormatud, aga võib-olla oled komistanud süsteemivea otsa.",
+    "The server does not support the room version specified.": "See server ei toeta antud jututoa versiooni.",
+    "Failure to create room": "Jututoa loomine ei õnnestunud",
+    "If you cancel now, you won't complete verifying the other user.": "Kui sa katkestad nüüd, siis sul jääb teise kasutaja verifitseerimine lõpetamata.",
+    "If you cancel now, you won't complete verifying your other session.": "Kui sa katkestad nüüd, siis sul jääb oma muu sessiooni verifitseerimine lõpetamata.",
+    "If you cancel now, you won't complete your operation.": "Kui sa katkestad nüüd, siis sul jääb pooleliolev tegevus lõpetamata.",
+    "Cancel entering passphrase?": "Kas katkestame paroolifraasi sisestamise?",
+    "Enter passphrase": "Sisesta paroolifraas",
+    "Setting up keys": "Võtamevõtmed kasutusele",
+    "Room name or address": "Jututoa nimi või aadress",
+    "Unable to enable Notifications": "Teavituste kasutusele võtmine ei õnnestunud",
+    "This email address was not found": "Seda e-posti aadressi ei leidunud",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Sinu e-posti aadress ei tundu olema selles koduserveris seotud Matrixi kasutajatunnusega.",
+    "Add User": "Lisa kasutaja",
+    "Enter a server name": "Sisesta serveri nimi",
+    "Looks good": "Tundub õige",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "E-posti teel kutse saatmiseks kasuta isikutuvastusserverit. Võid kasutada <default>vaikimisi serverit (%(defaultIdentityServerName)s)</default> või määrata muud serverid <settings>seadistustes</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Kasutajatele e-posti teel kutse saatmiseks pruugi isikutuvastusserverit. Täpsemalt saad seda <settings>hallata seadistustes</settings>.",
+    "The following users may not exist": "Järgnevaid kasutajaid ei pruugi olla olemas",
+    "Invite anyway and never warn me again": "Kutsu siiski ja ära hoiata mind enam",
+    "Invite anyway": "Kutsu siiski",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Palun kirjelda seda, mis läks valesti ja loo GitHub'is veateade.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Enne logide saatmist sa peaksid <a>GitHub'is looma veateate</a> ja kirjeldama seal tekkinud probleemi.",
+    "GitHub issue": "Veateade GitHub'is",
+    "Notes": "Märkused"
 }

From 1386419c6ee4ee65243340f3c28ec61160412e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 13 Jun 2020 06:29:23 +0000
Subject: [PATCH 179/181] Translated using Weblate (French)

Currently translated at 100.0% (2282 of 2282 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 2fb7c7e9bb..f4445082d8 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2506,5 +2506,7 @@
     "Show %(count)s more|other": "En afficher %(count)s de plus",
     "Show %(count)s more|one": "En afficher %(count)s de plus",
     "Leave Room": "Quitter le salon",
-    "Room options": "Options du salon"
+    "Room options": "Options du salon",
+    "Activity": "Activité",
+    "A-Z": "A-Z"
 }

From 5b1a3bf14d81d388c847beb447bc6b3de9f293fa Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 15 Jun 2020 07:53:40 +0000
Subject: [PATCH 180/181] Translated using Weblate (Italian)

Currently translated at 99.9% (2281 of 2282 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 81ac0a8dcf..8272dc126b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2500,5 +2500,7 @@
     "Show %(count)s more|other": "Mostra altri %(count)s",
     "Show %(count)s more|one": "Mostra %(count)s altro",
     "Leave Room": "Lascia stanza",
-    "Room options": "Opzioni stanza"
+    "Room options": "Opzioni stanza",
+    "Activity": "Attività",
+    "A-Z": "A-Z"
 }

From b7036ce183bff77f09d29b41f0530c81e8585710 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Sat, 13 Jun 2020 20:43:49 +0000
Subject: [PATCH 181/181] Translated using Weblate (Japanese)

Currently translated at 56.7% (1295 of 2282 strings)

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

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index fff38de46e..07ad4f9ef7 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1399,5 +1399,6 @@
     "Use bots, bridges, widgets and sticker packs": "ボット、ブリッジ、ウィジェット、ステッカーパックを使用",
     "Service": "サービス",
     "Summary": "概要",
-    "Document": "ドキュメント"
+    "Document": "ドキュメント",
+    "Appearance": "外観"
 }