Merge pull request #5182 from blockscout/vb-fix-staking-dapp

Fix Staking Dapp styles

CHANGELOG.md

@@ -5,10 +5,10 @@
 - [#4690](https://github.com/blockscout/blockscout/pull/4690) - Improve pagination: introduce pagination with random access to pages; Integrate it to the Transactions List page
 
 ### Fixes
+- [#5172](https://github.com/blockscout/blockscout/pull/5172), [#5182](https://github.com/blockscout/blockscout/pull/5182) - Reduced the size of js bundles
 - [#5160](https://github.com/blockscout/blockscout/pull/5160) - Fix blocks validated hint
 - [#5155](https://github.com/blockscout/blockscout/pull/5155) - Fix get_implementation_abi_from_proxy/2 implementation
 - [#5154](https://github.com/blockscout/blockscout/pull/5154) - Fix token counters bug
-- [#4701](https://github.com/blockscout/blockscout/pull/4701) - Reduced the size of js bundles
 
 ### Chore
 - [#5171](https://github.com/blockscout/blockscout/pull/5171) - Replace lodash NPM package with tiny lodash modules

apps/block_scout_web/assets/js/pages/stakes.js

@@ -1,5 +1,3 @@
-import '../../css/stakes.scss'
-
 import $ from 'jquery'
 import _ from 'lodash'
 import { subscribeChannel } from '../socket'

apps/block_scout_web/assets/package-lock.json

@@ -95,10 +95,11 @@
       }
     },
     "../../../deps/phoenix": {
-      "version": "0.0.1"
+      "version": "1.5.13",
+      "license": "MIT"
     },
     "../../../deps/phoenix_html": {
-      "version": "0.0.1"
+      "version": "2.14.3"
     },
     "node_modules/@babel/code-frame": {
       "version": "7.16.7",

apps/block_scout_web/assets/webpack.config.js

@@ -90,6 +90,7 @@ const appJs =
       'async-listing-load': './js/lib/async_listing_load',
       'non-critical': './css/non-critical.scss',
       'main-page': './css/main-page.scss',
+      'staking': './css/stakes.scss',
       'tokens': './js/pages/token/search.js',
       'ad': './js/lib/ad.js',
       'text_ad': './js/lib/text_ad.js',

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

@@ -5,19 +5,25 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <%= if @view_module == Elixir.BlockScoutWeb.ChainView do %>
-      <link rel="stylesheet" href="<%= static_path(@conn, "/css/main-page.css") %>">
-      <link rel="preload" href="<%= static_path(@conn, "/js/chain.js") %>" as="script">
-      <link rel="preload" href="<%= static_path(@conn, "/js/chart-loader.js") %>" as="script">
-      <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/github.svg") %>" as="image" crossorigin>
-      <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/twitter.svg") %>" as="image" crossorigin>
-      <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/telegram.svg") %>" as="image" crossorigin>
-      <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/bar-chart.svg") %>" as="image" crossorigin>
-      <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/info-circle.svg") %>" as="image" crossorigin>
-      <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/tag.svg") %>" as="image" crossorigin>
-    <% else %>
-      <link rel="stylesheet" href="<%= static_path(@conn, "/css/app.css") %>">
+    <%= case @view_module do %>
+      <% Elixir.BlockScoutWeb.ChainView -> %>
+        <link rel="stylesheet" href="<%= static_path(@conn, "/css/main-page.css") %>">
+        <link rel="preload" href="<%= static_path(@conn, "/js/chain.js") %>" as="script">
+        <link rel="preload" href="<%= static_path(@conn, "/js/chart-loader.js") %>" as="script">
+        <link rel="preload" href="<%= static_path(@conn, "/js/token-transfers-toggle.js") %>" as="script">
+      <% Elixir.BlockScoutWeb.StakesView -> %>
+        <link rel="stylesheet" href="<%= static_path(@conn, "/css/staking.css") %>">
+        <link rel="stylesheet" href="<%= static_path(@conn, "/css/app.css") %>">
+      <% _ -> %>
+        <link rel="stylesheet" href="<%= static_path(@conn, "/css/app.css") %>">
     <% end %>
+    <link rel="preload" href="<%= static_path(@conn, "/js/autocomplete.js") %>" as="script">
+    <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/github.svg") %>" as="image" crossorigin>
+    <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/twitter.svg") %>" as="image" crossorigin>
+    <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/telegram.svg") %>" as="image" crossorigin>
+    <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/bar-chart.svg") %>" as="image" crossorigin>
+    <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/info-circle.svg") %>" as="image" crossorigin>
+    <link rel="preload" href="<%= static_path(@conn, "/images/icons/fontawesome/tag.svg") %>" as="image" crossorigin>
     <link rel="preload" href="<%= static_path(@conn, "/css/non-critical.css") %>" as="style" onload="this.onload=null;this.rel='stylesheet'">
     <link rel="stylesheet" href="<%= static_path(@conn, "/css/non-critical.css") %>">
     <%= render_existing(@view_module, "styles.html", assigns) %>

apps/block_scout_web/lib/block_scout_web/views/stakes_view.ex

@@ -2,8 +2,4 @@ defmodule BlockScoutWeb.StakesView do
   use BlockScoutWeb, :view
   import BlockScoutWeb.StakesHelpers
   alias Explorer.Chain
-
-  def render("styles.html", _) do
-    ~E(<link rel="stylesheet" href="/css/stakes.css">)
-  end
 end

apps/block_scout_web/priv/gettext/default.pot

@@ -99,7 +99,7 @@ msgid "(query)"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:183
+#: lib/block_scout_web/templates/layout/app.html.eex:189
 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate."
 msgstr ""
 
@@ -368,7 +368,7 @@ msgid "Block Height"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:40
+#: lib/block_scout_web/templates/layout/app.html.eex:46
 msgid "Block Mined, awaiting import..."
 msgstr ""
 
@@ -414,7 +414,7 @@ msgid "Blocks"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:39
+#: lib/block_scout_web/templates/layout/app.html.eex:45
 msgid "Blocks Indexed"
 msgstr ""
 
@@ -1105,7 +1105,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/index.html.eex:5 lib/block_scout_web/templates/address/overview.html.eex:180
 #: lib/block_scout_web/templates/block/overview.html.eex:209 lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:89 lib/block_scout_web/templates/layout/_topnav.html.eex:110
-#: lib/block_scout_web/templates/layout/app.html.eex:45 lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
+#: 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/_tile.html.eex:37 lib/block_scout_web/templates/transaction/overview.html.eex:411
 #: lib/block_scout_web/views/wei_helpers.ex:78
 msgid "Ether"
@@ -1331,7 +1331,7 @@ msgid "Indexed?"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:41
+#: lib/block_scout_web/templates/layout/app.html.eex:47
 msgid "Indexing Tokens"
 msgstr ""
 
@@ -1390,7 +1390,7 @@ msgid "Last Balance Update"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:42
+#: lib/block_scout_web/templates/layout/app.html.eex:48
 msgid "Less than"
 msgstr ""
 
@@ -1498,7 +1498,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:61
-#: lib/block_scout_web/templates/layout/app.html.eex:43 lib/block_scout_web/templates/tokens/overview/_details.html.eex:98
+#: lib/block_scout_web/templates/layout/app.html.eex:49 lib/block_scout_web/templates/tokens/overview/_details.html.eex:98
 #: lib/block_scout_web/views/address_view.ex:142
 msgid "Market Cap"
 msgstr ""
@@ -1843,7 +1843,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:41
-#: lib/block_scout_web/templates/layout/app.html.eex:44 lib/block_scout_web/templates/tokens/overview/_details.html.eex:109
+#: lib/block_scout_web/templates/layout/app.html.eex:50 lib/block_scout_web/templates/tokens/overview/_details.html.eex:109
 msgid "Price"
 msgstr ""
 
@@ -2775,7 +2775,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:92
-#: lib/block_scout_web/templates/layout/app.html.eex:46
+#: lib/block_scout_web/templates/layout/app.html.eex:52
 msgid "Tx/day"
 msgstr ""
 

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

@@ -99,7 +99,7 @@ msgid "(query)"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:183
+#: lib/block_scout_web/templates/layout/app.html.eex:189
 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate."
 msgstr ""
 
@@ -368,7 +368,7 @@ msgid "Block Height"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:40
+#: lib/block_scout_web/templates/layout/app.html.eex:46
 msgid "Block Mined, awaiting import..."
 msgstr ""
 
@@ -414,7 +414,7 @@ msgid "Blocks"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:39
+#: lib/block_scout_web/templates/layout/app.html.eex:45
 msgid "Blocks Indexed"
 msgstr ""
 
@@ -1105,7 +1105,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/index.html.eex:5 lib/block_scout_web/templates/address/overview.html.eex:180
 #: lib/block_scout_web/templates/block/overview.html.eex:209 lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:89 lib/block_scout_web/templates/layout/_topnav.html.eex:110
-#: lib/block_scout_web/templates/layout/app.html.eex:45 lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
+#: 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/_tile.html.eex:37 lib/block_scout_web/templates/transaction/overview.html.eex:411
 #: lib/block_scout_web/views/wei_helpers.ex:78
 msgid "Ether"
@@ -1331,7 +1331,7 @@ msgid "Indexed?"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:41
+#: lib/block_scout_web/templates/layout/app.html.eex:47
 msgid "Indexing Tokens"
 msgstr ""
 
@@ -1390,7 +1390,7 @@ msgid "Last Balance Update"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/layout/app.html.eex:42
+#: lib/block_scout_web/templates/layout/app.html.eex:48
 msgid "Less than"
 msgstr ""
 
@@ -1498,7 +1498,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:61
-#: lib/block_scout_web/templates/layout/app.html.eex:43 lib/block_scout_web/templates/tokens/overview/_details.html.eex:98
+#: lib/block_scout_web/templates/layout/app.html.eex:49 lib/block_scout_web/templates/tokens/overview/_details.html.eex:98
 #: lib/block_scout_web/views/address_view.ex:142
 msgid "Market Cap"
 msgstr ""
@@ -1843,7 +1843,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:41
-#: lib/block_scout_web/templates/layout/app.html.eex:44 lib/block_scout_web/templates/tokens/overview/_details.html.eex:109
+#: lib/block_scout_web/templates/layout/app.html.eex:50 lib/block_scout_web/templates/tokens/overview/_details.html.eex:109
 msgid "Price"
 msgstr ""
 
@@ -2775,7 +2775,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:92
-#: lib/block_scout_web/templates/layout/app.html.eex:46
+#: lib/block_scout_web/templates/layout/app.html.eex:52
 msgid "Tx/day"
 msgstr ""