From 66b3fcd410dfe5c03fe567f540b7aca45c1bcd4f Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Wed, 11 Dec 2024 09:06:03 +0100 Subject: [PATCH 1/5] chore: Update translations (#18474) --- src/i18n/de-DE.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json index 05beb0de6b7..740e69b3d78 100644 --- a/src/i18n/de-DE.json +++ b/src/i18n/de-DE.json @@ -1061,9 +1061,9 @@ "modalConversationOptionsToggleServiceMessage": "Status der Dienste konnte nicht geändert werden.", "modalConversationRemoveAction": "Entfernen", "modalConversationRemoveCloseBtn": "Fenster 'Entfernen' schließen", - "modalConversationRemoveGroupAction": "Delete for Me", - "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?", - "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.", + "modalConversationRemoveGroupAction": "Für mich löschen", + "modalConversationRemoveGroupHeadline": "Gruppe {conversation} für mich löschen?", + "modalConversationRemoveGroupMessage": "Sie können dann nicht mehr auf die Gruppe und ihren Inhalt zugreifen. Es gibt keine Möglichkeit, sie wiederherzustellen.", "modalConversationRemoveGuestsHeadline": "Gastzugang deaktivieren?", "modalConversationRemoveGuestsMessage": "Aktuelle Gäste werden aus der Unterhaltung entfernt. Neue Gäste können nicht hinzugefügt werden.", "modalConversationRemoveGuestsOrServicesAction": "Deaktivieren", From c42c8136e6292a01115751a99e2e237e38a7ed19 Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:01:01 +0100 Subject: [PATCH 2/5] chore: set default api to v7 (#18478) --- src/script/Config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/Config.ts b/src/script/Config.ts index 04ba29ba490..7a2d9b25c8b 100644 --- a/src/script/Config.ts +++ b/src/script/Config.ts @@ -81,7 +81,7 @@ const config = { ALLOWED_IMAGE_TYPES: ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png'], /** Which min and max version of the backend api do we support */ - SUPPORTED_API_RANGE: [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 6], + SUPPORTED_API_RANGE: [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 7], /** DataDog client api keys acces */ dataDog: { From d309d8d0f07ab0a730c1fa2ab3af8d300047761d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wei=C3=9F?= <77456193+aweiss-dev@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:02:33 +0100 Subject: [PATCH 3/5] feat: remove the environmental mls feature flag (#18479) --- .env.localhost | 1 - server/config/client.config.ts | 1 - server/config/env.ts | 2 -- .../Modals/GroupCreation/GroupCreationModal.tsx | 11 ++++------- src/script/util/util.ts | 3 +-- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.env.localhost b/.env.localhost index 4b8da96deee..ed0eeafcc3f 100644 --- a/.env.localhost +++ b/.env.localhost @@ -19,7 +19,6 @@ ENABLE_DEV_BACKEND_API="true" #FEATURE_DEFAULT_LOGIN_TEMPORARY_CLIENT="false" #FEATURE_APPLOCK_UNFOCUS_TIMEOUT="30" #FEATURE_APPLOCK_SCHEDULED_TIMEOUT="30" -#FEATURE_ENABLE_MLS="true" #FEATURE_USE_CORE_CRYPTO="true" # staging diff --git a/server/config/client.config.ts b/server/config/client.config.ts index 5966226fd9c..7848a71c320 100644 --- a/server/config/client.config.ts +++ b/server/config/client.config.ts @@ -61,7 +61,6 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) { ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY: env.FEATURE_ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY == 'true', ENABLE_EXTRA_CLIENT_ENTROPY: env.FEATURE_ENABLE_EXTRA_CLIENT_ENTROPY == 'true', ENABLE_MEDIA_EMBEDS: env.FEATURE_ENABLE_MEDIA_EMBEDS != 'false', - ENABLE_MLS: env.FEATURE_ENABLE_MLS == 'true', ENABLE_PROTEUS_CORE_CRYPTO: env.FEATURE_ENABLE_PROTEUS_CORE_CRYPTO == 'true', ENABLE_SSO: env.FEATURE_ENABLE_SSO == 'true', ENFORCE_CONSTANT_BITRATE: env.FEATURE_ENFORCE_CONSTANT_BITRATE == 'true', diff --git a/server/config/env.ts b/server/config/env.ts index b82aaf81294..715bda788b0 100644 --- a/server/config/env.ts +++ b/server/config/env.ts @@ -78,8 +78,6 @@ export type Env = { FEATURE_ALLOWED_FILE_UPLOAD_EXTENSIONS: string; /** will enable the MLS protocol */ - FEATURE_ENABLE_MLS?: string; - FEATURE_USE_CORE_CRYPTO?: string; FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD?: string; diff --git a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx index f39792e4aca..c734c341488 100644 --- a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx +++ b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx @@ -81,15 +81,12 @@ const GroupCreationModal: React.FC = ({ } = useKoSubscribableChildren(teamState, ['isTeam', 'isMLSEnabled', 'isProtocolToggleEnabledForUser']); const {self: selfUser} = useKoSubscribableChildren(userState, ['self']); - const isMLSFeatureEnabled = Config.getConfig().FEATURE.ENABLE_MLS; - - const enableMLSToggle = isMLSFeatureEnabled && isMLSEnabledForTeam && isProtocolToggleEnabledForUser; + const enableMLSToggle = isMLSEnabledForTeam && isProtocolToggleEnabledForUser; //if feature flag is set to false or mls is disabled for current team use proteus as default - const defaultProtocol = - isMLSFeatureEnabled && isMLSEnabledForTeam - ? teamState.teamFeatures()?.mls?.config.defaultProtocol - : ConversationProtocol.PROTEUS; + const defaultProtocol = isMLSEnabledForTeam + ? teamState.teamFeatures()?.mls?.config.defaultProtocol + : ConversationProtocol.PROTEUS; const protocolOptions: ProtocolOption[] = ([ConversationProtocol.PROTEUS, ConversationProtocol.MLS] as const).map( protocol => ({ diff --git a/src/script/util/util.ts b/src/script/util/util.ts index df66753fc91..3b8251868ac 100644 --- a/src/script/util/util.ts +++ b/src/script/util/util.ts @@ -25,7 +25,6 @@ import {Runtime} from '@wireapp/commons'; import {isTabKey} from './KeyboardUtil'; import {getLogger} from './Logger'; -import {Config} from '../Config'; import type {Conversation} from '../entity/Conversation'; import {AuthError} from '../error/AuthError'; @@ -304,7 +303,7 @@ export const setContextMenuPosition = (event: React.KeyboardEvent) => { const supportsSecretStorage = () => !Runtime.isDesktopApp() || !!window.systemCrypto; // disables mls for old 'broken' desktop clients, see https://github.com/wireapp/wire-desktop/pull/6094 -export const supportsMLS = () => Config.getConfig().FEATURE.ENABLE_MLS && supportsSecretStorage(); +export const supportsMLS = () => supportsSecretStorage(); export const incomingCssClass = 'content-animation-incoming-horizontal-left'; From a91eb4e650a951c6a29f874e653dfbf50012ea16 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Wed, 11 Dec 2024 20:02:54 +0330 Subject: [PATCH 4/5] feat: bump @wireapp/core from 14.13.0 to 46.14.0 (#18481) --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 7c4691b2514..78cd8bc55f2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@mediapipe/tasks-vision": "0.10.18", "@wireapp/avs": "9.10.16", "@wireapp/commons": "5.4.0", - "@wireapp/core": "46.13.0", + "@wireapp/core": "46.14.0", "@wireapp/react-ui-kit": "9.28.0", "@wireapp/store-engine-dexie": "2.1.15", "@wireapp/telemetry": "0.1.3", diff --git a/yarn.lock b/yarn.lock index ef2c273bcab..0f981fdeca7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5941,9 +5941,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^27.13.2": - version: 27.13.2 - resolution: "@wireapp/api-client@npm:27.13.2" +"@wireapp/api-client@npm:^27.14.0": + version: 27.14.0 + resolution: "@wireapp/api-client@npm:27.14.0" dependencies: "@wireapp/commons": "npm:^5.4.0" "@wireapp/priority-queue": "npm:^2.1.11" @@ -5958,7 +5958,7 @@ __metadata: tough-cookie: "npm:4.1.4" ws: "npm:8.18.0" zod: "npm:3.23.8" - checksum: 10/1fbe961c5648fd349de4f59df29eb52e80d7999c7114066cfdfbf14a7c42e4ebfa6276218f4694aa4a141e7e6221e1b2bd9f65de48cfcd2c3207e330e00edc9d + checksum: 10/8f03bc24e21b8a1b2c78e4aa663115eb910d2cb5acbf3e4603e25ed860b72a1c2342db4cf02d2f853413386b3d6b91128d0baf72cb4c6f3237dc75f49b4a4151 languageName: node linkType: hard @@ -6012,11 +6012,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:46.13.0": - version: 46.13.0 - resolution: "@wireapp/core@npm:46.13.0" +"@wireapp/core@npm:46.14.0": + version: 46.14.0 + resolution: "@wireapp/core@npm:46.14.0" dependencies: - "@wireapp/api-client": "npm:^27.13.2" + "@wireapp/api-client": "npm:^27.14.0" "@wireapp/commons": "npm:^5.4.0" "@wireapp/core-crypto": "npm:2.0.0" "@wireapp/cryptobox": "npm:12.8.0" @@ -6034,7 +6034,7 @@ __metadata: long: "npm:^5.2.0" uuid: "npm:9.0.1" zod: "npm:3.23.8" - checksum: 10/30b90cdc3fdc0ba8e015bac7182244c410528ba66ed0a48c7aa647e8354e2b4fa6aa0c9e30af18923aa02551b6c10562632604c6d59537e49dc1e113d4858cb6 + checksum: 10/5fba4c5b419e82c65d4157582c951ed4617dadf167d02cff733c89911bdf71b84c28ff344b2b0ca7097ddcdeb4c41fb9203a1bebec07bcf1188e9cb601de19ce languageName: node linkType: hard @@ -18683,7 +18683,7 @@ __metadata: "@wireapp/avs": "npm:9.10.16" "@wireapp/commons": "npm:5.4.0" "@wireapp/copy-config": "npm:2.2.10" - "@wireapp/core": "npm:46.13.0" + "@wireapp/core": "npm:46.14.0" "@wireapp/eslint-config": "npm:3.0.7" "@wireapp/prettier-config": "npm:0.6.4" "@wireapp/react-ui-kit": "npm:9.28.0" From c40cc9fdd98884d96ae66d2141f77632e4af8dbb Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 12 Dec 2024 12:52:33 +0330 Subject: [PATCH 5/5] chore: Bump @wireapp/core from 46.14.0 to 46.14.1 (#18486) --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 78cd8bc55f2..0a5ff3a8390 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@mediapipe/tasks-vision": "0.10.18", "@wireapp/avs": "9.10.16", "@wireapp/commons": "5.4.0", - "@wireapp/core": "46.14.0", + "@wireapp/core": "46.14.1", "@wireapp/react-ui-kit": "9.28.0", "@wireapp/store-engine-dexie": "2.1.15", "@wireapp/telemetry": "0.1.3", diff --git a/yarn.lock b/yarn.lock index 0f981fdeca7..863752cecdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6005,20 +6005,20 @@ __metadata: languageName: node linkType: hard -"@wireapp/core-crypto@npm:2.0.0": - version: 2.0.0 - resolution: "@wireapp/core-crypto@npm:2.0.0" - checksum: 10/f4d9a687ba32bea4026d831f05dcc20e65436f44e6600663348aaf3089ceb1d0a6ad179d24516fc54436be104805b065ab44fe9418b3c8ef872aba8417f71ce3 +"@wireapp/core-crypto@npm:3.0.0": + version: 3.0.0 + resolution: "@wireapp/core-crypto@npm:3.0.0" + checksum: 10/7c4a1385bac9e59692ee0e4102745f20cfb5a2d4abd0025e28bce33970712125de2cc2d631769828a9339374684cb3ab9f6e737dfc0eb9af16d2f4129fec75ff languageName: node linkType: hard -"@wireapp/core@npm:46.14.0": - version: 46.14.0 - resolution: "@wireapp/core@npm:46.14.0" +"@wireapp/core@npm:46.14.1": + version: 46.14.1 + resolution: "@wireapp/core@npm:46.14.1" dependencies: "@wireapp/api-client": "npm:^27.14.0" "@wireapp/commons": "npm:^5.4.0" - "@wireapp/core-crypto": "npm:2.0.0" + "@wireapp/core-crypto": "npm:3.0.0" "@wireapp/cryptobox": "npm:12.8.0" "@wireapp/priority-queue": "npm:^2.1.11" "@wireapp/promise-queue": "npm:^2.3.10" @@ -6034,7 +6034,7 @@ __metadata: long: "npm:^5.2.0" uuid: "npm:9.0.1" zod: "npm:3.23.8" - checksum: 10/5fba4c5b419e82c65d4157582c951ed4617dadf167d02cff733c89911bdf71b84c28ff344b2b0ca7097ddcdeb4c41fb9203a1bebec07bcf1188e9cb601de19ce + checksum: 10/11a5fbedddc1c5be8218935f4b1f1ec9c7824c4261e6d189ad3708f8edcdcfaea143fd121fd57c05a790c0392e9e5757c5a82742c1c8a85fb3ff9f8360a4c650 languageName: node linkType: hard @@ -18683,7 +18683,7 @@ __metadata: "@wireapp/avs": "npm:9.10.16" "@wireapp/commons": "npm:5.4.0" "@wireapp/copy-config": "npm:2.2.10" - "@wireapp/core": "npm:46.14.0" + "@wireapp/core": "npm:46.14.1" "@wireapp/eslint-config": "npm:3.0.7" "@wireapp/prettier-config": "npm:0.6.4" "@wireapp/react-ui-kit": "npm:9.28.0"