Просмотр исходного кода

wallet: chatview bugfix insert_line() method

darkfi 2 лет назад
Родитель
Сommit
8c8e198da7
2 измененных файлов с 10 добавлено и 5 удалено
  1. 1 1
      bin/darkwallet/insert_line.py
  2. 9 4
      bin/darkwallet/src/ui/chatview.rs

+ 1 - 1
bin/darkwallet/insert_line.py

@@ -3,7 +3,7 @@ from gui import *
 node_id = api.lookup_node_id("/window/view/chatty")
 
 arg_data = bytearray()
-serial.write_u32(arg_data, 2245)
+serial.write_u32(arg_data, 1849)
 serial.encode_str(arg_data, "nick")
 serial.encode_str(arg_data, "hello1234")
 

+ 9 - 4
bin/darkwallet/src/ui/chatview.rs

@@ -599,16 +599,21 @@ impl ChatView {
         let mut pages = self.pages2.lock().await;
         let mut idx = None;
         for (i, page) in pages.iter_mut().enumerate() {
-            let first_timest = page.msgs.first().unwrap().timest;
-            let last_timest = page.msgs.last().unwrap().timest;
+            let first_timest = page.msgs.last().unwrap().timest;
+            let last_timest = page.msgs.first().unwrap().timest;
 
+            //debug!(target: "ui::chatview", "page {i} [{first_timest}, {last_timest}]");
             if first_timest <= timest && timest <= last_timest {
+                //debug!(target: "ui::chatview", "found page {i} [{first_timest}, {last_timest}]");
                 idx = Some(i);
             }
         }
         let idx = match idx {
             Some(idx) => idx,
-            None => 0,
+            None => {
+                //debug!(target: "ui::chatview", "no page found");
+                0
+            },
         };
 
         let page = &mut pages[idx];
@@ -742,7 +747,7 @@ impl ChatView {
             let key_bytes: [u8; 4] = k.as_ref().try_into().unwrap();
             let timest = Timestamp::from_be_bytes(key_bytes);
             let chatmsg: ChatMsg = deserialize(&v).unwrap();
-            debug!(target: "ui::chatview", "{k:?} {chatmsg:?}");
+            debug!(target: "ui::chatview", "{timest:?} {chatmsg:?}");
 
             let timestr = timest.to_string();
             // left pad with zeros