fix deleted message remains in preview at Jump to section #16374 #16385

Parveshdhull · 2023-06-25T21:03:46Z

status: ready

status-im-auto · 2023-06-25T21:10:06Z

Jenkins Builds

Click to see older builds (12)

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`49fd938`	#1	2023-06-25 21:10:05	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`49fd938`	#1	2023-06-25 21:11:13	~7 min	`ios`	📱`ipa` 📲
✔️	`49fd938`	#1	2023-06-25 21:11:51	~7 min	`android`	🤖`apk` 📲
✔️	`49fd938`	#1	2023-06-25 21:12:50	~8 min	`tests`	📄`log`

✔️	`a38ffea`	#3	2023-06-26 07:50:50	~5 min	`android`	🤖`apk` 📲
✔️	`a38ffea`	#3	2023-06-26 07:51:03	~5 min	`android-e2e`	🤖`apk` 📲
✔️	`a38ffea`	#3	2023-06-26 07:52:03	~6 min	`ios`	📱`ipa` 📲
✔️	`a38ffea`	#3	2023-06-26 07:52:45	~7 min	`tests`	📄`log`

✔️	`6114c42`	#4	2023-06-26 07:58:46	~5 min	`android-e2e`	🤖`apk` 📲
✔️	`6114c42`	#4	2023-06-26 07:58:53	~5 min	`ios`	📱`ipa` 📲
✔️	`6114c42`	#4	2023-06-26 08:00:40	~7 min	`android`	🤖`apk` 📲
✔️	`6114c42`	#4	2023-06-26 08:01:25	~8 min	`tests`	📄`log`

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`1ca949b`	#5	2023-06-26 08:35:07	~6 min	`ios`	📱`ipa` 📲
✔️	`1ca949b`	#5	2023-06-26 08:36:03	~7 min	`android`	🤖`apk` 📲
✔️	`1ca949b`	#5	2023-06-26 08:38:06	~9 min	`android-e2e`	🤖`apk` 📲
✔️	`1ca949b`	#5	2023-06-26 08:40:23	~12 min	`tests`	📄`log`

✔️	`303483a`	#6	2023-06-26 10:45:44	~7 min	`ios`	📱`ipa` 📲
✔️	`303483a`	#6	2023-06-26 10:46:13	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`303483a`	#6	2023-06-26 10:46:27	~7 min	`android`	🤖`apk` 📲
✔️	`303483a`	#6	2023-06-26 10:47:06	~8 min	`tests`	📄`log`

ibrkhalil

Non blocking comments

src/status_im2/subs/shell.cljs

ibrkhalil · 2023-06-25T21:14:51Z

src/status_im2/subs/shell.cljs

         (let [community (get communities (:community-id last-message))]
           {:content-type constants/content-type-community
            :data         {:avatar         (community-avatar community)
                           :community-name (:name community)}})

-         nil))
+         :else nil))


We don't need a default/fallback card?

subscription only returns content for the card, and default case nil was just added for the case because it would have thrown an error if a message with an unimplemented content type was received. It's not a problem with cond, removed it.

ibrkhalil · 2023-06-25T21:17:19Z

src/status_im2/subs/shell.cljs

