diff --git a/lib/api/resources.ts b/lib/api/resources.ts index b99d04846f..2c9f4ca1ef 100644 --- a/lib/api/resources.ts +++ b/lib/api/resources.ts @@ -1098,7 +1098,7 @@ export const RESOURCES = { advanced_filter: { path: '/api/v2/advanced-filters', filterFields: [ - 'tx_types' as const, + 'transaction_types' as const, 'methods' as const, 'methods_names' as const /* frontend only */, 'age_from' as const, diff --git a/mocks/txs/tx.ts b/mocks/txs/tx.ts index 92bd43ed9b..c0dd894f38 100644 --- a/mocks/txs/tx.ts +++ b/mocks/txs/tx.ts @@ -60,7 +60,7 @@ export const base: Transaction = { }, token_transfers: [], token_transfers_overflow: false, - tx_burnt_fee: '461030000000000', + transaction_burnt_fee: '461030000000000', transaction_tag: null, transaction_types: [ 'contract_call', @@ -196,7 +196,7 @@ export const pending: Transaction = { revert_reason: null, status: null, timestamp: null, - tx_burnt_fee: null, + transaction_burnt_fee: null, transaction_tag: null, type: null, value: '0', diff --git a/stubs/tx.ts b/stubs/tx.ts index 370712b220..211e73a026 100644 --- a/stubs/tx.ts +++ b/stubs/tx.ts @@ -19,7 +19,7 @@ export const TX: Transaction = { type: 0, exchange_rate: '1828.71', to: ADDRESS_PARAMS, - tx_burnt_fee: null, + transaction_burnt_fee: null, max_fee_per_gas: null, result: 'success', hash: '0x2b824349b320cfa72f292ab26bf525adb00083ba9fa097141896c3c8c74567cc', diff --git a/types/api/advancedFilter.ts b/types/api/advancedFilter.ts index 474d299df3..b1f1f058ce 100644 --- a/types/api/advancedFilter.ts +++ b/types/api/advancedFilter.ts @@ -2,7 +2,7 @@ import type { AddressParam } from './addressParams'; import type { TokenInfo } from './token'; export type AdvancedFilterParams = { - tx_types?: Array; + transaction_types?: Array; methods?: Array; methods_names?: Array; /* frontend only */ age_from?: string; diff --git a/types/api/transaction.ts b/types/api/transaction.ts index 43c19110a2..a7817a126f 100644 --- a/types/api/transaction.ts +++ b/types/api/transaction.ts @@ -45,7 +45,7 @@ export type Transaction = { max_priority_fee_per_gas: string | null; priority_fee: string | null; base_fee_per_gas: string | null; - tx_burnt_fee: string | null; + transaction_burnt_fee: string | null; nonce: number; position: number | null; revert_reason: TransactionRevertReason | null; diff --git a/ui/advancedFilter/FilterByColumn.pw.tsx b/ui/advancedFilter/FilterByColumn.pw.tsx index 861119ae1e..541cee86c3 100644 --- a/ui/advancedFilter/FilterByColumn.pw.tsx +++ b/ui/advancedFilter/FilterByColumn.pw.tsx @@ -18,7 +18,7 @@ const columns: Array = [ ]; const filters = { - tx_types: [ 'coin_transfer' as const ], + transaction_types: [ 'coin_transfer' as const ], methods: [ '0xa9059cbb' ], age: '7d' as const, address_relation: 'or' as const, diff --git a/ui/advancedFilter/FilterByColumn.tsx b/ui/advancedFilter/FilterByColumn.tsx index 3c997c1c4a..0adb192654 100644 --- a/ui/advancedFilter/FilterByColumn.tsx +++ b/ui/advancedFilter/FilterByColumn.tsx @@ -29,7 +29,7 @@ const FilterByColumn = ({ column, filters, columnName, handleFilterChange, searc const commonProps = { columnName, handleFilterChange, isLoading }; switch (column) { case 'type': { - const value = filters.tx_types; + const value = filters.transaction_types; return ( ; diff --git a/ui/advancedFilter/lib.ts b/ui/advancedFilter/lib.ts index b65cc08f01..a430ccb60e 100644 --- a/ui/advancedFilter/lib.ts +++ b/ui/advancedFilter/lib.ts @@ -52,7 +52,7 @@ const filterParamNames: Record = { token_contract_symbols_to_exclude: '', token_contract_address_hashes_to_include: 'Asset', token_contract_symbols_to_include: '', - tx_types: 'Type', + transaction_types: 'Type', }; export function getFilterTags(filters: AdvancedFilterParams) { @@ -76,7 +76,7 @@ export function getFilterTags(filters: AdvancedFilterParams) { valueStr = getFilterValueWithNames(filtersToShow.methods, filtersToShow.methods_names); break; } - case 'tx_types': { + case 'transaction_types': { valueStr = castArray(value).map(i => ADVANCED_FILTER_TYPES.find(t => t.id === i)?.name).filter(Boolean).join(', '); break; } diff --git a/ui/block/useBlockTxsQuery.tsx b/ui/block/useBlockTxsQuery.tsx index 3acc27dfac..4ef3ee1b48 100644 --- a/ui/block/useBlockTxsQuery.tsx +++ b/ui/block/useBlockTxsQuery.tsx @@ -111,7 +111,7 @@ export default function useBlockTxsQuery({ heightOrHash, blockQuery, tab }: Para created_contract: null, result: '', priority_fee: null, - tx_burnt_fee: null, + transaction_burnt_fee: null, revert_reason: null, decoded_input: null, has_error_in_internal_transactions: null, diff --git a/ui/pages/AdvancedFilter.tsx b/ui/pages/AdvancedFilter.tsx index e37733babf..034a03c04f 100644 --- a/ui/pages/AdvancedFilter.tsx +++ b/ui/pages/AdvancedFilter.tsx @@ -54,7 +54,7 @@ const AdvancedFilter = () => { const [ filters, setFilters ] = React.useState(() => { const age = getFilterValueFromQuery(ADVANCED_FILTER_AGES, router.query.age); return { - tx_types: getFilterValuesFromQuery(ADVANCED_FILTER_TYPES, router.query.tx_types), + transaction_types: getFilterValuesFromQuery(ADVANCED_FILTER_TYPES, router.query.transaction_types), methods: getValuesArrayFromQuery(router.query.methods), methods_names: getValuesArrayFromQuery(router.query.methods_names), amount_from: getQueryParamString(router.query.amount_from), diff --git a/ui/tx/TxDetailsDegraded.tsx b/ui/tx/TxDetailsDegraded.tsx index 316f90dade..ea4c05c74a 100644 --- a/ui/tx/TxDetailsDegraded.tsx +++ b/ui/tx/TxDetailsDegraded.tsx @@ -103,7 +103,7 @@ const TxDetailsDegraded = ({ hash, txQuery }: Props) => { null, result: '', priority_fee: null, - tx_burnt_fee: null, + transaction_burnt_fee: null, revert_reason: null, decoded_input: null, has_error_in_internal_transactions: null, diff --git a/ui/tx/details/TxDetailsBurntFees.tsx b/ui/tx/details/TxDetailsBurntFees.tsx index 9054964c1a..2e8536c9f6 100644 --- a/ui/tx/details/TxDetailsBurntFees.tsx +++ b/ui/tx/details/TxDetailsBurntFees.tsx @@ -23,7 +23,7 @@ const TxDetailsBurntFees = ({ data, isLoading }: Props) => { return null; } - const value = BigNumber(data.tx_burnt_fee || 0).plus(BigNumber(data.blob_gas_used || 0).multipliedBy(BigNumber(data.blob_gas_price || 0))); + const value = BigNumber(data.transaction_burnt_fee || 0).plus(BigNumber(data.blob_gas_used || 0).multipliedBy(BigNumber(data.blob_gas_price || 0))); if (value.isEqualTo(ZERO)) { return null;