From e7baff02b78d5dd426f7c6bddfda87601a022d25 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Sun, 5 Oct 2025 22:55:57 -0700 Subject: [PATCH] Swap the start building and login buttons (#39576) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New onboarding screen: Screenshot 2025-10-05 at 10 38 57 PM This PR also adds a new telemetry event: `Welcome Start Building Clicked` Release Notes: - N/A --- crates/onboarding/src/onboarding.rs | 146 +++++++++++++--------------- crates/paths/src/paths.rs | 2 +- 2 files changed, 67 insertions(+), 81 deletions(-) diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs index 835db1734d986b33d3f58c8d9f1a4883458cba31..25961c4e78366369b146d8a57b4f3f6022ce1009 100644 --- a/crates/onboarding/src/onboarding.rs +++ b/crates/onboarding/src/onboarding.rs @@ -357,8 +357,6 @@ impl Onboarding { } fn render_nav(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { - let ai_setup_page = matches!(self.selected_page, SelectedPage::AiSetup); - v_flex() .h_full() .w(rems_from_px(220.)) @@ -398,106 +396,94 @@ impl Onboarding { .children(self.render_nav_buttons(window, cx)), ) .map(|this| { - let keybinding = KeyBinding::for_action_in( - &Finish, - &self.focus_handle, - window, - cx, - ) - .map(|kb| kb.size(rems_from_px(12.))); - - if ai_setup_page { + if let Some(user) = self.user_store.read(cx).current_user() { this.child( - ButtonLike::new("start_building") - .style(ButtonStyle::Outlined) - .size(ButtonSize::Medium) + v_flex() + .gap_1() .child( h_flex() - .ml_1() + .ml_2() + .gap_2() + .max_w_full() .w_full() - .justify_between() - .child(Label::new("Start Building")) - .children(keybinding), + .child(Avatar::new(user.avatar_uri.clone())) + .child( + Label::new(user.github_login.clone()) + .truncate(), + ), ) - .on_click(|_, window, cx| { - window.dispatch_action(Finish.boxed_clone(), cx); - }), + .child( + ButtonLike::new("open_account") + .size(ButtonSize::Medium) + .child( + h_flex() + .ml_1() + .w_full() + .justify_between() + .child(Label::new("Open Account")) + .children( + KeyBinding::for_action_in( + &OpenAccount, + &self.focus_handle, + window, + cx, + ) + .map(|kb| { + kb.size(rems_from_px(12.)) + }), + ), + ) + .on_click(|_, window, cx| { + window.dispatch_action( + OpenAccount.boxed_clone(), + cx, + ); + }), + ), ) } else { this.child( - ButtonLike::new("skip_all") + ButtonLike::new("sign_in") .size(ButtonSize::Medium) .child( h_flex() .ml_1() .w_full() .justify_between() - .child( - Label::new("Skip All").color(Color::Muted), - ) - .children(keybinding), + .child(Label::new("Sign In")) + .children( + KeyBinding::for_action_in( + &SignIn, + &self.focus_handle, + window, + cx, + ) + .map(|kb| kb.size(rems_from_px(12.))), + ), ) .on_click(|_, window, cx| { - window.dispatch_action(Finish.boxed_clone(), cx); + telemetry::event!("Welcome Sign In Clicked"); + window.dispatch_action(SignIn.boxed_clone(), cx); }), ) } }), ), ) - .child( - if let Some(user) = self.user_store.read(cx).current_user() { - v_flex() - .gap_1() - .child( - h_flex() - .ml_2() - .gap_2() - .max_w_full() - .w_full() - .child(Avatar::new(user.avatar_uri.clone())) - .child(Label::new(user.github_login.clone()).truncate()), - ) - .child( - ButtonLike::new("open_account") - .size(ButtonSize::Medium) - .child( - h_flex() - .ml_1() - .w_full() - .justify_between() - .child(Label::new("Open Account")) - .children( - KeyBinding::for_action_in( - &OpenAccount, - &self.focus_handle, - window, - cx, - ) - .map(|kb| kb.size(rems_from_px(12.))), - ), - ) - .on_click(|_, window, cx| { - window.dispatch_action(OpenAccount.boxed_clone(), cx); - }), - ) - .into_any_element() - } else { - Button::new("sign_in", "Sign In") - .full_width() - .style(ButtonStyle::Outlined) - .size(ButtonSize::Medium) - .key_binding( - KeyBinding::for_action_in(&SignIn, &self.focus_handle, window, cx) - .map(|kb| kb.size(rems_from_px(12.))), - ) - .on_click(|_, window, cx| { - telemetry::event!("Welcome Sign In Clicked"); - window.dispatch_action(SignIn.boxed_clone(), cx); - }) - .into_any_element() - }, - ) + .child({ + Button::new("start_building", "Start Building") + .full_width() + .style(ButtonStyle::Outlined) + .size(ButtonSize::Medium) + .key_binding( + KeyBinding::for_action_in(&Finish, &self.focus_handle, window, cx) + .map(|kb| kb.size(rems_from_px(12.))), + ) + .on_click(|_, window, cx| { + telemetry::event!("Welcome Start Building Clicked"); + window.dispatch_action(Finish.boxed_clone(), cx); + }) + }) } fn on_finish(_: &Finish, _: &mut Window, cx: &mut App) { diff --git a/crates/paths/src/paths.rs b/crates/paths/src/paths.rs index ac68cf863149dfd9c00615574bd5e51bd4592ff6..53f7f2f0230be232fc59894440410af93b15ffbb 100644 --- a/crates/paths/src/paths.rs +++ b/crates/paths/src/paths.rs @@ -65,7 +65,7 @@ pub fn set_custom_data_dir(dir: &str) -> &'static PathBuf { } CUSTOM_DATA_DIR.get_or_init(|| { let mut path = PathBuf::from(dir); - if path.is_relative() { + if path.is_relative() && path.exists() { let abs_path = path .canonicalize() .expect("failed to canonicalize custom data directory's path to an absolute path");