From 9ac6c079973c07829155b5fc7985665ea5e6f413 Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Tue, 6 Aug 2019 18:58:55 +0300
Subject: [PATCH 01/24] value-ticker gaps fix

---
 .../block_scout_web/templates/chain/_block.html.eex  |  3 +--
 .../templates/transaction/_tile.html.eex             |  6 ++----
 .../templates/transaction/_token_transfer.html.eex   |  3 +--
 .../templates/transaction/overview.html.eex          |  3 +--
 apps/block_scout_web/priv/gettext/default.pot        | 12 ++++++------
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex
index 706d18ec47..0c86c88131 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex
@@ -20,8 +20,7 @@
       </div>
       <%= if BlockScoutWeb.BlockView.show_reward?(@block.rewards) do %>
         <div class="text-truncate">
-          <%= gettext "Reward" %>
-          <%= BlockScoutWeb.BlockView.combined_rewards_value(@block) %>
+          <%= gettext "Reward" %> <%= BlockScoutWeb.BlockView.combined_rewards_value(@block) %>
         </div>
       <% end %>
     </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
index b70cbbb1fb..91a7d9973a 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
@@ -26,12 +26,10 @@
       </span>
       <span class="d-flex flex-md-row flex-column mt-3 mt-md-0">
         <span class="tile-title">
-          <%= value(@transaction, include_label: false) %>&nbsp;
-          <%= gettext "Ether" %>
+          <%= value(@transaction, include_label: false) %> <%= gettext "Ether" %>
         </span>
         <span class="ml-0 ml-md-1 text-nowrap">
-          <%= formatted_fee(@transaction, denomination: :ether, include_label: false) %> 
-          <%= gettext "TX Fee" %>
+          <%= formatted_fee(@transaction, denomination: :ether, include_label: false) %> <%= gettext "TX Fee" %>
         </span>
       </span>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_token_transfer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_token_transfer.html.eex
index 3afa468b54..8c88fdf87b 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_token_transfer.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_token_transfer.html.eex
@@ -20,7 +20,6 @@
     </span>
   </span>
   <span class="col-xs-12 col-lg-4 ml-3 ml-sm-0 text-truncate">
-  <%= token_transfer_amount(@token_transfer) %>
-  <%= link(token_symbol(@token_transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, @token_transfer.token.contract_address_hash)) %>
+  <%= token_transfer_amount(@token_transfer) %> <%= link(token_symbol(@token_transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, @token_transfer.token.contract_address_hash)) %>
   </span>
 </div>
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 e804ec81d9..6ed9d835f8 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
@@ -221,8 +221,7 @@
             </h3>
             <!-- Gas Limit -->
             <p class="address-current-balance">
-              <%= gettext "Limit" %>
-              <%= format_gas_limit(@transaction.gas) %>
+              <%= gettext "Limit" %> <%= format_gas_limit(@transaction.gas) %>
             </p>
           </div>
         </div>
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 95bb1f079b..0bfb51a681 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -370,7 +370,7 @@ msgstr ""
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:21
 #: lib/block_scout_web/templates/layout/app.html.eex:56
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:30
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:29
 #: lib/block_scout_web/templates/transaction/overview.html.eex:196
 #: lib/block_scout_web/views/wei_helpers.ex:78
 msgid "Ether"
@@ -441,7 +441,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:74
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:72
 msgid "IN"
 msgstr ""
 
@@ -567,7 +567,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:70
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:68
 msgid "OUT"
 msgstr ""
 
@@ -692,7 +692,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:21
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:34
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:32
 #: lib/block_scout_web/templates/transaction/overview.html.eex:84
 msgid "TX Fee"
 msgstr ""
@@ -938,12 +938,12 @@ msgid "View Contract"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:53
 msgid "View Less Transfers"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:54
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:52
 msgid "View More Transfers"
 msgstr ""
 

