diff --git a/package.json b/package.json index c2a149d25c..1b7edcd886 100644 --- a/package.json +++ b/package.json @@ -215,5 +215,6 @@ "outputDirectory": "coverage", "outputName": "jest-sonar-report.xml", "relativePaths": true - } + }, + "packageManager": "yarn@1.22.21" } diff --git a/res/css/superhero/custom.css b/res/css/superhero/custom.css index 88358b8034..d5dd4ed68e 100644 --- a/res/css/superhero/custom.css +++ b/res/css/superhero/custom.css @@ -33,11 +33,6 @@ h2 .sh_VerifiedIcon { mask-image: url("../../themes/superhero/img/icons/diamond.svg"); } -.mx_QuickSettingsButton.sh_MintTokenButton::before { - -webkit-mask-image: url("../../themes/superhero/img/icons/tokens.svg"); - mask-image: url("../../themes/superhero/img/icons/tokens.svg"); -} - /* START - Update @user chat message highlighting */ .mx_EventTile.mx_EventTile_highlight, .mx_EventTile.mx_EventTile_highlight .markdown-body, diff --git a/res/themes/superhero/img/icons/tokens.svg b/res/themes/superhero/img/icons/tokens.svg deleted file mode 100644 index c4b45c7c24..0000000000 --- a/res/themes/superhero/img/icons/tokens.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx index 7e10f64a0c..1a59d97591 100644 --- a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx +++ b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx @@ -253,12 +253,15 @@ const findVisibleRoomMembers = (visibleRooms: Room[], cli: MatrixClient, filterD return Object.values( visibleRooms .filter((room) => !filterDMs || !DMRoomMap.shared().getUserIdForRoomId(room.roomId)) - .reduce((members, room) => { - for (const member of room.getJoinedMembers()) { - members[member.userId] = member; - } - return members; - }, {} as Record), + .reduce( + (members, room) => { + for (const member of room.getJoinedMembers()) { + members[member.userId] = member; + } + return members; + }, + {} as Record, + ), ).filter((it) => it.userId !== cli.getUserId()); }; @@ -630,8 +633,7 @@ const SpotlightDialog: React.FC = ({ initialText = "", initialFilter = n {...ariaProperties} > - {' '} - + = ({ initialText = "", initialFilter = n size={AVATAR_SIZE} tooltipProps={{ tabIndex: -1 }} /> - {' '} - + {isCommunityRoom && } {isTokenGatedRoom && } {truncatedRoomName} - {(roomUsers?.length && !isTokenGatedRoom && !isCommunityRoom) ? ( + {roomUsers?.length && !isTokenGatedRoom && !isCommunityRoom ? ( ) : null} diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx index edc2b1ff2f..de22f01331 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -652,8 +652,8 @@ export const RoomKickButton = ({ ? _t("user_info|disinvite_button_space") : _t("user_info|kick_button_space") : member.membership === "invite" - ? _t("user_info|disinvite_button_room") - : _t("user_info|kick_button_room"), + ? _t("user_info|disinvite_button_room") + : _t("user_info|kick_button_room"), title: member.membership === "invite" ? _t("user_info|disinvite_button_room_name", { roomName: room.name }) @@ -723,8 +723,8 @@ export const RoomKickButton = ({ ? _t("user_info|disinvite_button_space") : _t("user_info|kick_button_space") : member.membership === "invite" - ? _t("user_info|disinvite_button_room") - : _t("user_info|kick_button_room"); + ? _t("user_info|disinvite_button_room") + : _t("user_info|kick_button_room"); return ( { return ( - {({ onFocus, isActive, ref }): ReactElement => ( + {({ onFocus, isActive }): ReactElement => (