From d49ee059ec728b3f2435065bb724b01b14555575 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Mon, 16 Dec 2024 09:56:57 +0300
Subject: [PATCH 1/5] feat/open-in-explorer-for-wallets-on-account-screen

---
 src/components/ShareURIDialog.vue | 23 +++++++++++++++++++++--
 src/locales/en.json               |  3 ++-
 src/locales/ru.json               |  3 ++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/components/ShareURIDialog.vue b/src/components/ShareURIDialog.vue
index c352943f4..34b1abbae 100644
--- a/src/components/ShareURIDialog.vue
+++ b/src/components/ShareURIDialog.vue
@@ -22,6 +22,14 @@
               {{ $t('home.show_qr_code') }}
             </v-list-item-title>
           </v-list-item>
+          <v-list-item
+            v-if="crypto !== cryptos.USDT && crypto !== cryptos.USDC"
+            @click="openInExplorer"
+          >
+            <v-list-item-title :class="`${className}__list-item-title`">
+              {{ $t('home.explorer') }}
+            </v-list-item-title>
+          </v-list-item>
         </v-list>
       </v-card-text>
     </v-card>
@@ -32,7 +40,9 @@
 <script>
 import QrcodeRendererDialog from '@/components/QrcodeRendererDialog.vue'
 import copyToClipboard from 'copy-to-clipboard'
