[15550] Allow unpinning of deleted-for-me messages #15572

ibrkhalil · 2023-04-03T22:30:52Z

Summary

This PR just adds a filter on deleted-for-me pinned messages and doesn't add them to the list of pinned messages

status: ready

status-im-auto · 2023-04-03T22:37:51Z

Jenkins Builds

Click to see older builds (28)

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`6efee61`	#1	2023-04-03 22:37:51	~6 min	`tests`	📄`log`
✔️	`6efee61`	#1	2023-04-03 22:38:54	~7 min	`ios`	📱`ipa` 📲
✔️	`6efee61`	#1	2023-04-03 22:40:05	~8 min	`android-e2e`	🤖`apk` 📲
✔️	`6efee61`	#1	2023-04-03 22:40:28	~9 min	`android`	🤖`apk` 📲

✔️	`7d3e446`	#2	2023-04-08 20:21:14	~7 min	`ios`	📱`ipa` 📲
✔️	`7d3e446`	#2	2023-04-08 20:22:58	~9 min	`android-e2e`	🤖`apk` 📲
✔️	`7d3e446`	#2	2023-04-08 20:23:09	~9 min	`android`	🤖`apk` 📲
✔️	`7d3e446`	#2	2023-04-08 20:23:25	~9 min	`tests`	📄`log`

✔️	`bbe0f08`	#3	2023-04-16 17:02:24	~5 min	`android`	🤖`apk` 📲
✔️	`bbe0f08`	#3	2023-04-16 17:02:39	~5 min	`tests`	📄`log`
✔️	`bbe0f08`	#3	2023-04-16 17:02:54	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`bbe0f08`	#3	2023-04-16 17:03:39	~7 min	`ios`	📱`ipa` 📲

✔️	`d0ea50f`	#4	2023-04-17 17:32:48	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`d0ea50f`	#4	2023-04-17 17:34:41	~8 min	`android`	🤖`apk` 📲
✔️	`d0ea50f`	#4	2023-04-17 17:35:28	~8 min	`tests`	📄`log`
✔️	`d0ea50f`	#4	2023-04-17 17:41:10	~14 min	`ios`	📱`ipa` 📲

✔️	`6d65821`	#6	2023-04-17 18:52:26	~5 min	`android`	🤖`apk` 📲
✔️	`6d65821`	#6	2023-04-17 18:53:51	~6 min	`tests`	📄`log`
✔️	`6d65821`	#6	2023-04-17 18:54:03	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`6d65821`	#6	2023-04-17 18:54:24	~7 min	`ios`	📱`ipa` 📲

✔️	`2a6e2db`	#7	2023-04-19 11:49:43	~5 min	`android-e2e`	🤖`apk` 📲
✔️	`2a6e2db`	#7	2023-04-19 11:51:13	~6 min	`tests`	📄`log`
✔️	`2a6e2db`	#7	2023-04-19 11:51:14	~6 min	`ios`	📱`ipa` 📲
✔️	`2a6e2db`	#7	2023-04-19 11:51:44	~7 min	`android`	🤖`apk` 📲

✔️	`06559bd`	#8	2023-04-19 13:09:46	~6 min	`android`	🤖`apk` 📲
✔️	`06559bd`	#8	2023-04-19 13:09:47	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`06559bd`	#8	2023-04-19 13:10:21	~6 min	`tests`	📄`log`
✔️	`06559bd`	#8	2023-04-19 13:10:50	~7 min	`ios`	📱`ipa` 📲

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`2f66195`	#9	2023-04-20 07:13:59	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`2f66195`	#9	2023-04-20 07:14:00	~6 min	`android`	🤖`apk` 📲
✔️	`2f66195`	#9	2023-04-20 07:14:02	~6 min	`tests`	📄`log`
✔️	`2f66195`	#9	2023-04-20 07:14:54	~7 min	`ios`	📱`ipa` 📲

✔️	`b4ac4d4`	#10	2023-04-23 17:07:32	~6 min	`ios`	📱`ipa` 📲
✔️	`b4ac4d4`	#10	2023-04-23 17:07:36	~6 min	`android`	🤖`apk` 📲
✔️	`b4ac4d4`	#10	2023-04-23 17:07:38	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`b4ac4d4`	#10	2023-04-23 17:07:52	~6 min	`tests`	📄`log`

yqrashawn · 2023-04-04T05:28:11Z

This may cause user not be able to pin more messages if there are 3 pinned and deleted-for-me messages, and we hide them in the pinned message list.
I think we need a better solution. Maybe show them in pinned message list and allow user to unpin them

ibrkhalil · 2023-04-04T07:48:41Z

This may cause user not be able to pin more messages if there are 3 pinned and deleted-for-me messages, and we hide them in the pinned message list. I think we need a better solution. Maybe show them in pinned message list and allow user to unpin them

Going to test if that case might happen and how to avoid it, Thanks Rashawn

briansztamfater · 2023-04-04T17:01:34Z

I think it shouldn't be filtered, just shown as "deleted for me" message.

