-
-
-
-
-
+
-
- - <%= gettext("Block Details") %> -
-
- <%= block_not_found_message(@block_above_tip) %>
-
-
+
-
+
\ No newline at end of file
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex
index 97df28640a..c34d84824a 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex
@@ -1,47 +1,33 @@
+ 
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- <%= gettext "Transaction Details" %>
-
-
- <%= gettext("The transaction %{bold_hash} was not processed yet", bold_hash: "#{@transaction_hash}") |> raw() %> -
-
-
-
-
- - <%= gettext("The transaction %{bold_hash} was not processed yet", bold_hash: "#{@transaction_hash}") |> raw() %> -
-
-
+ <%= gettext "Once we have the transaction's data this page will refresh automatically" %>
-<%= gettext "The possible reasons for this transaction not being processed include the following:" %>
--
-
- <%= gettext "The transaction was made a few seconds ago" %> -
- <%= gettext "The transaction may be in the pool of a node that didn't broadcast it yet" %> -
- <%= gettext "Some transactions may take a while longer to be indexed depending on the load on the network" %> -
- <%= gettext "The transaction still does not exist" %> -
+
\ No newline at end of file
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 1de0664736..38261f6cac 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -307,13 +307,11 @@ msgid "Copy Address"
msgstr ""
#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:10
#: lib/block_scout_web/templates/transaction/overview.html.eex:16
msgid "Copy Transaction Hash"
msgstr ""
#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:14
#: lib/block_scout_web/templates/transaction/overview.html.eex:20
msgid "Copy Txn Hash"
msgstr ""
@@ -894,7 +892,6 @@ msgid "Transaction %{transaction}, %{subnetwork} %{transaction}"
msgstr ""
#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:22
#: lib/block_scout_web/templates/transaction/overview.html.eex:11
msgid "Transaction Details"
msgstr ""
@@ -1130,11 +1127,6 @@ msgstr ""
msgid "Raw Input"
msgstr ""
-#, elixir-format
-#: lib/block_scout_web/templates/block_transaction/404.html.eex:7
-msgid "Block Details"
-msgstr ""
-
#, elixir-format
#: lib/block_scout_web/views/block_transaction_view.ex:15
msgid "Block not found, please try again later."
@@ -1155,41 +1147,6 @@ msgstr ""
msgid "Invalid Transaction Hash"
msgstr ""
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:33
-msgid "Once we have the transaction's data this page will refresh automatically"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:38
-msgid "Some transactions may take a while longer to be indexed depending on the load on the network"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:34
-msgid "The possible reasons for this transaction not being processed include the following:"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:29
-msgid "The transaction %{bold_hash} was not processed yet"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:37
-msgid "The transaction may be in the pool of a node that didn't broadcast it yet"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:39
-msgid "The transaction still does not exist"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:36
-msgid "The transaction was made a few seconds ago"
-msgstr ""
-
#, elixir-format
#: lib/block_scout_web/templates/transaction/invalid.html.eex:8
msgid "is not a valid transaction hash"
@@ -1709,6 +1666,11 @@ msgstr ""
msgid "of"
msgstr ""
+#, elixir-format
+#: lib/block_scout_web/templates/block_transaction/404.html.eex:7
+msgid "Block Details"
+msgstr ""
+
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:83
msgid "Contract Byte Code"
@@ -1738,3 +1700,33 @@ msgstr ""
#: lib/block_scout_web/templates/address_logs/index.html.eex:77
msgid "There are no logs for this address."
msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:7
+msgid "Sorry, We are unable to locate this transaction Hash"
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:12
+msgid "If you have just submitted this transaction please wait for at least 30 seconds before refreshing this page."
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:30
+msgid "Back Home"
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:22
+msgid "During times when the network is busy (i.e during ICOs) it can take a while for your transaction to propagate through the network and for us to index it."
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:26
+msgid "If it still does not show up after 1 hour, please check with your sender/exchange/wallet/transaction provider for additional information."
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:16
+msgid "It could still be in the TX Pool of a different node, waiting to be broadcasted."
+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 0a763e8878..62bbed2f37 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
@@ -307,13 +307,11 @@ msgid "Copy Address"
msgstr ""
#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:10
#: lib/block_scout_web/templates/transaction/overview.html.eex:16
msgid "Copy Transaction Hash"
msgstr ""
#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:14
#: lib/block_scout_web/templates/transaction/overview.html.eex:20
msgid "Copy Txn Hash"
msgstr ""
@@ -894,7 +892,6 @@ msgid "Transaction %{transaction}, %{subnetwork} %{transaction}"
msgstr ""
#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:22
#: lib/block_scout_web/templates/transaction/overview.html.eex:11
msgid "Transaction Details"
msgstr ""
@@ -1129,11 +1126,6 @@ msgstr ""
msgid "Raw Input"
msgstr ""
-#, elixir-format
-#: lib/block_scout_web/templates/block_transaction/404.html.eex:7
-msgid "Block Details"
-msgstr ""
-
#, elixir-format
#: lib/block_scout_web/views/block_transaction_view.ex:15
msgid "Block not found, please try again later."
@@ -1154,41 +1146,6 @@ msgstr ""
msgid "Invalid Transaction Hash"
msgstr ""
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:33
-msgid "Once we have the transaction's data this page will refresh automatically"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:38
-msgid "Some transactions may take a while longer to be indexed depending on the load on the network"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:34
-msgid "The possible reasons for this transaction not being processed include the following:"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:29
-msgid "The transaction %{bold_hash} was not processed yet"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:37
-msgid "The transaction may be in the pool of a node that didn't broadcast it yet"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:39
-msgid "The transaction still does not exist"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/transaction/not_found.html.eex:36
-msgid "The transaction was made a few seconds ago"
-msgstr ""
-
#, elixir-format
#: lib/block_scout_web/templates/transaction/invalid.html.eex:8
msgid "is not a valid transaction hash"
@@ -1708,6 +1665,11 @@ msgstr ""
msgid "of"
msgstr ""
+#, elixir-format
+#: lib/block_scout_web/templates/block_transaction/404.html.eex:7
+msgid "Block Details"
+msgstr ""
+
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:83
msgid "Contract Byte Code"
@@ -1737,3 +1699,33 @@ msgstr ""
#: lib/block_scout_web/templates/address_logs/index.html.eex:77
msgid "There are no logs for this address."
msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:7
+msgid "Sorry, We are unable to locate this transaction Hash"
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:12
+msgid "If you have just submitted this transaction please wait for at least 30 seconds before refreshing this page."
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:30
+msgid "Back Home"
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:22
+msgid "During times when the network is busy (i.e during ICOs) it can take a while for your transaction to propagate through the network and for us to index it."
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:26
+msgid "If it still does not show up after 1 hour, please check with your sender/exchange/wallet/transaction provider for additional information."
+msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/transaction/not_found.html.eex:16
+msgid "It could still be in the TX Pool of a different node, waiting to be broadcasted."
+msgstr ""
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs
index 993b25fcec..e6a0e7e702 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs
@@ -5,7 +5,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do
alias BlockScoutWeb.API.RPC.AddressController
alias Explorer.Chain
- alias Explorer.Chain.{BlockNumberCache, Events.Subscriber, Transaction, Wei}
+ alias Explorer.Chain.{Events.Subscriber, Transaction, Wei}
alias Explorer.Counters.{AddressesWithBalanceCounter, AverageBlockTime}
alias Indexer.Fetcher.CoinBalanceOnDemand
alias Explorer.Repo
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs
index 6a4e2ebf32..b8f6233e49 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs
@@ -165,7 +165,7 @@ defmodule BlockScoutWeb.BlockTransactionControllerTest do
defp assert_block_above_tip(conn) do
assert conn
|> html_response(404)
- |> Floki.find(~S|[data-selector="block-not-found-message"|)
+ |> Floki.find(~S|.error-descr|)
|> Floki.text()
|> String.trim() == "Easy Cowboy! This block does not exist yet!"
end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex
index d56a85cd9f..98174be69a 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex
@@ -173,6 +173,7 @@ defmodule EthereumJSONRPC.Parity.FetchedBeneficiaries do
defp get_address_type(reward_type, index) when reward_type == "external" and index == 1, do: :emission_funds
defp get_address_type(reward_type, index) when reward_type == "external" and index == 2, do: :validator
defp get_address_type(reward_type, index) when reward_type == "external" and index == 3, do: :validator
+ defp get_address_type(reward_type, index) when reward_type == "external" and index == 4, do: :validator
defp get_address_type(reward_type, _index) when reward_type == "block", do: :validator
defp get_address_type(reward_type, _index) when reward_type == "uncle", do: :uncle
end
+ 
+
+
+
+
-
+ <%= gettext("Sorry, We are unable to locate this transaction Hash") %>
+
+
+ <%= gettext("Back Home") %>
+
+
+ 1
+
+ <%= gettext("If you have just submitted this transaction please wait for at least 30 seconds before refreshing this page.") %>
+
+ 2
+
+ <%= gettext("It could still be in the TX Pool of a different node, waiting to be broadcasted.") %>
+
+
+ 3
+
+ <%= gettext("During times when the network is busy (i.e during ICOs) it can take a while for your transaction to propagate through the network and for us to index it.") %>
+
+ 4
+
<%= gettext("If it still does not show up after 1 hour, please check with your sender/exchange/wallet/transaction provider for additional information.") %>