Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: assets sort order on bridge and assets screen #20813

Merged
merged 8 commits into from
Jul 22, 2024
Merged

Conversation

OmarBasem
Copy link
Contributor

@OmarBasem OmarBasem commented Jul 19, 2024

fixes: #20706

Summary

This PR fixes sort order of assets on bridge and select assets screen to be in descending order of balance.

Simple fix, skipping QA.

Demo

Before:

After:

@OmarBasem OmarBasem self-assigned this Jul 19, 2024
@status-im-auto
Copy link
Member

status-im-auto commented Jul 19, 2024

Jenkins Builds

Click to see older builds (25)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ c317a12 #1 2024-07-19 04:03:58 ~5 min tests 📄log
✔️ c317a12 #1 2024-07-19 04:08:09 ~9 min android-e2e 🤖apk 📲
✔️ c317a12 #1 2024-07-19 04:08:11 ~9 min android 🤖apk 📲
✔️ c317a12 #1 2024-07-19 04:08:29 ~9 min ios 📱ipa 📲
✔️ 9ae90d6 #3 2024-07-19 04:22:02 ~6 min tests 📄log
✔️ 9ae90d6 #3 2024-07-19 04:22:29 ~7 min android-e2e 🤖apk 📲
✔️ 9ae90d6 #3 2024-07-19 04:22:34 ~7 min android 🤖apk 📲
✔️ 9ae90d6 #3 2024-07-19 04:24:13 ~8 min ios 📱ipa 📲
1f95eca #4 2024-07-22 03:43:25 ~2 min tests 📄log
✔️ 1f95eca #4 2024-07-22 03:47:39 ~7 min android-e2e 🤖apk 📲
✔️ 1f95eca #4 2024-07-22 03:48:00 ~7 min android 🤖apk 📲
✔️ 1f95eca #4 2024-07-22 03:49:29 ~8 min ios 📱ipa 📲
ca9d18d #5 2024-07-22 03:52:00 ~2 min tests 📄log
✔️ ca9d18d #5 2024-07-22 03:56:50 ~7 min android-e2e 🤖apk 📲
✔️ ca9d18d #5 2024-07-22 03:56:54 ~7 min android 🤖apk 📲
✔️ ca9d18d #5 2024-07-22 04:00:35 ~11 min ios 📱ipa 📲
b12d38d #6 2024-07-22 04:33:10 ~2 min tests 📄log
✔️ b12d38d #6 2024-07-22 04:36:53 ~6 min android-e2e 🤖apk 📲
✔️ b12d38d #6 2024-07-22 04:37:20 ~6 min android 🤖apk 📲
✔️ b12d38d #6 2024-07-22 04:39:16 ~8 min ios 📱ipa 📲
✔️ 1f914ea #7 2024-07-22 04:49:17 ~4 min tests 📄log
✔️ 1f914ea #7 2024-07-22 04:51:03 ~6 min android-e2e 🤖apk 📲
✔️ 1f914ea #7 2024-07-22 04:51:30 ~6 min android 🤖apk 📲
✔️ 1f914ea #7 2024-07-22 04:53:45 ~8 min ios 📱ipa 📲
6c793b5 #8 2024-07-22 04:57:48 ~2 min tests 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
a481fa3 #9 2024-07-22 05:03:13 ~2 min tests 📄log
✔️ a481fa3 #9 2024-07-22 05:07:15 ~6 min android 🤖apk 📲
✔️ a481fa3 #9 2024-07-22 05:07:54 ~7 min android-e2e 🤖apk 📲
a481fa3 #9 2024-07-22 05:08:56 ~8 min ios 📄log
✔️ 077434d #10 2024-07-22 05:16:00 ~4 min tests 📄log
✔️ 077434d #10 2024-07-22 05:18:09 ~6 min android 🤖apk 📲
✔️ 077434d #10 2024-07-22 05:18:34 ~6 min android-e2e 🤖apk 📲
✔️ 077434d #10 2024-07-22 05:20:55 ~8 min ios 📱ipa 📲

Copy link
Contributor

@ulisesmac ulisesmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR @OmarBasem ! 👍 👍

