Merge remote-tracking branch 'aaronraimist/sort-imports' into develop

test/components/views/dialogs/AccessSecretStorageDialog-test.js

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
+
 import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { stubClient } from '../../../test-utils';

test/components/views/dialogs/InteractiveAuthDialog-test.js

@@ -22,7 +22,6 @@ import { sleep } from "matrix-js-sdk/src/utils";
 
 import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-
 import * as TestUtilsMatrix from '../../../test-utils';
 
 const InteractiveAuthDialog = sdk.getComponent(

test/components/views/elements/MemberEventListSummary-test.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ShallowRenderer from "react-test-renderer/shallow";
+
 import sdk from '../../../skinned-sdk';
 import * as testUtils from '../../../test-utils';
 

test/components/views/elements/PollCreateDialog-test.tsx

@@ -18,9 +18,10 @@ limitations under the License.
 import '../../../skinned-sdk';
 import React from "react";
 import { mount, ReactWrapper } from "enzyme";
+import { Room } from "matrix-js-sdk/src/models/room";
+
 import * as TestUtils from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import { Room } from "matrix-js-sdk/src/models/room";
 import _PollCreateDialog from "../../../../src/components/views/elements/PollCreateDialog";
 const PollCreateDialog = TestUtils.wrapInMatrixClientContext(_PollCreateDialog);
 

test/components/views/groups/GroupMemberList-test.js

@@ -17,13 +17,13 @@ limitations under the License.
 import React from "react";
 import ReactDOM from "react-dom";
 import ReactTestUtils from "react-dom/test-utils";
-
 import MockHttpBackend from "matrix-mock-request";
-import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import sdk from "../../../skinned-sdk";
 import Matrix from "matrix-js-sdk";
 
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import sdk from "../../../skinned-sdk";
 import * as TestUtils from "../../../test-utils";
+
 const { waitForUpdate } = TestUtils;
 
 const GroupMemberList = sdk.getComponent("views.groups.GroupMemberList");

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

@@ -2,10 +2,10 @@ import '../../../skinned-sdk'; // Must be first for skinning to work
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
 import { EventEmitter } from 'events';
-import * as TestUtils from '../../../test-utils';
-
-import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
+
+import * as TestUtils from '../../../test-utils';
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import MKeyVerificationConclusion from '../../../../src/components/views/messages/MKeyVerificationConclusion';
 
 const trustworthy = () => ({ isCrossSigningVerified: () => true });

test/components/views/messages/MPollBody-test.tsx

@@ -16,13 +16,12 @@ limitations under the License.
 
 import React from "react";
 import { mount, ReactWrapper } from "enzyme";
-
-import sdk from "../../../skinned-sdk";
-import * as TestUtils from "../../../test-utils";
-
 import { Callback, IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk";
 import { ISendEventResponse } from "matrix-js-sdk/src/@types/requests";
 import { Relations } from "matrix-js-sdk/src/models/relations";
+
+import * as TestUtils from "../../../test-utils";
+import sdk from "../../../skinned-sdk";
 import {
     IPollAnswer,
     IPollContent,

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

@@ -19,12 +19,12 @@ 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 { 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 { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import * as TestUtils from '../../../test-utils';
 import { compare } from "../../../../src/utils/strings";
 import MemberList from "../../../../src/components/views/rooms/MemberList";
 import MemberTile from '../../../../src/components/views/rooms/MemberTile';

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

@@ -1,16 +1,12 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk';
 
 import "../../../skinned-sdk";
-
 import * as TestUtils from '../../../test-utils';
-
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
 import RoomHeader from '../../../../src/components/views/rooms/RoomHeader';
-
-import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk';
 import { SearchScope } from '../../../../src/components/views/rooms/SearchBar';
 import { E2EStatus } from '../../../../src/utils/ShieldUtils';
 import { PlaceCallType } from '../../../../src/CallHandler';

test/components/views/rooms/RoomList-test.js

@@ -1,16 +1,13 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
+import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
 
 import * as TestUtils from '../../../test-utils';
-
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import sdk from '../../../skinned-sdk';
-
 import dis from '../../../../src/dispatcher/dispatcher';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
-
-import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
 import { DefaultTagID } from "../../../../src/stores/room-list/models";
 import RoomListStore, { RoomListStoreClass } from "../../../../src/stores/room-list/RoomListStore";
 import RoomListLayoutStore from "../../../../src/stores/room-list/RoomListLayoutStore";

test/components/views/rooms/RoomSettings-test.js

@@ -1,6 +1,7 @@
 // TODO: Rewrite room settings tests for dialog support
 import React from 'react';
 import ReactDOM from 'react-dom';
+
 import * as testUtils from '../../../test-utils';
 import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';

test/components/views/settings/CryptographyPanel-test.tsx

@@ -1,11 +1,11 @@
 import '../../../skinned-sdk';
-import * as TestUtils from '../../../test-utils';
 
-import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import React, { ReactElement } from 'react';
 import ReactDOM from 'react-dom';
-
 import { MatrixClient } from 'matrix-js-sdk';
+
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import * as TestUtils from '../../../test-utils';
 import CryptographyPanel from '../../../../src/components/views/settings/CryptographyPanel';
 
 describe('CryptographyPanel', () => {