Merge branch 'master' into ab-get-rid-fo-telemetry-warnings

CHANGELOG.md

@@ -6,6 +6,8 @@
 - [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth
 
 ### Fixes
+- [#2512](https://github.com/poanetwork/blockscout/pull/2512) - alert link fix
+- [#2508](https://github.com/poanetwork/blockscout/pull/2508) - logs view columns fix
 - [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance
 - [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout
 - [#2463](https://github.com/poanetwork/blockscout/pull/2463) - dark theme fixes
@@ -16,6 +18,7 @@
 
 ### Chore
 - [#2507](https://github.com/poanetwork/blockscout/pull/2507) - update minor version of ecto, ex_machina, phoenix_live_reload
+- [#2516](https://github.com/poanetwork/blockscout/pull/2516) - update absinthe plug from fork
 - [#2473](https://github.com/poanetwork/blockscout/pull/2473) - get rid of cldr warnings
 - [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0
 - [#2492](https://github.com/poanetwork/blockscout/pull/2492) - hide decoded row if event is not decoded

PULL_REQUEST_TEMPLATE.md

@@ -36,3 +36,4 @@
   - [ ] If I fixed a bug, I added a regression test to prevent the bug from silently reappearing again.
   - [ ] I checked whether I should update the docs and did so if necessary
   - [ ] If I added/changed/removed ENV var, I should update the list of env vars in https://github.com/poanetwork/blockscout/blob/master/docs/env-variables.md to reflect changes in the table here https://poanetwork.github.io/blockscout/#/env-variables?id=blockscout-env-variables
+  - [ ] If I add new indices into DB, I checked, that they don't redundant with PGHero or other tools

apps/block_scout_web/assets/css/theme/_dark-theme.scss

@@ -680,4 +680,9 @@ $labels-dark: #8a8dba; // header nav, labels
 		color: #3f436b !important;
 		border-right-color: #3f436b !important;
 	}
+
+	// alert link
+	.alert-link {
+		color: $dark-secondary;
+	}
 }

apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex

@@ -1,7 +1,7 @@
 <div data-test="transaction_log" class="tile tile-muted">
   <dl class="row">
-    <dt class="col-md-1"> <%= gettext "Address" %> </dt>
-    <dd class="col-md-11">
+    <dt class="col-lg-2"> <%= gettext "Address" %> </dt>
+    <dd class="col-lg-10">
       <h3 class="">
         <%= link(
             @log.address,
@@ -13,8 +13,8 @@
     </dd>
       <%= case decode(@log, @transaction) do %>
         <% {:error, :contract_not_verified} -> %>
-          <dt class="col-md-1"><%= gettext "Decoded" %></dt>
-          <dd class="col-md-11">
+          <dt class="col-lg-2"><%= gettext "Decoded" %></dt>
+          <dd class="col-lg-10">
           <div class="alert alert-info">
             <%= gettext "To see decoded input data, the contract must be verified." %>
             <%= case @transaction do %>
@@ -25,16 +25,16 @@
             <% end %>
           </div>
         <% {:error, :could_not_decode} -> %>
-          <dt class="col-md-1"><%= gettext "Decoded" %></dt>
-          <dd class="col-md-11">
+          <dt class="col-lg-2"><%= gettext "Decoded" %></dt>
+          <dd class="col-lg-10">
           <div class="alert alert-danger">
             <%= gettext "Failed to decode log data." %>
           </div>
         <% {:error, :no_matching_function} -> %>
           <%= nil %>
         <% {:ok, method_id, text, mapping} -> %>
-          <dt class="col-md-1"><%= gettext "Decoded" %></dt>
-          <dd class="col-md-11">
+          <dt class="col-lg-2"><%= gettext "Decoded" %></dt>
+          <dd class="col-lg-10">
           <table summary="Transaction Info" class="table thead-light table-bordered transaction-input-table">
             <tr>
               <td>Method Id</td>
@@ -88,8 +88,8 @@
           <%= nil %>
       <% end %>
 
-    <dt class="col-md-1"><%= gettext "Topics" %></dt>
-    <dd class="col-md-11">
+    <dt class="col-lg-2"><%= gettext "Topics" %></dt>
+    <dd class="col-lg-10">
       <div class="raw-transaction-log-topics">
         <%= unless is_nil(@log.first_topic) do %>
           <div class="text-dark">
@@ -117,10 +117,10 @@
         <% end %>
       </div>
     </dd>
-    <dt class="col-md-1">
+    <dt class="col-lg-2">
       <%= gettext "Data" %>
     </dt>
-    <dd class="col-md-11">
+    <dd class="col-lg-10">
       <%= unless is_nil(@log.data) do %>
         <div class="text-dark raw-transaction-log-data">
           <%= @log.data %>

apps/block_scout_web/mix.exs

@@ -64,7 +64,7 @@ defmodule BlockScoutWeb.Mixfile do
       # Integrates Absinthe subscriptions with Phoenix
       {:absinthe_phoenix, git: "https://github.com/ayrat555/absinthe_phoenix.git", branch: "master"},
       # Plug support for Absinthe
-      {:absinthe_plug, git: "https://github.com/ayrat555/absinthe_plug.git", branch: "ab-allow-to-set-default-query"},
+      {:absinthe_plug, git: "https://github.com/ayrat555/absinthe_plug.git", branch: "ab-enable-default-query"},
       # Absinthe support for the Relay framework
       {:absinthe_relay, "~> 1.4"},
       {:bypass, "~> 1.0", only: :test},

mix.lock

@@ -2,8 +2,8 @@
   "abi": {:hex, :abi, "0.1.12", "87ae04cb09e2308db7b3c350584dc3934de0e308f6a056ba82be5756b081a1ca", [:mix], [{:exth_crypto, "~> 0.1.4", [hex: :exth_crypto, repo: "hexpm", optional: false]}], "hexpm"},
   "abnf2": {:hex, :abnf2, "0.1.2", "6f8792b8ac3288dba5fc889c2bceae9fe78f74e1a7b36bea9726ffaa9d7bef95", [:mix], []},
   "absinthe": {:hex, :absinthe, "1.4.14", "fef224a6aac63d6eaafbc0cb96040a8abcd572275b9b4db69d46329acdcae7c7", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
-  "absinthe_phoenix": {:git, "https://github.com/ayrat555/absinthe_phoenix.git", "4104c7213c328c3698b52710d49cd6d85449305c", [branch: "master"]},
-  "absinthe_plug": {:git, "https://github.com/ayrat555/absinthe_plug.git", "e74da0a6e004fe4126885b5f5f60a3e72abd70bb", [branch: "ab-allow-to-set-default-query"]},
+  "absinthe_phoenix": {:git, "https://github.com/ayrat555/absinthe_phoenix.git", "0f5127844a9e4e1c5fecb1fcee225894a2af6336", [branch: "master"]},
+  "absinthe_plug": {:git, "https://github.com/ayrat555/absinthe_plug.git", "cbe1c170e11e60b3b0146b925a1ce6ec562840ce", [branch: "ab-enable-default-query"]},
   "absinthe_relay": {:hex, :absinthe_relay, "1.4.6", "ec0e2288994b388556247cf9601245abec785cdf206d6e844f2992d29de21624", [:mix], [{:absinthe, "~> 1.4.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
   "accept": {:hex, :accept, "0.3.3", "548ebb6fb2e8b0d170e75bb6123aea6ceecb0189bb1231eeadf52eac08384a97", [:rebar3], [], "hexpm"},
   "artificery": {:hex, :artificery, "0.2.6", "f602909757263f7897130cbd006b0e40514a541b148d366ad65b89236b93497a", [:mix], [], "hexpm"},