From 19725ca7cbadb8d186b22aecbac17b01139c2861 Mon Sep 17 00:00:00 2001
From: aineo <124525926+aineo@users.noreply.github.com>
Date: Wed, 25 Sep 2024 18:41:35 +0300
Subject: [PATCH 01/18] fix: broken links are shown as undefined

---
 src/lib/markdown.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/lib/markdown.js b/src/lib/markdown.js
index 92e2dda2f..1bcaeee3c 100644
--- a/src/lib/markdown.js
+++ b/src/lib/markdown.js
@@ -10,11 +10,11 @@ marked.setOptions({
 
 const renderer = new marked.Renderer()
 
-renderer.image = function (_href, _title, _text) {
+renderer.image = function ({ _href, _title, _text }) {
   return ''
 }
 
-renderer.link = function (href, title, text) {
+renderer.link = function ({ href, _title, text }) {
   const linkPattern = /^(eth|bch|bitcoin|https?|s?ftp|magnet|tor|onion|tg):(.*)$/i
   const emailPattern = /^(mailto):[^@]+@[^@]+\.[^@]+$/i
 
@@ -27,10 +27,12 @@ renderer.link = function (href, title, text) {
   return text
 }
 
-renderer.heading = function (text) {
+renderer.heading = function ({ text }) {
   return `<p>${text}</p>`
 }
 
+marked.use({ renderer })
+
 /**
  * Sanitizes text to show HTML
  * @param {string} text text to sanitize
@@ -46,7 +48,7 @@ export function sanitizeHTML(text = '') {
  * @returns {string} resulting sanitized HTML
  */
 export function renderMarkdown(text = '') {
-  return marked(DOMPurify.sanitize(text), { renderer })
+  return marked.parse(sanitizeHTML(text))
 }
 
 /**
@@ -58,7 +60,7 @@ export function renderMarkdown(text = '') {
 export function removeFormats(text = '') {
   const node = document.createElement('div')
   const textWithSymbol = text.replace(/\n/g, '↵ ')
-  node.innerHTML = marked(DOMPurify.sanitize(textWithSymbol), { renderer })
+  node.innerHTML = marked.parse(sanitizeHTML(textWithSymbol))
 
   return node.textContent || node.innerText || ''
 }
@@ -66,7 +68,7 @@ export function removeFormats(text = '') {
 export function formatMessage(text = '') {
   const node = document.createElement('div')
   const textWithSymbol = text.replace(/\n/g, '↵ ')
-  node.innerHTML = marked(DOMPurify.sanitize(textWithSymbol), { renderer })
+  node.innerHTML = marked.parse(sanitizeHTML(textWithSymbol))
 
   const textWithoutHtml = node.textContent || node.innerText || ''
   const styledText = textWithoutHtml.replace(/↵/g, '<span class="arrow-return">↵</span>')

From d378d5206e2a8228c70a52715074c3e91f836b11 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Fri, 25 Oct 2024 11:02:19 +0300
Subject: [PATCH 02/18] fix: padding in styles

---
 src/components/NodesOfflineDialog.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/NodesOfflineDialog.vue b/src/components/NodesOfflineDialog.vue
index f4d324cb9..7dc6f00ca 100644
--- a/src/components/NodesOfflineDialog.vue
+++ b/src/components/NodesOfflineDialog.vue
@@ -77,8 +77,11 @@ export default {
 @import '@/assets/styles/settings/_colors.scss';
 
 .all-nodes-disabled-dialog {
+  &__card-title {
+    padding: 14px !important;
+  }
   &__card-text {
-    padding: 16px !important;
+    padding: 14px !important;
   }
   &__disclaimer {
     margin-top: 10px;

From 42d5b8089ca5e6f2ca46ed2d2282aa425bbb4027 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Fri, 25 Oct 2024 12:02:24 +0300
Subject: [PATCH 03/18] fix: padding in styles for headers; padding s for the
 content are vuetify's default ones

---
 src/components/NodesOfflineDialog.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/NodesOfflineDialog.vue b/src/components/NodesOfflineDialog.vue
index 7dc6f00ca..07029b2cd 100644
--- a/src/components/NodesOfflineDialog.vue
+++ b/src/components/NodesOfflineDialog.vue
@@ -77,11 +77,8 @@ export default {
 @import '@/assets/styles/settings/_colors.scss';
 
 .all-nodes-disabled-dialog {
-  &__card-title {
-    padding: 14px !important;
-  }
-  &__card-text {
-    padding: 14px !important;
+  .a-text-header {
+    padding-left: 24px !important;
   }
   &__disclaimer {
     margin-top: 10px;

From 2d1ee57bb7122271497bc66da201ec98a3b07855 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Fri, 25 Oct 2024 12:32:57 +0300
Subject: [PATCH 04/18] fix: padding in styles for the card's header with BEM
 rules

---
 src/components/NodesOfflineDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/NodesOfflineDialog.vue b/src/components/NodesOfflineDialog.vue
index 07029b2cd..12774ea5b 100644
--- a/src/components/NodesOfflineDialog.vue
+++ b/src/components/NodesOfflineDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <v-dialog v-model="showDialog" width="500" :class="className">
     <v-card>
-      <v-card-title class="a-text-header">
+      <v-card-title :class="`${className}__card-title a-text-header`">
         {{ t('chats.nodes_offline_dialog.title', { coin: nodeType.toUpperCase() }) }}
       </v-card-title>
 
@@ -77,7 +77,7 @@ export default {
 @import '@/assets/styles/settings/_colors.scss';
 
 .all-nodes-disabled-dialog {
-  .a-text-header {
+  &__card-title {
     padding-left: 24px !important;
   }
   &__disclaimer {

From a3c2d715ef69608129ba4e2579decaad08eb5319 Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Fri, 25 Oct 2024 10:55:05 +0100
Subject: [PATCH 05/18] fix(NodesOfflineDialog): add padding-right

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

diff --git a/src/components/NodesOfflineDialog.vue b/src/components/NodesOfflineDialog.vue
index 12774ea5b..c20df418d 100644
--- a/src/components/NodesOfflineDialog.vue
+++ b/src/components/NodesOfflineDialog.vue
@@ -79,6 +79,7 @@ export default {
 .all-nodes-disabled-dialog {
   &__card-title {
     padding-left: 24px !important;
+    padding-right: 24px !important;
   }
   &__disclaimer {
     margin-top: 10px;

From 3883d6e684d3312ecad480865ea92a6e1ee0b817 Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Fri, 25 Oct 2024 10:59:35 +0100
Subject: [PATCH 06/18] feat(NodesOfflineDialog): less bottom padding for card
 content

---
 src/components/NodesOfflineDialog.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/NodesOfflineDialog.vue b/src/components/NodesOfflineDialog.vue
index c20df418d..ee20404a5 100644
--- a/src/components/NodesOfflineDialog.vue
+++ b/src/components/NodesOfflineDialog.vue
@@ -81,6 +81,9 @@ export default {
     padding-left: 24px !important;
     padding-right: 24px !important;
   }
+  &__card-text {
+    padding-bottom: 16px !important;
+  }
   &__disclaimer {
     margin-top: 10px;
   }

From 4479bbf0b21d2aa17af027f93ea71338430b281e Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Fri, 25 Oct 2024 11:01:26 +0100
Subject: [PATCH 07/18] feat(NodesOfflineDialog): remove disclaimer margin

---
 src/components/NodesOfflineDialog.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/NodesOfflineDialog.vue b/src/components/NodesOfflineDialog.vue
index ee20404a5..e90ebc874 100644
--- a/src/components/NodesOfflineDialog.vue
+++ b/src/components/NodesOfflineDialog.vue
@@ -84,9 +84,6 @@ export default {
   &__card-text {
     padding-bottom: 16px !important;
   }
-  &__disclaimer {
-    margin-top: 10px;
-  }
   &__btn {
     margin-top: 15px;
     margin-bottom: 20px;

From 136f4049eb473af0bbb1c0e1173443f86a54c269 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Tue, 29 Oct 2024 12:47:59 +0300
Subject: [PATCH 08/18] fix: ui bugs in light theme 1

---
 src/components/LoginForm.vue                  | 28 +++++++++++++++++--
 .../nodes/components/NodesTableHead.vue       | 17 +++++++++++
 src/views/Login.vue                           |  3 +-
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 2d3b9bbf1..cc1e42642 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -1,13 +1,13 @@
 <template>
-  <v-form ref="form" class="login-form" @submit.prevent="submit">
+  <v-form ref="form" :class="className" @submit.prevent="submit">
     <v-row no-gutters>
       <slot>
         <v-text-field
           v-model="passphrase"
           :label="$t('login.password_label')"
           autocomplete="current-password"
+          :class="`${className}__textfield`"
           class="text-center"
-          color="white"
           :type="showPassphrase ? 'text' : 'password'"
           variant="underlined"
         >
@@ -72,6 +72,7 @@ export default defineComponent({
     const router = useRouter()
     const store = useStore()
     const { t } = useI18n()
+    const className = 'login-form'
     const showSpinner = ref(false)
 
     const showPassphrase = ref(false)
@@ -133,6 +134,7 @@ export default defineComponent({
       showSpinner,
       passphrase,
       showPassphrase,
+      className,
       togglePassphraseVisibility,
       submit,
       freeze,
@@ -142,3 +144,25 @@ export default defineComponent({
   }
 })
 </script>
+
+<style lang="scss" scoped>
+@import 'vuetify/settings';
+@import '@/assets/styles/settings/_colors.scss';
+
+/** Themes **/
+.v-theme--light {
+  .login-form {
+    &__textfield {
+      color: map-get($adm-colors, 'regular');
+    }
+  }
+}
+.v-theme--dark {
+  .login-form {
+    &__textfield {
+      color: map-get($shades, 'white');
+    }
+  }
+}
+
+</style>
diff --git a/src/components/nodes/components/NodesTableHead.vue b/src/components/nodes/components/NodesTableHead.vue
index 863d521c5..853e96add 100644
--- a/src/components/nodes/components/NodesTableHead.vue
+++ b/src/components/nodes/components/NodesTableHead.vue
@@ -60,6 +60,7 @@ export default {
 
 <style lang="scss">
 @import 'vuetify/settings';
+@import '@/assets/styles/settings/_colors.scss';
 
 .nodes-table-head {
   &__th {
@@ -76,4 +77,20 @@ export default {
     width: 104px;
   }
 }
+
+/** Themes **/
+.v-theme--light {
+  .nodes-table-head {
+    &__th {
+      color: map-get($adm-colors, 'regular');
+    }
+  }
+}
+.v-theme--dark {
+  .nodes-table-head {
+    &__th {
+      color: map-get($adm-colors, 'white');
+    }
+  }
+}
 </style>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 08768aaca..d9ea620e5 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -229,7 +229,8 @@ export default defineComponent({
   .login-page {
     &__icon,
     &__title,
-    &__subtitle {
+    &__subtitle,
+    &__settings-button {
       color: map-get($adm-colors, 'regular');
     }
   }

From cd5c34fc8024a05b11bc09d08270065126694165 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Mon, 4 Nov 2024 12:07:50 +0300
Subject: [PATCH 09/18] fix: ui bugs in light theme 2

---
 .../DelegatesTable/DelegateVoteCheckbox.vue         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/DelegatesTable/DelegateVoteCheckbox.vue b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
index 1d176dac9..94c148611 100644
--- a/src/components/DelegatesTable/DelegateVoteCheckbox.vue
+++ b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
@@ -93,13 +93,14 @@ export default {
   .delegate-vote-checkbox {
     &__icon {
       color: map-get($adm-colors, 'muted');
-    }
-  }
-}
 
-.dark {
-  .delegate-vote-checkbox {
-    &__icon {
+      &--good {
+        color: map-get($adm-colors, 'good');
+      }
+
+      &--danger {
+        color: map-get($adm-colors, 'danger');
+      }
     }
   }
 }

From b7c8f85cd00b15001e74ab7c128f76a72cc2ae91 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sun, 10 Nov 2024 21:01:25 +0300
Subject: [PATCH 10/18] Small style fixes due to comments

---
 .../DelegatesTable/DelegateVoteCheckbox.vue   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/DelegatesTable/DelegateVoteCheckbox.vue b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
index 94c148611..4ec4060f1 100644
--- a/src/components/DelegatesTable/DelegateVoteCheckbox.vue
+++ b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
@@ -78,26 +78,31 @@ export default {
   &__icon {
     font-size: 24px !important;
     height: 24px !important;
+  }
+}
 
-    &--good {
-      color: map-get($adm-colors, 'good');
-    }
+/** Themes **/
+.v-theme--light {
+  .delegate-vote-checkbox {
+    &__icon {
+      &--good {
+        color: map-get($adm-colors, 'good');
+      }
 
-    &--danger {
-      color: map-get($adm-colors, 'danger');
+      &--danger {
+        color: map-get($adm-colors, 'danger');
+      }
     }
   }
 }
 
-.v-theme--light {
+.v-theme--dark {
   .delegate-vote-checkbox {
     &__icon {
-      color: map-get($adm-colors, 'muted');
-
       &--good {
         color: map-get($adm-colors, 'good');
       }
-
+      
       &--danger {
         color: map-get($adm-colors, 'danger');
       }

From 4dd0a94ce58e78200a7e9f5c4fad44bb2ea661f0 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sun, 10 Nov 2024 21:13:41 +0300
Subject: [PATCH 11/18] LoginForm.vue classes refactoring according to
 comments.

---
 src/components/LoginForm.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index cc1e42642..1f8487fae 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -1,12 +1,12 @@
 <template>
-  <v-form ref="form" :class="className" @submit.prevent="submit">
+  <v-form ref="form" :class="classes.root" @submit.prevent="submit">
     <v-row no-gutters>
       <slot>
         <v-text-field
           v-model="passphrase"
           :label="$t('login.password_label')"
           autocomplete="current-password"
-          :class="`${className}__textfield`"
+          :class="classes.textField"
           class="text-center"
           :type="showPassphrase ? 'text' : 'password'"
           variant="underlined"
@@ -72,8 +72,12 @@ export default defineComponent({
     const router = useRouter()
     const store = useStore()
     const { t } = useI18n()
-    const className = 'login-form'
     const showSpinner = ref(false)
+    const className = 'login-form'
+    const classes = {
+      root: className,
+      textField: `${className}__textfield`
+    }
 
     const showPassphrase = ref(false)
     const togglePassphraseVisibility = () => {
@@ -134,7 +138,7 @@ export default defineComponent({
       showSpinner,
       passphrase,
       showPassphrase,
-      className,
+      classes,
       togglePassphraseVisibility,
       submit,
       freeze,

From 8b6e5672452520bfb7293dd4d4cf346da6bf8ff4 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sun, 10 Nov 2024 21:58:52 +0300
Subject: [PATCH 12/18] LoginForm: classes moved outside the component
 definition.

---
 src/components/LoginForm.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 1f8487fae..0caeeaad2 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -60,6 +60,12 @@ import { useRouter } from 'vue-router'
 import { isAxiosError } from 'axios'
 import { isAllNodesOfflineError, isAllNodesDisabledError } from '@/lib/nodes/utils/errors'
 
+const className = 'login-form'
+const classes = {
+  root: className,
+  textField: `${className}__textfield`
+}
+
 export default defineComponent({
   props: {
     modelValue: {
@@ -73,12 +79,6 @@ export default defineComponent({
     const store = useStore()
     const { t } = useI18n()
     const showSpinner = ref(false)
-    const className = 'login-form'
-    const classes = {
-      root: className,
-      textField: `${className}__textfield`
-    }
-
     const showPassphrase = ref(false)
     const togglePassphraseVisibility = () => {
       showPassphrase.value = !showPassphrase.value

From 21acf6b902e4b58ea8969057882b080ad2128b25 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Thu, 14 Nov 2024 10:38:04 +0300
Subject: [PATCH 13/18] Light/dark themes delegate vote checkbox styles
 separation

---
 src/components/DelegatesTable/DelegateVoteCheckbox.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DelegatesTable/DelegateVoteCheckbox.vue b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
index 4ec4060f1..96177e058 100644
--- a/src/components/DelegatesTable/DelegateVoteCheckbox.vue
+++ b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
@@ -85,6 +85,7 @@ export default {
 .v-theme--light {
   .delegate-vote-checkbox {
     &__icon {
+      color: map-get($adm-colors, 'muted');
       &--good {
         color: map-get($adm-colors, 'good');
       }

From bc08da38ec4c9688d2c5e9a805d18c00c74493c1 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Fri, 15 Nov 2024 11:59:25 +0300
Subject: [PATCH 14/18] update doge indexer healthcheck-endpoint

---
 src/lib/nodes/doge-indexer/DogeIndexer.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/nodes/doge-indexer/DogeIndexer.ts b/src/lib/nodes/doge-indexer/DogeIndexer.ts
index 6dc403ec4..212758b6e 100644
--- a/src/lib/nodes/doge-indexer/DogeIndexer.ts
+++ b/src/lib/nodes/doge-indexer/DogeIndexer.ts
@@ -19,8 +19,8 @@ export class DogeIndexer extends Node<AxiosInstance> {
   protected async checkHealth() {
     const time = Date.now()
     const height = await this.client
-      .get('/api/blocks?limit=0')
-      .then((res) => res.data.blocks[0].height)
+      .get('/api/status')
+      .then((res) => res.data.info.blocks)
 
     return {
       height,

From e10a33ea9fd88e5666f8ee578724147b504cb749 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sat, 16 Nov 2024 12:32:08 +0300
Subject: [PATCH 15/18] fix: node status word 'Syncing' instead of 'Sync'

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index f959ca233..f2d869d74 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -180,7 +180,7 @@
     "label": "Type",
     "host": "Host",
     "inactive": "Inactive",
-    "sync": "Sync",
+    "sync": "Syncing",
     "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",

From b469aa10f0699de29d01cbd71c26fb9b4132415d Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Mon, 18 Nov 2024 09:24:15 +0300
Subject: [PATCH 16/18] NodesTableHead: fix label font color

---
 src/components/nodes/components/NodesTableHead.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/nodes/components/NodesTableHead.vue b/src/components/nodes/components/NodesTableHead.vue
index 853e96add..55c592e5d 100644
--- a/src/components/nodes/components/NodesTableHead.vue
+++ b/src/components/nodes/components/NodesTableHead.vue
@@ -81,14 +81,14 @@ export default {
 /** Themes **/
 .v-theme--light {
   .nodes-table-head {
-    &__th {
+    &__th, &__label {
       color: map-get($adm-colors, 'regular');
     }
   }
 }
 .v-theme--dark {
   .nodes-table-head {
-    &__th {
+    &__th, &__label {
       color: map-get($adm-colors, 'white');
     }
   }

From 397e5654c1d98ecd6835ae6f698060db4369f193 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sun, 24 Nov 2024 19:08:11 +0300
Subject: [PATCH 17/18] fix: usdt tx fee

---
 src/components/transactions/Erc20Transaction.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/transactions/Erc20Transaction.vue b/src/components/transactions/Erc20Transaction.vue
index 012af7424..ef66b6435 100644
--- a/src/components/transactions/Erc20Transaction.vue
+++ b/src/components/transactions/Erc20Transaction.vue
@@ -22,6 +22,7 @@ import { useStore } from 'vuex'
 import TransactionTemplate from './TransactionTemplate.vue'
 import { getExplorerTxUrl } from '@/config/utils'
 import { Cryptos, CryptoSymbol } from '@/lib/constants'
+import { AllCryptos } from '@/lib/constants/cryptos'
 import { useCryptoAddressPretty } from './hooks/address'
 import { useBlockHeight } from '@/hooks/queries/useBlockHeight'
 import { useTransactionStatus } from './hooks/useTransactionStatus'
@@ -96,7 +97,13 @@ export default defineComponent({
 
       return transaction.value?.confirmations
     })
-    const fee = computed(() => transaction.value?.fee)
+    const fee = computed(() => {
+      const ethFee = transaction.value?.fee || 0
+      const currentCurrency = store.state.options.currentRate
+      const currentRate = store.state.rate.rates[`${AllCryptos.ETH}/${currentCurrency}`]
+      const feeRate = (ethFee * currentRate).toFixed(2)
+      return +feeRate
+    })
 
     return {
       refetch,

From 35e0e2b7190957dedca7ef52eea986b46d8db304 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Fri, 29 Nov 2024 14:21:24 +0300
Subject: [PATCH 18/18] fix: v-btn variant for settings 'gear' button

---
 src/views/Login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index d9ea620e5..811682502 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -6,7 +6,7 @@
           <language-switcher prepend-icon="mdi-chevron-right" />
         </div>
         <div :class="`${className}__settings-button`">
-          <v-btn @click="$router.push('/options/nodes')" icon variant="flat" :size="32">
+          <v-btn @click="$router.push('/options/nodes')" icon variant="plain" :size="32">
             <v-icon icon="mdi-cog" />
           </v-btn>
         </div>