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 @@ - <%= token_transfer_amount(@transfer) %> - <%= @transfer.token.symbol %> + <%= token_transfer_amount(@transfer) %> <%= @transfer.token.symbol %> 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 @@ <%= 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 != [] -> %>
+ <%= if @transaction.value.value != 0 do %> +

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

+
+

+ <%= value(@transaction) %> +

+ <%= if !empty_exchange_rate?(@exchange_rate) do %> +

+ data-usd-exchange-rate=<%= @exchange_rate.usd_value %>> +

+ <% end %> +
+ <% end %>

<%= token_type_name(type)%><%= gettext " Token Transfer" %>

<%= for transfer <- aggregate_token_transfers(transaction_with_transfers.token_transfers) do %> -

- <%= 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)) %>

- <% end %>
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 ""