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.

Sign up for GitHub

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

Jump to bottom

fix: token requirements margin issues #19342

Merged
merged 1 commit into from
Mar 30, 2024
Merged

fix: token requirements margin issues #19342

merged 1 commit into from
Mar 30, 2024

Conversation

jo-mut
Copy link
Contributor

@jo-mut jo-mut commented Mar 20, 2024 •
edited
Loading

fixes #19231

Summary

This pr fixes the margin and spacing issues on the bottom sheet when view community token requirements

design review is appreciated

Steps to test

  • Open Status
  • Open a token gated community
  • View token requirements options sheet

Before and after screenshots comparison

status: ready

@jo-mut jo-mut self-assigned this Mar 20, 2024
@status-im-auto
Copy link
Member

status-im-auto commented Mar 20, 2024 •
edited
Loading

Jenkins Builds

Click to see older builds (19)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ e0c37a2 #1 2024-03-20 13:16:00 ~6 min tests 📄log
✔️ e0c37a2 #1 2024-03-20 13:17:44 ~8 min android 🤖apk 📲
✔️ e0c37a2 #1 2024-03-20 13:17:55 ~8 min android-e2e 🤖apk 📲
✔️ e0c37a2 #1 2024-03-20 13:19:03 ~9 min ios 📱ipa 📲
✔️ 920ba03 #2 2024-03-20 14:29:29 ~7 min android 🤖apk 📲
✔️ 920ba03 #2 2024-03-20 14:29:45 ~8 min android-e2e 🤖apk 📲
✔️ 920ba03 #2 2024-03-20 14:36:05 ~14 min ios 📱ipa 📲
✔️ 9777f08 #3 2024-03-22 14:54:57 ~8 min tests 📄log
✔️ 9777f08 #3 2024-03-22 14:56:18 ~10 min android-e2e 🤖apk 📲
✔️ 9777f08 #3 2024-03-22 14:56:24 ~10 min android 🤖apk 📲
✔️ 9777f08 #3 2024-03-22 14:57:14 ~10 min ios 📱ipa 📲
✔️ ee771e4 #4 2024-03-24 19:28:35 ~7 min tests 📄log
✔️ ee771e4 #4 2024-03-24 19:29:59 ~8 min android-e2e 🤖apk 📲
✔️ ee771e4 #4 2024-03-24 19:30:07 ~8 min android 🤖apk 📲
✔️ ee771e4 #4 2024-03-24 19:34:37 ~13 min ios 📱ipa 📲
✔️ b059321 #5 2024-03-27 11:02:09 ~6 min tests 📄log
✔️ b059321 #5 2024-03-27 11:02:29 ~6 min android 🤖apk 📲
✔️ b059321 #5 2024-03-27 11:04:04 ~8 min android-e2e 🤖apk 📲
✔️ b059321 #5 2024-03-27 11:06:21 ~10 min ios 📱ipa 📲
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 1bc71ca #6 2024-03-28 10:35:55 ~4 min tests 📄log
✔️ 1bc71ca #6 2024-03-28 10:38:35 ~7 min android 🤖apk 📲
✔️ 1bc71ca #6 2024-03-28 10:39:44 ~8 min android-e2e 🤖apk 📲
✔️ 1bc71ca #6 2024-03-28 10:44:48 ~13 min ios 📱ipa 📲
✔️ 29be3a8 #7 2024-03-30 20:07:39 ~4 min tests 📄log
✔️ 29be3a8 #7 2024-03-30 20:11:43 ~8 min android-e2e 🤖apk 📲
✔️ 29be3a8 #7 2024-03-30 20:11:48 ~8 min ios 📱ipa 📲
✔️ 29be3a8 #7 2024-03-30 20:11:48 ~8 min android 🤖apk 📲

@jo-mut jo-mut force-pushed the bug/token-gatin-drawers-margins branch from e0c37a2 to 920ba03 Compare March 20, 2024 14:21
@jo-mut jo-mut marked this pull request as ready for review March 20, 2024 15:06
Francesca-G
Francesca-G approved these changes Mar 21, 2024
View reviewed changes
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 to me ✨

@jo-mut
Copy link
Contributor Author

jo-mut commented Mar 22, 2024 •
edited
Loading

@Parveshdhull as this pr is just about margins and is already approved by design, i think its okay to skip qa. wdyt?

@Parveshdhull
Copy link
Member

@Parveshdhull as this pr is just about margins and is already approved by design, i think its okay to skip qa. wdyt?

Yeah sounds good. Lets wait for e2e tests and get this PR merged.

@status-im-auto
Copy link
Member

75% of end-end tests have passed

Total executed tests: 48
Failed tests: 11
Expected to fail tests: 1
Passed tests: 36

IDs of failed tests: 702732,702957,703495,702894,702850,703297,703202,702807,702731,702808,702958 

IDs of expected to fail tests: 703503

Failed tests (11)

Click to expand
  • Rerun failed tests

    • Class TestCommunityMultipleDeviceMerged:

    1. test_community_contact_block_unblock_offline, id: 702894

    Device 2: `Text` is `Delivered`
    Device 1: Looking for a message by text: Hurray! unblocked 

    critical/chats/test_public_chat_browsing.py:740: in test_community_contact_block_unblock_offline
    self.errors.verify_no_errors()
