FIX: launcher 2.1.2 release bugs (#1835)

* update the fetching * fix the new api for the testers * Revert "fix the new api for the testers" This reverts commit ab01562. * Revert "update the fetching" This reverts commit b5a052c. * Fix the nuke modal animation * Revert "Fix the nuke modal animation" This reverts commit 3c5b547. * UPDATE: remove the rpc and stake buttons from tutorial * UPDATE: true network icon in the ssv modal * FIX ssh modal gen options
stereum-dev · Apr 17, 2024 · b388902 · b388902
1 parent a0c4c8f
commit b388902
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/launcher/src/components/UI/node-page/components/alert/NodeTutorial.vue b/launcher/src/components/UI/node-page/components/alert/NodeTutorial.vue
@@ -16,22 +16,22 @@
         <span>{{ $t("nodeSidebarVideo.video") }}</span>
       </div>
     </div>
-    <div class="tutorial-btn" @click="isTutorialActive = true">
+    <!-- <div class="tutorial-btn" @click="isTutorialActive = true">
       <div class="icon-box camera">
         <img src="/img/icon/guide-page-icons/guide-icon.png" alt="" />
       </div>
       <div class="name-span">
         <span>{{ $t("nodeSidebarVideo.rpc") }}</span>
       </div>
-    </div>
-    <div v-if="currentNetwork.network !== 'gnosis'" class="tutorial-btn" @click="isStakeGuideActive = true">
+    </div> -->
+    <!-- <div v-if="currentNetwork.network !== 'gnosis'" class="tutorial-btn" @click="isStakeGuideActive = true">
       <div class="icon-box camera">
         <img src="/img/icon/guide-page-icons/guide-icon.png" alt="" />
       </div>
       <div class="name-span">
         <span>{{ $t("nodeSidebarVideo.stake") }}</span>
       </div>
-    </div>
+    </div> -->
 
     <div
       class="back-button"

diff --git a/launcher/src/components/UI/server-management/components/modals/GenerateKey.vue b/launcher/src/components/UI/server-management/components/modals/GenerateKey.vue
@@ -146,7 +146,12 @@
               ></span>
             </label>
           </div>
-          <div class="col-start-1 col-span-full row-start-5 row-span-1 grid grid-cols-12 items-center">
+          <div
+            class="col-start-1 col-span-full row-start-5 row-span-1 grid grid-cols-12 items-center"
+            :class="{
+              'opacity-50 pointer-events-none cursor-not-allowed': disableDiv,
+            }"
+          >
             <span
               class="col-start-1 col-end-4 w-full text-left self-center text-md font-semibold text-gray-200 uppercase"
               >{{ $t("multiServer.specCypher") }}</span
@@ -245,7 +250,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watchEffect } from "vue";
+import { ref, computed, watchEffect, onMounted } from "vue";
 import { useServers } from "@/store/servers";
 import { useDeepClone } from "@/composables/utils";
 import ControlService from "@/store/ControlService";
@@ -266,8 +271,20 @@ const isDisabled = ref(true);
 // serverStore.bitAmount: "",
 // serverStore.selectedKeyType: "",
 
+onMounted(() => {
+  serverStore.savePath = "";
+  serverStore.sshPassword = "";
+  serverStore.selectedCyper = "";
+  serverStore.bitAmount = "";
+  serverStore.selectedKeyType = "";
+});
+
 //Computed
 
+const disableDiv = computed(() => {
+  return expertOptions.value && (serverStore.selectedKeyType === "" || serverStore.selectedKeyType === "ED25519");
+});
+
 const typesAmount = computed(() => {
   if (serverStore.selectedKeyType === "RSA") {
     return ["1024", "2048", "3072", "4096", "8192", "16384"];

diff --git a/launcher/src/components/UI/services-modal/SsvModal.vue b/launcher/src/components/UI/services-modal/SsvModal.vue
@@ -20,7 +20,15 @@
           <div class="flip-box-inner">
             <img class="flip-box-front" src="/img/icon/service-icons/Other/ssv-network.png" alt="icon" />
 
-            <img class="flip-box-back" src="/img/icon/network-icons/ethereum-testnet-icon.png" alt="icon" />
+            <img
+              class="flip-box-back"
+              :src="`${
+                currentNetwork.network == 'mainnet'
+                  ? '/img/icon/network-icons/ethereum-mainnet.png'
+                  : '/img/icon/network-icons/ethereum-testnet-icon.png'
+              }`"
+              alt="icon"
+            />
           </div>
         </div>
 
@@ -159,14 +167,15 @@
 </template>
 <script>
 import ControlService from "@/store/ControlService";
-import { mapWritableState } from "pinia";
+import { mapWritableState, mapState } from "pinia";
 import { useNodeHeader } from "@/store/nodeHeader";
 import axios from "axios";
 import { toRaw } from "vue";
 import ConfirmBox from "./plugin/ConfirmBox.vue";
 import ImportBox from "./plugin/ImportBox.vue";
 import PasswordBox from "./plugin/PasswordBox";
 import { useRestartService } from "@/composables/services";
+import { useNodeManage } from "@/store/nodeManage";
 const JSZip = require("jszip");
 const saveAs = require("file-saver");
 const semver = require("semver");
@@ -249,6 +258,9 @@ export default {
       importBoxModel: "importBoxModel",
       passwordBoxModel: "passwordBoxModel",
     }),
+    ...mapState(useNodeManage, {
+      currentNetwork: "currentNetwork",
+    }),
     //new ssv start hereeeeeeeeeeee
     passControlGenerateEncryptKeyTitle() {
       if (!this.firstPassToGenerateCheck && !this.confirmPassToGenerateCheck) {
@@ -348,6 +360,7 @@ export default {
   },
 
   mounted() {
+    console.log(this.currentNetwork.network);
     this.getKeys();
     this.passwordBoxModel = "";
     this.importBoxModel = "";