Merge branch 'dev' into dependabot/npm_and_yarn/types/react-18.2.27

wireapp · Oct 11, 2023 · 9b26d5b · 9b26d5b
2 parents 7337397 + 0ca6116
commit 9b26d5b
Show file tree

Hide file tree

Showing 47 changed files with 1,424 additions and 1,024 deletions.
diff --git a/.github/workflows/deploy-to-test-env.yml b/.github/workflows/deploy-to-test-env.yml
@@ -9,7 +9,6 @@ on:
         type: choice
         options:
           - wire-webapp-qa-al2-migration
-          - wire-webapp-edge-al2
           - wire-webapp-mls-al2
 
 concurrency:

diff --git a/package.json b/package.json
@@ -7,9 +7,9 @@
     "@lexical/react": "0.12.2",
     "@wireapp/avs": "9.4.14",
     "@wireapp/commons": "5.2.1",
-    "@wireapp/core": "42.10.1",
+    "@wireapp/core": "42.12.1",
     "@wireapp/lru-cache": "3.8.1",
-    "@wireapp/react-ui-kit": "9.9.9",
+    "@wireapp/react-ui-kit": "9.9.10",
     "@wireapp/store-engine-dexie": "2.1.6",
     "@wireapp/store-engine-sqleet": "1.8.9",
     "@wireapp/webapp-events": "0.18.3",
@@ -69,7 +69,7 @@
     "@koush/wrtc": "0.5.3",
     "@testing-library/react": "14.0.0",
     "@types/adm-zip": "0.5.2",
-    "@types/dexie-batch": "0.4.4",
+    "@types/dexie-batch": "0.4.5",
     "@types/eslint": "^8",
     "@types/fs-extra": "11.0.2",
     "@types/generate-changelog": "1.8.1",
@@ -92,7 +92,7 @@
     "@types/seedrandom": "^3",
     "@types/sinon": "10.0.19",
     "@types/speakingurl": "13.0.4",
-    "@types/underscore": "1.11.10",
+    "@types/underscore": "1.11.11",
     "@types/webpack-env": "1.18.2",
     "@wireapp/copy-config": "2.1.9",
     "@wireapp/eslint-config": "3.0.4",
@@ -111,7 +111,7 @@
     "dotenv": "16.3.1",
     "dpdm": "3.14.0",
     "eslint": "^8.51.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "fake-indexeddb": "4.0.2",
     "generate-changelog": "1.8.0",
     "html-webpack-plugin": "^5.5.3",

diff --git a/src/__mocks__/@wireapp/core.ts b/src/__mocks__/@wireapp/core.ts
@@ -59,6 +59,8 @@ export class Account extends EventEmitter {
       messageTimer: {
         setConversationLevelTimer: jest.fn(),
       },
+      removeUsersFromMLSConversation: jest.fn(),
+      removeUserFromConversation: jest.fn(),
     },
 
     client: {

diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
@@ -412,6 +412,7 @@
   "conversationMemberLeftYou": "[bold]You[/bold] left",
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",

diff --git a/src/script/components/ConnectRequests/ConnectionRequests.tsx b/src/script/components/ConnectRequests/ConnectionRequests.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {FC, useContext, useEffect, useRef} from 'react';
+import {useContext, useEffect, useRef} from 'react';
 
 import {container} from 'tsyringe';
 
@@ -39,14 +39,12 @@ import {UserState} from '../../user/UserState';
 interface ConnectRequestsProps {
   readonly userState: UserState;
   readonly teamState: TeamState;
-  readonly selfUser: User;
 }
 
-export const ConnectRequests: FC<ConnectRequestsProps> = ({
+export const ConnectRequests = ({
   userState = container.resolve(UserState),
   teamState = container.resolve(TeamState),
-  selfUser,
-}) => {
+}: ConnectRequestsProps) => {
   const connectRequestsRefEnd = useRef<HTMLDivElement | null>(null);
   const temporaryConnectRequestsCount = useRef<number>(0);
 

diff --git a/src/script/components/Conversation/Conversation.tsx b/src/script/components/Conversation/Conversation.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {FC, UIEvent, useCallback, useState} from 'react';
+import {UIEvent, useCallback, useState} from 'react';
 
 import cx from 'classnames';
 import {container} from 'tsyringe';
@@ -62,26 +62,25 @@ import {RightSidebarParams} from '../../page/AppMain';
 import {PanelState} from '../../page/RightSidebar';
 import {useMainViewModel} from '../../page/RootProvider';
 import {TeamState} from '../../team/TeamState';
-import {UserState} from '../../user/UserState';
 import {ElementType, MessageDetails} from '../MessagesList/Message/ContentMessage/asset/TextMessageRenderer';
 
 interface ConversationProps {
   readonly initialMessage?: Message;
   readonly teamState: TeamState;
-  readonly userState: UserState;
+  selfUser: User;
   openRightSidebar: (panelState: PanelState, params: RightSidebarParams, compareEntityId?: boolean) => void;
   isRightSidebarOpen?: boolean;
 }
 
 const CONFIG = Config.getConfig();
 
-export const Conversation: FC<ConversationProps> = ({
+export const Conversation = ({
   initialMessage,
   teamState,
-  userState,
+  selfUser,
   openRightSidebar,
   isRightSidebarOpen = false,
-}) => {
+}: ConversationProps) => {
   const messageListLogger = getLogger('ConversationList');
 
   const mainViewModel = useMainViewModel();
@@ -100,7 +99,6 @@ export const Conversation: FC<ConversationProps> = ({
     'isFileSharingSendingEnabled',
   ]);
   const {is1to1, isRequest} = useKoSubscribableChildren(activeConversation!, ['is1to1', 'isRequest']);
-  const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
   const {inTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);
 
   const {activeCalls} = useKoSubscribableChildren(callState, ['activeCalls']);