From 9064b72abecdf2e509b4a118ffc790bc8b8bb972 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 12 Jun 2019 15:53:15 +0300 Subject: [PATCH 1/8] remove pending transaction count --- .../controllers/pending_transaction_controller.ex | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex index 95ffe8aa22..c8a52c3596 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex @@ -52,8 +52,7 @@ defmodule BlockScoutWeb.PendingTransactionController do def index(conn, _params) do render(conn, "index.html", - current_path: current_path(conn), - pending_transaction_count: Chain.pending_transaction_count() + current_path: current_path(conn) ) end From ee0f704c5fe21e41b595b0084e7bc73fe356a843 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 12 Jun 2019 15:57:04 +0300 Subject: [PATCH 2/8] mix format --- .../controllers/pending_transaction_controller.ex | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex index c8a52c3596..f0f9626f89 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex @@ -51,9 +51,7 @@ defmodule BlockScoutWeb.PendingTransactionController do end def index(conn, _params) do - render(conn, "index.html", - current_path: current_path(conn) - ) + render(conn, "index.html", current_path: current_path(conn)) end defp get_pending_transactions_and_next_page(options) do From 286fe63b62dc59b70afce145a98002ecab12814b Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 12 Jun 2019 15:59:59 +0300 Subject: [PATCH 3/8] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1c4814ac3..3558e227e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,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 From bce04b067b0a73d20c25aa51f8ae0f86ccee9a44 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 12 Jun 2019 16:12:12 +0300 Subject: [PATCH 4/8] remove pending transaction test --- .../controllers/pending_transaction_controller_test.exs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs index d535b309f8..d632154294 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs +++ b/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)) From efb74a5d5a39a7161e1ca6ccb03ac07fc9a141a3 Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 12 Jun 2019 17:26:43 +0300 Subject: [PATCH 5/8] hide dropdown menu then other networks list is empty --- .../lib/block_scout_web/templates/layout/_topnav.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index de88489330..73a92c7cfc 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -77,7 +77,7 @@
  • - " href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <%= render BlockScoutWeb.IconsView, "_active_icon.html" %> From 25b18761fb2a2805e8b0b946b421a7d62a4745e0 Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 12 Jun 2019 17:40:42 +0300 Subject: [PATCH 6/8] add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1c4814ac3..d29214f652 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 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 - [#2144](https://github.com/poanetwork/blockscout/pull/2144) - 'page not found' images path fixed for goerli From de6a325e8e43522b6e43a4118763f1c0d0f2c998 Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Thu, 13 Jun 2019 11:16:11 +0300 Subject: [PATCH 7/8] contract creation tile color changed --- apps/block_scout_web/assets/css/components/_tile.scss | 2 +- apps/block_scout_web/assets/css/theme/_base_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/css/components/_tile.scss b/apps/block_scout_web/assets/css/components/_tile.scss index d5658647c5..f86ba1a64f 100644 --- a/apps/block_scout_web/assets/css/components/_tile.scss +++ b/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; diff --git a/apps/block_scout_web/assets/css/theme/_base_variables.scss b/apps/block_scout_web/assets/css/theme/_base_variables.scss index 3e97eb61b3..9f1b82c887 100644 --- a/apps/block_scout_web/assets/css/theme/_base_variables.scss +++ b/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( From bdc54b6650bb27270ed1300f7242bb4e82581782 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Thu, 13 Jun 2019 11:18:04 +0300 Subject: [PATCH 8/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1c4814ac3..5c7b2e3b92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache ### 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