Merge branch 'master' into ab-cache-for-chart-data

CHANGELOG.md

@@ -6,6 +6,7 @@
 - [#2151](https://github.com/poanetwork/blockscout/pull/2151) - hide dropdown menu then other networks list is empty
 
 ### Fixes
+- [#2183](https://github.com/poanetwork/blockscout/pull/2183) - tile content aligning for mobile resolution fix, dai logo fix
 - [#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
@@ -28,6 +29,7 @@
 - [#2130](https://github.com/poanetwork/blockscout/pull/2130) - fix navigation
 - [#2147](https://github.com/poanetwork/blockscout/pull/2147) - add rsk format of checksum
 - [#2149](https://github.com/poanetwork/blockscout/pull/2149) - remove pending transaction count
+- [#2186](https://github.com/poanetwork/blockscout/pull/2186) - fix net version test
 
 ### Chore
 - [#2127](https://github.com/poanetwork/blockscout/pull/2127) - use previouse chromedriver version

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

@@ -104,6 +104,18 @@ $tile-body-a-color: #5959d8 !default;
   padding: 0 5px;
 }
 
+.tile-transaction-type-block {
+  .tile-status-label {
+    padding: 0;
+  }
+}
+
+.tile-bottom {
+  @media (max-width: 767px) {
+    justify-content: flex-start !important;
+  }
+}
+
 .tile-bottom-contents {
   background-color: #f6f7f9;
   font-size: 12px;

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

@@ -19,7 +19,7 @@
     <!-- Content -->
     <div class="col-md-7 col-lg-8 d-flex flex-column pr-2 pr-sm-2 pr-md-0">
       <%= render "_link.html", transaction_hash: @transaction.hash %>
-      <span class="text-nowrap">
+      <span>
         <%= @transaction |> BlockScoutWeb.AddressView.address_partial_selector(:from, assigns[:current_address]) |> BlockScoutWeb.RenderHelpers.render_partial() %>
         &rarr;
         <%= @transaction |> BlockScoutWeb.AddressView.address_partial_selector(:to, assigns[:current_address]) |> BlockScoutWeb.RenderHelpers.render_partial() %>
@@ -58,7 +58,7 @@
       <% end %>
     </div>
     <!-- Block info -->
-    <div class="col-md-3 col-lg-2 d-flex flex-row flex-md-column flex-nowrap justify-content-center text-md-right mt-3 mt-md-0">
+    <div class="col-md-3 col-lg-2 d-flex flex-row flex-md-column flex-nowrap justify-content-center text-md-right mt-3 mt-md-0 tile-bottom">
       <span class="mr-2 mr-md-0 order-1">
         <%= @transaction |> block_number() |> BlockScoutWeb.RenderHelpers.render_partial() %>
       </span>

apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs

@@ -888,13 +888,19 @@ defmodule EthereumJSONRPCTest do
 
   describe "fetch_net_version/1" do
     test "fetches net version", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      expected_version =
+        case Keyword.fetch!(json_rpc_named_arguments, :variant) do
+          EthereumJSONRPC.Parity -> 77
+          _variant -> 1
+        end
+
       if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
         expect(EthereumJSONRPC.Mox, :json_rpc, fn _json, _options ->
-          {:ok, "1"}
+          {:ok, "#{expected_version}"}
         end)
       end
 
-      assert {:ok, 1} = EthereumJSONRPC.fetch_net_version(json_rpc_named_arguments)
+      assert {:ok, ^expected_version} = EthereumJSONRPC.fetch_net_version(json_rpc_named_arguments)
     end
   end