diff --git a/CHANGELOG.md b/CHANGELOG.md index 4edae41dad..5ecb9ae546 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 78b3beb7df..f53a43e897 100644 --- a/README.md +++ b/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 diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss index 06510862b9..3838fd96c1 100644 --- a/apps/block_scout_web/assets/css/app.scss +++ b/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; - secondary: $secondary; + dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color; dashboardLineColorMarket: $dashboard-line-color-market; dashboardLineColorPrice: $dashboard-line-color-price; - dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color; + primary: $primary; + secondary: $secondary; } diff --git a/apps/block_scout_web/assets/css/components/_token_tile_view_more.scss b/apps/block_scout_web/assets/css/components/_token_tile_view_more.scss index 435dc3e235..41cfc89a5a 100644 --- a/apps/block_scout_web/assets/css/components/_token_tile_view_more.scss +++ b/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, - :focus { + a { text-decoration: none; } -} - -.token-tile-view-more span { - display: inline-block; - position: relative; -} -.token-tile-view-more span:before, -.token-tile-view-more span:after { - content: ""; - position: absolute; - height: 5px; - border-bottom: 1px solid $border-color; - border-top: 1px solid $border-color; - top: 0; - width: 43%; -} - -.token-tile-view-more span:before { - right: 55%; - margin-right: 0.9375rem; -} + &:before, + &:after { + border-bottom: 1px solid $border-color; + border-top: 1px solid $border-color; + content: ""; + height: 4px; + flex-grow: 1; -.token-tile-view-more span:after { - left: 55%; - margin-left: 0.9375rem; -} + @include media-breakpoint-down(md) { + } -@include media-breakpoint-down(md) { - .token-tile-view-more span:before, - .token-tile-view-more span:after { - width: 40%; + @include media-breakpoint-down(sm) { + } } - .token-tile-view-more span:before { - right: 58%; - } + &:before { + margin-right: 10px; - .token-tile-view-more span:after { - left: 58%; - } -} + @include media-breakpoint-down(md) { + } -@include media-breakpoint-down(sm) { - .token-tile-view-more span:before, - .token-tile-view-more span:after { - width: 28%; + @include media-breakpoint-down(sm) { + } } - .token-tile-view-more span:before { - right: 66%; - } + &:after { + margin-left: 10px; + + @include media-breakpoint-down(md) { + } - .token-tile-view-more span:after { - left: 66%; + @include media-breakpoint-down(sm) { + } } } diff --git a/apps/block_scout_web/assets/js/lib/card_tabs.js b/apps/block_scout_web/assets/js/lib/card_tabs.js index eed0790dc7..49b82ad04f 100644 --- a/apps/block_scout_web/assets/js/lib/card_tabs.js +++ b/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')) { - siblings.show() - } else { - siblings.hide() + if (siblings.is(':hidden')) { + siblings.show() + } else { + siblings.hide() + } } }) }) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex index 8ed8d4e028..0c2d339c38 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex @@ -1,4 +1,4 @@ -
+
<%= link( gettext("Transactions"), class: "card-tab #{tab_status("transactions", @conn.request_path)}", diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex index 76d28e6a82..a497ab1b7e 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex @@ -4,7 +4,7 @@
-
+
<%= link( gettext("Transactions"), diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex index 3a9e9ec11f..f22c913356 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex @@ -1,4 +1,4 @@ -
+
<%= link( gettext("Token Transfers"), class: "card-tab #{tab_status("token_transfers", @conn.request_path)}", diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex index 67a5980f28..c857323fd3 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex @@ -1,4 +1,4 @@ -
+
<%= if @show_token_transfers do %> <%= link( gettext("Token Transfers"), diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex index 9ff19a9e5d..e8d52b25f4 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex @@ -50,11 +50,9 @@
<%= if Enum.any?(remaining_token_transfers) do %> -
- +
<%= 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" %> -
<% end %> <% end %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 9eedeec5a5..68f3690d8d 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/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 "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 91d30f7e46..48b302ed75 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/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 ""