+    (re-frame/subscribe [:multiaccount])])
+ (fn [[chat communities contacts current-multiaccount] [_ id]]
+   (let [from         (get-in chat [:last-message :from])
+         contact      (when from (multiaccounts/contact-by-identity contacts from))


Why do we need if from exists?
Is it possible to have a message without a sender, Is that a case for system messages maybe?

Not sure, just a precaution

status-im-auto · 2023-06-25T21:55:46Z

85% of end-end tests have passed

Total executed tests: 33
Failed tests: 5
Passed tests: 28

IDs of failed tests: 702732,703133,702894,702783,702731

Failed tests (5)

Click to expand

Rerun failed tests

Class TestGroupChatMultipleDeviceMergedNewUI:

1. test_group_chat_pin_messages, id: 702732
`Test is not run, e2e blocker` [[reason: [NOTRUN] Pin feature is in development]]

Class TestOneToOneChatMultipleSharedDevicesNewUi:

1. test_1_1_chat_is_shown_message_sent_delivered_from_offline, id: 702783
# STEP: Device1 goes back online and checks that 1-1 chat will be fetched Device 1: Looking for a message by text: test message `critical/chats/test_1_1_public_chats.py:1253: in test_1_1_chat_is_shown_message_sent_delivered_from_offline self.errors.verify_no_errors() base_test_case.py:182: in verify_no_errors pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))])) Message status was not delivered after back up online, it is "Sending"!` [[Issue with messages not being sent for a long time]] Device sessions Device 1: Steps, video, logs Failure screenshot Device 2: Steps, video, logs Failure screenshot
2. test_1_1_chat_pin_messages, id: 702731
`Test is not run, e2e blocker` [[reason: [NOTRUN] Pin feature is in development]]

Class TestCommunityOneDeviceMerged:

1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133

Device 1: Find Button by accessibility id: show-profiles
Device 1: Tap on found: Button

critical/test_public_chat_browsing.py:406: in test_restore_multiaccount_with_waku_backup_remove_switch
    self.errors.verify_no_errors()
base_test_case.py:182: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Contact my-custom-nickname was not restored from backup!

Device sessions

Device 1:

Class TestCommunityMultipleDeviceMerged:

1. test_community_contact_block_unblock_offline, id: 702894

Device 1: Looking for a message by text: Hurray! unblocked
Device 1: Find ChatElementByText by xpath: //*[starts-with(@text,'Hurray! unblocked')]/ancestor::android.view.ViewGroup[@content-desc='chat-item']

critical/test_public_chat_browsing.py:758: in test_community_contact_block_unblock_offline
    chat_element.find_element()
../views/chat_view.py:134: in find_element
    self.wait_for_visibility_of_element(20)
../views/base_element.py:135: in wait_for_visibility_of_element
    raise TimeoutException(
 Device 1: ChatElementByText by xpath:`//*[starts-with(@text,'Hurray! unblocked')]/ancestor::android.view.ViewGroup[@content-desc='chat-item']` is not found on the screen after wait_for_visibility_of_element

Device sessions

Device 1:

Device 2:

Passed tests (28)

Click to expand

Class TestCommunityOneDeviceMerged:

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

Class TestActivityMultipleDevicePR:

1. test_activity_center_mentions, id: 702957
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
2. test_navigation_jump_to, id: 702936
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
3. test_activity_center_reply_read_unread_delete_filter_swipe, id: 702947
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
4. test_activity_center_admin_notification_accept_swipe, id: 702958
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
2. test_activity_center_contact_request_decline, id: 702850
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestCommunityMultipleDeviceMerged:

1. test_community_several_images_send_reply, id: 703194
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
2. test_community_one_image_send_reply, id: 702859
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
3. test_community_emoji_send_copy_paste_reply, id: 702840
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
4. test_community_mark_all_messages_as_read, id: 703086
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
5. test_community_mentions_push_notification, id: 702786
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
6. test_community_message_delete, id: 702839
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
7. test_community_message_send_check_timestamps_sender_username, id: 702838
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
8. 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
9. test_community_message_edit, id: 702843
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
10. test_community_leave, id: 702845
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
11. test_community_unread_messages_badge, id: 702841
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestOneToOneChatMultipleSharedDevicesNewUi:

1. test_1_1_chat_emoji_send_reply_and_open_link, id: 702782
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
2. test_1_1_chat_text_message_delete_push_disappear, id: 702733
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
3. test_1_1_chat_delete_via_long_press_relogin, id: 702784
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
4. test_1_1_chat_push_emoji, id: 702813
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
5. 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
6. test_1_1_chat_edit_message, id: 702855
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs
7. test_1_1_chat_message_reaction, id: 702730
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestGroupChatMultipleDeviceMergedNewUI:

1. 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
2. test_group_chat_offline_pn, id: 702808
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs Device 3: Steps, video, logs

J-Son89 · 2023-06-26T09:12:18Z

src/status_im2/subs/shell.cljs

         {:content-type constants/content-type-text
-          :data         (get last-message :content)}
+          :data         {:text
+                         (if (or deleted-for-me? outgoing)


I'm curious of why do we have to include this logic here? is it not stored in the db or elsewhere that the message was deleted? 🤔

please can you elaborate, what you mean?

I would have expected this to be handled by the chat subscription instead, it seems like the preview message of a card should just pull in data and render it and not have any logic of what to render. Perhaps it is okay as is though.

pavloburykh · 2023-06-26T10:34:18Z

@Parveshdhull thanx for the fix. Rested and ready for merge.

Parveshdhull added the request-manual-qa label Jun 25, 2023

Parveshdhull requested review from jo-mut and ibrkhalil June 25, 2023 21:03

Parveshdhull self-assigned this Jun 25, 2023

ibrkhalil approved these changes Jun 25, 2023

View reviewed changes

jo-mut approved these changes Jun 25, 2023

View reviewed changes

Parveshdhull force-pushed the fix/deleted-message-in-shell branch 3 times, most recently from 6114c42 to 1ca949b Compare June 26, 2023 08:28

pavloburykh self-assigned this Jun 26, 2023

J-Son89 reviewed Jun 26, 2023

View reviewed changes

pavloburykh added the Tested - OK label Jun 26, 2023

fix deleted message remains in preview at Jump to section

303483a

Parveshdhull force-pushed the fix/deleted-message-in-shell branch from 1ca949b to 303483a Compare June 26, 2023 10:38

Parveshdhull merged commit 8f21cec into develop Jun 26, 2023

Parveshdhull deleted the fix/deleted-message-in-shell branch June 26, 2023 10:49

codemaster115 pushed a commit that referenced this pull request Jul 7, 2023

fix deleted message remains in preview at Jump to section (#16385)

032f4a2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix deleted message remains in preview at Jump to section #16374 #16385

fix deleted message remains in preview at Jump to section #16374 #16385

Parveshdhull commented Jun 25, 2023

status-im-auto commented Jun 25, 2023 •

edited

Loading

ibrkhalil left a comment

ibrkhalil Jun 25, 2023

Parveshdhull Jun 26, 2023

ibrkhalil Jun 25, 2023

Parveshdhull Jun 26, 2023

status-im-auto commented Jun 25, 2023

Class TestGroupChatMultipleDeviceMergedNewUI:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestCommunityOneDeviceMerged:

Class TestCommunityMultipleDeviceMerged:

Class TestCommunityOneDeviceMerged:

Class TestActivityMultipleDevicePR:

Class TestActivityCenterContactRequestMultipleDevicePR:

Class TestCommunityMultipleDeviceMerged:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestGroupChatMultipleDeviceMergedNewUI:

J-Son89 Jun 26, 2023

Parveshdhull Jun 26, 2023

J-Son89 Jun 26, 2023

pavloburykh commented Jun 26, 2023

fix deleted message remains in preview at Jump to section #16374 #16385

fix deleted message remains in preview at Jump to section #16374 #16385

Conversation

Parveshdhull commented Jun 25, 2023

status-im-auto commented Jun 25, 2023 • edited Loading

Jenkins Builds

ibrkhalil left a comment

Choose a reason for hiding this comment

ibrkhalil Jun 25, 2023

Choose a reason for hiding this comment

Parveshdhull Jun 26, 2023

Choose a reason for hiding this comment

ibrkhalil Jun 25, 2023

Choose a reason for hiding this comment

Parveshdhull Jun 26, 2023

Choose a reason for hiding this comment

status-im-auto commented Jun 25, 2023

85% of end-end tests have passed

Failed tests (5)

Class TestGroupChatMultipleDeviceMergedNewUI:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestCommunityOneDeviceMerged:

Class TestCommunityMultipleDeviceMerged:

Passed tests (28)

Class TestCommunityOneDeviceMerged:

Class TestActivityMultipleDevicePR:

Class TestActivityCenterContactRequestMultipleDevicePR:

Class TestCommunityMultipleDeviceMerged:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestGroupChatMultipleDeviceMergedNewUI:

J-Son89 Jun 26, 2023

Choose a reason for hiding this comment

Parveshdhull Jun 26, 2023

Choose a reason for hiding this comment

J-Son89 Jun 26, 2023

Choose a reason for hiding this comment

pavloburykh commented Jun 26, 2023

status-im-auto commented Jun 25, 2023 •

edited

Loading