From 654c29ece26827c9bf0cc11890bb724312a181fb Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 12 Aug 2019 10:39:51 +0300 Subject: [PATCH 1/3] do not show eth value if it's zero on transaction overview page --- .../lib/block_scout_web/templates/transaction/overview.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex index 6db055c2b9..c2993a4e1b 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex @@ -175,7 +175,7 @@
- <%= if @transaction.value.value != 0 do %> + <%= if @transaction.value && @transaction.value.value != Decimal.new(0) do %>

<%= gettext "Ether" %> <%= gettext "Value" %>

From 7ac76444ca90055db050045176b2a85334ecaca9 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 12 Aug 2019 10:42:32 +0300 Subject: [PATCH 2/3] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 128e10fcbf..407fe4f2be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method ### Fixes +- [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero on the transaction overview page - [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search - [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles - [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page From 357177137e2866b10e836bb5f37a8fec29c9c47a Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 12 Aug 2019 13:16:24 +0300 Subject: [PATCH 3/3] Rest tooltips styles to non-critical css --- CHANGELOG.md | 1 + apps/block_scout_web/assets/css/app.scss | 3 --- apps/block_scout_web/assets/css/non-critical.scss | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 128e10fcbf..fbb147faa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method ### Fixes +- [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip - [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search - [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles - [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss index 0e7d98f656..319fa54734 100644 --- a/apps/block_scout_web/assets/css/app.scss +++ b/apps/block_scout_web/assets/css/app.scss @@ -99,9 +99,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/check"; @import "components/stakes_variables"; @import "components/stakes_table"; -@import "components/i_tooltip"; -@import "components/check_tooltip"; -@import "components/tooltip"; @import "components/form"; @import "components/btn_copy"; @import "components/btn_qr"; diff --git a/apps/block_scout_web/assets/css/non-critical.scss b/apps/block_scout_web/assets/css/non-critical.scss index 81d5bd2b09..8c1cd18d07 100644 --- a/apps/block_scout_web/assets/css/non-critical.scss +++ b/apps/block_scout_web/assets/css/non-critical.scss @@ -7,6 +7,10 @@ @import "node_modules/bootstrap/scss/modal"; @import "node_modules/bootstrap/scss/tooltip"; +@import "components/i_tooltip"; +@import "components/check_tooltip"; +@import "components/tooltip"; + @import "components/qr-code"; @import "components/modal_variables"; @import "components/modal";