Use gRPC to AppVersionInfo converter

2 files changed, 5 insertions, 2 deletions

diff --git a/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts b/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
index 03655b905a..4e2159ffc6 100644
--- a/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
+++ b/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
@@ -34,6 +34,7 @@ import { ConnectionObserver, GrpcClient, noConnectionError } from './grpc-client
 import {
   convertFromApiAccessMethodSetting,
   convertFromAppUpgradeEvent,
+  convertFromAppVersionInfo,
   convertFromDaemonEvent,
   convertFromDevice,
   convertFromDeviceState,
@@ -493,7 +494,9 @@ export class DaemonRpc extends GrpcClient {
 
   public async getVersionInfo(): Promise<IAppVersionInfo> {
     const response = await this.callEmpty<grpcTypes.AppVersionInfo>(this.client.getVersionInfo);
-    return response.toObject();
+    const versionInfo = convertFromAppVersionInfo(response);
+
+    return versionInfo;
   }
 
   public async addSplitTunnelingApplication(path: string): Promise<void> {
diff --git a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
index 5ad3a14e6f..0c1a45b9cf 100644
--- a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
+++ b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
@@ -821,7 +821,7 @@ export function convertFromDaemonEvent(data: grpcTypes.DaemonEvent): DaemonEvent
 
   const versionInfo = data.getVersionInfo();
   if (versionInfo !== undefined) {
-    return { appVersionInfo: versionInfo.toObject() };
+    return { appVersionInfo: convertFromAppVersionInfo(versionInfo) };
   }
 
   const newAccessMethod = data.getNewAccessMethod();