diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs index ad7659c8b5..84c818dc90 100644 --- a/apps/explorer/mix.exs +++ b/apps/explorer/mix.exs @@ -85,7 +85,7 @@ defmodule Explorer.Mixfile do {:postgrex, ">= 0.0.0"}, {:scrivener_ecto, "~> 1.0"}, {:scrivener_html, "~> 1.7"}, - {:sobelow, ">= 0.0.0", only: [:dev, :test], runtime: false}, + {:sobelow, ">= 0.7.0", only: [:dev, :test], runtime: false}, {:timex, "~> 3.1.24"}, {:timex_ecto, "~> 3.2.1"} ] diff --git a/apps/explorer_web/assets/css/code.scss b/apps/explorer_web/assets/css/_code.scss similarity index 100% rename from apps/explorer_web/assets/css/code.scss rename to apps/explorer_web/assets/css/_code.scss diff --git a/apps/explorer_web/assets/css/_content.scss b/apps/explorer_web/assets/css/_content.scss index 00e0b33e69..098d6a77ab 100644 --- a/apps/explorer_web/assets/css/_content.scss +++ b/apps/explorer_web/assets/css/_content.scss @@ -19,7 +19,7 @@ display: flex; position: fixed; width: 100%; - z-index: 10001; + z-index: 1001; } .container { @@ -32,7 +32,7 @@ } @media (max-width: 768px) { - + #content { height: 100%; } diff --git a/apps/explorer_web/assets/css/tooltip.scss b/apps/explorer_web/assets/css/_tooltip.scss similarity index 100% rename from apps/explorer_web/assets/css/tooltip.scss rename to apps/explorer_web/assets/css/_tooltip.scss diff --git a/apps/explorer_web/assets/css/app.scss b/apps/explorer_web/assets/css/app.scss index ea2b41c577..611652e8bc 100644 --- a/apps/explorer_web/assets/css/app.scss +++ b/apps/explorer_web/assets/css/app.scss @@ -20,6 +20,11 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "node_modules/bootstrap/scss/reboot"; @import "node_modules/bootstrap/scss/grid"; @import "node_modules/bootstrap/scss/code"; +@import "node_modules/bootstrap/scss/modal"; +@import "node_modules/bootstrap/scss/close"; +@import "node_modules/bootstrap/scss/buttons"; +@import "node_modules/bootstrap/scss/forms"; +@import "node_modules/bootstrap/scss/input-group"; @import "node_modules/bootstrap/scss/utilities/spacing"; @import "node_modules/bootstrap/scss/utilities/sizing"; @import "node_modules/bootstrap/scss/utilities/display"; @@ -56,6 +61,7 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/filter"; @import "components/button"; @import "components/table"; +@import "components/qr-code"; :export { primary: $primary; diff --git a/apps/explorer_web/assets/css/components/_qr-code.scss b/apps/explorer_web/assets/css/components/_qr-code.scss new file mode 100644 index 0000000000..5323908d28 --- /dev/null +++ b/apps/explorer_web/assets/css/components/_qr-code.scss @@ -0,0 +1,7 @@ +.qr-code { + display: block; + margin-right: auto; + margin-left: auto; + width: 100%; + max-width: 60px; +} diff --git a/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex b/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex index e9e3feaa00..5e2923ec22 100644 --- a/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/address/overview.html.eex @@ -1,6 +1,17 @@
-

<%= address_title(@address) %>

-

<%= @address %>

+
+
+
+
+ qr_code +
+
+
+
+

<%= gettext "Address" %>

+

<%= @address %>

+
+
@@ -10,10 +21,17 @@ - <%= gettext "Balance" %> + <%= gettext "Ether" %> <%= gettext "Balance" %> - <%= balance(@address) %>
+ <%= balance(@address) %> + + + + + <%= gettext "USD" %> <%= gettext "Balance" %> + + <%= formatted_usd(@address, @exchange_rate) %> diff --git a/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex b/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex index 1e20a289d0..9cbf7b761c 100644 --- a/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex @@ -1,6 +1,17 @@
-

<%= gettext "Transaction Details" %>

-

<%= @transaction %>

+
+
+
+
+ qr_code +
+
+
+
+

<%= gettext "Transaction Details" %>

+

<%= @transaction %>

+
+
@@ -43,10 +54,17 @@ - <%= gettext "Value" %> + <%= gettext "Ether" %> <%= gettext "Value" %>
<%= value(@transaction) %>
+ + + + + <%= gettext "USD" %> <%= gettext "Value" %> + +
<%= formatted_usd_value(@transaction, @exchange_rate) %>
@@ -133,10 +151,17 @@ - <%= gettext "TX Fee" %> + <%= gettext "Ether" %> <%= gettext "TX Fee" %>
<%= formatted_fee(@transaction, denomination: :ether) %>
+ + + + + <%= gettext "USD" %> <%= gettext "TX Fee" %> + +
<%= formatted_fee(@transaction, exchange_rate: @exchange_rate) %>
diff --git a/apps/explorer_web/lib/explorer_web/views/address_view.ex b/apps/explorer_web/lib/explorer_web/views/address_view.ex index 6081feadb9..fe130f9c29 100644 --- a/apps/explorer_web/lib/explorer_web/views/address_view.ex +++ b/apps/explorer_web/lib/explorer_web/views/address_view.ex @@ -44,4 +44,11 @@ defmodule ExplorerWeb.AddressView do def hash(%Address{hash: hash}) do to_string(hash) end + + def qr_code(%Address{hash: hash}) do + hash + |> to_string() + |> QRCode.to_png() + |> Base.encode64() + end end diff --git a/apps/explorer_web/lib/explorer_web/views/transaction_view.ex b/apps/explorer_web/lib/explorer_web/views/transaction_view.ex index c3b79874f2..6cbb68da70 100644 --- a/apps/explorer_web/lib/explorer_web/views/transaction_view.ex +++ b/apps/explorer_web/lib/explorer_web/views/transaction_view.ex @@ -32,6 +32,13 @@ defmodule ExplorerWeb.TransactionView do end end + def qr_code(%Transaction{hash: hash}) do + hash + |> to_string() + |> QRCode.to_png() + |> Base.encode64() + end + defp fee_to_currency({fee_type, fee}, denomination: denomination) do {fee_type, format_wei_value(Wei.from(fee, :wei), denomination)} end diff --git a/apps/explorer_web/mix.exs b/apps/explorer_web/mix.exs index 1021207a6e..4678065b7a 100644 --- a/apps/explorer_web/mix.exs +++ b/apps/explorer_web/mix.exs @@ -91,10 +91,11 @@ defmodule ExplorerWeb.Mixfile do {:scrivener_html, "~> 1.7"}, # Waiting on https://github.com/smeevil/set_locale/pull/9 {:set_locale, github: "minifast/set_locale", branch: "master"}, - {:sobelow, ">= 0.0.0", only: [:dev, :test], runtime: false}, + {:sobelow, ">= 0.7.0", only: [:dev, :test], runtime: false}, {:timex, "~> 3.1.24"}, {:timex_ecto, "~> 3.2.1"}, - {:wallaby, "~> 0.20", only: [:test], runtime: false} + {:wallaby, "~> 0.20", only: [:test], runtime: false}, + {:qrcode, "~> 0.1.0"} ] end diff --git a/apps/explorer_web/priv/gettext/default.pot b/apps/explorer_web/priv/gettext/default.pot index 3412f87e67..f8e7d4235b 100644 --- a/apps/explorer_web/priv/gettext/default.pot +++ b/apps/explorer_web/priv/gettext/default.pot @@ -5,7 +5,7 @@ #: lib/explorer_web/templates/chain/_blocks.html.eex:8 #: lib/explorer_web/templates/chain/_transactions.html.eex:11 #: lib/explorer_web/templates/transaction/index.html.eex:36 -#: lib/explorer_web/templates/transaction/overview.html.eex:38 +#: lib/explorer_web/templates/transaction/overview.html.eex:49 msgid "Age" msgstr "" @@ -29,7 +29,7 @@ msgstr "" #: lib/explorer_web/templates/block/index.html.eex:20 #: lib/explorer_web/templates/block_transaction/index.html.eex:88 -#: lib/explorer_web/templates/transaction/overview.html.eex:145 +#: lib/explorer_web/templates/transaction/overview.html.eex:170 msgid "Gas Used" msgstr "" @@ -67,7 +67,8 @@ msgstr "" #: lib/explorer_web/templates/chain/_transactions.html.eex:10 #: lib/explorer_web/templates/pending_transaction/index.html.eex:39 #: lib/explorer_web/templates/transaction/index.html.eex:39 -#: lib/explorer_web/templates/transaction/overview.html.eex:46 +#: lib/explorer_web/templates/transaction/overview.html.eex:57 +#: lib/explorer_web/templates/transaction/overview.html.eex:65 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:33 msgid "Value" msgstr "" @@ -82,7 +83,7 @@ msgstr "" #: lib/explorer_web/templates/block/index.html.eex:21 #: lib/explorer_web/templates/block_transaction/index.html.eex:96 -#: lib/explorer_web/templates/transaction/overview.html.eex:119 +#: lib/explorer_web/templates/transaction/overview.html.eex:137 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:34 msgid "Gas Limit" msgstr "" @@ -92,7 +93,7 @@ msgid "Miner" msgstr "" #: lib/explorer_web/templates/block_transaction/index.html.eex:104 -#: lib/explorer_web/templates/transaction/overview.html.eex:87 +#: lib/explorer_web/templates/transaction/overview.html.eex:105 msgid "Nonce" msgstr "" @@ -116,11 +117,11 @@ msgstr "" msgid "Total Difficulty" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:22 +#: lib/explorer_web/templates/transaction/overview.html.eex:33 msgid "Block Number" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:2 +#: lib/explorer_web/templates/transaction/overview.html.eex:11 msgid "Transaction Details" msgstr "" @@ -136,15 +137,15 @@ msgid "Gas" msgstr "" #: lib/explorer_web/templates/block/index.html.eex:22 -#: lib/explorer_web/templates/transaction/overview.html.eex:127 +#: lib/explorer_web/templates/transaction/overview.html.eex:145 msgid "Gas Price" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:153 +#: lib/explorer_web/templates/transaction/overview.html.eex:178 msgid "Input" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:33 +#: lib/explorer_web/templates/transaction/overview.html.eex:44 msgid "%{confirmations} block confirmations" msgstr "" @@ -152,6 +153,7 @@ msgstr "" msgid "%{count} transactions in this block" msgstr "" +#: lib/explorer_web/templates/address/overview.html.eex:11 #: lib/explorer_web/templates/transaction_log/index.html.eex:29 #: lib/explorer_web/views/address_view.ex:17 msgid "Address" @@ -165,7 +167,7 @@ msgstr "" #: lib/explorer_web/templates/chain/_transactions.html.eex:8 #: lib/explorer_web/templates/pending_transaction/index.html.eex:37 #: lib/explorer_web/templates/transaction/index.html.eex:37 -#: lib/explorer_web/templates/transaction/overview.html.eex:55 +#: lib/explorer_web/templates/transaction/overview.html.eex:73 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:31 #: lib/explorer_web/views/address_internal_transaction_view.ex:9 #: lib/explorer_web/views/address_transaction_view.ex:11 @@ -177,7 +179,7 @@ msgstr "" msgid "Overview" msgstr "" -#: lib/explorer_web/views/transaction_view.ex:109 +#: lib/explorer_web/views/transaction_view.ex:116 msgid "Success" msgstr "" @@ -189,7 +191,7 @@ msgstr "" #: lib/explorer_web/templates/chain/_transactions.html.eex:9 #: lib/explorer_web/templates/pending_transaction/index.html.eex:38 #: lib/explorer_web/templates/transaction/index.html.eex:38 -#: lib/explorer_web/templates/transaction/overview.html.eex:71 +#: lib/explorer_web/templates/transaction/overview.html.eex:89 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:32 #: lib/explorer_web/views/address_internal_transaction_view.ex:8 #: lib/explorer_web/views/address_transaction_view.ex:10 @@ -201,11 +203,12 @@ msgstr "" msgid "Transaction Hash" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:13 +#: lib/explorer_web/templates/transaction/overview.html.eex:24 msgid "Transaction Status" msgstr "" -#: lib/explorer_web/templates/address/overview.html.eex:13 +#: lib/explorer_web/templates/address/overview.html.eex:24 +#: lib/explorer_web/templates/address/overview.html.eex:32 msgid "Balance" msgstr "" @@ -235,21 +238,21 @@ msgstr "" #: lib/explorer_web/templates/layout/_topnav.html.eex:31 #: lib/explorer_web/templates/pending_transaction/index.html.eex:21 #: lib/explorer_web/templates/transaction/index.html.eex:21 -#: lib/explorer_web/templates/transaction/overview.html.eex:65 -#: lib/explorer_web/templates/transaction/overview.html.eex:81 +#: lib/explorer_web/templates/transaction/overview.html.eex:83 +#: lib/explorer_web/templates/transaction/overview.html.eex:99 #: lib/explorer_web/views/transaction_view.ex:18 -#: lib/explorer_web/views/transaction_view.ex:65 #: lib/explorer_web/views/transaction_view.ex:72 -#: lib/explorer_web/views/transaction_view.ex:108 +#: lib/explorer_web/views/transaction_view.ex:79 +#: lib/explorer_web/views/transaction_view.ex:115 msgid "Pending" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:101 +#: lib/explorer_web/templates/transaction/overview.html.eex:119 msgid "First Seen" msgstr "" #: lib/explorer_web/templates/pending_transaction/index.html.eex:36 -#: lib/explorer_web/templates/transaction/overview.html.eex:110 +#: lib/explorer_web/templates/transaction/overview.html.eex:128 msgid "Last Seen" msgstr "" @@ -303,11 +306,11 @@ msgstr "" msgid "Next Page" msgstr "" -#: lib/explorer_web/views/transaction_view.ex:106 +#: lib/explorer_web/views/transaction_view.ex:113 msgid "Failed" msgstr "" -#: lib/explorer_web/views/transaction_view.ex:107 +#: lib/explorer_web/views/transaction_view.ex:114 msgid "Out of Gas" msgstr "" @@ -326,11 +329,14 @@ msgstr "" msgid "Showing #%{number}" msgstr "" +#: lib/explorer_web/templates/address/overview.html.eex:24 #: lib/explorer_web/templates/address_internal_transaction/index.html.eex:84 #: lib/explorer_web/templates/address_transaction/index.html.eex:87 #: lib/explorer_web/templates/chain/_transactions.html.eex:10 #: lib/explorer_web/templates/pending_transaction/index.html.eex:39 #: lib/explorer_web/templates/transaction/index.html.eex:39 +#: lib/explorer_web/templates/transaction/overview.html.eex:57 +#: lib/explorer_web/templates/transaction/overview.html.eex:154 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:33 #: lib/explorer_web/views/wei_helpers.ex:71 msgid "Ether" @@ -424,11 +430,14 @@ msgstr "" msgid "Price" msgstr "" +#: lib/explorer_web/templates/address/overview.html.eex:32 +#: lib/explorer_web/templates/transaction/overview.html.eex:65 +#: lib/explorer_web/templates/transaction/overview.html.eex:162 #: lib/explorer_web/views/currency_helpers.ex:32 msgid "USD" msgstr "" -#: lib/explorer_web/templates/address/overview.html.eex:22 +#: lib/explorer_web/templates/address/overview.html.eex:40 msgid "Number of Transactions" msgstr "" @@ -477,7 +486,8 @@ msgstr "" msgid "View All" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:136 +#: lib/explorer_web/templates/transaction/overview.html.eex:154 +#: lib/explorer_web/templates/transaction/overview.html.eex:162 msgid "TX Fee" msgstr "" diff --git a/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po index 7af6e5731f..96584fbac1 100644 --- a/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po @@ -17,7 +17,7 @@ msgstr "" #: lib/explorer_web/templates/chain/_blocks.html.eex:8 #: lib/explorer_web/templates/chain/_transactions.html.eex:11 #: lib/explorer_web/templates/transaction/index.html.eex:36 -#: lib/explorer_web/templates/transaction/overview.html.eex:38 +#: lib/explorer_web/templates/transaction/overview.html.eex:49 msgid "Age" msgstr "Age" @@ -41,7 +41,7 @@ msgstr "%{year} POA Network Ltd. All rights reserved" #: lib/explorer_web/templates/block/index.html.eex:20 #: lib/explorer_web/templates/block_transaction/index.html.eex:88 -#: lib/explorer_web/templates/transaction/overview.html.eex:145 +#: lib/explorer_web/templates/transaction/overview.html.eex:170 msgid "Gas Used" msgstr "Gas Used" @@ -79,7 +79,8 @@ msgstr "Transactions" #: lib/explorer_web/templates/chain/_transactions.html.eex:10 #: lib/explorer_web/templates/pending_transaction/index.html.eex:39 #: lib/explorer_web/templates/transaction/index.html.eex:39 -#: lib/explorer_web/templates/transaction/overview.html.eex:46 +#: lib/explorer_web/templates/transaction/overview.html.eex:57 +#: lib/explorer_web/templates/transaction/overview.html.eex:65 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:33 msgid "Value" msgstr "Value" @@ -94,7 +95,7 @@ msgstr "Difficulty" #: lib/explorer_web/templates/block/index.html.eex:21 #: lib/explorer_web/templates/block_transaction/index.html.eex:96 -#: lib/explorer_web/templates/transaction/overview.html.eex:119 +#: lib/explorer_web/templates/transaction/overview.html.eex:137 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:34 msgid "Gas Limit" msgstr "Gas Limit" @@ -104,7 +105,7 @@ msgid "Miner" msgstr "Validator" #: lib/explorer_web/templates/block_transaction/index.html.eex:104 -#: lib/explorer_web/templates/transaction/overview.html.eex:87 +#: lib/explorer_web/templates/transaction/overview.html.eex:105 msgid "Nonce" msgstr "Nonce" @@ -128,11 +129,11 @@ msgstr "Timestamp" msgid "Total Difficulty" msgstr "Total Difficulty" -#: lib/explorer_web/templates/transaction/overview.html.eex:22 +#: lib/explorer_web/templates/transaction/overview.html.eex:33 msgid "Block Number" msgstr "Block Height" -#: lib/explorer_web/templates/transaction/overview.html.eex:2 +#: lib/explorer_web/templates/transaction/overview.html.eex:11 msgid "Transaction Details" msgstr "Transaction Details" @@ -148,15 +149,15 @@ msgid "Gas" msgstr "Gas" #: lib/explorer_web/templates/block/index.html.eex:22 -#: lib/explorer_web/templates/transaction/overview.html.eex:127 +#: lib/explorer_web/templates/transaction/overview.html.eex:145 msgid "Gas Price" msgstr "Gas Price" -#: lib/explorer_web/templates/transaction/overview.html.eex:153 +#: lib/explorer_web/templates/transaction/overview.html.eex:178 msgid "Input" msgstr "Input" -#: lib/explorer_web/templates/transaction/overview.html.eex:33 +#: lib/explorer_web/templates/transaction/overview.html.eex:44 msgid "%{confirmations} block confirmations" msgstr "%{confirmations} block confirmations" @@ -164,6 +165,7 @@ msgstr "%{confirmations} block confirmations" msgid "%{count} transactions in this block" msgstr "%{count} transactions in this block" +#: lib/explorer_web/templates/address/overview.html.eex:11 #: lib/explorer_web/templates/transaction_log/index.html.eex:29 #: lib/explorer_web/views/address_view.ex:17 msgid "Address" @@ -177,7 +179,7 @@ msgstr "Address" #: lib/explorer_web/templates/chain/_transactions.html.eex:8 #: lib/explorer_web/templates/pending_transaction/index.html.eex:37 #: lib/explorer_web/templates/transaction/index.html.eex:37 -#: lib/explorer_web/templates/transaction/overview.html.eex:55 +#: lib/explorer_web/templates/transaction/overview.html.eex:73 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:31 #: lib/explorer_web/views/address_internal_transaction_view.ex:9 #: lib/explorer_web/views/address_transaction_view.ex:11 @@ -189,7 +191,7 @@ msgstr "From" msgid "Overview" msgstr "Overview" -#: lib/explorer_web/views/transaction_view.ex:109 +#: lib/explorer_web/views/transaction_view.ex:116 msgid "Success" msgstr "Success" @@ -201,7 +203,7 @@ msgstr "Success" #: lib/explorer_web/templates/chain/_transactions.html.eex:9 #: lib/explorer_web/templates/pending_transaction/index.html.eex:38 #: lib/explorer_web/templates/transaction/index.html.eex:38 -#: lib/explorer_web/templates/transaction/overview.html.eex:71 +#: lib/explorer_web/templates/transaction/overview.html.eex:89 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:32 #: lib/explorer_web/views/address_internal_transaction_view.ex:8 #: lib/explorer_web/views/address_transaction_view.ex:10 @@ -213,11 +215,12 @@ msgstr "To" msgid "Transaction Hash" msgstr "Transaction Hash" -#: lib/explorer_web/templates/transaction/overview.html.eex:13 +#: lib/explorer_web/templates/transaction/overview.html.eex:24 msgid "Transaction Status" msgstr "Transaction Status" -#: lib/explorer_web/templates/address/overview.html.eex:13 +#: lib/explorer_web/templates/address/overview.html.eex:24 +#: lib/explorer_web/templates/address/overview.html.eex:32 msgid "Balance" msgstr "Balance" @@ -247,21 +250,21 @@ msgstr "Showing %{count} Transactions" #: lib/explorer_web/templates/layout/_topnav.html.eex:31 #: lib/explorer_web/templates/pending_transaction/index.html.eex:21 #: lib/explorer_web/templates/transaction/index.html.eex:21 -#: lib/explorer_web/templates/transaction/overview.html.eex:65 -#: lib/explorer_web/templates/transaction/overview.html.eex:81 +#: lib/explorer_web/templates/transaction/overview.html.eex:83 +#: lib/explorer_web/templates/transaction/overview.html.eex:99 #: lib/explorer_web/views/transaction_view.ex:18 -#: lib/explorer_web/views/transaction_view.ex:65 #: lib/explorer_web/views/transaction_view.ex:72 -#: lib/explorer_web/views/transaction_view.ex:108 +#: lib/explorer_web/views/transaction_view.ex:79 +#: lib/explorer_web/views/transaction_view.ex:115 msgid "Pending" msgstr "Pending" -#: lib/explorer_web/templates/transaction/overview.html.eex:101 +#: lib/explorer_web/templates/transaction/overview.html.eex:119 msgid "First Seen" msgstr "" #: lib/explorer_web/templates/pending_transaction/index.html.eex:36 -#: lib/explorer_web/templates/transaction/overview.html.eex:110 +#: lib/explorer_web/templates/transaction/overview.html.eex:128 msgid "Last Seen" msgstr "" @@ -315,11 +318,11 @@ msgstr "" msgid "Next Page" msgstr "" -#: lib/explorer_web/views/transaction_view.ex:106 +#: lib/explorer_web/views/transaction_view.ex:113 msgid "Failed" msgstr "" -#: lib/explorer_web/views/transaction_view.ex:107 +#: lib/explorer_web/views/transaction_view.ex:114 msgid "Out of Gas" msgstr "" @@ -338,11 +341,14 @@ msgstr "" msgid "Showing #%{number}" msgstr "" +#: lib/explorer_web/templates/address/overview.html.eex:24 #: lib/explorer_web/templates/address_internal_transaction/index.html.eex:84 #: lib/explorer_web/templates/address_transaction/index.html.eex:87 #: lib/explorer_web/templates/chain/_transactions.html.eex:10 #: lib/explorer_web/templates/pending_transaction/index.html.eex:39 #: lib/explorer_web/templates/transaction/index.html.eex:39 +#: lib/explorer_web/templates/transaction/overview.html.eex:57 +#: lib/explorer_web/templates/transaction/overview.html.eex:154 #: lib/explorer_web/templates/transaction_internal_transaction/index.html.eex:33 #: lib/explorer_web/views/wei_helpers.ex:71 msgid "Ether" @@ -436,11 +442,14 @@ msgstr "" msgid "Price" msgstr "" +#: lib/explorer_web/templates/address/overview.html.eex:32 +#: lib/explorer_web/templates/transaction/overview.html.eex:65 +#: lib/explorer_web/templates/transaction/overview.html.eex:162 #: lib/explorer_web/views/currency_helpers.ex:32 msgid "USD" msgstr "" -#: lib/explorer_web/templates/address/overview.html.eex:22 +#: lib/explorer_web/templates/address/overview.html.eex:40 msgid "Number of Transactions" msgstr "" @@ -489,7 +498,8 @@ msgstr "" msgid "View All" msgstr "" -#: lib/explorer_web/templates/transaction/overview.html.eex:136 +#: lib/explorer_web/templates/transaction/overview.html.eex:154 +#: lib/explorer_web/templates/transaction/overview.html.eex:162 msgid "TX Fee" msgstr "" diff --git a/apps/explorer_web/test/explorer_web/views/address_view_test.exs b/apps/explorer_web/test/explorer_web/views/address_view_test.exs index e3c15f3f0d..2372f56eb5 100644 --- a/apps/explorer_web/test/explorer_web/views/address_view_test.exs +++ b/apps/explorer_web/test/explorer_web/views/address_view_test.exs @@ -23,4 +23,11 @@ defmodule ExplorerWeb.AddressViewTest do assert "$0.000005 USD" == AddressView.formatted_usd(address, token) end end + + describe "qr_code/1" do + test "it returns an encoded value" do + address = build(:address) + assert {:ok, _} = Base.decode64(AddressView.qr_code(address)) + end + end end diff --git a/apps/explorer_web/test/explorer_web/views/transaction_view_test.exs b/apps/explorer_web/test/explorer_web/views/transaction_view_test.exs index bfdf9d6a93..996c3cb071 100644 --- a/apps/explorer_web/test/explorer_web/views/transaction_view_test.exs +++ b/apps/explorer_web/test/explorer_web/views/transaction_view_test.exs @@ -83,4 +83,11 @@ defmodule ExplorerWeb.TransactionViewTest do assert TransactionView.formatted_status(transaction) == "Success" end end + + describe "qr_code/1" do + test "it returns an encoded value" do + transaction = build(:transaction) + assert {:ok, _} = Base.decode64(TransactionView.qr_code(transaction)) + end + end end diff --git a/mix.lock b/mix.lock index 737ebe6f39..584a6d1877 100644 --- a/mix.lock +++ b/mix.lock @@ -58,6 +58,7 @@ "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"}, "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], [], "hexpm"}, "postgrex": {:hex, :postgrex, "0.13.5", "3d931aba29363e1443da167a4b12f06dcd171103c424de15e5f3fc2ba3e6d9c5", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 1.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm"}, + "qrcode": {:hex, :qrcode, "0.1.1", "9ca0d512a3c69a07d28e7660b046f8f3d835ef5462063814a7639a27302f7213", [:mix], [], "hexpm"}, "ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], [], "hexpm"}, "redix": {:hex, :redix, "0.6.1", "20986b0e02f02b13e6f53c79a1ae70aa83147488c408f40275ec261f5bb0a6d0", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"}, "redix_pubsub": {:hex, :redix_pubsub, "0.4.1", "26e6a69129072ac2226be49139019bdf951bb1e9e210a773c1372acf88100936", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:redix, "~> 0.6.0", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm"}, @@ -65,7 +66,7 @@ "scrivener_ecto": {:hex, :scrivener_ecto, "1.3.0", "69698428e22810ac8a47abc12d1df5b2f5d8f6b36dc5d5bfe6dd93fde857c576", [:mix], [{:ecto, "~> 2.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.11.0 or ~> 0.12.0 or ~> 0.13.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm"}, "scrivener_html": {:hex, :scrivener_html, "1.7.1", "afa35128fb36184bc469e4531bb1ef61b2d91bb29e373157068c62332291485f", [:mix], [{:phoenix, "~> 1.0-pre and < 1.4.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.2", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.1", [hex: :plug, repo: "hexpm", optional: false]}, {:scrivener, "~> 1.2 or ~> 2.0", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm"}, "set_locale": {:git, "https://github.com/minifast/set_locale.git", "da9ae029642bc0fbd9212c2aaf86c0adca70c084", [branch: "master"]}, - "sobelow": {:hex, :sobelow, "0.6.9", "da695ec58398a424841f0e5042f9e7bcf5dcb1e5d54bfe82637ed00dcbe75cef", [:mix], [], "hexpm"}, + "sobelow": {:hex, :sobelow, "0.7.0", "68ac7cb55040e8d33fb0e5df0008b4f612d2b97ea2bc99a013967a9a200ffc57", [:mix], [], "hexpm"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"}, "timex": {:hex, :timex, "3.1.25", "6002dae5432f749d1c93e2cd103eb73cecb53e50d2c885349e8e4146fc96bd44", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"}, "timex_ecto": {:hex, :timex_ecto, "3.2.1", "461140751026e1ca03298fab628f78ab189e78784175f5e301eefa034ee530aa", [:mix], [{:ecto, "~> 2.2", [hex: :ecto, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm"},