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

Fixed styling issues for mention in the chat text #15723

Merged
merged 2 commits into from
Apr 25, 2023

Conversation

rahulpsingh
Copy link
Contributor

fixes #15702

Summary

  • Fixed styling issues for mention in the chat text

Screenshots

Android iOS
Screenshot_20230424-142630 Screenshot 2023-04-24 at 2 28 00 PM

Platforms

  • Android
  • iOS
Functional
  • 1-1 chats

status: ready

@status-github-bot
Copy link

Hey @rahulpsingh, and thank you so much for making your first pull request in status-mobile! ❤️ Please help us make your experience better by filling out this brief questionnaire https://goo.gl/forms/uWqNcVpVz7OIopXg2

@status-im-auto
Copy link
Member

status-im-auto commented Apr 24, 2023

Jenkins Builds

Click to see older builds (26)
Commit #️⃣ Finished (UTC) Duration Platform Result
2187d82 #2 2023-04-24 09:47:20 ~3 min tests 📄log
✔️ 2187d82 #2 2023-04-24 09:49:23 ~5 min android 🤖apk 📲
✔️ 2187d82 #2 2023-04-24 09:49:36 ~5 min android-e2e 🤖apk 📲
✔️ 2187d82 #2 2023-04-24 09:51:14 ~7 min ios 📱ipa 📲
608fa11 #3 2023-04-24 10:12:33 ~3 min tests 📄log
✔️ 608fa11 #3 2023-04-24 10:14:47 ~5 min android-e2e 🤖apk 📲
✔️ 608fa11 #3 2023-04-24 10:15:12 ~6 min android 🤖apk 📲
✔️ 608fa11 #3 2023-04-24 10:15:27 ~6 min ios 📱ipa 📲
✔️ 85ede0b #4 2023-04-24 13:01:14 ~5 min android 🤖apk 📲
✔️ 85ede0b #4 2023-04-24 13:01:38 ~6 min android-e2e 🤖apk 📲
✔️ 85ede0b #4 2023-04-24 13:01:45 ~6 min tests 📄log
✔️ 85ede0b #4 2023-04-24 13:02:24 ~7 min ios 📱ipa 📲
✔️ 904c1e7 #6 2023-04-24 13:26:34 ~5 min android-e2e 🤖apk 📲
✔️ 904c1e7 #6 2023-04-24 13:27:19 ~6 min android 🤖apk 📲
✔️ 904c1e7 #6 2023-04-24 13:27:28 ~6 min tests 📄log
✔️ 904c1e7 #6 2023-04-24 13:28:02 ~7 min ios 📱ipa 📲
✔️ f36ddad #7 2023-04-25 06:54:48 ~5 min android-e2e 🤖apk 📲
✔️ f36ddad #7 2023-04-25 06:55:07 ~5 min tests 📄log
✔️ f36ddad #7 2023-04-25 06:55:31 ~6 min android 🤖apk 📲
✔️ f36ddad #7 2023-04-25 06:57:59 ~8 min ios 📱ipa 📲
b4e3347 #8 2023-04-25 12:41:24 ~1 min ios 📄log
✔️ b4e3347 #8 2023-04-25 12:45:17 ~5 min android 🤖apk 📲
✔️ b4e3347 #8 2023-04-25 12:45:37 ~6 min tests 📄log
✔️ b4e3347 #8 2023-04-25 12:45:45 ~6 min android-e2e 🤖apk 📲
b4e3347 #9 2023-04-25 13:15:32 ~1 min ios 📄log
✔️ b4e3347 #10 2023-04-25 14:04:38 ~11 min ios 📱ipa 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 97944c3 #9 2023-04-25 14:14:44 ~5 min tests 📄log
✔️ 97944c3 #9 2023-04-25 14:15:34 ~6 min android-e2e 🤖apk 📲
✔️ 97944c3 #9 2023-04-25 14:15:36 ~6 min android 🤖apk 📲
✔️ 97944c3 #11 2023-04-25 14:16:19 ~7 min ios 📱ipa 📲
✔️ 66a3a3e #10 2023-04-25 15:15:57 ~7 min tests 📄log
✔️ 66a3a3e #10 2023-04-25 15:16:09 ~7 min android-e2e 🤖apk 📲
✔️ 66a3a3e #12 2023-04-25 15:16:41 ~8 min ios 📱ipa 📲
✔️ 66a3a3e #10 2023-04-25 15:16:49 ~8 min android 🤖apk 📲

@flexsurfer
Copy link
Member

hey @rahulpsingh , thank you for the PR, could you pls fix linting

[2023-04-24T09:44:25.892Z] Configuring Nix shell for target 'default'...

[2023-04-24T09:44:27.871Z] bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)

[2023-04-24T09:44:27.871Z] sh: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)

[2023-04-24T09:44:35.939Z] linting took 7779ms, errors: 0, warnings: 0

[2023-04-24T09:44:56.301Z] Formatting required in file src/status_im2/contexts/chat/messages/content/text/style.cljs

[2023-04-24T09:44:56.301Z] Formatting required in file src/status_im2/contexts/chat/messages/content/text/view.cljs

[2023-04-24T09:45:01.824Z] Processed 1086 files, 2 of which require formatting.

