Merge pull request #3360 from poanetwork/vb-fix-tokens-dropdown-appearance

Fix tokens dropdown appearance

CHANGELOG.md

@@ -1,7 +1,7 @@
 ## Current
 
 ### Features
-- [#2292](https://github.com/poanetwork/blockscout/pull/2292), [#3356](https://github.com/poanetwork/blockscout/pull/3356) - Add Web UI for POSDAO Staking DApp
+- [#2292](https://github.com/poanetwork/blockscout/pull/2292), [#3356](https://github.com/poanetwork/blockscout/pull/3356), [#3360](https://github.com/poanetwork/blockscout/pull/3360) - Add Web UI for POSDAO Staking DApp
 - [#3354](https://github.com/poanetwork/blockscout/pull/3354) - Tx hash in EOA coin balance history
 - [#3333](https://github.com/poanetwork/blockscout/pull/3333), [#3337](https://github.com/poanetwork/blockscout/pull/3337) - Dark forest contract custom theme
 - [#3330](https://github.com/poanetwork/blockscout/pull/3330) - Caching of address transactions counter, remove query 10_000 rows limit

apps/block_scout_web/assets/js/pages/address.js

@@ -72,7 +72,7 @@ export function reducer (state = initialState, action) {
 
 let fetchedTokenBalanceBlockNumber = 0
 function loadTokenBalance (blockNumber) {
-  if (blockNumber > fetchedTokenBalanceBlockNumber) {
+  if (blockNumber >= fetchedTokenBalanceBlockNumber) {
     fetchedTokenBalanceBlockNumber = blockNumber
     setTimeout(loadTokenBalanceDropdown, 1000)
   }

apps/block_scout_web/assets/js/pages/admin/tasks.js

@@ -14,7 +14,7 @@ const runTask = (event) => {
   $loading.show()
 
   $.get(apiPath)
-    .done(response => {
+    .done(_response => {
       $successMessage.show()
       $loading.hide()
     })

apps/block_scout_web/test/block_scout_web/features/viewing_addresses_test.exs

@@ -364,8 +364,13 @@ defmodule BlockScoutWeb.ViewingAddressesTest do
     end
 
     test "filter tokens balances by token name", %{session: session, lincoln: lincoln} do
+      next =
         session
         |> AddressPage.visit_page(lincoln)
+
+      Process.sleep(2_000)
+
+      next
       |> AddressPage.click_balance_dropdown_toggle()
       |> AddressPage.fill_balance_dropdown_search("ato")
       |> assert_has(AddressPage.token_balance(count: 2))
@@ -374,19 +379,29 @@ defmodule BlockScoutWeb.ViewingAddressesTest do
     end
 
     # flaky test
-    # test "filter token balances by token symbol", %{session: session, lincoln: lincoln} do
+    test "filter token balances by token symbol", %{session: session, lincoln: lincoln} do
-    #   session
+      next =
-    #   |> AddressPage.visit_page(lincoln)
+        session
-    #   |> AddressPage.click_balance_dropdown_toggle()
+        |> AddressPage.visit_page(lincoln)
-    #   |> AddressPage.fill_balance_dropdown_search("T2")
+
-    #   |> assert_has(AddressPage.token_balance(count: 2))
+      Process.sleep(2_000)
-    #   |> assert_has(AddressPage.token_type(count: 2))
+
-    #   |> assert_has(AddressPage.token_type_count(type: "ERC-20", text: "1"))
+      next
-    # end
+      |> AddressPage.click_balance_dropdown_toggle()
+      |> AddressPage.fill_balance_dropdown_search("T2")
+      |> assert_has(AddressPage.token_balance(count: 2))
+      |> assert_has(AddressPage.token_type(count: 2))
+      |> assert_has(AddressPage.token_type_count(type: "ERC-20", text: "1"))
+    end
 
     test "reset token balances filter when dropdown closes", %{session: session, lincoln: lincoln} do
+      next =
         session
         |> AddressPage.visit_page(lincoln)
+
+      Process.sleep(2_000)
+
+      next
       |> AddressPage.click_balance_dropdown_toggle()
       |> AddressPage.fill_balance_dropdown_search("ato")
       |> AddressPage.click_outside_of_the_dropdown()