CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1613 from poanetwork/ab-fix-usd-fee

Browse Source 
fix usd fee
pull/1615/head
Victor Baranov 6 years ago committed by GitHub
parent d240dc6129 6be45eaf3a
commit 6c5777c2ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
  2. 20
      apps/block_scout_web/priv/gettext/default.pot
  3. 20
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

7
apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
Unescape View File

@ -73,11 +73,10 @@
<dt class="col-sm-3 text-muted"> <%= gettext "TX Fee" %> </dt> <dt class="col-sm-3 text-muted"> <%= gettext "TX Fee" %> </dt>
<dd class="col-sm-9"> <dd class="col-sm-9">
<%= formatted_fee(@transaction, denomination: :ether) %> <%= formatted_fee(@transaction, denomination: :ether) %>
(<span data-wei-value=<%= fee(@transaction) %>
<% if !empty_exchange_rate?(@exchange_rate) do %> <%= if !empty_exchange_rate?(@exchange_rate) do %>
data-usd-exchange-rate=<%= @exchange_rate.usd_value %> (<span data-wei-value=<%= fee(@transaction) %> data-usd-exchange-rate=<%= @exchange_rate.usd_value %>></span>)
<% end %> <% end %>
></span>)
</dd> </dd>
</dl> </dl>
<!-- Processing Time --> <!-- Processing Time -->

20
apps/block_scout_web/priv/gettext/default.pot
Unescape View File

@ -392,7 +392,7 @@ msgstr ""
#: lib/block_scout_web/templates/layout/app.html.eex:51 #: lib/block_scout_web/templates/layout/app.html.eex:51
#: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
#: lib/block_scout_web/templates/transaction/_tile.html.eex:27 #: lib/block_scout_web/templates/transaction/_tile.html.eex:27
#: lib/block_scout_web/templates/transaction/overview.html.eex:146 #: lib/block_scout_web/templates/transaction/overview.html.eex:145
#: lib/block_scout_web/views/wei_helpers.ex:72 #: lib/block_scout_web/views/wei_helpers.ex:72
msgid "Ether" msgid "Ether"
msgstr "" msgstr ""
@ -431,7 +431,7 @@ msgid "GET"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:159 #: lib/block_scout_web/templates/transaction/overview.html.eex:158
msgid "Gas" msgid "Gas"
msgstr "" msgstr ""
@ -513,7 +513,7 @@ msgid "Less than"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:171 #: lib/block_scout_web/templates/transaction/overview.html.eex:170
msgid "Limit" msgid "Limit"
msgstr "" msgstr ""
@ -993,7 +993,7 @@ msgid "Unique Token"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:164 #: lib/block_scout_web/templates/transaction/overview.html.eex:163
msgid "Used" msgid "Used"
msgstr "" msgstr ""
@ -1014,7 +1014,7 @@ msgid "Validations"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:146 #: lib/block_scout_web/templates/transaction/overview.html.eex:145
msgid "Value" msgid "Value"
msgstr "" msgstr ""
@ -1210,7 +1210,7 @@ msgid "This API is provided for developers transitioning their applications from
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:100 #: lib/block_scout_web/templates/transaction/overview.html.eex:99
msgid "Raw Input" msgid "Raw Input"
msgstr "" msgstr ""
@ -1652,18 +1652,18 @@ msgid "Transactions Sent"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:91 #: lib/block_scout_web/templates/transaction/overview.html.eex:90
msgid "Transaction Speed" msgid "Transaction Speed"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:122 #: lib/block_scout_web/templates/transaction/overview.html.eex:121
#: lib/block_scout_web/templates/transaction/overview.html.eex:127 #: lib/block_scout_web/templates/transaction/overview.html.eex:126
msgid "Hex (Default)" msgid "Hex (Default)"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:131 #: lib/block_scout_web/templates/transaction/overview.html.eex:130
msgid "UTF-8" msgid "UTF-8"
msgstr "" msgstr ""

20
apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
Unescape View File

@ -392,7 +392,7 @@ msgstr ""
#: lib/block_scout_web/templates/layout/app.html.eex:51 #: lib/block_scout_web/templates/layout/app.html.eex:51
#: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
#: lib/block_scout_web/templates/transaction/_tile.html.eex:27 #: lib/block_scout_web/templates/transaction/_tile.html.eex:27
#: lib/block_scout_web/templates/transaction/overview.html.eex:146 #: lib/block_scout_web/templates/transaction/overview.html.eex:145
#: lib/block_scout_web/views/wei_helpers.ex:72 #: lib/block_scout_web/views/wei_helpers.ex:72
msgid "Ether" msgid "Ether"
msgstr "POA" msgstr "POA"
@ -431,7 +431,7 @@ msgid "GET"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:159 #: lib/block_scout_web/templates/transaction/overview.html.eex:158
msgid "Gas" msgid "Gas"
msgstr "" msgstr ""
@ -513,7 +513,7 @@ msgid "Less than"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:171 #: lib/block_scout_web/templates/transaction/overview.html.eex:170
msgid "Limit" msgid "Limit"
msgstr "" msgstr ""
@ -993,7 +993,7 @@ msgid "Unique Token"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:164 #: lib/block_scout_web/templates/transaction/overview.html.eex:163
msgid "Used" msgid "Used"
msgstr "" msgstr ""
@ -1014,7 +1014,7 @@ msgid "Validations"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:146 #: lib/block_scout_web/templates/transaction/overview.html.eex:145
msgid "Value" msgid "Value"
msgstr "" msgstr ""
@ -1210,7 +1210,7 @@ msgid "This API is provided for developers transitioning their applications from
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:100 #: lib/block_scout_web/templates/transaction/overview.html.eex:99
msgid "Raw Input" msgid "Raw Input"
msgstr "" msgstr ""
@ -1652,18 +1652,18 @@ msgid "Transactions Sent"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:91 #: lib/block_scout_web/templates/transaction/overview.html.eex:90
msgid "Transaction Speed" msgid "Transaction Speed"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:122 #: lib/block_scout_web/templates/transaction/overview.html.eex:121
#: lib/block_scout_web/templates/transaction/overview.html.eex:127 #: lib/block_scout_web/templates/transaction/overview.html.eex:126
msgid "Hex (Default)" msgid "Hex (Default)"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/transaction/overview.html.eex:131 #: lib/block_scout_web/templates/transaction/overview.html.eex:130
msgid "UTF-8" msgid "UTF-8"
msgstr "" msgstr ""

Write Preview
Loading…
Cancel
Save