CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2806 from poanetwork/vb-blocks-fetching-main-page-fix

Browse Source 
Fix blocks fetching on the main page
pull/2826/head
Victor Baranov 5 years ago committed by GitHub
parent 2fb893d0d2 8cf2a7a677
commit de9bb5787f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 4
      apps/block_scout_web/assets/js/pages/chain.js
  3. 64
      apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex

1
CHANGELOG.md
Unescape View File

@ -5,6 +5,7 @@
- [#2449](https://github.com/poanetwork/blockscout/pull/2449) - add ability to send notification events through postgres notify - [#2449](https://github.com/poanetwork/blockscout/pull/2449) - add ability to send notification events through postgres notify
### Fixes ### Fixes
- [#2806](https://github.com/poanetwork/blockscout/pull/2806) - Fix blocks fetching on the main page
- [#2803](https://github.com/poanetwork/blockscout/pull/2803) - Fix block validator custom tooltip - [#2803](https://github.com/poanetwork/blockscout/pull/2803) - Fix block validator custom tooltip
### Chore ### Chore

4
apps/block_scout_web/assets/js/pages/chain.js
Unescape View File

@ -68,10 +68,10 @@ function baseReducer (state = initialState, action) {
return Object.assign({}, state, { blocksLoading: false }) return Object.assign({}, state, { blocksLoading: false })
} }
case 'BLOCKS_FETCHED': { case 'BLOCKS_FETCHED': {
return Object.assign({}, state, { blocks: [...action.msg.blocks] }) return Object.assign({}, state, { blocks: [...action.msg.blocks], blocksLoading: false })
} }
case 'BLOCKS_REQUEST_ERROR': { case 'BLOCKS_REQUEST_ERROR': {
return Object.assign({}, state, { blocksError: true }) return Object.assign({}, state, { blocksError: true, blocksLoading: false })
} }
case 'RECEIVED_NEW_EXCHANGE_RATE': { case 'RECEIVED_NEW_EXCHANGE_RATE': {
return Object.assign({}, state, { return Object.assign({}, state, {

64
apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
Unescape View File

@ -91,49 +91,49 @@
<%= gettext "Something went wrong, click to reload." %> <%= gettext "Something went wrong, click to reload." %>
</span> </span>
</button> </button>
<div hidden data-selector="loading-message" class="col-lg-3" > <div hidden data-selector="loading-message" class="col-lg-3" >
<div data-selector="chain-block"> <div data-selector="chain-block">
<div class="tile tile-type-block n-p d-flex flex-column"> <div class="tile tile-type-block n-p d-flex flex-column">
<a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a> <a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a>
<div class="tile-bottom-contents"> <div class="tile-bottom-contents">
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
</div>
</div>
</div> </div>
</div> </div>
</div> <div hidden data-selector="loading-message" class="col-lg-3" >
</div>
<div hidden data-selector="loading-message" class="col-lg-3" >
<div data-selector="chain-block"> <div data-selector="chain-block">
<div class="tile tile-type-block n-p d-flex flex-column"> <div class="tile tile-type-block n-p d-flex flex-column">
<a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a> <a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a>
<div class="tile-bottom-contents"> <div class="tile-bottom-contents">
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
</div>
</div>
</div> </div>
</div> </div>
</div> <div hidden data-selector="loading-message" class="col-lg-3" >
</div>
<div hidden data-selector="loading-message" class="col-lg-3" >
<div data-selector="chain-block"> <div data-selector="chain-block">
<div class="tile tile-type-block n-p d-flex flex-column"> <div class="tile tile-type-block n-p d-flex flex-column">
<a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a> <a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a>
<div class="tile-bottom-contents"> <div class="tile-bottom-contents">
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
</div>
</div>
</div> </div>
</div> </div>
</div> <div hidden data-selector="loading-message" class="col-lg-3" >
</div>
<div hidden data-selector="loading-message" class="col-lg-3" >
<div data-selector="chain-block"> <div data-selector="chain-block">
<div class="tile tile-type-block n-p d-flex flex-column"> <div class="tile tile-type-block n-p d-flex flex-column">
<a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a> <a class="tile-title"><span class="tile-loader tile-label-loader"></span> </a>
<div class="tile-bottom-contents"> <div class="tile-bottom-contents">
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
<div class="dark-block-loader"></div> <div class="dark-block-loader"></div>
</div>
</div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save