wip

crates/chat/src/lib.rs

@@ -97,12 +97,10 @@ impl ChatRegistry {
 
     /// Create a new chat registry instance
     fn new(cx: &mut Context<Self>) -> Self {
+        let device = DeviceRegistry::global(cx);
         let nostr = NostrRegistry::global(cx);
         let nip17_state = nostr.read(cx).nip17_state();
 
-        let device = DeviceRegistry::global(cx);
-        let device_signer = device.read(cx).device_signer.clone();
-
         // A flag to indicate if the registry is loading
         let tracking_flag = Arc::new(AtomicBool::new(false));
 
@@ -128,8 +126,8 @@ impl ChatRegistry {
 
         subscriptions.push(
             // Observe the device signer state
-            cx.observe(&device_signer, |this, state, cx| {
-                if state.read(cx).is_some() {
+            cx.observe(&device, |this, state, cx| {
+                if state.read(cx).state().set() {
                     this.handle_notifications(cx);
                 }
             }),
@@ -180,9 +178,7 @@ impl ChatRegistry {
     fn handle_notifications(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-
-        let device = DeviceRegistry::global(cx);
-        let device_signer = device.read(cx).signer(cx);
+        let signer = nostr.read(cx).signer();
 
         let status = self.tracking_flag.clone();
         let tx = self.sender.clone();
@@ -191,6 +187,7 @@ impl ChatRegistry {
             let initialized_at = Timestamp::now();
             let sub_id1 = SubscriptionId::new(DEVICE_GIFTWRAP);
             let sub_id2 = SubscriptionId::new(USER_GIFTWRAP);
+            let device_signer = signer.get_encryption_signer().await;
 
             let mut notifications = client.notifications();
             let mut processed_events = HashSet::new();