From c15655defeb9616cfdde83b477307c94cb3058cd Mon Sep 17 00:00:00 2001
From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:48:04 +0100
Subject: [PATCH] FIX: Release Fixes (#2194)

* ADD: logs to debug

* FIX: lines warning

* FIX: removing imported dplg key

* REMOVE: log

* FIX: fetching dplg interval

* ADD: fetching dplg interval

* FIX: some fixes on lines

* REMOVE: CSM Website Link

* REMOVE: Log for prysm keystore mod change

* FIX: only get csm stats if lcom is running

* FIX: csm in queue value

* FIX: CSM stats somewhat

* FIX: missing translation

* FIX: preline issue

* FIX: wrong pass for dplg

* REMOVE: comments & logs

* FIX: open app twice

* FIX: format

---------

Co-authored-by: NeoPlays <80448387+NeoPlays@users.noreply.github.com>
---
 launcher/src/App.vue                          |  10 +-
 launcher/src/backend/Monitoring.js            |   1 +
 .../src/backend/ValidatorAccountManager.js    |   3 +-
 launcher/src/backend/web3/CSM.js              |  10 +-
 launcher/src/background.js                    | 290 +++++++++---------
 .../components/widgets/CsmStateWidget.vue     |  23 +-
 .../components/widgets/IdKeyCsm.vue           |  29 +-
 .../UI/edit-page/components/edit/EditBody.vue |   2 +-
 .../components/UI/node-page/NodeScreen.vue    |   1 +
 .../UI/node-page/components/node/NodeBody.vue |   2 +-
 .../UI/staking-page/StakingScreen.vue         |  11 +-
 .../staking-page/components/list/ListBody.vue |  38 ++-
 .../components/list/rows/DoppelGCheckRow.vue  |  41 +--
 .../components/client-commands/ButtonBox.vue  |  14 +-
 .../src/components/layers/ConnectionLine.vue  |  17 +-
 launcher/src/composables/importKey.js         |  16 +-
 launcher/src/composables/validators.js        |  17 +-
 launcher/src/languages/en.json                |   3 +-
 18 files changed, 256 insertions(+), 272 deletions(-)

diff --git a/launcher/src/App.vue b/launcher/src/App.vue
index 30232dbf9b..e3691fcd9c 100755
--- a/launcher/src/App.vue
+++ b/launcher/src/App.vue
@@ -3,8 +3,14 @@
     <router-view> </router-view>
   </div>
 </template>
-<script>
-export default {};
+<script setup>
+import { onMounted } from "vue";
+
+onMounted(() => {
+  setTimeout(() => {
+    window.HSStaticMethods.autoInit();
+  }, 100);
+});
 </script>
 <style>
 * {
diff --git a/launcher/src/backend/Monitoring.js b/launcher/src/backend/Monitoring.js
index 8dea9f3ce3..8ba2940644 100755
--- a/launcher/src/backend/Monitoring.js
+++ b/launcher/src/backend/Monitoring.js
@@ -157,6 +157,7 @@ export class Monitoring {
             config: {
               serviceID: config.id,
               configVersion: config.configVersion,
+              env: config.env,
               image: config.image,
               imageVersion: config.imageVersion,
               runningImageVersion: newState?.Image ? newState.Image.split(":").pop() : null,
diff --git a/launcher/src/backend/ValidatorAccountManager.js b/launcher/src/backend/ValidatorAccountManager.js
index a29dfdffb4..34362632fe 100755
--- a/launcher/src/backend/ValidatorAccountManager.js
+++ b/launcher/src/backend/ValidatorAccountManager.js
@@ -563,8 +563,7 @@ export class ValidatorAccountManager {
           walletPath = service.volumes.find((v) => v.servicePath == "/opt/app/data/wallets").destinationPath;
         }
         //Make sure keystores have correct permissions
-        const chmodResult = await this.nodeConnection.sshService.exec("chmod -Rv 600 " + walletPath + "/direct/accounts/*");
-        log.info(chmodResult.stdout);
+        await this.nodeConnection.sshService.exec("chmod -Rv 600 " + walletPath + "/direct/accounts/*");
         if (walletPath) {
           result = await this.nodeConnection.sshService.exec("cat " + walletPath + "/auth-token");
           result.stdout = result.stdout
diff --git a/launcher/src/backend/web3/CSM.js b/launcher/src/backend/web3/CSM.js
index d2d947a0b0..65310c95d9 100644
--- a/launcher/src/backend/web3/CSM.js
+++ b/launcher/src/backend/web3/CSM.js
@@ -95,10 +95,9 @@ async function getNodeOperatorInfo(contract, nodeOperatorId) {
     }
 
     const nodeOperator = await contract.methods.getNodeOperator(nodeOperatorId).call();
-    const enqueuedCount = nodeOperator.enqueuedCount;
 
     //log.info("Enqueued Count:", enqueuedCount);
-    return enqueuedCount;
+    return nodeOperator;
   } catch (error) {
     log.error("Error calling getNodeOperator:", error);
     return null;
@@ -240,7 +239,8 @@ async function getSigningKeysWithQueueInfo(monitoring) {
     }
 
     // Retrieve enqueued count
-    const enqueuedCount = await getNodeOperatorInfo(contract, nodeOperatorId);
+    const nodeOperatorInfo = await getNodeOperatorInfo(contract, nodeOperatorId);
+    const enqueuedCount = nodeOperatorInfo.enqueuedCount;
     if (enqueuedCount === null || enqueuedCount <= 0) {
       log.info("No enqueued validators for this Node Operator.");
     }
@@ -253,7 +253,7 @@ async function getSigningKeysWithQueueInfo(monitoring) {
     }
 
     // Retrieve the signing keys
-    const signingKeys = await getSigningKeys(contract, nodeOperatorId, 0, numberOfNoneWithdrawnKeys);
+    const signingKeys = await getSigningKeys(contract, nodeOperatorId, 0, nodeOperatorInfo.totalAddedKeys);
     if (!signingKeys) {
       log.info("Failed to retrieve signing keys.");
       return null;
@@ -380,7 +380,7 @@ async function checkSigningKeys(keysArray, monitoring) {
     }
 
     // Retrieve enqueuedCount and ensure it's above 0
-    const enqueuedCount = await getNodeOperatorInfo(contract, nodeOperatorId);
+    const enqueuedCount = (await getNodeOperatorInfo(contract, nodeOperatorId)).enqueuedCount;
     if (enqueuedCount === null || enqueuedCount <= 0) {
       log.info("No enqueued validators for this Node Operator.");
       return false;
diff --git a/launcher/src/background.js b/launcher/src/background.js
index 29c786de42..81d1ba1a26 100755
--- a/launcher/src/background.js
+++ b/launcher/src/background.js
@@ -864,195 +864,188 @@ ipcMain.handle("getSSVClusterInformation", async (event, args) => {
   return await monitoring.getSSVClusterInformation(args.serviceID);
 });
 
+let mainWindow = null;
 // Scheme must be registered before the app is ready
 protocol.registerSchemesAsPrivileged([{ scheme: "app", privileges: { secure: true, standard: true } }]);
 
-let mainWindow = null;
 async function createWindow(type = "main") {
-  // Create the browser window.
+  // Ensure only one instance of the window exists
+  if (mainWindow) {
+    mainWindow.focus();
+    return;
+  }
 
+  // Define window settings
   const initwin = {
     width: 1044,
     height: 609,
     minHeight: 609,
     minWidth: 1044,
     webPreferences: {
-      // Use pluginOptions.nodeIntegration, leave this alone
-      // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
-      // devTools: false,
       nodeIntegration: false,
       preload: path.join(__dirname, "preload.js"),
     },
   };
+
+  // Modify window size based on environment
   if (!isDevelopment) {
-    initwin["maxHeight"] = 609;
-    initwin["maxWidth"] = 1044;
+    Object.assign(initwin, { maxHeight: 609, maxWidth: 1044 });
   }
   if (!isDevelopment && process.platform === "win32") {
-    initwin["minHeight"] = 650;
-    initwin["minWidth"] = 1100;
-    initwin["maxHeight"] = 650;
-    initwin["maxWidth"] = 1100;
+    Object.assign(initwin, {
+      minHeight: 650,
+      minWidth: 1100,
+      maxHeight: 650,
+      maxWidth: 1100,
+    });
   }
 
+  // Create the browser window
   const win = new BrowserWindow(initwin);
-
   win.setMenuBarVisibility(false);
 
+  // Load correct URL based on environment
   if (process.env.WEBPACK_DEV_SERVER_URL) {
-    // Load the url of the dev server if in development mode
-    if (type === "update") {
-      await win.loadURL(process.env.WEBPACK_DEV_SERVER_URL + "#/update");
-    } else {
-      await win.loadURL(process.env.WEBPACK_DEV_SERVER_URL);
-    }
+    const url = type === "update" ? `${process.env.WEBPACK_DEV_SERVER_URL}#/update` : process.env.WEBPACK_DEV_SERVER_URL;
+
+    await win.loadURL(url);
+
     if (!process.env.IS_TEST) win.webContents.openDevTools();
   } else {
     createProtocol("app");
-    // Load the index.html when not in developmen
-    if (type === "update") {
-      win.loadURL("app://./index.html#/update");
-    } else {
-      win.loadURL("app://./index.html");
-    }
-
-    mainWindow = win;
-    return win;
+    win.loadURL(type === "update" ? "app://./index.html#/update" : "app://./index.html");
   }
 
-  win.on("ready-to-show", async () => {
-    await nodeConnection.closeTunnels();
+  // Assign to global window variable
+  mainWindow = win;
+
+  // Ensure tunnels are closed once window is ready
+  win.once("ready-to-show", () => {
+    nodeConnection.closeTunnels();
   });
-  let closeHandler;
-  switch (type) {
-    case "main": {
-      closeHandler = (e) => {
-        if (app.showExitPrompt) {
-          e.preventDefault(); // Prevents the window from closing
-          const response = dialog.showMessageBoxSync({
-            type: "question",
-            buttons: ["Yes", "No"],
-            title: "Confirm",
-            message: "Critical tasks are running in the background.\nAre you sure you want to quit?",
-            icon: "./public/img/icon/node-journal-icons/red-warning.png",
-          });
-          if (response === 0) {
-            app.showExitPrompt = false;
-            win.close();
-          }
-        }
-      };
-      break;
-    }
-    case "update": {
-      closeHandler = (e) => {
-        if (app.showExitPrompt) {
-          e.preventDefault(); // Prevents the window from closing
-          const response = dialog.showMessageBoxSync({
-            type: "question",
-            buttons: ["Yes", "No"],
-            title: "Confirm",
-            message: "Stereum is updating.\nAre you sure you want to quit?",
-            icon: "./public/img/icon/node-journal-icons/red-warning.png",
-          });
-          if (response === 0) {
-            app.showExitPrompt = false;
-            stereumUpdater.updateWindow = null;
-            win.close();
-          }
-        }
-      };
-      break;
+
+  // Define close behavior
+  function handleClose(e) {
+    if (app.showExitPrompt) {
+      e.preventDefault(); // Prevents the window from closing
+      const response = dialog.showMessageBoxSync({
+        type: "question",
+        buttons: ["Yes", "No"],
+        title: "Confirm",
+        message:
+          type === "update"
+            ? "Stereum is updating.\nAre you sure you want to quit?"
+            : "Critical tasks are running in the background.\nAre you sure you want to quit?",
+      });
+      if (response === 0) {
+        app.showExitPrompt = false;
+        if (type === "update") stereumUpdater.updateWindow = null;
+        win.close();
+      }
     }
   }
 
-  win.on("close", closeHandler);
+  win.on("close", handleClose);
 
-  //
+  // Handle directory selection
   ipcMain.handle("openDirectoryDialog", async (event, args) => {
     const { canceled, filePaths } = await dialog.showOpenDialog(win, args);
-    if (canceled) return [];
-    return filePaths;
+    return canceled ? [] : filePaths;
   });
 
+  // Handle file picker
   ipcMain.handle("openFilePicker", async (event, dialog_options, read_content = false) => {
     const { canceled, filePaths } = await dialog.showOpenDialog(win, dialog_options);
     if (canceled) return [];
-    const fileList = [];
-    for (const filePath of filePaths) {
-      try {
-        if (read_content) {
-          const content = readFileSync(filePath, "utf-8");
-          fileList.push({ path: filePath, name: path.basename(filePath), content: content });
-        } else {
-          fileList.push({ path: filePath, name: path.basename(filePath) });
+
+    const fileList = filePaths
+      .map((filePath) => {
+        try {
+          return read_content
+            ? { path: filePath, name: path.basename(filePath), content: readFileSync(filePath, "utf-8") }
+            : { path: filePath, name: path.basename(filePath) };
+        } catch (error) {
+          log.error("Failed reading local file:", error);
+          return null;
         }
-      } catch (error) {
-        log.error("Failed reading local file: ", error);
-      }
-    }
+      })
+      .filter(Boolean);
+
     return fileList;
   });
 
   return win;
 }
 
-// Disable CTRL+R and F5 in build
-if (!isDevelopment) {
-  app.on("browser-window-focus", function () {
-    globalShortcut.register("CommandOrControl+R", () => {});
-    globalShortcut.register("F5", () => {});
-  });
-  app.on("browser-window-blur", function () {
-    globalShortcut.unregister("CommandOrControl+R");
-    globalShortcut.unregister("F5");
-  });
+function disableShortcuts() {
+  globalShortcut.register("CommandOrControl+R", () => {});
+  globalShortcut.register("F5", () => {});
 }
 
-// Quit when all windows are closed.
-app.on("window-all-closed", () => {
-  nodeConnection.logout();
-  if (process.platform !== "darwin") {
-    app.quit();
+function enableShortcuts() {
+  globalShortcut.unregister("CommandOrControl+R");
+  globalShortcut.unregister("F5");
+}
+
+// Register shortcuts only when a window exists
+app.on("browser-window-focus", disableShortcuts);
+app.on("browser-window-blur", enableShortcuts);
+
+app.on("window-all-closed", async () => {
+  app.isQuiting = true;
+  await nodeConnection.logout();
+  if (process.platform !== "darwin") app.quit();
+});
+
+app.on("ready", async () => {
+  if (app.isReady()) {
+    if (process.env.WEBPACK_DEV_SERVER_URL) {
+      // Development mode
+      app.setAsDefaultProtocolClient("stereumlauncher", process.execPath, [path.resolve(process.argv[1])]);
+    } else {
+      // Production mode
+      app.setAsDefaultProtocolClient("stereumlauncher");
+
+      // Disable "View" and "Window" Menu items in production
+      const hideMenuItems = ["viewmenu", "windowmenu"];
+      const menu = Menu.getApplicationMenu();
+      if (menu && menu.items) {
+        menu.items.filter((item) => hideMenuItems.includes(item.role)).forEach((item) => (item.visible = false));
+        Menu.setApplicationMenu(menu);
+      }
+
+      // Check for updates
+      stereumUpdater.checkForUpdates();
+    }
+
+    await createWindow();
   }
 });
 
-app.on("activate", () => {
-  if (BrowserWindow.getAllWindows().length === 0) createWindow();
+app.on("activate", async () => {
+  if (!mainWindow) {
+    try {
+      await createWindow();
+    } catch (error) {
+      console.error("Error creating window on activate:", error);
+    }
+  }
 });
 
 app.on("web-contents-created", (event, contents) => {
   contents.setWindowOpenHandler((details) => {
-    const parsedUrl = new url.URL(details.url);
-    if (["https:", "http:", "mailto:"].includes(parsedUrl.protocol)) {
-      shell.openExternal(parsedUrl.href);
+    try {
+      const parsedUrl = new url.URL(details.url);
+      if (["https:", "http:", "mailto:"].includes(parsedUrl.protocol)) {
+        shell.openExternal(parsedUrl.href);
+      }
+    } catch (error) {
+      console.error("Invalid URL attempted to open:", details.url, error);
     }
     return { action: "deny" };
   });
 });
 
-app.on("ready", async () => {
-  if (process.env.WEBPACK_DEV_SERVER_URL) {
-    // Development mode
-    app.setAsDefaultProtocolClient("stereumlauncher", process.execPath, [path.resolve(process.argv[1])]);
-  } else {
-    // Production mode
-    app.setAsDefaultProtocolClient("stereumlauncher");
-
-    // Disable "View" and "Window" Menu items in build
-    const hideMenuItems = ["viewmenu", "windowmenu"];
-    var menu = Menu.getApplicationMenu();
-    menu.items.filter((item) => hideMenuItems.includes(item.role)).map((item) => (item.visible = false));
-    Menu.setApplicationMenu(menu);
-
-    // Check for updates in production
-    stereumUpdater.checkForUpdates();
-  }
-
-  await createWindow();
-});
-
-// Handle the protocol on Windows and Linux
 if (process.platform === "win32" || process.platform === "linux") {
   const gotTheLock = app.requestSingleInstanceLock();
 
@@ -1063,50 +1056,53 @@ if (process.platform === "win32" || process.platform === "linux") {
       if (mainWindow) {
         if (mainWindow.isMinimized()) mainWindow.restore();
         mainWindow.focus();
+      }
 
-        const url = argv.find((arg) => arg.startsWith("stereumlauncher://"));
-        if (url) {
-          await protocolHandler.handleCustomUrl(url);
+      // Handle custom protocol URLs
+      const urlArg = argv.find((arg) => arg.startsWith("stereumlauncher://"));
+      if (urlArg) {
+        try {
+          await protocolHandler.handleCustomUrl(urlArg);
+        } catch (error) {
+          console.error("Error handling custom URL:", urlArg, error);
         }
       }
     });
   }
 }
 
-// Handle the protocol on macOS
 if (process.platform === "darwin") {
   app.on("open-url", async (event, url) => {
     event.preventDefault();
 
-    // If app is not ready, wait for it
-    if (!mainWindow) {
-      app.on("ready", async () => {
+    try {
+      if (!mainWindow) {
+        app.once("ready", async () => {
+          await protocolHandler.handleCustomUrl(url);
+        });
+      } else {
         await protocolHandler.handleCustomUrl(url);
-      });
-    } else {
-      await protocolHandler.handleCustomUrl(url);
+      }
+    } catch (error) {
+      console.error("Error handling macOS open-url event:", url, error);
     }
   });
 }
 
-// Handle URLs from command line arguments (works for all platforms)
-app.on("ready", async () => {
-  const protocolUrl = process.argv.find((arg) => arg.startsWith("stereumlauncher://"));
-  if (protocolUrl) {
-    await protocolHandler.handleCustomUrl(protocolUrl);
-  }
-});
-
 if (isDevelopment) {
   if (process.platform === "win32") {
     process.on("message", (data) => {
-      if (data === "graceful-exit") {
+      if (data === "graceful-exit" && !app.isQuiting) {
+        app.isQuiting = true;
         app.quit();
       }
     });
   } else {
     process.on("SIGTERM", () => {
-      app.quit();
+      if (!app.isQuiting) {
+        app.isQuiting = true;
+        app.quit();
+      }
     });
   }
 }
diff --git a/launcher/src/components/UI/control-page/components/widgets/CsmStateWidget.vue b/launcher/src/components/UI/control-page/components/widgets/CsmStateWidget.vue
index 25c2e6ffc5..4e006851a3 100644
--- a/launcher/src/components/UI/control-page/components/widgets/CsmStateWidget.vue
+++ b/launcher/src/components/UI/control-page/components/widgets/CsmStateWidget.vue
@@ -31,11 +31,11 @@
 </template>
 
 <script setup>
+import i18n from "@/includes/i18n";
 import { useSetups } from "@/store/setups";
-import ServiceLine from "../fragments/ServiceLine.vue";
 import { useStakingStore } from "@/store/theStaking";
 import { computed } from "vue";
-import i18n from "@/includes/i18n";
+import ServiceLine from "../fragments/ServiceLine.vue";
 
 const t = i18n.global.t;
 
@@ -50,23 +50,6 @@ const props = defineProps({
 });
 
 const dvtInQueueWithRelatedValidatorCount = computed(() => {
-  if (!stakingStore?.keys || !setupStore?.allSetups || !setupStore?.selectedLCOMService) {
-    return 0;
-  }
-
-  return stakingStore?.keys.filter((key) => {
-    if (key?.dvt !== true || key?.status !== "inQueue" || !key?.validatorID) {
-      return false;
-    }
-
-    const relatedValidator = setupStore?.allSetups.some((setup) => {
-      return (
-        setup?.setupId === setupStore?.selectedLCOMService?.setupId &&
-        setup?.services.some((service) => service?.category === "validator" && service?.validatorID === key?.validatorID)
-      );
-    });
-
-    return relatedValidator;
-  }).length;
+  return stakingStore.keys.filter((key) => key.status == "inQueue").length;
 });
 </script>
diff --git a/launcher/src/components/UI/control-page/components/widgets/IdKeyCsm.vue b/launcher/src/components/UI/control-page/components/widgets/IdKeyCsm.vue
index 4b18410f28..0f408d3dd5 100644
--- a/launcher/src/components/UI/control-page/components/widgets/IdKeyCsm.vue
+++ b/launcher/src/components/UI/control-page/components/widgets/IdKeyCsm.vue
@@ -5,7 +5,9 @@
     </div>
     <div class="item-row w-full h-1/4 flex justify-between items-center uppercase text-gray-200 text-2xs pl-1 pr-1">
       operator id
-      <span class="text-2xs pl-1 pr-1 text-green-500">{{ setupStore?.selectedLCOMService?.id }}</span>
+      <span class="text-2xs pl-1 pr-1 text-green-500">{{
+        serviceStore.installedServices.find((service) => service.service === "LCOMService")?.config?.env?.NO_ID || 0
+      }}</span>
     </div>
     <div class="item-row w-full h-1/4 flex justify-between items-center uppercase text-gray-200 text-2xs pl-1 pr-1">
       <div class="total-ttl h-full w-1/2 flex justify-start items-center">
@@ -17,31 +19,16 @@
   </div>
 </template>
 <script setup>
-import { useSetups } from "@/store/setups";
-import { useStakingStore } from "@/store/theStaking";
+import { useServices } from "@/store/services.js";
+import { useSetups } from "@/store/setups.js";
+import { useStakingStore } from "@/store/theStaking.js";
 import { computed } from "vue";
 
+const serviceStore = useServices();
 const stakingStore = useStakingStore();
 const setupStore = useSetups();
 
 const dvtWithRelatedValidatorCount = computed(() => {
-  if (!stakingStore?.keys || !setupStore?.allSetups || !setupStore?.selectedLCOMService) {
-    return 0;
-  }
-
-  return stakingStore?.keys.filter((key) => {
-    if (key?.dvt !== true || !key?.validatorID) {
-      return false;
-    }
-
-    const relatedValidator = setupStore?.allSetups.some((setup) => {
-      return (
-        setup?.setupId === setupStore?.selectedLCOMService.setupId &&
-        setup?.services.some((service) => service?.category === "validator" && service?.validatorID === key?.validatorID)
-      );
-    });
-
-    return relatedValidator;
-  }).length;
+  return stakingStore.keys.length;
 });
 </script>
diff --git a/launcher/src/components/UI/edit-page/components/edit/EditBody.vue b/launcher/src/components/UI/edit-page/components/edit/EditBody.vue
index cd4fe877b8..fdcbc0e8db 100644
--- a/launcher/src/components/UI/edit-page/components/edit/EditBody.vue
+++ b/launcher/src/components/UI/edit-page/components/edit/EditBody.vue
@@ -25,7 +25,7 @@
         element: connection.end.element,
         position: connection.end.position,
       }"
-      color="#DBEF6A"
+      color="#F6F68B85"
       :animated="true"
       :dashed="true"
     />
diff --git a/launcher/src/components/UI/node-page/NodeScreen.vue b/launcher/src/components/UI/node-page/NodeScreen.vue
index 8ffa83be5c..613e188ab5 100755
--- a/launcher/src/components/UI/node-page/NodeScreen.vue
+++ b/launcher/src/components/UI/node-page/NodeScreen.vue
@@ -174,6 +174,7 @@ const checkForListingKeys = async () => {
     )
   ) {
     clearInterval(pollingListingKeys);
+    console.log("Listing keys node screen");
     useListKeys();
   }
 };
diff --git a/launcher/src/components/UI/node-page/components/node/NodeBody.vue b/launcher/src/components/UI/node-page/components/node/NodeBody.vue
index 31438858b9..525af56030 100755
--- a/launcher/src/components/UI/node-page/components/node/NodeBody.vue
+++ b/launcher/src/components/UI/node-page/components/node/NodeBody.vue
@@ -23,7 +23,7 @@
         element: connection.end.element,
         position: connection.end.position,
       }"
-      color="#DBEF6A"
+      color="#F6F68B85"
       :animated="true"
       :dashed="true"
     />
diff --git a/launcher/src/components/UI/staking-page/StakingScreen.vue b/launcher/src/components/UI/staking-page/StakingScreen.vue
index 33a05116d1..e7230fb2e4 100644
--- a/launcher/src/components/UI/staking-page/StakingScreen.vue
+++ b/launcher/src/components/UI/staking-page/StakingScreen.vue
@@ -46,7 +46,7 @@ import { useServices } from "@/store/services";
 import { useSetups } from "@/store/setups";
 import { useStakingStore } from "@/store/theStaking";
 import { saveAs } from "file-saver";
-import { computed, onMounted, onUnmounted, watch } from "vue";
+import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import ControlService from "../../../store/ControlService";
 import ImportRemote from "./components/modals/ImportRemote.vue";
 import ImportValidator from "./components/modals/ImportValidator.vue";
@@ -65,6 +65,7 @@ const setupStore = useSetups();
 const { listGroups } = useListGroups();
 const { getServerView } = useMultiSetups();
 const { uploadValidatorKey, onDrop, importingKey, importValidatorProcessing } = useImportKeys(stakingStore.forceRefresh);
+const fetchInterval = ref(null);
 
 const modals = {
   import: {
@@ -131,6 +132,7 @@ onMounted(async () => {
   if (stakingStore.keys.length > 0 && setupStore.allSetups.length > 0) {
     getKeySetupColor();
   }
+  fetchInterval.value = setInterval(fetchKeysWhileDplProtection, 30000);
 });
 
 // *************** Methods *****************
@@ -143,6 +145,12 @@ const listKeys = async () => {
   stakingStore.isSkeletonActive = false;
 };
 
+const fetchKeysWhileDplProtection = async () => {
+  if (stakingStore.doppelgangerKeys) {
+    await useListKeys();
+  }
+};
+
 // const updateValidatorStats = async () => {
 //   await useUpdateValidatorStats();
 // };
@@ -745,5 +753,6 @@ const confirmImportRemoteKeys = async () => {
 onUnmounted(() => {
   setupStore.selectedSetup = null;
   getServerView();
+  clearInterval(fetchInterval.value);
 });
 </script>
diff --git a/launcher/src/components/UI/staking-page/components/list/ListBody.vue b/launcher/src/components/UI/staking-page/components/list/ListBody.vue
index c0a366008d..886129a97b 100644
--- a/launcher/src/components/UI/staking-page/components/list/ListBody.vue
+++ b/launcher/src/components/UI/staking-page/components/list/ListBody.vue
@@ -189,25 +189,37 @@ function normalizeKey(key) {
   return key?.startsWith("0x") ? key.substring(2) : key;
 }
 
-function removeDuplicatedDoppelgangerKeys() {
-  const normalizedKeysSet = new Set(stakingStore.keys.map((k) => normalizeKey(k.key)));
-  // const filteredKeys = stakingStore.doppelgangerKeys.filter(
-  //   (doppelKey) => !normalizedKeysSet.has(normalizeKey(doppelKey.pubkey))
-  // );
-
-  // if (filteredKeys.length !== stakingStore.doppelgangerKeys.length) {
-  //   stakingStore.doppelgangerKeys = filteredKeys;
-  // }
-
-  stakingStore.doppelgangerKeys = stakingStore.doppelgangerKeys.filter((item) => !normalizedKeysSet.has(item.pubkey));
-}
+const removeDuplicatedDoppelgangerKeys = async () => {
+  try {
+    const normalizedKeysSet = new Set(stakingStore.keys.filter((k) => k.key).map((k) => normalizeKey(k.key)));
+
+    const filteredKeys = stakingStore.doppelgangerKeys.filter((doppelKey) => {
+      if (!doppelKey?.pubkey) {
+        return false;
+      }
+
+      const normalizedPubkey = normalizeKey(doppelKey.pubkey);
+      const isDuplicate = normalizedKeysSet.has(normalizedPubkey);
+      return !isDuplicate;
+    });
+
+    if (filteredKeys.length !== stakingStore.doppelgangerKeys.length) {
+      stakingStore.doppelgangerKeys = filteredKeys;
+    }
+  } catch (error) {
+    console.log("Error in removeDuplicatedDoppelgangerKeys:", error);
+  }
+};
 
 watch(
   () => stakingStore.keys,
   async () => {
     removeDuplicatedDoppelgangerKeys();
   },
-  { once: true }
+  {
+    deep: true,
+    immediate: true,
+  }
 );
 
 const removeDoppelGangerManually = (pubkey) => {
diff --git a/launcher/src/components/UI/staking-page/components/list/rows/DoppelGCheckRow.vue b/launcher/src/components/UI/staking-page/components/list/rows/DoppelGCheckRow.vue
index deddcb98d3..f74581451c 100644
--- a/launcher/src/components/UI/staking-page/components/list/rows/DoppelGCheckRow.vue
+++ b/launcher/src/components/UI/staking-page/components/list/rows/DoppelGCheckRow.vue
@@ -36,14 +36,12 @@ import { computed, ref, onMounted, watchEffect } from 'vue';
 </template>
 
 <script setup>
-import { computed, ref, onMounted, watchEffect, onUnmounted } from "vue";
+import { computed, ref, onMounted, watchEffect } from "vue";
 import { useFooter } from "@/store/theFooter";
-import { useListKeys } from "@/composables/validators";
 import { useTruncate } from "@/composables/utils";
-import { useStakingStore } from "@/store/theStaking";
 
 const footerStore = useFooter();
-const stakingStore = useStakingStore();
+
 const displayText = ref("Doppelganger Protection");
 const isProtectionActive = ref(false);
 const isRemoveBtnActive = ref(false);
@@ -61,33 +59,19 @@ const formattedPubKey = computed(() => {
   return useTruncate(props.item.pubkey, 20, 20);
 });
 
-// const warningText = () => {
-//   setTimeout(() => {
-//     displayText.value = "Waiting for response";
-//   }, 900000);
-//   setTimeout(() => {
-//     displayText.value = "No response";
-//   }, 1800000);
-
-//   setTimeout(() => {
-//     displayText.value = "Click To Remove";
-//     isRemoveBtnActive.value = true;
-//     removeDoppelGanger();
-//   }, 86400000);
-// };
-
 const warningText = () => {
   setTimeout(() => {
     displayText.value = "Waiting for response";
-  }, 30000);
+  }, 900000);
   setTimeout(() => {
     displayText.value = "No response";
-  }, 50000);
+  }, 1800000);
 
   setTimeout(() => {
     displayText.value = "Click To Remove";
     isRemoveBtnActive.value = true;
-  }, 60000);
+    removeDoppelGanger();
+  }, 86400000);
 };
 
 watchEffect(() => {
@@ -96,14 +80,6 @@ watchEffect(() => {
   }
 });
 
-let fetchInterval = null;
-
-const fetchKeysWhileDplProtection = async () => {
-  if (stakingStore.doppelgangerKeys) {
-    await useListKeys(true);
-  }
-};
-
 const removeDoppelGanger = () => {
   emit("removeDplg", props.item.pubkey);
 };
@@ -111,11 +87,6 @@ const removeDoppelGanger = () => {
 onMounted(() => {
   isProtectionActive.value = true;
   isRemoveBtnActive.value = false;
-  fetchInterval = setInterval(fetchKeysWhileDplProtection, 30000);
-});
-
-onUnmounted(() => {
-  if (fetchInterval) clearInterval(fetchInterval);
 });
 </script>
 
diff --git a/launcher/src/components/UI/staking-page/components/management/components/client-commands/ButtonBox.vue b/launcher/src/components/UI/staking-page/components/management/components/client-commands/ButtonBox.vue
index 6cd10fb93c..9207618a7c 100644
--- a/launcher/src/components/UI/staking-page/components/management/components/client-commands/ButtonBox.vue
+++ b/launcher/src/components/UI/staking-page/components/management/components/client-commands/ButtonBox.vue
@@ -73,13 +73,13 @@ const buttonState = ref([
   },
   //Testnet https://csm.testnet.fi/?ref=stereum
   //Mainnet https://csm.lido.fi/
-  {
-    text: "GO TO CSM WEBSITE",
-    icon: "/img/icon/staking-page-icons/remote-key-icon.svg",
-    events: () => window.open("https://example.com", "_blank"),
-    tooltip: "Visit our website",
-    isHidden: false,
-  },
+  // {
+  //   text: "GO TO CSM WEBSITE",
+  //   icon: "/img/icon/staking-page-icons/remote-key-icon.svg",
+  //   events: () => window.open("https://example.com", "_blank"),
+  //   tooltip: "Visit our website",
+  //   isHidden: false,
+  // },
 ]);
 
 // Computed Property to Filter Button Visibility
diff --git a/launcher/src/components/layers/ConnectionLine.vue b/launcher/src/components/layers/ConnectionLine.vue
index c3520c4613..4e5c1a50e8 100644
--- a/launcher/src/components/layers/ConnectionLine.vue
+++ b/launcher/src/components/layers/ConnectionLine.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="connection-container" :style="containerStyle">
-    <svg ref="svgRef" class="connection-svg" :style="svgStyle" :width="bounds.width" :height="bounds.height">
+    <svg ref="svgRef" class="connection-svg" :width="bounds.width" :height="bounds.height">
       <defs>
         <filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
           <feGaussianBlur stdDeviation="2" result="coloredBlur" />
@@ -17,7 +17,7 @@
         fill="none"
         :stroke="color"
         :stroke-width="strokeWidth"
-        stroke-dasharray="5,5"
+        stroke-dasharray="5.5"
         :filter="props.glow ? 'url(#glow)' : 'none'"
         :style="{ opacity: isPathReady ? 1 : 0 }"
       />
@@ -40,12 +40,16 @@ const props = defineProps({
   },
   color: {
     type: String,
-    default: "#000",
+    default: "#73a832",
   },
   strokeWidth: {
     type: Number,
     default: 2,
   },
+  strokeDasharray: {
+    type: String,
+    default: "5,5",
+  },
   animated: {
     type: Boolean,
     default: true,
@@ -157,8 +161,8 @@ const animatePath = () => {
   const pathLength = pathRef.value.getTotalLength();
 
   gsap.set(pathRef.value, {
-    strokeDasharray: `${pathLength} ${pathLength}`,
-    strokeDashoffset: pathLength,
+    strokeDasharray: `${pathLength} ${pathLength}` || "5.5",
+    strokeDashoffset: pathLength || 5,
     opacity: 0,
   });
 
@@ -166,7 +170,8 @@ const animatePath = () => {
     strokeDashoffset: 0,
     strokeDasharray: true,
     duration: 0.8,
-    ease: "power2.out",
+    yoyo: true,
+    ease: "power1.inOut",
     onStart: () => {
       isPathReady.value = true;
     },
diff --git a/launcher/src/composables/importKey.js b/launcher/src/composables/importKey.js
index 4e88290248..f42dbac33d 100644
--- a/launcher/src/composables/importKey.js
+++ b/launcher/src/composables/importKey.js
@@ -76,6 +76,12 @@ export function useImportKeys(forceRefresh) {
   const importingKey = async (val) => {
     stakingStore.importEnteredPassword = val;
     stakingStore.importKeyMessage = await ControlService.importKey(stakingStore.selectedValidatorService.config.serviceID);
+    if (stakingStore.importKeyMessage.includes("error")) {
+      if (stakingStore.keyFiles.length > 1) stakingStore.doppelgangerKeys = [];
+      else {
+        stakingStore.doppelgangerKeys.pop();
+      }
+    }
     stakingStore.isPreviewListActive = false;
     stakingStore.setActivePanel("insert");
     stakingStore.keyFiles = [];
@@ -84,14 +90,18 @@ export function useImportKeys(forceRefresh) {
 
     stakingStore.importEnteredPassword = "";
     stakingStore.forceRefresh = true;
-    if (stakingStore.isDoppelgangerProtectionActive && stakingStore.doppelgangerKeys.length > 0) {
+    if (
+      stakingStore.isDoppelgangerProtectionActive &&
+      stakingStore.doppelgangerKeys.length > 0 &&
+      !stakingStore.importKeyMessage.includes("error")
+    ) {
       stakingStore.displayDoppelgangerPreview = true;
       setTimeout(() => {
         stakingStore.setActiveModal(null);
       }, 10000);
+      await useListKeys(forceRefresh);
+      await useListGroups();
     }
-    await useListKeys(forceRefresh);
-    await useListGroups();
   };
 
   const importValidatorProcessing = async () => {
diff --git a/launcher/src/composables/validators.js b/launcher/src/composables/validators.js
index c127f80f0c..35680da276 100644
--- a/launcher/src/composables/validators.js
+++ b/launcher/src/composables/validators.js
@@ -103,6 +103,7 @@ export async function useListKeys(forceRefresh) {
 export async function useUpdateValidatorStats() {
   const nodeManageStore = useNodeManage();
   const stakingStore = useStakingStore();
+  const serviceStore = useServices();
   let totalBalance = 0;
   let data = [];
 
@@ -142,15 +143,17 @@ export async function useUpdateValidatorStats() {
   }
   // Get queue keys
   let keysInQueue = [];
-  try {
-    keysInQueue = (await ControlService.getSigningKeysWithQueueInfo()) || [];
-    if (!Array.isArray(keysInQueue)) {
-      console.warn("Unexpected response from getSigningKeysWithQueueInfo:", keysInQueue);
+  if (serviceStore.installedServices.some((s) => s.service === "LCOMService")) {
+    try {
+      keysInQueue = (await ControlService.getSigningKeysWithQueueInfo()) || [];
+      if (!Array.isArray(keysInQueue)) {
+        console.warn("Unexpected response from getSigningKeysWithQueueInfo:", keysInQueue);
+        keysInQueue = [];
+      }
+    } catch (error) {
+      console.error("Error fetching signing keys with queue info:", error);
       keysInQueue = [];
     }
-  } catch (error) {
-    console.error("Error fetching signing keys with queue info:", error);
-    keysInQueue = [];
   }
 
   stakingStore.keys.forEach((key) => {
diff --git a/launcher/src/languages/en.json b/launcher/src/languages/en.json
index 1b81bf838b..fe37b435b2 100755
--- a/launcher/src/languages/en.json
+++ b/launcher/src/languages/en.json
@@ -1101,6 +1101,7 @@
   },
   "csmStateWidget": {
     "servceCount": "{count} Monitoring services {isAre} running.",
-    "inque": "The number of keys in the queueis {number}."
+    "inque": "The number of keys in the queueis {number}.",
+    "nodeStatus": "Node Status"
   }
 }