Merge branch 'master' into ab-fix-exchange-rates

CHANGELOG.md

@@ -11,6 +11,9 @@
 
 ### Fixes
 - [#2550](https://github.com/poanetwork/blockscout/pull/2550) - correctly encode decimal values for frontend
+- [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip
+- [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox
+- [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero on the transaction overview page
 - [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search
 - [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles
 - [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page
@@ -22,6 +25,7 @@
 - [#2515](https://github.com/poanetwork/blockscout/pull/2515) - do not aggregate NFT token transfers
 - [#2514](https://github.com/poanetwork/blockscout/pull/2514) - Isolating of staking dapp css && extracting of non-critical css
 - [#2512](https://github.com/poanetwork/blockscout/pull/2512) - alert link fix
+- [#2509](https://github.com/poanetwork/blockscout/pull/2509) - value-ticker gaps fix
 - [#2508](https://github.com/poanetwork/blockscout/pull/2508) - logs view columns fix
 - [#2506](https://github.com/poanetwork/blockscout/pull/2506) - fix two active tab in the top menu
 - [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance

apps/block_scout_web/assets/css/app.scss

@@ -99,9 +99,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "components/check";
 @import "components/stakes_variables";
 @import "components/stakes_table";
-@import "components/i_tooltip";
-@import "components/check_tooltip";
-@import "components/tooltip";
 @import "components/form";
 @import "components/btn_copy";
 @import "components/btn_qr";

apps/block_scout_web/assets/css/non-critical.scss

@@ -7,6 +7,10 @@
 @import "node_modules/bootstrap/scss/modal";
 @import "node_modules/bootstrap/scss/tooltip";
 
+@import "components/i_tooltip";
+@import "components/check_tooltip";
+@import "components/tooltip";
+
 @import "components/qr-code";
 @import "components/modal_variables";
 @import "components/modal";

apps/block_scout_web/assets/js/app.js

@@ -20,6 +20,9 @@ import 'bootstrap'
 
 import './locale'
 
+// support of preload in Firefox
+import '../node_modules/fg-loadcss/dist/cssrelpreload.min'
+
 import './pages/address'
 import './pages/address/coin_balances'
 import './pages/address/transactions'

apps/block_scout_web/assets/package-lock.json

@@ -4121,6 +4121,11 @@
         "bser": "^2.0.0"
       }
     },
+    "fg-loadcss": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fg-loadcss/-/fg-loadcss-2.1.0.tgz",
+      "integrity": "sha512-HpvR2uRoKvrYAEwimw+k4Fr2NVHYPfld5Lc/f9uy3mKeUTXhS5urL24XA2rqyq5b2i410EXCLir4Uhsb8J1QaQ=="
+    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",

apps/block_scout_web/assets/package.json

@@ -25,6 +25,7 @@
     "bootstrap": "^4.1.3",
     "chart.js": "^2.7.2",
     "clipboard": "^2.0.1",
+    "fg-loadcss": "^2.1.0",
     "highlight.js": "^9.13.1",
     "highlightjs-solidity": "^1.0.6",
     "humps": "^2.0.1",

apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex

@@ -104,8 +104,7 @@
           <%= if contract?(@address) do %>
             <span class="text-muted" data-test="address_contract_creator">
               <%= if from_address_hash do %>
-                <%= gettext "Created by" %>
+                <%= gettext "Created by" %> <%= link(
-                <%= link(
                   trimmed_hash(from_address_hash(@address)),
                   to: address_path(@conn, :show, from_address_hash(@address))
                 ) %>

apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex

@@ -20,8 +20,7 @@
       </div>
       <%= if BlockScoutWeb.BlockView.show_reward?(@block.rewards) do %>
         <div class="text-truncate">
-          <%= gettext "Reward" %>
+          <%= gettext "Reward" %> <%= BlockScoutWeb.BlockView.combined_rewards_value(@block) %>
-          <%= BlockScoutWeb.BlockView.combined_rewards_value(@block) %>
         </div>
       <% end %>
     </div>

apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex

@@ -17,8 +17,7 @@
       </span>
       <span class="d-flex flex-md-row flex-column mt-3 mt-md-0">
         <span class="tile-title">
-          <%= BlockScoutWeb.TransactionView.value(@internal_transaction, include_label: false) %>
+          <%= BlockScoutWeb.TransactionView.value(@internal_transaction, include_label: false) %> <%= gettext "Ether" %>
-          <%= gettext "Ether" %>
         </span>
       </span>
     </div>

apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="<%= static_path(@conn, "/css/app.css") %>">
-    <link rel="preload" href="/css/non-critical.css" as="style" onload="this.rel='stylesheet'">
+    <link rel="preload" href="/css/non-critical.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
     <noscript><link rel="stylesheet" href="/css/non-critical.css"></noscript>
 
     <link rel="apple-touch-icon" sizes="180x180" href="<%= static_path(@conn, "/apple-touch-icon.png") %>">

apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex

@@ -79,8 +79,7 @@
                   <%= format_according_to_decimals(@token.total_supply, @token.decimals) %>
                 <% else %>
                   <%= format_integer_to_currency(@token.total_supply) %>
-                <% end %>
+                <% end %> <%= @token.symbol %>
-                <%= @token.symbol %>
               </h3>
               <%= if @token.usd_value do %>
                 <div class="text-uppercase">

apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex

@@ -28,8 +28,7 @@
       </span>
       <span class="d-flex flex-md-row flex-column mt-3 mt-md-0">
         <span class="tile-title">
-          <%= token_transfer_amount(@transfer) %>
+          <%= token_transfer_amount(@transfer) %> <%= @transfer.token.symbol %>
-          <%= @transfer.token.symbol %>
         </span>
       </span>
     </div>

apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex

@@ -26,12 +26,10 @@
       </span>
       <span class="d-flex flex-md-row flex-column mt-3 mt-md-0">
         <span class="tile-title">
-          <%= value(@transaction, include_label: false) %>&nbsp;
+          <%= value(@transaction, include_label: false) %> <%= gettext "Ether" %>
-          <%= gettext "Ether" %>
         </span>
         <span class="ml-0 ml-md-1 text-nowrap">
-          <%= formatted_fee(@transaction, denomination: :ether, include_label: false) %> 
+          <%= formatted_fee(@transaction, denomination: :ether, include_label: false) %> <%= gettext "TX Fee" %>
-          <%= gettext "TX Fee" %>
         </span>
       </span>
 

apps/block_scout_web/lib/block_scout_web/templates/transaction/_token_transfer.html.eex

@@ -20,7 +20,6 @@
     </span>
   </span>
   <span class="col-xs-12 col-lg-4 ml-3 ml-sm-0 text-truncate">
-  <%= token_transfer_amount(@token_transfer) %>
+  <%= token_transfer_amount(@token_transfer) %> <%= link(token_symbol(@token_transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, @token_transfer.token.contract_address_hash)) %>
-  <%= link(token_symbol(@token_transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, @token_transfer.token.contract_address_hash)) %>
   </span>
 </div>

apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex

@@ -175,7 +175,7 @@
         <!-- Value -->
         <div class="card card-background-1 flex-grow-1">
           <div class="card-body card-body-flex-column-space-between">
-            <%= if @transaction.value.value != 0 do %>
+            <%= if @transaction.value && @transaction.value.value != Decimal.new(0) do %>
               <h2 class="card-title balance-card-title"><%= gettext "Ether" %> <%= gettext "Value" %></h2>
               <div class="text-right">
                 <h3 class="address-balance-text">
@@ -192,13 +192,11 @@
             <h2 class="card-title balance-card-title"><%= token_type_name(type)%><%= gettext " Token Transfer" %></h2>
             <div class="text-right">
             <%= for transfer  <- aggregate_token_transfers(transaction_with_transfers.token_transfers) do %>
-
               <h3 class="address-balance-text">
                   <%= token_transfer_amount(transfer) %>
                   <%= " "%>
                   <%= link(token_symbol(transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, transfer.token.contract_address_hash)) %>
               </h3>
-
             <% end %>
             </div>
           </div>
@@ -236,8 +234,7 @@
             </h3>
             <!-- Gas Limit -->
             <p class="address-current-balance">
-              <%= gettext "Limit" %>
+              <%= gettext "Limit" %> <%= format_gas_limit(@transaction.gas) %>
-              <%= format_gas_limit(@transaction.gas) %>
             </p>
           </div>
         </div>

apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex

@@ -13,8 +13,7 @@
       </span>
 
       <span class="tile-title text-truncate">
-        <%= token_transfer_amount(@token_transfer) %>
+        <%= token_transfer_amount(@token_transfer) %> <%= link(token_symbol(@token_transfer.token), to: token_path(@conn, :show, @token_transfer.token.contract_address_hash)) %>
-        <%= link(token_symbol(@token_transfer.token), to: token_path(@conn, :show, @token_transfer.token.contract_address_hash)) %>
       </span>
     </div>
   </div>

apps/block_scout_web/priv/gettext/default.pot

@@ -136,8 +136,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/block/_link.html.eex:2
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:29
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:28
-#: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:40
+#: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:39
 msgid "Block #%{number}"
 msgstr ""
 
@@ -211,10 +211,10 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:37
-#: lib/block_scout_web/templates/address/overview.html.eex:146
+#: lib/block_scout_web/templates/address/overview.html.eex:145
-#: lib/block_scout_web/templates/address/overview.html.eex:154
+#: lib/block_scout_web/templates/address/overview.html.eex:153
-#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:107
+#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:106
-#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:115
+#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:114
 msgid "Close"
 msgstr ""
 
@@ -375,12 +375,12 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_balance_card.html.eex:15
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:21
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20
 #: lib/block_scout_web/templates/layout/app.html.eex:58
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:30
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:29
 #: lib/block_scout_web/templates/transaction/overview.html.eex:179
-#: lib/block_scout_web/templates/transaction/overview.html.eex:211
+#: lib/block_scout_web/templates/transaction/overview.html.eex:209
 #: lib/block_scout_web/views/wei_helpers.ex:78
 msgid "Ether"
 msgstr ""
@@ -451,8 +451,8 @@ msgid "Hash"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:38
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:74
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:72
 msgid "IN"
 msgstr ""
 
@@ -494,7 +494,7 @@ msgid "Less than"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:239
+#: lib/block_scout_web/templates/transaction/overview.html.eex:237
 msgid "Limit"
 msgstr ""
 
@@ -578,8 +578,8 @@ msgid "Nonce"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:36
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:70
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:68
 msgid "OUT"
 msgstr ""
 
@@ -635,9 +635,9 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/overview.html.eex:33
-#: lib/block_scout_web/templates/address/overview.html.eex:145
+#: lib/block_scout_web/templates/address/overview.html.eex:144
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:36
-#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:106
+#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:105
 msgid "QR Code"
 msgstr ""
 
@@ -709,7 +709,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:21
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:34
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:32
 #: lib/block_scout_web/templates/transaction/overview.html.eex:84
 msgid "TX Fee"
 msgstr ""
@@ -915,7 +915,7 @@ msgid "Unique Token"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:233
+#: lib/block_scout_web/templates/transaction/overview.html.eex:231
 msgid "Used"
 msgstr ""
 
@@ -936,7 +936,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/overview.html.eex:179
-#: lib/block_scout_web/templates/transaction/overview.html.eex:211
+#: lib/block_scout_web/templates/transaction/overview.html.eex:209
 msgid "Value"
 msgstr ""
 
@@ -957,12 +957,12 @@ msgid "View Contract"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:53
 msgid "View Less Transfers"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:54
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:52
 msgid "View More Transfers"
 msgstr ""
 
@@ -1002,7 +1002,7 @@ msgid "Yes"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address/overview.html.eex:113
+#: lib/block_scout_web/templates/address/overview.html.eex:112
 msgid "at"
 msgstr ""
 
@@ -1449,7 +1449,7 @@ msgid "Incoming Transactions"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address/overview.html.eex:121
+#: lib/block_scout_web/templates/address/overview.html.eex:120
 msgid "Error: Could not determine contract creator."
 msgstr ""
 
@@ -1512,7 +1512,7 @@ msgid "View All Transactions"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:229
+#: lib/block_scout_web/templates/transaction/overview.html.eex:227
 msgid "Gas"
 msgstr ""