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

Feat(ActivityCenter): Community membership AC notifications #7771

Merged
merged 6 commits into from
Oct 27, 2022

Conversation

MishkaRogachev
Copy link
Contributor

@MishkaRogachev MishkaRogachev commented Oct 5, 2022

Close #7274
Needs status-im/status-go#2886

What does the PR do

Add Activity Center membership notifications

Affected areas

Activity Center

Screenshot of functionality (including design for comparison)

  • I've checked the design and this PR matches it

Screenshot 2022-10-19 at 12 52 41

@status-im-auto
Copy link
Member

status-im-auto commented Oct 5, 2022

Jenkins Builds

Click to see older builds (111)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ e0bea83 #1 2022-10-05 15:12:13 ~5 min linux-cpp 📦pkg
✔️ e0bea83 #1 2022-10-05 15:16:23 ~9 min macos 📦dmg
✔️ e0bea83 #1 2022-10-05 15:18:21 ~11 min linux 📦tgz
⁉️ e0bea83 #1 2022-10-05 15:22:04 ~14 min e2e 📄log
✔️ e0bea83 #1 2022-10-05 15:27:44 ~20 min windows 📦exe
✔️ b2e76ab #3 2022-10-06 14:11:19 ~4 min linux-cpp 📦pkg
✔️ b2e76ab #3 2022-10-06 14:15:30 ~9 min macos 📦dmg
✔️ b2e76ab #3 2022-10-06 14:17:05 ~10 min linux 📦tgz
⁉️ b2e76ab #2 2022-10-06 14:21:10 ~14 min e2e 📄log
✔️ b2e76ab #3 2022-10-06 14:27:29 ~21 min windows 📦exe
✔️ 696cbd2 #4 2022-10-11 13:27:16 ~5 min linux-cpp 📦pkg
✔️ 696cbd2 #4 2022-10-11 13:30:16 ~8 min macos 📦dmg
✔️ 696cbd2 #4 2022-10-11 13:34:11 ~12 min linux 📦tgz
✔️ 696cbd2 #4 2022-10-11 13:48:36 ~26 min windows 📦exe
696cbd2 #3 2022-10-11 14:10:29 ~9 min e2e 📄log
✔️ afdc034 #5 2022-10-12 10:22:12 ~4 min linux-cpp 📦pkg
✔️ afdc034 #5 2022-10-12 10:30:02 ~12 min linux 📦tgz
✔️ afdc034 #5 2022-10-12 10:30:52 ~13 min macos 📦dmg
⁉️ afdc034 #4 2022-10-12 10:31:58 ~14 min e2e 📄log
✔️ 94f0840 #6 2022-10-12 10:35:45 ~4 min linux-cpp 📦pkg
✔️ 94f0840 #6 2022-10-12 10:39:26 ~8 min macos 📦dmg
✔️ 94f0840 #6 2022-10-12 10:43:10 ~12 min linux 📦tgz
⁉️ 94f0840 #5 2022-10-12 10:45:56 ~13 min e2e 📄log
✔️ 94f0840 #6 2022-10-12 10:52:50 ~21 min windows 📦exe
✔️ 135224c #7 2022-10-13 15:57:48 ~4 min linux-cpp 📦pkg
✔️ 135224c #7 2022-10-13 16:03:45 ~10 min macos 📦dmg
✔️ 135224c #7 2022-10-13 16:04:55 ~11 min linux 📦tgz
✔️ 135224c #7 2022-10-13 16:14:12 ~20 min windows 📦exe
135224c #6 2022-10-13 16:19:00 ~14 min e2e 📄log
✔️ f7a130d #8 2022-10-14 11:52:06 ~8 min macos 📦dmg
✔️ fcd2072 #8 2022-10-14 13:08:47 ~4 min linux-cpp 📦pkg
✔️ fcd2072 #9 2022-10-14 13:13:48 ~9 min macos 📦dmg
✔️ fcd2072 #8 2022-10-14 13:15:12 ~11 min linux 📦tgz
⁉️ fcd2072 #7 2022-10-14 13:16:46 ~12 min e2e 📄log
✔️ fcd2072 #8 2022-10-14 13:26:12 ~22 min windows 📦exe
✔️ 1520cb8 #9 2022-10-17 11:22:31 ~5 min linux-cpp 📦pkg
1520cb8 #10 2022-10-17 11:23:23 ~6 min macos 📄log
1520cb8 #8 2022-10-17 11:23:33 ~6 min e2e 📄log
1520cb8 #9 2022-10-17 11:24:35 ~7 min linux 📄log
1520cb8 #9 2022-10-17 11:29:55 ~12 min windows 📄log
✔️ fd68ffb #10 2022-10-18 16:21:20 ~4 min linux-cpp 📦pkg
✔️ fd68ffb #10 2022-10-18 16:28:39 ~11 min linux 📦tgz
✔️ fd68ffb #11 2022-10-18 16:31:31 ~14 min macos 📦dmg
⁉️ fd68ffb #9 2022-10-18 16:32:17 ~15 min e2e 📄log
✔️ fd68ffb #10 2022-10-18 16:38:04 ~21 min windows 📦exe
✔️ 998dc7b #11 2022-10-18 19:52:00 ~4 min linux-cpp 📦pkg
✔️ 998dc7b #12 2022-10-18 19:56:29 ~9 min macos 📦dmg
✔️ 998dc7b #11 2022-10-18 19:57:30 ~10 min linux 📦tgz
⁉️ 998dc7b #10 2022-10-18 20:01:07 ~13 min e2e 📄log
✔️ 998dc7b #11 2022-10-18 20:07:43 ~20 min windows 📦exe
✔️ a389c6e #13 2022-10-19 08:57:55 ~4 min linux-cpp 📦pkg
✔️ a389c6e #14 2022-10-19 09:03:15 ~9 min macos 📦dmg
✔️ a389c6e #13 2022-10-19 09:04:37 ~10 min linux 📦tgz
⁉️ a389c6e #12 2022-10-19 09:21:42 ~15 min e2e 📄log
⁉️ bdb84cc #11 2022-10-19 09:06:27 ~16 min e2e 📄log
✔️ c7498dd #14 2022-10-19 13:02:15 ~5 min linux-cpp 📦pkg
✔️ c7498dd #15 2022-10-19 13:05:50 ~9 min macos 📦dmg
✔️ c7498dd #14 2022-10-19 13:08:35 ~12 min linux 📦tgz
⁉️ c7498dd #13 2022-10-19 13:14:58 ~18 min e2e 📄log
✔️ 8da44e3 #15 2022-10-20 12:05:18 ~7 min linux-cpp 📦pkg
✔️ 8da44e3 #16 2022-10-20 12:07:09 ~8 min macos 📦dmg
✔️ 8da44e3 #15 2022-10-20 12:12:02 ~13 min linux 📦tgz
8da44e3 #14 2022-10-20 12:17:33 ~19 min e2e 📄log
✔️ 3f10e4f #16 2022-10-20 12:33:02 ~6 min linux-cpp 📦pkg
✔️ 3f10e4f #17 2022-10-20 12:35:26 ~8 min macos 📦dmg
✔️ 3f10e4f #16 2022-10-20 12:38:38 ~12 min linux 📦tgz
⁉️ 3f10e4f #15 2022-10-20 12:51:04 ~14 min e2e 📄log
✔️ f51bdba #17 2022-10-20 14:54:33 ~5 min linux-cpp 📦pkg
✔️ f51bdba #17 2022-10-20 15:01:21 ~11 min linux 📦tgz
✔️ f51bdba #18 2022-10-20 15:01:49 ~12 min macos 📦dmg
⁉️ f51bdba #16 2022-10-20 15:16:00 ~17 min e2e 📄log
✔️ 71244c5 #18 2022-10-21 12:53:32 ~4 min linux-cpp 📦pkg
✔️ 71244c5 #19 2022-10-21 12:58:50 ~9 min macos 📦dmg
✔️ 71244c5 #18 2022-10-21 12:59:06 ~10 min linux 📦tgz
71244c5 #17 2022-10-21 13:03:04 ~13 min e2e 📄log
✔️ fd29593 #19 2022-10-21 13:52:26 ~4 min linux-cpp 📦pkg
✔️ fd29593 #20 2022-10-21 13:57:18 ~9 min macos 📦dmg
✔️ fd29593 #19 2022-10-21 13:59:40 ~12 min linux 📦tgz
⁉️ fd29593 #18 2022-10-21 14:01:06 ~13 min e2e 📄log
✔️ 47cd20f #20 2022-10-21 14:49:48 ~4 min linux-cpp 📦pkg
✔️ 47cd20f #20 2022-10-21 14:56:25 ~11 min linux 📦tgz
✔️ 47cd20f #21 2022-10-21 15:01:12 ~15 min macos 📦dmg
⁉️ 47cd20f #19 2022-10-21 15:34:14 ~14 min e2e 📄log
✔️ 6828392 #21 2022-10-24 13:57:40 ~6 min linux-cpp 📦pkg
✔️ 6828392 #22 2022-10-24 14:00:39 ~9 min macos 📦dmg
✔️ 6828392 #21 2022-10-24 14:04:20 ~13 min linux 📦tgz
⁉️ 6828392 #20 2022-10-24 14:08:41 ~17 min e2e 📄log
✔️ db26abd #22 2022-10-25 12:29:28 ~4 min linux-cpp 📦pkg
✔️ db26abd #23 2022-10-25 12:35:05 ~10 min macos 📦dmg
✔️ db26abd #22 2022-10-25 12:36:34 ~11 min linux 📦tgz
db26abd #21 2022-10-25 12:52:02 ~15 min e2e 📄log
✔️ 26e86c4 #23 2022-10-25 15:04:09 ~6 min linux-cpp 📦pkg
✔️ 26e86c4 #24 2022-10-25 15:11:58 ~13 min macos 📦dmg
✔️ 26e86c4 #23 2022-10-25 15:13:06 ~15 min linux 📦tgz
✔️ 26e86c4 #23 2022-10-25 15:22:28 ~24 min windows 📦exe
✔️ 02dd634 #24 2022-10-25 15:53:05 ~5 min linux-cpp 📦pkg
✔️ 02dd634 #25 2022-10-25 15:57:12 ~9 min macos 📦dmg
✔️ 02dd634 #24 2022-10-25 16:00:09 ~12 min linux 📦tgz
02dd634 #22 2022-10-25 16:10:08 ~15 min e2e 📄log
✔️ 7893ca9 #25 2022-10-25 16:09:19 ~4 min linux-cpp 📦pkg
✔️ 7893ca9 #26 2022-10-25 16:13:33 ~8 min macos 📦dmg
✔️ 7893ca9 #25 2022-10-25 16:16:21 ~11 min linux 📦tgz
✔️ 7893ca9 #25 2022-10-25 16:27:44 ~23 min windows 📦exe
✔️ 625a67c #26 2022-10-25 16:43:08 ~5 min linux-cpp 📦pkg
✔️ 625a67c #27 2022-10-25 16:46:48 ~8 min macos 📦dmg
✔️ 625a67c #26 2022-10-25 16:49:20 ~11 min linux 📦tgz
625a67c #23 2022-10-25 17:25:45 ~14 min e2e 📄log
✔️ 6b87be9 #27 2022-10-25 21:16:09 ~4 min linux-cpp 📦pkg
✔️ 6b87be9 #28 2022-10-25 21:20:49 ~9 min macos 📦dmg
✔️ 6b87be9 #27 2022-10-25 21:23:00 ~11 min linux 📦tgz
⁉️ 6b87be9 #24 2022-10-25 21:31:35 ~19 min e2e 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 3a54d38 #28 2022-10-26 13:20:19 ~6 min linux-cpp 📦pkg
✔️ 3a54d38 #29 2022-10-26 13:23:36 ~9 min macos 📦dmg
✔️ 3a54d38 #28 2022-10-26 13:26:09 ~12 min linux 📦tgz
✔️ 3a54d38 #28 2022-10-26 13:35:08 ~21 min windows 📦exe
⁉️ 3a54d38 #25 2022-10-26 14:19:45 ~19 min e2e 📄log
✔️ e7e6b64 #29 2022-10-27 13:16:26 ~13 min linux-cpp 📦pkg
✔️ e7e6b64 #29 2022-10-27 13:25:10 ~21 min windows 📦exe
✔️ e7e6b64 #29 2022-10-27 13:25:20 ~22 min linux 📦tgz
✔️ e7e6b64 #30 2022-10-27 13:27:00 ~23 min macos 📦dmg
⁉️ e7e6b64 #26 2022-10-27 14:37:28 ~22 min e2e 📄log

