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

Merge pull request #3565 from poanetwork/vb-staking-unhealthy-dapp-message

Browse Source 
Staking dapp: unhealthy state message
pull/3567/head
Victor Baranov 4 years ago committed by GitHub
parent d4d1a59199 97a1559cb4
commit 7828960c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 19 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. 13
      apps/block_scout_web/assets/js/pages/stakes.js
  3. 4
      apps/block_scout_web/lib/block_scout_web/channels/stakes_channel.ex
  4. 18
      apps/block_scout_web/priv/gettext/default.pot
  5. 18
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

1
CHANGELOG.md
Unescape View File

@ -6,6 +6,7 @@
### Fixes ### Fixes
### Chore ### Chore
- [#3565](https://github.com/poanetwork/blockscout/pull/3565) - Staking dapp: unhealthy state alert message
## 3.5.1-beta ## 3.5.1-beta

13
apps/block_scout_web/assets/js/pages/stakes.js
Unescape View File

@ -48,7 +48,8 @@ export const initialState = {
tokenSymbol: '', tokenSymbol: '',
validatorSetApplyBlock: 0, validatorSetApplyBlock: 0,
validatorSetContract: null, validatorSetContract: null,
web3: null web3: null,
stakingErrorShown: false
} }
// 100 - id of xDai network, 101 - id of xDai test network // 100 - id of xDai network, 101 - id of xDai test network
@ -129,6 +130,11 @@ export function reducer (state = initialState, action) {
} }
return state return state
} }
case 'UNHEALTHY_APP_ERROR_SHOWN': {
return Object.assign({}, state, {
stakingErrorShown: true
})
}
default: default:
return state return state
} }
@ -214,6 +220,11 @@ if ($stakesPage.length) {
} }
}) })
if (msg.epoch_end_block === 0 && !state.stakingErrorShown) {
openErrorModal('Staking DApp is currently unavailable', 'Not all functions are active at the moment. Please try again later.')
store.dispatch({ type: 'UNHEALTHY_APP_ERROR_SHOWN' })
}
updating = false updating = false
} }

4
apps/block_scout_web/lib/block_scout_web/channels/stakes_channel.ex
Unescape View File

