Swap flows (launch from home / launch from account) #21269

alwx · 2024-09-16T12:38:04Z

fixes #20337
fixes #20338

Implements all the swap flows. Based on #21140 that is getting reviewed individually.

In includes:

Launching from the home screen.
Launching from the account screen.
Launching using the dedicated swaps button.

In all three cases the (pretty smart) selection of accounts being done, account to pay is always different from account to recieve + networks are being selected correctly.

Here is how it works:

Screen.Recording.2024-09-17.at.00.07.49.mov

Platforms

Android
iOS

status: ready

status-im-auto · 2024-09-16T12:43:19Z

Jenkins Builds

Click to see older builds (19)

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`0f7237c`	#1	2024-09-16 12:43:18	~4 min	`tests`	📄`log`
✔️	`0f7237c`	#1	2024-09-16 12:45:30	~7 min	`android`	🤖`apk` 📲
✔️	`0f7237c`	#1	2024-09-16 12:46:09	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`0f7237c`	#1	2024-09-16 12:50:37	~12 min	`ios`	📱`ipa` 📲

❌	`2eec8e2`	#2	2024-09-16 15:01:20	~3 min	`tests`	📄`log`
✔️	`2eec8e2`	#3	2024-09-16 15:05:24	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`2eec8e2`	#3	2024-09-16 15:05:56	~8 min	`android`	🤖`apk` 📲
✔️	`2eec8e2`	#3	2024-09-16 15:14:21	~16 min	`ios`	📱`ipa` 📲

❌	`be9ad7a`	#3	2024-09-16 21:44:14	~2 min	`tests`	📄`log`
✔️	`be9ad7a`	#4	2024-09-16 21:48:06	~6 min	`android`	🤖`apk` 📲
✔️	`be9ad7a`	#4	2024-09-16 21:49:00	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`be9ad7a`	#4	2024-09-16 21:53:15	~11 min	`ios`	📱`ipa` 📲

❌	`89b019c`	#4	2024-09-16 21:57:35	~2 min	`tests`	📄`log`
✔️	`89b019c`	#5	2024-09-16 22:02:30	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`89b019c`	#5	2024-09-16 22:02:58	~8 min	`android`	🤖`apk` 📲

❌	`f05770f`	#5	2024-09-16 22:07:19	~2 min	`tests`	📄`log`
✔️	`f05770f`	#6	2024-09-16 22:12:11	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`f05770f`	#6	2024-09-16 22:12:39	~7 min	`android`	🤖`apk` 📲
✔️	`f05770f`	#6	2024-09-16 22:21:13	~16 min	`ios`	📱`ipa` 📲

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
❌	`c07abca`	#7	2024-09-19 12:32:06	~3 min	`tests`	📄`log`
✔️	`c07abca`	#8	2024-09-19 12:36:09	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`c07abca`	#8	2024-09-19 12:36:29	~7 min	`android`	🤖`apk` 📲
✔️	`c07abca`	#8	2024-09-19 12:45:57	~17 min	`ios`	📱`ipa` 📲

❌	`bd42749`	#8	2024-09-19 13:02:52	~3 min	`tests`	📄`log`
✔️	`bd42749`	#9	2024-09-19 13:06:18	~6 min	`android`	🤖`apk` 📲
✔️	`bd42749`	#9	2024-09-19 13:07:07	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`bd42749`	#9	2024-09-19 13:17:44	~18 min	`ios`	📱`ipa` 📲

clauxx

Looks good! Also thanks for the function docs 👍

src/status_im/contexts/wallet/common/token_value/view.cljs

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

briansztamfater · 2024-09-17T13:21:15Z

src/status_im/contexts/wallet/common/token_value/view.cljs

-                                  :stack-id     :wallet-stack
-                                  :start-flow?  true
-                                  :owners       token-owners})
-        bridge-params          (if selected-account?
-                                 {:token            token-data
-                                  :bridge-disabled? (or (not has-balance?)
-                                                        (send-utils/bridge-disabled? token-symbol))
-                                  :stack-id         :screen/wallet.accounts
-                                  :start-flow?      true
-                                  :owners           token-owners}
-                                 {:token-symbol     token-symbol
-                                  :bridge-disabled? (send-utils/bridge-disabled? token-symbol)
-                                  :stack-id         :wallet-stack
-                                  :start-flow?      true
-                                  :owners           token-owners})]


