Merge pull request #4608 from blockscout/np-change-txs-button

Block Details page: Improved style of transactions button
pull/4612/head
Victor Baranov 3 years ago committed by GitHub
commit 09acd33fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 18
      apps/block_scout_web/assets/css/components/_btn_no_border.scss
  3. 14
      apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
  4. 72
      apps/block_scout_web/priv/gettext/default.pot
  5. 72
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

@ -1,6 +1,7 @@
## Current
### Features
- [#4608](https://github.com/blockscout/blockscout/pull/4608) - Block Details page: Improved style of transactions button
- [#4520](https://github.com/blockscout/blockscout/pull/4520) - Add support for EIP-1559
- [#4593](https://github.com/blockscout/blockscout/pull/4593) - Add status in `Position` pane for txs have no block
- [#4579](https://github.com/blockscout/blockscout/pull/4579) - Write contract page: Resize inputs; Improve multiplier selector

@ -10,3 +10,21 @@ $btn-no-border-color: $primary !default;
border-color: $btn-no-border-color;
}
}
.btn-no-border-transactions {
background-color: rgba($primary, 0.2) !important;
border-color: $btn-no-border-bg;
align-items: center;
border-radius: 2px;
display: flex;
font-size: 12px;
position: relative;
user-select: none;
text-align: center;
white-space: nowrap;
color: $primary !important;
&:hover {
border-color: #f5f6fa;
}
}

@ -74,12 +74,14 @@
<%= gettext("Transactions") %>
</dt>
<dd class="col-sm-9 col-lg-10">
<%= if @block_transaction_count == 1 do %>
<%= gettext "%{count} Transaction", count: @block_transaction_count %>
<% else %>
<%= gettext "%{count} Transactions", count: @block_transaction_count %>
<% end %>
<a href="#txs"><i class="fas fa-eye" style="font-size: 9.8px; position: absolute; bottom: 4.6px; margin-left: 5px;"></i></a></dd>
<a href="#txs" class="page-link bs-label large btn-no-border-transactions">
<%= if @block_transaction_count == 1 do %>
<%= gettext "%{count} Transaction", count: @block_transaction_count %>
<% else %>
<%= gettext "%{count} Transactions", count: @block_transaction_count %>
<% end %>
</a>
</dd>
</dl>
<!-- Miner/Validator -->
<%= if System.get_env("HIDE_BLOCK_MINER") !== "true" do %>

@ -57,12 +57,12 @@ msgid "%{block_type}s"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:78
#: lib/block_scout_web/templates/block/overview.html.eex:79
msgid "%{count} Transaction"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:80
#: lib/block_scout_web/templates/block/overview.html.eex:81
#: lib/block_scout_web/templates/chain/_block.html.eex:11
msgid "%{count} Transactions"
msgstr ""
@ -107,7 +107,7 @@ msgid "- We're indexing this chain right now. Some of the counts may be inaccura
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:187
#: lib/block_scout_web/templates/block/overview.html.eex:189
msgid "64-bit hash of value verifying proof-of-work (note: null for POA chains)."
msgstr ""
@ -123,7 +123,7 @@ msgid "<p>To become a candidate, your staking address must be funded with %{toke
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:89
#: lib/block_scout_web/templates/block/overview.html.eex:91
msgid "A block producer who successfully included the block onto the blockchain."
msgstr ""
@ -260,7 +260,7 @@ msgid "Amount of %{symbol} placed by an address."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:228
#: lib/block_scout_web/templates/block/overview.html.eex:230
msgid "Amount of distributed reward. Miners receive a static block reward + Tx fees + uncle fees."
msgstr ""
@ -328,7 +328,7 @@ msgid "Banned until block #%{banned_until} (%{estimated_unban_day})"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:199
#: lib/block_scout_web/templates/block/overview.html.eex:201
msgid "Base Fee per Gas"
msgstr ""
@ -391,7 +391,7 @@ msgid "Block Pending"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:150
#: lib/block_scout_web/templates/block/overview.html.eex:152
msgid "Block difficulty for miner, used to calibrate block generation time (Note: constant in POA based networks)."
msgstr ""
@ -461,7 +461,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:64
#: lib/block_scout_web/templates/block/overview.html.eex:208
#: lib/block_scout_web/templates/block/overview.html.eex:210
msgid "Burnt Fees"
msgstr ""
@ -725,8 +725,8 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address/overview.html.eex:37
#: lib/block_scout_web/templates/address/overview.html.eex:38
#: lib/block_scout_web/templates/block/overview.html.eex:96
#: lib/block_scout_web/templates/block/overview.html.eex:97
#: lib/block_scout_web/templates/block/overview.html.eex:98
#: lib/block_scout_web/templates/block/overview.html.eex:99
#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:40
#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:41
msgid "Copy Address"
@ -759,8 +759,8 @@ msgid "Copy From Address"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:121
#: lib/block_scout_web/templates/block/overview.html.eex:122
#: lib/block_scout_web/templates/block/overview.html.eex:123
#: lib/block_scout_web/templates/block/overview.html.eex:124
msgid "Copy Hash"
msgstr ""
@ -770,8 +770,8 @@ msgid "Copy Metadata"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:141
#: lib/block_scout_web/templates/block/overview.html.eex:142
#: lib/block_scout_web/templates/block/overview.html.eex:143
#: lib/block_scout_web/templates/block/overview.html.eex:144
msgid "Copy Parent Hash"
msgstr ""
@ -983,7 +983,7 @@ msgid "Details"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:151
#: lib/block_scout_web/templates/block/overview.html.eex:153
msgid "Difficulty"
msgstr ""
@ -1180,7 +1180,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:67
#: lib/block_scout_web/templates/block/overview.html.eex:179
#: lib/block_scout_web/templates/block/overview.html.eex:181
#: lib/block_scout_web/templates/transaction/overview.html.eex:340
msgid "Gas Limit"
msgstr ""
@ -1192,7 +1192,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:72
#: lib/block_scout_web/templates/block/overview.html.eex:170
#: lib/block_scout_web/templates/block/overview.html.eex:172
msgid "Gas Used"
msgstr ""
@ -1224,7 +1224,7 @@ msgid "Gwei"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:115
#: lib/block_scout_web/templates/block/overview.html.eex:117
msgid "Hash"
msgstr ""
@ -1281,7 +1281,7 @@ msgid "Index position of Transaction in the block."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:241
#: lib/block_scout_web/templates/block/overview.html.eex:243
msgid "Index position(s) of referenced stale blocks."
msgstr ""
@ -1521,7 +1521,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:41
#: lib/block_scout_web/templates/block/overview.html.eex:90
#: lib/block_scout_web/templates/block/overview.html.eex:92
#: lib/block_scout_web/templates/chain/_block.html.eex:16
msgid "Miner"
msgstr ""
@ -1550,7 +1550,7 @@ msgid "Minimum Stake:"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:198
#: lib/block_scout_web/templates/block/overview.html.eex:200
msgid "Minimum fee required per unit of gas. Fee adjusts based on network congestion."
msgstr ""
@ -1641,7 +1641,7 @@ msgid "No Information"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:188
#: lib/block_scout_web/templates/block/overview.html.eex:190
#: lib/block_scout_web/templates/transaction/overview.html.eex:399
msgid "Nonce"
msgstr ""
@ -1703,7 +1703,7 @@ msgid "Parameters"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:131
#: lib/block_scout_web/templates/block/overview.html.eex:133
msgid "Parent Hash"
msgstr ""
@ -1763,7 +1763,7 @@ msgid "Position"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:246
#: lib/block_scout_web/templates/block/overview.html.eex:248
msgid "Position %{index}"
msgstr ""
@ -1796,7 +1796,7 @@ msgid "Price per unit of gas specified by the sender. Higher gas prices can prio
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:217
#: lib/block_scout_web/templates/block/overview.html.eex:219
#: lib/block_scout_web/templates/transaction/overview.html.eex:369
msgid "Priority Fee / Tip"
msgstr ""
@ -2013,12 +2013,12 @@ msgid "Show only those I have stake in"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:106
#: lib/block_scout_web/templates/block/overview.html.eex:108
msgid "Size"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:105
#: lib/block_scout_web/templates/block/overview.html.eex:107
msgid "Size of the block in bytes."
msgstr ""
@ -2198,7 +2198,7 @@ msgid "The Number of Delegators in the Pool"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:114
#: lib/block_scout_web/templates/block/overview.html.eex:116
msgid "The SHA256 hash of the block."
msgstr ""
@ -2233,7 +2233,7 @@ msgid "The first amount is the validator’s own stake, the second is the total
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:130
#: lib/block_scout_web/templates/block/overview.html.eex:132
msgid "The hash of the block from which this block was generated."
msgstr ""
@ -2285,7 +2285,7 @@ msgid "The table refreshed <span></span> block(s) ago."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:169
#: lib/block_scout_web/templates/block/overview.html.eex:171
msgid "The total gas amount used in the block and its percentage of gas filled in the block."
msgstr ""
@ -2586,7 +2586,7 @@ msgid "Topics"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:161
#: lib/block_scout_web/templates/block/overview.html.eex:163
msgid "Total Difficulty"
msgstr ""
@ -2601,12 +2601,12 @@ msgid "Total blocks"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:160
#: lib/block_scout_web/templates/block/overview.html.eex:162
msgid "Total difficulty of the chain until this block."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:178
#: lib/block_scout_web/templates/block/overview.html.eex:180
msgid "Total gas limit provided by all transactions in the block."
msgstr ""
@ -2749,7 +2749,7 @@ msgid "Uncle Reward"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:242
#: lib/block_scout_web/templates/block/overview.html.eex:244
#: lib/block_scout_web/templates/layout/_topnav.html.eex:29
msgid "Uncles"
msgstr ""
@ -2802,7 +2802,7 @@ msgid "User-defined tip sent to validator for transaction priority/inclusion."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:216
#: lib/block_scout_web/templates/block/overview.html.eex:218
msgid "User-defined tips sent to validator for transaction priority/inclusion."
msgstr ""
@ -3188,6 +3188,6 @@ msgid "validator"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:207
#: lib/block_scout_web/templates/block/overview.html.eex:209
msgid "xDai burned from transactions included in the block (Base fee (per unit of gas) * Gas Used)."
msgstr ""

@ -57,12 +57,12 @@ msgid "%{block_type}s"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:78
#: lib/block_scout_web/templates/block/overview.html.eex:79
msgid "%{count} Transaction"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:80
#: lib/block_scout_web/templates/block/overview.html.eex:81
#: lib/block_scout_web/templates/chain/_block.html.eex:11
msgid "%{count} Transactions"
msgstr ""
@ -107,7 +107,7 @@ msgid "- We're indexing this chain right now. Some of the counts may be inaccura
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:187
#: lib/block_scout_web/templates/block/overview.html.eex:189
msgid "64-bit hash of value verifying proof-of-work (note: null for POA chains)."
msgstr ""
@ -123,7 +123,7 @@ msgid "<p>To become a candidate, your staking address must be funded with %{toke
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:89
#: lib/block_scout_web/templates/block/overview.html.eex:91
msgid "A block producer who successfully included the block onto the blockchain."
msgstr ""
@ -260,7 +260,7 @@ msgid "Amount of %{symbol} placed by an address."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:228
#: lib/block_scout_web/templates/block/overview.html.eex:230
msgid "Amount of distributed reward. Miners receive a static block reward + Tx fees + uncle fees."
msgstr ""
@ -328,7 +328,7 @@ msgid "Banned until block #%{banned_until} (%{estimated_unban_day})"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:199
#: lib/block_scout_web/templates/block/overview.html.eex:201
msgid "Base Fee per Gas"
msgstr ""
@ -391,7 +391,7 @@ msgid "Block Pending"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:150
#: lib/block_scout_web/templates/block/overview.html.eex:152
msgid "Block difficulty for miner, used to calibrate block generation time (Note: constant in POA based networks)."
msgstr ""
@ -461,7 +461,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:64
#: lib/block_scout_web/templates/block/overview.html.eex:208
#: lib/block_scout_web/templates/block/overview.html.eex:210
msgid "Burnt Fees"
msgstr ""
@ -725,8 +725,8 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address/overview.html.eex:37
#: lib/block_scout_web/templates/address/overview.html.eex:38
#: lib/block_scout_web/templates/block/overview.html.eex:96
#: lib/block_scout_web/templates/block/overview.html.eex:97
#: lib/block_scout_web/templates/block/overview.html.eex:98
#: lib/block_scout_web/templates/block/overview.html.eex:99
#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:40
#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:41
msgid "Copy Address"
@ -759,8 +759,8 @@ msgid "Copy From Address"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:121
#: lib/block_scout_web/templates/block/overview.html.eex:122
#: lib/block_scout_web/templates/block/overview.html.eex:123
#: lib/block_scout_web/templates/block/overview.html.eex:124
msgid "Copy Hash"
msgstr ""
@ -770,8 +770,8 @@ msgid "Copy Metadata"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:141
#: lib/block_scout_web/templates/block/overview.html.eex:142
#: lib/block_scout_web/templates/block/overview.html.eex:143
#: lib/block_scout_web/templates/block/overview.html.eex:144
msgid "Copy Parent Hash"
msgstr ""
@ -983,7 +983,7 @@ msgid "Details"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:151
#: lib/block_scout_web/templates/block/overview.html.eex:153
msgid "Difficulty"
msgstr ""
@ -1180,7 +1180,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:67
#: lib/block_scout_web/templates/block/overview.html.eex:179
#: lib/block_scout_web/templates/block/overview.html.eex:181
#: lib/block_scout_web/templates/transaction/overview.html.eex:340
msgid "Gas Limit"
msgstr ""
@ -1192,7 +1192,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:72
#: lib/block_scout_web/templates/block/overview.html.eex:170
#: lib/block_scout_web/templates/block/overview.html.eex:172
msgid "Gas Used"
msgstr ""
@ -1224,7 +1224,7 @@ msgid "Gwei"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:115
#: lib/block_scout_web/templates/block/overview.html.eex:117
msgid "Hash"
msgstr ""
@ -1281,7 +1281,7 @@ msgid "Index position of Transaction in the block."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:241
#: lib/block_scout_web/templates/block/overview.html.eex:243
msgid "Index position(s) of referenced stale blocks."
msgstr ""
@ -1521,7 +1521,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:41
#: lib/block_scout_web/templates/block/overview.html.eex:90
#: lib/block_scout_web/templates/block/overview.html.eex:92
#: lib/block_scout_web/templates/chain/_block.html.eex:16
msgid "Miner"
msgstr ""
@ -1550,7 +1550,7 @@ msgid "Minimum Stake:"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:198
#: lib/block_scout_web/templates/block/overview.html.eex:200
msgid "Minimum fee required per unit of gas. Fee adjusts based on network congestion."
msgstr ""
@ -1641,7 +1641,7 @@ msgid "No Information"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:188
#: lib/block_scout_web/templates/block/overview.html.eex:190
#: lib/block_scout_web/templates/transaction/overview.html.eex:399
msgid "Nonce"
msgstr ""
@ -1703,7 +1703,7 @@ msgid "Parameters"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:131
#: lib/block_scout_web/templates/block/overview.html.eex:133
msgid "Parent Hash"
msgstr ""
@ -1763,7 +1763,7 @@ msgid "Position"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:246
#: lib/block_scout_web/templates/block/overview.html.eex:248
msgid "Position %{index}"
msgstr ""
@ -1796,7 +1796,7 @@ msgid "Price per unit of gas specified by the sender. Higher gas prices can prio
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:217
#: lib/block_scout_web/templates/block/overview.html.eex:219
#: lib/block_scout_web/templates/transaction/overview.html.eex:369
msgid "Priority Fee / Tip"
msgstr ""
@ -2013,12 +2013,12 @@ msgid "Show only those I have stake in"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:106
#: lib/block_scout_web/templates/block/overview.html.eex:108
msgid "Size"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:105
#: lib/block_scout_web/templates/block/overview.html.eex:107
msgid "Size of the block in bytes."
msgstr ""
@ -2198,7 +2198,7 @@ msgid "The Number of Delegators in the Pool"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:114
#: lib/block_scout_web/templates/block/overview.html.eex:116
msgid "The SHA256 hash of the block."
msgstr ""
@ -2233,7 +2233,7 @@ msgid "The first amount is the validator’s own stake, the second is the total
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:130
#: lib/block_scout_web/templates/block/overview.html.eex:132
msgid "The hash of the block from which this block was generated."
msgstr ""
@ -2285,7 +2285,7 @@ msgid "The table refreshed <span></span> block(s) ago."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:169
#: lib/block_scout_web/templates/block/overview.html.eex:171
msgid "The total gas amount used in the block and its percentage of gas filled in the block."
msgstr ""
@ -2586,7 +2586,7 @@ msgid "Topics"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:161
#: lib/block_scout_web/templates/block/overview.html.eex:163
msgid "Total Difficulty"
msgstr ""
@ -2601,12 +2601,12 @@ msgid "Total blocks"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:160
#: lib/block_scout_web/templates/block/overview.html.eex:162
msgid "Total difficulty of the chain until this block."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:178
#: lib/block_scout_web/templates/block/overview.html.eex:180
msgid "Total gas limit provided by all transactions in the block."
msgstr ""
@ -2749,7 +2749,7 @@ msgid "Uncle Reward"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:242
#: lib/block_scout_web/templates/block/overview.html.eex:244
#: lib/block_scout_web/templates/layout/_topnav.html.eex:29
msgid "Uncles"
msgstr ""
@ -2802,7 +2802,7 @@ msgid "User-defined tip sent to validator for transaction priority/inclusion."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:216
#: lib/block_scout_web/templates/block/overview.html.eex:218
msgid "User-defined tips sent to validator for transaction priority/inclusion."
msgstr ""
@ -3188,6 +3188,6 @@ msgid "validator"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:207
#: lib/block_scout_web/templates/block/overview.html.eex:209
msgid "xDai burned from transactions included in the block (Base fee (per unit of gas) * Gas Used)."
msgstr ""

Loading…
Cancel
Save