@ -72,6 +72,7 @@ defmodule BlockScoutWeb.StakesChannel do
%{ %{
block_number: BlockNumber.get_max(), block_number: BlockNumber.get_max(),
epoch_number: ContractState.get(:epoch_number, 0), epoch_number: ContractState.get(:epoch_number, 0),
epoch_end_block: ContractState.get(:epoch_end_block, 0),
staking_allowed: ContractState.get(:staking_allowed, false), staking_allowed: ContractState.get(:staking_allowed, false),
staking_token_defined: ContractState.get(:token, nil) != nil, staking_token_defined: ContractState.get(:token, nil) != nil,
validator_set_apply_block: ContractState.get(:validator_set_apply_block, 0) validator_set_apply_block: ContractState.get(:validator_set_apply_block, 0)
@ -423,11 +424,14 @@ defmodule BlockScoutWeb.StakesChannel do
assign(socket, :staking_update_data, data) assign(socket, :staking_update_data, data)
end end
epoch_end_block = if Map.has_key?(data, :epoch_end_block), do: data.epoch_end_block, else: 0
push(socket, "staking_update", %{ push(socket, "staking_update", %{
account: socket.assigns[:account], account: socket.assigns[:account],
block_number: data.block_number, block_number: data.block_number,
by_set_account: by_set_account, by_set_account: by_set_account,
epoch_number: data.epoch_number, epoch_number: data.epoch_number,
epoch_end_block: epoch_end_block,
staking_allowed: data.staking_allowed, staking_allowed: data.staking_allowed,
staking_token_defined: data.staking_token_defined, staking_token_defined: data.staking_token_defined,
validator_set_apply_block: data.validator_set_apply_block, validator_set_apply_block: data.validator_set_apply_block,

18
apps/block_scout_web/priv/gettext/default.pot
Unescape View File

@ -2211,7 +2211,7 @@ msgid "It's me!"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:698 #: lib/block_scout_web/channels/stakes_channel.ex:702
msgid "JSON RPC error" msgid "JSON RPC error"
msgstr "" msgstr ""
@ -2286,7 +2286,7 @@ msgid "Pool"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:754 #: lib/block_scout_web/channels/stakes_channel.ex:758
msgid "Pools searching is already in progress for this address" msgid "Pools searching is already in progress for this address"
msgstr "" msgstr ""
@ -2319,7 +2319,7 @@ msgid "Remove My Pool"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:795 #: lib/block_scout_web/channels/stakes_channel.ex:799
msgid "Reward calculating is already in progress for this address" msgid "Reward calculating is already in progress for this address"
msgstr "" msgstr ""
@ -2399,7 +2399,7 @@ msgid "Stakes Ratio"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:798 #: lib/block_scout_web/channels/stakes_channel.ex:802
msgid "Staking epochs are not specified or not in the allowed range" msgid "Staking epochs are not specified or not in the allowed range"
msgstr "" msgstr ""
@ -2494,19 +2494,19 @@ msgid "Unable to find any pools you could claim a reward from."
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:761 #: lib/block_scout_web/channels/stakes_channel.ex:765
#: lib/block_scout_web/channels/stakes_channel.ex:808 #: lib/block_scout_web/channels/stakes_channel.ex:812
msgid "Unknown address of Staking contract. Please, contact support" msgid "Unknown address of Staking contract. Please, contact support"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:801 #: lib/block_scout_web/channels/stakes_channel.ex:805
msgid "Unknown pool staking address. Please, contact support" msgid "Unknown pool staking address. Please, contact support"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:757 #: lib/block_scout_web/channels/stakes_channel.ex:761
#: lib/block_scout_web/channels/stakes_channel.ex:804 #: lib/block_scout_web/channels/stakes_channel.ex:808
msgid "Unknown staker address. Please, choose your account in MetaMask" msgid "Unknown staker address. Please, choose your account in MetaMask"
msgstr "" msgstr ""

18
apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
Unescape View File

@ -2211,7 +2211,7 @@ msgid "It's me!"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:698 #: lib/block_scout_web/channels/stakes_channel.ex:702
msgid "JSON RPC error" msgid "JSON RPC error"
msgstr "" msgstr ""
@ -2286,7 +2286,7 @@ msgid "Pool"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:754 #: lib/block_scout_web/channels/stakes_channel.ex:758
msgid "Pools searching is already in progress for this address" msgid "Pools searching is already in progress for this address"
msgstr "" msgstr ""
@ -2319,7 +2319,7 @@ msgid "Remove My Pool"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:795 #: lib/block_scout_web/channels/stakes_channel.ex:799
msgid "Reward calculating is already in progress for this address" msgid "Reward calculating is already in progress for this address"
msgstr "" msgstr ""
@ -2399,7 +2399,7 @@ msgid "Stakes Ratio"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:798 #: lib/block_scout_web/channels/stakes_channel.ex:802
msgid "Staking epochs are not specified or not in the allowed range" msgid "Staking epochs are not specified or not in the allowed range"
msgstr "" msgstr ""
@ -2494,19 +2494,19 @@ msgid "Unable to find any pools you could claim a reward from."
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:761 #: lib/block_scout_web/channels/stakes_channel.ex:765
#: lib/block_scout_web/channels/stakes_channel.ex:808 #: lib/block_scout_web/channels/stakes_channel.ex:812
msgid "Unknown address of Staking contract. Please, contact support" msgid "Unknown address of Staking contract. Please, contact support"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:801 #: lib/block_scout_web/channels/stakes_channel.ex:805
msgid "Unknown pool staking address. Please, contact support" msgid "Unknown pool staking address. Please, contact support"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/channels/stakes_channel.ex:757 #: lib/block_scout_web/channels/stakes_channel.ex:761
#: lib/block_scout_web/channels/stakes_channel.ex:804 #: lib/block_scout_web/channels/stakes_channel.ex:808
msgid "Unknown staker address. Please, choose your account in MetaMask" msgid "Unknown staker address. Please, choose your account in MetaMask"
msgstr "" msgstr ""

Write Preview
Loading…
Cancel
Save