Merge tag 'v3.39.0' into sc

* Tweak room list header menu for when space is active ([\matrix-org#7577](matrix-org#7577)). Fixes element-hq/element-web#20601.
* Tweak light hover & active color for bubble layout ([\matrix-org#7626](matrix-org#7626)). Fixes element-hq/element-web#19475.
* De-labs Metaspaces ([\matrix-org#7613](matrix-org#7613)).
* De-labs Message Bubbles layout ([\matrix-org#7612](matrix-org#7612)).
* Add customisation point for mxid display ([\matrix-org#7595](matrix-org#7595)).
* Add labs flag for default open right panel ([\matrix-org#7618](matrix-org#7618)). Fixes element-hq/element-web#20666.
* Tweak copy for the Sidebar tab in User Settings ([\matrix-org#7578](matrix-org#7578)). Fixes element-hq/element-web#20619.
* Make widgets not reload (persistent) between center and top container  ([\matrix-org#7575](matrix-org#7575)). Fixes element-hq/element-web#20596. Contributed by @toger5.
* Don't render a bubble around emotes in bubble layout ([\matrix-org#7573](matrix-org#7573)). Fixes element-hq/element-web#20617.
* Add ability to switch between voice & video in calls ([\matrix-org#7155](matrix-org#7155)). Fixes element-hq/element-web#18619. Contributed by @SimonBrandner.
* Re-renable Share option for location messages ([\matrix-org#7596](matrix-org#7596)).
* Make room ID copyable ([\matrix-org#7600](matrix-org#7600)). Fixes element-hq/element-web#20675. Contributed by @SimonBrandner.
* Improve the look of the keyboard settings tab ([\matrix-org#7562](matrix-org#7562)). Contributed by @SimonBrandner.
* Add tooltips to emoji in messages ([\matrix-org#7592](matrix-org#7592)). Fixes element-hq/element-web#9911 and element-hq/element-web#20661. Contributed by @robintown.
* Improve redundant tooltip on send button in forward dialog ([\matrix-org#7594](matrix-org#7594)). Contributed by @twigleingrid.
* Allow downloads from widgets. ([\matrix-org#7502](matrix-org#7502)). Contributed by @Fox32.
* Parse matrix-schemed URIs ([\matrix-org#7453](matrix-org#7453)).
* Show a tile at beginning of visible history ([\matrix-org#5887](matrix-org#5887)). Fixes element-hq/element-web#16818 element-hq/element-web#16679 and element-hq/element-web#19888. Contributed by @robintown.
* Enable the polls feature ([\matrix-org#7581](matrix-org#7581)).
* Display general marker on non-self location shares ([\matrix-org#7574](matrix-org#7574)).
* Improve/add notifications for location and poll events ([\matrix-org#7552](matrix-org#7552)). Fixes element-hq/element-web#20561. Contributed by @SimonBrandner.
* Upgrade linkify to v3.0 ([\matrix-org#7282](matrix-org#7282)). Fixes element-hq/element-web#17133 element-hq/element-web#16825 and element-hq/element-web#5808. Contributed by @Palid.
* Update sidebar icon from Compound ([\matrix-org#7572](matrix-org#7572)). Fixes element-hq/element-web#20615.
* Replace home icon with new one ([\matrix-org#7571](matrix-org#7571)). Fixes element-hq/element-web#20606.
* Make the `Keyboard Shortcuts` dialog into a settings tab ([\matrix-org#7198](matrix-org#7198)). Fixes element-hq/element-web#19866. Contributed by @SimonBrandner.
* Add setting for enabling location sharing ([\matrix-org#7547](matrix-org#7547)).
* Add a developer mode 'view source' button to crashed event tiles ([\matrix-org#7537](matrix-org#7537)).
* Replace `kick` terminology with `Remove from chat` ([\matrix-org#7469](matrix-org#7469)). Fixes element-hq/element-web#9547.
* Render events as extensible events (behind labs) ([\matrix-org#7462](matrix-org#7462)).
* Render Jitsi (and other sticky widgets) in PiP container, so it can be dragged and the "jump to room functionality" is provided ([\matrix-org#7450](matrix-org#7450)). Fixes element-hq/element-web#15682. Contributed by @toger5.
* Allow bubble layout in Thread View ([\matrix-org#7478](matrix-org#7478)). Fixes element-hq/element-web#20419.
* Make LocationPicker appearance cleaner ([\matrix-org#7516](matrix-org#7516)).
* Limit max-width for bubble layout to 1200px ([\matrix-org#7458](matrix-org#7458)). Fixes element-hq/element-web#18072.
* Improve look of call events in bubble layout ([\matrix-org#7445](matrix-org#7445)). Fixes element-hq/element-web#20324. Contributed by @SimonBrandner.
* Make files & voice memos in bubble layout match colouring ([\matrix-org#7457](matrix-org#7457)). Fixes element-hq/element-web#20326.
* Allow cancelling events whilst they are encrypting ([\matrix-org#7483](matrix-org#7483)). Fixes element-hq/element-web#17726.
* [Release] Fix left panel widgets causing app-wide crash ([\matrix-org#7660](matrix-org#7660)).
* Load light theme prior to HTML export to ensure it is present ([\matrix-org#7643](matrix-org#7643)). Fixes element-hq/element-web#20276.
* Fix soft-crash when hanging up Jitsi via PIP ([\matrix-org#7645](matrix-org#7645)). Fixes element-hq/element-web#20766.
* Fix RightPanelStore assuming isViewingRoom is false on load ([\matrix-org#7642](matrix-org#7642)).
* Correctly handle Room.timeline events which have a nullable `Room` ([\matrix-org#7635](matrix-org#7635)). Fixes matrix-org/element-web-rageshakes#9490.
* Translate keyboard shortcut alternate key names ([\matrix-org#7633](matrix-org#7633)). Fixes element-hq/element-web#20739.
* Fix unfocused paste handling and focus return for file uploads ([\matrix-org#7625](matrix-org#7625)).
* Changed MacOS hotkey for GoToHome view. ([\matrix-org#7631](matrix-org#7631)). Contributed by @aj-ya.
* Fix issue with the new composer EmojiPart which caused infinite loops ([\matrix-org#7629](matrix-org#7629)). Fixes element-hq/element-web#20746.
* Upgrade linkifyjs to fix schemes as domain prefixes ([\matrix-org#7628](matrix-org#7628)). Fixes element-hq/element-web#20720.
* Show bubble tile timestamps for bubble layout inside the bubble ([\matrix-org#7622](matrix-org#7622)). Fixes element-hq/element-web#20562.
*  Improve taken username warning in registration for when request fails ([\matrix-org#7621](matrix-org#7621)).
* Avoid double dialog after clicking to remove a public room ([\matrix-org#7604](matrix-org#7604)). Fixes element-hq/element-web#20681. Contributed by @c-cal.
* Fix space member list right panel state ([\matrix-org#7617](matrix-org#7617)). Fixes element-hq/element-web#20716.
* Fall back to legacy analytics for guest users ([\matrix-org#7616](matrix-org#7616)).
* Always emit a space filter update when the space is actually changed ([\matrix-org#7611](matrix-org#7611)). Fixes element-hq/element-web#20664.
* Enlarge emoji in composer ([\matrix-org#7602](matrix-org#7602)). Fixes element-hq/element-web#20665 element-hq/element-web#15635 and element-hq/element-web#20688. Contributed by @robintown.
* Disable location sharing button on Desktop ([\matrix-org#7590](matrix-org#7590)).
* Make pills more natural to navigate around ([\matrix-org#7607](matrix-org#7607)). Fixes element-hq/element-web#20678. Contributed by @robintown.
* Fix excessive padding on inline images ([\matrix-org#7605](matrix-org#7605)). Contributed by @robintown.
* Prevent pills from being split by formatting actions ([\matrix-org#7606](matrix-org#7606)). Contributed by @robintown.
* Fix translation of "powerText" ([\matrix-org#7603](matrix-org#7603)). Contributed by @c-cal.
* Unhide display names when switching back to modern layout ([\matrix-org#7601](matrix-org#7601)). Fixes element-hq/element-web#20676. Contributed by @robintown.
* Fix space member list not opening ([\matrix-org#7609](matrix-org#7609)). Fixes element-hq/element-web#20679. Contributed by @SimonBrandner.
* Fix translation for the "Add room" tooltip ([\matrix-org#7532](matrix-org#7532)). Contributed by @c-cal.
* Make the close button of the location share dialog visible in high-contrast theme ([\matrix-org#7597](matrix-org#7597)).
* Cancel pending events in virtual room when call placed ([\matrix-org#7583](matrix-org#7583)). Fixes element-hq/element-web#17594.
* Fix alignment of unread badge in thread list ([\matrix-org#7582](matrix-org#7582)). Fixes element-hq/element-web#20643.
* Fix left positioned tooltips being wrong and offset by fixed value ([\matrix-org#7551](matrix-org#7551)).
* Fix MAB overlapping or overflowing in bubbles layout and threads regressions ([\matrix-org#7569](matrix-org#7569)). Fixes element-hq/element-web#20403 and element-hq/element-web#20404.
* Fix wrong icon being used for appearance tab in space preferences dialog ([\matrix-org#7570](matrix-org#7570)). Fixes element-hq/element-web#20608.
* Fix `/jumptodate` using wrong MSC feature flag ([\matrix-org#7563](matrix-org#7563)).
* Ensure maps show up in replies and threads, by creating unique IDs ([\matrix-org#7568](matrix-org#7568)).
* Differentiate between hover and roving focus in spotlight dialog ([\matrix-org#7564](matrix-org#7564)). Fixes element-hq/element-web#20597.
* Fix timeline jumping issues related to bubble layout ([\matrix-org#7529](matrix-org#7529)). Fixes element-hq/element-web#20302.
* Start a conference in a room with 2 people + invitee rather than a 1:1 call ([\matrix-org#7557](matrix-org#7557)). Fixes element-hq/element-web#1202. Contributed by @SimonBrandner.
* Wait for initial profile load before displaying widget ([\matrix-org#7556](matrix-org#7556)).
* Make widgets and calls span across the whole room width when using bubble layout ([\matrix-org#7553](matrix-org#7553)). Fixes element-hq/element-web#20560. Contributed by @SimonBrandner.
* Always show right panel after setting a card ([\matrix-org#7544](matrix-org#7544)). Contributed by @toger5.
* Support deserialising HR tags for editing ([\matrix-org#7543](matrix-org#7543)). Fixes element-hq/element-web#20553.
* Refresh ThreadView after React state has been updated ([\matrix-org#7539](matrix-org#7539)). Fixes element-hq/element-web#20549.
* Set initial zoom level to 1 to make zooming to location faster ([\matrix-org#7541](matrix-org#7541)).
* truncate room name on pip header ([\matrix-org#7538](matrix-org#7538)).
* Prevent enter to send edit weirdness when no change has been made ([\matrix-org#7522](matrix-org#7522)). Fixes element-hq/element-web#20507.
* Allow using room pills in slash commands ([\matrix-org#7513](matrix-org#7513)). Fixes element-hq/element-web#20343.

.eslintrc.js

@@ -45,7 +45,6 @@ module.exports = {
         "jsx-a11y/alt-text": "off",
         "jsx-a11y/aria-activedescendant-has-tabindex": "off",
         "jsx-a11y/click-events-have-key-events": "off",
-        "jsx-a11y/iframe-has-title": "off",
         "jsx-a11y/interactive-supports-focus": "off",
         "jsx-a11y/label-has-associated-control": "off",
         "jsx-a11y/media-has-caption": "off",

.github/workflows/layered-build.yaml

@@ -17,16 +17,4 @@ jobs:
                   path: element-web/webapp
                   # We'll only use this in a triggered job, then we're done with it
                   retention-days: 1
-            - uses: actions/[email protected]
-              with:
-                script: |
-                    var fs = require('fs');
-                    fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
-            - name: Upload PR Info
-              uses: actions/upload-artifact@v2
-              with:
-                  name: pr.json
-                  path: pr.json
-                  # We'll only use this in a triggered job, then we're done with it
-                  retention-days: 1
 

.github/workflows/netlify.yaml

@@ -33,28 +33,8 @@ jobs:
                   });
                   var fs = require('fs');
                   fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
-
-                  var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
-                    return artifact.name == "pr.json"
-                  })[0];
-                  var download = await github.actions.downloadArtifact({
-                     owner: context.repo.owner,
-                     repo: context.repo.repo,
-                     artifact_id: prInfoArtifact.id,
-                     archive_format: 'zip',
-                  });
-                  var fs = require('fs');
-                  fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
             - name: Extract Artifacts
-              run: unzip -d webapp previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
-            - name: 'Read PR Info'
-              id: readctx
-              uses: actions/[email protected]
-              with:
-                script: |
-                    var fs = require('fs');
-                    var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
-                    console.log(`::set-output name=prnumber::${pr.number}`);
+              run: unzip -d webapp previewbuild.zip && rm previewbuild.zip
             - name: Deploy to Netlify
               id: netlify
               uses: nwtgck/[email protected]
@@ -73,7 +53,7 @@ jobs:
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               with:
-                  pull-request-number: ${{ steps.readctx.outputs.prnumber }}
+                  pull-request-number: ${{github.event.workflow_run.pull_requests[0].number}}
                   description-message: |
                       Preview: ${{ steps.netlify.outputs.deploy-url }}
                       ⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.

docs/settings.md

@@ -25,7 +25,7 @@ that room administrators cannot force account-only settings upon participants.
 ## Settings
 
 Settings are the different options a user may set or experience in the application. These are pre-defined in 
-`src/settings/Settings.ts` under the `SETTINGS` constant, and match the `ISetting` interface as defined there.
+`src/settings/Settings.tsx` under the `SETTINGS` constant, and match the `ISetting` interface as defined there.
 
 Settings that support the config level can be set in the config file under the `settingDefaults` key (note that some 
 settings, like the "theme" setting, are special cased in the config file):

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.38.0",
+  "version": "3.39.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -29,6 +29,9 @@
   "matrix_src_main": "./src/index.ts",
   "matrix_lib_main": "./lib/index.ts",
   "matrix_lib_typings": "./lib/index.d.ts",
+  "matrix_i18n_extra_translation_funcs": [
+    "newTranslatableError"
+  ],
   "scripts": {
     "prepublishOnly": "yarn build",
     "i18n": "matrix-gen-i18n",
@@ -55,6 +58,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
+    "@matrix-org/linkify-element": "^4.0.0-rc.5",
+    "@matrix-org/linkify-string": "^4.0.0-rc.5",
+    "@matrix-org/linkifyjs": "^4.0.0-rc.6",
     "@sentry/browser": "^6.11.0",
     "@sentry/tracing": "^6.11.0",
     "@types/geojson": "^7946.0.8",
@@ -82,11 +88,11 @@
     "is-ip": "^3.1.0",
     "jszip": "^3.7.0",
     "katex": "^0.12.0",
-    "linkifyjs": "^2.1.9",
     "lodash": "^4.17.20",
     "maplibre-gl": "^1.15.2",
-    "matrix-analytics-events": "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
-    "matrix-js-sdk": "15.4.0",
+    "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
+    "matrix-events-sdk": "^0.0.1-beta.6",
+    "matrix-js-sdk": "15.5.0",
     "matrix-widget-api": "^0.1.0-beta.18",
     "minimist": "^1.2.5",
     "opus-recorder": "^8.0.3",
@@ -141,7 +147,6 @@
     "@types/file-saver": "^2.0.3",
     "@types/flux": "^3.1.9",
     "@types/jest": "^26.0.20",
-    "@types/linkifyjs": "^2.1.3",
     "@types/lodash": "^4.14.168",
     "@types/modernizr": "^3.5.3",
     "@types/node": "^14.14.22",
@@ -178,7 +183,7 @@
     "jest-raw-loader": "^1.0.1",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.3",
-    "matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
+    "matrix-web-i18n": "^1.2.0",
     "raw-loader": "^4.0.2",
     "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",

res/css/_common.scss

@@ -427,7 +427,7 @@ legend {
  * Elements that should not be styled like a dialog button are mentioned in a :not() pseudo-class.
  * For the widest browser support, we use multiple :not pseudo-classes instead of :not(.a, .b).
  */
-.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton),
+.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton),
 .mx_Dialog input[type="submit"],
 .mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
 .mx_Dialog_buttons input[type="submit"] {
@@ -444,49 +444,49 @@ legend {
     font-family: inherit;
 }
 
-.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):last-child {
+.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):last-child {
     margin-right: 0px;
 }
 
-.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):hover,
+.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):hover,
 .mx_Dialog input[type="submit"]:hover,
 .mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):hover,
 .mx_Dialog_buttons input[type="submit"]:hover {
     @mixin mx_DialogButton_hover;
 }
 
-.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):focus,
+.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):focus,
 .mx_Dialog input[type="submit"]:focus,
 .mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):focus,
 .mx_Dialog_buttons input[type="submit"]:focus {
     filter: brightness($focus-brightness);
 }
 
-.mx_Dialog button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
+.mx_Dialog button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]),
 .mx_Dialog input[type="submit"].mx_Dialog_primary,
-.mx_Dialog_buttons button.mx_Dialog_primary,
+.mx_Dialog_buttons button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
 .mx_Dialog_buttons input[type="submit"].mx_Dialog_primary {
     color: $accent-fg-color;
     background-color: $accent;
     min-width: 156px;
 }
 
-.mx_Dialog button.danger:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
+.mx_Dialog button.danger:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]),
 .mx_Dialog input[type="submit"].danger,
-.mx_Dialog_buttons button.danger,
+.mx_Dialog_buttons button.danger:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
 .mx_Dialog_buttons input[type="submit"].danger {
     background-color: $alert;
     border: solid 1px $alert;
     color: $accent-fg-color;
 }
 
-.mx_Dialog button.warning:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
+.mx_Dialog button.warning:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]),
 .mx_Dialog input[type="submit"].warning {
     border: solid 1px $alert;
     color: $alert;
 }
 
-.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):disabled,
+.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):disabled,
 .mx_Dialog input[type="submit"]:disabled,
 .mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):disabled,
 .mx_Dialog_buttons input[type="submit"]:disabled {

res/css/_components.scss

@@ -95,7 +95,6 @@
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
 @import "./views/dialogs/_JoinRuleDropdown.scss";
-@import "./views/dialogs/_KeyboardShortcutsDialog.scss";
 @import "./views/dialogs/_LeaveSpaceDialog.scss";
 @import "./views/dialogs/_LocationViewDialog.scss";
 @import "./views/dialogs/_ManageRestrictedJoinRuleDialog.scss";
@@ -134,6 +133,7 @@
 @import "./views/elements/_AccessibleButton.scss";
 @import "./views/elements/_AddressSelector.scss";
 @import "./views/elements/_AddressTile.scss";
+@import "./views/elements/_CopyableText.scss";
 @import "./views/elements/_DesktopBuildsNotice.scss";
 @import "./views/elements/_DesktopCapturerSourcePicker.scss";
 @import "./views/elements/_DialPadBackspaceButton.scss";
@@ -184,6 +184,7 @@
 @import "./views/messages/_CreateEvent.scss";
 @import "./views/messages/_DateSeparator.scss";
 @import "./views/messages/_EventTileBubble.scss";
+@import "./views/messages/_HiddenBody.scss";
 @import "./views/messages/_MEmoteBody.scss";
 @import "./views/messages/_MFileBody.scss";
 @import "./views/messages/_MImageBody.scss";
@@ -228,6 +229,7 @@
 @import "./views/rooms/_EventTile.scss";
 @import "./views/rooms/_GroupLayout.scss";
 @import "./views/rooms/_BubbleLayout.scss";
+@import "./views/rooms/_HistoryTile.scss";
 @import "./views/rooms/_IRCLayout.scss";
 @import "./views/rooms/_JumpToBottomButton.scss";
 @import "./views/rooms/_LinkPreviewGroup.scss";
@@ -287,6 +289,7 @@
 @import "./views/settings/tabs/user/_AppearanceUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_GeneralUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_HelpUserSettingsTab.scss";
+@import "./views/settings/tabs/user/_KeyboardUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_LabsUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_MjolnirUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_NotificationUserSettingsTab.scss";
@@ -305,7 +308,6 @@
 @import "./views/typography/_Heading.scss";
 @import "./views/verification/_VerificationShowSas.scss";
 @import "./views/voip/CallView/_CallViewButtons.scss";
-@import "./views/voip/_CallContainer.scss";
 @import "./views/voip/_CallPreview.scss";
 @import "./views/voip/_CallView.scss";
 @import "./views/voip/_CallViewForRoom.scss";
@@ -314,4 +316,5 @@
 @import "./views/voip/_DialPad.scss";
 @import "./views/voip/_DialPadContextMenu.scss";
 @import "./views/voip/_DialPadModal.scss";
+@import "./views/voip/_PiPContainer.scss";
 @import "./views/voip/_VideoFeed.scss";

res/css/structures/_SpacePanel.scss

@@ -387,6 +387,10 @@ $activeBorderColor: $primary-content;
         line-height: $font-18px;
     }
 
+    .mx_SpacePanel_iconHome::before {
+        mask-image: url('$(res)/img/element-icons/home.svg');
+    }
+
     .mx_SpacePanel_iconInvite::before {
         mask-image: url('$(res)/img/element-icons/room/invite.svg');
     }
@@ -408,7 +412,7 @@ $activeBorderColor: $primary-content;
     }
 
     .mx_SpacePanel_iconExplore::before {
-        mask-image: url('$(res)/img/element-icons/roomlist/search.svg');
+        mask-image: url('$(res)/img/element-icons/roomlist/hash-search.svg');
     }
 
     .mx_SpacePanel_iconPreferences::before {

res/css/structures/_UserMenu.scss

@@ -176,7 +176,7 @@ limitations under the License.
     }
 
     .mx_UserMenu_iconHome::before {
-        mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
+        mask-image: url('$(res)/img/element-icons/home.svg');
     }
 
     .mx_UserMenu_iconDnd::before {

res/css/views/dialogs/_SpacePreferencesDialog.scss

@@ -44,3 +44,7 @@ limitations under the License.
         }
     }
 }
+
+.mx_SpacePreferencesDialog_appearanceIcon::before {
+    mask-image: url('$(res)/img/element-icons/settings/appearance.svg');
+}

res/css/views/dialogs/_SpotlightDialog.scss

@@ -154,10 +154,10 @@ limitations under the License.
 
                 &:hover, &[aria-selected=true] {
                     background-color: $system;
+                }
 
-                    .mx_SpotlightDialog_enterPrompt {
-                        display: inline-block;
-                    }
+                &[aria-selected=true] .mx_SpotlightDialog_enterPrompt {
+                    display: inline-block;
                 }
             }
         }

res/css/views/dialogs/_UserSettingsDialog.scss

@@ -37,6 +37,10 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/settings/preference.svg');
 }
 
+.mx_UserSettingsDialog_keyboardIcon::before {
+    mask-image: url('$(res)/img/element-icons/settings/keyboard.svg');
+}
+
 .mx_UserSettingsDialog_sidebarIcon::before {
     mask-image: url('$(res)/img/element-icons/settings/sidebar.svg');
 }

res/css/views/elements/_CopyableText.scss

@@ -0,0 +1,47 @@
+/*
+Copyright 2019 New Vector Ltd
+Copyright 2022 Šimon Brandner <[email protected]>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_CopyableText {
+    display: flex;
+    border-radius: 5px;
+    border: solid 1px $light-fg-color;
+    margin-bottom: 10px;
+    margin-top: 10px;
+    padding: 10px;
+    width: max-content;
+    max-width: 100%;
+
+    .mx_CopyableText_copyButton {
+        flex-shrink: 0;
+        width: 20px;
+        height: 20px;
+        cursor: pointer;
+        margin-left: 20px;
+        display: block;
+
+        &::before {
+            content: "";
+
+            mask-image: url($copy-button-url);
+            background-color: $message-action-bar-fg-color;
+            width: 20px;
+            height: 20px;
+            display: block;
+            background-repeat: no-repeat;
+        }
+    }
+}

res/css/views/elements/_RichText.scss

@@ -86,6 +86,11 @@ a.mx_Pill {
     margin-right: 0.24rem;
 }
 
+.mx_Emoji {
+    font-size: 1.8rem;
+    vertical-align: bottom;
+}
+
 .mx_Markdown_BOLD {
     font-weight: bold;
 }

res/css/views/elements/_Tooltip.scss

@@ -60,7 +60,8 @@ limitations under the License.
     font-weight: 500;
     max-width: 200px;
     word-break: break-word;
-    margin-right: 50px;
+    margin-left: 6px;
+    margin-right: 6px;
 
     background-color: #21262C; // Same on both themes
     color: $accent-fg-color;