Merge branch 'master' into ab-consider-uncles-when-calculating-block-time

CHANGELOG.md

@@ -3,8 +3,10 @@
 ### Features
 - [#2109](https://github.com/poanetwork/blockscout/pull/2109) - use bigger updates instead of `Multi` transactions in BlocksTransactionsMismatch
 - [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache
+- [#2151](https://github.com/poanetwork/blockscout/pull/2151) - hide dropdown menu then other networks list is empty
 
 ### Fixes
+- [#2162](https://github.com/poanetwork/blockscout/pull/2162) - contract creation tile color changed
 - [#2144](https://github.com/poanetwork/blockscout/pull/2144) - 'page not found' images path fixed for goerli
 - [#2142](https://github.com/poanetwork/blockscout/pull/2142) - Removed posdao theme and logo, added 'page not found' image for goerli
 - [#2138](https://github.com/poanetwork/blockscout/pull/2138) - badge colors issue, api titles issue
@@ -23,6 +25,7 @@
 - [#2123](https://github.com/poanetwork/blockscout/pull/2123) - fix coins percentage view
 - [#2119](https://github.com/poanetwork/blockscout/pull/2119) - fix map logging
 - [#2130](https://github.com/poanetwork/blockscout/pull/2130) - fix navigation
+- [#2149](https://github.com/poanetwork/blockscout/pull/2149) - remove pending transaction count
 
 ### Chore
 - [#2127](https://github.com/poanetwork/blockscout/pull/2127) - use previouse chromedriver version

apps/block_scout_web/assets/css/components/_tile.scss

@@ -4,7 +4,7 @@ $tile-type-reorg-color: $purple !default;
 $tile-type-emission-reward-color: $lilac !default;
 $tile-type-transaction-color: $blue !default;
 $tile-type-contract-call-color: $green !default;
-$tile-type-contract-creation-color: $pink !default;
+$tile-type-contract-creation-color: $dark-purple !default;
 $tile-type-token-transfer-color: $orange !default;
 $tile-type-unique-token-color: $orange !default;
 $tile-type-unique-token-image-color: $orange !default;

apps/block_scout_web/assets/css/theme/_base_variables.scss

@@ -47,6 +47,7 @@ $yellow: #ffc107 !default;
 $green: #20b760 !default;
 $teal: #009097 !default;
 $cyan: #90e1d8 !default;
+$dark-purple: #923dc3;
 
 $colors: () !default;
 $colors: map-merge(

apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex

@@ -51,10 +51,7 @@ defmodule BlockScoutWeb.PendingTransactionController do
   end
 
   def index(conn, _params) do
-    render(conn, "index.html",
+    render(conn, "index.html", current_path: current_path(conn))
-      current_path: current_path(conn),
-      pending_transaction_count: Chain.pending_transaction_count()
-    )
   end
 
   defp get_pending_transactions_and_next_page(options) do

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

@@ -77,7 +77,7 @@
           </div>
         </li>
         <li class="nav-item dropdown nav-item-networks">
-          <a class="nav-link topnav-nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link topnav-nav-link <%= if dropdown_nets() == [], do: "disabled", else: "dropdown-toggle" %>" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="nav-link-icon">
               <%= render BlockScoutWeb.IconsView, "_active_icon.html" %>
             </span>

apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs

@@ -37,15 +37,6 @@ defmodule BlockScoutWeb.PendingTransactionControllerTest do
       refute hd(json_response(conn, 200)["items"]) =~ to_string(dropped_replaced.hash)
     end
 
-    test "returns a count of pending transactions", %{conn: conn} do
-      insert(:transaction)
-
-      conn = get(conn, pending_transaction_path(BlockScoutWeb.Endpoint, :index))
-
-      assert html_response(conn, 200)
-      assert 1 == conn.assigns.pending_transaction_count
-    end
-
     test "works when there are no transactions", %{conn: conn} do
       conn = get(conn, pending_transaction_path(conn, :index))