@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch 5 times, most recently from afdc034 to 94f0840 Compare October 12, 2022 10:30
@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch 2 times, most recently from f7a130d to fcd2072 Compare October 14, 2022 13:03
@MishkaRogachev MishkaRogachev marked this pull request as ready for review October 14, 2022 14:15
@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch 2 times, most recently from 1520cb8 to fd68ffb Compare October 18, 2022 16:16
Copy link
Member

@caybro caybro left a comment

Choose a reason for hiding this comment

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

Just some minor stuff, otherwise looks good

@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch 2 times, most recently from bdb84cc to a389c6e Compare October 19, 2022 08:53
@MishkaRogachev
Copy link
Contributor Author

@caybro @saledjenic I've re-requested review because of lot fixes were added

Copy link
Member

@caybro caybro left a comment

Choose a reason for hiding this comment

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

LGTM, just some minor details

@elina2015 elina2015 self-requested a review October 19, 2022 15:11
Copy link

@elina2015 elina2015 left a comment

Choose a reason for hiding this comment

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

@MishkaRogachev hey, I found some small issues. Could you kindly check?

  1. There is no user name shown in the community request
  2. There is no default picture for a user without a photo in the community request

image

3. After the admin accepted a community request in Activity Center, the incorrect date appeared:

