Merge pull request #2019 from poanetwork/fix/#1981-missing-tx-hashes

(Fix) Missing tx hashes
pull/2050/head
Victor Baranov 6 years ago committed by GitHub
commit 51a50839b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 64
      apps/block_scout_web/assets/css/components/_token_tile_view_more.scss
  3. 4
      apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
  4. 8
      apps/block_scout_web/priv/gettext/default.pot
  5. 9
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

@ -21,6 +21,7 @@
### Fixes ### 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. - [#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. - [#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 - [#1926](https://github.com/poanetwork/blockscout/pull/1926) - status label alignment

@ -1,65 +1,47 @@
.token-tile-view-more { .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; text-align: center;
&:hover, a {
:focus {
text-decoration: none; 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: "";
position: absolute;
height: 5px;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
top: 0; content: "";
width: 43%; height: 4px;
} flex-grow: 1;
.token-tile-view-more span:before { @include media-breakpoint-down(md) {
right: 55%;
margin-right: 0.9375rem;
} }
.token-tile-view-more span:after { @include media-breakpoint-down(sm) {
left: 55%;
margin-left: 0.9375rem;
} }
@include media-breakpoint-down(md) {
.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%; }
} }
} }

@ -50,11 +50,9 @@
</div> </div>
<%= if Enum.any?(remaining_token_transfers) do %> <%= 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 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" %> <%= link gettext("View Less Transfers"), class: "d-none", to: "#transaction-#{@transaction.hash}", "data-toggle": "collapse", "data-selector": "token-transfer-close" %>
</span>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>

@ -452,7 +452,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39 #: 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" msgid "IN"
msgstr "" msgstr ""
@ -597,7 +597,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37 #: 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" msgid "OUT"
msgstr "" msgstr ""
@ -980,12 +980,12 @@ msgid "View Contract"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "View Less Transfers"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "View More Transfers"
msgstr "" msgstr ""

@ -452,7 +452,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39 #: 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" msgid "IN"
msgstr "" msgstr ""
@ -597,7 +597,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37 #: 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" msgid "OUT"
msgstr "" msgstr ""
@ -980,12 +980,12 @@ msgid "View Contract"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "View Less Transfers"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "View More Transfers"
msgstr "" msgstr ""
@ -1107,6 +1107,7 @@ msgstr ""
msgid "GraphQL" msgid "GraphQL"
msgstr "" msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/pending_transaction/index.html.eex:32 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:32
msgid "Loading" msgid "Loading"
msgstr "" msgstr ""

Loading…
Cancel
Save