ilmotta · 2023-04-05T10:18:27Z

In Telegram, if Alice deletes a pinned message only for her, then the pinned message also disappears, along with the actual message (for her only). I don't understand the point of displaying a deleted pinned message at the top and allowing Alice to unpin a deleted message. In essence, I much prefer Telegram's behavior here.

ibrkhalil · 2023-04-05T13:31:27Z

In Telegram, if Alice deletes a pinned message only for her, then the pinned message also disappears, along with the actual message (for her only). I don't understand the point of displaying a deleted pinned message at the top and allowing Alice to unpin a deleted message. In essence, I much prefer Telegram's behavior here.

Love the mock names
I agree
CC: @pedro-et

VolodLytvynenko · 2023-04-10T15:37:11Z

In Telegram, if Alice deletes a pinned message only for her, then the pinned message also disappears, along with the actual message (for her only). I don't understand the point of displaying a deleted pinned message at the top and allowing Alice to unpin a deleted message. In essence, I much prefer Telegram's behavior here.

hi @ilmotta . agree with you about convenience. The "deleted message" showing in the pinned bar was implemented in #14488 (comment)

But, I think one of the reasons to avoid more than 3 pinned messages (we have limits of no more than 3 pinned messages. Telegram does not have the pinning messages limits) CC: @yqrashawn correct me if I am wrong about the purpose of this functionality which is done in #14488 (comment)

Example:

User_A and User_B have 3 pinned messages.
User_A removes one message by 'delete for me' (now User_A has 2 pinned messages, User_B has 3 pinned messages)
User_A sends the 4-th message and pins it (now User_A has 3 pinned messages)

Expected result:

How many pinned messages the User_B should have after step 3?

Potential solution:

User_B has 4 pinned messages despite limits of 3 pinned and maybe we should consider rejecting the functionality of message pinning limiting
User_B has 3 pinned messages (the first pinned is removed)

CC: @pedro-et need your help here

yqrashawn · 2023-04-12T02:21:34Z

@VladimrLitvinenko That's correct. #14488 allows user to unpin deleted messages (show both deleted/deleted for me messages in pinned message list), and it introduced another edge case, which is what to do with pinned deleted for me messages.

Users don't care about deleted-for-me messages, definitely, but I think users do care about if they can pin more messages.

status-im-auto · 2023-04-19T11:31:45Z

90% of end-end tests have passed

Total executed tests: 29
Failed tests: 3
Passed tests: 26

IDs of failed tests: 702850,702838,702742

Failed tests (3)

Click to expand

Rerun failed tests

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

Device 1:

Device 2:

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

Device 1:

Device 2:

Class TestCommunityOneDeviceMerged:

1. test_community_copy_and_paste_message_in_chat_input, id: 702742

Device 1: Find ChatMessageInput by accessibility id: chat-message-input
Device 1: Clear text in ChatMessageInput

critical/test_public_chat_browsing.py:352: in test_community_copy_and_paste_message_in_chat_input
    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))]))
 Message mmmeowesage_text text was not copied in community channel
E    Message https://status.im text was not copied in community channel

Device sessions

Device 1:

Passed tests (26)

Click to expand

Class TestActivityMultipleDevicePR:

1. test_activity_center_reply_read_unread_delete_filter_swipe, id: 702947
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
2. test_activity_center_admin_notification_accept_swipe, id: 702958
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
3. test_navigation_jump_to, id: 702936
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
4. test_activity_center_mentions, id: 702957
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestCommunityMultipleDeviceMerged:

1. test_community_emoji_send_copy_paste_reply, id: 702840
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
2. test_community_links_with_previews_github_youtube_twitter_gif_send_enable, id: 702844
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
3. test_community_mentions_push_notification, id: 702786
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
4. test_community_contact_block_unblock_offline, id: 702894
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
5. test_community_leave, id: 702845
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
6. test_community_unread_messages_badge, id: 702841
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
7. test_community_message_delete, id: 702839
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
8. test_community_message_edit, id: 702843
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestOneToOneChatMultipleSharedDevicesNewUi:

1. test_1_1_chat_text_message_delete_push_disappear, id: 702733
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
2. test_1_1_chat_edit_message, id: 702855
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
3. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
4. test_1_1_chat_message_reaction, id: 702730
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
5. test_1_1_chat_emoji_send_reply_and_open_link, id: 702782
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
6. test_1_1_chat_is_shown_message_sent_delivered_from_offline, id: 702783
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
7. test_1_1_chat_pin_messages, id: 702731
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
8. test_1_1_chat_push_emoji, id: 702813
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
9. test_1_1_chat_delete_via_long_press_relogin, id: 702784
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestActivityCenterContactRequestMultipleDevicePR:

1. test_activity_center_contact_request_accept_swipe_mark_all_as_read, id: 702851
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestGroupChatMultipleDeviceMergedNewUI:

1. test_group_chat_pin_messages, id: 702732
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs Device 3: Steps, video, logs
2. test_group_chat_join_send_text_messages_push, id: 702807
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs Device 3: Steps, video, logs
3. test_group_chat_offline_pn, id: 702808
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs Device 3: Steps, video, logs

