From 39f7fe22a1f29797eb8dad9005c8f1489a73e71e Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Tue, 6 Aug 2019 18:39:25 +0300 Subject: [PATCH 1/8] logs view columns fix --- .../templates/transaction_log/_logs.html.eex | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index eb3f075cfc..c63502669b 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -1,7 +1,7 @@
-
<%= gettext "Address" %>
-
+
<%= gettext "Address" %>
+

<%= link( @log.address, @@ -13,8 +13,8 @@

<%= case decode(@log, @transaction) do %> <% {:error, :contract_not_verified} -> %> -
<%= gettext "Decoded" %>
-
+
<%= gettext "Decoded" %>
+
<%= gettext "To see decoded input data, the contract must be verified." %> <%= case @transaction do %> @@ -25,16 +25,16 @@ <% end %>
<% {:error, :could_not_decode} -> %> -
<%= gettext "Decoded" %>
-
+
<%= gettext "Decoded" %>
+
<%= gettext "Failed to decode log data." %>
<% {:error, :no_matching_function} -> %> <%= nil %> <% {:ok, method_id, text, mapping} -> %> -
<%= gettext "Decoded" %>
-
+
<%= gettext "Decoded" %>
+
@@ -88,8 +88,8 @@ <%= nil %> <% end %> -
<%= gettext "Topics" %>
-
+
<%= gettext "Topics" %>
+
<%= unless is_nil(@log.first_topic) do %>
@@ -117,10 +117,10 @@ <% end %>
-
+
<%= gettext "Data" %>
-
+
<%= unless is_nil(@log.data) do %>
<%= @log.data %> From 0ca9c069604970a194da2fc7d0911d36f16319ce Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Tue, 6 Aug 2019 18:41:20 +0300 Subject: [PATCH 2/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62d1cc05b7..d3fd193e16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth ### Fixes +- [#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 From bdd388b4ac5faf5ac3499b28bcbb7d25670cc7fd Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Tue, 6 Aug 2019 19:33:01 +0300 Subject: [PATCH 3/8] alert link fix --- apps/block_scout_web/assets/css/theme/_dark-theme.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss index c0adb0a84b..fe807aea60 100644 --- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss +++ b/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; + } } \ No newline at end of file From 159a2bd072918ddaa40b3da547088de7cd53bb45 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Tue, 6 Aug 2019 19:35:35 +0300 Subject: [PATCH 4/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62d1cc05b7..77b88f7ae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#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 - [#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 From 784cbe8c76a9c1740ca6acfb56d1b2f54bd899c5 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 7 Aug 2019 12:55:24 +0300 Subject: [PATCH 5/8] update absinthe plug from fork --- mix.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.lock b/mix.lock index d225be02ca..f0145b26fb 100644 --- a/mix.lock +++ b/mix.lock @@ -3,7 +3,7 @@ "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_plug": {:git, "https://github.com/ayrat555/absinthe_plug.git", "d4320bd4f634d418e3478870ed09b518cb3bd750", [branch: "ab-allow-to-set-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"}, From 34e8179e7dd6a25d5336b1b6ad238375a7f3969a Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 7 Aug 2019 12:59:09 +0300 Subject: [PATCH 6/8] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ed41ca1f7..213c27d218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB ### Chore +- [#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 From da52997fdc53f81abd66d8a9deb87a6197ed6ab3 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 7 Aug 2019 14:54:10 +0300 Subject: [PATCH 7/8] Update PULL_REQUEST_TEMPLATE.md DB indices check --- PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 09dbdd6b2f..9b367a8dc8 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/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 From d024cf0a4d211d08540c77c3b13fde4444648b19 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 7 Aug 2019 19:51:02 +0300 Subject: [PATCH 8/8] change fork branch --- apps/block_scout_web/mix.exs | 2 +- mix.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index 46867df947..ced5d67bcc 100644 --- a/apps/block_scout_web/mix.exs +++ b/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}, diff --git a/mix.lock b/mix.lock index f0145b26fb..1bfd8fe1e1 100644 --- a/mix.lock +++ b/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", "d4320bd4f634d418e3478870ed09b518cb3bd750", [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"},
Method Id