Resolved conflicts 4bdfdfe

celo-org · Dec 19, 2022 · e4085be · e4085be
2 parents c74b322 + 4bdfdfe
commit e4085be
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#6303](https://github.com/blockscout/blockscout/pull/6303) - Fix some UI bugs
 - [#6243](https://github.com/blockscout/blockscout/pull/6243) - Fix freezes on `/blocks` page
 - [#6162](https://github.com/blockscout/blockscout/pull/6162) - Extend token symbol type varchar(255) -> text
 - [#6158](https://github.com/blockscout/blockscout/pull/6158) - Add missing clause for merge_twin_vyper_contract_with_changeset function

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
@@ -93,7 +93,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-n": "^15.6.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "jest": "^29.2.1",
     "jest-junit": "^10.0.0",

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex
@@ -115,7 +115,8 @@
                     "data-test": "transaction_hash_link"
                   ) %>
                 <% else %>
-                  <p class="alert alert-danger" role="alert"><%= gettext("Error: Could not determine contract creator.") %></p>
+                  <p class="alert alert-danger" role="alert"><%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html",
+                text: gettext("Contract was precompiled and created at genesis or contract creation transaction is missing") %><%= gettext("Error: Could not determine contract creator.") %></p>
                 <% end %>
               </dd>
             </dl>

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
@@ -205,7 +205,7 @@
               <%= render BlockScoutWeb.AddressView, "_labels.html", tags: @from_tags %>
               <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
                 additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
-                clipboard_text: from_address_hash,
+                clipboard_text: Address.checksum(from_address_hash),
                 aria_label: gettext("Copy From Address"),
                 title: gettext("Copy From Address") %>
             </dd>
@@ -232,15 +232,15 @@
                   &nbsp;<%= gettext("created") %>]
                   <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
                     additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
-                    clipboard_text: recipient_address_hash,
+                    clipboard_text: Address.checksum(recipient_address_hash),
                     aria_label: gettext("Copy To Address"),
                     title: gettext("Copy To Address") %>
                 <% recipient_address_hash -> %>
                   <%= render BlockScoutWeb.AddressView, "_link.html", address: to_address, contract: BlockScoutWeb.AddressView.contract?(to_address), use_custom_tooltip: false, trimmed: false %>
                   <%= render BlockScoutWeb.AddressView, "_labels.html", tags: @to_tags %>
                   <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html",
                     additional_classes: ["btn-copy-icon-small", "btn-copy-icon-custom", "btn-copy-icon-no-borders"],
-                    clipboard_text: recipient_address_hash,
+                    clipboard_text: Address.checksum(recipient_address_hash),
                     aria_label: gettext("Copy To Address"),
                     title: gettext("Copy To Address") %>
                 <% true -> %>

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
@@ -209,7 +209,7 @@ msgstr ""
 msgid "All metadata displayed below is from that contract. In order to verify current contract, click"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:238
+#: lib/block_scout_web/templates/address/overview.html.eex:239
 #, elixir-autogen, elixir-format
 msgid "All tokens in the account and total value."
 msgstr ""
@@ -246,7 +246,7 @@ msgid "Back Home"
 msgstr ""
 
 #: lib/block_scout_web/templates/account/watchlist/show.html.eex:24
-#: lib/block_scout_web/templates/address/overview.html.eex:149
+#: lib/block_scout_web/templates/address/overview.html.eex:150
 #: lib/block_scout_web/templates/address_token/overview.html.eex:51
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
 #, elixir-autogen, elixir-format
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Block number containing the transaction."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:321
+#: lib/block_scout_web/templates/address/overview.html.eex:322
 #, elixir-autogen, elixir-format
 msgid "Block number in which the address was updated."
 msgstr ""
@@ -360,7 +360,7 @@ msgid "Blocks Indexed"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
-#: lib/block_scout_web/templates/address/overview.html.eex:339
+#: lib/block_scout_web/templates/address/overview.html.eex:340
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
 #: lib/block_scout_web/views/address_view.ex:438
 #, elixir-autogen, elixir-format
@@ -372,11 +372,11 @@ msgstr ""
 msgid "Blockscout is a tool for inspecting and analyzing EVM based blockchains. Blockchain explorer for the Celo Network."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:178
-#: lib/block_scout_web/templates/address/overview.html.eex:191
-#: lib/block_scout_web/templates/address/overview.html.eex:204
-#: lib/block_scout_web/templates/address/overview.html.eex:217
-#: lib/block_scout_web/templates/address/overview.html.eex:230
+#: lib/block_scout_web/templates/address/overview.html.eex:179
+#: lib/block_scout_web/templates/address/overview.html.eex:192
+#: lib/block_scout_web/templates/address/overview.html.eex:205
+#: lib/block_scout_web/templates/address/overview.html.eex:218
+#: lib/block_scout_web/templates/address/overview.html.eex:231
 #: lib/block_scout_web/templates/epoch_transaction/_election_tile.html.eex:24
 #: lib/block_scout_web/templates/epoch_transaction/_epoch_tile.html.eex:23
 #: lib/block_scout_web/templates/verified_contracts/_tile.html.eex:29
@@ -1010,7 +1010,7 @@ msgstr ""
 msgid "Error: (Awaiting internal transactions for reason)"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:118
+#: lib/block_scout_web/templates/address/overview.html.eex:119
 #, elixir-autogen, elixir-format
 msgid "Error: Could not determine contract creator."
 msgstr ""
@@ -1112,7 +1112,7 @@ msgstr ""
 msgid "Gas Tracker"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:304
+#: lib/block_scout_web/templates/address/overview.html.eex:305
 #: lib/block_scout_web/templates/block/_tile.html.eex:92
 #: lib/block_scout_web/templates/block/overview.html.eex:250
 #: lib/block_scout_web/templates/block/overview.html.eex:352
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Gas Used by Transaction"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:303
+#: lib/block_scout_web/templates/address/overview.html.eex:304
 #, elixir-autogen, elixir-format
 msgid "Gas used by the address."
 msgstr ""
@@ -1196,7 +1196,7 @@ msgstr ""
 msgid "If you have just submitted this transaction please wait for at least 30 seconds before refreshing this page."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:131
+#: lib/block_scout_web/templates/address/overview.html.eex:132
 #, elixir-autogen, elixir-format
 msgid "Implementation"
 msgstr ""
@@ -1206,7 +1206,7 @@ msgstr ""
 msgid "Implementation Name:"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:130
+#: lib/block_scout_web/templates/address/overview.html.eex:131
 #, elixir-autogen, elixir-format
 msgid "Implementation address of the proxy contract."
 msgstr ""
@@ -1273,7 +1273,7 @@ msgstr ""
 msgid "It could still be in the TX Pool of a different node, waiting to be broadcasted."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:322
+#: lib/block_scout_web/templates/address/overview.html.eex:323
 #, elixir-autogen, elixir-format
 msgid "Last Balance Update"
 msgstr ""
@@ -1311,7 +1311,7 @@ msgstr ""
 msgid "License ID"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:214
+#: lib/block_scout_web/templates/address/overview.html.eex:215
 #, elixir-autogen, elixir-format
 msgid "Lifetime Voting Rewards"
 msgstr ""
@@ -1547,12 +1547,12 @@ msgstr ""
 msgid "Not unique Token"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:249
+#: lib/block_scout_web/templates/address/overview.html.eex:250
 #, elixir-autogen, elixir-format
 msgid "Number of transactions related to this address."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:276
+#: lib/block_scout_web/templates/address/overview.html.eex:277
 #, elixir-autogen, elixir-format
 msgid "Number of transfers to/from this address."
 msgstr ""
@@ -2313,7 +2313,7 @@ msgid "Token name and symbol."
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:21
-#: lib/block_scout_web/templates/address/overview.html.eex:239
+#: lib/block_scout_web/templates/address/overview.html.eex:240
 #: lib/block_scout_web/templates/address_token/overview.html.eex:58
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/tokens/index.html.eex:9
@@ -2448,9 +2448,9 @@ msgid "Transaction type, introduced in EIP-2718."
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:7
-#: lib/block_scout_web/templates/address/overview.html.eex:250
-#: lib/block_scout_web/templates/address/overview.html.eex:256
-#: lib/block_scout_web/templates/address/overview.html.eex:264
+#: lib/block_scout_web/templates/address/overview.html.eex:251
+#: lib/block_scout_web/templates/address/overview.html.eex:257
+#: lib/block_scout_web/templates/address/overview.html.eex:265
 #: lib/block_scout_web/templates/address_transaction/index.html.eex:13
 #: lib/block_scout_web/templates/block/_tabs.html.eex:4
 #: lib/block_scout_web/templates/block/overview.html.eex:120
@@ -2471,9 +2471,9 @@ msgstr ""
 msgid "Transactions sent"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:277
-#: lib/block_scout_web/templates/address/overview.html.eex:283
-#: lib/block_scout_web/templates/address/overview.html.eex:291
+#: lib/block_scout_web/templates/address/overview.html.eex:278
+#: lib/block_scout_web/templates/address/overview.html.eex:284
+#: lib/block_scout_web/templates/address/overview.html.eex:292
 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:50
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:118
 #, elixir-autogen, elixir-format
@@ -2726,7 +2726,7 @@ msgstr ""
 msgid "Voting Rewards"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:213
+#: lib/block_scout_web/templates/address/overview.html.eex:214
 #, elixir-autogen, elixir-format
 msgid "Voting rewards accumulated over time."
 msgstr ""
@@ -2808,7 +2808,7 @@ msgstr ""
 msgid "cStables"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:230
+#: lib/block_scout_web/templates/address/overview.html.eex:231
 #, elixir-autogen, elixir-format
 msgid "cUSD"
 msgstr ""
@@ -2902,19 +2902,19 @@ msgstr "CELO"
 msgid "CRC Worth"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:311
+#: lib/block_scout_web/templates/address/overview.html.eex:312
 #, elixir-autogen, elixir-format
 msgid "Fetching gas used..."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:258
-#: lib/block_scout_web/templates/address/overview.html.eex:266
+#: lib/block_scout_web/templates/address/overview.html.eex:259
+#: lib/block_scout_web/templates/address/overview.html.eex:267
 #, elixir-autogen, elixir-format
 msgid "Fetching transactions..."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:285
-#: lib/block_scout_web/templates/address/overview.html.eex:293
+#: lib/block_scout_web/templates/address/overview.html.eex:286
+#: lib/block_scout_web/templates/address/overview.html.eex:294
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:122
 #, elixir-autogen, elixir-format
 msgid "Fetching transfers..."
@@ -3035,7 +3035,7 @@ msgstr ""
 msgid "Attestations"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:175
+#: lib/block_scout_web/templates/address/overview.html.eex:176
 #, elixir-autogen, elixir-format
 msgid "Locked CELO Balance"
 msgstr ""
@@ -3050,12 +3050,12 @@ msgstr ""
 msgid "Moola"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:201
+#: lib/block_scout_web/templates/address/overview.html.eex:202
 #, elixir-autogen, elixir-format
 msgid "Pending Unlocked Gold"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:226
+#: lib/block_scout_web/templates/address/overview.html.eex:227
 #, elixir-autogen, elixir-format
 msgid "Total amount of epoch rewards this address has received, all time."
 msgstr ""
@@ -3065,7 +3065,7 @@ msgstr ""
 msgid "Uniswap"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:227
+#: lib/block_scout_web/templates/address/overview.html.eex:228
 #, elixir-autogen, elixir-format
 msgid "Validator Rewards | Voting Rewards"
 msgstr ""
@@ -3085,17 +3085,17 @@ msgstr ""
 msgid "cLabs"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:200
+#: lib/block_scout_web/templates/address/overview.html.eex:201
 #, elixir-autogen, elixir-format
 msgid "Amount of CELO that’s in the process of being unlocked (3 days)"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:174
+#: lib/block_scout_web/templates/address/overview.html.eex:175
 #, elixir-autogen, elixir-format
 msgid "Amount of locked CELO in the protocol"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:187
+#: lib/block_scout_web/templates/address/overview.html.eex:188
 #, elixir-autogen, elixir-format
 msgid "Amount of locked CELO that has been activated to vote for validator(s)"
 msgstr ""
@@ -3122,7 +3122,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:338
+#: lib/block_scout_web/templates/address/overview.html.eex:339
 #, elixir-autogen, elixir-format
 msgid "Number of blocks validated by this validator."
 msgstr ""
@@ -3142,7 +3142,7 @@ msgstr ""
 msgid "View previous block"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:188
+#: lib/block_scout_web/templates/address/overview.html.eex:189
 #, elixir-autogen, elixir-format
 msgid "Voting CELO Balance"
 msgstr ""
@@ -3173,12 +3173,12 @@ msgstr ""
 msgid "Slow"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:148
+#: lib/block_scout_web/templates/address/overview.html.eex:149
 #, elixir-autogen, elixir-format
 msgid "Address balance in"
 msgstr ""
 
-#: lib/block_scout_web/templates/address/overview.html.eex:148
+#: lib/block_scout_web/templates/address/overview.html.eex:149
 #, elixir-autogen, elixir-format
 msgid "doesn't include ERC20, ERC721, ERC1155 tokens)."
 msgstr ""
@@ -3724,3 +3724,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "View previous epoch"
 msgstr ""
+
+#: lib/block_scout_web/templates/address/overview.html.eex:119
+#, elixir-autogen, elixir-format
+msgid "Contract was precompiled and created at genesis or contract creation transaction is missing"
+msgstr ""