Skip to content

Commit

Permalink
Merge pull request blockscout#5772 from blockscout/np-complete-dropdo…
Browse files Browse the repository at this point in the history
…wn-fix

Move usd value to separate row
  • Loading branch information
vbaranov authored and jagdeep sidhu committed Aug 6, 2022
1 parent 64da022 commit a2932c7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

### Fixes
- [#5768](https://github.com/blockscout/blockscout/pull/5768) - Outstanding rows limit for missing blocks query (catchup fetcher)
- [#5737](https://github.com/blockscout/blockscout/pull/5737) - Fix double requests; Fix token balances dropdown view
- [#5737](https://github.com/blockscout/blockscout/pull/5737), [#5772](https://github.com/blockscout/blockscout/pull/5772) - Fix double requests; Fix token balances dropdown view
- [#5723](https://github.com/blockscout/blockscout/pull/5723) - Add nil clause for Data.to_string/1
- [#5714](https://github.com/blockscout/blockscout/pull/5714) - Add clause for EthereumJSONRPC.Transaction.elixir_to_params/1 when gas_price is missing in the response
- [#5697](https://github.com/blockscout/blockscout/pull/5697) - Gas price oracle: ignore gas price rounding for values less than 0.01
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@
<% end %>
</div>
<div class="row dropdown-row wh-sp">
<p class="mb-0 ml-5px <%= if System.get_env("DISPLAY_TOKEN_ICONS") === "true", do: "ml-20px" %>">
<%= if token_balance.token.usd_value do %>
<p class="mb-0 text-right text-muted usd-rate">
<span data-selector="token-price" data-token-usd-value="<%= token_balance.token.usd_value %>"></span>
</p>
<% end %>
</div>
<div class="row dropdown-row wh-sp">
<p class="mb-0 ml-5px dropdown-amount <%= if System.get_env("DISPLAY_TOKEN_ICONS") === "true", do: "ml-20px" %>">
<%= if token_balance.token_type == "ERC-721" && !is_nil(token_balance.token_id) do %>
1
<% else %>
Expand All @@ -51,11 +58,6 @@
<%= " TokenID " <> to_string(token_balance.token_id) %>
<% end %>
</p>
<%= if token_balance.token.usd_value do %>
<p class="mb-0 col-md-6 text-right text-muted usd-rate">
<span data-selector="token-price" data-token-usd-value="<%= token_balance.token.usd_value %>"></span>
</p>
<% end %>
</div>
<% end %>
</div>
Expand Down

0 comments on commit a2932c7

Please sign in to comment.