[2023-04-24T09:45:01.824Z] make: *** [Makefile:307: lint] Error 2

@flexsurfer flexsurfer requested review from ajayesivan and removed request for OmarBasem April 24, 2023 09:54
@rahulpsingh
Copy link
Contributor Author

hey @rahulpsingh , thank you for the PR, could you pls fix linting

[2023-04-24T09:44:25.892Z] Configuring Nix shell for target 'default'...

[2023-04-24T09:44:27.871Z] bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)

[2023-04-24T09:44:27.871Z] sh: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)

[2023-04-24T09:44:35.939Z] linting took 7779ms, errors: 0, warnings: 0

[2023-04-24T09:44:56.301Z] Formatting required in file src/status_im2/contexts/chat/messages/content/text/style.cljs

[2023-04-24T09:44:56.301Z] Formatting required in file src/status_im2/contexts/chat/messages/content/text/view.cljs

[2023-04-24T09:45:01.824Z] Processed 1086 files, 2 of which require formatting.

[2023-04-24T09:45:01.824Z] make: *** [Makefile:307: lint] Error 2

Sure, yes!!

@cammellos
Copy link
Contributor

@rahulpsingh it seems it still needs some linting, you can fix those issues by running:
make lint-fix / commit / push

Thank you!

@rahulpsingh rahulpsingh force-pushed the feature/15702-mention-styles branch 2 times, most recently from 3965402 to 904c1e7 Compare April 24, 2023 13:20
Copy link
Contributor

@ilmotta ilmotta left a comment

Choose a reason for hiding this comment

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

Nice to see this is fixed, thanks @rahulpsingh

Copy link
Contributor

@ajayesivan ajayesivan left a comment

Choose a reason for hiding this comment

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

I created a PR(#15698) with a partial fix for this issue last week. But I think this one fixes it completely.

Great work 🎉 @rahulpsingh & Thanks for the PR.

@pavloburykh
Copy link
Contributor

Hey @rahulpsingh ! Thanx for the PR. Could you please rebase it to the latest develop before we proceed with testing? Thanx!

@cammellos
Copy link
Contributor

@pavloburykh rebased!

@status-im-auto
Copy link
Member

93% of end-end tests have passed

Total executed tests: 29
Failed tests: 2
Passed tests: 27
IDs of failed tests: 702850,702838 

Failed tests (2)

Click to expand
  • Rerun failed tests

  • Class TestActivityCenterContactRequestMultipleDevicePR:

    1. test_activity_center_contact_request_decline, id: 702850

    Device 2: Find `Button` by `accessibility id`: `tab-recent`
    Device 2: Tap on found: Button

    medium/test_activity_center.py:142: in test_activity_center_contact_request_decline
        self.errors.verify_no_errors()
    base_test_case.py:184: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     Username is not shown on 'Add contact' page after entering valid public key 
    

    [[Blocked by 15500]]

    Device sessions

    Class TestCommunityMultipleDeviceMerged:

    1. 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:418: in test_community_message_send_check_timestamps_sender_username
        channel.verify_message_is_under_today_text(message, self.errors)
    ../views/chat_view.py:923: 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 TestActivityCenterContactRequestMultipleDevicePR:

    1. test_activity_center_contact_request_accept_swipe_mark_all_as_read, id: 702851
    Device sessions

    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_emoji_send_reply_and_open_link, id: 702782
    Device sessions

    6. test_1_1_chat_is_shown_message_sent_delivered_from_offline, id: 702783
    Device sessions

    7. test_1_1_chat_pin_messages, id: 702731
    Device sessions

    8. test_1_1_chat_push_emoji, id: 702813
    Device sessions

    9. test_1_1_chat_delete_via_long_press_relogin, id: 702784
    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_community_links_with_previews_github_youtube_twitter_gif_send_enable, id: 702844
    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_message_edit, id: 702843
    Device sessions

    Class TestCommunityOneDeviceMerged:

    1. test_community_navigate_to_channel_when_relaunch, id: 702846
    Device sessions

    2. test_community_copy_and_paste_message_in_chat_input, id: 702742
    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

    @pavloburykh pavloburykh self-assigned this Apr 25, 2023
    @pavloburykh
    Copy link
    Contributor

    @rahulpsingh thanx for the PR. Tested and ready to be merged.

    @cammellos cammellos merged commit 80bab6d into status-im:develop Apr 25, 2023
    @John-44
    Copy link

    John-44 commented Apr 25, 2023

    The alignment of the @ mentions in the screenshots at the top or this PR looks correct in iOS, but looks incorrect for Android (because the bottom of the text in the highlighted @ mention should align with the bottom of the text that is not included in the @ mention e.g. @ mention text should be baseline aligned with non-@ mention text)

    @pavloburykh
    Copy link
    Contributor

    The alignment of the @ mentions in the screenshots at the top or this PR looks correct in iOS, but looks incorrect for Android (because the bottom of the text in the highlighted @ mention should align with the bottom of the text that is not included in the @ mention e.g. @ mention text should be baseline aligned with non-@ mention text)

    Thanx for noticing @John-44 I have logged a separate issue on that #15745

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