fix conflicts

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

@@ -46,17 +46,18 @@
               <dd class="col-sm-8 col-md-10"><%= @address.smart_contract.evm_version %></dd>
             </dl>
           <% end %>
-          <dl class="row">
-            <dt class="col-sm-4 col-md-2 text-muted"><%= gettext "Optimization enabled" %></dt>
-            <dd class="col-sm-8 col-md-10"><%= format_optimization_text(@address.smart_contract.optimization) %></dd>
-          </dl>
-          <%= if @address.smart_contract.optimization && @address.smart_contract.optimization_runs do %>
-            <dl class="row">
-              <dt class="col-sm-4 col-md-2 text-muted"><%= gettext "Optimization runs" %></dt>
-              <dd class="col-sm-8 col-md-10"><%= @address.smart_contract.optimization_runs %></dd>
-            </dl>
-          <% end %>
         <hr/>
+        <%= if @address.smart_contract.constructor_arguments do %>
+          <section>
+            <div class="d-flex justify-content-between align-items-baseline">
+              <h3><%= gettext "Constructor Arguments" %></h3>
+            </div>
+            <div class="tile tile-muted mb-4">
+              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= raw(format_constructor_arguments(@address.smart_contract)) %></code>
+              </pre>
+            </div>
+          </section>
+        <% end %>
         <section>
           <div class="d-flex justify-content-between align-items-baseline">
             <h3><%= gettext "Contract source code" %></h3>

apps/block_scout_web/priv/gettext/default.pot

@@ -258,7 +258,7 @@ msgid "Connection Lost, click to load newer validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:74
+#: lib/block_scout_web/templates/address_contract/index.html.eex:75
 msgid "Contract ABI"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgid "Contract name:"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:62
+#: lib/block_scout_web/templates/address_contract/index.html.eex:63
 msgid "Contract source code"
 msgstr ""
 
@@ -1407,17 +1407,17 @@ msgid "Support"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:76
+#: lib/block_scout_web/templates/address_contract/index.html.eex:77
 msgid "Copy ABI"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:92
+#: lib/block_scout_web/templates/address_contract/index.html.eex:93
 msgid "Copy Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:64
+#: lib/block_scout_web/templates/address_contract/index.html.eex:65
 msgid "Copy Source Code"
 msgstr ""
 
@@ -1587,27 +1587,27 @@ msgid "Block Details"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:104
+#: lib/block_scout_web/templates/address_contract/index.html.eex:105
 msgid "Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:90
+#: lib/block_scout_web/templates/address_contract/index.html.eex:91
 msgid "Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:96
+#: lib/block_scout_web/templates/address_contract/index.html.eex:97
 msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:106
+#: lib/block_scout_web/templates/address_contract/index.html.eex:107
 msgid "Copy Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:97
+#: lib/block_scout_web/templates/address_contract/index.html.eex:98
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
@@ -1766,7 +1766,7 @@ msgid "ERC-721 "
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:119
+#: lib/block_scout_web/templates/address_contract/index.html.eex:120
 msgid "External libraries"
 msgstr ""
 
@@ -1801,6 +1801,6 @@ msgid "Connection Lost"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:52
+#: lib/block_scout_web/templates/address_contract/index.html.eex:53
 msgid "Constructor Arguments"
 msgstr ""

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

@@ -258,7 +258,7 @@ msgid "Connection Lost, click to load newer validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:74
+#: lib/block_scout_web/templates/address_contract/index.html.eex:75
 msgid "Contract ABI"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgid "Contract name:"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:62
+#: lib/block_scout_web/templates/address_contract/index.html.eex:63
 msgid "Contract source code"
 msgstr ""
 
@@ -1407,17 +1407,17 @@ msgid "Support"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:76
+#: lib/block_scout_web/templates/address_contract/index.html.eex:77
 msgid "Copy ABI"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:92
+#: lib/block_scout_web/templates/address_contract/index.html.eex:93
 msgid "Copy Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:64
+#: lib/block_scout_web/templates/address_contract/index.html.eex:65
 msgid "Copy Source Code"
 msgstr ""
 
@@ -1587,27 +1587,27 @@ msgid "Block Details"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:104
+#: lib/block_scout_web/templates/address_contract/index.html.eex:105
 msgid "Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:90
+#: lib/block_scout_web/templates/address_contract/index.html.eex:91
 msgid "Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:96
+#: lib/block_scout_web/templates/address_contract/index.html.eex:97
 msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:106
+#: lib/block_scout_web/templates/address_contract/index.html.eex:107
 msgid "Copy Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:97
+#: lib/block_scout_web/templates/address_contract/index.html.eex:98
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
@@ -1766,7 +1766,7 @@ msgid "ERC-721 "
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:119
+#: lib/block_scout_web/templates/address_contract/index.html.eex:120
 msgid "External libraries"
 msgstr ""
 
@@ -1800,7 +1800,7 @@ msgstr ""
 msgid "Connection Lost"
 msgstr ""
 
-#, elixir-format, fuzzy
-#: lib/block_scout_web/templates/address_contract/index.html.eex:52
+#, elixir-format
+#: lib/block_scout_web/templates/address_contract/index.html.eex:53
 msgid "Constructor Arguments"
 msgstr ""