fix(wallet)_: Send flow for collectibles #21871

smohamedjavid · 2024-12-26T11:45:53Z

fixes #21727

Summary

This PR fixes

the send flow for collectibles (ERC721 and ERC1155)
picking the right balance of the ERC1155 in the send flow from the account page, based on the account viewing by the user
the balance of ERC1155 is sometimes incorrect if the collectible is present in more than one account of the user

Collectibles.send.flow.mp4

Testing notes

This PR doesn't fix the balance of the collectible after it's been sent. It's handled in different issue: #21483.

Platforms

Android
iOS

Steps to test

Prerequisites: An account with ERC721 and ERC1155 collectibles

ERC721

Open Status
Navigate to Wallet tab > Collectibles
Tap on any ERC721 and tap on Send
Verify the account of the collectible is automatically selected
Verify the user is taken to select the recipient

ERC1155

Open Status
Navigate to Wallet tab > Collectibles
Tap on any ERC155 which is present in two accounts and tap on Send
Verify the user is taken to select the account to send from

status: ready

status-im-auto · 2024-12-26T11:50:43Z

Jenkins Builds

Click to see older builds (4)

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`aa4871e`	#1	2024-12-26 11:50:42	~4 min	`tests`	📄`log`
✔️	`aa4871e`	#1	2024-12-26 11:53:01	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`aa4871e`	#1	2024-12-26 11:53:19	~7 min	`android`	🤖`apk` 📲
✔️	`aa4871e`	#1	2024-12-26 11:53:43	~7 min	`ios`	📱`ipa` 📲

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`84bedc6`	#2	2024-12-31 14:14:59	~4 min	`tests`	📄`log`
✔️	`84bedc6`	#2	2024-12-31 14:17:03	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`84bedc6`	#2	2024-12-31 14:17:23	~6 min	`android`	🤖`apk` 📲
✔️	`84bedc6`	#2	2024-12-31 14:17:39	~7 min	`ios`	📱`ipa` 📲

✔️	`c679008`	#3	2025-01-02 18:06:25	~4 min	`tests`	📄`log`
✔️	`c679008`	#3	2025-01-02 18:08:50	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`c679008`	#3	2025-01-02 18:08:58	~6 min	`ios`	📱`ipa` 📲
✔️	`c679008`	#3	2025-01-02 18:09:03	~7 min	`android`	🤖`apk` 📲

smohamedjavid · 2024-12-26T11:56:14Z

src/status_im/contexts/wallet/collectible/utils.cljs

+(defn remove-duplicates-in-ownership
+  [ownership]
+  (->> ownership
+       (reduce (fn [acc {:keys [address timestamp] :as owner}]
+                 (let [existing-owner (get acc address)]
+                   (if (or (nil? existing-owner) (> timestamp (:timestamp existing-owner)))
+                     (assoc acc address owner)
+                     acc)))
+               {})
+       vals))


Sometimes, the status-go returns duplicate data in the list, we do a cleanup based on the address and timestamp of the balance.

smohamedjavid · 2024-12-26T11:56:18Z

src/status_im/contexts/wallet/send/events.cljs

         collectible-tx?  (send-utils/tx-type-collectible?
                           (-> db :wallet :ui :send :tx-type))
         collectible      (when collectible-tx?
                            (-> db :wallet :ui :send :collectible))
         one-collectible? (when collectible-tx?
-                            (= (collectible.utils/collectible-balance collectible) 1))]
+                            (= (collectible.utils/collectible-balance collectible sender) 1))]


Picking the right balance of the collectible to send.

Previously, we took the first balance in the list, which may not be the right balance of the selected account.

smohamedjavid · 2024-12-26T11:56:29Z

src/status_im/contexts/wallet/send/events.cljs

+ (fn [{:keys [db]} [{:keys [ignore-entry-point?]}]]
+   (let [entry-point-wallet-home? (= (get-in db [:wallet :ui :send :entry-point]) :wallet-stack)
+         multiple-owners?         (get-in db [:wallet :ui :send :collectible-multiple-owners?])
+         transaction-type         (get-in db [:wallet :ui :send :tx-type])]
+     (when (or ignore-entry-point?
+               (and entry-point-wallet-home? (not multiple-owners?))
+               (not entry-point-wallet-home?))
+       {:db (update-in db
+                       [:wallet :ui :send]
+                       dissoc
+                       :collectible
+                       :collectible-multiple-owners?
+                       :token-display-name
+                       :amount
+                       (when (send-utils/tx-type-collectible? transaction-type)
+                         :tx-type))}))))


We skip cleaning the selected collectible on navigating back (the user will land on the From screen) from the select recipient screen if the collectible is present in multiple accounts.

smohamedjavid · 2024-12-26T11:56:35Z

src/status_im/contexts/wallet/send/from/view.cljs

  (rf/dispatch [:wallet/select-from-account
                {:address         address
                 :network-details network-details
                 :stack-id        :screen/wallet.select-from
-                 :start-flow?     true}]))
+                 :start-flow?     (not collectible-tx?)}]))


If it's a collectible tx, the flow is already started.

