Watch-only collectibles should not be included on the main wallet page by default #20735 #20761

mmilad75 · 2024-07-15T18:04:37Z

This PR removes the watch-only collectibles from the list of collectibles in the wallet home screen.

I renamed :wallet/request-collectibles-for-all-accounts event to :wallet/request-collectibles-for-owned-accounts and :wallet/all-collectibles-list to :wallet/owned-collectibles-list. They were only used in the wallet home page, so it was secure to rename it.

I could've created a new event to handle all owned collectibles, but it the :wallet/all-collectibles-list was not used any where else so it would become an unused code.

fixes #20735

ulisesmac

Hey @mmilad75 !

Thank you, the PR looks great 💯

Is removing the collectibles a design decision? 🤔

status-im-auto · 2024-07-15T18:09:32Z

Jenkins Builds

Click to see older builds (24)

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`c99e7a5`	#1	2024-07-15 18:09:31	~4 min	`tests`	📄`log`
✔️	`c99e7a5`	#1	2024-07-15 18:12:48	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`c99e7a5`	#1	2024-07-15 18:12:52	~7 min	`android`	🤖`apk` 📲
✔️	`c99e7a5`	#1	2024-07-15 18:14:05	~9 min	`ios`	📱`ipa` 📲

✔️	`63d007f`	#2	2024-07-16 13:55:17	~5 min	`tests`	📄`log`
✔️	`63d007f`	#2	2024-07-16 13:57:33	~8 min	`android-e2e`	🤖`apk` 📲
✔️	`63d007f`	#2	2024-07-16 13:57:40	~8 min	`android`	🤖`apk` 📲
✔️	`63d007f`	#2	2024-07-16 13:58:24	~9 min	`ios`	📱`ipa` 📲

✔️	`f090cc5`	#3	2024-07-17 08:52:27	~3 min	`tests`	📄`log`
✔️	`f090cc5`	#3	2024-07-17 08:56:09	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`f090cc5`	#3	2024-07-17 08:56:10	~7 min	`android`	🤖`apk` 📲
✔️	`f090cc5`	#3	2024-07-17 08:57:29	~9 min	`ios`	📱`ipa` 📲

✔️	`ad77d15`	#4	2024-07-17 17:05:53	~4 min	`tests`	📄`log`
✔️	`ad77d15`	#4	2024-07-17 17:09:03	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`ad77d15`	#4	2024-07-17 17:09:08	~7 min	`android`	🤖`apk` 📲
✔️	`ad77d15`	#4	2024-07-17 17:10:31	~8 min	`ios`	📱`ipa` 📲

✔️	`5391465`	#6	2024-07-19 17:26:25	~4 min	`tests`	📄`log`
✔️	`5391465`	#6	2024-07-19 17:28:18	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`5391465`	#6	2024-07-19 17:29:38	~7 min	`android`	🤖`apk` 📲
✔️	`5391465`	#6	2024-07-19 17:30:56	~9 min	`ios`	📱`ipa` 📲

✔️	`ebcd163`	#7	2024-07-22 12:41:05	~6 min	`android`	🤖`apk` 📲
✔️	`ebcd163`	#7	2024-07-22 12:41:38	~7 min	`tests`	📄`log`
✔️	`ebcd163`	#7	2024-07-22 12:43:07	~8 min	`android-e2e`	🤖`apk` 📲
✔️	`ebcd163`	#7	2024-07-22 12:45:13	~10 min	`ios`	📱`ipa` 📲

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`9cb9102`	#8	2024-07-22 14:23:25	~11 min	`ios`	📱`ipa` 📲
✔️	`9cb9102`	#8	2024-07-22 14:26:48	~15 min	`tests`	📄`log`
✔️	`9cb9102`	#8	2024-07-22 14:27:57	~16 min	`android-e2e`	🤖`apk` 📲
✔️	`9cb9102`	#8	2024-07-22 14:28:47	~17 min	`android`	🤖`apk` 📲

✔️	`65787e3`	#9	2024-07-23 12:24:11	~4 min	`tests`	📄`log`
✔️	`65787e3`	#9	2024-07-23 12:26:36	~6 min	`android`	🤖`apk` 📲
✔️	`65787e3`	#9	2024-07-23 12:27:57	~8 min	`android-e2e`	🤖`apk` 📲
✔️	`65787e3`	#9	2024-07-23 12:30:05	~10 min	`ios`	📱`ipa` 📲

