fix: conflicts

EthVM · Dec 17, 2024 · 5aed536 · 5aed536 · mew-bot · Dec 17, 2024
2 parents 3ba2b72 + 197722b
commit 5aed536
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
+### Release v2.1.13
+
 ### Fix
 
 -   fix ens subgraph [#1233](https://github.com/EthVM/EthVM/pull/1233)
 
+### Feature
+
+-   add link to contract on address [#1232](https://github.com/EthVM/EthVM/pull/1232)
+
 ### Release v2.1.12
 
 ### Feature

diff --git a/static/components/TheAppHeader.vue b/static/components/TheAppHeader.vue
@@ -56,7 +56,6 @@ const { name, xs } = useDisplay()
 const appDrawer = useAppDrawer()
 
 const showDrawerBtn = computed<boolean>(() => {
-    console.log(name.value === 'xs' || name.value === 'sm' || name.value === 'md')
     return name.value === 'xs' || name.value === 'sm' || name.value === 'md'
 })
 

diff --git a/v2/package.json b/v2/package.json
@@ -5,15 +5,19 @@
     "main": "index.js",
     "private": true,
     "scripts": {
-        "ts-serve": "run-p type-check serve",
-        "serve": "vue-cli-service serve",
+        "ts-serve": "run-p type-check dev",
+        "dev": "vue-cli-service serve",
         "serve-sepolia": "vue-cli-service serve --mode sepolia",
         "type-check": "vue-tsc --noEmit --watch",
         "build": "vue-cli-service build",
         "lint": "vue-cli-service lint",
         "codegen-generate": "graphql-codegen --config codegen.yml",
         "build:hash": "VUE_APP_ROUTER_MODE=hash vue-cli-service build"
     },
+    "engines": {
+        "node": "18.0.0",
+        "pnpm": "8.10.5"
+    },
     "dependencies": {
         "@apollo/client": "^3.5.10",
         "@ensdomains/eth-ens-namehash": "^2.0.15",

diff --git a/v2/src/modules/address/ModuleAddressTokens.vue b/v2/src/modules/address/ModuleAddressTokens.vue
@@ -17,7 +17,7 @@
                 />
             </div>
             <template v-if="props.isOverview">
-                <app-btn :text="$t('common.more')" is-small icon="east" @click="goToTokensBalancePage"></app-btn>
+                <app-btn :text="$t('common.more')" is-small icon="east" @click="goToTokensContractPage"></app-btn>
             </template>
         </v-card-title>
         <div v-if="!props.isOverview || (props.isOverview && xs)" class="d-flex align-center flex-wrap">
@@ -33,7 +33,7 @@
                 </address-balance-totals>
             </v-col>
             <v-spacer v-if="props.isOverview && xs" />
-            <app-btn-icon v-if="props.isOverview && xs" icon="east" @click="goToTokensBalancePage"></app-btn-icon>
+            <app-btn-icon v-if="props.isOverview && xs" icon="east" @click="goToTokensContractPage"></app-btn-icon>
             <div class="flex-grow-1 my-5 my-sm-0">
                 <app-input :place-holder="$t('token.searchTokenName')" v-model="state.searchParams" />
             </div>
@@ -189,7 +189,7 @@ import { TOKEN_FILTER_VALUES, KEY, DIRECTION, Token } from '@module/address/mode
 import { useAddressToken } from '@core/composables/AddressTokens/addressTokens.composable'
 import { AddressEventType } from '@/apollo/types'
 import { useRouter } from 'vue-router'
-import { ROUTE_NAME, ADDRESS_ROUTE_QUERY } from '@core/router/routesNames'
+import { ROUTE_NAME } from '@core/router/routesNames'
 import AddressBalanceTotals from './components/AddressBalanceTotals.vue'
 import AppNoResult from '@/core/components/AppNoResult.vue'
 import { useDisplay } from 'vuetify/lib/framework.mjs'
@@ -347,14 +347,13 @@ const router = useRouter()
 
 const routeToToken = (id: string) => {
     state.activeToken = id
-    goToTokensBalancePage()
+    goToTokensContractPage()
 }
 
-const goToTokensBalancePage = async () => {
+const goToTokensContractPage = async () => {
     await router.push({
-        name: ROUTE_NAME.ADDRESS_TOKENS.NAME,
-        query: { t: ADDRESS_ROUTE_QUERY.Q_TOKENS[0] },
-        params: { scrollId: state.activeToken }
+        name: ROUTE_NAME.TOKEN.NAME,
+        params: { addressRef: state.activeToken }
     })
 }
 

diff --git a/v2/src/modules/address/components/TableRowTokenBalance.vue b/v2/src/modules/address/components/TableRowTokenBalance.vue
@@ -1,10 +1,5 @@
 <template>
-    <app-table-row
-        row-align="start"
-        row-align-lg="center"
-        :color="state.showMore ? 'lightGrey' : 'transparent'"
-        v-on="{ click: !props.isOverview && marketData ? openMoreInfo : null }"
-    >
+    <app-table-row row-align="start" row-align-lg="center" :color="state.showMore ? 'lightGrey' : 'transparent'" v-on="{ click: openMoreInfo }">
         <!--
                 Token on Overview:
                 XS: NONE