mohsen-ghafouri · 2024-12-26T14:04:16Z

Hey @smohamedjavid, would you mind also check and advice about this issue?#21483
when i was testing i notice that :wallet/collectibles-data-updated recieved wrong balance (current balance and not updated data), I also tried to fetch manually after update but that didn't work too, so IMO the only way to fix it in status-go side. wdyt?

also my draft PR #21867 (not working properly yet)

mohsen-ghafouri

LGTM

src/status_im/contexts/wallet/send/events.cljs

status-im-auto · 2024-12-30T12:30:39Z

62% of end-end tests have passed

Total executed tests: 8
Failed tests: 3
Expected to fail tests: 0
Passed tests: 5

IDs of failed tests: 727230,727229,703133

Failed tests (3)

Click to expand

Rerun failed tests

Class TestWalletMultipleDevice:

1. test_wallet_send_asset_from_drawer, id: 727230
Device 1: Could not reach wallet view by pressing system back button Balance is Invalid API Key (#err2)\|ARBTESTNET Gwei `critical/test_wallet.py:163: 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:38: in _get_balances_before_tx sender_balance = self.network_api.get_balance(self.sender['wallet_address']) ../support/api/network_api.py:55: in get_balance return int(balance) / 1000000000000000000 invalid literal for int() with base 10: 'Invalid API Key (#err2)\|ARBTESTNET'`
2. test_wallet_send_eth, id: 727229
Device 2: Tap on found: Button Balance is Invalid API Key (#err2)\|ARBTESTNET Gwei `critical/test_wallet.py:129: in test_wallet_send_eth sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx() critical/test_wallet.py:38: in _get_balances_before_tx sender_balance = self.network_api.get_balance(self.sender['wallet_address']) ../support/api/network_api.py:55: in get_balance return int(balance) / 1000000000000000000 invalid literal for int() with base 10: 'Invalid API Key (#err2)\|ARBTESTNET'`

Class TestCommunityOneDeviceMerged:

1. test_restore_multiaccount_with_waku_backup_remove_profile_switch, id: 703133

Device 1: Tap on found: Button
# STEP: Check that removed user is not shown in the list anymore

critical/chats/test_public_chat_browsing.py:240: in test_restore_multiaccount_with_waku_backup_remove_profile_switch
    self.errors.verify_no_errors()
base_test_case.py:209: 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!

Device sessions

Device 1:

Steps, video, logs

Passed tests (5)

Click to expand

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 TestCommunityOneDeviceMerged:

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

Class TestWalletOneDevice:

1. test_wallet_add_remove_regular_account, id: 727231

2. test_wallet_balance_mainnet, id: 740490

Class TestCommunityMultipleDeviceMerged:

1. test_community_message_edit, id: 702843
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

status-im-auto · 2024-12-31T14:51:46Z

75% of end-end tests have passed

Total executed tests: 8
Failed tests: 0
Expected to fail tests: 2
Passed tests: 6

IDs of expected to fail tests: 727230,727229

Expected to fail tests (2)

Click to expand

Class TestWalletMultipleDevice:

1. test_wallet_send_asset_from_drawer, id: 727230
Device 1: Could not reach Button by pressing system back button Balance is Invalid API Key (#err2)\|ARBTESTNET Gwei `critical/test_wallet.py:165: 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:38: in _get_balances_before_tx sender_balance = self.network_api.get_balance(self.sender['wallet_address']) ../support/api/network_api.py:55: in get_balance return int(balance) / 1000000000000000000 invalid literal for int() with base 10: 'Invalid API Key (#err2)\|ARBTESTNET'` [[Arbiscan API is down, looking for analogue]]
2. test_wallet_send_eth, id: 727229
Device 2: Tap on found: Button Balance is Invalid API Key (#err2)\|ARBTESTNET Gwei `critical/test_wallet.py:130: in test_wallet_send_eth sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx() critical/test_wallet.py:38: in _get_balances_before_tx sender_balance = self.network_api.get_balance(self.sender['wallet_address']) ../support/api/network_api.py:55: in get_balance return int(balance) / 1000000000000000000 invalid literal for int() with base 10: 'Invalid API Key (#err2)\|ARBTESTNET'` [[Arbiscan API is down, looking for analogue]]

Passed tests (6)

Click to expand

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 TestWalletOneDevice:

1. test_wallet_add_remove_regular_account, id: 727231

2. test_wallet_balance_mainnet, id: 740490

Class TestCommunityMultipleDeviceMerged:

1. test_community_message_edit, id: 702843
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestCommunityOneDeviceMerged:

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

clauxx · 2025-01-02T12:50:53Z

src/status_im/contexts/wallet/collectible/utils.cljs

+  ([{:keys [ownership]} address]
+   (let [balance (some #(when (= address (:address %))
+                          (js/parseInt (:balance %)))
+                       ownership)]
+     (if (js/Number.isNaN balance) 0 balance))))


There's a helper for parsing numbers that allows to pass a default utils.number/parse-int

VolodLytvynenko · 2025-01-02T16:06:47Z

hi @smohamedjavid thank you for PR. Unfortunately, one issue has been found, but it's okay if it will be fixed in a separate follow-up. Let me know if this will be addressed in this PR, otherwise, the PR can be merged
PR_ISSUE 1: #21882

Signed-off-by: Mohamed Javid <[email protected]>

smohamedjavid · 2025-01-02T18:01:37Z

@VolodLytvynenko - I will fix it in a follow-up PR 👍

smohamedjavid added the request-manual-qa label Dec 26, 2024

smohamedjavid self-assigned this Dec 26, 2024

smohamedjavid commented Dec 26, 2024

View reviewed changes

smohamedjavid requested review from alwx, shivekkhurana, vkjr, briansztamfater, clauxx and mohsen-ghafouri December 26, 2024 11:57

smohamedjavid marked this pull request as ready for review December 26, 2024 11:57

mohsen-ghafouri approved these changes Dec 26, 2024

View reviewed changes

briansztamfater reviewed Dec 26, 2024

View reviewed changes

src/status_im/contexts/wallet/send/events.cljs Outdated Show resolved Hide resolved

briansztamfater approved these changes Dec 26, 2024

View reviewed changes

VolodLytvynenko self-assigned this Dec 30, 2024

VolodLytvynenko removed their assignment Dec 30, 2024

smohamedjavid force-pushed the fix/send-collectibles-flow branch from aa4871e to 84bedc6 Compare December 31, 2024 14:10

clauxx approved these changes Jan 2, 2025

View reviewed changes

VolodLytvynenko self-assigned this Jan 2, 2025

VolodLytvynenko mentioned this pull request Jan 2, 2025

"Context Canceled" Error and "No Routes Found" message on Collectible Send flow when using device back button #21882

Closed

VolodLytvynenko added the Tested - OK label Jan 2, 2025

fix(wallet)_: Send flow for collectibles

c679008

Signed-off-by: Mohamed Javid <[email protected]>

smohamedjavid force-pushed the fix/send-collectibles-flow branch from 84bedc6 to c679008 Compare January 2, 2025 18:01

smohamedjavid merged commit baf3b8c into develop Jan 2, 2025
5 checks passed

smohamedjavid deleted the fix/send-collectibles-flow branch January 2, 2025 18:10

smohamedjavid mentioned this pull request Jan 2, 2025

fix(wallet)_: collectible route cleanup on navigating back from TX confirmation page #21883

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(wallet)_: Send flow for collectibles #21871

fix(wallet)_: Send flow for collectibles #21871

smohamedjavid commented Dec 26, 2024

status-im-auto commented Dec 26, 2024 •

edited

Loading

smohamedjavid Dec 26, 2024

smohamedjavid Dec 26, 2024

smohamedjavid Dec 26, 2024

smohamedjavid Dec 26, 2024

mohsen-ghafouri commented Dec 26, 2024

mohsen-ghafouri left a comment

status-im-auto commented Dec 30, 2024

Class TestWalletMultipleDevice:

Class TestCommunityOneDeviceMerged:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestCommunityOneDeviceMerged:

Class TestWalletOneDevice:

Class TestCommunityMultipleDeviceMerged:

status-im-auto commented Dec 31, 2024

Class TestWalletMultipleDevice:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestWalletOneDevice:

Class TestCommunityMultipleDeviceMerged:

Class TestCommunityOneDeviceMerged:

clauxx Jan 2, 2025

VolodLytvynenko commented Jan 2, 2025

smohamedjavid commented Jan 2, 2025

fix(wallet)_: Send flow for collectibles #21871

fix(wallet)_: Send flow for collectibles #21871

Conversation

smohamedjavid commented Dec 26, 2024

Summary

Testing notes

Platforms

Steps to test

Prerequisites: An account with ERC721 and ERC1155 collectibles

ERC721

ERC1155

status-im-auto commented Dec 26, 2024 • edited Loading

Jenkins Builds

smohamedjavid Dec 26, 2024

Choose a reason for hiding this comment

smohamedjavid Dec 26, 2024

Choose a reason for hiding this comment

smohamedjavid Dec 26, 2024

Choose a reason for hiding this comment

smohamedjavid Dec 26, 2024

Choose a reason for hiding this comment

mohsen-ghafouri commented Dec 26, 2024

mohsen-ghafouri left a comment

Choose a reason for hiding this comment

status-im-auto commented Dec 30, 2024

62% of end-end tests have passed

Failed tests (3)

Class TestWalletMultipleDevice:

Class TestCommunityOneDeviceMerged:

Passed tests (5)

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestCommunityOneDeviceMerged:

Class TestWalletOneDevice:

Class TestCommunityMultipleDeviceMerged:

status-im-auto commented Dec 31, 2024

75% of end-end tests have passed

Expected to fail tests (2)

Class TestWalletMultipleDevice:

Passed tests (6)

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestWalletOneDevice:

Class TestCommunityMultipleDeviceMerged:

Class TestCommunityOneDeviceMerged:

clauxx Jan 2, 2025

Choose a reason for hiding this comment

VolodLytvynenko commented Jan 2, 2025

smohamedjavid commented Jan 2, 2025

status-im-auto commented Dec 26, 2024 •

edited

Loading