VolodLytvynenko · 2024-07-16T10:35:34Z

Is removing the collectibles a design decision? 🤔

hi @ulisesmac Once, the inclusion of watch-only account assets on the overall wallet page was discussed here. After that, @qoqobolo discussed with the design team (in Montenegro, if I am not mistaken) before issue creation, and they agreed that by default, the assets of watch-only accounts should not be included in the overall wallet.

VolodLytvynenko · 2024-07-17T11:34:45Z

Hi @mmilad75 thank you for PR. take a look found issues:

PR_ISSUE 1: Collectibles are not shown when a watch-only account with collectibles is opened

Steps:

Add a watch-only account with available collectibles (example: 0xFC6327a092f6232e158a0Dd1d6d967a2e1c65cD5).
Open the current account.
Go to the collectibles tab.

Actual result:

No collectibles are shown for watch only account when current account is opened

saved.mp4

Expected result:

Collectibles should be shown which belongs to the watch only account when the current account is opened.

VolodLytvynenko · 2024-07-17T11:47:44Z

PR_ISSUE 2: Count of Multi-Collectibles from Watch-Only Account is combined with Regular account

Steps:

Recover a user that has multi-collectibles.
Add a watch-only account that has the same multi-collectible.
Check the collectibles displayed on the wallet overview page.

Actual result:

The count of collectibles from the watch-only account is combined with the collectibles of the regular account on the wallet overview page.

watchonlycombined.mp4

Expected result:

The count of collectibles from the watch-only account should not be combined with the collectibles of the regular account on the wallet overview page.

OS:

IOS, Android

Devices:

Pixel 7a, Android 13
iPhone 11 Pro Max, IOS 17

mmilad75 · 2024-07-19T17:21:25Z

@VolodLytvynenko Hi Volodymyr. Thanks for testing. The issues are fixed now. Please check again

…s-on-main-wallet

status-im-auto · 2024-07-22T10:48:48Z

71% of end-end tests have passed

Total executed tests: 7
Failed tests: 1
Expected to fail tests: 1
Passed tests: 5

IDs of failed tests: 727229

IDs of expected to fail tests: 727232

Failed tests (1)

Click to expand

Rerun failed tests

Class TestWalletMultipleDevice:

1. test_wallet_send_eth, id: 727229

Device 2: Find `Text` by `xpath`: `//android.view.ViewGroup[@content-desc='container']/android.widget.TextView[@text='Ether']/../android.widget.TextView[3]`
Device 2: `Text` is `0.00889 ETH`

critical/test_wallet.py:156: in test_wallet_send_eth
    self.errors.verify_no_errors()
base_test_case.py:191: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Sender balance is not updated on Etherscan, it is 0.4906 but expected to be 0.4907

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

Device 1:

Steps, video, logs

Passed tests (5)

Click to expand

Class TestWalletOneDevice:

1. test_wallet_add_remove_regular_account, id: 727231
Device sessions Device 1: Steps, video, logs

Class TestCommunityOneDeviceMerged:

1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
Device sessions Device 1: Steps, video, logs
2. test_community_copy_and_paste_message_in_chat_input, id: 702742
Device sessions Device 1: Steps, video, logs

Class TestWalletMultipleDevice:

1. test_wallet_send_asset_from_drawer, id: 727230

Class TestOneToOneChatMultipleSharedDevicesNewUi:

1. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

…s-on-main-wallet

status-im-auto · 2024-07-23T09:25:14Z

86% of end-end tests have passed

Total executed tests: 7
Failed tests: 0
Expected to fail tests: 1
Passed tests: 6

IDs of expected to fail tests: 727232

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

Device 1:

Steps, video, logs

Passed tests (6)

Click to expand

Class TestWalletOneDevice:

1. test_wallet_add_remove_regular_account, id: 727231
Device sessions Device 1: Steps, video, logs

Class TestCommunityOneDeviceMerged:

1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
Device sessions Device 1: Steps, video, logs
2. test_community_copy_and_paste_message_in_chat_input, id: 702742
Device sessions Device 1: Steps, video, logs

Class TestOneToOneChatMultipleSharedDevicesNewUi:

1. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestWalletMultipleDevice:

1. test_wallet_send_asset_from_drawer, id: 727230

2. test_wallet_send_eth, id: 727229

VolodLytvynenko · 2024-07-23T10:01:31Z

Hi @mmilad75 issues are fixed. PR is ready to be merged. Thank you for your work!

…s-on-main-wallet