Class TestCommunityOneDeviceMerged:

1. test_community_navigate_to_channel_when_relaunch, id: 702846
Device sessions Device 1: Steps, video, logs

VolodLytvynenko · 2023-04-19T11:43:27Z

Hi @ibrkhalil, thank you for your work. No issues from my side. PR is tested and ready to be merged

ibrkhalil requested review from ilmotta, erikseppanen, Parveshdhull and smohamedjavid April 3, 2023 22:30

ibrkhalil self-assigned this Apr 3, 2023

ibrkhalil added the request-manual-qa label Apr 3, 2023

ibrkhalil changed the title ~~[15550] Filter out deleted-for-me messages from pinned messages popover~~ [15550] Filter out deleted-for-me? messages from pinned messages popover Apr 8, 2023

Allow unpinning of deleted-for-you messages

6d65821

ibrkhalil force-pushed the 15550 branch from d2cb8ba to 6d65821 Compare April 17, 2023 18:46

ibrkhalil changed the title ~~[15550] Filter out deleted-for-me? messages from pinned messages popover~~ [15550] Allow unpinning of deleted-for-me messages Apr 17, 2023

VolodLytvynenko self-assigned this Apr 19, 2023

VolodLytvynenko added the Tested - OK label Apr 19, 2023

Merge branch 'develop' into 15550

2a6e2db

ibrkhalil requested a review from flexsurfer April 19, 2023 11:45

ibrkhalil added 2 commits April 19, 2023 15:03

Merge branch 'develop' into 15550

06559bd

Merge branch 'develop' into 15550

2f66195

VolodLytvynenko mentioned this pull request Apr 21, 2023

Fix replies & pinned messages #15689

Merged

ibrkhalil requested review from flexsurfer, yqrashawn, ilmotta and Parveshdhull and removed request for ilmotta, erikseppanen, flexsurfer, Parveshdhull and smohamedjavid April 23, 2023 17:00

Merge branch 'develop' into 15550

b4ac4d4

Parveshdhull approved these changes Apr 23, 2023

View reviewed changes

ibrkhalil merged commit 9ddea48 into develop Apr 23, 2023

ibrkhalil deleted the 15550 branch April 23, 2023 17:13

yqrashawn pushed a commit that referenced this pull request Apr 25, 2023

Allow unpinning of deleted-for-you messages (#15572)

ece19bf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[15550] Allow unpinning of deleted-for-me messages #15572

[15550] Allow unpinning of deleted-for-me messages #15572

ibrkhalil commented Apr 3, 2023

status-im-auto commented Apr 3, 2023 •

edited

Loading

yqrashawn commented Apr 4, 2023

ibrkhalil commented Apr 4, 2023

briansztamfater commented Apr 4, 2023

ilmotta commented Apr 5, 2023

ibrkhalil commented Apr 5, 2023

VolodLytvynenko commented Apr 10, 2023 •

edited

Loading

yqrashawn commented Apr 12, 2023

status-im-auto commented Apr 19, 2023

Class TestCommunityMultipleDeviceMerged:

Class TestActivityCenterContactRequestMultipleDevicePR:

Class TestCommunityOneDeviceMerged:

Class TestActivityMultipleDevicePR:

Class TestCommunityMultipleDeviceMerged:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestActivityCenterContactRequestMultipleDevicePR:

Class TestGroupChatMultipleDeviceMergedNewUI:

Class TestCommunityOneDeviceMerged:

VolodLytvynenko commented Apr 19, 2023

[15550] Allow unpinning of deleted-for-me messages #15572

[15550] Allow unpinning of deleted-for-me messages #15572

Conversation

ibrkhalil commented Apr 3, 2023

Summary

status-im-auto commented Apr 3, 2023 • edited Loading

Jenkins Builds

yqrashawn commented Apr 4, 2023

ibrkhalil commented Apr 4, 2023

briansztamfater commented Apr 4, 2023

ilmotta commented Apr 5, 2023

ibrkhalil commented Apr 5, 2023

VolodLytvynenko commented Apr 10, 2023 • edited Loading

Example:

Expected result:

Potential solution:

yqrashawn commented Apr 12, 2023

status-im-auto commented Apr 19, 2023

90% of end-end tests have passed

Failed tests (3)

Class TestCommunityMultipleDeviceMerged:

Class TestActivityCenterContactRequestMultipleDevicePR:

Class TestCommunityOneDeviceMerged:

Passed tests (26)

Class TestActivityMultipleDevicePR:

Class TestCommunityMultipleDeviceMerged:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestActivityCenterContactRequestMultipleDevicePR:

Class TestGroupChatMultipleDeviceMergedNewUI:

Class TestCommunityOneDeviceMerged:

VolodLytvynenko commented Apr 19, 2023

status-im-auto commented Apr 3, 2023 •

edited

Loading

VolodLytvynenko commented Apr 10, 2023 •

edited

Loading