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

chore(wallet): move add-account functionality into its own folder #19476

Merged
merged 1 commit into from
Apr 11, 2024

Conversation

J-Son89
Copy link
Contributor

@J-Son89 J-Son89 commented Apr 2, 2024

This pr is the last pr of a set of wallet prs to restructure the root folder directory.

It moves all account generation pieces into add-account folder to align with figma separation.

Notes:
I think this can probably skip manual QA as it just moving files around and the compiler should really catch any issues 👍

@status-im-auto
Copy link
Member

status-im-auto commented Apr 2, 2024

Jenkins Builds

Click to see older builds (40)
Commit #️⃣ Finished (UTC) Duration Platform Result
7aea67b #1 2024-04-02 10:29:30 ~41 sec ios 📄log
7aea67b #1 2024-04-02 10:29:32 ~43 sec android-e2e 📄log
7aea67b #1 2024-04-02 10:29:49 ~1 min android 📄log
7aea67b #1 2024-04-02 10:30:00 ~1 min tests 📄log
6a51448 #2 2024-04-02 10:33:18 ~2 min tests 📄log
✔️ 6a51448 #2 2024-04-02 10:37:18 ~6 min android-e2e 🤖apk 📲
✔️ 6a51448 #2 2024-04-02 10:38:06 ~7 min android 🤖apk 📲
✔️ 6a51448 #2 2024-04-02 10:41:25 ~10 min ios 📱ipa 📲
4999e59 #3 2024-04-03 09:18:16 ~51 sec android-e2e 📄log
4999e59 #3 2024-04-03 09:18:29 ~1 min android 📄log
4999e59 #3 2024-04-03 09:19:02 ~1 min tests 📄log
4999e59 #3 2024-04-03 09:24:52 ~7 min ios 📄log
6e032d7 #4 2024-04-08 08:12:13 ~29 sec ios 📄log
6e032d7 #4 2024-04-08 08:12:13 ~29 sec android-e2e 📄log
6e032d7 #4 2024-04-08 08:12:13 ~30 sec android 📄log
6e032d7 #4 2024-04-08 08:13:08 ~1 min tests 📄log
011c292 #5 2024-04-08 08:26:25 ~29 sec ios 📄log
011c292 #5 2024-04-08 08:26:26 ~34 sec android-e2e 📄log
011c292 #5 2024-04-08 08:26:26 ~33 sec android 📄log
011c292 #5 2024-04-08 08:26:39 ~44 sec tests 📄log
2e9303f #6 2024-04-08 08:29:58 ~3 min tests 📄log
✔️ 2e9303f #6 2024-04-08 08:35:02 ~8 min android-e2e 🤖apk 📲
✔️ 2e9303f #6 2024-04-08 08:35:13 ~8 min android 🤖apk 📲
✔️ 2e9303f #6 2024-04-08 08:39:34 ~12 min ios 📱ipa 📲
3093644 #7 2024-04-08 09:00:57 ~2 min tests 📄log
✔️ 3093644 #7 2024-04-08 09:05:15 ~6 min android-e2e 🤖apk 📲
✔️ 3093644 #7 2024-04-08 09:05:18 ~6 min android 🤖apk 📲
✔️ 3093644 #7 2024-04-08 09:08:52 ~10 min ios 📱ipa 📲
e604392 #8 2024-04-09 14:16:29 ~2 min tests 📄log
✔️ e604392 #8 2024-04-09 14:20:57 ~6 min android-e2e 🤖apk 📲
✔️ e604392 #8 2024-04-09 14:21:06 ~6 min android 🤖apk 📲
✔️ e604392 #8 2024-04-09 14:23:59 ~9 min ios 📱ipa 📲
f424ca7 #9 2024-04-09 21:01:49 ~2 min tests 📄log
✔️ f424ca7 #9 2024-04-09 21:06:11 ~6 min android-e2e 🤖apk 📲
✔️ f424ca7 #9 2024-04-09 21:06:13 ~6 min android 🤖apk 📲
✔️ f424ca7 #9 2024-04-09 21:08:57 ~9 min ios 📱ipa 📲
dce8eda #10 2024-04-10 14:55:13 ~3 min tests 📄log
✔️ dce8eda #10 2024-04-10 14:57:48 ~6 min android-e2e 🤖apk 📲
✔️ dce8eda #10 2024-04-10 14:58:11 ~6 min android 🤖apk 📲
✔️ dce8eda #10 2024-04-10 15:15:33 ~24 min ios 📱ipa 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
7eb08ea #11 2024-04-10 17:47:52 ~2 min tests 📄log
✔️ 7eb08ea #11 2024-04-10 17:51:19 ~6 min android-e2e 🤖apk 📲
✔️ 7eb08ea #11 2024-04-10 17:51:21 ~6 min android 🤖apk 📲
✔️ 7eb08ea #11 2024-04-10 17:54:48 ~9 min ios 📱ipa 📲
✔️ 9fe5e21 #12 2024-04-10 18:04:44 ~5 min android 🤖apk 📲
✔️ 9fe5e21 #12 2024-04-10 18:05:40 ~6 min android-e2e 🤖apk 📲
✔️ 9fe5e21 #12 2024-04-10 18:08:59 ~10 min ios 📱ipa 📲
✔️ 9fe5e21 #13 2024-04-10 18:23:39 ~3 min tests 📄log

