From da434139232f79cfcbc4f766036894cd684ced16 Mon Sep 17 00:00:00 2001
From: PaulDremanovich <pauldremanovich@gmail.com>
Date: Thu, 8 Aug 2024 14:25:47 +0300
Subject: [PATCH 1/6] fix: russian locales and versions

---
 src/components/nodes/services/ServiceNodesTableItem.vue | 3 +++
 src/lib/nodes/eth-indexer/EthIndexer.ts                 | 3 ++-
 src/lib/nodes/eth-indexer/types/api/endpoints.ts        | 1 +
 src/locales/ru.json                                     | 6 +++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/nodes/services/ServiceNodesTableItem.vue b/src/components/nodes/services/ServiceNodesTableItem.vue
index 05e2f2a63..074490c2c 100644
--- a/src/components/nodes/services/ServiceNodesTableItem.vue
+++ b/src/components/nodes/services/ServiceNodesTableItem.vue
@@ -10,6 +10,7 @@
 
     <NodeColumn>
       <NodeUrl :node="node" />
+      <NodeVersion v-if="node.version && active" :node="node" />
     </NodeColumn>
 
     <NodeColumn ping :colspan="isUnsupported ? 2 : 1">
@@ -28,6 +29,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 NodeStatusCheckbox from '@/components/nodes/components/NodeStatusCheckbox.vue'
+import NodeVersion from '@/components/nodes/components/NodeVersion.vue'
 
 const className = 'nodes-table-item'
 const classes = {
@@ -39,6 +41,7 @@ const classes = {
 
 export default {
   components: {
+    NodeVersion,
     NodeColumn,
     NodeStatus,
     NodeLabel,
diff --git a/src/lib/nodes/eth-indexer/EthIndexer.ts b/src/lib/nodes/eth-indexer/EthIndexer.ts
index f05d51ccc..6a709ce0b 100644
--- a/src/lib/nodes/eth-indexer/EthIndexer.ts
+++ b/src/lib/nodes/eth-indexer/EthIndexer.ts
@@ -39,8 +39,9 @@ export class EthIndexer extends Node<AxiosInstance> {
   }
 
   private async fetchServiceInfo(): Promise<{ height: number }> {
-    const [{ max }] = await this.request('GET /max_block')
+    const [{ max, version }] = await this.request('GET /max_block')
     this.height = max
+    this.version = version
 
     return {
       height: this.height
diff --git a/src/lib/nodes/eth-indexer/types/api/endpoints.ts b/src/lib/nodes/eth-indexer/types/api/endpoints.ts
index 09aea9729..6dcc53c28 100644
--- a/src/lib/nodes/eth-indexer/types/api/endpoints.ts
+++ b/src/lib/nodes/eth-indexer/types/api/endpoints.ts
@@ -17,6 +17,7 @@ export type Endpoints = {
     result: [
       {
         max: number
+        version: string
       }
     ]
   }
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 5ec8b2feb..2649d3859 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -190,9 +190,9 @@
     "service": "Сервис",
     "socket": "Сокеты",
     "tabs": {
-      "adm_nodes": "ADM ноды",
-      "coin_nodes": "Coin ноды",
-      "service_nodes": "Сервис ноды"
+      "adm_nodes": "Узлы ADM",
+      "coin_nodes": "Крипто-ноды",
+      "service_nodes": "Крипто-сервисы"
     },
     "unsupported": "Не поддерживается",
     "unsupported_reason_protocol": "HTTP не поддерживается",

From 53a8e9c5edb8db682e5d981a0f6923436a73ebbc Mon Sep 17 00:00:00 2001
From: PaulDremanovich <pauldremanovich@gmail.com>
Date: Sun, 11 Aug 2024 14:22:24 +0300
Subject: [PATCH 2/6] fix: change rate service height format and change
 AllNodesDisabledError text

---
 src/components/SendFundsForm.vue                   |  6 +++++-
 src/components/nodes/hooks/useNodeStatus.ts        |  9 ++++++---
 src/lib/nodes/rate-info-service/RateInfoService.ts | 12 +++++++++++-
 src/views/Transactions.vue                         | 13 ++++++++++++-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/components/SendFundsForm.vue b/src/components/SendFundsForm.vue
index 592e04ac7..346d53533 100644
--- a/src/components/SendFundsForm.vue
+++ b/src/components/SendFundsForm.vue
@@ -189,7 +189,7 @@
 <script>
 import { adm } from '@/lib/nodes'
 import klyIndexer from '@/lib/nodes/kly-indexer'
-import { AllNodesOfflineError } from '@/lib/nodes/utils/errors'
+import { AllNodesDisabledError, AllNodesOfflineError } from '@/lib/nodes/utils/errors'
 import { PendingTransactionError } from '@/lib/pending-transactions'
 import axios from 'axios'
 import { nextTick } from 'vue'
@@ -755,6 +755,10 @@ export default {
             message = this.$t('errors.all_nodes_offline', {
               crypto: error.nodeLabel.toUpperCase()
             })
+          } else if (error instanceof AllNodesDisabledError) {
+            message = this.$t('errors.all_nodes_disabled', {
+              crypto: error.nodeLabel.toUpperCase()
+            })
           } else if (error instanceof PendingTransactionError) {
             message = this.$t('transfer.error_pending_transaction', {
               crypto: error.crypto
diff --git a/src/components/nodes/hooks/useNodeStatus.ts b/src/components/nodes/hooks/useNodeStatus.ts
index 11e7c0b85..54b42bc48 100644
--- a/src/components/nodes/hooks/useNodeStatus.ts
+++ b/src/components/nodes/hooks/useNodeStatus.ts
@@ -22,9 +22,12 @@ function getNodeStatusTitle(node: NodeStatusResult, t: VueI18nTranslation) {
     sync: 'nodes.sync',
     unsupported_version: 'nodes.unsupported'
   }
-  const i18nKey = i18n[node.status]
-
-  return t(i18nKey)
+  if (node.status !== 'online') {
+    const i18nKey = i18n[node.status]
+    return t(i18nKey)
+  } else {
+    return i18n[node.status]
+  }
 }
 
 function getNodeStatusDetail(
diff --git a/src/lib/nodes/rate-info-service/RateInfoService.ts b/src/lib/nodes/rate-info-service/RateInfoService.ts
index 54ba50b1f..d98c1797f 100644
--- a/src/lib/nodes/rate-info-service/RateInfoService.ts
+++ b/src/lib/nodes/rate-info-service/RateInfoService.ts
@@ -31,9 +31,19 @@ export class RateInfoService extends Node<AxiosInstance> {
   protected async checkHealth(): Promise<HealthcheckResult> {
     const start = Date.now()
     const response = await this.getAllRates()
+    this.height = this.formatHeight(response.date)
     return {
       ping: Date.now() - start,
-      height: response.date
+      height: this.height
     }
   }
+
+  private formatHeight(height: number) {
+    if (!height) return 0
+    return Number(
+      Math.ceil(height / 1000)
+        .toString()
+        .substring(2)
+    )
+  }
 }
diff --git a/src/views/Transactions.vue b/src/views/Transactions.vue
index 42b0c5898..8e2bc57f1 100644
--- a/src/views/Transactions.vue
+++ b/src/views/Transactions.vue
@@ -43,6 +43,7 @@ import AppToolbarCentered from '@/components/AppToolbarCentered.vue'
 import InlineSpinner from '@/components/InlineSpinner.vue'
 import TransactionListItem from '@/components/TransactionListItem.vue'
 import { isStringEqualCI } from '@/lib/textHelpers'
+import { AllNodesDisabledError, AllNodesOfflineError } from '@/lib/nodes/utils/errors'
 
 export default {
   components: {
@@ -183,8 +184,18 @@ export default {
           })
           .catch((err) => {
             this.isRejected = true
+            let message = err.message
+            if (err instanceof AllNodesOfflineError) {
+              message = this.$t('errors.all_nodes_offline', {
+                crypto: err.nodeLabel.toUpperCase()
+              })
+            } else if (err instanceof AllNodesDisabledError) {
+              message = this.$t('errors.all_nodes_disabled', {
+                crypto: err.nodeLabel.toUpperCase()
+              })
+            }
             this.$store.dispatch('snackbar/show', {
-              message: err.message
+              message: message
             })
           })
       }

From 6af91128696da88a301903e9d240b676414b93e6 Mon Sep 17 00:00:00 2001
From: PaulDremanovich <pauldremanovich@gmail.com>
Date: Wed, 14 Aug 2024 13:29:33 +0300
Subject: [PATCH 3/6] fix: refactor CurrencyRate height formatter

---
 src/lib/nodes/rate-info-service/RateInfoService.ts | 12 ++----------
 src/lib/nodes/rate-info-service/utils.ts           |  8 ++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 src/lib/nodes/rate-info-service/utils.ts

diff --git a/src/lib/nodes/rate-info-service/RateInfoService.ts b/src/lib/nodes/rate-info-service/RateInfoService.ts
index d98c1797f..464f6c9fb 100644
--- a/src/lib/nodes/rate-info-service/RateInfoService.ts
+++ b/src/lib/nodes/rate-info-service/RateInfoService.ts
@@ -5,6 +5,7 @@ import { NODE_LABELS } from '@/lib/nodes/constants'
 import { RateInfoResponse } from '@/lib/nodes/rate-info-service/types/RateInfoResponse'
 import { RateHistoryInfoResponse } from '@/lib/nodes/rate-info-service/types/RateHistoryInfoResponse'
 import { GetHistoryParams } from '@/lib/nodes/rate-info-service/types/GetHistoryParams'
+import { normalizeHeight } from '@/lib/nodes/rate-info-service/utils.ts'
 
 export class RateInfoService extends Node<AxiosInstance> {
   constructor(url: string) {
@@ -31,19 +32,10 @@ export class RateInfoService extends Node<AxiosInstance> {
   protected async checkHealth(): Promise<HealthcheckResult> {
     const start = Date.now()
     const response = await this.getAllRates()
-    this.height = this.formatHeight(response.date)
+    this.height = normalizeHeight(response.date)
     return {
       ping: Date.now() - start,
       height: this.height
     }
   }
-
-  private formatHeight(height: number) {
-    if (!height) return 0
-    return Number(
-      Math.ceil(height / 1000)
-        .toString()
-        .substring(2)
-    )
-  }
 }
diff --git a/src/lib/nodes/rate-info-service/utils.ts b/src/lib/nodes/rate-info-service/utils.ts
new file mode 100644
index 000000000..5e026c360
--- /dev/null
+++ b/src/lib/nodes/rate-info-service/utils.ts
@@ -0,0 +1,8 @@
+export const normalizeHeight = (height: number) => {
+  if (!height) return 0
+  return Number(
+    Math.ceil(height / 1000)
+      .toString()
+      .substring(2)
+  )
+}

From 9e42d51ce6b485c1e4eec1f685d91075e5de146b Mon Sep 17 00:00:00 2001
From: PaulDremanovich <pauldremanovich@gmail.com>
Date: Wed, 14 Aug 2024 13:31:07 +0300
Subject: [PATCH 4/6] fix: refactor getNodeStatusTitle

---
 src/components/nodes/hooks/useNodeStatus.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/nodes/hooks/useNodeStatus.ts b/src/components/nodes/hooks/useNodeStatus.ts
index 54b42bc48..cb16ed8b0 100644
--- a/src/components/nodes/hooks/useNodeStatus.ts
+++ b/src/components/nodes/hooks/useNodeStatus.ts
@@ -22,11 +22,11 @@ function getNodeStatusTitle(node: NodeStatusResult, t: VueI18nTranslation) {
     sync: 'nodes.sync',
     unsupported_version: 'nodes.unsupported'
   }
-  if (node.status !== 'online') {
+  if (node.status === 'online') {
+    return i18n[node.status]
+  } else {
     const i18nKey = i18n[node.status]
     return t(i18nKey)
-  } else {
-    return i18n[node.status]
   }
 }
 

From 9e00a6df77fc07a45d62757d7ab0e4a67420bbfb Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Fri, 16 Aug 2024 19:21:14 +0100
Subject: [PATCH 5/6] refactor(rate-info-service, utils): add JSDoc and rename
 param

---
 src/lib/nodes/rate-info-service/utils.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/lib/nodes/rate-info-service/utils.ts b/src/lib/nodes/rate-info-service/utils.ts
index 5e026c360..57fdcb9d8 100644
--- a/src/lib/nodes/rate-info-service/utils.ts
+++ b/src/lib/nodes/rate-info-service/utils.ts
@@ -1,7 +1,13 @@
-export const normalizeHeight = (height: number) => {
-  if (!height) return 0
+/**
+ * Normalize the height to 8 digits.
+ * Rounds the timestamp to seconds and removes the first two digits.
+ * @param timestamp Timestamp in milliseconds
+ */
+export const normalizeHeight = (timestamp: number) => {
+  if (!timestamp) return 0
+
   return Number(
-    Math.ceil(height / 1000)
+    Math.ceil(timestamp / 1000)
       .toString()
       .substring(2)
   )

From 48d9f57622d848b8f33ad8958822d8b69dbba160 Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Fri, 16 Aug 2024 19:21:51 +0100
Subject: [PATCH 6/6] refactor(RatesInfoService): shorter import

---
 src/lib/nodes/rate-info-service/RateInfoService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/nodes/rate-info-service/RateInfoService.ts b/src/lib/nodes/rate-info-service/RateInfoService.ts
index 464f6c9fb..bf69ccf44 100644
--- a/src/lib/nodes/rate-info-service/RateInfoService.ts
+++ b/src/lib/nodes/rate-info-service/RateInfoService.ts
@@ -5,7 +5,7 @@ import { NODE_LABELS } from '@/lib/nodes/constants'
 import { RateInfoResponse } from '@/lib/nodes/rate-info-service/types/RateInfoResponse'
 import { RateHistoryInfoResponse } from '@/lib/nodes/rate-info-service/types/RateHistoryInfoResponse'
 import { GetHistoryParams } from '@/lib/nodes/rate-info-service/types/GetHistoryParams'
-import { normalizeHeight } from '@/lib/nodes/rate-info-service/utils.ts'
+import { normalizeHeight } from './utils'
 
 export class RateInfoService extends Node<AxiosInstance> {
   constructor(url: string) {