Merge branch 'master' into ab-make-pages-async

CHANGELOG.md

@@ -21,6 +21,8 @@
 
 ### Fixes
 
+- [#2019](https://github.com/poanetwork/blockscout/pull/2019) - Fixed the missing tx hashes.
+- [#2020](https://github.com/poanetwork/blockscout/pull/2020) - Fixed a bug triggered when a second click to a selected tab caused the other tabs to hide.
 - [#1944](https://github.com/poanetwork/blockscout/pull/1944) - fixed styles for token's dropdown.
 - [#1926](https://github.com/poanetwork/blockscout/pull/1926) - status label alignment
 - [#1849](https://github.com/poanetwork/blockscout/pull/1849) - Improve chains menu

README.md

@@ -53,6 +53,7 @@ Currently available block explorers (i.e. Etherscan and Etherchain) are closed s
 | [RSK](https://blockscout.com/rsk/mainnet) |  | [PIRL](http://pirl.es/) |
 | [xDai Chain](https://blockscout.com/poa/dai) |  | [SafeChain](https://explorer.safechain.io) |
 |  |  | [SpringChain](https://explorer.springrole.com/) |
+|  |  | [Kotti Testnet](https://kottiexplorer.ethernode.io/) |
 
 
 ### Visual Interface

apps/block_scout_web/assets/css/app.scss

@@ -123,9 +123,9 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "components/errors";
 
 :export {
-  primary: $primary;
+  dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color;
-  secondary: $secondary;
   dashboardLineColorMarket: $dashboard-line-color-market;
   dashboardLineColorPrice: $dashboard-line-color-price;
-  dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color;
+  primary: $primary;
+  secondary: $secondary;
 }

apps/block_scout_web/assets/css/components/_token_tile_view_more.scss

@@ -1,65 +1,47 @@
 .token-tile-view-more {
-  line-height: 0.5;
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  line-height: 1.2;
+  padding-top: 10px;
   text-align: center;
 
-  &:hover,
+  a {
-  :focus {
     text-decoration: none;
   }
-}
-
-.token-tile-view-more span {
-  display: inline-block;
-  position: relative;
-}
 
-.token-tile-view-more span:before,
+  &:before,
-.token-tile-view-more span:after {
+  &:after {
-  content: "";
+    border-bottom: 1px solid $border-color;
-  position: absolute;
+    border-top: 1px solid $border-color;
-  height: 5px;
+    content: "";
-  border-bottom: 1px solid $border-color;
+    height: 4px;
-  border-top: 1px solid $border-color;
+    flex-grow: 1;
-  top: 0;
-  width: 43%;
-}
-
-.token-tile-view-more span:before {
-  right: 55%;
-  margin-right: 0.9375rem;
-}
 
-.token-tile-view-more span:after {
+    @include media-breakpoint-down(md) {
-  left: 55%;
+    }
-  margin-left: 0.9375rem;
-}
 
-@include media-breakpoint-down(md) {
+    @include media-breakpoint-down(sm) {
-  .token-tile-view-more span:before,
+    }
-  .token-tile-view-more span:after {
-    width: 40%;
   }
 
-  .token-tile-view-more span:before {
+  &:before {
-    right: 58%;
+    margin-right: 10px;
-  }
 
-  .token-tile-view-more span:after {
+    @include media-breakpoint-down(md) {
-    left: 58%;
+    }
-  }
-}
 
-@include media-breakpoint-down(sm) {
+    @include media-breakpoint-down(sm) {
-  .token-tile-view-more span:before,
+    }
-  .token-tile-view-more span:after {
-    width: 28%;
   }
 
-  .token-tile-view-more span:before {
+  &:after {
-    right: 66%;
+    margin-left: 10px;
-  }
+
+    @include media-breakpoint-down(md) {
+    }
 
-  .token-tile-view-more span:after {
+    @include media-breakpoint-down(sm) {
-    left: 66%;
+    }
   }
 }

apps/block_scout_web/assets/js/lib/card_tabs.js

@@ -1,21 +1,26 @@
 import $ from 'jquery'
 
 $(function () {
-  const activeTabCard = $('.card-tab.active')
+  const tabCards = $('.js-card-tabs')
+  const activeTabCard = tabCards.find('.active')
+  const isMobileCardTabs = tabCards.children(':hidden').length
+  const isOnlyChild = !activeTabCard.siblings().length
 
-  if (!activeTabCard.siblings().length) {
+  if (isOnlyChild) {
     activeTabCard.addClass('noCaret')
   }
 
   activeTabCard.on('click', function (e) {
     e.preventDefault()
 
-    const siblings = $(this).siblings()
+    if (isMobileCardTabs) {
+      const siblings = $(this).siblings()
 
-    if (siblings.is(':hidden')) {
+      if (siblings.is(':hidden')) {
-      siblings.show()
+        siblings.show()
-    } else {
+      } else {
-      siblings.hide()
+        siblings.hide()
+      }
     }
   })
 })

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

@@ -1,4 +1,4 @@
-<div class="card-tabs">
+<div class="card-tabs js-card-tabs">
   <%= link(
         gettext("Transactions"),
         class: "card-tab #{tab_status("transactions", @conn.request_path)}",

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

@@ -4,7 +4,7 @@
 
   <section>
     <div class="card mb-3">
-      <div class="card-tabs">
+      <div class="card-tabs js-card-tabs">
         <%=
           link(
             gettext("Transactions"),

apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex

@@ -1,4 +1,4 @@
-<div class="card-tabs">
+<div class="card-tabs js-card-tabs">
   <%= link(
         gettext("Token Transfers"),
         class: "card-tab #{tab_status("token_transfers", @conn.request_path)}",

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

@@ -1,4 +1,4 @@
-<div class="card-tabs">
+<div class="card-tabs js-card-tabs">
   <%= if @show_token_transfers do %>
     <%= link(
           gettext("Token Transfers"),

apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex

@@ -50,11 +50,9 @@
         </div>
 
         <%= if Enum.any?(remaining_token_transfers) do %>
-          <div class="col-md-12 d-flex flex-column mt-1 mb-2 text-center token-tile-view-more">
+          <div class="token-tile-view-more">
-            <span class="token-tile-more-lines">
               <%= link gettext("View More Transfers"), to: "#transaction-#{@transaction.hash}", "data-toggle": "collapse", "data-selector": "token-transfer-open", "data-test": "token_transfers_expansion" %>
               <%= link gettext("View Less Transfers"), class: "d-none", to: "#transaction-#{@transaction.hash}", "data-toggle": "collapse", "data-selector": "token-transfer-close" %>
-            </span>
           </div>
         <% end %>
       <% end %>

apps/block_scout_web/priv/gettext/default.pot

@@ -452,7 +452,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:76
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:74
 msgid "IN"
 msgstr ""
 
@@ -585,7 +585,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:72
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:70
 msgid "OUT"
 msgstr ""
 
@@ -963,12 +963,12 @@ msgid "View Contract"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:56
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
 msgid "View Less Transfers"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:54
 msgid "View More Transfers"
 msgstr ""
 

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

@@ -452,7 +452,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:76
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:74
 msgid "IN"
 msgstr ""
 
@@ -585,7 +585,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:72
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:70
 msgid "OUT"
 msgstr ""
 
@@ -963,12 +963,12 @@ msgid "View Contract"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:56
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
 msgid "View Less Transfers"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/transaction/_tile.html.eex:55
+#: lib/block_scout_web/templates/transaction/_tile.html.eex:54
 msgid "View More Transfers"
 msgstr ""