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

Design fixes for profile options #15966

Merged
merged 2 commits into from
May 22, 2023
Merged

Design fixes for profile options #15966

merged 2 commits into from
May 22, 2023

Conversation

vkjr
Copy link
Contributor

@vkjr vkjr commented May 19, 2023

Partially fixes design notes from #15789

Summary

Fixes the following notes:

  • Set drawer background color to shell (full comment here)
  • Updated delete icon design (full comment here)
  • Increased bottom padding for bottom sheet, made it 55 as in designs, instead of defaults of safe area (full comment here)

status: ready

@@ -69,12 +69,17 @@
(when js/goog.DEBUG
[reloader/reload-view])]))))

; Designs require bottom inset to be bigger than safe area, otherwise it is too close to the bottom
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you think its better if we move this block of code to status-mobile/src/react_native/safe_area.cljs ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure, to be honest. Safe area is used in a lot of different contexts and the file safe_area.cljs used as an interface react-native-static-safe-area-insets. So I don't think that moving bottom-sheet stuff there will be beneficial. Whereas its declaration near the place of use looks more obvious to me.
Wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm I can understand why you did this, to be honest in most cases i do this too.

The thought process behind my original comment was this ,
Since safe_area.cljs is an interface, I thought it would be better to have a bottom sheet variant over there which could then be used like this in your code like this :

