1 files changed, 8 insertions, 11 deletions

diff --git a/src/components/chats_list/chats_list_item.rs b/src/components/chats_list/chats_list_item.rs
index 191f163..d1da727 100644
--- a/src/components/chats_list/chats_list_item.rs
+++ b/src/components/chats_list/chats_list_item.rs
@@ -10,33 +10,30 @@ use crate::{chat::MacawChat, components::{avatar::AvatarWithPresence, sidebar::O
 
 #[component]
 pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
-    let chat_chat: Store<Chat> = <ArcStore<Chat> as Clone>::clone(&chat.chat).into();
-    let chat_user: Store<User> =
-        <ArcStore<filamento::user::User> as Clone>::clone(&chat.user).into();
-    let message_message: Store<Message> = <ArcStore<Message> as Clone>::clone(&message.message).into();
-    let name = move || get_name(chat_user, true);
+    let name = move || get_name(chat.user.get().into(), true);
 
     // TODO: store fine-grained reactivity
-    let latest_message_body = move || message_message.body().get().body;
+    let latest_message_body = move || message.get().body().get().body;
     let open_chats: Store<OpenChatsPanel> =
         use_context().expect("no open chats panel store in context");
 
     let open_chat = move |_| {
         debug!("opening chat");
-        open_chats.update(|open_chats| open_chats.open(chat.clone()));
+        open_chats.update(|open_chats| open_chats.open(chat.into()));
+        // open_chats.update(|open_chats| open_chats.open(chat.chat.try_get_value().unwrap().get().clone()));
     };
 
     let open = move || {
         if let Some(open_chat) = &*open_chats.chat_view().read() {
             debug!("got open chat: {:?}", open_chat);
-            if *open_chat == *chat_chat.correspondent().read() {
+            if *open_chat == *chat.get().correspondent().read() {
                 return Open::Focused;
             }
         }
         if let Some(_backgrounded_chat) = open_chats
             .chats()
             .read()
-            .get(chat_chat.correspondent().read().deref())
+            .get(chat.get().correspondent().read().deref())
         {
             return Open::Open;
         }
@@ -45,7 +42,7 @@ pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
     let focused = move || open().is_focused();
     let open = move || open().is_open();
 
-    let date = move || message_message.timestamp().read().naive_local();
+    let date = move || message.get().timestamp().read().naive_local();
     let now = move || Local::now().naive_local();
     let timeinfo = move || if date().date() == now().date() {
         // TODO: localisation/config
@@ -56,7 +53,7 @@ pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
 
     view! {
         <div class="chats-list-item" class:open=move || open() class:focused=move || focused() on:click=open_chat>
-            <AvatarWithPresence user=chat_user />
+            <AvatarWithPresence user=chat.user.get().into() />
             <div class="item-info">
                 <div class="main-info"><p class="name">{name}</p><p class="timestamp">{timeinfo}</p></div>
                 <div class="sub-info"><p class="message-preview">{latest_message_body}</p><p><!-- "TODO: delivery or unread state" --></p></div>