Merge branch 'develop' into johannes/default-intentional-mentions

CHANGELOG.md

@@ -1,3 +1,39 @@
+Changes in [3.80.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.1) (2023-09-13)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Update Compound to fix Firefox-specific avatar regression ([\#11604](https://github.com/matrix-org/matrix-react-sdk/pull/11604))
+
+Changes in [3.80.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.0) (2023-09-12)
+=====================================================================================================
+
+## ✨ Features
+ * Allow creating public knock rooms ([\#11481](https://github.com/matrix-org/matrix-react-sdk/pull/11481)). Contributed by @charlynguyen.
+ * Render custom images in reactions according to MSC4027 ([\#11087](https://github.com/matrix-org/matrix-react-sdk/pull/11087)). Contributed by @sumnerevans.
+ * Introduce room knocks bar ([\#11475](https://github.com/matrix-org/matrix-react-sdk/pull/11475)). Contributed by @charlynguyen.
+ * Room header UI updates ([\#11507](https://github.com/matrix-org/matrix-react-sdk/pull/11507)). Fixes vector-im/element-web#25892.
+ * Remove green "verified" bar for encrypted events ([\#11496](https://github.com/matrix-org/matrix-react-sdk/pull/11496)).
+ * Update member count on room summary update ([\#11488](https://github.com/matrix-org/matrix-react-sdk/pull/11488)).
+ * Support for E2EE in Element Call  ([\#11492](https://github.com/matrix-org/matrix-react-sdk/pull/11492)).
+ * Allow requesting to join knock rooms via spotlight ([\#11482](https://github.com/matrix-org/matrix-react-sdk/pull/11482)). Contributed by @charlynguyen.
+ * Lock out the first tab if Element is opened in a second tab. ([\#11425](https://github.com/matrix-org/matrix-react-sdk/pull/11425)). Fixes vector-im/element-web#25157.
+ * Change avatar to use Compound implementation ([\#11448](https://github.com/matrix-org/matrix-react-sdk/pull/11448)).
+
+## 🐛 Bug Fixes
+ * Fix vertical alignment of default avatar font ([\#11582](https://github.com/matrix-org/matrix-react-sdk/pull/11582)). Fixes vector-im/element-web#26081.
+ * Fix avatars in public room & space search being flex shrunk ([\#11580](https://github.com/matrix-org/matrix-react-sdk/pull/11580)). Fixes vector-im/element-web#26133.
+ * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](https://github.com/matrix-org/matrix-react-sdk/pull/11558)). Fixes vector-im/element-web#26075.
+ * Use RoomStateEvent.Update for knocks ([\#11516](https://github.com/matrix-org/matrix-react-sdk/pull/11516)). Contributed by @charlynguyen.
+ * Prevent event propagation when clicking icon buttons ([\#11515](https://github.com/matrix-org/matrix-react-sdk/pull/11515)).
+ * Only display RoomKnocksBar when feature flag is enabled ([\#11513](https://github.com/matrix-org/matrix-react-sdk/pull/11513)). Contributed by @andybalaam.
+ * Fix avatars of knock members for people tab of room settings ([\#11506](https://github.com/matrix-org/matrix-react-sdk/pull/11506)). Fixes vector-im/element-web#26083. Contributed by @charlynguyen.
+ * Fixes read receipt avatar offset ([\#11483](https://github.com/matrix-org/matrix-react-sdk/pull/11483)). Fixes vector-im/element-web#26067, vector-im/element-web#26064 vector-im/element-web#26059 and vector-im/element-web#26061.
+ * Fix avatar defects ([\#11473](https://github.com/matrix-org/matrix-react-sdk/pull/11473)). Fixes vector-im/element-web#26051 and vector-im/element-web#26046.
+ * Fix consistent avatar output for Percy ([\#11472](https://github.com/matrix-org/matrix-react-sdk/pull/11472)). Fixes vector-im/element-web#26049 and vector-im/element-web#26052.
+ * Fix colour of avatar and colour matching with username ([\#11470](https://github.com/matrix-org/matrix-react-sdk/pull/11470)). Fixes vector-im/element-web#26042.
+ * Fix incompatibility of Soft Logout with Element-R ([\#11468](https://github.com/matrix-org/matrix-react-sdk/pull/11468)).
+ * Fix instances of double translation and guard translation calls using typescript ([\#11443](https://github.com/matrix-org/matrix-react-sdk/pull/11443)).
+
 Changes in [3.79.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0) (2023-08-29)
 =====================================================================================================
 

cypress/plugins/dendritedocker/index.ts

@@ -96,7 +96,7 @@ async function dendritePineconeStart(template: string): Promise<HomeserverInstan
 
 async function containerStart(template: string, usePinecone: boolean): Promise<HomeserverInstance> {
     let dendriteImage = "matrixdotorg/dendrite-monolith:main";
-    let dendriteEntrypoint = "/usr/bin/dendrite-monolith-server";
+    let dendriteEntrypoint = "/usr/bin/dendrite";
     if (usePinecone) {
         dendriteImage = "matrixdotorg/dendrite-demo-pinecone:main";
         dendriteEntrypoint = "/usr/bin/dendrite-demo-pinecone";

package.json

@@ -1,6 +1,6 @@
 {
     "name": "matrix-react-sdk",
-    "version": "3.79.0",
+    "version": "3.80.1",
     "description": "SDK for matrix.org using React",
     "author": "matrix.org",
     "repository": {
@@ -69,7 +69,7 @@
         "@sentry/tracing": "^7.0.0",
         "@testing-library/react-hooks": "^8.0.1",
         "@vector-im/compound-design-tokens": "^0.0.5",
-        "@vector-im/compound-web": "^0.2.3",
+        "@vector-im/compound-web": "^0.4.0",
         "await-lock": "^2.1.0",
         "blurhash": "^1.1.3",
         "classnames": "^2.2.6",

res/css/views/right_panel/_UserInfo.pcss

@@ -99,6 +99,11 @@ limitations under the License.
             margin: 0 auto;
             transition: 0.5s;
 
+            .mx_BaseAvatar {
+                /* Override the calculated font-size so that the letter isn't tiny */
+                font-size: 4rem;
+            }
+
             .mx_BaseAvatar,
             .mx_BaseAvatar img {
                 width: 100%;
@@ -250,6 +255,11 @@ limitations under the License.
                 max-width: 72px;
                 margin: 0 auto;
             }
+
+            .mx_BaseAvatar {
+                /* Override the calculated font-size so that the letter isn't tiny */
+                font-size: 2rem;
+            }
         }
     }
 }

src/SlashCommands.tsx

@@ -624,7 +624,7 @@ export const Commands = [
             !isCurrentLocalRoom(cli),
         runFn: function (cli, roomId, threadId, widgetUrl) {
             if (!widgetUrl) {
-                return reject(new UserFriendlyError("Please supply a widget URL or embed code"));
+                return reject(new UserFriendlyError("slash_command|addwidget_missing_url"));
             }
 
             // Try and parse out a widget URL from iframes
@@ -635,15 +635,15 @@ export const Commands = [
                     if (iframe?.tagName.toLowerCase() === "iframe") {
                         logger.log("Pulling URL out of iframe (embed code)");
                         if (!iframe.hasAttribute("src")) {
-                            return reject(new UserFriendlyError("iframe has no src attribute"));
+                            return reject(new UserFriendlyError("slash_command|addwidget_iframe_missing_src"));
                         }
                         widgetUrl = iframe.getAttribute("src")!;
                     }
                 }
             }
 
             if (!widgetUrl.startsWith("https://") && !widgetUrl.startsWith("http://")) {
-                return reject(new UserFriendlyError("Please supply a https:// or http:// widget URL"));
+                return reject(new UserFriendlyError("slash_command|addwidget_invalid_protocol"));
             }
             if (WidgetUtils.canUserModifyWidgets(cli, roomId)) {
                 const userId = cli.getUserId();
@@ -665,7 +665,7 @@ export const Commands = [
 
                 return success(WidgetUtils.setRoomWidget(cli, roomId, widgetId, type, widgetUrl, name, data));
             } else {
-                return reject(new UserFriendlyError("You cannot modify widgets in this room."));
+                return reject(new UserFriendlyError("slash_command|addwidget_no_permissions"));
             }
         },
         category: CommandCategories.admin,
@@ -749,7 +749,7 @@ export const Commands = [
     }),
     new Command({
         command: "discardsession",
-        description: _td("Forces the current outbound group session in an encrypted room to be discarded"),
+        description: _td("slash_command|discardsession"),
         isEnabled: (cli) => !isCurrentLocalRoom(cli),
         runFn: function (cli, roomId) {
             try {
@@ -764,7 +764,7 @@ export const Commands = [
     }),
     new Command({
         command: "remakeolm",
-        description: _td("Developer command: Discards the current outbound group session and sets up new Olm sessions"),
+        description: _td("slash_command|remakeolm"),
         isEnabled: (cli) => {
             return SettingsStore.getValue("developerMode") && !isCurrentLocalRoom(cli);
         },
@@ -856,7 +856,7 @@ export const Commands = [
     }),
     new Command({
         command: "tovirtual",
-        description: _td("Switches to this room's virtual room, if it has one"),
+        description: _td("slash_command|tovirtual"),
         category: CommandCategories.advanced,
         isEnabled(cli): boolean {
             return !!LegacyCallHandler.instance.getSupportsVirtualRooms() && !isCurrentLocalRoom(cli);
@@ -865,7 +865,7 @@ export const Commands = [
             return success(
                 (async (): Promise<void> => {
                     const room = await VoipUserMapper.sharedInstance().getVirtualRoomForRoom(roomId);
-                    if (!room) throw new UserFriendlyError("No virtual room for this room");
+                    if (!room) throw new UserFriendlyError("slash_command|tovirtual_not_found");
                     dis.dispatch<ViewRoomPayload>({
                         action: Action.ViewRoom,
                         room_id: room.roomId,
@@ -878,7 +878,7 @@ export const Commands = [
     }),
     new Command({
         command: "query",
-        description: _td("Opens chat with the given user"),
+        description: _td("slash_command|query"),
         args: "<user-id>",
         runFn: function (cli, roomId, threadId, userId) {
             // easter-egg for now: look up phone numbers through the thirdparty API
@@ -893,7 +893,7 @@ export const Commands = [
                     if (isPhoneNumber) {
                         const results = await LegacyCallHandler.instance.pstnLookup(userId);
                         if (!results || results.length === 0 || !results[0].userid) {
-                            throw new UserFriendlyError("Unable to find Matrix ID for phone number");
+                            throw new UserFriendlyError("slash_command|query_not_found_phone_number");
                         }
                         userId = results[0].userid;
                     }
@@ -949,13 +949,13 @@ export const Commands = [
     }),
     new Command({
         command: "holdcall",
-        description: _td("Places the call in the current room on hold"),
+        description: _td("slash_command|holdcall"),
         category: CommandCategories.other,
         isEnabled: (cli) => !isCurrentLocalRoom(cli),
         runFn: function (cli, roomId, threadId, args) {
             const call = LegacyCallHandler.instance.getCallForRoom(roomId);
             if (!call) {
-                return reject(new UserFriendlyError("No active call in this room"));
+                return reject(new UserFriendlyError("slash_command|no_active_call"));
             }
             call.setRemoteOnHold(true);
             return success();
@@ -964,13 +964,13 @@ export const Commands = [
     }),
     new Command({
         command: "unholdcall",
-        description: _td("Takes the call in the current room off hold"),
+        description: _td("slash_command|unholdcall"),
         category: CommandCategories.other,
         isEnabled: (cli) => !isCurrentLocalRoom(cli),
         runFn: function (cli, roomId, threadId, args) {
             const call = LegacyCallHandler.instance.getCallForRoom(roomId);
             if (!call) {
-                return reject(new UserFriendlyError("No active call in this room"));
+                return reject(new UserFriendlyError("slash_command|no_active_call"));
             }
             call.setRemoteOnHold(false);
             return success();
@@ -979,24 +979,24 @@ export const Commands = [
     }),
     new Command({
         command: "converttodm",
-        description: _td("Converts the room to a DM"),
+        description: _td("slash_command|converttodm"),
         category: CommandCategories.other,
         isEnabled: (cli) => !isCurrentLocalRoom(cli),
         runFn: function (cli, roomId, threadId, args) {
             const room = cli.getRoom(roomId);
-            if (!room) return reject(new UserFriendlyError("Could not find room"));
+            if (!room) return reject(new UserFriendlyError("slash_command|could_not_find_room"));
             return success(guessAndSetDMRoom(room, true));
         },
         renderingTypes: [TimelineRenderingType.Room],
     }),
     new Command({
         command: "converttoroom",
-        description: _td("Converts the DM to a room"),
+        description: _td("slash_command|converttoroom"),
         category: CommandCategories.other,
         isEnabled: (cli) => !isCurrentLocalRoom(cli),
         runFn: function (cli, roomId, threadId, args) {
             const room = cli.getRoom(roomId);
-            if (!room) return reject(new UserFriendlyError("Could not find room"));
+            if (!room) return reject(new UserFriendlyError("slash_command|could_not_find_room"));
             return success(guessAndSetDMRoom(room, false));
         },
         renderingTypes: [TimelineRenderingType.Room],
@@ -1007,7 +1007,7 @@ export const Commands = [
     new Command({
         command: "me",
         args: "<message>",
-        description: _td("Displays action"),
+        description: _td("slash_command|me"),
         category: CommandCategories.messages,
         hideCompletionAfterSpace: true,
     }),

src/accessibility/KeyboardShortcutUtils.ts

@@ -50,7 +50,7 @@ const getUIOnlyShortcuts = (): IKeyboardShortcuts => {
                 key: Key.ENTER,
                 shiftKey: !ctrlEnterToSend,
             },
-            displayName: _td("New line"),
+            displayName: _td("keyboard|composer_new_line"),
         },
         [KeyBindingAction.CompleteAutocomplete]: {
             default: {
@@ -62,14 +62,14 @@ const getUIOnlyShortcuts = (): IKeyboardShortcuts => {
             default: {
                 key: Key.TAB,
             },
-            displayName: _td("Force complete"),
+            displayName: _td("keyboard|autocomplete_force"),
         },
         [KeyBindingAction.SearchInRoom]: {
             default: {
                 ctrlOrCmdKey: true,
                 key: Key.F,
             },
-            displayName: _td("Search (must be enabled)"),
+            displayName: _td("keyboard|search"),
         },
     };
 
@@ -82,7 +82,7 @@ const getUIOnlyShortcuts = (): IKeyboardShortcuts => {
                 ctrlOrCmdKey: true,
                 key: DIGITS,
             },
-            displayName: _td("Switch to space by number"),
+            displayName: _td("keyboard|switch_to_space"),
         };
     }