@J-Son89 J-Son89 force-pushed the jc/organise-add-account branch from 7aea67b to 6a51448 Compare April 2, 2024 10:30
@J-Son89 J-Son89 requested review from ulisesmac and OmarBasem and removed request for ulisesmac April 2, 2024 10:32
@@ -1,4 +1,4 @@
(ns status-im.contexts.wallet.events.collectibles
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved the collectibles file to an events.cljs file within it's collectible folder to align with the other events file

@@ -58,22 +58,24 @@
[status-im.contexts.wallet.account.edit-account.view :as wallet-edit-account]
[status-im.contexts.wallet.account.share-address.view :as wallet-share-address]
[status-im.contexts.wallet.account.view :as wallet-accounts]
[status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as
[status-im.contexts.wallet.add-account.create-account.edit-derivation-path.view :as
Copy link
Contributor Author

Choose a reason for hiding this comment

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

all of the account generation is now under add-account

@J-Son89 J-Son89 self-assigned this Apr 2, 2024
Copy link
Member

@smohamedjavid smohamedjavid left a comment

Choose a reason for hiding this comment

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

LGTM. 🚀

One quick question: Do we need to group events in add account flow? I see events file is growing.

@J-Son89
Copy link
Contributor Author

J-Son89 commented Apr 3, 2024

LGTM. 🚀

One quick question: Do we need to group events in add account flow? I see events file is growing.

yeah I think we should migrate that, I'll move these folders first in this pr as it will in someways be quicker/safer to do in 2 prs.

@J-Son89 J-Son89 force-pushed the jc/organise-add-account branch from 6a51448 to 4999e59 Compare April 3, 2024 09:17
@J-Son89 J-Son89 force-pushed the jc/organise-add-account branch from 4999e59 to 6e032d7 Compare April 8, 2024 08:11
@@ -1,4 +1,4 @@
(ns status-im.contexts.wallet.events.saved-addresses
(ns status-im.contexts.wallet.save-address.events
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@shivekkhurana -
I believe we had been going with an events file living close to its use case folder, rather than a folder of events with files for each functionality.

I moved this save-address stuff to here as I think it can be a bit more generic than within send folder too.
The flows for save address are actually used in the wallet settings also so maybe it makes sense to have it's own folder.
wdyt? 🤔

@J-Son89 J-Son89 force-pushed the jc/organise-add-account branch 2 times, most recently from 011c292 to 2e9303f Compare April 8, 2024 08:26
@@ -4,11 +4,9 @@
[react-native.background-timer :as background-timer]
[react-native.platform :as platform]
[status-im.constants :as constants]
[status-im.contexts.wallet.accounts.add-account.address-to-watch.events]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

don't think these are needed here so I moved them to src/status_im/events.cljs

@J-Son89 J-Son89 force-pushed the jc/organise-add-account branch 2 times, most recently from 3093644 to e604392 Compare April 9, 2024 14:13
@status-im-auto
Copy link
Member

90% of end-end tests have passed

Total executed tests: 52
Failed tests: 4
Expected to fail tests: 1
Passed tests: 47
IDs of failed tests: 702777,704613,702775,703629 
IDs of expected to fail tests: 703503 

Failed tests (4)

Click to expand
  • Rerun failed tests

  • Class TestDeepLinksOneDevice:

    1. test_links_open_universal_links_from_chat, id: 704613

    Device 1: Find `Button` by `xpath`: `//*[@text="open community"]`
    Device 1: Tap on found: Button

    critical/test_deep_and_universal_links.py:69: in test_links_open_universal_links_from_chat
        self.errors.verify_no_errors()
    base_test_case.py:190: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     Community 'closed community' was not requested to join by the url https://status.app/c/G00AAGS9TbI9mSR-ZNmFrhRjNuEeXAAbcAIUaLLJyjMOG3ACJQ12oIHD78QhzO9s_T5bUeU7rnATWJg3mGgTUemrAg==#zQ3shspPKCZ1VPVQ9dLXGufUGvGphjxVwrcZ6rkZc7S39T4b3
    



    Device sessions

    2. test_links_deep_links, id: 702775

    Device 1: Find BrowserTab by accessibility id: browser-stack-tab
    Device 1: Tap on found: BrowserTab

    critical/test_deep_and_universal_links.py:112: in test_links_deep_links
        self.errors.verify_no_errors()
    base_test_case.py:190: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     Community 'closed community' was not requested to join by the deep link status.app://c/G00AAGS9TbI9mSR-ZNmFrhRjNuEeXAAbcAIUaLLJyjMOG3ACJQ12oIHD78QhzO9s_T5bUeU7rnATWJg3mGgTUemrAg==#zQ3shspPKCZ1VPVQ9dLXGufUGvGphjxVwrcZ6rkZc7S39T4b3
    



    Device sessions

    Class TestCommunityMultipleDeviceMergedTwo:

    1. test_community_join_when_node_owner_offline, id: 703629

    Device 2: Looking for community: 'open community'
    Device 2: Click until Text by accessibility id: community-description-text will be presented

    critical/chats/test_public_chat_browsing.py:1181: in test_community_join_when_node_owner_offline
        self.errors.verify_no_errors()
    base_test_case.py:190: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     Text "You joined “closed community”" in shown toast element doesn't match expected "You joined “open community”"
    



    Device sessions

    Class TestActivityCenterContactRequestMultipleDevicePR:

    1. test_add_contact_field_validation, id: 702777

    Device 1: Find Button by xpath: //*[@text="Paste"]
    Device 1: Tap on found: Button

    activity_center/test_activity_center.py:237: in test_add_contact_field_validation
        self.errors.verify_no_errors()
    base_test_case.py:190: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     Error message is not shown for value "0x512543419b894307EA979C8d24219c279Be2315B"
    



    Device sessions

    Expected to fail tests (1)

    Click to expand

    Class TestCommunityOneDeviceMerged:

    1. test_community_discovery, id: 703503

    Test is not run, e2e blocker  
    

    [[reason: [NOTRUN] Curated communities not loading, https://github.com//issues/17852]]

    Passed tests (47)

    Click to expand

    Class TestCommunityMultipleDeviceMerged:

    1. test_community_several_images_send_reply, id: 703194
    Device sessions

    2. test_community_one_image_send_reply, id: 702859
    Device sessions

    3. test_community_emoji_send_copy_paste_reply, id: 702840
    Device sessions

    4. test_community_mark_all_messages_as_read, id: 703086
    Device sessions

    5. test_community_contact_block_unblock_offline, id: 702894
    Device sessions

    6. test_community_edit_delete_message_when_offline, id: 704615
    Device sessions

    7. test_community_message_delete, id: 702839
    Device sessions

    8. test_community_message_send_check_timestamps_sender_username, id: 702838
    Device sessions

    9. test_community_links_with_previews_github_youtube_twitter_gif_send_enable, id: 702844
    Device sessions

    10. test_community_message_edit, id: 702843
    Device sessions

    11. test_community_unread_messages_badge, id: 702841
    Device sessions

    Class TestActivityMultipleDevicePR:

    1. test_navigation_jump_to, id: 702936
    Device sessions

    2. test_activity_center_reply_read_unread_delete_filter_swipe, id: 702947
    Device sessions

    Class TestActivityCenterContactRequestMultipleDevicePR:

    1. test_activity_center_contact_request_accept_swipe_mark_all_as_read, id: 702851
    Device sessions

    2. test_activity_center_contact_request_decline, id: 702850
    Device sessions

    Class TestActivityMultipleDevicePRTwo:

    1. test_activity_center_mentions, id: 702957
    Device sessions

    2. test_activity_center_admin_notification_accept_swipe, id: 702958
    Device sessions

    Class TestWalletOneDevice:

    1. test_wallet_add_remove_regular_account, id: 727231
    Device sessions

    2. test_wallet_add_remove_watch_only_account, id: 727232
    Device sessions

    Class TestWalletMultipleDevice:

    1. test_wallet_send_asset_from_drawer, id: 727230
    Device sessions

    2. test_wallet_send_eth, id: 727229
    Device sessions

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_emoji_send_reply_and_open_link, id: 702782
    Device sessions

    2. test_1_1_chat_text_message_delete_push_disappear, id: 702733
    Device sessions

    3. test_1_1_chat_push_emoji, id: 702813
    Device sessions

    4. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
    Device sessions

    5. test_1_1_chat_edit_message, id: 702855
    Device sessions

    6. test_1_1_chat_send_image_save_and_share, id: 703391
    Device sessions

    7. test_1_1_chat_pin_messages, id: 702731
    Device sessions

    8. test_1_1_chat_message_reaction, id: 702730
    Device sessions

    Class TestGroupChatMultipleDeviceMergedNewUI:

    1. test_group_chat_pin_messages, id: 702732
    Device sessions

    2. test_group_chat_mute_chat, id: 703495
    Device sessions

    3. test_group_chat_send_image_save_and_share, id: 703297
    Device sessions

    4. test_group_chat_reactions, id: 703202
    Device sessions

    5. test_group_chat_join_send_text_messages_push, id: 702807
    Device sessions

    6. test_group_chat_offline_pn, id: 702808
    Device sessions

    Class TestCommunityMultipleDeviceMergedTwo:

    1. test_community_markdown_support, id: 702809
    Device sessions

    2. test_community_hashtag_links_to_community_channels, id: 702948
    Device sessions

    3. test_community_mentions_push_notification, id: 702786
    Device sessions

    4. test_community_leave, id: 702845
    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

    3. test_community_undo_delete_message, id: 702869
    Device sessions

    4. test_community_navigate_to_channel_when_relaunch, id: 702846
    Device sessions

    5. test_community_mute_community_and_channel, id: 703382
    Device sessions

    Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:

    1. test_1_1_chat_delete_via_long_press_relogin, id: 702784
    Device sessions

    2. test_1_1_chat_is_shown_message_sent_delivered_from_offline, id: 702783
    Device sessions

    3. test_1_1_chat_mute_chat, id: 703496
    Device sessions

    @J-Son89
    Copy link
    Contributor Author

    J-Son89 commented Apr 9, 2024

    @status-im/mobile-qa - this pr just moves code around. Can I merge it, do tests look okay? 🤔

    @@ -0,0 +1,22 @@
    (ns status-im.contexts.wallet.common.wizard.events
    Copy link
    Contributor Author

    Choose a reason for hiding this comment

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

    let's keep events in events.cljs files :)

    @VolodLytvynenko
    Copy link
    Contributor

    hi @J-Son89 the e2e failures are not PR related. PR can be merged. Thanx!

    @churik
    Copy link
    Member

    churik commented Apr 10, 2024

    Yes, @J-Son89 - you can merge it, thank you

    @J-Son89 J-Son89 force-pushed the jc/organise-add-account branch 2 times, most recently from dce8eda to 7eb08ea Compare April 10, 2024 17:45
    @J-Son89 J-Son89 force-pushed the jc/organise-add-account branch from 7eb08ea to 9fe5e21 Compare April 10, 2024 17:58
    @J-Son89 J-Son89 merged commit 1d1eae1 into develop Apr 11, 2024
    6 checks passed
    @J-Son89 J-Son89 deleted the jc/organise-add-account branch April 11, 2024 10:01
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    Archived in project
    Archived in project
    Development

    Successfully merging this pull request may close these issues.

    9 participants