Merge branch 'master' into rsk-support

CHANGELOG.md

@@ -14,7 +14,9 @@
 
 ### Chore
 
+ - [#1749](https://github.com/poanetwork/blockscout/pull/1749) - Replace the link in the footer with the official POA announcements tg channel link
  - [#1718](https://github.com/poanetwork/blockscout/pull/1718) - Flatten indexer module hierarchy and supervisor tree
+ - [#1753](https://github.com/poanetwork/blockscout/pull/1753) - Add a check mark to decompiled contract tab
 
 
 ## 1.3.9-beta

apps/block_scout_web/config/config.exs

@@ -93,7 +93,7 @@ config :block_scout_web, BlockScoutWeb.Gettext, locales: ~w(en), default_locale:
 
 config :block_scout_web, BlockScoutWeb.SocialMedia,
   twitter: "PoaNetwork",
-  telegram: "oraclesnetwork",
+  telegram: "poa_network",
   facebook: "PoaNetwork",
   instagram: "PoaNetwork"
 

apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex

@@ -64,8 +64,9 @@
       <%= link(
           to: address_decompiled_contract_path(@conn, :index, @address.hash),
           class: "nav-link #{tab_status("decompiled_contracts", @conn.request_path)}") do %>
-         <%= gettext("Decompiled code") %>
-      <% end %>
+          <%= gettext("Decompiled code") %>
+          <i class="far fa-check-circle text-success"></i>
+       <% end %>
     </li>
   <% end %>
 
@@ -131,6 +132,7 @@
                 to: address_decompiled_contract_path(@conn, :index, @address.hash),
                 class: "dropdown-item #{tab_status("contracts", @conn.request_path)}") do %>
              <%= gettext("Decompiled code") %>
+             <i class="far fa-check-circle text-success"></i>
           <% end %>
         <% end %>
         <% end %>

apps/block_scout_web/lib/block_scout_web/templates/address_decompiled_contract/index.html.eex

@@ -10,7 +10,7 @@
       <div class="card-body">
         <h3><%= gettext "Decompiler version" %></h3>
         <div class="tile tile-muted">
-          <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= contract.decompiler_version %></code></pre>
+          <pre class="pre-wrap"><code class="nohighlight"><%= contract.decompiler_version %></code></pre>
         </div>
         <br>
         <section>

apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex

@@ -17,7 +17,7 @@
           <a href="https://www.twitter.com/PoaNetwork/" rel="noreferrer" target="_blank" class="icon-link" data-toggle="tooltip" data-placement="top" title="<%= gettext("Twitter") %>">
             <i class="fab fa-twitter"></i>
           </a>
-          <a href="http://t.me/oraclesnetwork" rel="noreferrer" target="_blank" class="icon-link" data-toggle="tooltip" data-placement="top" title="<%= gettext("Telegram") %>">
+          <a href="https://t.me/poa_network" rel="noreferrer" target="_blank" class="icon-link" data-toggle="tooltip" data-placement="top" title="<%= gettext("Telegram") %>">
             <i class="fab fa-telegram-plane"></i>
           </a>
         </div>

apps/block_scout_web/priv/gettext/default.pot

@@ -188,7 +188,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:40
-#: lib/block_scout_web/templates/address/_tabs.html.eex:113
+#: lib/block_scout_web/templates/address/_tabs.html.eex:114
 #: lib/block_scout_web/templates/address/overview.html.eex:59
 #: lib/block_scout_web/templates/address_validation/index.html.eex:30
 #: lib/block_scout_web/templates/address_validation/index.html.eex:57
@@ -218,7 +218,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:53
-#: lib/block_scout_web/templates/address/_tabs.html.eex:123
+#: lib/block_scout_web/templates/address/_tabs.html.eex:124
 #: lib/block_scout_web/templates/address_validation/index.html.eex:39
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:119
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:141
@@ -488,7 +488,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:21
-#: lib/block_scout_web/templates/address/_tabs.html.eex:100
+#: lib/block_scout_web/templates/address/_tabs.html.eex:101
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:58
 #: lib/block_scout_web/templates/address_validation/index.html.eex:24
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:14
@@ -698,8 +698,8 @@ msgid "Query"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address/_tabs.html.eex:75
-#: lib/block_scout_web/templates/address/_tabs.html.eex:140
+#: lib/block_scout_web/templates/address/_tabs.html.eex:76
+#: lib/block_scout_web/templates/address/_tabs.html.eex:142
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:33
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:75
 #: lib/block_scout_web/views/address_view.ex:298
@@ -891,7 +891,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:13
-#: lib/block_scout_web/templates/address/_tabs.html.eex:95
+#: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/address_token/index.html.eex:11
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:12
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
@@ -948,7 +948,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:5
-#: lib/block_scout_web/templates/address/_tabs.html.eex:90
+#: lib/block_scout_web/templates/address/_tabs.html.eex:91
 #: lib/block_scout_web/templates/address_transaction/index.html.eex:53
 #: lib/block_scout_web/templates/address_validation/index.html.eex:14
 #: lib/block_scout_web/templates/block_transaction/index.html.eex:13
@@ -1399,7 +1399,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:30
-#: lib/block_scout_web/templates/address/_tabs.html.eex:106
+#: lib/block_scout_web/templates/address/_tabs.html.eex:107
 #: lib/block_scout_web/views/address_view.ex:299
 msgid "Coin Balance History"
 msgstr ""
@@ -1714,7 +1714,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:67
-#: lib/block_scout_web/templates/address/_tabs.html.eex:133
+#: lib/block_scout_web/templates/address/_tabs.html.eex:134
 msgid "Decompiled code"
 msgstr ""
 

apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

@@ -188,7 +188,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:40
-#: lib/block_scout_web/templates/address/_tabs.html.eex:113
+#: lib/block_scout_web/templates/address/_tabs.html.eex:114
 #: lib/block_scout_web/templates/address/overview.html.eex:59
 #: lib/block_scout_web/templates/address_validation/index.html.eex:30
 #: lib/block_scout_web/templates/address_validation/index.html.eex:57
@@ -218,7 +218,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:53
-#: lib/block_scout_web/templates/address/_tabs.html.eex:123
+#: lib/block_scout_web/templates/address/_tabs.html.eex:124
 #: lib/block_scout_web/templates/address_validation/index.html.eex:39
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:119
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:141
@@ -488,7 +488,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:21
-#: lib/block_scout_web/templates/address/_tabs.html.eex:100
+#: lib/block_scout_web/templates/address/_tabs.html.eex:101
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:58
 #: lib/block_scout_web/templates/address_validation/index.html.eex:24
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:14
@@ -698,8 +698,8 @@ msgid "Query"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address/_tabs.html.eex:75
-#: lib/block_scout_web/templates/address/_tabs.html.eex:140
+#: lib/block_scout_web/templates/address/_tabs.html.eex:76
+#: lib/block_scout_web/templates/address/_tabs.html.eex:142
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:33
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:75
 #: lib/block_scout_web/views/address_view.ex:298
@@ -891,7 +891,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:13
-#: lib/block_scout_web/templates/address/_tabs.html.eex:95
+#: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/address_token/index.html.eex:11
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:12
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
@@ -948,7 +948,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:5
-#: lib/block_scout_web/templates/address/_tabs.html.eex:90
+#: lib/block_scout_web/templates/address/_tabs.html.eex:91
 #: lib/block_scout_web/templates/address_transaction/index.html.eex:53
 #: lib/block_scout_web/templates/address_validation/index.html.eex:14
 #: lib/block_scout_web/templates/block_transaction/index.html.eex:13
@@ -1399,7 +1399,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:30
-#: lib/block_scout_web/templates/address/_tabs.html.eex:106
+#: lib/block_scout_web/templates/address/_tabs.html.eex:107
 #: lib/block_scout_web/views/address_view.ex:299
 msgid "Coin Balance History"
 msgstr ""
@@ -1714,7 +1714,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address/_tabs.html.eex:67
-#: lib/block_scout_web/templates/address/_tabs.html.eex:133
+#: lib/block_scout_web/templates/address/_tabs.html.eex:134
 msgid "Decompiled code"
 msgstr ""
 
@@ -1723,12 +1723,12 @@ msgstr ""
 msgid "Decompiled contract code"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/block_scout_web/templates/address_decompiled_contract/index.html.eex:11
 msgid "Decompiler version"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/block_scout_web/templates/address_contract_verification/new.html.eex:52
 msgid "Optimization runs"
 msgstr ""