From d8e8208e064d3775bef8038f04e5d3504734d3d2 Mon Sep 17 00:00:00 2001
From: maxgrapps <50101080+maxgrapps@users.noreply.github.com>
Date: Tue, 6 Aug 2019 19:01:37 +0300
Subject: [PATCH 02/24] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62d1cc05b7..9d725381b9 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
+- [#2509](https://github.com/poanetwork/blockscout/pull/2509) - value-ticker gaps 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 b6eb19e8dd47292343827d04daa85e268aca06f9 Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Wed, 7 Aug 2019 19:28:52 +0300
Subject: [PATCH 03/24] new gaps fixes

---
 .../templates/address/overview.html.eex       |  3 +-
 .../internal_transaction/_tile.html.eex       |  3 +-
 .../templates/transaction/overview.html.eex   |  3 +-
 apps/block_scout_web/priv/gettext/default.pot | 28 +++++++++----------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex
index 9f20f28458..48d492b735 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex
@@ -104,8 +104,7 @@
           <%= if contract?(@address) do %>
             <span class="text-muted" data-test="address_contract_creator">
               <%= if from_address_hash do %>
-                <%= gettext "Created by" %>
-                <%= link(
+                <%= gettext "Created by" %> <%= link(
                   trimmed_hash(from_address_hash(@address)),
                   to: address_path(@conn, :show, from_address_hash(@address))
                 ) %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
index 575ab8ab93..fb1d8a51eb 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
@@ -17,8 +17,7 @@
       </span>
       <span class="d-flex flex-md-row flex-column mt-3 mt-md-0">
         <span class="tile-title">
-          <%= BlockScoutWeb.TransactionView.value(@internal_transaction, include_label: false) %>
-          <%= gettext "Ether" %>
+          <%= BlockScoutWeb.TransactionView.value(@internal_transaction, include_label: false) %> <%= gettext "Ether" %>
         </span>
       </span>
     </div>
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 6ed9d835f8..2205636694 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
@@ -180,8 +180,7 @@
             <%= for transfer  <- aggregate_token_transfers(transaction_with_transfers.token_transfers) do %>
 
               <h3 class="address-balance-text">
-                  <%= token_transfer_amount(transfer) %>
-                  <%= link(token_symbol(transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, transfer.token.contract_address_hash)) %>
+                  <%= token_transfer_amount(transfer) %> <%= link(token_symbol(transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, transfer.token.contract_address_hash)) %>
               </h3>
 
             <% end %>
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 0bfb51a681..7c066772d5 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -136,7 +136,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/block/_link.html.eex:2
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:29
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:28
 #: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:40
 msgid "Block #%{number}"
 msgstr ""
@@ -209,8 +209,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:37
-#: lib/block_scout_web/templates/address/overview.html.eex:146
-#: lib/block_scout_web/templates/address/overview.html.eex:154
+#: lib/block_scout_web/templates/address/overview.html.eex:145
+#: lib/block_scout_web/templates/address/overview.html.eex:153
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:107
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:115
 msgid "Close"
@@ -367,11 +367,11 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_balance_card.html.eex:15
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:21
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20
 #: lib/block_scout_web/templates/layout/app.html.eex:56
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:29
-#: lib/block_scout_web/templates/transaction/overview.html.eex:196
+#: lib/block_scout_web/templates/transaction/overview.html.eex:195
 #: lib/block_scout_web/views/wei_helpers.ex:78
 msgid "Ether"
 msgstr ""
@@ -440,7 +440,7 @@ msgid "Hash"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:38
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:72
 msgid "IN"
 msgstr ""
@@ -483,7 +483,7 @@ msgid "Less than"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:224
+#: lib/block_scout_web/templates/transaction/overview.html.eex:223
 msgid "Limit"
 msgstr ""
 
@@ -566,7 +566,7 @@ msgid "Nonce"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37
+#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:36
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:68
 msgid "OUT"
 msgstr ""
@@ -621,7 +621,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/overview.html.eex:33
-#: lib/block_scout_web/templates/address/overview.html.eex:145
+#: lib/block_scout_web/templates/address/overview.html.eex:144
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:36
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:106
 msgid "QR Code"
@@ -897,7 +897,7 @@ msgid "Unique Token"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:218
+#: lib/block_scout_web/templates/transaction/overview.html.eex:217
 msgid "Used"
 msgstr ""
 
@@ -917,7 +917,7 @@ msgid "Validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:196
+#: lib/block_scout_web/templates/transaction/overview.html.eex:195
 msgid "Value"
 msgstr ""
 
@@ -983,7 +983,7 @@ msgid "Yes"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address/overview.html.eex:113
+#: lib/block_scout_web/templates/address/overview.html.eex:112
 msgid "at"
 msgstr ""
 
@@ -1429,7 +1429,7 @@ msgid "Incoming Transactions"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address/overview.html.eex:121
+#: lib/block_scout_web/templates/address/overview.html.eex:120
 msgid "Error: Could not determine contract creator."
 msgstr ""
 
@@ -1492,7 +1492,7 @@ msgid "View All Transactions"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:214
+#: lib/block_scout_web/templates/transaction/overview.html.eex:213
 msgid "Gas"
 msgstr ""
 

From b7c2b49ceeed46d593e5a60341ee3d85bd920ea5 Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Thu, 8 Aug 2019 20:36:25 +0300
Subject: [PATCH 04/24] total supply quantity gap fix, token transfer tile
 value gap fixes

---
 .../templates/tokens/overview/_details.html.eex             | 3 +--
 .../block_scout_web/templates/transaction/overview.html.eex | 2 +-
 .../transaction_token_transfer/_token_transfer.html.eex     | 3 +--
 apps/block_scout_web/priv/gettext/default.pot               | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex
index 50eccb7185..c4fbdc2af2 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex
@@ -79,8 +79,7 @@
                   <%= format_according_to_decimals(@token.total_supply, @token.decimals) %>
                 <% else %>
                   <%= format_integer_to_currency(@token.total_supply) %>
-                <% end %>
-                <%= @token.symbol %>
+                <% end %> <%= @token.symbol %>
               </h3>
               <%= if @token.usd_value do %>
                 <div class="text-uppercase">
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 2205636694..dead5d3aa2 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
@@ -180,7 +180,7 @@
             <%= for transfer  <- aggregate_token_transfers(transaction_with_transfers.token_transfers) do %>
 
               <h3 class="address-balance-text">
-                  <%= token_transfer_amount(transfer) %> <%= link(token_symbol(transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, transfer.token.contract_address_hash)) %>
+                  <%= token_transfer_amount(transfer) %> <%= link(token_symbol(transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, " ", transfer.token.contract_address_hash)) %>
               </h3>
 
             <% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex
index 1ce1ff834e..7c3c202f80 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex
@@ -13,8 +13,7 @@
       </span>
 
       <span class="tile-title text-truncate">
-        <%= token_transfer_amount(@token_transfer) %>
-        <%= link(token_symbol(@token_transfer.token), to: token_path(@conn, :show, @token_transfer.token.contract_address_hash)) %>
+        <%= token_transfer_amount(@token_transfer) %> <%= link(token_symbol(@token_transfer.token), to: token_path(@conn, :show, @token_transfer.token.contract_address_hash)) %>
       </span>
     </div>
   </div>
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index ce85885360..891ec5efcb 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -211,8 +211,8 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:37
 #: lib/block_scout_web/templates/address/overview.html.eex:145
 #: lib/block_scout_web/templates/address/overview.html.eex:153
-#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:107
-#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:115
+#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:106
+#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:114
 msgid "Close"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/overview.html.eex:33
 #: lib/block_scout_web/templates/address/overview.html.eex:144
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:36
-#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:106
+#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:105
 msgid "QR Code"
 msgstr ""
 

From 008481df660aec44928e675f497ca9a1125a174b Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Fri, 9 Aug 2019 21:26:30 +0300
Subject: [PATCH 05/24] wgbc token tile gap fix

---
 .../tokens/transfer/_token_transfer.html.eex  |  3 +--
 .../templates/transaction/overview.html.eex   | 22 +++++++++++++++----
 apps/block_scout_web/priv/gettext/default.pot | 16 ++++++++------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
index f9a8b55f55..0389a235cb 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
@@ -28,8 +28,7 @@
       </span>
       <span class="d-flex flex-md-row flex-column mt-3 mt-md-0">
         <span class="tile-title">
-          <%= token_transfer_amount(@transfer) %>
-          <%= @transfer.token.symbol %>
+          <%= token_transfer_amount(@transfer) %> <%= @transfer.token.symbol %>
         </span>
       </span>
     </div>
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 dead5d3aa2..a1dbe9ae30 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
@@ -170,19 +170,33 @@
     </div>
 
     <%= case token_transfer_type(@transaction) do %>
-      <% {type, transaction_with_transfers} when is_atom(type) -> %>
+      <% {type, %{token_transfers: token_transfers} = transaction_with_transfers} when is_list(token_transfers) and token_transfers != [] -> %>
         <div class="col-md-12 col-lg-4 d-flex flex-column flex-md-row flex-lg-column pl-0">
         <!-- Value -->
         <div class="card card-background-1 flex-grow-1">
           <div class="card-body card-body-flex-column-space-between">
+            <%= if @transaction.value.value != 0 do %>
+              <h2 class="card-title balance-card-title"><%= gettext "Ether" %> <%= gettext "Value" %></h2>
+              <div class="text-right">
+                <h3 class="address-balance-text">
+                  <%= value(@transaction) %>
+                </h3>
+                <%= if !empty_exchange_rate?(@exchange_rate) do %>
+                  <p class="address-current-balance"
+                    data-wei-value=<%= @transaction.value.value %>
+                    data-usd-exchange-rate=<%= @exchange_rate.usd_value %>>
+                  </p>
+                <% end %>
+              </div>
+            <% end %>
             <h2 class="card-title balance-card-title"><%= token_type_name(type)%><%= gettext " Token Transfer" %></h2>
             <div class="text-right">
             <%= for transfer  <- aggregate_token_transfers(transaction_with_transfers.token_transfers) do %>
-
               <h3 class="address-balance-text">
-                  <%= token_transfer_amount(transfer) %> <%= link(token_symbol(transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, " ", transfer.token.contract_address_hash)) %>
+                  <%= token_transfer_amount(transfer) %>
+                  <%= " "%>
+                  <%= link(token_symbol(transfer.token), to: token_path(BlockScoutWeb.Endpoint, :show, transfer.token.contract_address_hash)) %>
               </h3>
-
             <% end %>
             </div>
           </div>
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 891ec5efcb..387b5068de 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -137,7 +137,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/block/_link.html.eex:2
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:28
-#: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:40
+#: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:39
 msgid "Block #%{number}"
 msgstr ""
 
@@ -371,7 +371,8 @@ msgstr ""
 #: lib/block_scout_web/templates/layout/app.html.eex:56
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:29
-#: lib/block_scout_web/templates/transaction/overview.html.eex:195
+#: lib/block_scout_web/templates/transaction/overview.html.eex:179
+#: lib/block_scout_web/templates/transaction/overview.html.eex:209
 #: lib/block_scout_web/views/wei_helpers.ex:78
 msgid "Ether"
 msgstr ""
@@ -483,7 +484,7 @@ msgid "Less than"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:223
+#: lib/block_scout_web/templates/transaction/overview.html.eex:237
 msgid "Limit"
 msgstr ""
 
@@ -897,7 +898,7 @@ msgid "Unique Token"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:217
+#: lib/block_scout_web/templates/transaction/overview.html.eex:231
 msgid "Used"
 msgstr ""
 
@@ -917,7 +918,8 @@ msgid "Validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:195
+#: lib/block_scout_web/templates/transaction/overview.html.eex:179
+#: lib/block_scout_web/templates/transaction/overview.html.eex:209
 msgid "Value"
 msgstr ""
 
@@ -1492,7 +1494,7 @@ msgid "View All Transactions"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:213
+#: lib/block_scout_web/templates/transaction/overview.html.eex:227
 msgid "Gas"
 msgstr ""
 
@@ -1641,7 +1643,7 @@ msgid "New Smart Contract Verification"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/overview.html.eex:178
+#: lib/block_scout_web/templates/transaction/overview.html.eex:192
 msgid " Token Transfer"
 msgstr ""
 

From 7ef0b2e7bedd00c4eaf6e08cf96569da297dda55 Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Fri, 9 Aug 2019 21:37:05 +0300
Subject: [PATCH 06/24] gettext error fix

---
 apps/block_scout_web/priv/gettext/default.pot | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 80c33a9495..bf7f50b17d 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -379,9 +379,8 @@ msgstr ""
 #: lib/block_scout_web/templates/layout/app.html.eex:56
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:29
+#: lib/block_scout_web/templates/transaction/overview.html.eex:179
 #: lib/block_scout_web/templates/transaction/overview.html.eex:209
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:30
-#: lib/block_scout_web/templates/transaction/overview.html.eex:211
 #: lib/block_scout_web/views/wei_helpers.ex:78
 msgid "Ether"
 msgstr ""
@@ -496,7 +495,6 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/overview.html.eex:237
-#: lib/block_scout_web/templates/transaction/overview.html.eex:239
 msgid "Limit"
 msgstr ""
 
@@ -918,7 +916,6 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/overview.html.eex:231
-#: lib/block_scout_web/templates/transaction/overview.html.eex:233
 msgid "Used"
 msgstr ""
 
@@ -940,7 +937,6 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/overview.html.eex:179
 #: lib/block_scout_web/templates/transaction/overview.html.eex:209
-#: lib/block_scout_web/templates/transaction/overview.html.eex:211
 msgid "Value"
 msgstr ""
 
@@ -1517,7 +1513,6 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/overview.html.eex:227
-#: lib/block_scout_web/templates/transaction/overview.html.eex:229
 msgid "Gas"
 msgstr ""
 

From 0e038917f6c179245ae8ab023be86992333cecdd Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Mon, 12 Aug 2019 08:49:38 +0300
Subject: [PATCH 07/24] gettext error fix

---
 apps/block_scout_web/priv/gettext/default.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 545d5e7825..1a99ada8ad 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -376,7 +376,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address/_balance_card.html.eex:15
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20
-#: lib/block_scout_web/templates/layout/app.html.eex:56
+#: lib/block_scout_web/templates/layout/app.html.eex:58
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
 #: lib/block_scout_web/templates/transaction/_tile.html.eex:29
 #: lib/block_scout_web/templates/transaction/overview.html.eex:179

From 654c29ece26827c9bf0cc11890bb724312a181fb Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 10:39:51 +0300
Subject: [PATCH 08/24] 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 @@
         <!-- Value -->
         <div class="card card-background-1 flex-grow-1">
           <div class="card-body card-body-flex-column-space-between">
-            <%= if @transaction.value.value != 0 do %>
+            <%= if @transaction.value && @transaction.value.value != Decimal.new(0) do %>
               <h2 class="card-title balance-card-title"><%= gettext "Ether" %> <%= gettext "Value" %></h2>
               <div class="text-right">
                 <h3 class="address-balance-text">

From 7ac76444ca90055db050045176b2a85334ecaca9 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 10:42:32 +0300
Subject: [PATCH 09/24] 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 e0a6cdb97f47b23fd38d72657f3e039a55b297c4 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 12 Aug 2019 12:23:04 +0300
Subject: [PATCH 10/24] css preload support in Firefox

---
 CHANGELOG.md                                                 | 1 +
 apps/block_scout_web/assets/js/app.js                        | 3 +++
 apps/block_scout_web/assets/package-lock.json                | 5 +++++
 apps/block_scout_web/assets/package.json                     | 1 +
 .../lib/block_scout_web/templates/layout/app.html.eex        | 2 +-
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128e10fcbf..9c5e8ffc3b 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
+- [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox
 - [#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/js/app.js b/apps/block_scout_web/assets/js/app.js
index a33dab821d..4aa89e4142 100644
--- a/apps/block_scout_web/assets/js/app.js
+++ b/apps/block_scout_web/assets/js/app.js
@@ -20,6 +20,9 @@ import 'bootstrap'
 
 import './locale'
 
+// support of preload in Firefox
+import '../node_modules/fg-loadcss/dist/cssrelpreload.min'
+
 import './pages/address'
 import './pages/address/coin_balances'
 import './pages/address/transactions'
diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 23f1ccb7ba..a03732e4e0 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -4121,6 +4121,11 @@
         "bser": "^2.0.0"
       }
     },
+    "fg-loadcss": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fg-loadcss/-/fg-loadcss-2.1.0.tgz",
+      "integrity": "sha512-HpvR2uRoKvrYAEwimw+k4Fr2NVHYPfld5Lc/f9uy3mKeUTXhS5urL24XA2rqyq5b2i410EXCLir4Uhsb8J1QaQ=="
+    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 5a615bee33..5c92b7b1f9 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -25,6 +25,7 @@
     "bootstrap": "^4.1.3",
     "chart.js": "^2.7.2",
     "clipboard": "^2.0.1",
+    "fg-loadcss": "^2.1.0",
     "highlight.js": "^9.13.1",
     "highlightjs-solidity": "^1.0.6",
     "humps": "^2.0.1",
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
index d9636bcbe7..d8ecb167f1 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="<%= static_path(@conn, "/css/app.css") %>">
-    <link rel="preload" href="/css/non-critical.css" as="style" onload="this.rel='stylesheet'">
+    <link rel="preload" href="/css/non-critical.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
     <noscript><link rel="stylesheet" href="/css/non-critical.css"></noscript>
 
     <link rel="apple-touch-icon" sizes="180x180" href="<%= static_path(@conn, "/apple-touch-icon.png") %>">

From 357177137e2866b10e836bb5f37a8fec29c9c47a Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 12 Aug 2019 13:16:24 +0300
Subject: [PATCH 11/24] 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";

From e15face7244b5b6e0041035916b3e204844b1f07 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 14:54:44 +0300
Subject: [PATCH 12/24] correctly encode decimal values for frontend

---
 apps/block_scout_web/lib/block_scout_web/chain.ex | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index b1a3c3ec19..c8279652bf 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -31,6 +31,14 @@ defmodule BlockScoutWeb.Chain do
 
   alias Explorer.PagingOptions
 
+  defimpl Poison.Encoder, for: Decimal do
+    def encode(value, _opts) do
+      decimal = Decimal
+
+      [?\", decimal.to_string(value), ?\"]
+    end
+  end
+
   @page_size 50
   @default_paging_options %PagingOptions{page_size: @page_size + 1}
   @address_hash_len 40

From 3ec1e5e19530996bbc266bb2e07be5f54f697b5a Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 15:14:58 +0300
Subject: [PATCH 13/24] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128e10fcbf..8be16517ad 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
+- [#2550](https://github.com/poanetwork/blockscout/pull/2550) - correctly encode decimal values for frontend
 - [#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 70552971060e813747cc5f4bab8c04d00b03ecb6 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 15:31:43 +0300
Subject: [PATCH 14/24] add test

---
 apps/block_scout_web/lib/block_scout_web/chain.ex        | 1 +
 apps/block_scout_web/test/block_scout_web/chain_test.exs | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index c8279652bf..3aa660fbe4 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -33,6 +33,7 @@ defmodule BlockScoutWeb.Chain do
 
   defimpl Poison.Encoder, for: Decimal do
     def encode(value, _opts) do
+      # silence the xref warning
       decimal = Decimal
 
       [?\", decimal.to_string(value), ?\"]
diff --git a/apps/block_scout_web/test/block_scout_web/chain_test.exs b/apps/block_scout_web/test/block_scout_web/chain_test.exs
index 3d1a7312f4..7656ff2259 100644
--- a/apps/block_scout_web/test/block_scout_web/chain_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/chain_test.exs
@@ -71,4 +71,12 @@ defmodule BlockScoutWeb.ChainTest do
       assert {:error, :not_found} = Chain.from_param(address_hash)
     end
   end
+
+  describe "Posion.encode!" do
+    test "correctly encodes decimal values" do
+      val = Decimal.from_float(5.55)
+
+      assert "\"5.55\"" == Poison.encode!(val)
+    end
+  end
 end

From b7c89cd79050d3c11868aaffc9e75d4b60e426bb Mon Sep 17 00:00:00 2001
From: Paul Tsupikoff <goodsoft@goodsoft.lv>
Date: Mon, 12 Aug 2019 15:33:37 +0300
Subject: [PATCH 15/24] Correctly handle dynamically created Bootstrap tooltips

Problem: there are a lot of tooltips in staking UI that are located in
dynamically created DOM, which are currently not initialized correctly.

Solution: initialize tooltips on <body> with selector parameter.
---
 apps/block_scout_web/assets/js/lib/tooltip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/assets/js/lib/tooltip.js b/apps/block_scout_web/assets/js/lib/tooltip.js
index a22da61349..0c29a92770 100644
--- a/apps/block_scout_web/assets/js/lib/tooltip.js
+++ b/apps/block_scout_web/assets/js/lib/tooltip.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
 
 $(function () {
-  $('[data-toggle="tooltip"]').tooltip()
+  $('body').tooltip({ selector: '[data-toggle="tooltip"]' })
 })

From 1ca798e3b8d9decaa9098d99e9673c3e32ab2e96 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 16:25:29 +0300
Subject: [PATCH 16/24] remove brackets for token holders

---
 .../templates/tokens/holder/_token_balances.html.eex            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/_token_balances.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/_token_balances.html.eex
index 0ff5caeda3..1c4cd5125b 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/_token_balances.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/_token_balances.html.eex
@@ -11,7 +11,7 @@
         </span>
 
         <%= if show_total_supply_percentage?(@token.total_supply) do %>
-          (<%= total_supply_percentage(@token_balance.value, @token.total_supply) %>)
+          <%= total_supply_percentage(@token_balance.value, @token.total_supply) %>
         <% end %>
       </span>
     </div>

From 62f8c772f4bc2c23e074e7f5cf892fe2cc2d22f0 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 16:29:17 +0300
Subject: [PATCH 17/24] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128e10fcbf..492c65734f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,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
+- [#2552](https://github.com/poanetwork/blockscout/pull/2552) - remove brackets for token holders percentage
 - [#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

From c31377d8c3322d3b0bebc4eb899cd0eae2ac15d3 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 12 Aug 2019 16:26:44 +0300
Subject: [PATCH 18/24] Dark theme import to the end of sass

---
 CHANGELOG.md                             | 1 +
 apps/block_scout_web/assets/css/app.scss | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a0562c766..e9a8cdc659 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
+- [#2553](https://github.com/poanetwork/blockscout/pull/2553) - Dark theme import to the end of sass
 - [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip
 - [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox
 - [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero 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 319fa54734..4bc13bd0bc 100644
--- a/apps/block_scout_web/assets/css/app.scss
+++ b/apps/block_scout_web/assets/css/app.scss
@@ -75,9 +75,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "components/table";
 @import "components/navbar";
 @import "components/alerts";
-
-@import "theme/dark-theme";
-
 @import "components/animations";
 @import "components/card";
 @import "components/tile";
@@ -116,6 +113,8 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "components/radio_big";
 @import "components/btn_no_border";
 
+@import "theme/dark-theme";
+
 :export {
   dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color;
   dashboardLineColorMarket: $dashboard-line-color-market;

From 0e9982d39b19f50145d727b63af241c6c077673f Mon Sep 17 00:00:00 2001
From: Paul Tsupikoff <goodsoft@goodsoft.lv>
Date: Mon, 12 Aug 2019 16:35:30 +0300
Subject: [PATCH 19/24] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a0562c766..e7a676a664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - [#2495](https://github.com/poanetwork/blockscout/pull/2495) - fix logs for indexed chain
 - [#2459](https://github.com/poanetwork/blockscout/pull/2459) - fix top addresses query
 - [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB
+- [#2551](https://github.com/poanetwork/blockscout/pull/2551) - Correctly handle dynamically created Bootstrap tooltips
 
 ### Chore
 - [#2507](https://github.com/poanetwork/blockscout/pull/2507) - update minor version of ecto, ex_machina, phoenix_live_reload

From 691bd9aef5f8f713b686fce1fa1e85548d9bbd92 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 16:38:18 +0300
Subject: [PATCH 20/24] remove extract slash for endpoint url in docs

---
 .../lib/block_scout_web/templates/api_docs/eth_rpc.html.eex     | 2 +-
 .../lib/block_scout_web/templates/api_docs/index.html.eex       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex
index c85e4d3214..0b44781e1e 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex
@@ -2,7 +2,7 @@
   <div class="card">
     <div class="card-body">
       <h1 class="card-title margin-bottom-sm"><%= gettext("ETH RPC API Documentation") %></h2>
-      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>/api/eth_rpc">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>/api/eth_rpc ]</p>
+      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>api/eth_rpc">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>api/eth_rpc ]</p>
       <p class="card-subtitle margin-bottom-0">
         <%= gettext "This API is provided to support some rpc methods in the exact format specified for ethereum nodes, which can be found " %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex
index 163697d324..8f24a9cace 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex
@@ -2,7 +2,7 @@
   <div class="card">
     <div class="card-body">
       <h1 class="card-title margin-bottom-sm"><%= gettext("API Documentation") %></h2>
-      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>/api">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>/api ]</p>
+      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>api">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>api ]</p>
       <p class="card-subtitle margin-bottom-0"><%= gettext "This API is provided for developers transitioning their applications from Etherscan to BlockScout. It supports GET and POST requests." %></p>
     </div>
     <div class="api-anchors-list">

From 45959cc3f49125b43de4070761d3e4abb96f26fe Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 16:40:10 +0300
Subject: [PATCH 21/24] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128e10fcbf..2aee694638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,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
+- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extrac slash for endpoint url in docs
 - [#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

From 994b3bcb70058a9b2c6e6467756a352f1fe694e4 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 12 Aug 2019 16:41:38 +0300
Subject: [PATCH 22/24] fix typo in changelog entry

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93d4d65e21..f4001501e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,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
-- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extrac slash for endpoint url in docs
+- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extra slash for endpoint url in docs
 - [#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

From 85e976f69cdec66cb02d821974750e433767e758 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 12 Aug 2019 18:02:29 +0300
Subject: [PATCH 23/24] Update env-variables.md

---
 docs/env-variables.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/env-variables.md b/docs/env-variables.md
index 7e2d652889..6a9cd6fee3 100644
--- a/docs/env-variables.md
+++ b/docs/env-variables.md
@@ -35,9 +35,9 @@ $ export NETWORK=POA
 | `SOURCE_MODULE` | | This environment variable is used to calculate the exchange rate and is specifically used by the xDai Chain. | false | all |
 | `DATABASE_URL` | | Production environment variable to define the Database endpoint. | (empty) | all |
 | `POOL_SIZE` | | Production environment variable to define the number of database connections allowed. | 20 | all |
-|  `ECTO_USE_SSL`| | Production environment variable to use SSL on Ecto queries. | true | all |
-|  `DATADOG_HOST` | | Host configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/) | (empty) | all |
-|  `DATADOG_PORT` | | Port configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/). | (empty} | all |
+| `ECTO_USE_SSL` | | Production environment variable to use SSL on Ecto queries. | true | all |
+| `DATADOG_HOST` | | Host configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/) | (empty) | all |
+| `DATADOG_PORT` | | Port configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/). | (empty} | all |
 | `SPANDEX_BATCH_SIZE` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all |
 |  `SPANDEX_SYNC_THRESHOLD` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting.  | (empty) | all |
 | `HEART_BEAT_TIMEOUT` | | Production environment variable to restart the application in the event of a crash. | 30 | all |
@@ -48,7 +48,7 @@ $ export NETWORK=POA
 | `BLOCK_TRANSFORMER` | | Transformer for blocks: base or clique. | base |  v1.3.4+ |
 | `GRAPHIQL _TRANSACTION` | | Default transaction in query to GraphiQL. | (empty) |  v1.3.4+ |
 | `FIRST_BLOCK` | | The block number, where indexing begins from. | 0 |  v1.3.8+ |
-| `LAST_BLOCK` | | The block number, where indexing stops. | (empty) | master |
+| `LAST_BLOCK` | | The block number, where indexing stops. | (empty) | v2.0.3+ |
 | `TXS_COUNT_CACHE_PERIOD` | | Interval in seconds to restart the task, which calculates the total txs count. | 60 * 60 * 2 |  v1.3.9+ |
 | `ADDRESS_WITH_BALANCES` <br /> `_UPDATE_INTERVAL`|  | Interval in seconds to restart the task, which calculates addresses with balances. | 30 * 60 |  v1.3.9+ |
 | `LINK_TO_OTHER_EXPLORERS` | | true/false. If true, links to other explorers are added in the footer  | (empty)  |  v1.3.0+ |
@@ -56,9 +56,9 @@ $ export NETWORK=POA
 | `SUPPORTED_CHAINS` | | Array of supported chains that displays in the footer and in the chains dropdown. This var was introduced in this PR [#1900](https://github.com/poanetwork/blockscout/pull/1900) and looks like an array of JSON objects.  | (empty) |  v2.0.0+ |
 | `BLOCK_COUNT_CACHE_PERIOD ` | | time to live of cache in seconds. This var was introduced in [#1876](https://github.com/poanetwork/blockscout/pull/1876)  | 600 |  v2.0.0+ |
 | `ALLOWED_EVM_VERSIONS ` | | the comma-separated list of allowed EVM versions for contracts verification. This var was introduced in [#1964](https://github.com/poanetwork/blockscout/pull/1964)  | "homestead, tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg" |  v2.0.0+ |
-| `DISABLE_WEBAPP` | | If `true`, endpoints to webapp are hidden (compile-time) | `false` | master |
-| `DISABLE_READ_API` | | If `true`, read-only endpoints to API are hidden (compile-time) | `false` | master |
-| `DISABLE_WRITE_API` | | If `true`, write endpoints to API are hidden (compile-time) | `false` | master |
-| `DISABLE_INDEXER` | | If `true`, indexer application doesn't run | `false` | master |
-| `WEBAPP_URL` | | Link to web application instance, e.g. `http://host/path` | (empty) | master |
-| `API_URL` | | Link to API instance, e.g. `http://host/path` | (empty) | master |
+| `DISABLE_WEBAPP` | | If `true`, endpoints to webapp are hidden (compile-time) | `false` | v2.0.3+ |
+| `DISABLE_READ_API` | | If `true`, read-only endpoints to API are hidden (compile-time) | `false` | v2.0.3+ |
+| `DISABLE_WRITE_API` | | If `true`, write endpoints to API are hidden (compile-time) | `false` | v2.0.3+ |
+| `DISABLE_INDEXER` | | If `true`, indexer application doesn't run | `false` | v2.0.3+ |
+| `WEBAPP_URL` | | Link to web application instance, e.g. `http://host/path` | (empty) | v2.0.3+ |
+| `API_URL` | | Link to API instance, e.g. `http://host/path` | (empty) | v2.0.3+ |

From 3d35b371ea45f41beac49018a7545edf848d539f Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 12 Aug 2019 18:05:43 +0300
Subject: [PATCH 24/24] fixate 2.0.3 release

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7592af448..ade434a9d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Current
 
+### Features
+
+### Fixes
+
+### Chore
+
+
+## 2.0.3-beta
+
 ### Features
 - [#2433](https://github.com/poanetwork/blockscout/pull/2433) - Add a functionality to try Eth RPC methods in the documentation
 - [#2529](https://github.com/poanetwork/blockscout/pull/2529) - show both eth value and token transfers on transaction overview page
@@ -55,6 +64,7 @@
 - [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0
 - [#2373](https://github.com/poanetwork/blockscout/pull/2373) - Add script to validate internal_transactions constraint for large DBs
 
+
 ## 2.0.2-beta
 
 ### Features
@@ -199,6 +209,7 @@
 - [#2255](https://github.com/poanetwork/blockscout/pull/2255) - upgrade elixir version to 1.9.0
 - [#2256](https://github.com/poanetwork/blockscout/pull/2256) - use the latest version of chromedriver
 
+
 ## 2.0.0-beta
 
 ### Features
@@ -281,6 +292,7 @@
 - [#2055](https://github.com/poanetwork/blockscout/pull/2055) - Increase timeout for geth indexers
 - [#2069](https://github.com/poanetwork/blockscout/pull/2069) - Docsify integration: static docs page generation
 
+
 ## 1.3.15-beta
 
 ### Features
@@ -310,6 +322,7 @@
 
 - [#1892](https://github.com/poanetwork/blockscout/pull/1892) - Remove temporary worker modules
 
+
 ## 1.3.13-beta
 
 ### Features
@@ -322,10 +335,12 @@
 - [#1881](https://github.com/poanetwork/blockscout/pull/1881) - fix: store solc versions locally for performance
 - [#1898](https://github.com/poanetwork/blockscout/pull/1898) - check if the constructor has arguments before verifying constructor arguments
 
+
 ## 1.3.12-beta
 
 Reverting of synchronous block counter, implemented in #1848
 
+
 ## 1.3.11-beta
 
 ### Features
@@ -347,6 +362,7 @@ Reverting of synchronous block counter, implemented in #1848
 - [#1814](https://github.com/poanetwork/blockscout/pull/1814) - Clear build artefacts script
 - [#1837](https://github.com/poanetwork/blockscout/pull/1837) - Add -f flag to clear_build.sh script delete static folder
 
+
 ## 1.3.10-beta
 
 ### Features
@@ -457,6 +473,7 @@ Reverting of synchronous block counter, implemented in #1848
 
  - [#1610](https://github.com/poanetwork/blockscout/pull/1610) - Add PIRL to Readme
 
+
 ## 1.3.6-beta
 
 ### Features