From 03d2100c84d22f3daf512d2089c22deab3ea4cde Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Mon, 15 Nov 2021 16:51:24 +0300
Subject: [PATCH] Fix avatars (#302)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 packages/presentation/src/components/UserBox.svelte        | 7 +------
 packages/presentation/src/components/UserInfo.svelte       | 2 +-
 .../recruit-resources/src/components/CandidateCard.svelte  | 2 +-
 plugins/recruit-resources/src/components/KanbanCard.svelte | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/presentation/src/components/UserBox.svelte b/packages/presentation/src/components/UserBox.svelte
index c110eb1be1..7b56d35cef 100644
--- a/packages/presentation/src/components/UserBox.svelte
+++ b/packages/presentation/src/components/UserBox.svelte
@@ -21,7 +21,6 @@
   import { Label, showPopup } from '@anticrm/ui'
   import Avatar from './Avatar.svelte'
   import UsersPopup from './UsersPopup.svelte'
-  import IconAvatar from './icons/Avatar.svelte'
 
   import type { Ref, Class } from '@anticrm/core'
   import { formatName, Person } from '@anticrm/contact'
@@ -66,11 +65,7 @@
   }}
 >
   <button class="focused-button btn" class:selected bind:this={btn}>
-    {#if selected}
-      <Avatar size={'medium'} />
-    {:else}
-      <IconAvatar />
-    {/if}
+    <Avatar avatar={selected ? selected.avatar : undefined} size={'medium'} />
   </button>
 
   <div class="selectUser">
diff --git a/packages/presentation/src/components/UserInfo.svelte b/packages/presentation/src/components/UserInfo.svelte
index 5d3d36c8b4..8011ed741a 100644
--- a/packages/presentation/src/components/UserInfo.svelte
+++ b/packages/presentation/src/components/UserInfo.svelte
@@ -24,7 +24,7 @@
 </script>
 
 <div class="flex-row-center" on:click>
-  <Avatar {size} />
+  <Avatar avatar={value.avatar} {size} />
   <div class="flex-col user-info">
     {#if subtitle}<div class="subtitle">{subtitle}</div>{/if}
     <div class="title">{formatName(value.name)}</div>
diff --git a/plugins/recruit-resources/src/components/CandidateCard.svelte b/plugins/recruit-resources/src/components/CandidateCard.svelte
index 2304999ded..f30f7c58ad 100644
--- a/plugins/recruit-resources/src/components/CandidateCard.svelte
+++ b/plugins/recruit-resources/src/components/CandidateCard.svelte
@@ -24,7 +24,7 @@
 
 <div class="flex-col card-container">
   <div class="label">CANDIDATE</div>
-  <Avatar size={'large'} />
+  <Avatar avatar={candidate.avatar} size={'large'} />
   {#if candidate}
     <div class="name">{formatName(candidate.name)}</div>
     <div class="description">{candidate.title}</div>
diff --git a/plugins/recruit-resources/src/components/KanbanCard.svelte b/plugins/recruit-resources/src/components/KanbanCard.svelte
index 8a86465802..901381cda6 100644
--- a/plugins/recruit-resources/src/components/KanbanCard.svelte
+++ b/plugins/recruit-resources/src/components/KanbanCard.svelte
@@ -40,7 +40,7 @@
 <div class="card-container" {draggable} class:draggable on:dragstart on:dragend>
   <div class="content">
     <div class="flex-row-center">
-      <Avatar size={'medium'} />
+      <Avatar avatar={object.$lookup?.attachedTo?.avatar} size={'medium'} />
       <div class="flex-col ml-2">
         <div class="fs-title over-underline" on:click={showCandidate}><Label label={formatName(object.$lookup?.attachedTo?.name)} /></div>
         <div class="fs-subtitle"><Label label={formatName(object.$lookup?.attachedTo?.title)} /></div>