From 1fbe885718a30f7976f0b899f3c1a3661c74b52a Mon Sep 17 00:00:00 2001
From: Mansurkhoja <mansur.atm@gmail.com>
Date: Wed, 30 Mar 2022 17:34:54 +0500
Subject: [PATCH 01/14] feat: currency rates

---
 src/assets/stylus/components/_chat.styl       |  10 +-
 src/assets/stylus/themes/adamant/_inputs.styl |  58 ++++++++++
 src/components/AChat/AChatTransaction.vue     |  32 +++++-
 src/components/Chat/Chat.vue                  |   7 +-
 src/components/CurrencySwitcher.vue           | 102 +++++++++++++++++
 src/components/SendFundsForm.vue              |  58 +++++++---
 src/components/TransactionListItem.vue        |  24 +++-
 src/components/WalletCard.vue                 |  16 ++-
 .../__tests__/TransactionListItem.test.js     |   2 +-
 .../transactions/TransactionTemplate.vue      |  62 +++++++++-
 src/config/development.json                   |   3 +
 src/config/production.json                    |   3 +
 src/config/test.json                          |   3 +
 src/config/tor.json                           |   3 +
 .../{currency.js => currencyAmount.js}        |   4 +-
 src/filters/currencyAmountWithSymbol.js       |  15 +++
 src/filters/helpers/index.js                  |  10 ++
 src/i18n/de.json                              |   3 +
 src/i18n/en.json                              |   3 +
 src/i18n/ru.json                              |   3 +
 src/lib/constants.js                          |  15 ++-
 src/lib/notifications.js                      |   2 +-
 src/main.js                                   |   2 +-
 src/mixins/transaction.js                     |  16 ++-
 src/store/index.js                            |   6 +-
 src/store/modules/options/index.js            |   5 +-
 src/store/modules/rate/index.js               | 107 ++++++++++++++++++
 src/store/plugins/localStorage.js             |   3 +-
 src/views/Home.vue                            |  35 +++++-
 src/views/Options.vue                         |  18 +++
 src/views/Transactions.vue                    |   1 -
 31 files changed, 591 insertions(+), 40 deletions(-)
 create mode 100644 src/components/CurrencySwitcher.vue
 rename src/filters/{currency.js => currencyAmount.js} (84%)
 create mode 100644 src/filters/currencyAmountWithSymbol.js
 create mode 100644 src/store/modules/rate/index.js

diff --git a/src/assets/stylus/components/_chat.styl b/src/assets/stylus/components/_chat.styl
index 9e6701216..4d828e9e7 100644
--- a/src/assets/stylus/components/_chat.styl
+++ b/src/assets/stylus/components/_chat.styl
@@ -181,7 +181,13 @@ $chat-avatar-size := 40px
 
     &--clickable
       cursor: pointer
-
+  &__rates-column
+    flex-direction: column
+  &__rates
+    color: hsla(0,0%,100%,.7)
+    font-style: italic
+    font-size: 14px
+    font-weight: 300
   &__status
     line-height: 1
     margin-left: 8px
@@ -257,6 +263,8 @@ $chat-avatar-size := 40px
       color: $adm-colors.muted
     &__amount
       color: $adm-colors.regular
+    &__rates
+      color: $adm-colors.muted
     &__direction
       color: $adm-colors.regular
     &__message-text
diff --git a/src/assets/stylus/themes/adamant/_inputs.styl b/src/assets/stylus/themes/adamant/_inputs.styl
index 92b41bd9b..840e4a8ec 100644
--- a/src/assets/stylus/themes/adamant/_inputs.styl
+++ b/src/assets/stylus/themes/adamant/_inputs.styl
@@ -17,6 +17,60 @@
     &:after // [2]
       transition: unset
 
+.fake-input
+  color: rgba(255,255,255,0.5)
+  font-weight: 400
+  padding-top: 12px
+  margin-top: 4px
+  pointer-events: none
+  flex: 1 1 auto
+  font-size: 16px
+  text-align: left
+  display: flex
+  align-items: flex-start
+  min-height: inherit;
+  position: relative
+.fake-input__label
+  left: 0px
+  right: auto
+  position: absolute
+  transform: translateY(-18px) scale(0.75)
+  overflow: hidden
+  text-overflow: ellipsis
+  top: 15px
+  transform-origin: top left
+  white-space: nowrap
+  max-width: 133%
+.fake-input__box
+  width: 100%
+  padding-bottom: 20px
+  position: relative
+  display: flex
+  align-items: baseline
+  overflow: hidden
+.fake-input__value
+  line-height: 32px
+  display: block;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+.fake-input__box:before
+  content: ''
+  border-image: repeating-linear-gradient(to right, rgba(255,255,255,0.5) 0px, rgba(255,255,255,0.5) 2px, transparent 2px, transparent 4px) 1 repeat
+  border-color: rgba(255,255,255,0.7)
+  border-style: solid
+  border-width: thin 0 0 0
+  border-top-width: 1px
+  left: 0
+  position: absolute
+  transition: 0.3s cubic-bezier(0.25, 0.8, 0.5, 1)
+  width: 100%
+  top: 31px
+.fake-input__value--rate
+  font-style: italic
+  padding-left: 3px
+  color: inherit !important
+
+  
 .theme--light
   .a-input
     .v-label
@@ -42,3 +96,7 @@
     &.v-input--is-focused > .v-input__control > .v-input__slot:after // [3.c.]
       border-color: $adm-colors.primary2
       border-width: thin 0 0 0
+  .fake-input
+    color: rgba(0,0,0,0.54)
+  .fake-input__box:before
+    border-image: repeating-linear-gradient(to right, rgba(0,0,0,0.38) 0px, rgba(0,0,0,0.38) 2px, transparent 2px, transparent 4px) 1 repeat    
diff --git a/src/components/AChat/AChatTransaction.vue b/src/components/AChat/AChatTransaction.vue
index 6430aeab6..1162a4786 100644
--- a/src/components/AChat/AChatTransaction.vue
+++ b/src/components/AChat/AChatTransaction.vue
@@ -38,7 +38,10 @@
           >
             <v-layout align-center>
               <slot name="crypto" />
-              <span class="ml-2">{{ amount }}</span>
+              <div class="a-chat__rates-column d-flex ml-2">
+                <span class="mb-1">{{ amount | currency(crypto) }}</span>
+                <span class="a-chat__rates">{{ historyRate }}</span>
+              </div>
             </v-layout>
           </div>
         </div>
@@ -56,6 +59,8 @@
 <script>
 import { tsIcon, tsUpdatable, tsColor } from '@/lib/constants'
 import { isStringEqualCI } from '@/lib/textHelpers'
