Merge branch 'develop' into widget-uids

Author: robintown

res/css/_components.scss

@@ -23,7 +23,6 @@
 @import "./structures/_HeaderButtons.scss";
 @import "./structures/_HomePage.scss";
 @import "./structures/_LeftPanel.scss";
-@import "./structures/_LeftPanelWidget.scss";
 @import "./structures/_MainSplit.scss";
 @import "./structures/_MatrixChat.scss";
 @import "./structures/_MyGroups.scss";

res/css/structures/_LeftPanelWidget.scss

@@ -27,7 +27,6 @@ import { Action } from "../../dispatcher/actions";
 import RoomSearch from "./RoomSearch";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import LeftPanelWidget from "./LeftPanelWidget";
 import { replaceableComponent } from "../../utils/replaceableComponent";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { MetaSpace, SpaceKey, UPDATE_SELECTED_SPACE } from "../../stores/spaces";
@@ -444,7 +443,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                             { roomList }
                         </div>
                     </div>
-                    { !this.props.isMinimized && <LeftPanelWidget /> }
                 </aside>
             </div>
         );

src/components/structures/LeftPanel.tsx

@@ -882,10 +882,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
         default: {},
     },
-    "Widgets.leftPanel": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: null,
-    },
     "Spaces.allRoomsInHome": {
         displayName: _td("Show all rooms in Home"),
         description: _td("All rooms you're in will appear in Home."),

src/components/structures/LeftPanelWidget.tsx

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import "../../skinned-sdk";
-import { MatrixClient } from 'matrix-js-sdk/src/matrix';
+import { MatrixClient, MatrixEvent } from 'matrix-js-sdk/src/matrix';
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { CallState } from "matrix-js-sdk/src/webrtc/call";
 
@@ -52,7 +52,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: THEIR_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
 
         expect(grouper.state).toBe(CustomCallState.Missed);
     });
@@ -73,7 +73,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: MY_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
         grouperHangup.add({
             getContent: () => {
                 return {
@@ -86,7 +86,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: THEIR_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
 
         grouperReject.add({
             getContent: () => {
@@ -100,7 +100,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: MY_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
         grouperReject.add({
             getContent: () => {
                 return {
@@ -113,7 +113,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: THEIR_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
 
         expect(grouperHangup.state).toBe(CallState.Ended);
         expect(grouperReject.state).toBe(CallState.Ended);
@@ -134,7 +134,7 @@ describe('CallEventGrouper', () => {
             getType: () => {
                 return EventType.CallInvite;
             },
-        });
+        } as unknown as MatrixEvent);
 
         expect(grouper.isVoice).toBe(false);
     });