Fix lint

RocketChat · Aug 24, 2023 · a0ef01d · a0ef01d
1 parent eb3fd48
commit a0ef01d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/app/definitions/IServer.ts b/app/definitions/IServer.ts
@@ -70,7 +70,7 @@ export interface IServer {
 	uniqueID: string;
 	enterpriseModules: IEnterpriseModules;
 	E2E_Enable: boolean;
-	supportedVersions: ISupportedVersions;
+	supportedVersions?: ISupportedVersions;
 }
 
 export type TServerModel = IServer & Model;
diff --git a/app/lib/services/getServerInfo.ts b/app/lib/services/getServerInfo.ts
@@ -33,8 +33,8 @@ const MOCKED_SUPPORTED_VERSIONS: ISupportedVersions = {
 		}
 	],
 	exceptions: {
-		// domain: string;
-		// uniqueId: string;
+		domain: 'https://open.rocket.chat',
+		uniqueId: '123',
 		// messages?: Messages[];
 		versions: [
 			{

diff --git a/app/sagas/selectServer.ts b/app/sagas/selectServer.ts
@@ -80,9 +80,7 @@ const upsertServer = async function ({ server, serverInfo }: { server: string; s
 		await serversDB.write(async () => {
 			await record.update(r => {
 				r.version = serverVersion;
-				if (serverInfo.supportedVersions?.timestamp && serverInfo.supportedVersions.timestamp > r.supportedVersions?.timestamp) {
-					r.supportedVersions = serverInfo.supportedVersions;
-				}
+				r.supportedVersions = serverInfo.supportedVersions;
 			});
 		});
 		return record;
@@ -128,7 +126,10 @@ const getServerInfo = function* getServerInfo({ server, raiseError = true }: { s
 		}
 
 		const serverRecord = yield* call(upsertServer, { server, serverInfo: serverInfoResult });
-		const isCompatible = yield* call(checkServerVersionCompatibility, serverRecord.supportedVersions, serverRecord.version);
+		const isCompatible = yield* call(checkServerVersionCompatibility, {
+			supportedVersion: serverRecord.supportedVersions,
+			serverVersion: serverRecord.version
+		});
 		if (!isCompatible) {
 			// if (raiseError) {
 			Alert.alert(I18n.t('Oops'), 'Nope');