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

[#19264] fix: add contact bottom margin #19398

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Conversation

mohsen-ghafouri
Copy link
Contributor

fixes #19264

Summary

View profile button is too narrow, causing the button to touch the composer in the Add a contact screen

Platforms

  • iOS

Before and after screenshots comparison

Before

After

status: ready

@status-im-auto
Copy link
Member

status-im-auto commented Mar 26, 2024

Jenkins Builds

Click to see older builds (21)
Commit #️⃣ Finished (UTC) Duration Platform Result
3894f4a #1 2024-03-26 10:14:21 ~4 min tests 📄log
✔️ 3894f4a #1 2024-03-26 10:16:29 ~6 min android-e2e 🤖apk 📲
✔️ 3894f4a #1 2024-03-26 10:16:38 ~6 min android 🤖apk 📲
✔️ 3894f4a #1 2024-03-26 10:19:15 ~9 min ios 📱ipa 📲
✔️ 3894f4a #2 2024-03-26 10:34:44 ~3 min tests 📄log
✔️ e4386df #2 2024-03-26 15:00:11 ~6 min android 🤖apk 📲
✔️ e4386df #3 2024-03-26 15:00:16 ~6 min tests 📄log
✔️ e4386df #2 2024-03-26 15:01:12 ~7 min android-e2e 🤖apk 📲
✔️ e4386df #2 2024-03-26 15:02:57 ~9 min ios 📱ipa 📲
✔️ ccc4488 #4 2024-03-29 12:47:58 ~3 min tests 📄log
✔️ ccc4488 #3 2024-03-29 12:50:22 ~6 min android-e2e 🤖apk 📲
✔️ ccc4488 #3 2024-03-29 12:51:14 ~7 min android 🤖apk 📲
✔️ ccc4488 #3 2024-03-29 12:53:00 ~8 min ios 📱ipa 📲
✔️ d40b5ad #5 2024-04-02 10:51:34 ~4 min tests 📄log
✔️ d40b5ad #4 2024-04-02 10:53:10 ~5 min android 🤖apk 📲
✔️ d40b5ad #4 2024-04-02 10:54:13 ~6 min android-e2e 🤖apk 📲
✔️ d40b5ad #4 2024-04-02 10:57:38 ~10 min ios 📱ipa 📲
✔️ a36894c #6 2024-04-02 16:35:54 ~4 min tests 📄log
✔️ a36894c #5 2024-04-02 16:37:55 ~6 min android-e2e 🤖apk 📲
a36894c #5 2024-04-02 16:39:07 ~7 min ios 📄log
✔️ a36894c #5 2024-04-02 16:39:22 ~7 min android 🤖apk 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 386e98a #7 2024-04-02 18:36:04 ~4 min tests 📄log
✔️ 386e98a #6 2024-04-02 18:37:38 ~5 min android-e2e 🤖apk 📲
✔️ 386e98a #6 2024-04-02 18:39:06 ~7 min android 🤖apk 📲
386e98a #9 2024-04-03 09:26:38 ~17 min ios 📄log
✔️ 0c26b95 #8 2024-04-03 09:50:56 ~7 min tests 📄log
✔️ 0c26b95 #7 2024-04-03 09:51:28 ~7 min android-e2e 🤖apk 📲
✔️ 0c26b95 #7 2024-04-03 09:52:00 ~8 min android 🤖apk 📲
✔️ 0c26b95 #10 2024-04-03 09:52:21 ~8 min ios 📱ipa 📲

@shivekkhurana
Copy link
Contributor

I had this problem in another feature. Should we not resolve this at a lower level?

Because every view that uses keyboard-avoiding-view will have this problem due to ios keyboard suggestions.

@mohsen-ghafouri
Copy link
Contributor Author

@shivekkhurana I can see in other places they used either keyboard-vertical-offset or add bottom space in other ways. so in this small PR i prefer to not extend the scope and do any refactoring.

@status-im-auto
Copy link
Member

96% of end-end tests have passed

Total executed tests: 48
Failed tests: 1
Expected to fail tests: 1
Passed tests: 46
IDs of failed tests: 703629 
IDs of expected to fail tests: 703503 

Failed tests (1)

Click to expand
  • Rerun failed tests

  • 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:1180: 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

    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 (46)

    Click to expand

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

    1. test_links_open_universal_links_from_chat, id: 704613
    Device sessions

    2. test_links_deep_links, id: 702775
    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 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

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

    1. test_add_contact_field_validation, id: 702777
    Device sessions

    2. test_activity_center_contact_request_accept_swipe_mark_all_as_read, id: 702851
    Device sessions

    3. test_activity_center_contact_request_decline, id: 702850
    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 TestActivityMultipleDevicePRTwo:

    1. test_activity_center_mentions, id: 702957
    Device sessions

    2. test_activity_center_admin_notification_accept_swipe, id: 702958
    Device sessions

    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

    @mohsen-ghafouri
    Copy link
    Contributor Author

    @status-im/mobile-qa does it require manual QA or we can do just design review?

    @mariia-skrypnyk
    Copy link

    Hi @mohsen-ghafouri !

    We can check it quickly.
    Just rebase it, please.

    @mohsen-ghafouri
    Copy link
    Contributor Author

    Thanks @mariia-skrypnyk, rebased.

    @mariia-skrypnyk mariia-skrypnyk self-assigned this Mar 26, 2024
    @mariia-skrypnyk
    Copy link

    @mohsen-ghafouri Thanks for your fix.
    iOS looks as you showed on your example.
    But Android looks like this:
    Screenshot 2024-03-26 at 16 22 01
    Can you fix it?

    @ulisesmac
    Copy link
    Contributor

    @J-Son89 Proably this is also a good place to use the floating-button component?

    @mohsen-ghafouri
    Copy link
    Contributor Author

    @mariia-skrypnyk I already tested and it was fine, also here in design review you can see Android looks fine https://www.figma.com/file/oznddnBnDbLlLQIaACYNuj/Release-Reviews?type=design&node-id=9-108908&mode=design&t=9yEb61MuyLycw31z-4, but could you please share device information you tested it?

    @mariia-skrypnyk
    Copy link

    mariia-skrypnyk commented Mar 26, 2024

    @mohsen-ghafouri yes, please.
    I use Samsung A34 14.0
    I've retested it once more.
    Here are my steps:

    video_2024-03-26_17-33-11.mp4

    @mohsen-ghafouri
    Copy link
    Contributor Author

    @ulisesmac could you please review it again? i used what you mention for this screen.

    @mohsen-ghafouri
    Copy link
    Contributor Author

    @mariia-skrypnyk could you please test again?

    @status-im-auto
    Copy link
    Member

    92% of end-end tests have passed

    Total executed tests: 48
    Failed tests: 3
    Expected to fail tests: 1
    Passed tests: 44
    
    IDs of failed tests: 702777,702850,703629 
    
    IDs of expected to fail tests: 703503 
    

    Failed tests (3)

    Click to expand
  • Rerun failed tests

  • 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:1180: 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))]))
     User is not found on 'Add contact' page after entering valid public key
    E    User is not found on 'Add contact' page after entering valid public key
    



    Device sessions

    2. test_activity_center_contact_request_decline, id: 702850

    Device 2: Find Button by accessibility id: close-activity-center
    Device 2: Tap on found: Button

    activity_center/test_activity_center.py:95: in test_activity_center_contact_request_decline
        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))]))
     User is not found on 'Add contact' page after entering valid public key
    



    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 (44)

    Click to expand

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

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

    1. test_activity_center_contact_request_accept_swipe_mark_all_as_read, id: 702851
    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 TestDeepLinksOneDevice:

    1. test_links_open_universal_links_from_chat, id: 704613
    Device sessions

    2. test_links_deep_links, id: 702775
    Device sessions

    @ulisesmac
    Copy link
    Contributor

    @ulisesmac could you please review it again? i used what you mention for this screen.

    @mohsen-ghafouri Sure! and sorry for the delay reviewing this.

    Copy link
    Contributor

    @ulisesmac ulisesmac left a comment

    Choose a reason for hiding this comment

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

    @mohsen-ghafouri The code looks good 👍

    @mariia-skrypnyk
    Copy link

    @mariia-skrypnyk could you please test again?

    Hi @mohsen-ghafouri !
    Sorry for the delay!
    Can you please rebase your PR?

    @mohsen-ghafouri
    Copy link
    Contributor Author

    Hi @mariia-skrypnyk, done

    @mariia-skrypnyk
    Copy link

    Thanks @mohsen-ghafouri for your fix!

    I've checked iOS and Android.
    For last one I'll ask @Francesca-G to leave her comment from design perspective.
    Is it ok that user's profile is not fully visible because of blurred View profile button.
    Screenshot 2024-04-02 at 13 36 33

    Copy link

    @Francesca-G Francesca-G left a comment

    Choose a reason for hiding this comment

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

    Looks good ✨

    @mohsen-ghafouri mohsen-ghafouri force-pushed the fix/add-contact-space branch 2 times, most recently from a36894c to 386e98a Compare April 2, 2024 18:31
    @mohsen-ghafouri mohsen-ghafouri merged commit a6a7ec8 into develop Apr 3, 2024
    6 checks passed
    @mohsen-ghafouri mohsen-ghafouri deleted the fix/add-contact-space branch April 3, 2024 09:56
    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.

    View profile button bottom margin issue [iOS]
    7 participants