imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to importing models/room-state & models/room-member from main js-sdk export (#11362)

Browse source 
* Switch to importing TypedEventEmitter from main js-sdk export

* Switch to importing js-sdk/matrix in cypress

* Remove duplicated imports

* Fix lint:js-fix to run prettier last otherwise ESLint --fix may cause a mess

* Add lint rule

* Switch to importing models/Room from main js-sdk export

* Switch to importing models/room-state & models/room-member from main js-sdk export

* Fix cypress-axe import

* Fix more imports

* Fix cypress-axe import

* Fix bad merge
This commit is contained in:
Michael Telatynski 2023-08-04 12:22:08 +01:00 • committed by GitHub
parent f0d58d25dc
commit e6af09e424
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
84 changed files with 108 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/right_panel/EncryptionInfo.tsx
View file

@ -15,7 +15,7 @@ limitations under the License.
*/
import React from "react";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { RoomMember } from "matrix-js-sdk/src/matrix";
import { User } from "matrix-js-sdk/src/models/user";
import { _t } from "../../../languageHandler";

2
src/components/views/right_panel/EncryptionPanel.tsx
View file

@ -16,7 +16,7 @@ limitations under the License.
import React, { useCallback, useEffect, useState } from "react";
import { VerificationPhase, VerificationRequest, VerificationRequestEvent } from "matrix-js-sdk/src/crypto-api";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { RoomMember } from "matrix-js-sdk/src/matrix";
import { User } from "matrix-js-sdk/src/models/user";
import EncryptionInfo from "./EncryptionInfo";

3
src/components/views/right_panel/PinnedMessagesCard.tsx
View file

@ -15,11 +15,10 @@ limitations under the License.
*/
import React, { useCallback, useContext, useEffect, useState } from "react";
import { Room, RoomEvent } from "matrix-js-sdk/src/matrix";
import { Room, RoomEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
import { logger } from "matrix-js-sdk/src/logger";
import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg";
import { Icon as EmojiIcon } from "../../../../res/img/element-icons/room/message-bar/emoji.svg";

4
src/components/views/right_panel/UserInfo.tsx
View file

@ -20,15 +20,13 @@ limitations under the License.
import React, { ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react";
import classNames from "classnames";
import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { RoomMember, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
import { User } from "matrix-js-sdk/src/models/user";
import { Room } from "matrix-js-sdk/src/matrix";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { VerificationRequest } from "matrix-js-sdk/src/crypto-api";
import { EventType } from "matrix-js-sdk/src/@types/event";
import { logger } from "matrix-js-sdk/src/logger";
import { CryptoEvent } from "matrix-js-sdk/src/crypto";
import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
import { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning";
import { Device } from "matrix-js-sdk/src/models/device";

3
src/components/views/right_panel/VerificationPanel.tsx
View file

@ -22,11 +22,10 @@ import {
VerificationRequest,
VerificationRequestEvent,
} from "matrix-js-sdk/src/crypto-api";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { RoomMember, Device } from "matrix-js-sdk/src/matrix";
import { User } from "matrix-js-sdk/src/models/user";
import { logger } from "matrix-js-sdk/src/logger";
import { ShowQrCodeCallbacks, ShowSasCallbacks, VerifierEvent } from "matrix-js-sdk/src/crypto-api/verification";
import { Device } from "matrix-js-sdk/src/matrix";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import VerificationQRCode from "../elements/crypto/VerificationQRCode";