diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs index f36fa67d9d..86d6bc9912 100644 --- a/crates/client/src/client.rs +++ b/crates/client/src/client.rs @@ -66,12 +66,12 @@ pub const ZED_SECRET_CLIENT_TOKEN: &str = "618033988749894"; pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(100); pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(5); -actions!(client, [Authenticate, SignOut]); +actions!(client, [SignIn, SignOut]); pub fn init(client: Arc, cx: &mut MutableAppContext) { cx.add_global_action({ let client = client.clone(); - move |_: &Authenticate, cx| { + move |_: &SignIn, cx| { let client = client.clone(); cx.spawn( |cx| async move { client.authenticate_and_connect(true, &cx).log_err().await }, diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 57f78a1630..59a4f36e27 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -4,7 +4,7 @@ use crate::{ ToggleScreenSharing, }; use call::{ActiveCall, ParticipantLocation, Room}; -use client::{proto::PeerId, Authenticate, ContactEventKind, SignOut, User, UserStore}; +use client::{proto::PeerId, ContactEventKind, SignIn, SignOut, User, UserStore}; use clock::ReplicaId; use contacts_popover::ContactsPopover; use context_menu::{ContextMenu, ContextMenuItem}; @@ -313,7 +313,7 @@ impl CollabTitlebarItem { vec![ ContextMenuItem::Item { label: "Sign in".into(), - action: Box::new(Authenticate), + action: Box::new(SignIn), }, ContextMenuItem::Item { label: "Give Feedback".into(), @@ -556,7 +556,7 @@ impl CollabTitlebarItem { fn render_sign_in_button(&self, theme: &Theme, cx: &mut RenderContext) -> ElementBox { let titlebar = &theme.workspace.titlebar; - MouseEventHandler::::new(0, cx, |state, _| { + MouseEventHandler::::new(0, cx, |state, _| { let style = titlebar.sign_in_prompt.style_for(state, false); Label::new("Sign In", style.text.clone()) .contained() @@ -565,7 +565,7 @@ impl CollabTitlebarItem { }) .with_cursor_style(CursorStyle::PointingHand) .on_click(MouseButton::Left, move |_, cx| { - cx.dispatch_action(Authenticate); + cx.dispatch_action(SignIn); }) .boxed() }