image

4. User who has been rejected for joining a community will see a 'pending' status in AC and the wrong date:

image

5. The user who was accepted for joining a community, will see a 'pending' status in AC 6. If the user has a long contact request and a community request (user), then it doesn't look good:

image

7. User A was accepted for joining a community and kicked from this community by an admin. User A will see 'pending' in AC for the community from which he was kicked off. 8. There is no sign on the AC icon (bell icon) about new notifications (community requests, accepting, rejection, kicking off)

@elina2015
Copy link

Copy link
Contributor

@osmaczko osmaczko left a comment

Choose a reason for hiding this comment

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

Overall looks ok, with some minor things.

src/app/modules/main/activity_center/item.nim Outdated Show resolved Hide resolved
ui/app/mainui/activitycenter/controls/Badge.qml Outdated Show resolved Hide resolved
ui/app/mainui/activitycenter/panels/MembershipCta.qml Outdated Show resolved Hide resolved
ui/app/mainui/activitycenter/panels/MembershipCta.qml Outdated Show resolved Hide resolved
ui/app/mainui/activitycenter/panels/MembershipCta.qml Outdated Show resolved Hide resolved
@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch from 8da44e3 to 3f10e4f Compare October 20, 2022 12:26
@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch 3 times, most recently from 7893ca9 to 625a67c Compare October 25, 2022 16:37
@MishkaRogachev
Copy link
Contributor Author