(def bottom-sheet
  (reagent/reactify-component
   (fn []
     (let [{:keys [sheets hide?]} (rf/sub [:bottom-sheet])
           sheet                  (last sheets)
           insets                 (safe-area/bottom-sheet-insets)]
       ^{:key (str "sheet" @reloader/cnt)}
       [:<>
        [inactive]

But totally upto you, I don't have a very strong opinion on this :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I checked all the usages of (safe-area/get-insets) and didn't find other similar code where insets are changed right after getting. So I would suggest leaving it as is. And if we will find out that different components also want to get some alternated insets, we can move all these alternations to safe_area.cljs.

In general I think that developer who opened safe_area.cljs for his own reasons shouldn't stumble upon bottom-sheet mention and think about it, since it is on another level of abstraction)

@status-im-auto
Copy link
Member

status-im-auto commented May 19, 2023

Jenkins Builds

Click to see older builds (8)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 2aa2f04 #2 2023-05-19 12:44:52 ~6 min android 🤖apk 📲
✔️ 2aa2f04 #2 2023-05-19 12:44:57 ~6 min android-e2e 🤖apk 📲
✔️ 2aa2f04 #2 2023-05-19 12:45:09 ~6 min tests 📄log
✔️ 2aa2f04 #2 2023-05-19 12:46:37 ~8 min ios 📱ipa 📲
✔️ 1d4365e #3 2023-05-19 13:18:08 ~5 min android-e2e 🤖apk 📲
✔️ 1d4365e #3 2023-05-19 13:18:33 ~6 min ios 📱ipa 📲
✔️ 1d4365e #3 2023-05-19 13:18:39 ~6 min android 🤖apk 📲
✔️ 1d4365e #3 2023-05-19 13:19:08 ~6 min tests 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
c1c239e #4 2023-05-22 14:24:11 ~34 sec ios 📄log
✔️ 0f0caee #5 2023-05-22 14:32:43 ~5 min android 🤖apk 📲
✔️ 0f0caee #5 2023-05-22 14:32:55 ~5 min android-e2e 🤖apk 📲
✔️ 0f0caee #5 2023-05-22 14:33:25 ~6 min ios 📱ipa 📲
✔️ 0f0caee #5 2023-05-22 14:33:39 ~6 min tests 📄log

Copy link
Contributor

@siddarthkay siddarthkay left a comment

Choose a reason for hiding this comment

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

Other than a minor comment, this looks good to me, good work @vkjr

@status-im-auto
Copy link
Member

84% of end-end tests have passed

Total executed tests: 32
Failed tests: 5
Passed tests: 27
IDs of failed tests: 702844,702782,702850,702851,702838 

Failed tests (5)

Click to expand
  • Rerun failed tests

  • Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_emoji_send_reply_and_open_link, id: 702782

    Device 1: Tap on found: SendMessageButton
    Device 2: Find `Button` by `xpath`: `//*[starts-with(@text,'http://status.im')]`

    critical/chats/test_1_1_public_chats.py:930: in test_1_1_chat_emoji_send_reply_and_open_link
        self.chat_2.element_starts_with_text(url_message, 'button').click_inside_element_by_coordinate(0.2, 0.5)
    ../views/base_element.py:328: in click_inside_element_by_coordinate
        location, size = self.get_element_coordinates()
    ../views/base_element.py:266: in get_element_coordinates
        element = self.find_element()
    ../views/base_element.py:80: in find_element
        raise NoSuchElementException(
     Device 2: Button by xpath: `//*[starts-with(@text,'http://status.im')]` is not found on the screen
    



    Device sessions

    Class TestActivityCenterContactRequestMultipleDevicePR:

    1. test_activity_center_contact_request_decline, id: 702850

    Device 2: Looking for activity center element: 'sender'
    Device 2: Find Button by xpath: //*[contains(@text, 'sender')]/ancestor::*[@content-desc='activity']//*[@content-desc="activity-message-body"]

    medium/test_activity_center.py:68: in test_activity_center_contact_request_decline
        if activity_center_element.message_body.text != self.home_2.get_translation_by_key("add-me-to-your-contacts"):
    ../views/base_element.py:209: in text
        return self.find_element().text
    ../views/base_element.py:80: in find_element
        raise NoSuchElementException(
     Device 2: Button by xpath: `//*[contains(@text, 'sender')]/ancestor::*[@content-desc='activity']//*[@content-desc="activity-message-body"]` is not found on the screen
    



    Device sessions

    2. test_activity_center_contact_request_accept_swipe_mark_all_as_read, id: 702851

    Device 2: Find Button by accessibility id: new-chat-button
    Device 2: Find Button by accessibility id: add-a-contact

    medium/test_activity_center.py:78: in test_activity_center_contact_request_accept_swipe_mark_all_as_read
        self.home_2.add_contact(self.public_key_1, remove_from_contacts=True)
    ../views/home_view.py:337: in add_contact
        self.add_a_contact_chat_bottom_sheet_button.click()
    ../views/base_element.py:91: in click
        self.find_element().click()
    ../views/base_element.py:80: in find_element
        raise NoSuchElementException(
     Device 2: Button by accessibility id: `add-a-contact` is not found on the screen
    



    Device sessions

    Class TestCommunityMultipleDeviceMerged:

    1. test_community_links_with_previews_github_youtube_twitter_gif_send_enable, id: 702844

    Device 2: Tap on found: SendMessageButton
    Device 2: Find Button by xpath: //*[@text="Don't ask me again"]

    critical/test_public_chat_browsing.py:604: in test_community_links_with_previews_github_youtube_twitter_gif_send_enable
        self.channel_2.element_by_translation_id("dont-ask").click()
    ../views/base_element.py:91: in click
        self.find_element().click()
    ../views/base_element.py:80: in find_element
        raise NoSuchElementException(
     Device 2: Button by xpath: `//*[@text="Don't ask me again"]` is not found on the screen
    



    Device sessions

    2. test_community_message_send_check_timestamps_sender_username, id: 702838

    Device 2: Verifying that 'hello' is under today
    Device 2: Looking for a message by text: hello

    critical/test_public_chat_browsing.py:456: in test_community_message_send_check_timestamps_sender_username
        channel.verify_message_is_under_today_text(message, self.errors)
    ../views/chat_view.py:935: in verify_message_is_under_today_text
        message_element.wait_for_visibility_of_element()
    ../views/base_element.py:135: in wait_for_visibility_of_element
        raise TimeoutException(
     Device 2: ChatElementByText by xpath:`//*[starts-with(@text,'hello')]/ancestor::android.view.ViewGroup[@content-desc='chat-item']` is not found on the screen after wait_for_visibility_of_element 
    

    [[blocked by 14797]]

    Device sessions

    Passed tests (27)

    Click to expand

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_text_message_delete_push_disappear, id: 702733
    Device sessions

    2. test_1_1_chat_edit_message, id: 702855
    Device sessions

    3. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
    Device sessions

    4. test_1_1_chat_message_reaction, id: 702730
    Device sessions

    5. test_1_1_chat_is_shown_message_sent_delivered_from_offline, id: 702783
    Device sessions

    6. test_1_1_chat_pin_messages, id: 702731
    Device sessions

    7. test_1_1_chat_push_emoji, id: 702813
    Device sessions

    8. test_1_1_chat_delete_via_long_press_relogin, id: 702784
    Device sessions

    Class TestActivityMultipleDevicePR:

    1. test_activity_center_reply_read_unread_delete_filter_swipe, id: 702947
    Device sessions

    2. test_activity_center_admin_notification_accept_swipe, id: 702958
    Device sessions

    3. test_navigation_jump_to, id: 702936
    Device sessions

    4. test_activity_center_mentions, id: 702957
    Device sessions

    Class TestCommunityOneDeviceMerged:

    1. test_community_navigate_to_channel_when_relaunch, id: 702846
    Device sessions

    2. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
    Device sessions

    3. test_community_copy_and_paste_message_in_chat_input, id: 702742
    Device sessions

    Class TestGroupChatMultipleDeviceMergedNewUI:

    1. test_group_chat_pin_messages, id: 702732
    Device sessions

    2. test_group_chat_join_send_text_messages_push, id: 702807
    Device sessions

    3. test_group_chat_offline_pn, id: 702808
    Device sessions

    Class TestCommunityMultipleDeviceMerged:

    1. test_community_emoji_send_copy_paste_reply, id: 702840
    Device sessions

    2. test_1_1_chat_image_send_reply, id: 702859
    Device sessions

    3. test_community_mentions_push_notification, id: 702786
    Device sessions

    4. test_community_contact_block_unblock_offline, id: 702894
    Device sessions

    5. test_community_leave, id: 702845
    Device sessions

    6. test_community_unread_messages_badge, id: 702841
    Device sessions

    7. test_community_message_delete, id: 702839
    Device sessions

    8. test_community_mark_all_messages_as_read, id: 703086
    Device sessions

    9. test_community_message_edit, id: 702843
    Device sessions

    @status-im-auto
    Copy link
    Member

    50% of end-end tests have passed

    Total executed tests: 4
    Failed tests: 2
    Passed tests: 2
    
    IDs of failed tests: 702782,702844 
    

    Failed tests (2)

    Click to expand
  • Rerun failed tests

  • Class TestCommunityMultipleDeviceMerged:

    1. test_community_links_with_previews_github_youtube_twitter_gif_send_enable, id: 702844

    Device 2: Tap on found: SendMessageButton
    Device 2: Find `Button` by `xpath`: `//*[@text="Don't ask me again"]`

    critical/test_public_chat_browsing.py:604: in test_community_links_with_previews_github_youtube_twitter_gif_send_enable
        self.channel_2.element_by_translation_id("dont-ask").click()
    ../views/base_element.py:91: in click
        self.find_element().click()
    ../views/base_element.py:80: in find_element
        raise NoSuchElementException(
     Device 2: Button by xpath: `//*[@text="Don't ask me again"]` is not found on the screen
    



    Device sessions

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_emoji_send_reply_and_open_link, id: 702782

    Device 1: Tap on found: SendMessageButton
    Device 2: Find Button by xpath: //*[starts-with(@text,'http://status.im')]

    critical/chats/test_1_1_public_chats.py:930: in test_1_1_chat_emoji_send_reply_and_open_link
        self.chat_2.element_starts_with_text(url_message, 'button').click_inside_element_by_coordinate(0.2, 0.5)
    ../views/base_element.py:328: in click_inside_element_by_coordinate
        location, size = self.get_element_coordinates()
    ../views/base_element.py:266: in get_element_coordinates
        element = self.find_element()
    ../views/base_element.py:80: in find_element
        raise NoSuchElementException(
     Device 2: Button by xpath: `//*[starts-with(@text,'http://status.im')]` is not found on the screen
    



    Device sessions

    Passed tests (2)

    Click to expand

    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

    @@ -73,7 +73,7 @@
    (styles/sheet insets window-height override-theme shell?))}

    (when shell?
    [blur/view
    [blur/ios-view
    Copy link
    Member

    Choose a reason for hiding this comment

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

    Do we have issues for blur on Android here? Asking so I can try to fix it here #15953

    Copy link
    Contributor Author

    Choose a reason for hiding this comment

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

    Yeah, with blur/view it looks incorrect on Android

    Copy link
    Contributor Author

    Choose a reason for hiding this comment

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

    photo_2023-05-22_11-45-43

    Copy link
    Member

    Choose a reason for hiding this comment

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

    Thanks, I'll try to fix it on my PR 👍

    @qoqobolo
    Copy link
    Contributor

    Thanks for the fixes @vkjr!
    PR can be merged.

    @vkjr vkjr merged commit 540e5be into develop May 22, 2023
    @vkjr vkjr deleted the design-fixes branch May 22, 2023 15:07
    @vkjr
    Copy link
    Contributor Author

    vkjr commented May 22, 2023

    @qoqobolo, thank you!

    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    No open projects
    Archived in project
    Development

    Successfully merging this pull request may close these issues.

    5 participants