migrate to gpui-component

crates/relay_auth/Cargo.toml

@@ -8,10 +8,10 @@ publish.workspace = true
 state = { path = "../state" }
 settings = { path = "../settings" }
 common = { path = "../common" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
 
 gpui.workspace = true
+gpui-component.workspace = true
+
 nostr-sdk.workspace = true
 
 anyhow.workspace = true

crates/relay_auth/src/lib.rs

@@ -10,14 +10,13 @@ use gpui::{
     App, AppContext, Context, Entity, Global, IntoElement, ParentElement, SharedString, Styled,
     Task, Window, div, relative,
 };
+use gpui_component::button::Button;
+use gpui_component::notification::{Notification, NotificationType};
+use gpui_component::{ActiveTheme, Disableable, WindowExt, v_flex};
 use nostr_sdk::prelude::*;
 use settings::{AppSettings, AuthMode};
 use smallvec::{SmallVec, smallvec};
 use state::NostrRegistry;
-use theme::ActiveTheme;
-use ui::button::Button;
-use ui::notification::{Notification, NotificationKind};
-use ui::{Disableable, WindowExtension, v_flex};
 
 const AUTH_MESSAGE: &str =
     "Approve the authentication request to allow Coop to continue sending or receiving events.";
@@ -270,7 +269,7 @@ impl RelayAuth {
             let url = req.url();
 
             this.update_in(cx, |this, window, cx| {
-                window.clear_notification_by_id::<AuthNotification>(challenge, cx);
+                window.remove_notification1::<AuthNotification>(challenge, cx);
 
                 match result {
                     Ok(_) => {
@@ -325,9 +324,9 @@ impl RelayAuth {
         let loading = Rc::new(Cell::new(false));
 
         Notification::new()
-            .type_id::<AuthNotification>(challenge)
+            .id1::<AuthNotification>(challenge)
             .autohide(false)
-            .with_kind(NotificationKind::Info)
+            .with_type(NotificationType::Info)
             .title("Authentication Required")
             .content(move |_this, _window, cx| {
                 v_flex()
@@ -344,8 +343,8 @@ impl RelayAuth {
                             .px_1p5()
                             .rounded_sm()
                             .text_xs()
-                            .bg(cx.theme().elevated_surface_background)
-                            .text_color(cx.theme().text)
+                            .bg(cx.theme().muted)
+                            .text_color(cx.theme().muted_foreground)
                             .child(url.clone()),
                     )
                     .into_any_element()