1 files changed, 13 insertions, 11 deletions

diff --git a/src/components/roster_list/roster_list_item.rs b/src/components/roster_list/roster_list_item.rs
index 9ebc26a..842f66c 100644
--- a/src/components/roster_list/roster_list_item.rs
+++ b/src/components/roster_list/roster_list_item.rs
@@ -9,10 +9,7 @@ use crate::{chat::{ArcMacawChat, MacawChat}, components::{avatar::AvatarWithPres
 
 #[component]
 pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
-    let contact_contact: Store<Contact> = contact.contact;
-    let contact_user: Store<User> =
-        <ArcStore<filamento::user::User> as Clone>::clone(&contact.user.get()).into();
-    let name = move || get_name(contact_user, false);
+    let name = move || get_name(contact.user.get().into(), false);
 
     let open_chats: Store<OpenChatsPanel> =
         use_context().expect("no open chats panel store in context");
@@ -20,10 +17,10 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
     // TODO: why can this not be in the closure?????
     // TODO: not good, as overwrites preexisting chat state with possibly incorrect one...
     let chat = Chat {
-        correspondent: contact_user.jid().get(),
+        correspondent: contact.user.get().jid().get(),
         have_chatted: false,
     };
-    let chat = ArcMacawChat::got_chat_and_user(chat, contact_user.get());
+    let chat = ArcMacawChat::got_chat_and_user(chat, contact.user.get().get());
 
     let open_chat = move |_| {
         debug!("opening chat");
@@ -33,14 +30,14 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
     let open = move || {
         if let Some(open_chat) = &*open_chats.chat_view().read() {
             debug!("got open chat: {:?}", open_chat);
-            if *open_chat == *contact_user.jid().read() {
+            if *open_chat == *contact.user.get().jid().read() {
                 return Open::Focused;
             }
         }
         if let Some(_backgrounded_chat) = open_chats
             .chats()
             .read()
-            .get(contact_user.jid().read().deref())
+            .get(contact.user.get().jid().read().deref())
         {
             return Open::Open;
         }
@@ -51,10 +48,15 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
 
     view! {
         <div class="roster-list-item" class:open=move || open() class:focused=move || focused() on:click=open_chat>
-            <AvatarWithPresence user=contact_user />
+            {move || {
+                let user = contact.user.get().into();
+                view! {
+                    <AvatarWithPresence user />
+                }
+            }}
             <div class="item-info">
-                <div class="main-info"><p class="name">{name}<span class="jid"> - {move || contact_contact.user_jid().read().to_string()}</span></p></div>
-                <div class="sub-info">{move || contact_contact.subscription().read().to_string()}</div>
+                <div class="main-info"><p class="name">{name}<span class="jid"> - {move || contact.user_jid().read().to_string()}</span></p></div>
+                <div class="sub-info">{move || contact.subscription().read().to_string()}</div>
             </div>
         </div>
     }