From 32ed4ef99ced13df20478efdead8ae1f393e1683 Mon Sep 17 00:00:00 2001
From: PatrykBuniX <patrykbunix@gmail.com>
Date: Fri, 7 Jun 2024 10:22:54 +0200
Subject: [PATCH] Revert "feat: add avs version to webapp (#17518)"

This reverts commit 7141a41afc9598f0a1deceff070b2d1c093f6d10.
---
 server/config/client.config.ts                            | 3 +--
 server/config/config.types.ts                             | 3 ---
 server/config/index.ts                                    | 8 --------
 src/i18n/en-US.json                                       | 1 -
 .../MainContent/panels/preferences/AboutPreferences.tsx   | 1 -
 src/script/util/Environment.ts                            | 2 --
 6 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/server/config/client.config.ts b/server/config/client.config.ts
index 42a167013b1..a7c58878b34 100644
--- a/server/config/client.config.ts
+++ b/server/config/client.config.ts
@@ -21,7 +21,7 @@ import {ConfigGeneratorParams} from './config.types';
 import {Env} from './env';
 
 export function generateConfig(params: ConfigGeneratorParams, env: Env) {
-  const {urls, version, env: nodeEnv, dependencies} = params;
+  const {urls, version, env: nodeEnv} = params;
   return {
     APP_BASE: urls.base,
     ANALYTICS_API_KEY: env.ANALYTICS_API_KEY,
@@ -108,7 +108,6 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
       WHATS_NEW: env.URL_WHATS_NEW,
     },
     VERSION: version,
-    AVS_VERSION: dependencies.avs,
     WEBSITE_LABEL: env.WEBSITE_LABEL,
   } as const;
 }
diff --git a/server/config/config.types.ts b/server/config/config.types.ts
index b5644d0983c..8264f58101d 100644
--- a/server/config/config.types.ts
+++ b/server/config/config.types.ts
@@ -26,7 +26,4 @@ export type ConfigGeneratorParams = {
   };
   commit: string;
   version: string;
-  dependencies: {
-    avs: string;
-  };
 };
diff --git a/server/config/index.ts b/server/config/index.ts
index fb26417de12..95082ce2ce2 100644
--- a/server/config/index.ts
+++ b/server/config/index.ts
@@ -27,12 +27,7 @@ import {Env} from './env';
 import {generateConfig as generateServerConfig} from './server.config';
 
 const versionData = readFileSync(path.resolve(__dirname, './version.json'), 'utf8');
-const packageJsonData = readFileSync(path.resolve(__dirname, '../../../package.json'), 'utf8');
-
 const version = versionData ? JSON.parse(versionData) : {version: 'unknown', commit: 'unknown'};
-const packageJson = packageJsonData ? JSON.parse(packageJsonData) : null;
-
-const readDependencyVersion = (name: string): string => packageJson?.dependencies?.[name] || 'unknown';
 
 const env = dotenv.load({
   includeProcessEnv: true,
@@ -62,9 +57,6 @@ function generateUrls() {
 const commonConfig = {
   commit: version.commit,
   version: version.version,
-  dependencies: {
-    avs: readDependencyVersion('@wireapp/avs'),
-  },
   env: env.NODE_ENV || 'production',
   urls: generateUrls(),
 };
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index 146a21edb83..bc0c1ef6bbe 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -1200,7 +1200,6 @@
   "preferencesAboutSupportWebsite": "Support website",
   "preferencesAboutTermsOfUse": "Terms of use",
   "preferencesAboutVersion": "Version {{version}}",
-  "preferencesAboutAVSVersion": "AVS version {{version}}",
   "preferencesAboutWebsite": "{{brandName}} website",
   "preferencesAccount": "Account",
   "preferencesAccountAccentColor": "Set a profile color",
diff --git a/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx b/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx
index d3a50fbdd2b..e84f03cb97a 100644
--- a/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx
@@ -111,7 +111,6 @@ const AboutPreferences: React.FC<AboutPreferencesProps> = ({selfUser, teamState
       )}
       <PreferencesSection hasSeparator>
         <p className="preferences-detail">{t('preferencesAboutVersion', config.VERSION)}</p>
-        <p className="preferences-detail">{t('preferencesAboutAVSVersion', config.AVS_VERSION)}</p>
         <p className="preferences-detail">{t('preferencesAboutCopyright')}</p>
       </PreferencesSection>
     </PreferencesPage>
diff --git a/src/script/util/Environment.ts b/src/script/util/Environment.ts
index 77c55c79ed3..2fc419bf6f1 100644
--- a/src/script/util/Environment.ts
+++ b/src/script/util/Environment.ts
@@ -49,7 +49,6 @@ interface Environment {
     isProduction: typeof isProduction;
   };
   version: (showWrapperVersion?: boolean) => string;
-  avsVersion: () => string;
 }
 
 export const Environment: Environment = {
@@ -68,5 +67,4 @@ export const Environment: Environment = {
     const showElectronVersion = electronVersion && showWrapperVersion;
     return showElectronVersion ? electronVersion : Config.getConfig().VERSION;
   },
-  avsVersion: (): string => Config.getConfig().AVS_VERSION,
 };