resolve conflicts from master

pull/699/head
Gustavo Santos Ferreira 6 years ago
parent 24a2c135c8
commit 6535f7283f
  1. 3
      apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/index.html.eex
  2. 2
      apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex
  3. 2
      apps/block_scout_web/lib/block_scout_web/templates/tokens/read_contract/index.html.eex
  4. 2
      apps/block_scout_web/lib/block_scout_web/templates/tokens/token/show.html.eex

@ -4,7 +4,8 @@
"_details.html",
token: @token,
total_token_transfers: @total_token_transfers,
total_token_holders: @total_token_holders
total_token_holders: @total_token_holders,
conn: @conn
) %>
<section>

@ -37,7 +37,7 @@
<div class="d-flex flex-row justify-content-start text-muted">
<span class="mr-4"> <%= @token.type %> </span>
<span class="mr-4"><%= @total_token_holders %> <%= gettext "addresses" %></span>
<span class="mr-4"><%= @total_address_in_token_transfers %> <%= gettext "addresses" %></span>
<span class="mr-4"><%= @total_token_holders %> <%= gettext "addresses" %></span>
<span class="mr-4"><%= @total_token_transfers %> <%= gettext "Transfers" %></span>
<%= if decimals?(@token) do %>
<span class="mr-4"><%= @token.decimals %> <%= gettext "decimals" %></span>

@ -5,7 +5,7 @@
token: @token,
total_token_transfers: @total_token_transfers,
total_token_holders: @total_token_holders,
total_address_in_token_transfers: @total_address_in_token_transfers,
total_token_holders: @total_token_holders,
conn: @conn
) %>

@ -5,7 +5,7 @@
token: @token,
total_token_transfers: @total_token_transfers,
total_token_holders: @total_token_holders,
total_address_in_token_transfers: @total_address_in_token_transfers,
total_token_holders: @total_token_holders,
conn: @conn
) %>

Loading…
Cancel
Save