From f36a74435e0c982c6b5bf9134d95cd8b423b03c0 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Sat, 20 Jan 2024 05:49:48 +0000
Subject: [PATCH 01/19] feat: ui fix

---
 src/components/AppNavigation.vue              |  2 +-
 src/components/nodes/NodesTable.vue           |  2 +-
 .../nodes/coins/CoinNodesTableItem.vue        | 34 +++++++++++++++++--
 src/components/nodes/components/NodeLabel.vue |  1 +
 src/locales/en.json                           |  2 +-
 src/locales/ru.json                           |  2 +-
 src/locales/zh.json                           |  2 +-
 7 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/components/AppNavigation.vue b/src/components/AppNavigation.vue
index 0ab4dd469..fcbe352c7 100644
--- a/src/components/AppNavigation.vue
+++ b/src/components/AppNavigation.vue
@@ -156,7 +156,7 @@ export default defineComponent({
       background-color: map-get($adm-colors, 'black');
     }
     :deep(.v-btn.v-btn--active) {
-      color: map-get($shades, 'white');
+      color: map-get($adm-colors, 'secondary');
     }
     :deep(.v-btn:not(.v-btn--active)) {
       color: map-get($adm-colors, 'grey-transparent');
diff --git a/src/components/nodes/NodesTable.vue b/src/components/nodes/NodesTable.vue
index ee5a6f65b..5b68634b7 100644
--- a/src/components/nodes/NodesTable.vue
+++ b/src/components/nodes/NodesTable.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="classes.root">
-    <v-tabs v-model="tab" bg-color="secondary">
+    <v-tabs v-model="tab" bg-color="transparent">
       <v-tab value="adm">{{ $t('nodes.tabs.adm_nodes') }}</v-tab>
       <v-tab value="coins">{{ $t('nodes.tabs.coin_nodes') }}</v-tab>
     </v-tabs>
diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index ef5fbab4c..82b3f17da 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -1,11 +1,13 @@
 <template>
   <tr :class="classes.root">
-    <NodeColumn align="right">
+    <NodeColumn align="left">
       <NodeLabel :label="label" />
     </NodeColumn>
 
     <NodeColumn>
-      {{ url }}
+      <span class="protocol">{{ getProtocol }}</span>
+      <span class="nodeName">{{ getNodeName }}</span>
+      <span class="domain">{{ getDomain }}</span>
       <NodeVersion v-if="node.version" :node="node" />
     </NodeColumn>
 
@@ -65,18 +67,44 @@ export default {
       store.dispatch('nodes/updateStatus')
     }
 
+    const getProtocol = computed(() => {
+      const protocol = url.value.match(/^https:\/\//)
+      return protocol ? protocol[0] : ''
+    })
+
+    const getNodeName = computed(() => {
+      const nodeName = url.value.replace(/^https:\/\/|\.adamant\.im$/g, '')
+      return nodeName
+    })
+    const getDomain = computed(() => {
+      const domain = url.value.match(/\.adamant\.im/)
+      return domain ? domain[0] : ''
+    })
+
     return {
       classes,
       url,
       active,
       isUnsupported,
-      toggleActiveStatus
+      toggleActiveStatus,
+      getProtocol,
+      getNodeName,
+      getDomain
     }
   }
 }
 </script>
 
 <style lang="scss">
+@import '@/assets/styles/settings/_colors.scss';
 .nodes-table-item {
 }
+
+.protocol,
+.domain {
+  color: map-get($adm-colors, 'grey-transparent');
+  font-size: 12px;
+}
+.nodeName {
+}
 </style>
diff --git a/src/components/nodes/components/NodeLabel.vue b/src/components/nodes/components/NodeLabel.vue
index 19d33a8f1..a083425fc 100644
--- a/src/components/nodes/components/NodeLabel.vue
+++ b/src/components/nodes/components/NodeLabel.vue
@@ -26,5 +26,6 @@ export default defineComponent({
 .blockchain-label {
   --v-chip-height: 18px;
   padding: 0 4px;
+  margin-left: 12px;
 }
 </style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 7ded3de6a..d35d54801 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -206,7 +206,7 @@
     "idb_not_supported": "Browser does not support IndexedDB and in Private Browsing mode too",
     "language_label": "Language",
     "currency_label": "Main currency",
-    "nodes_list": "Nodes list",
+    "nodes_list": "Nodes and services",
     "notification_title": "Notifications",
     "page_title": "Settings",
     "push_denied": "Push notifications have been denied in browser settings",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 6283e870e..27baa55a1 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -207,7 +207,7 @@
     "idb_not_supported": "Браузер не поддерживает IndexedDB или открыт в режиме приватного просмотра",
     "language_label": "Язык",
     "currency_label": "Основная валюта",
-    "nodes_list": "Список узлов",
+    "nodes_list": "Узлы и сервисы",
     "notification_title": "Уведомления",
     "page_title": "Настройки",
     "push_denied": "Push-уведомления запрещены в настройках браузера",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 962752bd2..4f5f4a75a 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -206,7 +206,7 @@
     "idb_not_supported": "浏览器不支持IndexedDB，也处于私有浏览模式",
     "language_label": "语言",
     "currency_label": "主货币",
-    "nodes_list": "节点列表",
+    "nodes_list": "节点和服务",
     "notification_title": "通知",
     "page_title": "设置",
     "push_denied": "推送通知在浏览器设置中被拒绝",

From 15324b87a36fc843aa186b3609968cbbba021e82 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 24 Jan 2024 00:29:31 +0000
Subject: [PATCH 02/19] feat: disconnection of coin nodes

---
 src/components/nodes/adm/AdmNodesTableItem.vue    |  3 ++-
 src/components/nodes/coins/CoinNodesTableItem.vue | 10 +++++++++-
 src/lib/nodes/abstract.node.ts                    |  7 +++++--
 src/lib/nodes/adm/AdmNode.ts                      |  2 +-
 src/lib/nodes/btc/BtcNode.ts                      |  2 +-
 src/lib/nodes/dash/DashNode.ts                    |  2 +-
 src/lib/nodes/doge/DogeNode.ts                    |  2 +-
 src/lib/nodes/eth/EthNode.ts                      |  2 +-
 src/lib/nodes/lsk-indexer/LskIndexer.ts           |  2 +-
 src/lib/nodes/lsk/LskNode.ts                      |  2 +-
 src/store/modules/nodes/nodes-mutations.js        |  2 +-
 src/store/modules/nodes/nodes-plugin.js           |  8 +++++---
 12 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/nodes/adm/AdmNodesTableItem.vue b/src/components/nodes/adm/AdmNodesTableItem.vue
index 212278e3c..fcbbff808 100644
--- a/src/components/nodes/adm/AdmNodesTableItem.vue
+++ b/src/components/nodes/adm/AdmNodesTableItem.vue
@@ -58,11 +58,12 @@ export default {
     const active = computed(() => props.node.active)
     const socketSupport = computed(() => props.node.socketSupport)
     const isUnsupported = computed(() => props.node.status === 'unsupported_version')
-
+    const type = () => props.node.type
     const showSocketColumn = computed(() => active.value && !isUnsupported.value)
 
     const toggleActiveStatus = () => {
       store.dispatch('nodes/toggle', {
+        type,
         url: url.value,
         active: !active.value
       })
diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index 82b3f17da..922b036c4 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -1,5 +1,9 @@
 <template>
   <tr :class="classes.root">
+    <NodeColumn checkbox>
+      <NodeStatusCheckbox :value="active" @change="toggleActiveStatus" />
+    </NodeColumn>
+
     <NodeColumn align="left">
       <NodeLabel :label="label" />
     </NodeColumn>
@@ -26,6 +30,7 @@ import NodeColumn from '@/components/nodes/components/NodeColumn.vue'
 import NodeLabel from '@/components/nodes/components/NodeLabel.vue'
 import NodeStatus from '@/components/nodes/components/NodeStatus.vue'
 import NodeVersion from '@/components/nodes/components/NodeVersion.vue'
+import NodeStatusCheckbox from '@/components/nodes/components/NodeStatusCheckbox.vue'
 
 const className = 'nodes-table-item'
 const classes = {
@@ -40,7 +45,8 @@ export default {
     NodeColumn,
     NodeStatus,
     NodeVersion,
-    NodeLabel
+    NodeLabel,
+    NodeStatusCheckbox
   },
   props: {
     node: {
@@ -58,9 +64,11 @@ export default {
     const url = computed(() => props.node.url)
     const active = computed(() => props.node.active)
     const isUnsupported = computed(() => props.node.status === 'unsupported_version')
+    const type = () => props.node.type
 
     const toggleActiveStatus = () => {
       store.dispatch('nodes/toggle', {
+        type,
         url: url.value,
         active: !active.value
       })
diff --git a/src/lib/nodes/abstract.node.ts b/src/lib/nodes/abstract.node.ts
index 197e9daf0..084ba55cc 100644
--- a/src/lib/nodes/abstract.node.ts
+++ b/src/lib/nodes/abstract.node.ts
@@ -1,5 +1,5 @@
 import { TNodeLabel } from './constants'
-import { NodeStatus } from './types'
+import { NodeStatus, NodeType } from './types'
 import { nodesStorage } from './storage'
 
 type HealthcheckResult = {
@@ -93,6 +93,7 @@ export abstract class Node<C = unknown> {
    * Will be updated after `GET /api/node/status`
    */
   socketSupport = false
+  type: NodeType
   label: TNodeLabel
 
   onStatusChangeCallback?: (nodeStatus: ReturnType<typeof this.getStatus>) => void
@@ -100,8 +101,9 @@ export abstract class Node<C = unknown> {
   timer?: NodeJS.Timeout
   abstract client: C
 
-  constructor(url: string, label: TNodeLabel, version = '', minNodeVersion = '') {
+  constructor(url: string, type: NodeType, label: TNodeLabel, version = '', minNodeVersion = '') {
     this.url = url
+    this.type = type
     this.label = label
     this.protocol = new URL(url).protocol as HttpProtocol
     this.port = new URL(url).port
@@ -160,6 +162,7 @@ export abstract class Node<C = unknown> {
       socketSupport: this.socketSupport,
       height: this.height,
       status: this.getNodeStatus(),
+      type: this.type,
       label: this.label
     }
   }
diff --git a/src/lib/nodes/adm/AdmNode.ts b/src/lib/nodes/adm/AdmNode.ts
index 6bc751dac..41b9b1f75 100644
--- a/src/lib/nodes/adm/AdmNode.ts
+++ b/src/lib/nodes/adm/AdmNode.ts
@@ -31,7 +31,7 @@ export class AdmNode extends Node {
   client: AxiosInstance
 
   constructor(url: string, minNodeVersion = '0.0.0') {
-    super(url, NODE_LABELS.AdmNode, minNodeVersion, minNodeVersion)
+    super(url, 'adm', NODE_LABELS.AdmNode, minNodeVersion, minNodeVersion)
 
     this.wsPort = '36668' // default wsPort
     this.wsProtocol = this.protocol === 'https:' ? 'wss:' : 'ws:'
diff --git a/src/lib/nodes/btc/BtcNode.ts b/src/lib/nodes/btc/BtcNode.ts
index dd1823e5c..04c187dfb 100644
--- a/src/lib/nodes/btc/BtcNode.ts
+++ b/src/lib/nodes/btc/BtcNode.ts
@@ -11,7 +11,7 @@ export class BtcNode extends Node {
   client: AxiosInstance
 
   constructor(url: string) {
-    super(url, NODE_LABELS.BtcNode)
+    super(url, 'btc', NODE_LABELS.BtcNode)
 
     this.client = createBtcLikeClient(url)
 
diff --git a/src/lib/nodes/dash/DashNode.ts b/src/lib/nodes/dash/DashNode.ts
index 1e4c24599..ad5f7d820 100644
--- a/src/lib/nodes/dash/DashNode.ts
+++ b/src/lib/nodes/dash/DashNode.ts
@@ -11,7 +11,7 @@ export class DashNode extends Node {
   client: AxiosInstance
 
   constructor(url: string) {
-    super(url, NODE_LABELS.DashNode)
+    super(url, 'dash', NODE_LABELS.DashNode)
 
     this.client = createBtcLikeClient(url)
 
diff --git a/src/lib/nodes/doge/DogeNode.ts b/src/lib/nodes/doge/DogeNode.ts
index 9ccf99134..490fdadd1 100644
--- a/src/lib/nodes/doge/DogeNode.ts
+++ b/src/lib/nodes/doge/DogeNode.ts
@@ -11,7 +11,7 @@ export class DogeNode extends Node {
   client: AxiosInstance
 
   constructor(url: string) {
-    super(url, NODE_LABELS.DogeNode)
+    super(url, 'doge', NODE_LABELS.DogeNode)
 
     this.client = createBtcLikeClient(url)
 
diff --git a/src/lib/nodes/eth/EthNode.ts b/src/lib/nodes/eth/EthNode.ts
index 6b05b4a60..846980e3f 100644
--- a/src/lib/nodes/eth/EthNode.ts
+++ b/src/lib/nodes/eth/EthNode.ts
@@ -15,7 +15,7 @@ export class EthNode extends Node {
   client: Web3Eth
 
   constructor(url: string) {
-    super(url, NODE_LABELS.EthNode)
+    super(url, 'eth', NODE_LABELS.EthNode)
 
     this.provider = new HttpProvider(this.url)
     this.client = new Web3Eth(this.provider)
diff --git a/src/lib/nodes/lsk-indexer/LskIndexer.ts b/src/lib/nodes/lsk-indexer/LskIndexer.ts
index 49664eedd..9f7696cbe 100644
--- a/src/lib/nodes/lsk-indexer/LskIndexer.ts
+++ b/src/lib/nodes/lsk-indexer/LskIndexer.ts
@@ -11,7 +11,7 @@ export class LskIndexer extends Node {
   client: AxiosInstance
 
   constructor(url: string) {
-    super(url, NODE_LABELS.LskIndexer)
+    super(url, 'lsk', NODE_LABELS.LskIndexer)
 
     this.client = axios.create({ baseURL: `${url}/api/v3` })
 
diff --git a/src/lib/nodes/lsk/LskNode.ts b/src/lib/nodes/lsk/LskNode.ts
index 5d4c23c76..5f22f2ea0 100644
--- a/src/lib/nodes/lsk/LskNode.ts
+++ b/src/lib/nodes/lsk/LskNode.ts
@@ -13,7 +13,7 @@ export class LskNode extends Node {
   client: AxiosInstance
 
   constructor(url: string) {
-    super(url, NODE_LABELS.LskNode)
+    super(url, 'lsk', NODE_LABELS.LskNode)
 
     this.client = axios.create({ baseURL: url })
 
diff --git a/src/store/modules/nodes/nodes-mutations.js b/src/store/modules/nodes/nodes-mutations.js
index 133fd559e..3a4c13f95 100644
--- a/src/store/modules/nodes/nodes-mutations.js
+++ b/src/store/modules/nodes/nodes-mutations.js
@@ -4,7 +4,7 @@ export default {
   },
 
   toggle(state, payload) {
-    const node = state.adm[payload.url]
+    const node = [payload.type][payload.url]
     if (node) {
       node.active = payload.active
     }
diff --git a/src/store/modules/nodes/nodes-plugin.js b/src/store/modules/nodes/nodes-plugin.js
index 050e7ba96..a2559d4aa 100644
--- a/src/store/modules/nodes/nodes-plugin.js
+++ b/src/store/modules/nodes/nodes-plugin.js
@@ -15,14 +15,16 @@ export default (store) => {
     const { type, payload } = mutation
 
     if (type === 'nodes/useFastest') {
-      nodes.adm.setUseFastest(!!mutation.payload)
+      const selectedNodeType = payload.type()
+      nodes[selectedNodeType].setUseFastest(!!mutation.payload)
     }
 
     if (type === 'nodes/toggle') {
-      const newStatus = nodes.adm.toggleNode(payload.url, payload.active)
+      const selectedNodeType = payload.type()
+      const newStatus = nodes[selectedNodeType].toggleNode(payload.url, payload.active)
 
       if (newStatus) {
-        store.commit('nodes/status', { status: newStatus, nodeType: 'adm' })
+        store.commit('nodes/status', { status: newStatus, nodeType: selectedNodeType })
       }
     }
   })

From 302f5febacfa38747f52407f7a513f932597ade6 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 24 Jan 2024 16:02:55 +0000
Subject: [PATCH 03/19] fix: refactoring coin nodes table

---
 src/components/nodes/adm/AdmNodesTableItem.vue    | 4 ++--
 src/components/nodes/coins/CoinNodesTable.vue     | 2 +-
 src/components/nodes/coins/CoinNodesTableItem.vue | 4 ++--
 src/store/modules/nodes/nodes-mutations.js        | 2 +-
 src/store/modules/nodes/nodes-plugin.js           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/nodes/adm/AdmNodesTableItem.vue b/src/components/nodes/adm/AdmNodesTableItem.vue
index fcbbff808..be6f5453d 100644
--- a/src/components/nodes/adm/AdmNodesTableItem.vue
+++ b/src/components/nodes/adm/AdmNodesTableItem.vue
@@ -58,12 +58,12 @@ export default {
     const active = computed(() => props.node.active)
     const socketSupport = computed(() => props.node.socketSupport)
     const isUnsupported = computed(() => props.node.status === 'unsupported_version')
-    const type = () => props.node.type
+    const type = computed(() => props.node.type)
     const showSocketColumn = computed(() => active.value && !isUnsupported.value)
 
     const toggleActiveStatus = () => {
       store.dispatch('nodes/toggle', {
-        type,
+        type: type.value,
         url: url.value,
         active: !active.value
       })
diff --git a/src/components/nodes/coins/CoinNodesTable.vue b/src/components/nodes/coins/CoinNodesTable.vue
index ac6b0d52e..8e0bb3865 100644
--- a/src/components/nodes/coins/CoinNodesTable.vue
+++ b/src/components/nodes/coins/CoinNodesTable.vue
@@ -1,6 +1,6 @@
 <template>
   <NodesTableContainer>
-    <NodesTableHead hide-checkbox hide-socket />
+    <NodesTableHead hide-socket />
 
     <tbody>
       <CoinNodesTableItem v-for="node in nodes" :key="node.url" :label="node.label" :node="node" />
diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index 922b036c4..2ae0f5bee 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -64,11 +64,11 @@ export default {
     const url = computed(() => props.node.url)
     const active = computed(() => props.node.active)
     const isUnsupported = computed(() => props.node.status === 'unsupported_version')
-    const type = () => props.node.type
+    const type = computed(() => props.node.type)
 
     const toggleActiveStatus = () => {
       store.dispatch('nodes/toggle', {
-        type,
+        type: type.value,
         url: url.value,
         active: !active.value
       })
diff --git a/src/store/modules/nodes/nodes-mutations.js b/src/store/modules/nodes/nodes-mutations.js
index 3a4c13f95..96e1ba35c 100644
--- a/src/store/modules/nodes/nodes-mutations.js
+++ b/src/store/modules/nodes/nodes-mutations.js
@@ -4,7 +4,7 @@ export default {
   },
 
   toggle(state, payload) {
-    const node = [payload.type][payload.url]
+    const node = state[payload.type][payload.url]
     if (node) {
       node.active = payload.active
     }
diff --git a/src/store/modules/nodes/nodes-plugin.js b/src/store/modules/nodes/nodes-plugin.js
index a2559d4aa..2a8b42a18 100644
--- a/src/store/modules/nodes/nodes-plugin.js
+++ b/src/store/modules/nodes/nodes-plugin.js
@@ -15,12 +15,12 @@ export default (store) => {
     const { type, payload } = mutation
 
     if (type === 'nodes/useFastest') {
-      const selectedNodeType = payload.type()
+      const selectedNodeType = payload.type
       nodes[selectedNodeType].setUseFastest(!!mutation.payload)
     }
 
     if (type === 'nodes/toggle') {
-      const selectedNodeType = payload.type()
+      const selectedNodeType = payload.type
       const newStatus = nodes[selectedNodeType].toggleNode(payload.url, payload.active)
 
       if (newStatus) {

From 5af28163aa4f558d45413c64c4b2af52b5f65689 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Thu, 25 Jan 2024 22:03:38 +0000
Subject: [PATCH 04/19] fix: separate choose the fastest adm node

---
 src/components/nodes/NodesTable.vue        | 124 ++++++++++++++++++++-
 src/store/modules/nodes/nodes-actions.js   |   7 +-
 src/store/modules/nodes/nodes-mutations.js |   7 +-
 src/store/modules/nodes/nodes-plugin.js    |  10 +-
 src/store/modules/nodes/nodes-state.js     |   3 +-
 src/views/Nodes.vue                        |  82 +-------------
 6 files changed, 140 insertions(+), 93 deletions(-)

diff --git a/src/components/nodes/NodesTable.vue b/src/components/nodes/NodesTable.vue
index 5b68634b7..2024151b9 100644
--- a/src/components/nodes/NodesTable.vue
+++ b/src/components/nodes/NodesTable.vue
@@ -14,17 +14,69 @@
         <CoinNodesTable />
       </v-window-item>
     </v-window>
+    <div class="ml-6">
+      <div v-if="tab === 'coins'">
+        <v-checkbox
+          v-model="preferFastestCoinNodeOption"
+          :label="$t('nodes.fastest_title')"
+          :class="classes.checkbox"
+          class="mt-4"
+          color="grey darken-1"
+          hide-details
+        />
+        <div class="a-text-explanation-enlarged">
+          {{ $t('nodes.fastest_tooltip') }}
+        </div>
+      </div>
+      <div v-if="tab === 'adm'">
+        <v-checkbox
+          v-model="preferFastestAdmNodeOption"
+          :label="$t('nodes.fastest_title')"
+          :class="classes.checkbox"
+          class="mt-4"
+          color="grey darken-1"
+          hide-details
+        />
+        <div class="a-text-explanation-enlarged">
+          {{ $t('nodes.fastest_tooltip') }}
+        </div>
+        <v-checkbox
+          v-model="useSocketConnection"
+          :label="$t('nodes.use_socket_connection')"
+          :class="classes.checkbox"
+          class="mt-4"
+          color="grey darken-1"
+          hide-details
+        />
+        <div class="a-text-explanation-enlarged">
+          {{ $t('nodes.use_socket_connection_tooltip') }}
+        </div>
+
+        <!-- eslint-disable vue/no-v-html -- Safe internal content -->
+        <div
+          :class="classes.info"
+          class="a-text-regular-enlarged mt-6"
+          v-html="$t('nodes.nodeLabelDescription')"
+        />
+        <!-- eslint-enable vue/no-v-html -->
+
+        <div>&nbsp;<br />&nbsp;</div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue'
+import { defineComponent, ref, computed } from 'vue'
 import { AdmNodesTable } from './adm'
 import { CoinNodesTable } from './coins'
+import { useStore } from 'vuex'
 
 const className = 'nodes-table'
 const classes = {
-  root: className
+  root: className,
+  info: `${className}__info`,
+  checkbox: `${className}__checkbox `
 }
 
 type Tab = 'adm' | 'coins'
@@ -35,23 +87,74 @@ export default defineComponent({
     CoinNodesTable
   },
   setup() {
+    const store = useStore()
     const tab = ref<Tab>('adm')
 
+    const useSocketConnection = computed<boolean>({
+      get() {
+        return store.state.options.useSocketConnection
+      },
+      set(value) {
+        store.commit('options/updateOption', {
+          key: 'useSocketConnection',
+          value
+        })
+      }
+    })
+    const preferFastestAdmNodeOption = computed<boolean>({
+      get() {
+        return store.state.nodes.useFastestAdmNode
+      },
+      set(value) {
+        store.dispatch('nodes/setUseFastestAdmNode', value)
+      }
+    })
+
+    const preferFastestCoinNodeOption = computed<boolean>({
+      get() {
+        return store.state.nodes.useFastestCoinNode
+      },
+      set(value) {
+        store.dispatch('nodes/setUseFastestCoinNode', value)
+      }
+    })
+
     return {
       tab,
-      classes
+      classes,
+      useSocketConnection,
+      preferFastestAdmNodeOption,
+      preferFastestCoinNodeOption
     }
   }
 })
 </script>
 
 <style lang="scss" scoped>
+@import '@/assets/styles/themes/adamant/_mixins.scss';
 @import 'vuetify/settings';
+@import '@/assets/styles/settings/_colors.scss';
 
 .nodes-table {
   margin-left: -24px;
   margin-right: -24px;
   max-width: unset !important;
+
+  &__info {
+    :deep(a) {
+      text-decoration-line: none;
+      &:hover {
+        text-decoration-line: underline;
+      }
+    }
+  }
+  :deep(.v-input--selection-controls:not(.v-input--hide-details)) .v-input__slot {
+    margin-bottom: 0;
+  }
+
+  :deep(.v-checkbox) {
+    margin-left: -8px;
+  }
 }
 
 @media #{map-get($display-breakpoints, 'sm-and-down')} {
@@ -60,4 +163,19 @@ export default defineComponent({
     margin-right: -16px;
   }
 }
+/** Themes **/
+.v-theme--light {
+  .nodes-table {
+    &__checkbox {
+      :deep(.v-label) {
+        color: map-get($adm-colors, 'regular');
+      }
+      :deep(.v-input--selection-controls__ripple),
+      :deep(.v-input--selection-controls__input) i {
+        color: map-get($adm-colors, 'regular') !important;
+        caret-color: map-get($adm-colors, 'regular') !important;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/store/modules/nodes/nodes-actions.js b/src/store/modules/nodes/nodes-actions.js
index d25de04c5..3661d4e06 100644
--- a/src/store/modules/nodes/nodes-actions.js
+++ b/src/store/modules/nodes/nodes-actions.js
@@ -11,7 +11,10 @@ export default {
     context.commit('toggle', payload)
   },
 
-  setUseFastest(context, payload) {
-    context.commit('useFastest', payload)
+  setUseFastestAdmNode(context, payload) {
+    context.commit('useFastestAdmNode', payload)
+  },
+  setUseFastestCoinNode(context, payload) {
+    context.commit('useFastestCoinNode', payload)
   }
 }
diff --git a/src/store/modules/nodes/nodes-mutations.js b/src/store/modules/nodes/nodes-mutations.js
index 96e1ba35c..8c747c815 100644
--- a/src/store/modules/nodes/nodes-mutations.js
+++ b/src/store/modules/nodes/nodes-mutations.js
@@ -1,6 +1,9 @@
 export default {
-  useFastest(state, value) {
-    state.useFastest = value
+  useFastestAdmNode(state, value) {
+    state.useFastestAdmNode = value
+  },
+  useFastestCoinNode(state, value) {
+    state.useFastestCoinNode = value
   },
 
   toggle(state, payload) {
diff --git a/src/store/modules/nodes/nodes-plugin.js b/src/store/modules/nodes/nodes-plugin.js
index 2a8b42a18..3bcf25196 100644
--- a/src/store/modules/nodes/nodes-plugin.js
+++ b/src/store/modules/nodes/nodes-plugin.js
@@ -9,16 +9,18 @@ export default (store) => {
       store.commit('nodes/status', { status, nodeType })
     })
   }
-  store.commit('nodes/useFastest', nodes.adm.useFastest)
+  store.commit('nodes/useFastestAdmNode', nodes.adm.useFastest)
+  // todo: useFaster for coin nodes
 
   store.subscribe((mutation) => {
     const { type, payload } = mutation
 
-    if (type === 'nodes/useFastest') {
-      const selectedNodeType = payload.type
-      nodes[selectedNodeType].setUseFastest(!!mutation.payload)
+    if (type === 'nodes/useFastestAdmNode') {
+      nodes.adm.setUseFastest(!!payload)
     }
 
+    // todo mutation for coin nodes
+
     if (type === 'nodes/toggle') {
       const selectedNodeType = payload.type
       const newStatus = nodes[selectedNodeType].toggleNode(payload.url, payload.active)
diff --git a/src/store/modules/nodes/nodes-state.js b/src/store/modules/nodes/nodes-state.js
index f4b7249b0..4b52694f7 100644
--- a/src/store/modules/nodes/nodes-state.js
+++ b/src/store/modules/nodes/nodes-state.js
@@ -5,5 +5,6 @@ export default {
   doge: {},
   dash: {},
   lsk: {},
-  useFastest: false
+  useFastestAdmNode: false,
+  useFastestCoinNode: false
 }
diff --git a/src/views/Nodes.vue b/src/views/Nodes.vue
index 53ab2146e..e068a9392 100644
--- a/src/views/Nodes.vue
+++ b/src/views/Nodes.vue
@@ -6,38 +6,6 @@
       <v-row justify="center" no-gutters>
         <container padding>
           <NodesTable />
-
-          <v-checkbox
-            v-model="preferFastestNodeOption"
-            :label="$t('nodes.fastest_title')"
-            :class="`${className}__checkbox mt-4`"
-            color="grey darken-1"
-            hide-details
-          />
-          <div class="a-text-explanation-enlarged">
-            {{ $t('nodes.fastest_tooltip') }}
-          </div>
-
-          <v-checkbox
-            v-model="useSocketConnection"
-            :label="$t('nodes.use_socket_connection')"
-            :class="`${className}__checkbox mt-4`"
-            color="grey darken-1"
-            hide-details
-          />
-          <div class="a-text-explanation-enlarged">
-            {{ $t('nodes.use_socket_connection_tooltip') }}
-          </div>
-
-          <!-- eslint-disable vue/no-v-html -- Safe internal content -->
-          <div
-            :class="`${className}__info a-text-regular-enlarged`"
-            class="mt-6"
-            v-html="$t('nodes.nodeLabelDescription')"
-          />
-          <!-- eslint-enable vue/no-v-html -->
-
-          <div>&nbsp;<br />&nbsp;</div>
         </container>
       </v-row>
     </v-container>
@@ -60,26 +28,7 @@ export default {
     timer: null
   }),
   computed: {
-    className: () => 'nodes-view',
-    useSocketConnection: {
-      get() {
-        return this.$store.state.options.useSocketConnection
-      },
-      set(value) {
-        this.$store.commit('options/updateOption', {
-          key: 'useSocketConnection',
-          value
-        })
-      }
-    },
-    preferFastestNodeOption: {
-      get() {
-        return this.$store.state.nodes.useFastest
-      },
-      set(value) {
-        this.$store.dispatch('nodes/setUseFastest', value)
-      }
-    }
+    className: () => 'nodes-view'
   },
   mounted() {
     this.$store.dispatch('nodes/updateStatus')
@@ -94,41 +43,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '@/assets/styles/themes/adamant/_mixins.scss';
 @import 'vuetify/settings';
-@import '@/assets/styles/settings/_colors.scss';
 
 .nodes-view {
-  &__info {
-    :deep(a) {
-      text-decoration-line: none;
-      &:hover {
-        text-decoration-line: underline;
-      }
-    }
-  }
-  :deep(.v-input--selection-controls:not(.v-input--hide-details)) .v-input__slot {
-    margin-bottom: 0;
-  }
-
-  :deep(.v-checkbox) {
-    margin-left: -8px;
-  }
 }
 
 /** Themes **/
 .v-theme--light {
-  .nodes-view {
-    &__checkbox {
-      :deep(.v-label) {
-        color: map-get($adm-colors, 'regular');
-      }
-      :deep(.v-input--selection-controls__ripple),
-      :deep(.v-input--selection-controls__input) i {
-        color: map-get($adm-colors, 'regular') !important;
-        caret-color: map-get($adm-colors, 'regular') !important;
-      }
-    }
-  }
 }
 </style>

From 0c665d683452cbe854381fb762f3f8926c636c30 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Thu, 25 Jan 2024 22:25:21 +0000
Subject: [PATCH 05/19] fix: color settings icon

---
 src/components/AppNavigation.vue | 2 +-
 src/views/Login.vue              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation.vue b/src/components/AppNavigation.vue
index fcbe352c7..0ab4dd469 100644
--- a/src/components/AppNavigation.vue
+++ b/src/components/AppNavigation.vue
@@ -156,7 +156,7 @@ export default defineComponent({
       background-color: map-get($adm-colors, 'black');
     }
     :deep(.v-btn.v-btn--active) {
-      color: map-get($adm-colors, 'secondary');
+      color: map-get($shades, 'white');
     }
     :deep(.v-btn:not(.v-btn--active)) {
       color: map-get($adm-colors, 'grey-transparent');
diff --git a/src/views/Login.vue b/src/views/Login.vue
index ecabbf4f1..1153c8ba6 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -217,6 +217,7 @@ export default defineComponent({
     position: absolute;
     right: 0;
     margin-right: 8px;
+    color: map-get($adm-colors, 'grey-transparent');
   }
 }
 

From 8b95e58d18835ff60e70574b428d5ab54eb7f379 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Sat, 27 Jan 2024 23:15:38 +0000
Subject: [PATCH 06/19] fix: new style link format in adm table

---
 .../nodes/adm/AdmNodesTableItem.vue           | 42 ++++++++++++++++++-
 .../nodes/coins/CoinNodesTableItem.vue        |  1 +
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/components/nodes/adm/AdmNodesTableItem.vue b/src/components/nodes/adm/AdmNodesTableItem.vue
index be6f5453d..76b8e0abb 100644
--- a/src/components/nodes/adm/AdmNodesTableItem.vue
+++ b/src/components/nodes/adm/AdmNodesTableItem.vue
@@ -5,7 +5,11 @@
     </NodeColumn>
 
     <NodeColumn>
-      {{ url }}
+      <span class="protocol">{{ protocol }}//</span>
+      <span v-if="result === false" class="nodeName">{{ nodeName }}</span>
+      <span v-if="result === false" class="domain">.{{ domain }}</span>
+      <span v-else-if="result" class="nodeName">{{ hostname }}</span>
+      <span v-if="port" class="domain">:{{ port }}</span>
       <NodeVersion v-if="node.version" :node="node" />
     </NodeColumn>
 
@@ -70,6 +74,25 @@ export default {
       store.dispatch('nodes/updateStatus')
     }
 
+    const baseUrl = new URL(url.value)
+    const protocol = baseUrl.protocol
+    const hostname = baseUrl.hostname
+    const port = baseUrl.port
+    const result = /^[\d.]+$/.test(hostname)
+
+    let nodeName: string | null = null
+    let domain: string | null = null
+
+    if (result === false) {
+      const regex = /([^.]*)\.(.*)/
+      const parts = hostname.match(regex)
+
+      if (parts !== null) {
+        nodeName = parts[1]
+        domain = parts[2]
+      }
+    }
+
     return {
       classes,
       url,
@@ -77,13 +100,28 @@ export default {
       socketSupport,
       isUnsupported,
       showSocketColumn,
-      toggleActiveStatus
+      toggleActiveStatus,
+      protocol,
+      hostname,
+      nodeName,
+      domain,
+      result,
+      port
     }
   }
 }
 </script>
 
 <style lang="scss">
+@import '@/assets/styles/settings/_colors.scss';
 .amd-nodes-table-item {
+  line-height: 14px;
+}
+.protocol,
+.domain,
+.port {
+  color: map-get($adm-colors, 'grey-transparent');
+  font-size: 12px;
+  display: inline-block;
 }
 </style>
diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index 2ae0f5bee..68a36970c 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -112,6 +112,7 @@ export default {
 .domain {
   color: map-get($adm-colors, 'grey-transparent');
   font-size: 12px;
+  display: inline-block;
 }
 .nodeName {
 }

From 4187f1f6921476d39e90afddfcb8d44eec015bad Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 31 Jan 2024 01:23:34 +0000
Subject: [PATCH 07/19] fix: outward appearance node status

---
 .../nodes/components/NodeStatus.vue           | 20 ++++++++++++++++---
 src/components/nodes/hooks/useNodeStatus.ts   |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/nodes/components/NodeStatus.vue b/src/components/nodes/components/NodeStatus.vue
index 745ff56c9..209ae0c91 100644
--- a/src/components/nodes/components/NodeStatus.vue
+++ b/src/components/nodes/components/NodeStatus.vue
@@ -1,6 +1,8 @@
 <template>
   <div :class="classes.statusTitle">
-    {{ nodeStatusTitle }}
+    <span>
+      {{ nodeStatusTitle }}<span :class="classes.textMs">{{ $t('nodes.ms') }}</span></span
+    >
 
     <v-icon
       :class="{
@@ -18,17 +20,18 @@
 
   <span v-if="nodeStatusDetail" :class="classes.statusText">
     <v-icon v-if="nodeStatusDetail.icon" :icon="nodeStatusDetail.icon" :size="12" />
-    {{ nodeStatusDetail.text }}
+    {{ formattedNumber }}
   </span>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, toRefs } from 'vue'
+import { defineComponent, PropType, toRefs, computed } from 'vue'
 import { NodeStatusResult } from '@/lib/nodes/abstract.node'
 import { useNodeStatus } from '@/components/nodes/hooks'
 
 const className = 'node-status'
 const classes = {
+  textMs: `${className}__text-ms`,
   statusTitle: `${className}__status-title`,
   statusText: `${className}__status-text`,
   icon: `${className}__icon`,
@@ -50,7 +53,12 @@ export default defineComponent({
 
     const { nodeStatusTitle, nodeStatusDetail, nodeStatusColor } = useNodeStatus(node)
 
+    const formattedNumber = computed(() => {
+      return nodeStatusDetail.value.text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+    })
+
     return {
+      formattedNumber,
       nodeStatusTitle,
       nodeStatusDetail,
       nodeStatusColor,
@@ -63,9 +71,12 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import 'vuetify/settings';
 @import '@/assets/styles/settings/_colors.scss';
+@import '@/assets/styles/themes/adamant/_mixins.scss';
 
 .node-status {
   &__status-title {
+    width: 76px;
+    max-width: 80px;
     line-height: 17px;
     display: flex;
   }
@@ -78,6 +89,9 @@ export default defineComponent({
   &__icon {
     margin-inline-start: 4px;
   }
+  &__text-ms {
+    @include a-text-explanation-small();
+  }
 }
 
 .v-theme--light {
diff --git a/src/components/nodes/hooks/useNodeStatus.ts b/src/components/nodes/hooks/useNodeStatus.ts
index 43d0cd1ca..d18b2ec83 100644
--- a/src/components/nodes/hooks/useNodeStatus.ts
+++ b/src/components/nodes/hooks/useNodeStatus.ts
@@ -15,7 +15,7 @@ type NodeStatusDetail = {
 
 function getNodeStatusTitle(node: NodeStatusResult, t: VueI18nTranslation) {
   const i18n: Record<NodeStatus, string> = {
-    online: node.ping + ' ' + t('nodes.ms'),
+    online: node.ping + ' ',
     offline: 'nodes.offline',
     disabled: 'nodes.inactive',
     sync: 'nodes.sync',

From 2897d301b30fb16812a264f7fd389b4187efdadf Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 31 Jan 2024 01:43:37 +0000
Subject: [PATCH 08/19] fix: easy reading of numbers in node status

---
 src/components/nodes/components/NodeStatus.vue | 9 ++-------
 src/components/nodes/hooks/index.ts            | 2 +-
 src/components/nodes/hooks/useNodeStatus.ts    | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/nodes/components/NodeStatus.vue b/src/components/nodes/components/NodeStatus.vue
index 209ae0c91..27e89e9db 100644
--- a/src/components/nodes/components/NodeStatus.vue
+++ b/src/components/nodes/components/NodeStatus.vue
@@ -20,12 +20,12 @@
 
   <span v-if="nodeStatusDetail" :class="classes.statusText">
     <v-icon v-if="nodeStatusDetail.icon" :icon="nodeStatusDetail.icon" :size="12" />
-    {{ formattedNumber }}
+    {{ nodeStatusDetail.text }}
   </span>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, toRefs, computed } from 'vue'
+import { defineComponent, PropType, toRefs } from 'vue'
 import { NodeStatusResult } from '@/lib/nodes/abstract.node'
 import { useNodeStatus } from '@/components/nodes/hooks'
 
@@ -53,12 +53,7 @@ export default defineComponent({
 
     const { nodeStatusTitle, nodeStatusDetail, nodeStatusColor } = useNodeStatus(node)
 
-    const formattedNumber = computed(() => {
-      return nodeStatusDetail.value.text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-    })
-
     return {
-      formattedNumber,
       nodeStatusTitle,
       nodeStatusDetail,
       nodeStatusColor,
diff --git a/src/components/nodes/hooks/index.ts b/src/components/nodes/hooks/index.ts
index cb4e771c9..24ffaef2e 100644
--- a/src/components/nodes/hooks/index.ts
+++ b/src/components/nodes/hooks/index.ts
@@ -1 +1 @@
-export * from './useNodeStatus.ts'
+export * from './useNodeStatus'
diff --git a/src/components/nodes/hooks/useNodeStatus.ts b/src/components/nodes/hooks/useNodeStatus.ts
index d18b2ec83..2518da6f3 100644
--- a/src/components/nodes/hooks/useNodeStatus.ts
+++ b/src/components/nodes/hooks/useNodeStatus.ts
@@ -44,7 +44,7 @@ function getNodeStatusDetail(
     }
   } else if (node.online) {
     return {
-      text: node.height,
+      text: node.height.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','),
       icon: 'mdi-cube-outline'
     }
   }

From d0c6be03083e83d0aedc41c30091d1286e570129 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 31 Jan 2024 03:01:29 +0000
Subject: [PATCH 09/19] fix: correcting regular expressions

---
 .../nodes/adm/AdmNodesTableItem.vue           | 59 +++++++++++--------
 .../nodes/coins/CoinNodesTableItem.vue        | 32 +++++-----
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/src/components/nodes/adm/AdmNodesTableItem.vue b/src/components/nodes/adm/AdmNodesTableItem.vue
index 76b8e0abb..f5e89f84a 100644
--- a/src/components/nodes/adm/AdmNodesTableItem.vue
+++ b/src/components/nodes/adm/AdmNodesTableItem.vue
@@ -5,11 +5,15 @@
     </NodeColumn>
 
     <NodeColumn>
-      <span class="protocol">{{ protocol }}//</span>
-      <span v-if="result === false" class="nodeName">{{ nodeName }}</span>
-      <span v-if="result === false" class="domain">.{{ domain }}</span>
-      <span v-else-if="result" class="nodeName">{{ hostname }}</span>
-      <span v-if="port" class="domain">:{{ port }}</span>
+      <span class="protocol">{{ computedResult.protocol }}//</span>
+      <span v-if="computedResult.result === false" class="nodeName">{{
+        computedResult.nodeName
+      }}</span>
+      <span v-if="computedResult.result === false" class="domain"
+        >.{{ computedResult.domain }}</span
+      >
+      <span v-else-if="computedResult.result" class="nodeName">{{ computedResult.hostname }}</span>
+      <span v-if="computedResult.port" class="domain">:{{ computedResult.port }}</span>
       <NodeVersion v-if="node.version" :node="node" />
     </NodeColumn>
 
@@ -74,24 +78,34 @@ export default {
       store.dispatch('nodes/updateStatus')
     }
 
-    const baseUrl = new URL(url.value)
-    const protocol = baseUrl.protocol
-    const hostname = baseUrl.hostname
-    const port = baseUrl.port
-    const result = /^[\d.]+$/.test(hostname)
+    const computedResult = computed(() => {
+      const baseUrl = new URL(url.value)
+      const protocol = baseUrl.protocol
+      const hostname = baseUrl.hostname
+      const port = baseUrl.port
+      const result = /^[\d.]+$/.test(hostname)
 
-    let nodeName: string | null = null
-    let domain: string | null = null
+      let nodeName = null
+      let domain = null
 
-    if (result === false) {
-      const regex = /([^.]*)\.(.*)/
-      const parts = hostname.match(regex)
+      if (result === false) {
+        const regex = /([^.]*)\.(.*)/
+        const parts = hostname.match(regex)
+        if (parts !== null) {
+          nodeName = parts[1]
+          domain = parts[2]
+        }
+      }
 
-      if (parts !== null) {
-        nodeName = parts[1]
-        domain = parts[2]
+      return {
+        protocol,
+        hostname,
+        nodeName,
+        domain,
+        result,
+        port
       }
-    }
+    })
 
     return {
       classes,
@@ -101,12 +115,7 @@ export default {
       isUnsupported,
       showSocketColumn,
       toggleActiveStatus,
-      protocol,
-      hostname,
-      nodeName,
-      domain,
-      result,
-      port
+      computedResult
     }
   }
 }
diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index 68a36970c..84bce6964 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -9,9 +9,9 @@
     </NodeColumn>
 
     <NodeColumn>
-      <span class="protocol">{{ getProtocol }}</span>
-      <span class="nodeName">{{ getNodeName }}</span>
-      <span class="domain">{{ getDomain }}</span>
+      <span class="protocol">{{ getCoinLink.protocol }}</span>
+      <span class="nodeName">{{ getCoinLink.nodeName }}</span>
+      <span class="domain">{{ getCoinLink.domain }}</span>
       <NodeVersion v-if="node.version" :node="node" />
     </NodeColumn>
 
@@ -75,18 +75,16 @@ export default {
       store.dispatch('nodes/updateStatus')
     }
 
-    const getProtocol = computed(() => {
-      const protocol = url.value.match(/^https:\/\//)
-      return protocol ? protocol[0] : ''
-    })
-
-    const getNodeName = computed(() => {
-      const nodeName = url.value.replace(/^https:\/\/|\.adamant\.im$/g, '')
-      return nodeName
-    })
-    const getDomain = computed(() => {
-      const domain = url.value.match(/\.adamant\.im/)
-      return domain ? domain[0] : ''
+    const getCoinLink = computed(() => {
+      const regex = url.value.match(/^(https:\/\/)?(.*?)\.adamant\.im$/)
+      if (regex) {
+        const protocol = regex[1] || ''
+        const nodeName = regex[2] || ''
+        const domain = '.adamant.im'
+        return { protocol, nodeName, domain }
+      } else {
+        return { protocol: '', nodeName: '', domain: '' }
+      }
     })
 
     return {
@@ -95,9 +93,7 @@ export default {
       active,
       isUnsupported,
       toggleActiveStatus,
-      getProtocol,
-      getNodeName,
-      getDomain
+      getCoinLink
     }
   }
 }

From 826aa9af8e17d480780825ca5c8c21380cf75d03 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 31 Jan 2024 20:51:18 +0000
Subject: [PATCH 10/19] feat: node url component and fix style

---
 .../nodes/adm/AdmNodesTableItem.vue           |  22 +---
 .../nodes/coins/CoinNodesTableItem.vue        |  28 +----
 src/components/nodes/components/NodeLabel.vue |   2 +-
 .../nodes/components/NodeStatus.vue           |  12 +-
 src/components/nodes/components/NodeUrl.vue   | 106 ++++++++++++++++++
 .../nodes/components/NodesTableContainer.vue  |   1 +
 6 files changed, 126 insertions(+), 45 deletions(-)
 create mode 100644 src/components/nodes/components/NodeUrl.vue

diff --git a/src/components/nodes/adm/AdmNodesTableItem.vue b/src/components/nodes/adm/AdmNodesTableItem.vue
index f5e89f84a..162e9dd23 100644
--- a/src/components/nodes/adm/AdmNodesTableItem.vue
+++ b/src/components/nodes/adm/AdmNodesTableItem.vue
@@ -5,15 +5,7 @@
     </NodeColumn>
 
     <NodeColumn>
-      <span class="protocol">{{ computedResult.protocol }}//</span>
-      <span v-if="computedResult.result === false" class="nodeName">{{
-        computedResult.nodeName
-      }}</span>
-      <span v-if="computedResult.result === false" class="domain"
-        >.{{ computedResult.domain }}</span
-      >
-      <span v-else-if="computedResult.result" class="nodeName">{{ computedResult.hostname }}</span>
-      <span v-if="computedResult.port" class="domain">:{{ computedResult.port }}</span>
+      <NodeUrl :node="node" />
       <NodeVersion v-if="node.version" :node="node" />
     </NodeColumn>
 
@@ -31,6 +23,7 @@
 import { computed, PropType } from 'vue'
 import { useStore } from 'vuex'
 import type { NodeStatusResult } from '@/lib/nodes/abstract.node'
+import NodeUrl from '@/components/nodes/components/NodeUrl.vue'
 import NodeColumn from '@/components/nodes/components/NodeColumn.vue'
 import NodeStatus from '@/components/nodes/components/NodeStatus.vue'
 import NodeVersion from '@/components/nodes/components/NodeVersion.vue'
@@ -51,7 +44,8 @@ export default {
     NodeColumn,
     NodeStatus,
     NodeVersion,
-    SocketSupport
+    SocketSupport,
+    NodeUrl
   },
   props: {
     node: {
@@ -122,15 +116,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '@/assets/styles/settings/_colors.scss';
 .amd-nodes-table-item {
   line-height: 14px;
 }
-.protocol,
-.domain,
-.port {
-  color: map-get($adm-colors, 'grey-transparent');
-  font-size: 12px;
-  display: inline-block;
-}
 </style>
diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index 84bce6964..c031614b4 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -9,9 +9,7 @@
     </NodeColumn>
 
     <NodeColumn>
-      <span class="protocol">{{ getCoinLink.protocol }}</span>
-      <span class="nodeName">{{ getCoinLink.nodeName }}</span>
-      <span class="domain">{{ getCoinLink.domain }}</span>
+      <NodeUrl :node="node" />
       <NodeVersion v-if="node.version" :node="node" />
     </NodeColumn>
 
@@ -26,6 +24,7 @@ import { computed, PropType } from 'vue'
 import { useStore } from 'vuex'
 import type { NodeStatusResult } from '@/lib/nodes/abstract.node'
 import type { TNodeLabel } from '@/lib/nodes/constants'
+import NodeUrl from '@/components/nodes/components/NodeUrl.vue'
 import NodeColumn from '@/components/nodes/components/NodeColumn.vue'
 import NodeLabel from '@/components/nodes/components/NodeLabel.vue'
 import NodeStatus from '@/components/nodes/components/NodeStatus.vue'
@@ -46,6 +45,7 @@ export default {
     NodeStatus,
     NodeVersion,
     NodeLabel,
+    NodeUrl,
     NodeStatusCheckbox
   },
   props: {
@@ -75,41 +75,21 @@ export default {
       store.dispatch('nodes/updateStatus')
     }
 
-    const getCoinLink = computed(() => {
-      const regex = url.value.match(/^(https:\/\/)?(.*?)\.adamant\.im$/)
-      if (regex) {
-        const protocol = regex[1] || ''
-        const nodeName = regex[2] || ''
-        const domain = '.adamant.im'
-        return { protocol, nodeName, domain }
-      } else {
-        return { protocol: '', nodeName: '', domain: '' }
-      }
-    })
-
     return {
       classes,
       url,
       active,
       isUnsupported,
-      toggleActiveStatus,
-      getCoinLink
+      toggleActiveStatus
     }
   }
 }
 </script>
 
 <style lang="scss">
-@import '@/assets/styles/settings/_colors.scss';
 .nodes-table-item {
 }
 
-.protocol,
-.domain {
-  color: map-get($adm-colors, 'grey-transparent');
-  font-size: 12px;
-  display: inline-block;
-}
 .nodeName {
 }
 </style>
diff --git a/src/components/nodes/components/NodeLabel.vue b/src/components/nodes/components/NodeLabel.vue
index a083425fc..8a2db38a8 100644
--- a/src/components/nodes/components/NodeLabel.vue
+++ b/src/components/nodes/components/NodeLabel.vue
@@ -26,6 +26,6 @@ export default defineComponent({
 .blockchain-label {
   --v-chip-height: 18px;
   padding: 0 4px;
-  margin-left: 12px;
+  margin-left: 0px;
 }
 </style>
diff --git a/src/components/nodes/components/NodeStatus.vue b/src/components/nodes/components/NodeStatus.vue
index 27e89e9db..e63660fd4 100644
--- a/src/components/nodes/components/NodeStatus.vue
+++ b/src/components/nodes/components/NodeStatus.vue
@@ -1,7 +1,10 @@
 <template>
   <div :class="classes.statusTitle">
     <span>
-      {{ nodeStatusTitle }}<span :class="classes.textMs">{{ $t('nodes.ms') }}</span></span
+      {{ nodeStatusTitle
+      }}<span v-if="nodeStatusDetail?.icon" :class="classes.textMs">{{
+        $t('nodes.ms')
+      }}</span></span
     >
 
     <v-icon
@@ -72,7 +75,6 @@ export default defineComponent({
   &__status-title {
     width: 76px;
     max-width: 80px;
-    line-height: 17px;
     display: flex;
   }
 
@@ -94,6 +96,9 @@ export default defineComponent({
     &__status-text {
       color: map-get($adm-colors, 'regular');
     }
+    &__text-ms {
+      color: map-get($adm-colors, 'muted');
+    }
 
     &__icon {
       &--green {
@@ -118,6 +123,9 @@ export default defineComponent({
       color: map-get($shades, 'white');
       opacity: 0.7;
     }
+    &__text-ms {
+      color: map-get($adm-colors, 'grey-transparent');
+    }
     &__icon {
       &--green {
         color: map-get($adm-colors, 'good') !important;
diff --git a/src/components/nodes/components/NodeUrl.vue b/src/components/nodes/components/NodeUrl.vue
new file mode 100644
index 000000000..8d9757159
--- /dev/null
+++ b/src/components/nodes/components/NodeUrl.vue
@@ -0,0 +1,106 @@
+<template>
+  <span :class="classes.protocol">{{ computedResult.protocol }}//</span>
+  <span v-if="computedResult.result === false" :class="classes.nodeName">{{
+    computedResult.nodeName
+  }}</span>
+  <span v-if="computedResult.result === false" :class="classes.domain"
+    >.{{ computedResult.domain }}</span
+  >
+  <span v-else-if="computedResult.result" :class="classes.nodeName">{{
+    computedResult.hostname
+  }}</span>
+  <span v-if="computedResult.port" :class="classes.port">:{{ computedResult.port }}</span>
+</template>
+<script lang="ts">
+import { computed, PropType } from 'vue'
+import type { NodeStatusResult } from '@/lib/nodes/abstract.node'
+
+const className = 'node-url'
+const classes = {
+  root: className,
+  nodeName: `${className}__node-name`,
+  domain: `${className}__domain`,
+  protocol: `${className}__protocol`,
+  port: `${className}__port`
+}
+
+export default {
+  props: {
+    node: {
+      type: Object as PropType<NodeStatusResult>,
+      required: true
+    }
+  },
+  setup(props) {
+    const url = computed(() => props.node.url)
+
+    const computedResult = computed(() => {
+      const baseUrl = new URL(url.value)
+      const protocol = baseUrl.protocol
+      const hostname = baseUrl.hostname
+      const port = baseUrl.port
+      const result = /^[\d.]+$/.test(hostname)
+
+      let nodeName = null
+      let domain = null
+
+      if (result === false) {
+        const regex = /([^.]*)\.(.*)/
+        const parts = hostname.match(regex)
+        if (parts !== null) {
+          nodeName = parts[1]
+          domain = parts[2]
+        }
+      }
+
+      return {
+        protocol,
+        hostname,
+        nodeName,
+        domain,
+        result,
+        port
+      }
+    })
+
+    return {
+      classes,
+      url,
+      computedResult
+    }
+  }
+}
+</script>
+<style lang="scss">
+@import '@/assets/styles/settings/_colors.scss';
+@import 'vuetify/settings';
+
+.node-url {
+  &__domain,
+  &__protocol,
+  &__port {
+    font-size: 12px;
+    display: inline-block;
+  }
+}
+
+.v-theme--light {
+  .node-url {
+    &__domain,
+    &__protocol,
+    &__port {
+      color: map-get($adm-colors, 'muted');
+    }
+  }
+}
+
+.v-theme--dark {
+  .node-url {
+    &__domain,
+    &__protocol,
+    &__port {
+      color: map-get($adm-colors, 'grey-transparent');
+    }
+  }
+}
+</style>
diff --git a/src/components/nodes/components/NodesTableContainer.vue b/src/components/nodes/components/NodesTableContainer.vue
index 6b760829c..e0c6a0a8b 100644
--- a/src/components/nodes/components/NodesTableContainer.vue
+++ b/src/components/nodes/components/NodesTableContainer.vue
@@ -25,6 +25,7 @@ export default defineComponent({
 @import 'vuetify/settings';
 
 .nodes-table-container {
+  line-height: 14px;
 }
 
 .v-theme--dark {

From 64bfb0e458ebd8e66327c1e69cd6e78effe63cb3 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 31 Jan 2024 21:56:53 +0000
Subject: [PATCH 11/19] fix: node url component

---
 src/components/nodes/components/NodeUrl.vue | 57 ++++++++++-----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/components/nodes/components/NodeUrl.vue b/src/components/nodes/components/NodeUrl.vue
index 8d9757159..c06c4440f 100644
--- a/src/components/nodes/components/NodeUrl.vue
+++ b/src/components/nodes/components/NodeUrl.vue
@@ -1,15 +1,14 @@
 <template>
-  <span :class="classes.protocol">{{ computedResult.protocol }}//</span>
-  <span v-if="computedResult.result === false" :class="classes.nodeName">{{
-    computedResult.nodeName
-  }}</span>
-  <span v-if="computedResult.result === false" :class="classes.domain"
-    >.{{ computedResult.domain }}</span
-  >
-  <span v-else-if="computedResult.result" :class="classes.nodeName">{{
-    computedResult.hostname
-  }}</span>
-  <span v-if="computedResult.port" :class="classes.port">:{{ computedResult.port }}</span>
+  <span :class="classes.protocol">{{ protocol }}//</span>
+
+  <span v-if="isIP" :class="classes.nodeName">{{ hostname }}</span>
+
+  <template v-else>
+    <span :class="classes.nodeName">{{ nodeHost.name }}</span>
+    <span :class="classes.domain">.{{ nodeHost.domain }}</span>
+  </template>
+
+  <span v-if="port" :class="classes.port">:{{ port }}</span>
 </template>
 <script lang="ts">
 import { computed, PropType } from 'vue'
@@ -32,41 +31,39 @@ export default {
     }
   },
   setup(props) {
-    const url = computed(() => props.node.url)
+    const url = computed(() => new URL(props.node.url))
+    const protocol = computed(() => url.value.protocol)
+    const hostname = computed(() => url.value.hostname)
+    const port = computed(() => url.value.port)
 
-    const computedResult = computed(() => {
-      const baseUrl = new URL(url.value)
-      const protocol = baseUrl.protocol
-      const hostname = baseUrl.hostname
-      const port = baseUrl.port
-      const result = /^[\d.]+$/.test(hostname)
+    const isIP = computed(() => /^[\d.]+$/.test(hostname.value))
 
-      let nodeName = null
+    const nodeHost = computed(() => {
+      let name = null
       let domain = null
 
-      if (result === false) {
+      if (!isIP.value) {
         const regex = /([^.]*)\.(.*)/
-        const parts = hostname.match(regex)
+        const parts = hostname.value.match(regex)
         if (parts !== null) {
-          nodeName = parts[1]
+          name = parts[1]
           domain = parts[2]
         }
       }
 
       return {
-        protocol,
-        hostname,
-        nodeName,
-        domain,
-        result,
-        port
+        name,
+        domain
       }
     })
 
     return {
       classes,
-      url,
-      computedResult
+      protocol,
+      hostname,
+      port,
+      isIP,
+      nodeHost
     }
   }
 }

From 350ae944b2c3dadafe7fb3fb29d61fb8038f35a5 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Thu, 1 Feb 2024 04:13:25 +0000
Subject: [PATCH 12/19] fix: choice fastes coin node

---
 src/store/modules/nodes/nodes-plugin.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/nodes/nodes-plugin.js b/src/store/modules/nodes/nodes-plugin.js
index 3bcf25196..1ce0cb4b6 100644
--- a/src/store/modules/nodes/nodes-plugin.js
+++ b/src/store/modules/nodes/nodes-plugin.js
@@ -1,7 +1,6 @@
 import { nodes } from '@/lib/nodes'
 
 export default (store) => {
-  // initial nodes state
   for (const [nodeType, client] of Object.entries(nodes)) {
     client.getNodes().forEach((status) => store.commit('nodes/status', { status, nodeType }))
 
@@ -10,7 +9,7 @@ export default (store) => {
     })
   }
   store.commit('nodes/useFastestAdmNode', nodes.adm.useFastest)
-  // todo: useFaster for coin nodes
+  store.commit('nodes/useFastestCoinNode', nodes.btc.useFastest)
 
   store.subscribe((mutation) => {
     const { type, payload } = mutation
@@ -19,7 +18,13 @@ export default (store) => {
       nodes.adm.setUseFastest(!!payload)
     }
 
-    // todo mutation for coin nodes
+    if (type === 'nodes/useFastestCoinNode') {
+      nodes.btc.setUseFastest(!!payload)
+      nodes.dash.setUseFastest(!!payload)
+      nodes.doge.setUseFastest(!!payload)
+      nodes.eth.setUseFastest(!!payload)
+      nodes.lsk.setUseFastest(!!payload)
+    }
 
     if (type === 'nodes/toggle') {
       const selectedNodeType = payload.type

From adef92759e7e221622afb585a0f55f629d8ad14d Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Thu, 1 Feb 2024 21:49:53 +0000
Subject: [PATCH 13/19] fix: label coin and fix syles

---
 src/components/nodes/coins/CoinNodesTableItem.vue  |  2 +-
 src/components/nodes/components/NodeColumn.vue     | 10 +++++++++-
 src/components/nodes/components/NodeLabel.vue      |  1 -
 src/components/nodes/components/NodesTableHead.vue |  3 ++-
 src/locales/en.json                                |  1 +
 src/locales/ru.json                                |  1 +
 src/locales/zh.json                                |  1 +
 7 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index c031614b4..e8ba32906 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -13,7 +13,7 @@
       <NodeVersion v-if="node.version" :node="node" />
     </NodeColumn>
 
-    <NodeColumn :colspan="isUnsupported ? 2 : 1">
+    <NodeColumn ping :colspan="isUnsupported ? 2 : 1">
       <NodeStatus :node="node" />
     </NodeColumn>
   </tr>
diff --git a/src/components/nodes/components/NodeColumn.vue b/src/components/nodes/components/NodeColumn.vue
index 25194eec4..f2c14794b 100644
--- a/src/components/nodes/components/NodeColumn.vue
+++ b/src/components/nodes/components/NodeColumn.vue
@@ -2,6 +2,7 @@
   <td
     :class="{
       [classes.root]: true,
+      [classes.ping]: ping,
       [classes.checkbox]: checkbox,
       [classes.alignRight]: align === 'right',
       [classes.alignCenter]: align === 'center'
@@ -17,6 +18,7 @@ import { defineComponent, PropType } from 'vue'
 const className = 'node-column'
 const classes = {
   root: className,
+  ping: `${className}--ping`,
   checkbox: `${className}--checkbox`,
   alignRight: `${className}--align-right`,
   alignCenter: `${className}--align-center`
@@ -30,6 +32,9 @@ export default defineComponent({
     checkbox: {
       type: Boolean
     },
+    ping: {
+      type: Boolean
+    },
     align: {
       type: String as PropType<'left' | 'right' | 'center'>
     }
@@ -49,13 +54,16 @@ export default defineComponent({
 .node-column {
   font-size: 14px;
   padding-left: 0 !important;
-  padding-right: 8px !important;
+  padding-right: 24px !important;
 
   &--checkbox {
     width: 64px;
     max-width: 64px;
     padding-right: 0 !important;
   }
+  &--ping {
+    padding-right: 8px !important;
+  }
 
   &--align-right {
     text-align: right;
diff --git a/src/components/nodes/components/NodeLabel.vue b/src/components/nodes/components/NodeLabel.vue
index 8a2db38a8..19d33a8f1 100644
--- a/src/components/nodes/components/NodeLabel.vue
+++ b/src/components/nodes/components/NodeLabel.vue
@@ -26,6 +26,5 @@ export default defineComponent({
 .blockchain-label {
   --v-chip-height: 18px;
   padding: 0 4px;
-  margin-left: 0px;
 }
 </style>
diff --git a/src/components/nodes/components/NodesTableHead.vue b/src/components/nodes/components/NodesTableHead.vue
index 02af0bc13..5e24d0c20 100644
--- a/src/components/nodes/components/NodesTableHead.vue
+++ b/src/components/nodes/components/NodesTableHead.vue
@@ -2,7 +2,7 @@
   <thead :class="classes.root">
     <tr>
       <th :class="classes.checkbox" v-if="!hideCheckbox" />
-      <th :class="classes.label" class="pl-0" v-if="!hideLabel" />
+      <th :class="classes.label" class="pl-0 pr-2" v-if="!hideLabel">{{ t('nodes.coin') }}</th>
       <th :class="classes.th" class="pl-0 pr-2" v-if="!hideHost">
         {{ t('nodes.host') }}
       </th>
@@ -70,6 +70,7 @@ export default {
   }
 
   &__label {
+    font-size: 12px;
     width: 104px;
   }
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index d35d54801..c4bb1e3ec 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -170,6 +170,7 @@
     "ms": "ms",
     "nodeLabelDescription": "Support decentralization and enhance privacy level—<a target=\"_blank\" href=\"https://medium.com/adamant-im/how-to-run-your-adamant-node-on-ubuntu-990e391e8fcc\">run your own ADAMANT node</a>. To add your nodes to the list, you need <a target=\"_blank\" href=\"https://github.com/Adamant-im/adamant-im/\">to deploy web application on separate domain</a>. This limitation refers to Content Security Policy (CSP).",
     "offline": "Offline",
+    "coin": "Coin",
     "ping": "Ping",
     "socket": "Socket",
     "unsupported": "Unsupported",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 27baa55a1..260b0872a 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -171,6 +171,7 @@
     "ms": "мс",
     "nodeLabelDescription": "Поддержите децентрализацию и повысьте уровень приватности — <a target=\"_blank\" href=\"https://medium.com/adamant-im/how-to-run-your-adamant-node-on-ubuntu-990e391e8fcc\">установите свой узел (ноду) АДАМАНТа</a>. Чтобы добавить свои узлы в список для подключения, вам нужно <a target=\"_blank\" href=\"https://github.com/Adamant-im/adamant-im/\">развернуть свое веб-приложение на отдельном домене</a>. Это ограничение связано с политикой безопасности Content Security Policy (CSP).",
     "offline": "Недоступна",
+    "coin": "Coin",
     "ping": "Пинг",
     "socket": "Сокеты",
     "unsupported": "Не поддерживается",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 4f5f4a75a..822082e0e 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -170,6 +170,7 @@
     "ms": "ms",
     "nodeLabelDescription": "支持去中心化并提高隐私级别--<a target=\"_blank\" href=\"https://medium.com/adamant-im/how-to-run-your-adamant-node-on-ubuntu-990e391e8fcc\">运行您自己的ADAMANT节点</a>。若要将节点添加到列表中，您需要<a target=\"_blank\"href=\"https://github.com/Adamant-im/adamant-im/\">在单独的域上部署web应用程序</a>。此限制指的是内容安全策略（CSP）。",
     "offline": "脱机",
+    "coin": "硬币",
     "ping": "Ping",
     "socket": "套接字",
     "unsupported": "不受欢迎",

From 175e3bf80ebbb4eb7f4e7ad8e4de777e4a7bfcee Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Sat, 3 Feb 2024 18:20:03 +0000
Subject: [PATCH 14/19] fix: no node version for inactive notes

---
 src/components/nodes/adm/AdmNodesTableItem.vue    | 2 +-
 src/components/nodes/coins/CoinNodesTableItem.vue | 2 +-
 src/components/nodes/components/NodeColumn.vue    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/nodes/adm/AdmNodesTableItem.vue b/src/components/nodes/adm/AdmNodesTableItem.vue
index 162e9dd23..913b18908 100644
--- a/src/components/nodes/adm/AdmNodesTableItem.vue
+++ b/src/components/nodes/adm/AdmNodesTableItem.vue
@@ -6,7 +6,7 @@
 
     <NodeColumn>
       <NodeUrl :node="node" />
-      <NodeVersion v-if="node.version" :node="node" />
+      <NodeVersion v-if="node.version && active" :node="node" />
     </NodeColumn>
 
     <NodeColumn :colspan="!showSocketColumn ? 2 : 1">
diff --git a/src/components/nodes/coins/CoinNodesTableItem.vue b/src/components/nodes/coins/CoinNodesTableItem.vue
index e8ba32906..02d7bcf2f 100644
--- a/src/components/nodes/coins/CoinNodesTableItem.vue
+++ b/src/components/nodes/coins/CoinNodesTableItem.vue
@@ -10,7 +10,7 @@
 
     <NodeColumn>
       <NodeUrl :node="node" />
-      <NodeVersion v-if="node.version" :node="node" />
+      <NodeVersion v-if="node.version && active" :node="node" />
     </NodeColumn>
 
     <NodeColumn ping :colspan="isUnsupported ? 2 : 1">
diff --git a/src/components/nodes/components/NodeColumn.vue b/src/components/nodes/components/NodeColumn.vue
index f2c14794b..aeb32017a 100644
--- a/src/components/nodes/components/NodeColumn.vue
+++ b/src/components/nodes/components/NodeColumn.vue
@@ -54,7 +54,7 @@ export default defineComponent({
 .node-column {
   font-size: 14px;
   padding-left: 0 !important;
-  padding-right: 24px !important;
+  padding-right: 8px !important;
 
   &--checkbox {
     width: 64px;

From aacd7dc1759f9c497e31786e19dc5c1f6f376198 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Sat, 3 Feb 2024 20:39:47 +0000
Subject: [PATCH 15/19] =?UTF-8?q?fix:=20don=E2=80=99t=20show=20height=20an?=
 =?UTF-8?q?d=20Infinity=20ms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/nodes/components/NodeStatus.vue | 4 ++--
 src/lib/nodes/abstract.node.ts                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/nodes/components/NodeStatus.vue b/src/components/nodes/components/NodeStatus.vue
index e63660fd4..d7df0b14d 100644
--- a/src/components/nodes/components/NodeStatus.vue
+++ b/src/components/nodes/components/NodeStatus.vue
@@ -2,7 +2,7 @@
   <div :class="classes.statusTitle">
     <span>
       {{ nodeStatusTitle
-      }}<span v-if="nodeStatusDetail?.icon" :class="classes.textMs">{{
+      }}<span v-if="node.status === 'online'" :class="classes.textMs">{{
         $t('nodes.ms')
       }}</span></span
     >
@@ -21,7 +21,7 @@
     />
   </div>
 
-  <span v-if="nodeStatusDetail" :class="classes.statusText">
+  <span v-if="nodeStatusDetail && node.status !== 'sync'" :class="classes.statusText">
     <v-icon v-if="nodeStatusDetail.icon" :icon="nodeStatusDetail.icon" :size="12" />
     {{ nodeStatusDetail.text }}
   </span>
diff --git a/src/lib/nodes/abstract.node.ts b/src/lib/nodes/abstract.node.ts
index 084ba55cc..b70e8fdc2 100644
--- a/src/lib/nodes/abstract.node.ts
+++ b/src/lib/nodes/abstract.node.ts
@@ -31,7 +31,7 @@ export abstract class Node<C = unknown> {
    * Indicates whether node is out of sync (i.e. its block height is
    * either too big or too small compared to the other nodes)
    */
-  outOfSync = false
+  outOfSync = true
 
   /**
    * Default `wsPort`. Will be updated after `GET /api/node/status`

From 801288788a8d36be51acaf8b3d76e25bccfe7857 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Mon, 5 Feb 2024 13:59:30 +0100
Subject: [PATCH 16/19] fix: coin node  default enabled

---
 src/store/modules/nodes/nodes-state.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/nodes/nodes-state.js b/src/store/modules/nodes/nodes-state.js
index 4b52694f7..ac1dc1535 100644
--- a/src/store/modules/nodes/nodes-state.js
+++ b/src/store/modules/nodes/nodes-state.js
@@ -6,5 +6,5 @@ export default {
   dash: {},
   lsk: {},
   useFastestAdmNode: false,
-  useFastestCoinNode: false
+  useFastestCoinNode: true
 }

From 6cc1114b103721115fead1efbf768bdd87e04b51 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Thu, 8 Feb 2024 21:52:14 +0000
Subject: [PATCH 17/19] fix: indentation at the bottom of the  coin node

---
 src/components/nodes/NodesTable.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/nodes/NodesTable.vue b/src/components/nodes/NodesTable.vue
index 2024151b9..940c83402 100644
--- a/src/components/nodes/NodesTable.vue
+++ b/src/components/nodes/NodesTable.vue
@@ -27,6 +27,7 @@
         <div class="a-text-explanation-enlarged">
           {{ $t('nodes.fastest_tooltip') }}
         </div>
+        <div>&nbsp;<br />&nbsp;</div>
       </div>
       <div v-if="tab === 'adm'">
         <v-checkbox

From 70c0afadf099752b96f28c41ff3d2abc832edf53 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Sat, 10 Feb 2024 23:45:52 +0000
Subject: [PATCH 18/19] fix: use fastest coin node true

---
 src/lib/nodes/storage.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/nodes/storage.ts b/src/lib/nodes/storage.ts
index e3d2a89c6..28b58fc3c 100644
--- a/src/lib/nodes/storage.ts
+++ b/src/lib/nodes/storage.ts
@@ -41,11 +41,11 @@ function saveState(newState: State) {
 
 const defaultOptions: Options = {
   adm: { useFastest: false },
-  btc: { useFastest: false },
-  doge: { useFastest: false },
-  dash: { useFastest: false },
-  eth: { useFastest: false },
-  lsk: { useFastest: false }
+  btc: { useFastest: true },
+  doge: { useFastest: true },
+  dash: { useFastest: true },
+  eth: { useFastest: true },
+  lsk: { useFastest: true }
 }
 
 function getOptions() {

From df59ad0b74be273c6e3b703adb7e0ae323897a5d Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Sun, 11 Feb 2024 08:56:13 +0000
Subject: [PATCH 19/19] fix: created  function  format height

---
 src/components/nodes/NodesTable.vue         | 4 ++--
 src/components/nodes/hooks/useNodeStatus.ts | 3 ++-
 src/components/nodes/utils/formatHeight.ts  | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 src/components/nodes/utils/formatHeight.ts

diff --git a/src/components/nodes/NodesTable.vue b/src/components/nodes/NodesTable.vue
index 940c83402..16e1ff6c1 100644
--- a/src/components/nodes/NodesTable.vue
+++ b/src/components/nodes/NodesTable.vue
@@ -29,7 +29,7 @@
         </div>
         <div>&nbsp;<br />&nbsp;</div>
       </div>
-      <div v-if="tab === 'adm'">
+      <div v-else-if="tab === 'adm'">
         <v-checkbox
           v-model="preferFastestAdmNodeOption"
           :label="$t('nodes.fastest_title')"
@@ -77,7 +77,7 @@ const className = 'nodes-table'
 const classes = {
   root: className,
   info: `${className}__info`,
-  checkbox: `${className}__checkbox `
+  checkbox: `${className}__checkbox`
 }
 
 type Tab = 'adm' | 'coins'
diff --git a/src/components/nodes/hooks/useNodeStatus.ts b/src/components/nodes/hooks/useNodeStatus.ts
index 2518da6f3..ca7c82e7b 100644
--- a/src/components/nodes/hooks/useNodeStatus.ts
+++ b/src/components/nodes/hooks/useNodeStatus.ts
@@ -3,6 +3,7 @@ import { useI18n, VueI18nTranslation } from 'vue-i18n'
 
 import { NodeStatusResult } from '@/lib/nodes/abstract.node'
 import { NodeStatus } from '@/lib/nodes/types'
+import { formatHeight } from '@/components/nodes/utils/formatHeight'
 
 type StatusColor = 'green' | 'red' | 'grey' | 'orange'
 type NodeStatusDetail = {
@@ -44,7 +45,7 @@ function getNodeStatusDetail(
     }
   } else if (node.online) {
     return {
-      text: node.height.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','),
+      text: formatHeight(node.height),
       icon: 'mdi-cube-outline'
     }
   }
diff --git a/src/components/nodes/utils/formatHeight.ts b/src/components/nodes/utils/formatHeight.ts
new file mode 100644
index 000000000..de9e13a10
--- /dev/null
+++ b/src/components/nodes/utils/formatHeight.ts
@@ -0,0 +1,4 @@
+export function formatHeight(height: number) {
+  const formatted = height.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return formatted
+}