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(swap): update icon and don't show contract address for eth on confirmation screen #21410

Merged
merged 1 commit into from
Oct 16, 2024

Conversation

briansztamfater
Copy link
Contributor

fixes #21322
fixes #21352

Summary

This PR fixes the icon which is the transaction icon in the Iconset (https://www.figma.com/design/qLLuMLfpGxK9OfpIavwsmK/Iconset?node-id=347-91&m=dev) and also don't show contract address for Ether transaction on the Swap confirmation screen (we were previously showing what is coming from status-go which is the zero address)

Screenshots

Platforms

  • Android
  • iOS

Areas that maybe impacted

Functional
  • wallet / transactions

Steps to test

Issue #21322

  1. Login to app
  2. Turn on swaps feature flag
  3. Go to wallet
  4. Open any account
  5. Make a long tap on any token you have
  6. Verify the swap icon is the correct one

Issue #21352

  1. Go to the swap page and select ETH in the send or receive field.
  2. Navigate to the confirmation page.
  3. Verify that the field should be empty where the contract address is usually displayed

status: ready

@status-im-auto
Copy link
Member

status-im-auto commented Oct 9, 2024

Jenkins Builds

Click to see older builds (9)
Commit #️⃣ Finished (UTC) Duration Platform Result
64fd8e1 #1 2024-10-09 23:00:24 ~4 min tests 📄log
✔️ 64fd8e1 #1 2024-10-09 23:03:50 ~7 min android-e2e 🤖apk 📲
✔️ 64fd8e1 #1 2024-10-09 23:04:22 ~8 min android 🤖apk 📲
✔️ 64fd8e1 #1 2024-10-09 23:10:08 ~14 min ios 📱ipa 📲
✔️ 64fd8e1 #2 2024-10-10 11:08:27 ~2 min tests 📄log
✔️ 8485d1a #3 2024-10-14 18:02:07 ~6 min tests 📄log
✔️ 8485d1a #2 2024-10-14 18:05:08 ~9 min ios 📱ipa 📲
✔️ 8485d1a #2 2024-10-14 18:05:26 ~9 min android-e2e 🤖apk 📲
✔️ 8485d1a #2 2024-10-14 18:06:45 ~10 min android 🤖apk 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ cd4ba2d #4 2024-10-15 13:05:39 ~4 min tests 📄log
✔️ cd4ba2d #3 2024-10-15 13:08:44 ~7 min android-e2e 🤖apk 📲
✔️ cd4ba2d #3 2024-10-15 13:09:18 ~7 min android 🤖apk 📲
✔️ cd4ba2d #3 2024-10-15 13:10:19 ~8 min ios 📱ipa 📲
✔️ cb79382 #5 2024-10-16 15:02:00 ~4 min tests 📄log
✔️ cb79382 #4 2024-10-16 15:04:49 ~7 min android-e2e 🤖apk 📲
✔️ cb79382 #4 2024-10-16 15:05:24 ~7 min android 🤖apk 📲
✔️ cb79382 #4 2024-10-16 15:08:43 ~11 min ios 📱ipa 📲

@briansztamfater briansztamfater force-pushed the fix/swap-icon-and-hide-zero-address branch from 64fd8e1 to 8485d1a Compare October 14, 2024 17:55
@Horupa-Olena Horupa-Olena self-assigned this Oct 15, 2024
@Horupa-Olena Horupa-Olena force-pushed the fix/swap-icon-and-hide-zero-address branch from 8485d1a to cd4ba2d Compare October 15, 2024 13:01
@status-im-auto
Copy link
Member

57% of end-end tests have passed

Total executed tests: 7
Failed tests: 3
Expected to fail tests: 0
Passed tests: 4
IDs of failed tests: 727231,703133,702843 

Failed tests (3)

Click to expand
  • Rerun failed tests

  • Class TestWalletOneDevice:

    1. test_wallet_add_remove_regular_account, id: 727231
    Test setup failed: critical/test_wallet.py:200: in prepare_devices
        self.drivers, self.loop = create_shared_drivers(1)
    base_test_case.py:330: in create_shared_drivers
        raise e
    base_test_case.py:320: in create_shared_drivers
        test_suite_data.current_test.testruns[-1].jobs[drivers[i].session_id] = i + 1
     '_asyncio.Future' object has no attribute 'session_id'
    



    Class TestCommunityOneDeviceMerged:

    1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133

    Device 1: Find Button by accessibility id: show-profiles
    Device 1: Tap on found: Button

    critical/chats/test_public_chat_browsing.py:244: in test_restore_multiaccount_with_waku_backup_remove_switch
        self.errors.verify_no_errors()
    base_test_case.py:192: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     zQ3...dWXh5 was not restored as a contact from waku backup!
    E    zQ3...Vacac was not restored as a contact from waku backup!
    E    admin_open was not restored from waku-backup!!
    E    member_open was not restored from waku-backup!!
    E    admin_closed was not restored from waku-backup!!
    E    member_closed was not restored from waku-backup!!
    



    Device sessions

    Class TestCommunityMultipleDeviceMerged:

    1. test_community_message_edit, id: 702843

    Device 2: Find Text by xpath: //android.view.ViewGroup[@content-desc='chat-item']//android.widget.TextView[contains(@text,'https://status.app/c/')]
    Device 2: Wait for element Button for max 120s and click when it is available

    Test setup failed: critical/chats/test_public_chat_browsing.py:350: in prepare_devices
        self.community_2.join_community()
    ../views/chat_view.py:420: in join_community
        self.join_button.wait_and_click(120)
    ../views/base_element.py:100: in wait_and_click
        self.wait_for_visibility_of_element(sec)
    ../views/base_element.py:147: in wait_for_visibility_of_element
        raise TimeoutException(
     Device 2: Button by accessibility id:`show-request-to-join-screen-button` is not found on the screen after wait_for_visibility_of_element
    



    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_community_copy_and_paste_message_in_chat_input, id: 702742
    Device sessions

    Class TestWalletMultipleDevice:

    1. test_wallet_send_asset_from_drawer, id: 727230
    2. test_wallet_send_eth, id: 727229

    @status-im-auto
    Copy link
    Member

    67% of end-end tests have passed

    Total executed tests: 3
    Failed tests: 1
    Expected to fail tests: 0
    Passed tests: 2
    
    IDs of failed tests: 702843 
    

    Failed tests (1)

    Click to expand
  • Rerun failed tests

  • Class TestCommunityMultipleDeviceMerged:

    1. test_community_message_edit, id: 702843

    Device 2: Find `Text` by `xpath`: `//android.view.ViewGroup[@content-desc='chat-item']//android.widget.TextView[contains(@text,'https://status.app/c/')]`
    Device 2: Wait for element `Button` for max 120s and click when it is available

    Test setup failed: critical/chats/test_public_chat_browsing.py:350: in prepare_devices
        self.community_2.join_community()
    ../views/chat_view.py:420: in join_community
        self.join_button.wait_and_click(120)
    ../views/base_element.py:100: in wait_and_click
        self.wait_for_visibility_of_element(sec)
    ../views/base_element.py:147: in wait_for_visibility_of_element
        raise TimeoutException(
     Device 2: Button by accessibility id:`show-request-to-join-screen-button` is not found on the screen after wait_for_visibility_of_element
    



    Device sessions

    Passed tests (2)

    Click to expand

    Class TestWalletOneDevice:

    1. test_wallet_add_remove_regular_account, id: 727231
    Device sessions

    Class TestCommunityOneDeviceMerged:

    1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
    Device sessions

    @Horupa-Olena
    Copy link

    @briansztamfater Thanks for your PR. All is good, you can merge it.

    @briansztamfater briansztamfater force-pushed the fix/swap-icon-and-hide-zero-address branch from cd4ba2d to cb79382 Compare October 16, 2024 14:57
    @briansztamfater briansztamfater merged commit d58553f into develop Oct 16, 2024
    6 checks passed
    @briansztamfater briansztamfater deleted the fix/swap-icon-and-hide-zero-address branch October 16, 2024 15:51
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    Archived in project
    Status: Done
    6 participants