src/status_im/subs/wallet/wallet.cljs Outdated Show resolved Hide resolved
src/status_im/subs/wallet/wallet.cljs Outdated Show resolved Hide resolved
@status-im-auto
Copy link
Member

57% of end-end tests have passed

Total executed tests: 7
Failed tests: 2
Expected to fail tests: 1
Passed tests: 4
IDs of failed tests: 727230,727229 
IDs of expected to fail tests: 727232 

Failed tests (2)

Click to expand
  • Rerun failed tests

  • Class TestWalletMultipleDevice:

    1. test_wallet_send_asset_from_drawer, id: 727230

    # STEP: Getting ETH amount in the wallet of the sender before transaction
    Device 1: Find `Button` by `xpath`: `//android.view.ViewGroup[contains(@content-desc,'Account 1')]`

    critical/test_wallet.py:161: in test_wallet_send_asset_from_drawer
        sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
    critical/test_wallet.py:43: in _get_balances_before_tx
        self.wallet_1.get_account_element().click()
    ../views/base_element.py:90: in click
        element = self.find_element()
    ../views/base_element.py:79: in find_element
        raise NoSuchElementException(
     Device 1: Button by xpath: `//android.view.ViewGroup[contains(@content-desc,'Account 1')]` is not found on the screen; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#no-such-element-exception; also Unexpected Alert is shown: 'Cannot compare function q(a0, a1, a2, a3) { [bytecode] } to function q(a0, a1, a2, a3) { [bytecode] }'
    



    2. test_wallet_send_eth, id: 727229

    Device 1: Tap on found: Button
    Device 1: Find Button by xpath: //*[@content-desc='token-network']/android.widget.TextView[@text='Ether']

    critical/test_wallet.py:138: in test_wallet_send_eth
        self.wallet_1.send_asset(address='arb1:' + self.receiver['wallet_address'],
    ../views/wallet_view.py:138: in send_asset
        self.select_asset(asset_name).click()
    ../views/base_element.py:90: in click
        element = self.find_element()
    ../views/base_element.py:79: in find_element
        raise NoSuchElementException(
     Device 1: Button by xpath: `//*[@content-desc='token-network']/android.widget.TextView[@text='Ether']` is not found on the screen; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#no-such-element-exception; also Unexpected Alert is shown: 'Cannot compare function q(a0, a1, a2, a3) { [bytecode] } to function q(a0, a1, a2, a3) { [bytecode] }'
    



    Expected to fail tests (1)

    Click to expand

    Class TestWalletOneDevice:

    1. test_wallet_add_remove_watch_only_account, id: 727232

    Device 1: Find EditBox by accessibility id: add-address-to-watch
    Device 1: Type 0x8d2413447ff297d30bdc475f6d5cb00254685aae to EditBox

    critical/test_wallet.py:249: in test_wallet_add_remove_watch_only_account
        self.wallet_view.add_watch_only_account(address=address_to_watch, account_name=new_account_name)
    ../views/wallet_view.py:163: in add_watch_only_account
        self.account_has_activity_label.wait_for_visibility_of_element()
    ../views/base_element.py:147: in wait_for_visibility_of_element
        raise TimeoutException(
     Device 1: Text by accessibility id:`account-has-activity` is not found on the screen after wait_for_visibility_of_element 
    

    [[Missing networks in account address, https://github.com//issues/20166]]

    Device sessions

    Passed tests (4)

    Click to expand

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
    Device sessions

    Class TestCommunityOneDeviceMerged:

    1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
    Device sessions

    2. test_community_copy_and_paste_message_in_chat_input, id: 702742
    Device sessions

    Class TestWalletOneDevice:

    1. test_wallet_add_remove_regular_account, id: 727231
    Device sessions

    @OmarBasem OmarBasem merged commit 3b44696 into develop Jul 22, 2024
    6 checks passed
    @OmarBasem OmarBasem deleted the fix/sort-assets branch July 22, 2024 10:16
    cammellos pushed a commit that referenced this pull request Jul 22, 2024
    * fix: assets sort order on bridge and assets screen (#20813)
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    Status: DONE
    Development

    Successfully merging this pull request may close these issues.

    Assets are not shown in descending order of the fiat value on the 'select assets' and 'bridge' pages
    4 participants