MishkaRogachev commented Oct 25, 2022

@elina2015

  1. Fixed

Screenshot 2022-10-25 at 20 24 16

  1. Hmm. I've checked several times. It should work. But if you already opened this community link do nothing.

  2. There is separated issue for that: Community request AC notification status #7980 . Temporary i can remove those type of notifications

@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch from 625a67c to 6b87be9 Compare October 25, 2022 21:11
@MishkaRogachev
Copy link
Contributor Author

@elina2015

UPD: p.3 fixed:

Screenshot 2022-10-26 at 01 09 34

@elina2015
Copy link

@MishkaRogachev hey, the button for inviting members just doesn't work. So, I cannot test the pr. Could you kindly rebase the build?
image

@anastasiyaig anastasiyaig linked an issue Oct 26, 2022 that may be closed by this pull request
@MishkaRogachev
Copy link
Contributor Author

Waiting #8048

@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch from 6b87be9 to 3a54d38 Compare October 26, 2022 13:13
@MishkaRogachev
Copy link
Contributor Author

@elina2015 Rebased. If there will be some UI-related issues, i think it would be better to open new ticket for that

@MishkaRogachev MishkaRogachev force-pushed the feat/issue-7274-community-notifications branch from 3a54d38 to e7e6b64 Compare October 27, 2022 13:03
Copy link

@elina2015 elina2015 left a comment

Choose a reason for hiding this comment

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

Tested and approved

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.

Community Requests should be displayed in the activity center Community membership notifications
7 participants