Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

 Conflicts:

	src/SlashCommands.tsx

	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx

	src/createRoom.ts

test/components/views/messages/TextualBody-test.js

@@ -302,7 +302,7 @@ describe("<TextualBody />", () => {
             event: true,
         });
 
-        const wrapper = mount(<TextualBody mxEvent={ev} showUrlPreview={true} />);
+        const wrapper = mount(<TextualBody mxEvent={ev} showUrlPreview={true} onHeightChanged={() => {}} />);
         expect(wrapper.text()).toBe(ev.getContent().body);
 
         let widgets = wrapper.find("LinkPreviewWidget");

test/components/views/rooms/MemberList-test.tsx

@@ -14,18 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../../../skinned-sdk";
+
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
 
 import * as TestUtils from '../../../test-utils';
-import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { Room } from 'matrix-js-sdk/src/models/room';
 import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import { User } from "matrix-js-sdk/src/models/user";
 import { compare } from "../../../../src/utils/strings";
 import MemberList from "../../../../src/components/views/rooms/MemberList";
+import MemberTile from '../../../../src/components/views/rooms/MemberTile';
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
@@ -206,7 +208,6 @@ describe('MemberList', () => {
     }
 
     function itDoesOrderMembersCorrectly(enablePresence) {
-        const MemberTile = sdk.getComponent("rooms.MemberTile");
         describe('does order members correctly', () => {
             // Note: even if presence is disabled, we still expect that the presence
             // tests will pass. All expectOrderedByPresenceAndPowerLevel does is ensure

test/end-to-end-tests/element/install.sh

@@ -12,5 +12,5 @@ unzip -q element.zip
 rm element.zip
 mv element-web-${ELEMENT_BRANCH} element-web
 cd element-web
-yarn install
+yarn install --pure-lockfile
 yarn run build

test/end-to-end-tests/install.sh

@@ -4,4 +4,4 @@ set -e
 ./synapse/install.sh
 # local testing doesn't need a Element fetched from master,
 # so not installing that by default
-yarn install
+yarn install --pure-lockfile