From e3c8b20205af5bdaa2f7edbde24c8b1b62ab7941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 11 May 2021 18:07:41 +0300
Subject: [PATCH] Team member improvements

---
 .../assign-owner-dialog.component.html                    | 2 +-
 .../assign-owner-dialog.component.scss                    | 8 +-------
 .../assign-owner-dialog/assign-owner-dialog.component.ts  | 1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.html
index 8e6ccd5b2..e3a038f2a 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.html
@@ -67,7 +67,7 @@
                                 <redaction-round-checkbox [active]="isApprover(userId)" class="mr-8"></redaction-round-checkbox>
                                 <span [translate]="'assign-' + data.type + '-owner.dialog.make-approver'"></span>
                             </div>
-                            <mat-icon *ngIf="!isOwner(userId)" [svgIcon]="'red:' + (isMemberSelected(userId) ? 'close' : 'check')"></mat-icon>
+                            <mat-icon *ngIf="!isOwner(userId)" svgIcon="red:check"></mat-icon>
                         </div>
                     </div>
                 </div>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss
index 264daedc3..af18d0899 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss
@@ -55,15 +55,9 @@ redaction-team-members {
             }
         }
 
-        &.selected {
-            .actions {
-                display: flex;
-            }
-        }
-
+        &.selected,
         &:hover {
             background-color: $grey-2;
-
             .actions {
                 display: flex;
             }
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.ts
index e69db6b4c..15b36e701 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.ts
@@ -61,6 +61,7 @@ export class AssignOwnerDialogComponent {
         const searchQuery = this.searchForm.get('query').value;
         return this.userService.eligibleUsers
             .filter((user) => this.userService.getNameForId(user.userId).toLowerCase().includes(searchQuery.toLowerCase()))
+            .filter((user) => this.selectedSingleUser !== user.userId)
             .map((user) => user.userId);
     }