From 7073696c0c1533f4f3e1c6a13e6110c9f2b034f3 Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Fri, 2 Sep 2022 20:55:42 +0300 Subject: [PATCH] Re-use _btn_copy.html for raw trace page --- CHANGELOG.md | 1 + ISSUE_TEMPLATE.md | 1 + .../transaction_raw_trace/index.html.eex | 22 +++++++------------ apps/block_scout_web/priv/gettext/default.pot | 5 +++-- .../priv/gettext/en/LC_MESSAGES/default.po | 5 +++-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4415485652..4eb2968cff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ ### Chore +- [#6045](https://github.com/blockscout/blockscout/pull/6045) - Re-use _btn_copy.html for raw trace page - [#6035](https://github.com/blockscout/blockscout/pull/6035) - Hide copy btn if no raw trace - [#6034](https://github.com/blockscout/blockscout/pull/6034) - Suppress empty sections in supported chain dropdown - [#5939](https://github.com/blockscout/blockscout/pull/5939) - Bump sweetalert2 from 11.4.26 to 11.4.27 in /apps/block_scout_web/assets diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 1ed9541dc8..1e5bff0136 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -7,6 +7,7 @@ * Node JS version (`node -v`): * Operating System: * Blockscout Version/branch/commit: +* Archive node type && version (Erigon/Geth/Nethermind/Ganache/?): ### Steps to reproduce diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex index d067dbbd93..8bb5c03b49 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex @@ -6,20 +6,14 @@

<%= gettext "Raw Trace" %> <%= if Enum.count(@internal_transactions) > 0 do %> - - - - - + <% raw_trace_text = for {line, _} <- raw_traces_with_lines(@internal_transactions), do: line %> + <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", + id: "tx-raw-trace-input", + additional_classes: ["tx-raw-input", "transaction-input"], + clipboard_text: raw_trace_text, + aria_label: gettext("Copy Value"), + title: gettext("Copy Raw Trace"), + style: "float: right;" %> <% end %>

<%= if Enum.count(@internal_transactions) > 0 do %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 6b05e7895b..c49c49c37a 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -635,7 +635,7 @@ msgstr "" msgid "Copy Parent Hash" msgstr "" -#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:16 +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:15 #, elixir-autogen, elixir-format msgid "Copy Raw Trace" msgstr "" @@ -686,6 +686,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:41 #: lib/block_scout_web/templates/transaction/overview.html.eex:463 #: lib/block_scout_web/templates/transaction/overview.html.eex:469 +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:14 #, elixir-autogen, elixir-format msgid "Copy Value" msgstr "" @@ -2861,7 +2862,7 @@ msgstr "" msgid "truffle flattener" msgstr "" -#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:29 +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:23 #, elixir-autogen, elixir-format msgid "No trace entries found." msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 864214a368..be81fc4f99 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -635,7 +635,7 @@ msgstr "" msgid "Copy Parent Hash" msgstr "" -#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:16 +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:15 #, elixir-autogen, elixir-format msgid "Copy Raw Trace" msgstr "" @@ -686,6 +686,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:41 #: lib/block_scout_web/templates/transaction/overview.html.eex:463 #: lib/block_scout_web/templates/transaction/overview.html.eex:469 +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:14 #, elixir-autogen, elixir-format msgid "Copy Value" msgstr "" @@ -2861,7 +2862,7 @@ msgstr "" msgid "truffle flattener" msgstr "" -#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:29 +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:23 #, elixir-autogen, elixir-format msgid "No trace entries found." msgstr ""