mmilad75 requested review from ulisesmac and smohamedjavid July 15, 2024 18:04

mmilad75 requested review from ilmotta, vkjr, briansztamfater and J-Son89 July 15, 2024 18:05

mmilad75 self-assigned this Jul 15, 2024

ulisesmac approved these changes Jul 15, 2024

View reviewed changes

ulisesmac added the request-manual-qa label Jul 15, 2024

ilmotta approved these changes Jul 16, 2024

View reviewed changes

VolodLytvynenko self-assigned this Jul 17, 2024

VolodLytvynenko added the Tested - Issues label Jul 17, 2024

mmilad75 added 3 commits July 17, 2024 14:56

fix(wallet): remove watch-only collectibles from wallet home

561b5bb

fix(wallet): fix qa issue 1

f04c7f9

fix(wallet): rename event

ad77d15

mmilad75 force-pushed the milad/20735-remove-watch-only-collectibles-on-main-wallet branch from f090cc5 to ad77d15 Compare July 17, 2024 17:01

fix(wallet): fix qa issue 2

4a11cb0

Merge branch 'develop' into milad/20735-remove-watch-only-collectible…

5391465

…s-on-main-wallet

Merge branch 'develop' into milad/20735-remove-watch-only-collectible…

ebcd163

…s-on-main-wallet

Merge branch 'develop' into milad/20735-remove-watch-only-collectible…

9cb9102

…s-on-main-wallet

VolodLytvynenko added Tested - OK and removed Tested - Issues labels Jul 23, 2024

Merge branch 'develop' into milad/20735-remove-watch-only-collectible…

65787e3

…s-on-main-wallet

mmilad75 merged commit 89bb3ea into develop Jul 23, 2024
6 checks passed

mmilad75 deleted the milad/20735-remove-watch-only-collectibles-on-main-wallet branch July 23, 2024 12:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Watch-only collectibles should not be included on the main wallet page by default #20735 #20761

Watch-only collectibles should not be included on the main wallet page by default #20735 #20761

mmilad75 commented Jul 15, 2024

ulisesmac left a comment

status-im-auto commented Jul 15, 2024 •

edited

Loading

VolodLytvynenko commented Jul 16, 2024

VolodLytvynenko commented Jul 17, 2024

VolodLytvynenko commented Jul 17, 2024

mmilad75 commented Jul 19, 2024

status-im-auto commented Jul 22, 2024

Class TestWalletMultipleDevice:

Class TestWalletOneDevice:

Class TestWalletOneDevice:

Class TestCommunityOneDeviceMerged:

Class TestWalletMultipleDevice:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

status-im-auto commented Jul 23, 2024

Class TestWalletOneDevice:

Class TestWalletOneDevice:

Class TestCommunityOneDeviceMerged:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestWalletMultipleDevice:

VolodLytvynenko commented Jul 23, 2024

Watch-only collectibles should not be included on the main wallet page by default #20735 #20761

Watch-only collectibles should not be included on the main wallet page by default #20735 #20761

Conversation

mmilad75 commented Jul 15, 2024

ulisesmac left a comment

Choose a reason for hiding this comment

status-im-auto commented Jul 15, 2024 • edited Loading

Jenkins Builds

VolodLytvynenko commented Jul 16, 2024

VolodLytvynenko commented Jul 17, 2024

PR_ISSUE 1: Collectibles are not shown when a watch-only account with collectibles is opened

Steps:

Actual result:

Expected result:

VolodLytvynenko commented Jul 17, 2024

PR_ISSUE 2: Count of Multi-Collectibles from Watch-Only Account is combined with Regular account

Steps:

Actual result:

Expected result:

OS:

Devices:

mmilad75 commented Jul 19, 2024

status-im-auto commented Jul 22, 2024

71% of end-end tests have passed

Failed tests (1)

Class TestWalletMultipleDevice:

Expected to fail tests (1)

Class TestWalletOneDevice:

Passed tests (5)

Class TestWalletOneDevice:

Class TestCommunityOneDeviceMerged:

Class TestWalletMultipleDevice:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

status-im-auto commented Jul 23, 2024

86% of end-end tests have passed

Expected to fail tests (1)

Class TestWalletOneDevice:

Passed tests (6)

Class TestWalletOneDevice:

Class TestCommunityOneDeviceMerged:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestWalletMultipleDevice:

VolodLytvynenko commented Jul 23, 2024

status-im-auto commented Jul 15, 2024 •

edited

Loading