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

Merge branch 'main' into chat-again

Browse source
This commit is contained in:
Max Brunsfeld 2023-09-15 11:06:39 -07:00
commit 6c3fd2a687
547 changed files with 1040 additions and 4715 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab_ui/src/collab_panel/contact_finder.rs
View file

@ -211,7 +211,7 @@ impl PickerDelegate for ContactFinderDelegate {
ContactRequestStatus::None | ContactRequestStatus::RequestReceived => {
Some("icons/check_8.svg")
}
ContactRequestStatus::RequestSent => Some("icons/x_mark_8.svg"),
ContactRequestStatus::RequestSent => Some("icons/x.svg"),
ContactRequestStatus::RequestAccepted => None,
};
let button_style = if self.user_store.read(cx).is_contact_request_pending(user) {