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

Fix syncing blocked contacts #3799

Merged
merged 7 commits into from
Aug 4, 2023
Merged

Conversation

igor-sirotin
Copy link
Collaborator

@igor-sirotin igor-sirotin commented Jul 25, 2023

Fixes #3804
Required for status-im/status-desktop#11523

  1. Test for blocking/unblocking contact from paired devices
  2. Fix syncing contact blocked state
  3. Fix showing Alice removed you as contact when unblocking

Related bugs:

Though the test will currently pass, there's a bunch of fixme/warning to be updated when the bugs above fixed.

@status-im-auto
Copy link
Member

status-im-auto commented Jul 25, 2023

Jenkins Builds

Click to see older builds (58)
Commit #️⃣ Finished (UTC) Duration Platform Result
✖️ d941375 #1 2023-07-25 13:44:57 ~2 min tests 📄log
✔️ d941375 #1 2023-07-25 13:45:37 ~3 min linux 📦zip
✔️ d941375 #1 2023-07-25 13:47:41 ~5 min android 📦aar
✔️ d941375 #1 2023-07-25 13:52:21 ~9 min ios 📦zip
✖️ 8b88c2c #2 2023-07-27 13:51:09 ~2 min tests 📄log
✔️ 8b88c2c #2 2023-07-27 13:51:54 ~3 min linux 📦zip
✔️ 8b88c2c #2 2023-07-27 13:53:27 ~5 min android 📦aar
✔️ 8b88c2c #2 2023-07-27 13:59:52 ~11 min ios 📦zip
✔️ 890604d #4 2023-07-31 10:46:24 ~2 min android 📦aar
✖️ 890604d #4 2023-07-31 10:46:52 ~2 min tests 📄log
✔️ 890604d #4 2023-07-31 10:47:42 ~3 min linux 📦zip
✔️ 890604d #4 2023-07-31 10:47:56 ~3 min ios 📦zip
✖️ 705f7c4 #5 2023-07-31 10:51:46 ~50 sec tests 📄log
✔️ 705f7c4 #5 2023-07-31 10:52:27 ~1 min linux 📦zip
✔️ 705f7c4 #5 2023-07-31 10:54:07 ~3 min ios 📦zip
✔️ 705f7c4 #5 2023-07-31 10:55:35 ~4 min android 📦aar
✖️ 0cbaa3d #6 2023-07-31 10:56:00 ~2 min tests 📄log
✔️ 0cbaa3d #6 2023-07-31 10:56:38 ~3 min linux 📦zip
✔️ 0cbaa3d #6 2023-07-31 10:57:06 ~1 min android 📦aar
✔️ 0cbaa3d #6 2023-07-31 10:57:16 ~3 min ios 📦zip
✖️ 3f1b318 #7 2023-07-31 11:03:25 ~2 min tests 📄log
✔️ 3f1b318 #7 2023-07-31 11:03:56 ~3 min linux 📦zip
✔️ 3f1b318 #7 2023-07-31 11:04:05 ~3 min ios 📦zip
✔️ 3f1b318 #7 2023-07-31 11:05:35 ~4 min android 📦aar
✖️ b25a4a3 #8 2023-07-31 11:05:22 ~1 min tests 📄log
✔️ b25a4a3 #8 2023-07-31 11:05:31 ~1 min linux 📦zip
✔️ b25a4a3 #8 2023-07-31 11:07:37 ~3 min ios 📦zip
✔️ b25a4a3 #8 2023-07-31 11:07:58 ~2 min android 📦aar
✔️ 3a54c8d #9 2023-07-31 11:13:10 ~1 min android 📦aar
✔️ 3a54c8d #9 2023-07-31 11:13:16 ~1 min linux 📦zip
✖️ 3a54c8d #9 2023-07-31 11:14:03 ~2 min tests 📄log
✔️ 3a54c8d #9 2023-07-31 11:14:40 ~2 min ios 📦zip
✖️ 64654fb #10 2023-07-31 11:18:42 ~1 min tests 📄log
✔️ 64654fb #10 2023-07-31 11:19:03 ~1 min linux 📦zip
✔️ 64654fb #10 2023-07-31 11:19:25 ~1 min android 📦aar
✔️ 64654fb #10 2023-07-31 11:21:59 ~4 min ios 📦zip
✖️ b2e3f5b #11 2023-07-31 11:54:18 ~1 min tests 📄log
✔️ b2e3f5b #11 2023-07-31 11:54:37 ~1 min linux 📦zip
✔️ b2e3f5b #11 2023-07-31 11:54:57 ~1 min android 📦aar
✔️ b2e3f5b #11 2023-07-31 11:57:58 ~4 min ios 📦zip
✖️ d8f78e6 #12 2023-07-31 13:34:46 ~1 min tests 📄log
✔️ d8f78e6 #12 2023-07-31 13:35:06 ~1 min linux 📦zip
✔️ d8f78e6 #12 2023-07-31 13:35:36 ~1 min android 📦aar
✔️ d8f78e6 #12 2023-07-31 13:51:30 ~17 min ios 📦zip
✔️ 4b57d22 #13 2023-07-31 13:51:44 ~1 min linux 📦zip
✔️ 4b57d22 #13 2023-07-31 13:52:03 ~2 min android 📦aar
✖️ 4b57d22 #13 2023-07-31 13:54:35 ~4 min tests 📄log
✖️ 4b57d22 #14 2023-07-31 14:11:51 ~6 min tests 📄log
✔️ 4b57d22 #13 2023-07-31 14:23:06 ~31 min ios 📦zip
✖️ 4b57d22 #15 2023-07-31 14:26:11 ~5 min tests 📄log
✔️ a8f2142 #14 2023-07-31 16:01:59 ~1 min android 📦aar
✔️ a8f2142 #14 2023-07-31 16:03:17 ~2 min linux 📦zip
✔️ a8f2142 #14 2023-07-31 16:04:03 ~3 min ios 📦zip
✖️ a8f2142 #16 2023-07-31 16:18:46 ~18 min tests 📄log
✔️ 8aba9b7 #15 2023-08-03 15:53:25 ~1 min linux 📦zip
✔️ 8aba9b7 #15 2023-08-03 15:53:43 ~1 min android 📦aar
✔️ 8aba9b7 #15 2023-08-03 15:54:58 ~3 min ios 📦zip
✖️ 8aba9b7 #17 2023-08-03 16:08:43 ~16 min tests 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 4e58c37 #16 2023-08-03 16:00:39 ~2 min linux 📦zip
✔️ 4e58c37 #16 2023-08-03 16:02:08 ~4 min ios 📦zip
✔️ 4e58c37 #16 2023-08-03 16:02:45 ~5 min android 📦aar
✖️ 4e58c37 #18 2023-08-03 16:27:11 ~18 min tests 📄log
✔️ d3cc101 #17 2023-08-04 09:04:09 ~1 min linux 📦zip
✔️ d3cc101 #17 2023-08-04 09:07:14 ~4 min ios 📦zip
✔️ d3cc101 #17 2023-08-04 09:07:28 ~4 min android 📦aar
✔️ d3cc101 #19 2023-08-04 09:25:29 ~22 min tests 📄log

