chore: merge temp hotfix branch to the release branch

package.json

@@ -8,7 +8,7 @@
     "@wireapp/avs": "9.6.12",
     "@wireapp/commons": "5.2.6",
     "@wireapp/core": "45.2.11",
-    "@wireapp/react-ui-kit": "9.16.0",
+    "@wireapp/react-ui-kit": "9.16.3",
     "@wireapp/store-engine-dexie": "2.1.8",
     "@wireapp/webapp-events": "0.20.1",
     "amplify": "https://github.com/wireapp/amplify#head=master",

src/script/components/InputBar/InputBar.tsx

@@ -355,14 +355,14 @@ export const InputBar = ({
 
     if (isE2EIDegraded) {
       PrimaryModal.show(PrimaryModal.type.CONFIRM, {
-        primaryAction: {
+        secondaryAction: {
           action: () => {
             conversation.mlsVerificationState(ConversationVerificationState.UNVERIFIED);
             sendMessage();
           },
           text: t('conversation.E2EISendAnyway'),
         },
-        secondaryAction: {
+        primaryAction: {
           action: () => {},
           text: t('conversation.E2EICancel'),
         },

src/script/components/RichTextEditor/plugins/SendPlugin.tsx

@@ -33,12 +33,20 @@ export function SendPlugin({onSend}: Props): null {
     return editor.registerCommand(
       KEY_ENTER_COMMAND,
       event => {
-        if (event?.shiftKey) {
+        if (!event) {
+          return false;
+        }
+
+        if (event.shiftKey) {
           return true;
         }
 
+        // When sending a message with "Enter", we want to prevent the default behavior (new line)
+        event.preventDefault();
         onSend();
-        return false;
+
+        // By returning true, we tell the editor that we've handled the event and it should stop propagation (only for the same command priority level)
+        return true;
       },
       COMMAND_PRIORITY_LOW,
     );

src/script/components/RichTextEditor/plugins/TypeaheadMenuPlugin.tsx

@@ -453,7 +453,7 @@ function LexicalPopoverMenu<TOption extends TypeaheadOption>({
           selectOptionAndCleanUp(options[selectedIndex]);
           return true;
         },
-        COMMAND_PRIORITY_LOW,
+        COMMAND_PRIORITY_NORMAL,
       ),
     );
   }, [selectOptionAndCleanUp, close, editor, options, selectedIndex, updateSelectedIndex]);

src/script/page/MainContent/panels/preferences/DevicesPreferences/components/FormattedId.styles.ts

@@ -23,6 +23,7 @@ export const devicePart = (smallPadding = false): CSSObject => ({
   display: 'inline-block',
   marginRight: smallPadding ? '4px' : '12px',
   textTransform: 'uppercase',
+  whiteSpace: 'nowrap',
 
   ...(!smallPadding && {
     width: '18px',

src/style/common/button.less

@@ -338,6 +338,7 @@
   }
 
   &:focus-visible {
+    border-radius: 16px;
     background-color: var(--accent-color-600);
     outline: 1px solid var(--accent-color-700);
   }

yarn.lock

@@ -4911,9 +4911,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/react-ui-kit@npm:9.16.0":
-  version: 9.16.0
-  resolution: "@wireapp/react-ui-kit@npm:9.16.0"
+"@wireapp/react-ui-kit@npm:9.16.3":
+  version: 9.16.3
+  resolution: "@wireapp/react-ui-kit@npm:9.16.3"
   dependencies:
     "@types/color": 3.0.6
     color: 4.2.3
@@ -4928,7 +4928,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 2e863cb084c63bf0c9b9c13adaedaa791ceeaf226c298f3a12a5be5b10ef068d8c3a90fd65188dba82b4394f45bd8a0cfaa14d38a8877c95a5c87a71cde2dcb1
+  checksum: b0f767b70f42c1baabb8cea661fd35e47b8bcb63067a10ada0f48e82b9978fa2dbfc7dbefb602cb7eb8fbf6525555b0c634864303433ca44a8e28314b4028b33
   languageName: node
   linkType: hard
 
@@ -17462,7 +17462,7 @@ __metadata:
     "@wireapp/core": 45.2.11
     "@wireapp/eslint-config": 3.0.5
     "@wireapp/prettier-config": 0.6.3
-    "@wireapp/react-ui-kit": 9.16.0
+    "@wireapp/react-ui-kit": 9.16.3
     "@wireapp/store-engine": ^5.1.4
     "@wireapp/store-engine-dexie": 2.1.8
     "@wireapp/webapp-events": 0.20.1