diff --git a/src/app/core/services/transaction.service.ts b/src/app/core/services/transaction.service.ts
index c07d2d551..de139cf77 100644
--- a/src/app/core/services/transaction.service.ts
+++ b/src/app/core/services/transaction.service.ts
@@ -191,7 +191,11 @@ export class TransactionService extends CommonService {
const operationsDoc = `
query QueryEvmTxOfContract( $limit: Int = null, $address: String = null) {
${this.envDB} {
- evm_transaction(where: {evm_events: {address: {_eq: $address}}}, limit: $limit, order_by: {id: desc}) {
+ evm_transaction(
+ where: {_or: [{to: {_eq: $address}}, {evm_events: {address: {_eq: $address}}}]}
+ limit: $limit
+ order_by: {id: desc}
+ ) {
from
to
hash
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.ts b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.ts
index db2af1997..4b903cb1c 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.ts
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.ts
@@ -197,7 +197,7 @@ export class EvmTokenHoldersTabComponent implements OnInit {
let listAddr = [];
res?.view_count_holder_erc721.forEach((element) => {
if (element.owner) {
- listAddr.push(element.from);
+ listAddr.push(element.owner);
}
});
const listAddrUnique = _.uniq(listAddr);
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html
index 9fd8e3cf4..f2259c6cb 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html
@@ -25,7 +25,7 @@
Token ID:
+ [routerLink]="['/token/evm/erc721', item.contract_address, encodeData(item.token_id)]">
{{ item.token_id | ellipsis: 8 : 8 }}
{{ item.token_id | ellipsis: 5 : 5 }}
@@ -38,7 +38,7 @@