FIX: CustomService updates, withdraw and validator filter (#1761)

* FIX: CustomService Updates * FIX: withdraw and validator filter
stereum-dev · Mar 12, 2024 · ebdcff5 · ebdcff5
1 parent 38c5249
commit ebdcff5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/controls/roles/update-services/tasks/update-service.yml b/controls/roles/update-services/tasks/update-service.yml
@@ -18,7 +18,7 @@
 - name: Get latest version for this service
   set_fact:
     new_service_docker_image_tag: "{{ update_data.json[service_configuration.network][service_configuration.service] | default(update_data.json['mainnet'][service_configuration.service]) | last }}"
-  when: service_configuration.autoupdate
+  when: service_configuration.autoupdate and service_configuration.service != 'CustomService'
 
 - name: Build new image tag
   set_fact:

diff --git a/launcher/src/components/UI/staking-page/components/modals/StakingCustomModal.vue b/launcher/src/components/UI/staking-page/components/modals/StakingCustomModal.vue
@@ -29,7 +29,7 @@ import { useNodeManage } from '@/store/nodeManage'; import { computed } from 'vu
             @click="exportAction"
           >
             <img class="h-4" src="/img/icon/staking-page-icons/export.png" alt="Export Icon" />
-            <span class="text-sm text-gray-200 font-semibold">{{ $("stakingPage.expMsg") }}</span>
+            <span class="text-sm text-gray-200 font-semibold">{{ $t("stakingPage.expMsg") }}</span>
           </button>
           <button
             v-if="!props.isProcessing && props.confirmText"

diff --git a/launcher/src/components/UI/staking-page/components/modals/WithdrawMultiple.vue b/launcher/src/components/UI/staking-page/components/modals/WithdrawMultiple.vue
@@ -23,7 +23,7 @@
         >
           <div v-if="getStatus?.success" class="w-full h-full flex justify-center items-center overflow-hidden">
             <span class="text-md text-teal-700 font-semibold text-center">
-              {{ getStatus.success }} {{ $("stakingPage.vldExited") }}</span
+              {{ getStatus.success }} {{ $t("stakingPage.vldExited") }}</span
             >
           </div>
           <div v-if="getStatus?.failure" class="w-full h-full flex justify-center items-center overflow-hidden">
@@ -133,13 +133,15 @@ const getNumberOfKeys = () => {
   let successCount = 0;
   let failureCount = 0;
 
-  displayResponse.value.forEach((item) => {
-    if (item.code === "200") {
-      successCount++;
-    } else {
-      failureCount++;
-    }
-  });
+  if(Array.isArray(displayResponse.value)) {
+    displayResponse.value.forEach((item) => {
+      if (item.code === "200") {
+        successCount++;
+      } else {
+        failureCount++;
+      }
+    });
+  }
 
   // Combine the counts with the original displayResponse
   const combinedResponse = [...useDeepClone(displayResponse.value), { success: successCount, failure: failureCount }];

diff --git a/launcher/src/components/UI/staking-page/sections/SidebarSection.vue b/launcher/src/components/UI/staking-page/sections/SidebarSection.vue
@@ -58,7 +58,7 @@ const hoveredIndex = ref(null);
 
 const installedValidators = computed(() => {
   return serviceStore.installedServices
-    .filter((s) => s.category === "validator")
+    .filter((s) => s.category === "validator" && !/SSVNetwork|Charon/.test(s.service))
     .map((service) => ({ ...service, selected: false }))
     .sort((a, b) => a.name.localeCompare(b.name));
 });