refactor: return only the version names from getActiveVersions

Author: erikian

src/renderer/components/settings-electron.tsx

@@ -61,9 +61,7 @@ export const ElectronSettings = observer(
       this.handleStateChange = this.handleStateChange.bind(this);
 
       this.state = {
-        activeVersions: new Set<string>([
-          props.appState.getVersionLockName(props.appState.version),
-        ]),
+        activeVersions: new Set<string>([props.appState.version]),
         isDownloadingAll: false,
         isDeletingAll: false,
       };
@@ -428,7 +426,7 @@ export const ElectronSettings = observer(
           break;
       }
 
-      if (this.state.activeVersions.has(appState.getVersionLockName(version))) {
+      if (this.state.activeVersions.has(version)) {
         return (
           <Tooltip
             position="auto"

src/renderer/state.ts

@@ -215,7 +215,7 @@ export class AppState {
 
   private static versionLockNamePrefix = 'version:';
 
-  public getVersionLockName(ver: string) {
+  private getVersionLockName(ver: string) {
     return `${AppState.versionLockNamePrefix}${ver}`;
   }
 
@@ -226,7 +226,7 @@ export class AppState {
     return ((await navigator.locks.query()).held || []).reduce<Set<string>>(
       (acc, item) => {
         if (item.name?.startsWith(AppState.versionLockNamePrefix)) {
-          acc.add(item.name);
+          acc.add(item.name.split(AppState.versionLockNamePrefix)[1]);
         }
 
         return acc;
@@ -730,7 +730,7 @@ export class AppState {
 
     const activeVersions = await this.getActiveVersions();
 
-    if (activeVersions.has(this.getVersionLockName(ver.version))) {
+    if (activeVersions.has(ver.version)) {
       console.log(`State: Not removing active version ${version}`);
       return;
     }