-import { generateURI } from '@/lib/uri'
+import { generateURI, websiteUriToOnion } from '@/lib/uri'
+import { Cryptos } from '@/lib/constants'
+import config from '@/config/index'
 
 export default {
   components: { QrcodeRendererDialog },
@@ -57,7 +67,8 @@ export default {
   emits: ['update:modelValue'],
   data: () => ({
     className: 'share-uri-dialog',
-    showQrcodeRendererDialog: false
+    showQrcodeRendererDialog: false,
+    cryptos: Cryptos
   }),
   computed: {
     show: {
@@ -86,6 +97,14 @@ export default {
     openQRCodeRenderer() {
       this.showQrcodeRendererDialog = true
       this.show = false
+    },
+    openInExplorer() {
+      const explorerUri = config[this.crypto.toLowerCase()].explorerAddress.replace(
+        /\${([a-zA-Z_]+?)}/,
+        this.address
+      )
+      const explorerLink = this.isADM ? websiteUriToOnion(explorerUri) : explorerUri
+      window.open(explorerLink, '_blank', 'resizable,scrollbars,status,noopener')
     }
   }
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index f2d869d74..20b9536db 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -122,7 +122,8 @@
     "show_qr_code": "Show QR code",
     "stake_and_earn_btn": "Stake and earn",
     "wallet": "wallet",
-    "wallet_crypto": "{crypto} wallet"
+    "wallet_crypto": "{crypto} wallet",
+    "explorer": "Open in Explorer"
   },
   "warning_on_addresses": {
     "warning": "Warning",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 7d70fecc0..3c2ff7760 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -123,7 +123,8 @@
     "show_qr_code": "Показать QR-код",
     "stake_and_earn_btn": "Застейкать и заработать",
     "wallet": "кошелек",
-    "wallet_crypto": "Кошелек {crypto}"
+    "wallet_crypto": "Кошелек {crypto}",
+    "explorer": "Посмотреть в Explorer'е"
   },
   "warning_on_addresses": {
     "warning": "Внимание",

From 3a04588bfec43b46fad7e45bd0967a1d23f9852f Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Thu, 26 Dec 2024 23:04:16 +0300
Subject: [PATCH 2/5] fixes per comments

---
 src/components/ShareURIDialog.vue | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/components/ShareURIDialog.vue b/src/components/ShareURIDialog.vue
index 34b1abbae..4eb1422f6 100644
--- a/src/components/ShareURIDialog.vue
+++ b/src/components/ShareURIDialog.vue
@@ -22,10 +22,7 @@
               {{ $t('home.show_qr_code') }}
             </v-list-item-title>
           </v-list-item>
-          <v-list-item
-            v-if="crypto !== cryptos.USDT && crypto !== cryptos.USDC"
-            @click="openInExplorer"
-          >
+          <v-list-item v-if="!isErc" @click="openInExplorer">
             <v-list-item-title :class="`${className}__list-item-title`">
               {{ $t('home.explorer') }}
             </v-list-item-title>
@@ -40,9 +37,9 @@
 <script>
 import QrcodeRendererDialog from '@/components/QrcodeRendererDialog.vue'
 import copyToClipboard from 'copy-to-clipboard'
-import { generateURI, websiteUriToOnion } from '@/lib/uri'
-import { Cryptos } from '@/lib/constants'
-import config from '@/config/index'
+import { generateURI } from '@/lib/uri'
+import { isErc20 } from '@/lib/constants'
+import { getExplorerAddressUrl } from '@/config/utils'
 
 export default {
   components: { QrcodeRendererDialog },
@@ -67,8 +64,7 @@ export default {
   emits: ['update:modelValue'],
   data: () => ({
     className: 'share-uri-dialog',
-    showQrcodeRendererDialog: false,
-    cryptos: Cryptos
+    showQrcodeRendererDialog: false
   }),
   computed: {
     show: {
@@ -81,6 +77,9 @@ export default {
     },
     uri() {
       return generateURI(this.crypto, this.address)
+    },
+    isErc() {
+      return isErc20(this.crypto)
     }
   },
   methods: {
@@ -99,11 +98,7 @@ export default {
       this.show = false
     },
     openInExplorer() {
-      const explorerUri = config[this.crypto.toLowerCase()].explorerAddress.replace(
-        /\${([a-zA-Z_]+?)}/,
-        this.address
-      )
-      const explorerLink = this.isADM ? websiteUriToOnion(explorerUri) : explorerUri
+      const explorerLink = getExplorerAddressUrl(this.crypto, this.address)
       window.open(explorerLink, '_blank', 'resizable,scrollbars,status,noopener')
     }
   }

From 026ca96309409146b475da75f66bdd7903fdbf92 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sat, 28 Dec 2024 18:31:19 +0300
Subject: [PATCH 3/5] fixes: per comments; refactor into composition api (ts)

---
 src/components/ShareURIDialog.vue         | 139 +++++++++++++---------
 src/config/utils/getExplorerAddressUrl.ts |   2 +-
 2 files changed, 83 insertions(+), 58 deletions(-)

diff --git a/src/components/ShareURIDialog.vue b/src/components/ShareURIDialog.vue
index 4eb1422f6..4098fe091 100644
--- a/src/components/ShareURIDialog.vue
+++ b/src/components/ShareURIDialog.vue
@@ -1,30 +1,30 @@
 <template>
-  <v-dialog v-model="show" eager width="320" :class="className">
+  <v-dialog v-model="show" eager width="320" :class="classes.root">
     <v-card>
-      <v-card-title :class="`${className}__dialog-title`" class="a-text-header">
-        {{ $t('home.share_uri', { crypto }) }}
+      <v-card-title :class="classes.dialogTitle" class="a-text-header">
+        {{ t('home.share_uri', { crypto }) }}
       </v-card-title>
       <v-divider class="a-divider" />
       <v-card-text class="pa-0">
         <v-list>
           <v-list-item @click="copyAddress">
-            <v-list-item-title :class="`${className}__list-item-title`">
-              {{ $t('home.copy_address') }}
+            <v-list-item-title :class="classes.listItemTitle">
+              {{ t('home.copy_address') }}
             </v-list-item-title>
           </v-list-item>
           <v-list-item v-if="isADM" @click="copyURI">
-            <v-list-item-title :class="`${className}__list-item-title`">
-              {{ $t('home.copy_uri') }}
+            <v-list-item-title :class="classes.listItemTitle">
+              {{ t('home.copy_uri') }}
             </v-list-item-title>
           </v-list-item>
           <v-list-item @click="openQRCodeRenderer">
-            <v-list-item-title :class="`${className}__list-item-title`">
-              {{ $t('home.show_qr_code') }}
+            <v-list-item-title :class="classes.listItemTitle">
+              {{ t('home.show_qr_code') }}
             </v-list-item-title>
           </v-list-item>
           <v-list-item v-if="!isErc" @click="openInExplorer">
-            <v-list-item-title :class="`${className}__list-item-title`">
-              {{ $t('home.explorer') }}
+            <v-list-item-title :class="classes.listItemTitle">
+              {{ t('home.explorer') }}
             </v-list-item-title>
           </v-list-item>
         </v-list>
@@ -34,75 +34,100 @@
   </v-dialog>
 </template>
 
-<script>
+<script lang="ts">
+import { ref, computed, defineComponent, PropType } from 'vue'
+import { useStore } from 'vuex'
+import { useI18n } from 'vue-i18n'
+
+import { CryptoSymbol, isErc20 } from '@/lib/constants'
+
 import QrcodeRendererDialog from '@/components/QrcodeRendererDialog.vue'
 import copyToClipboard from 'copy-to-clipboard'
 import { generateURI } from '@/lib/uri'
-import { isErc20 } from '@/lib/constants'
 import { getExplorerAddressUrl } from '@/config/utils'
 
-export default {
-  components: { QrcodeRendererDialog },
+const className = 'share-uri-dialog'
+const classes = {
+  root: className,
+  dialogTitle: `${className}__dialog-title`,
+  listItemTitle: `${className}__list-item-title`
+}
+
+export default defineComponent({
+  components: {
+    QrcodeRendererDialog
+  },
   props: {
+    modelValue: {
+      type: Boolean,
+      required: true
+    },
     address: {
-      required: true,
-      type: String
+      type: String,
+      required: true
     },
     crypto: {
-      required: true,
-      type: String
+      type: String as PropType<CryptoSymbol>,
+      required: true
     },
     isADM: {
-      required: true,
-      type: Boolean
-    },
-    modelValue: {
-      required: true,
       type: Boolean
     }
   },
   emits: ['update:modelValue'],
-  data: () => ({
-    className: 'share-uri-dialog',
-    showQrcodeRendererDialog: false
-  }),
-  computed: {
-    show: {
+  setup(props, { emit }) {
+    const { t } = useI18n()
+    const store = useStore()
+    const showQrcodeRendererDialog = ref(false)
+
+    const show = computed({
       get() {
-        return this.modelValue
+        return props.modelValue
       },
       set(value) {
-        this.$emit('update:modelValue', value)
+        emit('update:modelValue', value)
       }
-    },
-    uri() {
-      return generateURI(this.crypto, this.address)
-    },
-    isErc() {
-      return isErc20(this.crypto)
+    })
+
+    const uri = computed(() => generateURI(props.crypto, props.address, ''))
+    const isErc = computed(() => isErc20(props.crypto))
+
+    const copyAddress = () => {
+      copyToClipboard(props.address)
+      store.dispatch('snackbar/show', { message: t('home.copied') })
+      show.value = false
     }
-  },
-  methods: {
-    copyAddress() {
-      copyToClipboard(this.address)
-      this.$store.dispatch('snackbar/show', { message: this.$t('home.copied') })
-      this.show = false
-    },
-    copyURI() {
-      copyToClipboard(this.uri)
-      this.$store.dispatch('snackbar/show', { message: this.$t('home.copied') })
-      this.show = false
-    },
-    openQRCodeRenderer() {
-      this.showQrcodeRendererDialog = true
-      this.show = false
-    },
-    openInExplorer() {
-      const explorerLink = getExplorerAddressUrl(this.crypto, this.address)
+
+    const copyURI = () => {
+      copyToClipboard(uri.value)
+      store.dispatch('snackbar/show', { message: t('home.copied') })
+      show.value = false
+    }
+
+    const openQRCodeRenderer = () => {
+      showQrcodeRendererDialog.value = true
+      show.value = false
+    }
+
+    const openInExplorer = () => {
+      const explorerLink = getExplorerAddressUrl(props.crypto, props.address)
       window.open(explorerLink, '_blank', 'resizable,scrollbars,status,noopener')
     }
+
+    return {
+      classes,
+      t,
+      showQrcodeRendererDialog,
+      show,
+      uri,
+      isErc,
+      copyAddress,
+      copyURI,
+      openQRCodeRenderer,
+      openInExplorer
+    }
   }
-}
+})
 </script>
 
 <style lang="scss">
diff --git a/src/config/utils/getExplorerAddressUrl.ts b/src/config/utils/getExplorerAddressUrl.ts
index 28040e389..3118b3ecf 100644
--- a/src/config/utils/getExplorerAddressUrl.ts
+++ b/src/config/utils/getExplorerAddressUrl.ts
@@ -6,7 +6,7 @@ import config from '../index'
  * @param {string} crypto like 'adm' or 'eth'
  * @param {string} address Crypto address
  */
-export function getExplorerAddressUrl(crypto: string, address: number): string {
+export function getExplorerAddressUrl(crypto: string, address: string): string {
   const explorerAddress = config[crypto.toLowerCase()].explorerAddress
 
   if (!explorerAddress) {

From 987747537ac24cc05f94a97dd218e666aca4da57 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sat, 28 Dec 2024 19:35:57 +0300
Subject: [PATCH 4/5] fix: same explorer address for ERC20 as for ETH

---
 src/components/ShareURIDialog.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/ShareURIDialog.vue b/src/components/ShareURIDialog.vue
index 4098fe091..fb1987af1 100644
--- a/src/components/ShareURIDialog.vue
+++ b/src/components/ShareURIDialog.vue
@@ -22,7 +22,7 @@
               {{ t('home.show_qr_code') }}
             </v-list-item-title>
           </v-list-item>
-          <v-list-item v-if="!isErc" @click="openInExplorer">
+          <v-list-item @click="openInExplorer">
             <v-list-item-title :class="classes.listItemTitle">
               {{ t('home.explorer') }}
             </v-list-item-title>
@@ -39,7 +39,7 @@ import { ref, computed, defineComponent, PropType } from 'vue'
 import { useStore } from 'vuex'
 import { useI18n } from 'vue-i18n'
 
-import { CryptoSymbol, isErc20 } from '@/lib/constants'
+import { CryptoSymbol, Cryptos, isErc20 } from '@/lib/constants'
 
 import QrcodeRendererDialog from '@/components/QrcodeRendererDialog.vue'
 import copyToClipboard from 'copy-to-clipboard'
@@ -110,7 +110,8 @@ export default defineComponent({
     }
 
     const openInExplorer = () => {
-      const explorerLink = getExplorerAddressUrl(props.crypto, props.address)
+      const crypto = isErc.value ? Cryptos.ETH : props.crypto
+      const explorerLink = getExplorerAddressUrl(crypto, props.address)
       window.open(explorerLink, '_blank', 'resizable,scrollbars,status,noopener')
     }
 

From 90dbb88ceb88b00e36f985d209bbfd3647bb21d2 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sat, 28 Dec 2024 19:43:27 +0300
Subject: [PATCH 5/5] fix: wallet-card's prop type

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

diff --git a/src/components/WalletCard.vue b/src/components/WalletCard.vue
index dab8e32bf..f05057f84 100644
--- a/src/components/WalletCard.vue
+++ b/src/components/WalletCard.vue
@@ -56,11 +56,11 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue'
+import { computed, defineComponent, ref, PropType } from 'vue'
 import { useI18n } from 'vue-i18n'
 import ShareURIDialog from '@/components/ShareURIDialog.vue'
 import WalletCardListActions from '@/components/WalletCardListActions.vue'
-import { Cryptos } from '@/lib/constants'
+import { Cryptos, CryptoSymbol } from '@/lib/constants'
 import { useDisplay } from 'vuetify'
 import smartNumber from '@/lib/smartNumber'
 import currencyAmount from '@/filters/currencyAmount'
@@ -86,7 +86,7 @@ export default defineComponent({
       required: true
     },
     crypto: {
-      type: String,
+      type: String as PropType<CryptoSymbol>,
       default: 'ADM'
     },
     cryptoName: {