From 992bd01f83582c753ac4307ab976c1b3b86adc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= <michalcieslak@status.im>
Date: Fri, 16 Sep 2022 14:03:26 +0200
Subject: [PATCH] fix(@chat/members): display member's picture according to
 settings

Closes: #7309

Two fixes:
- current user's picture is always visible
- hide pictures off all members (excluding self) when "noOne" options is
set
---
 ui/app/AppLayouts/Chat/panels/UserListPanel.qml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/panels/UserListPanel.qml b/ui/app/AppLayouts/Chat/panels/UserListPanel.qml
index 93f0691081..604392e6ac 100644
--- a/ui/app/AppLayouts/Chat/panels/UserListPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/UserListPanel.qml
@@ -81,13 +81,15 @@ Item {
             isUntrustworthy: model.isUntrustworthy
             isAdmin: model.isAdmin
             asset.name: {
-                if ((!model.isContact &&
-                    Global.privacyModuleInst.profilePicturesVisibility !==
-                    Constants.profilePicturesVisibility.everyone)) {
-                    return "";
-                }
-                //TODO check if icon is rendered correctly
-                return model.icon;
+                const isCurrentUser = model.pubKey === root.rootStore.getPubkey()
+                const visibility = Global.privacyModuleInst.profilePicturesVisibility
+
+                if (isCurrentUser
+                        || visibility === Constants.profilePicturesVisibility.everyone
+                        || (visibility === Constants.profilePicturesVisibility.contactsOnly && model.isContact))
+                    return model.icon
+
+                return ""
             }
             asset.isImage: (asset.name !== "")
             asset.isLetterIdenticon: (asset.name === "")