Skip to content

Commit 9f41b57

Browse files
authored
remove electron deps from about.tsx (#3194)
1 parent 28bab88 commit 9f41b57

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

frontend/app/modals/about.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
import Logo from "@/app/asset/logo.svg";
55
import { OnboardingGradientBg } from "@/app/onboarding/onboarding-common";
6+
import { atoms } from "@/app/store/global";
67
import { modalsModel } from "@/app/store/modalmodel";
78
import { RpcApi } from "@/app/store/wshclientapi";
89
import { TabRpcClient } from "@/app/store/wshrpcutil";
910
import { isDev } from "@/util/isdev";
1011
import { fireAndForget } from "@/util/util";
11-
import { useEffect, useState } from "react";
12-
import { getApi } from "../store/global";
12+
import { useAtomValue } from "jotai";
13+
import { useEffect } from "react";
1314
import { Modal } from "./modal";
1415

1516
interface AboutModalVProps {
@@ -84,9 +85,9 @@ const AboutModalV = ({ versionString, updaterChannel, onClose }: AboutModalVProp
8485
AboutModalV.displayName = "AboutModalV";
8586

8687
const AboutModal = () => {
87-
const [details] = useState(() => getApi().getAboutModalDetails());
88-
const [updaterChannel] = useState(() => getApi().getUpdaterChannel());
89-
const versionString = `${details.version} (${isDev() ? "dev-" : ""}${details.buildTime})`;
88+
const fullConfig = useAtomValue(atoms.fullConfigAtom);
89+
const versionString = `${fullConfig?.version ?? ""} (${isDev() ? "dev-" : ""}${fullConfig?.buildtime ?? ""})`;
90+
const updaterChannel = fullConfig?.settings?.["autoupdate:channel"] ?? "latest";
9091

9192
useEffect(() => {
9293
fireAndForget(async () => {

frontend/types/gotypes.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,8 @@ declare global {
10201020
bookmarks: {[key: string]: WebBookmark};
10211021
waveai: {[key: string]: AIModeConfigType};
10221022
configerrors: ConfigError[];
1023+
version: string;
1024+
buildtime: string;
10231025
};
10241026

10251027
// waveobj.Job

pkg/wconfig/settingsconfig.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ type FullConfigType struct {
376376
Bookmarks map[string]WebBookmark `json:"bookmarks"`
377377
WaveAIModes map[string]AIModeConfigType `json:"waveai"`
378378
ConfigErrors []ConfigError `json:"configerrors" configfile:"-"`
379+
Version string `json:"version" configfile:"-"`
380+
BuildTime string `json:"buildtime" configfile:"-"`
379381
}
380382

381383
type ConnKeywords struct {
@@ -696,6 +698,8 @@ func ReadFullConfig() FullConfigType {
696698
utilfn.ReUnmarshal(fieldPtr, configPart)
697699
}
698700
}
701+
fullConfig.Version = wavebase.WaveVersion
702+
fullConfig.BuildTime = wavebase.BuildTime
699703
return fullConfig
700704
}
701705

0 commit comments

Comments
 (0)