Skip to content

Commit

Permalink
Merge pull request #252 from rsksmart/develop
Browse files Browse the repository at this point in the history
Merge develop into master
  • Loading branch information
ivegabr authored Dec 18, 2024
2 parents ad78731 + 28a1ae0 commit 7e193df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
4 changes: 0 additions & 4 deletions src/components/DataSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<div class="messages" v-if="msgs">
<message v-for="(msg, key) in messages" :message="msg" :key="key" :data="data" :parentData="parentData"></message>
</div>
<!-- Transactions filters -->
<tx-filters class="frame" v-if="action === 'getTransactions'" :q="q" :module="module" :reqKey="reqKey"></tx-filters>
</template>

<!-- Component -->
Expand Down Expand Up @@ -39,7 +37,6 @@ import ToolTip from './ToolTip'
import DataTable from '@/components/General/DataTable'
import DataItem from './DataItem'
import Paginator from './Paginator'
import TxFilters from './TxFilters'
import Spinner from './Spinner'
import Message from './Message'
import ImplementationAddressField from './ImplementationAddressField.vue'
Expand All @@ -50,7 +47,6 @@ export default {
DataItem,
ToolTip,
Paginator,
TxFilters,
Spinner,
Message,
ImplementationAddressField
Expand Down
8 changes: 4 additions & 4 deletions src/config/entities/token.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ const Tokens = () => {
balance: {
type: 'tokenBalance'
},
created: {
field: 'createdByTx.timestamp',
type: 'timestamp',
hideIfEmpty: true
blockNumber: {
field: 'blockNumber',
type: 'block',
title: 'Updated at block'
}
}
}
Expand Down

0 comments on commit 7e193df

Please sign in to comment.