Removing these changes may affect bridge and send flows navigation. Are you sure we want to remove them?
We should ask @status-im/mobile-qa team to verify we are not introducing regressions with these changes.

They are not getting removed here, it's simply a small restructuring because some of the code is redundant.

ulisesmac

Hi @alwx !

Thanks for the PR, I left a couple of comments

ulisesmac · 2024-09-17T22:04:46Z

src/status_im/contexts/wallet/common/token_value/view.cljs

+                 (action-receive selected-account)
+                 (when (ff/enabled? ::ff/wallet.swap)
+                   (action-swap params))
+                 (when (seq (seq token-owners))


I know it already existed, but I wonder if this (seq (seq x)) makes sense 🤔

Haha, fixed it

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

src/status_im/contexts/wallet/swap/select_asset_to_pay/view.cljs

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

mariia-skrypnyk · 2024-09-18T11:21:57Z

Hey @alwx !
Can you please rebase your PR?

alwx · 2024-09-18T11:24:34Z

@mariia-skrypnyk I can't. It's based on another PR that's not merged yet.
#21140

status-im-auto · 2024-09-18T11:37:42Z

86% of end-end tests have passed

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

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: Looking for a message by text: Message AFTER edit 2 (Edited)
Device 2: Find `ChatElementByText` by `xpath`: `//*[starts-with(@text,'Message AFTER edit 2 (Edited)')]/ancestor::android.view.ViewGroup[@content-desc='chat-item']`

critical/chats/test_public_chat_browsing.py:378: in test_community_message_edit
    self.channel_2.set_reaction(message_text_after_edit)
../views/chat_view.py:1053: in set_reaction
    self.chat_element_by_text(message).long_press_until_element_is_shown(element)
../views/base_element.py:327: in long_press_until_element_is_shown
    element = self.find_element()
../views/chat_view.py:116: in find_element
    self.wait_for_visibility_of_element(20)
../views/base_element.py:147: in wait_for_visibility_of_element
    raise TimeoutException(
 Device 2: ChatElementByText by xpath:`//*[starts-with(@text,'Message AFTER edit 2 (Edited)')]/ancestor::android.view.ViewGroup[@content-desc='chat-item']` is not found on the screen after wait_for_visibility_of_element

Device sessions

Device 1:

Steps, video, logs

Device 2:

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

1. test_wallet_send_asset_from_drawer, id: 727230

2. test_wallet_send_eth, id: 727229

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

mariia-skrypnyk · 2024-09-18T13:55:54Z

Hey @alwx!
Thanks for your PR.

ISSUE 1: wrong icon for swap option

Design vs Implementation

QUESTION 1:

If I have a specific token only on Account 2 and I do such steps:

Long tap on the token from the home screen.
Choose swap option.
Change account on Swap screen
Go back (sometimes I need 2-3 tries to repeat 3 and 4 steps)
Make long tap on the same token from step 1
Choose swap option.

Result: strange bottom sheet appears

Is it it the scope of your PR or I should report it separately?

alwx · 2024-09-19T13:17:39Z

@mariia-skrypnyk to be honest, I think both issues should be reported separately. First of all, because swaps are still behind the feature flag.
The one with the icon is definitely not important — we currently don't have the icon you're talking about in our resources. I can add it but we can also leave it for the part when we're doing the design reviews.
The second one is a bit of an edge case — I would be happy to investigate but I'm currently busy with another issue and I think that might wait.

mariia-skrypnyk · 2024-09-19T13:59:29Z

Ok @alwx , will create followups and ask @status-im/design-team for an icon for swap option from ISSUE 1.

What fixes did you push while ago? What changed?

alwx · 2024-09-19T19:45:35Z

@mariia-skrypnyk what do you mean? I've basically just rebased this one.

alwx self-assigned this Sep 16, 2024

alwx force-pushed the feature/swap-flows branch from 0f7237c to 2eec8e2 Compare September 16, 2024 14:57

alwx changed the base branch from develop to feature/20332-20333 September 16, 2024 14:57

alwx requested review from shivekkhurana, ulisesmac and briansztamfater September 16, 2024 22:12

alwx marked this pull request as ready for review September 16, 2024 22:12

clauxx approved these changes Sep 17, 2024

View reviewed changes

src/status_im/contexts/wallet/common/token_value/view.cljs Outdated Show resolved Hide resolved

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

briansztamfater reviewed Sep 17, 2024

View reviewed changes

briansztamfater added the request-manual-qa label Sep 17, 2024

ulisesmac reviewed Sep 17, 2024

View reviewed changes

mariia-skrypnyk self-assigned this Sep 18, 2024

mariia-skrypnyk added the Tested - Issues label Sep 18, 2024

alwx mentioned this pull request Sep 19, 2024

Swaps: Asset to Pay / Asset to Receive #21140

Open

alwx force-pushed the feature/20332-20333 branch 4 times, most recently from fe3aa38 to 052e412 Compare September 19, 2024 12:20

alwx force-pushed the feature/swap-flows branch from f05770f to 5c725d9 Compare September 19, 2024 12:28

Swap flows (launch from home / launch from account)

c07abca

alwx force-pushed the feature/swap-flows branch from 5c725d9 to c07abca Compare September 19, 2024 12:28

Fixes

bd42749

alwx requested review from briansztamfater and ulisesmac September 19, 2024 12:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swap flows (launch from home / launch from account) #21269

Swap flows (launch from home / launch from account) #21269

alwx commented Sep 16, 2024 •

edited

Loading

status-im-auto commented Sep 16, 2024 •

edited

Loading

clauxx left a comment

briansztamfater Sep 17, 2024 •

edited

Loading

alwx Sep 19, 2024

ulisesmac left a comment

ulisesmac Sep 17, 2024

alwx Sep 19, 2024

mariia-skrypnyk commented Sep 18, 2024

alwx commented Sep 18, 2024

status-im-auto commented Sep 18, 2024

Class TestCommunityMultipleDeviceMerged:

Class TestWalletOneDevice:

Class TestCommunityOneDeviceMerged:

Class TestWalletMultipleDevice:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

mariia-skrypnyk commented Sep 18, 2024 •

edited

Loading

alwx commented Sep 19, 2024

mariia-skrypnyk commented Sep 19, 2024 •

edited

Loading

alwx commented Sep 19, 2024

Swap flows (launch from home / launch from account) #21269

Are you sure you want to change the base?

Swap flows (launch from home / launch from account) #21269

Conversation

alwx commented Sep 16, 2024 • edited Loading

Platforms

status-im-auto commented Sep 16, 2024 • edited Loading

Jenkins Builds

clauxx left a comment

Choose a reason for hiding this comment

briansztamfater Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

alwx Sep 19, 2024

Choose a reason for hiding this comment

ulisesmac left a comment

Choose a reason for hiding this comment

ulisesmac Sep 17, 2024

Choose a reason for hiding this comment

alwx Sep 19, 2024

Choose a reason for hiding this comment

mariia-skrypnyk commented Sep 18, 2024

alwx commented Sep 18, 2024

status-im-auto commented Sep 18, 2024

86% of end-end tests have passed

Failed tests (1)

Class TestCommunityMultipleDeviceMerged:

Passed tests (6)

Class TestWalletOneDevice:

Class TestCommunityOneDeviceMerged:

Class TestWalletMultipleDevice:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

mariia-skrypnyk commented Sep 18, 2024 • edited Loading

alwx commented Sep 19, 2024

mariia-skrypnyk commented Sep 19, 2024 • edited Loading

alwx commented Sep 19, 2024

alwx commented Sep 16, 2024 •

edited

Loading

status-im-auto commented Sep 16, 2024 •

edited

Loading

briansztamfater Sep 17, 2024 •

edited

Loading

mariia-skrypnyk commented Sep 18, 2024 •

edited

Loading

mariia-skrypnyk commented Sep 19, 2024 •

edited

Loading