Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflicts

Browse source
This commit is contained in:
Mikayla 2023-09-15 12:30:26 -07:00
parent f9fff3a7b2
commit 5400605483
No known key found for this signature in database
8 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/collab_ui/src/chat_panel.rs
View file

@ -167,7 +167,7 @@ impl ChatPanel {
.channel_store
.read(cx)
.channel_at_index(selected_ix)
.map(|e| e.1.id);
.map(|e| e.0.id);
if let Some(selected_channel_id) = selected_channel_id {
this.select_channel(selected_channel_id, cx)
.detach_and_log_err(cx);
@ -391,7 +391,7 @@ impl ChatPanel {
(ItemType::Unselected, true) => &theme.channel_select.hovered_item,
};
let channel = &channel_store.read(cx).channel_at_index(ix).unwrap().1;
let channel = &channel_store.read(cx).channel_at_index(ix).unwrap().0;
let channel_id = channel.id;
let mut row = Flex::row()