@igor-sirotin
Copy link
Collaborator Author

igor-sirotin commented Jul 26, 2023

  • clean up sync_device_test.go

@igor-sirotin igor-sirotin force-pushed the fix/sync-blocked-contacts branch 10 times, most recently from 0a3175a to 4b57d22 Compare July 31, 2023 13:49
@igor-sirotin igor-sirotin marked this pull request as ready for review July 31, 2023 14:06
Copy link
Contributor

@MishkaRogachev MishkaRogachev left a comment

Choose a reason for hiding this comment

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

Great!

protocol/messenger_contacts.go Outdated Show resolved Hide resolved
protocol/messenger.go Show resolved Hide resolved
@igor-sirotin igor-sirotin force-pushed the fix/sync-blocked-contacts branch from 4b57d22 to a8f2142 Compare July 31, 2023 16:00
Copy link
Member

@Samyoul Samyoul left a comment

Choose a reason for hiding this comment

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

This looks good. Thank you for doing this work 🙏

@igor-sirotin igor-sirotin force-pushed the fix/sync-blocked-contacts branch from 8aba9b7 to 4e58c37 Compare August 3, 2023 15:57
@igor-sirotin igor-sirotin merged commit bbb8e99 into develop Aug 4, 2023
@igor-sirotin igor-sirotin deleted the fix/sync-blocked-contacts branch August 4, 2023 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When unblocked, we show 'Alice removed you as contact'
4 participants