+import currencyAmount from '@/filters/currencyAmount'
+import { timestampInSec } from '@/filters/helpers'
 
 export default {
   props: {
@@ -102,6 +107,17 @@ export default {
     isClickable: {
       type: Boolean,
       default: false
+    },
+    crypto: {
+      type: String,
+      default: 'ADM'
+    },
+    hash: {
+      required: true,
+      type: String
+    },
+    txTimestamp: {
+      required: true
     }
   },
   computed: {
@@ -116,6 +132,15 @@ export default {
     },
     statusColor () {
       return tsColor(this.status.virtualStatus)
+    },
+    historyRate () {
+      const amount = currencyAmount(this.amount, this.crypto)
+      return '~' + this.$store.getters['rate/historyRate'](timestampInSec(this.crypto, this.txTimestamp), amount, this.crypto)
+    }
+  },
+  watch: {
+    txTimestamp () {
+      this.getHistoryRates()
     }
   },
   mounted () {
@@ -134,6 +159,11 @@ export default {
       if (this.statusUpdatable) {
         this.$emit('click:transactionStatus', this.id)
       }
+    },
+    getHistoryRates () {
+      this.$store.dispatch('rate/getHistoryRates', {
+        timestamp: timestampInSec(this.crypto, this.txTimestamp)
+      })
     }
   }
 }
diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
index 9c8294501..01d2f6c3a 100644
--- a/src/components/Chat/Chat.vue
+++ b/src/components/Chat/Chat.vue
@@ -52,15 +52,17 @@
             @click="onClickAvatar(sender.id)"
           />
         </a-chat-message>
-
         <a-chat-transaction
           v-else-if="isTransaction(message.type)"
           v-bind="message"
           :key="message.id"
           :user-id="userId"
           :sender="sender"
-          :amount="message.amount | currency(message.type)"
+          :amount="message.amount"
+          :crypto="message.type"
           :time="message.timestamp | date"
+          :hash="message.hash"
+          :tx-timestamp="getTransaction(message.type, message.hash).timestamp"
           :currency="message.type"
           :locale="locale"
           :status="getTransactionStatus(message)"
@@ -288,7 +290,6 @@ export default {
   },
   mounted () {
     if (this.isFulfilled && this.chatPage <= 0) this.fetchChatMessages()
-
     this.scrollBehavior()
     this.$nextTick(() => {
       this.isScrolledToBottom = this.$refs.chat.isScrolledToBottom()
diff --git a/src/components/CurrencySwitcher.vue b/src/components/CurrencySwitcher.vue
new file mode 100644
index 000000000..ff09222d4
--- /dev/null
+++ b/src/components/CurrencySwitcher.vue
@@ -0,0 +1,102 @@
+<template>
+  <v-menu
+    offset-y
+    class="language-switcher"
+  >
+    <v-btn
+      slot="activator"
+      class="ma-0"
+      flat
+    >
+      <slot name="prepend">
+        <v-icon
+          v-if="prependIcon"
+          left
+        >
+          {{ prependIcon }}
+        </v-icon>
+      </slot>
+      {{ currentCurrency }}
+      <slot name="append">
+        <v-icon
+          v-if="appendIcon"
+          right
+        >
+          {{ appendIcon }}
+        </v-icon>
+      </slot>
+    </v-btn>
+    <v-list>
+      <v-list-tile
+        v-for="(currency, idx) in currencies"
+        :key="idx"
+        @click="onSelect(idx)"
+      >
+        <v-list-tile-title>{{ currency }}</v-list-tile-title>
+      </v-list-tile>
+    </v-list>
+  </v-menu>
+</template>
+
+<script>
+// eslint-disable-next-line no-unused-vars
+import { RatesNames } from '@/lib/constants'
+
+export default {
+  props: {
+    prependIcon: {
+      type: String,
+      default: ''
+    },
+    appendIcon: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    currencies () {
+      return RatesNames
+    },
+    currentCurrency: {
+      get () {
+        return this.$store.state.options.currentRate
+      },
+      set (value) {
+        this.$store.commit('options/updateOption', {
+          key: 'currentRate',
+          value
+        })
+      }
+    }
+  },
+  methods: {
+    onSelect (currency) {
+      this.currentCurrency = currency
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~vuetify/src/stylus/settings/_colors.styl'
+@import '../assets/stylus/settings/_colors.styl'
+
+.language-switcher
+  >>> .v-menu__activator
+    .v-icon
+      margin-top: 2px
+    .v-icon:before
+      transition: 0.2s linear
+  >>> .v-menu__activator--active
+    .v-icon:before
+      transform: rotate(90deg)
+  >>> .v-btn
+    text-transform: capitalize
+
+/** Themes **/
+.theme--light
+  .language-switcher
+    .v-btn
+      color: $adm-colors.regular
+      font-weight: 300
+</style>
diff --git a/src/components/SendFundsForm.vue b/src/components/SendFundsForm.vue
index cddd7e97f..fa13f20a0 100644
--- a/src/components/SendFundsForm.vue
+++ b/src/components/SendFundsForm.vue
@@ -104,21 +104,29 @@
           </v-menu>
         </template>
       </v-text-field>
-
-      <v-text-field
-        :value="`${transferFeeFixed} ${transferFeeCurrency}`"
-        :label="`${transferFeeLabel}`"
-        class="a-input"
-        disabled
-      />
-      <v-text-field
+      <div
+        class="fake-input"
+      >
+        <div class="fake-input__label">
+          {{ transferFeeLabel }}
+        </div>
+        <div class="fake-input__box">
+          <span class="fake-input__value"> {{ transferFeeFixed }} {{ transferFeeCurrency }} </span>
+          <span class="fake-input__value fake-input__value--rate a-text-regular"> ~{{ transferFeeRate }} </span>
+        </div>
+      </div>
+      <div
         v-if="!hideFinalAmount"
-        :value="`${finalAmountFixed} ${currency}`"
-        :label="$t('transfer.final_amount_label')"
-        class="a-input"
-        disabled
-      />
-
+        class="fake-input"
+      >
+        <div class="fake-input__label">
+          {{ $t('transfer.final_amount_label') }}
+        </div>
+        <div class="fake-input__box">
+          <span class="fake-input__value"> {{ finalAmountFixed }} {{ currency }} </span>
+          <span class="fake-input__value fake-input__value--rate a-text-regular"> ~{{ finalAmountRate }} </span>
+        </div>
+      </div>
       <v-text-field
         v-if="addressReadonly"
         v-model="comment"
@@ -137,7 +145,6 @@
         counter
         maxlength="64"
       />
-
       <v-checkbox
         v-if="allowIncreaseFee"
         v-model="increaseFee"
@@ -495,6 +502,27 @@ export default {
     },
     allowIncreaseFee () {
       return (this.currency === Cryptos.BTC) || isEthBased(this.currency)
+    },
+    currentCurrency: {
+      get () {
+        return this.$store.state.options.currentRate
+      },
+      set (value) {
+        this.$store.commit('options/updateOption', {
+          key: 'currentRate',
+          value
+        })
+      }
+    },
+    transferFeeRate () {
+      const currentRate = this.$store.state.rate.rates[`${this.transferFeeCurrency}/${this.currentCurrency}`]
+      const feeRate = (this.transferFeeFixed * currentRate).toFixed(2)
+      return currentRate !== undefined ? `${feeRate} ${this.currentCurrency}` : ''
+    },
+    finalAmountRate () {
+      const currentRate = this.$store.state.rate.rates[`${this.currency}/${this.currentCurrency}`]
+      const amountRate = (this.finalAmountFixed * currentRate).toFixed(2)
+      return currentRate !== undefined ? `${amountRate} ${this.currentCurrency}` : ''
     }
   },
   watch: {
diff --git a/src/components/TransactionListItem.vue b/src/components/TransactionListItem.vue
index e605ebac1..d0401fa97 100644
--- a/src/components/TransactionListItem.vue
+++ b/src/components/TransactionListItem.vue
@@ -28,6 +28,9 @@
 
         <v-list-tile-title>
           <span :class="`${className}__amount ${directionClass}`">{{ amount | currency(crypto) }}</span>
+          <span
+            :class="`${className}__rates`"
+          > {{ historyRate }}</span>
           <span
             v-if="comment"
             class="a-text-regular-enlarged-bold"
@@ -89,6 +92,8 @@ import dateFilter from '@/filters/date'
 import { EPOCH, Cryptos } from '@/lib/constants'
 import partnerName from '@/mixins/partnerName'
 import { isStringEqualCI } from '@/lib/textHelpers'
+import currencyAmount from '@/filters/currencyAmount'
+import { timestampInSec } from '@/filters/helpers'
 
 export default {
   filters: {
@@ -189,8 +194,15 @@ export default {
     comment () {
       const admTx = this.getAdmTx
       return admTx.message
+    },
+    historyRate () {
+      const amount = currencyAmount(this.amount, this.crypto)
+      return '~' + this.$store.getters['rate/historyRate'](timestampInSec(this.crypto, this.timestamp), amount, this.crypto)
     }
   },
+  mounted () {
+    this.getHistoryRates()
+  },
   methods: {
     isStringEqualCI (string1, string2) {
       return isStringEqualCI(string1, string2)
@@ -231,6 +243,11 @@ export default {
         return !!admTx.id
       })
       return admTx
+    },
+    getHistoryRates () {
+      this.$store.dispatch('rate/getHistoryRates', {
+        timestamp: timestampInSec(this.crypto, this.timestamp)
+      })
     }
   }
 }
@@ -241,6 +258,10 @@ export default {
 @import '../assets/stylus/themes/adamant/_mixins.styl'
 
 .transaction-item
+  &__rates
+   color: hsla(0,0%,100%,.7)
+   font-style: italic
+   a-text-regular()
   &__amount
     a-text-regular-enlarged-bold()
   &__date
@@ -266,7 +287,8 @@ export default {
   .transaction-item
     &__amount
       color: $adm-colors.regular
-
+    &__rates
+      color: $adm-colors.muted
       &--is-incoming
         color: $adm-colors.good
       &--is-outgoing
diff --git a/src/components/WalletCard.vue b/src/components/WalletCard.vue
index 286e48233..309674040 100644
--- a/src/components/WalletCard.vue
+++ b/src/components/WalletCard.vue
@@ -42,7 +42,10 @@
             {{ $t('home.balance') }}
           </v-list-tile-title>
           <v-list-tile-sub-title :class="`${className}__subtitle`">
-            {{ balance | currency(crypto, true) }}
+            {{ balance | currency(crypto, true) }} <span
+              v-if="$store.state.rate.isLoaded"
+              class="a-text-regular"
+            >~{{ rate }} {{ currentCurrency }}</span>
           </v-list-tile-sub-title>
         </v-list-tile-content>
 
@@ -97,6 +100,10 @@ export default {
       type: Number,
       required: true
     },
+    rate: {
+      type: Number,
+      required: true
+    },
     crypto: {
       type: String,
       default: 'ADM'
@@ -104,6 +111,10 @@ export default {
     cryptoName: {
       type: String,
       default: 'ADAMANT'
+    },
+    currentCurrency: {
+      type: String,
+      default: 'USD'
     }
   },
   data: () => ({ showShareURIDialog: false }),
@@ -129,6 +140,9 @@ export default {
   &__subtitle
     a-text-regular-enlarged()
     word-break: break-word
+    span
+      font-style: italic
+      color: inherit
   &__list
     padding: 8px 0 0
   &__tile
diff --git a/src/components/__tests__/TransactionListItem.test.js b/src/components/__tests__/TransactionListItem.test.js
index c28791de9..b5769df21 100644
--- a/src/components/__tests__/TransactionListItem.test.js
+++ b/src/components/__tests__/TransactionListItem.test.js
@@ -4,7 +4,7 @@ import Vuex from 'vuex'
 import VueI18n from 'vue-i18n'
 import Vuetify from 'vuetify'
 
-import currencyFilter from '@/filters/currency'
+import currencyFilter from '@/filters/currencyAmountWithSymbol'
 import { EPOCH } from '@/lib/constants'
 import formatters from '@/lib/formatters'
 import mockupI18n from './__mocks__/plugins/i18n'
diff --git a/src/components/transactions/TransactionTemplate.vue b/src/components/transactions/TransactionTemplate.vue
index 19a6c7377..bec40eae7 100644
--- a/src/components/transactions/TransactionTemplate.vue
+++ b/src/components/transactions/TransactionTemplate.vue
@@ -11,7 +11,6 @@
       flat
       :class="`${className}__toolbar`"
     />
-
     <container>
       <v-list class="transparent">
         <v-list-tile>
@@ -30,6 +29,43 @@
 
         <v-divider />
 
+        <v-list-tile>
+          <v-list-tile-content :class="`${className}__titlecontent`">
+            <v-list-tile-title :class="`${className}__title`">
+              {{ $t('transaction.currentVal') }}
+            </v-list-tile-title>
+          </v-list-tile-content>
+
+          <div>
+            <v-list-tile-title
+              v-if="rate !== false"
+              :class="`${className}__value`"
+            >
+              {{ rate }}
+            </v-list-tile-title>
+          </div>
+        </v-list-tile>
+
+        <v-divider />
+
+        <v-list-tile>
+          <v-list-tile-content :class="`${className}__titlecontent`">
+            <v-list-tile-title :class="`${className}__title`">
+              {{ $t('transaction.valueTimeTxn') }}
+            </v-list-tile-title>
+          </v-list-tile-content>
+
+          <div>
+            <v-list-tile-title
+              v-if="historyRate !== false"
+              :class="`${className}__value`"
+            >
+              {{ historyRate }}
+            </v-list-tile-title>
+          </div>
+        </v-list-tile>
+
+        <v-divider />
         <v-list-tile>
           <v-list-tile-content :class="`${className}__titlecontent`">
             <v-list-tile-title :class="`${className}__title`">
@@ -229,9 +265,9 @@
 <script>
 import { Symbols, tsUpdatable } from '@/lib/constants'
 import AppToolbarCentered from '@/components/AppToolbarCentered'
-
 import transaction from '@/mixins/transaction'
 import { copyToClipboard } from '@/lib/textHelpers'
+import { timestampInSec } from '@/filters/helpers'
 
 export default {
   name: 'TransactionTemplate',
@@ -319,18 +355,35 @@ export default {
     },
     statusUpdatable () {
       return tsUpdatable(this.status.virtualStatus, this.crypto)
+    },
+    amountNumber () {
+      return this.amount.replace(/[^\d.-]/g, '')
+    },
+    historyRate () {
+      return this.$store.getters['rate/historyRate'](timestampInSec(this.crypto, this.timestamp), this.amountNumber, this.crypto)
+    },
+    rate () {
+      return this.$store.getters['rate/rate'](this.amountNumber, this.crypto)
     }
   },
   watch: {
     // fetch Tx status when we get admTx
     admTx () {
       this.fetchTransactionStatus(this.admTx, this.partner)
+    },
+    timestamp () {
+      this.$nextTick(() => {
+        this.getHistoryRates()
+      })
     }
   },
   mounted () {
     if (this.admTx) {
       this.fetchTransactionStatus(this.admTx, this.partner)
     }
+    if (!isNaN(this.timestamp)) {
+      this.getHistoryRates()
+    }
   },
   methods: {
     copyToClipboard: function (key) {
@@ -359,6 +412,11 @@ export default {
       if (this.crypto && this.statusUpdatable) {
         this.$store.dispatch(this.crypto.toLowerCase() + '/updateTransaction', { hash: this.id, force: true, updateOnly: false, dropStatus: true })
       }
+    },
+    getHistoryRates () {
+      this.$store.dispatch('rate/getHistoryRates', {
+        timestamp: this.timestampInSec
+      })
     }
   }
 }
diff --git a/src/config/development.json b/src/config/development.json
index d878388b0..627592350 100644
--- a/src/config/development.json
+++ b/src/config/development.json
@@ -52,6 +52,9 @@
     "lskservice": [
       { "url": "https://liskservice3.adamant.im" },
       { "url": "https://liskservice4.adamant.im" }
+    ],
+    "infoservice": [
+      { "url": "https://info.adamant.im" }
     ]
   },
   "env": "development"
diff --git a/src/config/production.json b/src/config/production.json
index 05d4df2c5..5b949952a 100644
--- a/src/config/production.json
+++ b/src/config/production.json
@@ -52,6 +52,9 @@
     "lskservice": [
       { "url": "https://liskservice3.adamant.im" },
       { "url": "https://liskservice4.adamant.im" }
+    ],
+    "infoservice": [
+      { "url": "https://info.adamant.im" }
     ]
   },
   "env": "production"
diff --git a/src/config/test.json b/src/config/test.json
index 4022030f3..cd349a93a 100644
--- a/src/config/test.json
+++ b/src/config/test.json
@@ -37,6 +37,9 @@
     "lskservice": [
       { "url": "https://liskservice3.adamant.im" },
       { "url": "https://liskservice4.adamant.im" }
+    ],
+    "infoservice": [
+      { "url": "https://info.adamant.im" }
     ]
   },
   "env": "test"
diff --git a/src/config/tor.json b/src/config/tor.json
index 5176d1d81..ef29adec0 100644
--- a/src/config/tor.json
+++ b/src/config/tor.json
@@ -34,6 +34,9 @@
     "lskservice": [
       { "url": "http://xqrymra5go2nb3cslb3c3iv4weeuicybcxpjee4ay2indk2hgo7rw4qd.onion" },
       { "url": "http://s2q6phc22icy73zjccjq66555gwtvyuyrodmadwhjdhmvyehb3qrcsid.onion" }
+    ],
+    "infoservice": [
+      { "url": "https://info.adamant.im" }
     ]
   },
   "env": "production"
diff --git a/src/filters/currency.js b/src/filters/currencyAmount.js
similarity index 84%
rename from src/filters/currency.js
rename to src/filters/currencyAmount.js
index 98be68e95..16849c23c 100644
--- a/src/filters/currency.js
+++ b/src/filters/currencyAmount.js
@@ -2,7 +2,7 @@ import BigNumber from '@/lib/bignumber'
 import { Cryptos } from '@/lib/constants'
 
 /**
- * Format currency amount to a fancy string with symbol
+ * Format currency amount to a fancy string without symbol
  * @param {number} amount - Amount to format
  * @param {string} symbol - Currency symbol (ticker)
  * @param {boolean} isAdmBalance - Amount is ADM balance
@@ -13,6 +13,6 @@ export default (amount, symbol = Cryptos.ADM, isAdmBalance) => {
     const formatted = BigNumber(
       !isAdmBalance && symbol === Cryptos.ADM ? amount / 1e8 : amount
     ).toFixed()
-    return `${formatted} ${symbol}`
+    return `${formatted}`
   } else return ''
 }
diff --git a/src/filters/currencyAmountWithSymbol.js b/src/filters/currencyAmountWithSymbol.js
new file mode 100644
index 000000000..1a3d82e9e
--- /dev/null
+++ b/src/filters/currencyAmountWithSymbol.js
@@ -0,0 +1,15 @@
+import { Cryptos } from '@/lib/constants'
+import currencyAmount from './currencyAmount'
+
+/**
+ * Format currency amount to a fancy string with symbol
+ * @param {number} amount - Amount to format
+ * @param {string} symbol - Currency symbol (ticker)
+ * @param {boolean} isAdmBalance - Amount is ADM balance
+ * @returns {string}
+ */
+export default (amount, symbol = Cryptos.ADM, isAdmBalance) => {
+  if (amount !== undefined) {
+    return `${currencyAmount(amount, symbol, isAdmBalance)} ${symbol}`
+  } else return ''
+}
diff --git a/src/filters/helpers/index.js b/src/filters/helpers/index.js
index e6618bcae..f004c92ef 100644
--- a/src/filters/helpers/index.js
+++ b/src/filters/helpers/index.js
@@ -1,3 +1,5 @@
+import adamant from '@/lib/adamant'
+
 /**
  * Determine if a date is today.
  *
@@ -55,3 +57,11 @@ export const isCurrentWeek = someDate => {
 
   return false
 }
+/**
+ * Timestamp to timestamp seconds.
+ *
+ */
+export const timestampInSec = (crypto, timestamp) => {
+  const timestampInMs = crypto === 'ADM' ? adamant.toTimestamp(timestamp) : timestamp
+  return Math.floor(timestampInMs / 1000)
+}
diff --git a/src/i18n/de.json b/src/i18n/de.json
index 4d5034135..f09b5848a 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -129,6 +129,7 @@
     "general_title": "Allgemein",
     "idb_not_supported": "Your browser does not support IndexedDB or in Private Browsing mode",
     "language_label": "Sprache",
+    "currency_label": "Hauptwährung",
     "nodes_list": "Nodes list",
     "notification_title": "Benachrichtigungen",
     "other": "Other",
@@ -163,6 +164,8 @@
   "transaction": {
     "addresses": "no address | {n} address | {n} addresses",
     "amount": "Betrag",
+    "currentVal": "Aktueller Wert",
+    "valueTimeTxn": "Wert zum Zeitpunkt von Txn",
     "commission": "Gebühr",
     "confirmations": "Bestätigungen",
     "continueChat": "Continue chat",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7a35965e8..8be580ad5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -183,6 +183,7 @@
     "general_title": "General",
     "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",
     "notification_title": "Notifications",
     "page_title": "Settings",
@@ -224,6 +225,8 @@
   "transaction": {
     "addresses": "no address | {n} address | {n} addresses",
     "amount": "Amount",
+    "currentVal": "Current value",
+    "valueTimeTxn": "Value at Time of Txn",
     "commission": "Transaction fee",
     "confirmations": "Confirmations",
     "continueChat": "Continue chat",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index a47fb6b6d..a9a71e06d 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -184,6 +184,7 @@
     "general_title": "Общие",
     "idb_not_supported": "Браузер не поддерживает IndexedDB или открыт в режиме приватного просмотра",
     "language_label": "Язык",
+    "currency_label": "Основная валюта",
     "nodes_list": "Список узлов",
     "notification_title": "Уведомления",
     "page_title": "Настройки",
@@ -225,6 +226,8 @@
   "transaction": {
     "addresses": "| {n} адрес | {n} адреса | {n} адресов",
     "amount": "Количество",
+    "currentVal": "Текущая стоимость",
+    "valueTimeTxn": "Cтоимость во время Txn",
     "commission": "Комиссия за транзакцию",
     "confirmations": "Подтверждений",
     "continueChat": "Продолжить чат",
diff --git a/src/lib/constants.js b/src/lib/constants.js
index 68f778d90..089c6741a 100644
--- a/src/lib/constants.js
+++ b/src/lib/constants.js
@@ -23,7 +23,13 @@ export const Cryptos = {
   USDS: 'USDS',
   BNB: 'BNB'
 }
-
+export const Rates = {
+  USD: 'USD',
+  EUR: 'EUR',
+  RUB: 'RUB',
+  CNY: 'CNY',
+  JPY: 'JPY'
+}
 export const CryptosNames = {
   [Cryptos.ADM]: 'ADAMANT',
   [Cryptos.BNB]: 'Binance Coin',
@@ -35,6 +41,13 @@ export const CryptosNames = {
   [Cryptos.BTC]: 'Bitcoin'
 }
 
+export const RatesNames = {
+  [Rates.USD]: 'USD ($)', // United States Dollar
+  [Rates.EUR]: 'EUR (€)', // Euro
+  [Rates.RUB]: 'RUB (₽)', // Russian Ruble
+  [Rates.CNY]: 'CNY (¥)', // Chinese Yuan
+  [Rates.JPY]: 'JPY (¥)' // Japanese Yen
+}
 // Some cryptos require minimum balance to maintain on a wallet
 export const minBalances = {
   [Cryptos.LSK]: 0.05,
diff --git a/src/lib/notifications.js b/src/lib/notifications.js
index 08b04061f..8fbc933a3 100644
--- a/src/lib/notifications.js
+++ b/src/lib/notifications.js
@@ -2,7 +2,7 @@
 
 import Notify from 'notifyjs'
 import Visibility from 'visibilityjs'
-import currency from '@/filters/currency'
+import currency from '@/filters/currencyAmountWithSymbol'
 import { removeFormats } from '@/lib/markdown'
 
 let _this
diff --git a/src/main.js b/src/main.js
index d95305d76..f357df09f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,7 +5,7 @@ import App from './App.vue'
 import router from './router'
 import store from './store'
 import i18n from './i18n'
-import currencyFilter from './filters/currency'
+import currencyFilter from './filters/currencyAmountWithSymbol'
 import numberFormatFilter from './filters/numberFormat'
 import VueFormatters from './lib/formatters'
 import packageJSON from '../package.json'
diff --git a/src/mixins/transaction.js b/src/mixins/transaction.js
index 2271a7a36..36e9d95a5 100644
--- a/src/mixins/transaction.js
+++ b/src/mixins/transaction.js
@@ -32,6 +32,21 @@ export default {
       return this.$store.dispatch(`${cryptoModule}/getTransaction`, { hash, timestamp })
     },
 
+    /**
+     * Get crypto tx info from store
+     * @param {string} type Transaction type
+     * @param {string} hash Transaction hash
+     */
+    getTransaction (type, hash) {
+      let transaction
+      if (type === 'ADM') {
+        transaction = this.$store.state.adm.transactions[hash] || { }
+      } else {
+        transaction = this.$store.getters[`${type.toLowerCase()}/transaction`](hash) || {}
+      }
+      return transaction
+    },
+
     /**
      * Fetch recipientId & senderId crypto addresses.
      * @param type Crypto name
@@ -152,6 +167,5 @@ export default {
 
       return status
     }
-
   }
 }
diff --git a/src/store/index.js b/src/store/index.js
index a64329c54..1a79b4e57 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -35,6 +35,7 @@ import options from './modules/options'
 import identicon from './modules/identicon'
 import notification from './modules/notification'
 import cache from '@/store/cache'
+import rate from './modules/rate'
 
 Vue.use(Vuex)
 
@@ -173,7 +174,6 @@ const store = {
       return getCurrentAccount()
         .then(account => {
           commit('setBalance', account.balance)
-
           if (account.balance > Fees.KVS) {
             flushCryptoAddresses()
           }
@@ -189,7 +189,6 @@ const store = {
             .catch(err => console.error(err))
             .then(() => (interval = setTimeout(repeat, UPDATE_BALANCE_INTERVAL)))
         }
-
         repeat()
       }
     },
@@ -219,7 +218,8 @@ const store = {
     chat,
     options,
     identicon,
-    notification
+    notification,
+    rate
   }
 }
 
diff --git a/src/store/modules/options/index.js b/src/store/modules/options/index.js
index 96aae52b5..7c71b5775 100644
--- a/src/store/modules/options/index.js
+++ b/src/store/modules/options/index.js
@@ -1,4 +1,4 @@
-import { Cryptos } from '@/lib/constants'
+import { Cryptos, Rates } from '@/lib/constants'
 
 const state = () => ({
   stayLoggedIn: false, // if true, messages and passphrase will be stored encrypted. If false, localStorage will be cleared after logout
@@ -11,7 +11,8 @@ const state = () => ({
   useFullDate: false,
   currentWallet: Cryptos.ADM, // current Wallet Tab on Account view (this is not an option)
   useSocketConnection: true,
-  suppressWarningOnAddressesNotification: false
+  suppressWarningOnAddressesNotification: false,
+  currentRate: Rates.USD
 })
 
 const getters = {
diff --git a/src/store/modules/rate/index.js b/src/store/modules/rate/index.js
new file mode 100644
index 000000000..7704ec6e9
--- /dev/null
+++ b/src/store/modules/rate/index.js
@@ -0,0 +1,107 @@
+import axios from 'axios'
+import getEnpointUrl from '@/lib/getEndpointUrl'
+import Vue from 'vue'
+
+const state = () => ({
+  rates: {},
+  isLoaded: false,
+  historyRates: {}
+})
+
+export let interval
+
+const UPDATE_RATES_INTERVAL = 90000
+const mutations = {
+  setRates (state, rates) {
+    state.rates = rates
+  },
+  setHistoryRates (state, historyRates) {
+    Vue.set(state.historyRates, historyRates.name, historyRates.value)
+  },
+  loadRates (state) {
+    state.isLoaded = true
+  }
+}
+const actions = {
+  getAllRates ({ commit }) {
+    const url = getEnpointUrl('infoservice')
+    return new Promise((resolve, reject) => {
+      axios
+        .get(`${url}/get`)
+        .then((res) => {
+          const rates = res.data.result
+          commit('setRates', rates)
+          commit('loadRates')
+          resolve(res)
+        })
+        .catch((err) => {
+          reject(err)
+        })
+    })
+  },
+  getHistoryRates ({ state, commit }, { timestamp }) {
+    const url = getEnpointUrl('infoservice')
+    if (state.historyRates[timestamp] !== undefined) {
+      return state.historyRates[timestamp]
+    } else {
+      return new Promise((resolve, reject) => {
+        axios
+          .get(`${url}/getHistory?timestamp=${timestamp}`)
+          .then((res) => {
+            const rates = res?.data?.result[0]?.tickers ?? null
+            commit('setHistoryRates', { name: timestamp, value: rates })
+            resolve(res)
+          })
+          .catch((err) => {
+            reject(err)
+          })
+      })
+    }
+  },
+  startInterval: {
+    root: true,
+    handler ({ dispatch }) {
+      function repeat () {
+        dispatch('getAllRates')
+          .catch(err => console.error(err))
+          .then(() => {
+            interval = setTimeout(repeat, UPDATE_RATES_INTERVAL)
+          })
+      }
+
+      repeat()
+    }
+  },
+  stopInterval: {
+    root: true,
+    handler () {
+      clearTimeout(interval)
+    }
+  }
+}
+const getters = {
+  historyRate: (state, getters, rootState) => (timestamp, amount, crypto) => {
+    let historyRate
+    const currentCurrency = rootState.options.currentRate
+    const store = state.historyRates[timestamp]
+    if (store) {
+      historyRate = `${(store[`${crypto}/${currentCurrency}`] * amount).toFixed(2)} ${currentCurrency}`
+    } else {
+      historyRate = '�'
+    }
+    return historyRate
+  },
+  rate: (state, getters, rootState) => (amount, crypto) => {
+    const currentCurrency = rootState.options.currentRate
+    const store = state.rates[`${crypto}/${currentCurrency}`]
+    const rate = store * amount
+    return isNaN(rate) ? '�' : `${rate.toFixed(2)} ${currentCurrency}`
+  }
+}
+export default {
+  state,
+  getters,
+  mutations,
+  actions,
+  namespaced: true
+}
diff --git a/src/store/plugins/localStorage.js b/src/store/plugins/localStorage.js
index 31017f5f3..f7b47fa90 100644
--- a/src/store/plugins/localStorage.js
+++ b/src/store/plugins/localStorage.js
@@ -17,7 +17,8 @@ const vuexPersistence = new VuexPersistence({
         formatMessages: state.options.formatMessages,
         useFullDate: state.options.useFullDate,
         useSocketConnection: state.options.useSocketConnection,
-        suppressWarningOnAddressesNotification: state.options.suppressWarningOnAddressesNotification
+        suppressWarningOnAddressesNotification: state.options.suppressWarningOnAddressesNotification,
+        currentRate: state.options.currentRate
       }
     }
   }
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 44adac19e..4dab98075 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -45,6 +45,12 @@
                     <sub>ERC20</sub>
                   </span>
                 </div>
+                <div
+                  v-if="$store.state.rate.isLoaded"
+                  class="a-text-explanation account-view__rates"
+                >
+                  {{ wallet.rate }} {{ currentCurrency }}
+                </div>
               </div>
             </v-tab>
 
@@ -58,6 +64,8 @@
                 :balance="wallet.balance"
                 :crypto="wallet.cryptoCurrency"
                 :crypto-name="wallet.cryptoName"
+                :rate="wallet.rate"
+                :current-currency="currentCurrency"
                 @click:balance="goToTransactions"
               >
                 <crypto-icon
@@ -117,13 +125,15 @@ export default {
         const address = crypto === Cryptos.ADM ? state.address : state[key].address
         const balance = crypto === Cryptos.ADM ? state.balance : state[key].balance
         const erc20 = isErc20(crypto.toUpperCase())
-
+        const currentRate = state.rate.rates[`${crypto}/${this.currentCurrency}`]
+        const rate = currentRate !== undefined ? Number((balance * currentRate).toFixed(2)) : 0
         return {
           address,
           balance,
           cryptoCurrency: crypto,
           cryptoName: CryptosNames[crypto],
-          erc20
+          erc20,
+          rate
         }
       })
     },
@@ -137,6 +147,17 @@ export default {
           value
         })
       }
+    },
+    currentCurrency: {
+      get () {
+        return this.$store.state.options.currentRate
+      },
+      set (value) {
+        this.$store.commit('options/updateOption', {
+          key: 'currentRate',
+          value
+        })
+      }
     }
   },
   mounted () {
@@ -174,6 +195,9 @@ export default {
  * 2. Reset VTabItem opacity.
  */
 .account-view
+  &__rates
+    margin-top: 2px
+    color: hsla(0,0%,100%,.7)
   &__wallets
     &.v-card
       background-color: transparent
@@ -200,6 +224,9 @@ export default {
 /** Themes **/
 .theme--light
   .account-view
+    &__rates {
+      color: $adm-colors.muted
+    }
     &__wallets
       >>> .v-tabs__bar
         background-color: $adm-colors.secondary2-transparent
@@ -236,4 +263,8 @@ export default {
         color: $adm-colors.primary
         .svg-icon
           fill: $adm-colors.primary
+
+.v-tabs__item--active
+  .account-view__rates
+    color: inherit
 </style>
diff --git a/src/views/Options.vue b/src/views/Options.vue
index af4133e69..94c3a6d69 100644
--- a/src/views/Options.vue
+++ b/src/views/Options.vue
@@ -45,6 +45,22 @@
                 append-icon="mdi-chevron-down"
               />
             </v-flex>
+            <v-flex xs6>
+              <v-subheader
+                :class="`${className}__label`"
+                class="pa-0"
+              >
+                {{ $t('options.currency_label') }}
+              </v-subheader>
+            </v-flex>
+            <v-flex
+              xs6
+              class="text-xs-right"
+            >
+              <currency-switcher
+                append-icon="mdi-chevron-down"
+              />
+            </v-flex>
             <v-flex
               xs12
               class="mt-2"
@@ -292,6 +308,7 @@
 
 <script>
 import LanguageSwitcher from '@/components/LanguageSwitcher'
+import CurrencySwitcher from '@/components/CurrencySwitcher'
 import AppToolbarCentered from '@/components/AppToolbarCentered'
 import PasswordSetDialog from '@/components/PasswordSetDialog'
 import { clearDb, db as isIDBSupported } from '@/lib/idb'
@@ -300,6 +317,7 @@ import scrollPosition from '@/mixins/scrollPosition'
 export default {
   components: {
     LanguageSwitcher,
+    CurrencySwitcher,
     AppToolbarCentered,
     PasswordSetDialog
   },
diff --git a/src/views/Transactions.vue b/src/views/Transactions.vue
index ef7e20ea8..0938317b4 100644
--- a/src/views/Transactions.vue
+++ b/src/views/Transactions.vue
@@ -117,7 +117,6 @@ export default {
     if (!this.$store.getters['options/isLoginViaPassword'] || this.$store.state.IDBReady) {
       this.getNewTransactions()
     }
-
     window.addEventListener('scroll', this.onScroll)
   },
   // mixins: [scrollPosition],

From 91c0a16890e8038368fb851f70a1a9c5f6a526b1 Mon Sep 17 00:00:00 2001
From: Mansurkhoja <mansur.atm@gmail.com>
Date: Wed, 30 Mar 2022 23:39:03 +0500
Subject: [PATCH 02/14] fix: txTimestamp

---
 src/components/AChat/AChatTransaction.vue           | 1 +
 src/components/transactions/TransactionTemplate.vue | 2 +-
 src/store/modules/rate/index.js                     | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/AChat/AChatTransaction.vue b/src/components/AChat/AChatTransaction.vue
index 1162a4786..af4871458 100644
--- a/src/components/AChat/AChatTransaction.vue
+++ b/src/components/AChat/AChatTransaction.vue
@@ -145,6 +145,7 @@ export default {
   },
   mounted () {
     this.$emit('mount')
+    this.getHistoryRates()
   },
   methods: {
     isStringEqualCI (string1, string2) {
diff --git a/src/components/transactions/TransactionTemplate.vue b/src/components/transactions/TransactionTemplate.vue
index bec40eae7..e7cf5a99e 100644
--- a/src/components/transactions/TransactionTemplate.vue
+++ b/src/components/transactions/TransactionTemplate.vue
@@ -415,7 +415,7 @@ export default {
     },
     getHistoryRates () {
       this.$store.dispatch('rate/getHistoryRates', {
-        timestamp: this.timestampInSec
+        timestamp: timestampInSec(this.crypto, this.timestamp)
       })
     }
   }
diff --git a/src/store/modules/rate/index.js b/src/store/modules/rate/index.js
index 7704ec6e9..b8d2d853b 100644
--- a/src/store/modules/rate/index.js
+++ b/src/store/modules/rate/index.js
@@ -41,6 +41,7 @@ const actions = {
   },
   getHistoryRates ({ state, commit }, { timestamp }) {
     const url = getEnpointUrl('infoservice')
+    console.log(timestamp)
     if (state.historyRates[timestamp] !== undefined) {
       return state.historyRates[timestamp]
     } else {
@@ -49,7 +50,10 @@ const actions = {
           .get(`${url}/getHistory?timestamp=${timestamp}`)
           .then((res) => {
             const rates = res?.data?.result[0]?.tickers ?? null
-            commit('setHistoryRates', { name: timestamp, value: rates })
+            if (timestamp !== undefined) {
+              commit('setHistoryRates', { name: timestamp, value: rates })
+            }
+            console.log(state.historyRates)
             resolve(res)
           })
           .catch((err) => {

From 8b1d5c706a32ed194fc8ca961e02acf197b2add0 Mon Sep 17 00:00:00 2001
From: Mansurkhoja <mansur.atm@gmail.com>
Date: Wed, 30 Mar 2022 23:40:19 +0500
Subject: [PATCH 03/14] fix: txTimestamp

---
 src/store/modules/rate/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/store/modules/rate/index.js b/src/store/modules/rate/index.js
index b8d2d853b..1a92611a9 100644
--- a/src/store/modules/rate/index.js
+++ b/src/store/modules/rate/index.js
@@ -41,7 +41,6 @@ const actions = {
   },
   getHistoryRates ({ state, commit }, { timestamp }) {
     const url = getEnpointUrl('infoservice')
-    console.log(timestamp)
     if (state.historyRates[timestamp] !== undefined) {
       return state.historyRates[timestamp]
     } else {
@@ -53,7 +52,6 @@ const actions = {
             if (timestamp !== undefined) {
               commit('setHistoryRates', { name: timestamp, value: rates })
             }
-            console.log(state.historyRates)
             resolve(res)
           })
           .catch((err) => {

From 413b5f68b60c6feb9a816bee3983c1adf90c293d Mon Sep 17 00:00:00 2001
From: Mansurkhoja <mansur.atm@gmail.com>
Date: Thu, 31 Mar 2022 12:26:16 +0500
Subject: [PATCH 04/14] fix: check timestamp for store/rate

---
 src/store/modules/rate/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/rate/index.js b/src/store/modules/rate/index.js
index 1a92611a9..347059ae8 100644
--- a/src/store/modules/rate/index.js
+++ b/src/store/modules/rate/index.js
@@ -40,6 +40,7 @@ const actions = {
     })
   },
   getHistoryRates ({ state, commit }, { timestamp }) {
+    if (!timestamp) return
     const url = getEnpointUrl('infoservice')
     if (state.historyRates[timestamp] !== undefined) {
       return state.historyRates[timestamp]
@@ -49,9 +50,7 @@ const actions = {
           .get(`${url}/getHistory?timestamp=${timestamp}`)
           .then((res) => {
             const rates = res?.data?.result[0]?.tickers ?? null
-            if (timestamp !== undefined) {
-              commit('setHistoryRates', { name: timestamp, value: rates })
-            }
+            commit('setHistoryRates', { name: timestamp, value: rates })
             resolve(res)
           })
           .catch((err) => {

From 5519a7978f194af23cf04cfdce98204a48998333 Mon Sep 17 00:00:00 2001
From: martiliones <hi@martilion.es>
Date: Wed, 6 Apr 2022 03:22:15 +0600
Subject: [PATCH 05/14] refactor: remove eslint-disable statement

---
 src/components/CurrencySwitcher.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/CurrencySwitcher.vue b/src/components/CurrencySwitcher.vue
index ff09222d4..4f9bcab22 100644
--- a/src/components/CurrencySwitcher.vue
+++ b/src/components/CurrencySwitcher.vue
@@ -39,7 +39,6 @@
 </template>
 
 <script>
-// eslint-disable-next-line no-unused-vars
 import { RatesNames } from '@/lib/constants'
 
 export default {

From f43a48eedf27857e90c31b45c733efa93a935347 Mon Sep 17 00:00:00 2001
From: martiliones <hi@martilion.es>
Date: Wed, 6 Apr 2022 03:24:31 +0600
Subject: [PATCH 06/14] refactor: use braces for if-else conditions

---
 src/filters/currencyAmount.js           | 4 +++-
 src/filters/currencyAmountWithSymbol.js | 4 +++-
 src/lib/adamant-api-client.js           | 7 +++++--
 src/lib/notifications.js                | 4 +++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/filters/currencyAmount.js b/src/filters/currencyAmount.js
index 16849c23c..ca505b894 100644
--- a/src/filters/currencyAmount.js
+++ b/src/filters/currencyAmount.js
@@ -14,5 +14,7 @@ export default (amount, symbol = Cryptos.ADM, isAdmBalance) => {
       !isAdmBalance && symbol === Cryptos.ADM ? amount / 1e8 : amount
     ).toFixed()
     return `${formatted}`
-  } else return ''
+  } else {
+    return ''
+  }
 }
diff --git a/src/filters/currencyAmountWithSymbol.js b/src/filters/currencyAmountWithSymbol.js
index 1a3d82e9e..536bf1a1d 100644
--- a/src/filters/currencyAmountWithSymbol.js
+++ b/src/filters/currencyAmountWithSymbol.js
@@ -11,5 +11,7 @@ import currencyAmount from './currencyAmount'
 export default (amount, symbol = Cryptos.ADM, isAdmBalance) => {
   if (amount !== undefined) {
     return `${currencyAmount(amount, symbol, isAdmBalance)} ${symbol}`
-  } else return ''
+  } else {
+    return ''
+  }
 }
diff --git a/src/lib/adamant-api-client.js b/src/lib/adamant-api-client.js
index 68eb8048f..eb2fb6332 100644
--- a/src/lib/adamant-api-client.js
+++ b/src/lib/adamant-api-client.js
@@ -352,8 +352,11 @@ class ApiClient {
      */
     this._statusPromise = new Promise((resolve, reject) => {
       this._onInit = error => {
-        if (error) reject(error)
-        else resolve()
+        if (error) {
+          reject(error)
+        } else {
+          resolve()
+        }
         this._onInit = null
       }
     })
diff --git a/src/lib/notifications.js b/src/lib/notifications.js
index 8fbc933a3..980e7f786 100644
--- a/src/lib/notifications.js
+++ b/src/lib/notifications.js
@@ -164,7 +164,9 @@ class TabNotification extends Notification {
         } else {
           document.title = this.i18n.t('notifications.tabMessage.many')
         }
-      } else this.stop()
+      } else {
+        this.stop()
+      }
       this.showAmount = !this.showAmount
     }, 1e3)
   }

From a020c23d7ae70ef7c29dacc58e56f0518215f015 Mon Sep 17 00:00:00 2001
From: martiliones <hi@martilion.es>
Date: Wed, 6 Apr 2022 03:43:11 +0600
Subject: [PATCH 07/14] refactor: remove useless code in several cases

---
 src/components/SendFundsForm.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/SendFundsForm.vue b/src/components/SendFundsForm.vue
index fa13f20a0..ad5083b5d 100644
--- a/src/components/SendFundsForm.vue
+++ b/src/components/SendFundsForm.vue
@@ -516,13 +516,25 @@ export default {
     },
     transferFeeRate () {
       const currentRate = this.$store.state.rate.rates[`${this.transferFeeCurrency}/${this.currentCurrency}`]
+
+      if (currentRate === undefined) {
+        return ''
+      }
+
       const feeRate = (this.transferFeeFixed * currentRate).toFixed(2)
-      return currentRate !== undefined ? `${feeRate} ${this.currentCurrency}` : ''
+
+      return feeRate
     },
     finalAmountRate () {
       const currentRate = this.$store.state.rate.rates[`${this.currency}/${this.currentCurrency}`]
+
+      if (currentRate === undefined) {
+        return ''
+      }
+
       const amountRate = (this.finalAmountFixed * currentRate).toFixed(2)
-      return currentRate !== undefined ? `${amountRate} ${this.currentCurrency}` : ''
+
+      return `${amountRate} ${this.currentCurrency}`
     }
   },
   watch: {

From fae28d1de1fdd15b647541da2e99555c63a4993a Mon Sep 17 00:00:00 2001
From: martiliones <hi@martilion.es>
Date: Wed, 6 Apr 2022 03:50:30 +0600
Subject: [PATCH 08/14] refactor: use child selectors instead

---
 src/assets/stylus/themes/adamant/_inputs.styl | 81 ++++++++++---------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/assets/stylus/themes/adamant/_inputs.styl b/src/assets/stylus/themes/adamant/_inputs.styl
index 840e4a8ec..e85da140f 100644
--- a/src/assets/stylus/themes/adamant/_inputs.styl
+++ b/src/assets/stylus/themes/adamant/_inputs.styl
@@ -30,45 +30,48 @@
   align-items: flex-start
   min-height: inherit;
   position: relative
-.fake-input__label
-  left: 0px
-  right: auto
-  position: absolute
-  transform: translateY(-18px) scale(0.75)
-  overflow: hidden
-  text-overflow: ellipsis
-  top: 15px
-  transform-origin: top left
-  white-space: nowrap
-  max-width: 133%
-.fake-input__box
-  width: 100%
-  padding-bottom: 20px
-  position: relative
-  display: flex
-  align-items: baseline
-  overflow: hidden
-.fake-input__value
-  line-height: 32px
-  display: block;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-.fake-input__box:before
-  content: ''
-  border-image: repeating-linear-gradient(to right, rgba(255,255,255,0.5) 0px, rgba(255,255,255,0.5) 2px, transparent 2px, transparent 4px) 1 repeat
-  border-color: rgba(255,255,255,0.7)
-  border-style: solid
-  border-width: thin 0 0 0
-  border-top-width: 1px
-  left: 0
-  position: absolute
-  transition: 0.3s cubic-bezier(0.25, 0.8, 0.5, 1)
-  width: 100%
-  top: 31px
-.fake-input__value--rate
-  font-style: italic
-  padding-left: 3px
-  color: inherit !important
+
+  &__label
+    left: 0px
+    right: auto
+    position: absolute
+    transform: translateY(-18px) scale(0.75)
+    overflow: hidden
+    text-overflow: ellipsis
+    top: 15px
+    transform-origin: top left
+    white-space: nowrap
+    max-width: 133%
+  &__box
+    width: 100%
+    padding-bottom: 20px
+    position: relative
+    display: flex
+    align-items: baseline
+    overflow: hidden
+
+    &:before
+      content: ''
+      border-image: repeating-linear-gradient(to right, rgba(255,255,255,0.5) 0px, rgba(255,255,255,0.5) 2px, transparent 2px, transparent 4px) 1 repeat
+      border-color: rgba(255,255,255,0.7)
+      border-style: solid
+      border-width: thin 0 0 0
+      border-top-width: 1px
+      left: 0
+      position: absolute
+      transition: 0.3s cubic-bezier(0.25, 0.8, 0.5, 1)
+      width: 100%
+      top: 31px
+  &__value
+    line-height: 32px
+    display: block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
+    &--rate
+      font-style: italic
+      padding-left: 3px
+      color: inherit !important
 
   
 .theme--light

From 0e871c099665fb8b7b5e4ae312b1c662eceb3c91 Mon Sep 17 00:00:00 2001
From: martiliones <hi@martilion.es>
Date: Wed, 6 Apr 2022 03:52:39 +0600
Subject: [PATCH 09/14] refactor: remove useless template literals

---
 src/filters/currencyAmount.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/filters/currencyAmount.js b/src/filters/currencyAmount.js
index ca505b894..9e27b510a 100644
--- a/src/filters/currencyAmount.js
+++ b/src/filters/currencyAmount.js
@@ -13,7 +13,7 @@ export default (amount, symbol = Cryptos.ADM, isAdmBalance) => {
     const formatted = BigNumber(
       !isAdmBalance && symbol === Cryptos.ADM ? amount / 1e8 : amount
     ).toFixed()
-    return `${formatted}`
+    return formatted
   } else {
     return ''
   }

From 691b3575258a5915b030f950884cc42f7b582cfa Mon Sep 17 00:00:00 2001
From: adamant-al <adamantim@yandex.ru>
Date: Wed, 6 Apr 2022 11:02:01 +0300
Subject: [PATCH 10/14] Fix transferFeeRate in SendFundsForm

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

diff --git a/src/components/SendFundsForm.vue b/src/components/SendFundsForm.vue
index ad5083b5d..db609a08a 100644
--- a/src/components/SendFundsForm.vue
+++ b/src/components/SendFundsForm.vue
@@ -523,7 +523,7 @@ export default {
 
       const feeRate = (this.transferFeeFixed * currentRate).toFixed(2)
 
-      return feeRate
+      return `${feeRate} ${this.currentCurrency}`
     },
     finalAmountRate () {
       const currentRate = this.$store.state.rate.rates[`${this.currency}/${this.currentCurrency}`]

From 5ff710688fa47a46c63268523d0c522a051257a1 Mon Sep 17 00:00:00 2001
From: adamant-al <adamantim@yandex.ru>
Date: Wed, 6 Apr 2022 11:22:45 +0300
Subject: [PATCH 11/14] Update dependencies and pump version

---
 package.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index a6829d86e..54b56ecd1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adamant-im",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "author": "ADAMANT Foundation <devs@adamant.im>",
   "license": "GPLv3",
   "description": "Decentralized Messenger",
@@ -21,26 +21,26 @@
   "dependencies": {
     "@liskhq/lisk-cryptography": "3.2.0",
     "@liskhq/lisk-transactions": "5.2.1",
-    "@mdi/font": "^6.5.95",
+    "@mdi/font": "^6.6.96",
     "@stablelib/utf8": "^1.0.1",
     "@zxing/library": "0.19.1",
     "abi-decoder": "^2.4.0",
-    "axios": "^0.26.0",
+    "axios": "^0.26.1",
     "b64-to-blob": "^1.2.19",
     "bignumber.js": "^9.0.2",
     "bip39": "^3.0.4",
     "bitcoinjs-lib": "^5.2.0",
     "bytebuffer": "^5.0.1",
-    "coininfo": "^5.1.0",
-    "core-js": "^3.21.0",
-    "dayjs": "^1.10.7",
+    "coininfo": "^5.2.1",
+    "core-js": "^3.21.1",
+    "dayjs": "^1.11.0",
     "deepmerge": "^4.2.2",
     "detect-browser": "^5.3.0",
     "dompurify": "^2.3.6",
     "ed2curve": "^0.3.0",
     "file-saver": "^2.0.5",
     "hdkey": "^2.0.1",
-    "idb": "^7.0.0",
+    "idb": "^7.0.1",
     "js-base64": "^3.7.2",
     "js-md5": "^0.7.3",
     "lodash": "^4.17.21",
@@ -64,11 +64,11 @@
     "vuetify": "^1.5.24",
     "vuex": "^3.6.2",
     "vuex-persist": "^3.1.3",
-    "web3-eth": "^1.7.0",
-    "web3-utils": "^1.7.0"
+    "web3-eth": "^1.7.1",
+    "web3-utils": "^1.7.1"
   },
   "devDependencies": {
-    "@babel/core": "7.17.4",
+    "@babel/core": "7.17.8",
     "@babel/eslint-parser": "^7.17.0",
     "@intlify/vue-i18n-loader": "^1.1.0",
     "@vue/babel-preset-app": "^4.5.15",
@@ -84,22 +84,22 @@
     "babel-jest": "^27.5.1",
     "babel-plugin-rewire": "^1.2.0",
     "cross-env": "^7.0.3",
-    "electron": "^17.0.1",
+    "electron": "^18.0.2",
     "electron-devtools-installer": "^3.2.0",
     "eslint": "^7.31.0",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-vue": "^8.4.1",
+    "eslint-plugin-vue": "^8.6.0",
     "lorem-ipsum": "^2.0.4",
     "sinon": "^13.0.1",
-    "stylus": "^0.56.0",
+    "stylus": "^0.57.0",
     "stylus-loader": "^3.0.2",
     "uuid": "^8.3.2",
     "vue-cli-plugin-electron-builder": "^2.1.1",
     "vue-cli-plugin-i18n": "^2.3.1",
-    "vue-cli-plugin-vuetify": "^2.4.5",
+    "vue-cli-plugin-vuetify": "^2.4.8",
     "vue-cli-plugin-webpack-bundle-analyzer": "^4.0.0",
     "vue-jest": "^3.0.7",
     "vue-template-compiler": "^2.6.14",

From 5cc49ba8c991a6545e77066a5c1b7fd2ad6d76d1 Mon Sep 17 00:00:00 2001
From: adamant-al <adamantim@yandex.ru>
Date: Wed, 6 Apr 2022 12:31:26 +0300
Subject: [PATCH 12/14] Generate crypto QR code address with correct prefix

---
 src/lib/constants.js | 28 +++++++++++++++++++++-------
 src/lib/uri.js       | 15 +++++++--------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/lib/constants.js b/src/lib/constants.js
index 089c6741a..9aee9284a 100644
--- a/src/lib/constants.js
+++ b/src/lib/constants.js
@@ -23,13 +23,7 @@ export const Cryptos = {
   USDS: 'USDS',
   BNB: 'BNB'
 }
-export const Rates = {
-  USD: 'USD',
-  EUR: 'EUR',
-  RUB: 'RUB',
-  CNY: 'CNY',
-  JPY: 'JPY'
-}
+
 export const CryptosNames = {
   [Cryptos.ADM]: 'ADAMANT',
   [Cryptos.BNB]: 'Binance Coin',
@@ -41,6 +35,26 @@ export const CryptosNames = {
   [Cryptos.BTC]: 'Bitcoin'
 }
 
+// Used to generate QR codes for wallets like lisk:lskk42c2ut4fmpcxf8swwcpy64fokqmfuzwupjnat
+export const CryptosQqPrefixes = {
+  [Cryptos.ADM]: 'adm',
+  [Cryptos.BNB]: 'ethereum',
+  [Cryptos.ETH]: 'ethereum',
+  [Cryptos.LSK]: 'lisk',
+  [Cryptos.DOGE]: 'doge',
+  [Cryptos.DASH]: 'dash',
+  [Cryptos.USDS]: 'ethereum',
+  [Cryptos.BTC]: 'bitcoin'
+}
+
+export const Rates = {
+  USD: 'USD',
+  EUR: 'EUR',
+  RUB: 'RUB',
+  CNY: 'CNY',
+  JPY: 'JPY'
+}
+
 export const RatesNames = {
   [Rates.USD]: 'USD ($)', // United States Dollar
   [Rates.EUR]: 'EUR (€)', // Euro
diff --git a/src/lib/uri.js b/src/lib/uri.js
index 7af910df4..15b3dee33 100644
--- a/src/lib/uri.js
+++ b/src/lib/uri.js
@@ -1,7 +1,7 @@
 import { isAddress as isEthAddress, isHexStrict } from 'web3-utils'
 import { validateBase32Address as isLskAddress } from '@liskhq/lisk-cryptography'
 import {
-  Cryptos, isErc20,
+  Cryptos, CryptosQqPrefixes,
   RE_ADM_ADDRESS, RE_BTC_ADDRESS, RE_DASH_ADDRESS, RE_DOGE_ADDRESS, RE_LSK_ADDRESS
 } from './constants'
 
@@ -107,14 +107,13 @@ export function generateURI (crypto = Cryptos.ADM, address, name) {
     }
     return `${hostname}?address=${address}${label}`
   }
-  if (crypto === Cryptos.BTC) {
-    return `bitcoin:${address}`
-  }
-  if (crypto === Cryptos.ETH || isErc20(crypto)) {
-    return `ethereum:${address}`
-  }
 
-  return `${crypto.toLowerCase()}:${address}`
+  const cryptoQrPrefix = CryptosQqPrefixes[crypto]
+  if (cryptoQrPrefix) {
+    return `${cryptoQrPrefix}:${address}`
+  } else {
+    return address
+  }
 }
 
 /**

From 90c46acbff1dde6ca2db3f1f81c71142287d3f9c Mon Sep 17 00:00:00 2001
From: adamant-al <adamantim@yandex.ru>
Date: Sun, 22 May 2022 13:49:59 +0300
Subject: [PATCH 13/14] Update dependencies & show fiat only if non-zero

---
 package.json       | 30 +++++++++++++++---------------
 src/i18n/ru.json   |  2 +-
 src/views/Home.vue |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 54b56ecd1..97fd8358c 100644
--- a/package.json
+++ b/package.json
@@ -19,24 +19,24 @@
     "postinstall": "electron-builder install-app-deps"
   },
   "dependencies": {
-    "@liskhq/lisk-cryptography": "3.2.0",
-    "@liskhq/lisk-transactions": "5.2.1",
-    "@mdi/font": "^6.6.96",
+    "@liskhq/lisk-cryptography": "3.2.1",
+    "@liskhq/lisk-transactions": "5.2.2",
+    "@mdi/font": "^6.7.96",
     "@stablelib/utf8": "^1.0.1",
     "@zxing/library": "0.19.1",
     "abi-decoder": "^2.4.0",
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
     "b64-to-blob": "^1.2.19",
     "bignumber.js": "^9.0.2",
     "bip39": "^3.0.4",
     "bitcoinjs-lib": "^5.2.0",
     "bytebuffer": "^5.0.1",
     "coininfo": "^5.2.1",
-    "core-js": "^3.21.1",
-    "dayjs": "^1.11.0",
+    "core-js": "^3.22.5",
+    "dayjs": "^1.11.2",
     "deepmerge": "^4.2.2",
     "detect-browser": "^5.3.0",
-    "dompurify": "^2.3.6",
+    "dompurify": "^2.3.8",
     "ed2curve": "^0.3.0",
     "file-saver": "^2.0.5",
     "hdkey": "^2.0.1",
@@ -44,14 +44,14 @@
     "js-base64": "^3.7.2",
     "js-md5": "^0.7.3",
     "lodash": "^4.17.21",
-    "marked": "^4.0.12",
+    "marked": "^4.0.16",
     "notifyjs": "^3.0.0",
     "pbkdf2": "^3.1.2",
     "promise-queue": "^2.2.5",
     "qrcode": "^1.5.0",
     "qs": "^6.10.3",
     "register-service-worker": "^1.7.2",
-    "semver": "^7.3.5",
+    "semver": "^7.3.7",
     "simple-audio": "^1.0.1",
     "socket.io-client": "^2.4.0",
     "sodium-browserify-tweetnacl": "^0.2.6",
@@ -64,11 +64,11 @@
     "vuetify": "^1.5.24",
     "vuex": "^3.6.2",
     "vuex-persist": "^3.1.3",
-    "web3-eth": "^1.7.1",
-    "web3-utils": "^1.7.1"
+    "web3-eth": "^1.7.3",
+    "web3-utils": "^1.7.3"
   },
   "devDependencies": {
-    "@babel/core": "7.17.8",
+    "@babel/core": "7.18.0",
     "@babel/eslint-parser": "^7.17.0",
     "@intlify/vue-i18n-loader": "^1.1.0",
     "@vue/babel-preset-app": "^4.5.15",
@@ -81,10 +81,10 @@
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/test-utils": "^1.3.0",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^27.5.1",
+    "babel-jest": "^28.1.0",
     "babel-plugin-rewire": "^1.2.0",
     "cross-env": "^7.0.3",
-    "electron": "^18.0.2",
+    "electron": "^18.2.4",
     "electron-devtools-installer": "^3.2.0",
     "eslint": "^7.31.0",
     "eslint-config-standard": "^16.0.3",
@@ -93,7 +93,7 @@
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-vue": "^8.6.0",
     "lorem-ipsum": "^2.0.4",
-    "sinon": "^13.0.1",
+    "sinon": "^14.0.0",
     "stylus": "^0.57.0",
     "stylus-loader": "^3.0.2",
     "uuid": "^8.3.2",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index a9a71e06d..57b94af5d 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -155,7 +155,7 @@
     "socket": "Сокеты",
     "unsupported": "Не поддерживается",
     "use_socket_connection": "Использовать сокет-подключения",
-    "use_socket_connection_tooltip": "Сокеты позволяют получать новые сообщения мгновенно, как классичесикие P2P-мессенджеры"
+    "use_socket_connection_tooltip": "Сокеты позволяют получать новые сообщения мгновенно, как классические P2P-мессенджеры"
   },
   "notifications": {
     "tabMessage": {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 4dab98075..0920e4d5e 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -46,7 +46,7 @@
                   </span>
                 </div>
                 <div
-                  v-if="$store.state.rate.isLoaded"
+                  v-if="$store.state.rate.isLoaded && wallet.rate"
                   class="a-text-explanation account-view__rates"
                 >
                   {{ wallet.rate }} {{ currentCurrency }}
@@ -203,6 +203,7 @@ export default {
       background-color: transparent
     >>> .v-tabs__container
       height: auto // [1]
+      align-items: baseline
     >>> .v-tabs__slider
       height: 2px
     >>> .v-tabs__wrapper

From 220142f618bb4eafa7ca41f970f847fe56e11d6a Mon Sep 17 00:00:00 2001
From: adamant-al <adamantim@yandex.ru>
Date: Sun, 22 May 2022 14:20:43 +0300
Subject: [PATCH 14/14] Add Tor InfoService

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

diff --git a/src/config/tor.json b/src/config/tor.json
index ef29adec0..591a76289 100644
--- a/src/config/tor.json
+++ b/src/config/tor.json
@@ -36,7 +36,7 @@
       { "url": "http://s2q6phc22icy73zjccjq66555gwtvyuyrodmadwhjdhmvyehb3qrcsid.onion" }
     ],
     "infoservice": [
-      { "url": "https://info.adamant.im" }
+      { "url": "http://czjsawp2crjmnkliw2h2kpk7wwd3a36zvvnvqgvzmi4t4vc2yzm7j2qd.onion" }
     ]
   },
   "env": "production"