base_test_case.py:191: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 1-1 chat from blocked user is not removed and messages home is not empty!



    Device sessions

    Class TestActivityMultipleDevicePRTwo:

    1. test_activity_center_mentions, id: 702957 

    Test setup failed: activity_center/test_activity_center.py:391: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(2)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



    2. test_activity_center_admin_notification_accept_swipe, id: 702958 

    Test setup failed: activity_center/test_activity_center.py:391: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(2)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_pin_messages, id: 702731

    Device 1: Find Button by xpath: //*[@content-desc='pins-count']//android.widget.TextView
    Device 2: Find Button by xpath: //*[@content-desc='pins-count']//android.widget.TextView 

    critical/chats/test_1_1_public_chats.py:267: in test_1_1_chat_pin_messages
    self.errors.verify_no_errors()
base_test_case.py:191: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Pinned messages count is 3 but should be 2 after unpinning the last pinned message for user 2



    Device sessions

    Class TestActivityCenterContactRequestMultipleDevicePR:

    1. 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:94: in test_activity_center_contact_request_decline
    self.errors.verify_no_errors()
base_test_case.py:191: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Pending contact request is not shown on unread notification element on Activity center!



    Device sessions

    Class TestGroupChatMultipleDeviceMergedNewUI:

    1. test_group_chat_pin_messages, id: 702732 

    Test setup failed: critical/chats/test_group_chat.py:19: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(3)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



    2. test_group_chat_mute_chat, id: 703495 

    Test setup failed: critical/chats/test_group_chat.py:19: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(3)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



    3. test_group_chat_send_image_save_and_share, id: 703297 

    Test setup failed: critical/chats/test_group_chat.py:19: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(3)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



    4. test_group_chat_reactions, id: 703202 

    Test setup failed: critical/chats/test_group_chat.py:19: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(3)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



    5. test_group_chat_join_send_text_messages_push, id: 702807 

    Test setup failed: critical/chats/test_group_chat.py:19: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(3)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



    6. test_group_chat_offline_pn, id: 702808 

    Test setup failed: critical/chats/test_group_chat.py:19: in prepare_devices
    self.drivers, self.loop = create_shared_drivers(3)
base_test_case.py:309: in create_shared_drivers
    drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
/usr/lib/python3.10/asyncio/base_events.py:649: in run_until_complete
    return future.result()
__init__.py:26: in start_threads
    returns[k] = await returns[k]
/usr/lib/python3.10/concurrent/futures/thread.py:58: in run
    result = self.fn(*self.args, **self.kwargs)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:257: in __init__
    super().__init__(
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:206: in __init__
    self.start_session(capabilities)
/home/jenkins/.local/lib/python3.10/site-packages/appium/webdriver/webdriver.py:346: in start_session
    response = self.execute(RemoteCommand.NEW_SESSION, w3c_caps)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:345: in execute
    self.error_handler.check_response(response)
/home/jenkins/.local/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:193: in check_response
    raise exception_class(value)
 <html><body><h1>502 Bad Gateway</h1>
E   The server returned an invalid or incomplete response.
E   </body></html>



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

    Click to expand

    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

    5. test_community_join_when_node_owner_offline, id: 703629
    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_edit_delete_message_when_offline, id: 704615
    Device sessions

    6. test_community_message_delete, id: 702839
    Device sessions

    7. test_community_message_send_check_timestamps_sender_username, id: 702838
    Device sessions

    8. test_community_links_with_previews_github_youtube_twitter_gif_send_enable, id: 702844
    Device sessions

    9. test_community_message_edit, id: 702843
    Device sessions

    10. 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 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_message_reaction, id: 702730
    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

    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

    @jo-mut jo-mut force-pushed the bug/token-gatin-drawers-margins branch 4 times, most recently from b059321 to 1bc71ca Compare March 28, 2024 10:31
    @jo-mut jo-mut force-pushed the bug/token-gatin-drawers-margins branch from 1bc71ca to 29be3a8 Compare March 30, 2024 20:03
    @jo-mut jo-mut merged commit 3067b81 into develop Mar 30, 2024
    6 checks passed
    @jo-mut jo-mut deleted the bug/token-gatin-drawers-margins branch March 30, 2024 23:03
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Reviewers

    @Parveshdhull Parveshdhull Parveshdhull approved these changes

    @Francesca-G Francesca-G Francesca-G approved these changes

    @ajayesivan ajayesivan Awaiting requested review from ajayesivan

    @ibrkhalil ibrkhalil Awaiting requested review from ibrkhalil

    Assignees

    @jo-mut jo-mut

    Labels
    design-review-required skip-manual-qa
    Projects
    Pipeline for QA
    Archived in project
    Legacy QA Automation Project
    Archived in project
    Milestone
    No milestone
    Development

    Successfully merging this pull request may close these issues.

    Communities - Channel detail Token Gating margin issues
    4 participants
    @jo-mut @status-im-auto @Parveshdhull @Francesca-G