merged previous stuffs on master

2026-02-20 19:48:03 +07:00
parent 014757cfc9
commit b88955e62c
176 changed files with 11152 additions and 11212 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,13 +12,15 @@ publish = false

 # GPUI
 gpui = { git = "https://github.com/zed-industries/zed" }
+gpui_platform = { git = "https://github.com/zed-industries/zed" }
 gpui_tokio = { git = "https://github.com/zed-industries/zed" }
 reqwest_client = { git = "https://github.com/zed-industries/zed" }

 # Nostr
 nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
 nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
-nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [ "nip96", "nip59", "nip49", "nip44" ] }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr" }
+nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip96", "nip59", "nip49", "nip44" ] }

 # Others
 anyhow = "1.0.44"
--- a/assets/fonts/Inter/Inter-Bold.ttf
+++ b/assets/fonts/Inter/Inter-Bold.ttf
--- a/assets/fonts/Inter/Inter-BoldItalic.ttf
+++ b/assets/fonts/Inter/Inter-BoldItalic.ttf
--- a/assets/fonts/Inter/Inter-Italic.ttf
+++ b/assets/fonts/Inter/Inter-Italic.ttf
--- a/assets/fonts/Inter/Inter-Medium.ttf
+++ b/assets/fonts/Inter/Inter-Medium.ttf
--- a/assets/fonts/Inter/Inter-MediumItalic.ttf
+++ b/assets/fonts/Inter/Inter-MediumItalic.ttf
--- a/assets/fonts/Inter/Inter-Regular.ttf
+++ b/assets/fonts/Inter/Inter-Regular.ttf
--- a/assets/fonts/Inter/Inter-SemiBold.ttf
+++ b/assets/fonts/Inter/Inter-SemiBold.ttf
--- a/assets/fonts/Inter/Inter-SemiBoldItalic.ttf
+++ b/assets/fonts/Inter/Inter-SemiBoldItalic.ttf
--- a/assets/fonts/plex-mono/ZedPlexMono-Bold.ttf
+++ b/assets/fonts/plex-mono/ZedPlexMono-Bold.ttf
--- a/assets/fonts/plex-mono/ZedPlexMono-BoldItalic.ttf
+++ b/assets/fonts/plex-mono/ZedPlexMono-BoldItalic.ttf
--- a/assets/fonts/plex-mono/ZedPlexMono-Italic.ttf
+++ b/assets/fonts/plex-mono/ZedPlexMono-Italic.ttf
--- a/assets/fonts/plex-mono/ZedPlexMono-Regular.ttf
+++ b/assets/fonts/plex-mono/ZedPlexMono-Regular.ttf
--- a/assets/fonts/plex-mono/license.txt
+++ b/assets/fonts/plex-mono/license.txt
@@ -1,92 +0,0 @@
-Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/assets/fonts/plex-sans/ZedPlexSans-Bold.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-Bold.ttf
--- a/assets/fonts/plex-sans/ZedPlexSans-BoldItalic.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-BoldItalic.ttf
--- a/assets/fonts/plex-sans/ZedPlexSans-Italic.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-Italic.ttf
--- a/assets/fonts/plex-sans/ZedPlexSans-Regular.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-Regular.ttf
--- a/assets/fonts/plex-sans/ZedPlexSans-SemiBold.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-SemiBold.ttf
--- a/assets/fonts/plex-sans/ZedPlexSans-SemiBoldItalic.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-SemiBoldItalic.ttf
--- a/assets/fonts/plex-sans/license.txt
+++ b/assets/fonts/plex-sans/license.txt
@@ -1,92 +0,0 @@
-Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/assets/icons/arrow-left.svg
+++ b/assets/icons/arrow-left.svg
@@ -1,3 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M10 5.75 3.75 12 10 18.25M4.5 12h15.75"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+    <path
+        d="M10 5.75L3.75 12L10 18.25"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M4.5 12H20.25"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
 </svg>
--- a/assets/icons/arrow-right.svg
+++ b/assets/icons/arrow-right.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M14 5.75 20.25 12 14 18.25M19.5 12H3.75"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M14 5.75L20.25 12L14 18.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M19.5 12H3.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/arrows-in.svg
+++ b/assets/icons/arrows-in.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" viewBox="0 0 256 256"><path d="M213.66,53.66,163.31,104H192a8,8,0,0,1,0,16H144a8,8,0,0,1-8-8V64a8,8,0,0,1,16,0V92.69l50.34-50.35a8,8,0,0,1,11.32,11.32ZM112,136H64a8,8,0,0,0,0,16H92.69L42.34,202.34a8,8,0,0,0,11.32,11.32L104,163.31V192a8,8,0,0,0,16,0V144A8,8,0,0,0,112,136Z"></path></svg>
--- a/assets/icons/boom.svg
+++ b/assets/icons/boom.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M17.25 14C17.25 18.0041 14.0041 21.25 10 21.25C5.99594 21.25 2.75 18.0041 2.75 14C2.75 9.99594 5.99594 6.75 10 6.75C14.0041 6.75 17.25 9.99594 17.25 14Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M15.5 8.5L17.5 6.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M16.75 1.75V3.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.75 7.25H22.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M20 4L21.25 2.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/caret-down-fill.svg
+++ b/assets/icons/caret-down-fill.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M213.66,101.66l-80,80a8,8,0,0,1-11.32,0l-80-80A8,8,0,0,1,48,88H208a8,8,0,0,1,5.66,13.66Z"></path></svg>
--- a/assets/icons/caret-down.svg
+++ b/assets/icons/caret-down.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m8 10 3.293 3.293a1 1 0 0 0 1.414 0L16 10"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M5.75 9.5L12 15.75L18.25 9.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/caret-right.svg
+++ b/assets/icons/caret-right.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M181.66,133.66l-80,80a8,8,0,0,1-11.32-11.32L164.69,128,90.34,53.66a8,8,0,0,1,11.32-11.32l80,80A8,8,0,0,1,181.66,133.66Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M9.5 18.25L15.75 12L9.5 5.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/caret-up.svg
+++ b/assets/icons/caret-up.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M213.66,165.66a8,8,0,0,1-11.32,0L128,91.31,53.66,165.66a8,8,0,0,1-11.32-11.32l80-80a8,8,0,0,1,11.32,0l80,80A8,8,0,0,1,213.66,165.66Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M5.75 14.5L12 8.25L18.25 14.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/check-circle-fill.svg
+++ b/assets/icons/check-circle-fill.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm45.66,85.66-56,56a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L112,148.69l50.34-50.35a8,8,0,0,1,11.32,11.32Z"></path></svg>
--- a/assets/icons/check-circle.svg
+++ b/assets/icons/check-circle.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M173.66,98.34a8,8,0,0,1,0,11.32l-56,56a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L112,148.69l50.34-50.35A8,8,0,0,1,173.66,98.34ZM232,128A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-16,0a88,88,0,1,0-88,88A88.1,88.1,0,0,0,216,128Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="12" r="9.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75 12.9231L10.5625 15.75L15.25 8.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/check.svg
+++ b/assets/icons/check.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M229.66,77.66l-128,128a8,8,0,0,1-11.32,0l-56-56a8,8,0,0,1,11.32-11.32L96,188.69,218.34,66.34a8,8,0,0,1,11.32,11.32Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M6.75 13.0625L9.9 16.25L17.25 7.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/chevron-down.svg
+++ b/assets/icons/chevron-down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M9.8007 10.25C8.74816 10.25 8.16683 11.4713 8.83056 12.2882L11.0301 14.9953C11.5303 15.611 12.4701 15.611 12.9704 14.9953L15.1699 12.2882C15.8336 11.4713 15.2523 10.25 14.1997 10.25H9.8007Z" fill="currentColor"/>
+</svg>
--- a/assets/icons/close-circle-fill.svg
+++ b/assets/icons/close-circle-fill.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm7.53-3.53a.75.75 0 0 0-1.06 1.06L10.94 12l-2.47 2.47a.75.75 0 1 0 1.06 1.06L12 13.06l2.47 2.47a.75.75 0 1 0 1.06-1.06L13.06 12l2.47-2.47a.75.75 0 0 0-1.06-1.06L12 10.94 9.53 8.47Z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM9.53033 8.46967C9.23744 8.17678 8.76256 8.17678 8.46967 8.46967C8.17678 8.76256 8.17678 9.23744 8.46967 9.53033L10.9393 12L8.46967 14.4697C8.17678 14.7626 8.17678 15.2374 8.46967 15.5303C8.76256 15.8232 9.23744 15.8232 9.53033 15.5303L12 13.0607L14.4697 15.5303C14.7626 15.8232 15.2374 15.8232 15.5303 15.5303C15.8232 15.2374 15.8232 14.7626 15.5303 14.4697L13.0607 12L15.5303 9.53033C15.8232 9.23744 15.8232 8.76256 15.5303 8.46967C15.2374 8.17678 14.7626 8.17678 14.4697 8.46967L12 10.9393L9.53033 8.46967Z" fill="currentColor"/>
 </svg>
--- a/assets/icons/close-circle.svg
+++ b/assets/icons/close-circle.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm7.53-3.53a.75.75 0 0 0-1.06 1.06L10.94 12l-2.47 2.47a.75.75 0 1 0 1.06 1.06L12 13.06l2.47 2.47a.75.75 0 1 0 1.06-1.06L13.06 12l2.47-2.47a.75.75 0 0 0-1.06-1.06L12 10.94 9.53 8.47Z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M15 9L9 15M15 15L9 9M21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12C2.75 6.89137 6.89137 2.75 12 2.75C17.1086 2.75 21.25 6.89137 21.25 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/close.svg
+++ b/assets/icons/close.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M205.66,194.34a8,8,0,0,1-11.32,11.32L128,139.31,61.66,205.66a8,8,0,0,1-11.32-11.32L116.69,128,50.34,61.66A8,8,0,0,1,61.66,50.34L128,116.69l66.34-66.35a8,8,0,0,1,11.32,11.32L139.31,128Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M6.25 6.25L17.75 17.75M17.75 6.25L6.25 17.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
--- a/assets/icons/copy.svg
+++ b/assets/icons/copy.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.75 8v.75m0-3.75v-.25a2 2 0 0 1 2-2H11m8 0h.25a2 2 0 0 1 2 2V5M14 2.75h2M21.25 8v2m0 3v.25a2 2 0 0 1-2 2H19m-3 0h-.75M14 8.75H4c-.69 0-1.25.56-1.25 1.25v10c0 .69.56 1.25 1.25 1.25h10c.69 0 1.25-.56 1.25-1.25V10c0-.69-.56-1.25-1.25-1.25Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.10352 4C7.42998 2.84575 8.49122 2 9.75 2H14.25C15.5088 2 16.57 2.84575 16.8965 4H18.25C19.7688 4 21 5.23122 21 6.75V19.25C21 20.7688 19.7688 22 18.25 22H5.75C4.23122 22 3 20.7688 3 19.25V6.75C3 5.23122 4.23122 4 5.75 4H7.10352ZM8.5 4.75V6.25C8.5 6.38807 8.61193 6.5 8.75 6.5H15.25C15.3881 6.5 15.5 6.38807 15.5 6.25V4.75C15.5 4.05964 14.9404 3.5 14.25 3.5H9.75C9.05964 3.5 8.5 4.05964 8.5 4.75Z" fill="currentColor"/>
 </svg>
--- a/assets/icons/door.svg
+++ b/assets/icons/door.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.75 21.25L21.25 21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.75 21.25V4.75C4.75 3.64543 5.64543 2.75 6.75 2.75H17.25C18.3546 2.75 19.25 3.64543 19.25 4.75V21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75 12.25H8.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/edit.svg
+++ b/assets/icons/edit.svg
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M10.75 21.25h-4a2 2 0 0 1-2-2V4.75a2 2 0 0 1 2-2h10.5a2 2 0 0 1 2 2v7"/>
-  <path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.5" d="M13.75 21.25v-2.333l3.75-3.75a1.65 1.65 0 0 1 2.333 2.333l-3.75 3.75H13.75Z"/>
-</svg>
--- a/assets/icons/ellipsis.svg
+++ b/assets/icons/ellipsis.svg
@@ -1,4 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" d="M12 13a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm8.25 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm-16.5 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z"/>
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 13a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm8.25 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm-16.5 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M3.75 10.25C2.7835 10.25 2 11.0335 2 12C2 12.9665 2.7835 13.75 3.75 13.75C4.7165 13.75 5.5 12.9665 5.5 12C5.5 11.0335 4.7165 10.25 3.75 10.25Z" fill="currentColor"/><path d="M12 10.25C11.0335 10.25 10.25 11.0335 10.25 12C10.25 12.9665 11.0335 13.75 12 13.75C12.9665 13.75 13.75 12.9665 13.75 12C13.75 11.0335 12.9665 10.25 12 10.25Z" fill="currentColor"/><path d="M20.25 10.25C19.2835 10.25 18.5 11.0335 18.5 12C18.5 12.9665 19.2835 13.75 20.25 13.75C21.2165 13.75 22 12.9665 22 12C22 11.0335 21.2165 10.25 20.25 10.25Z" fill="currentColor"/>
 </svg>
--- a/assets/icons/emoji-fill.svg
+++ b/assets/icons/emoji-fill.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm7.75-5a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0v-3.5A.75.75 0 0 1 9.75 7Zm4.5 0a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0v-3.5a.75.75 0 0 1 .75-.75Zm-6.143 7.864a.75.75 0 0 1 1.029-.257c1.04.624 1.97.905 2.864.905.894 0 1.824-.281 2.864-.905a.75.75 0 1 1 .772 1.286c-1.21.726-2.405 1.12-3.636 1.12-1.23 0-2.426-.394-3.636-1.12a.75.75 0 0 1-.257-1.029Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/emoji.svg
+++ b/assets/icons/emoji.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12C2.75 6.89137 6.89137 2.75 12 2.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M19 1.75V8.25M15.75 5H22.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M10.75 9.9C10.75 11.0046 10.0784 11.75 9.25 11.75C8.42157 11.75 7.75 11.0046 7.75 9.9C7.75 8.79543 8.42157 8 9.25 8C10.0784 8 10.75 8.79543 10.75 9.9Z" fill="currentColor"/><path d="M16.25 9.9C16.25 11.0046 15.5784 11.75 14.75 11.75C13.9216 11.75 13.25 11.0046 13.25 9.9C13.25 8.79543 13.9216 8 14.75 8C15.5784 8 16.25 8.79543 16.25 9.9Z" fill="currentColor"/><path d="M16.1123 14.8493C16.1942 14.7105 16.2249 14.545 16.192 14.3857C16.1592 14.2263 16.0665 14.0867 15.933 13.9968C15.7996 13.9069 15.6354 13.8733 15.4754 13.9028C15.3154 13.9321 15.1736 14.0226 15.0757 14.1507C15.0008 14.2469 14.9237 14.3367 14.8415 14.4241C14.1096 15.2083 13.061 15.628 12.0035 15.625C10.946 15.6265 9.8972 15.2055 9.16254 14.4222C9.08002 14.3348 9.00261 14.2451 8.92738 14.1491C8.8291 14.0214 8.68699 13.9313 8.52686 13.9024C8.36679 13.8735 8.20268 13.9076 8.06954 13.9979C7.9364 14.0882 7.84406 14.2281 7.81174 14.3875C7.77938 14.547 7.81054 14.7123 7.89293 14.8509C7.97731 14.99 8.06686 15.1223 8.16553 15.2526C9.04297 16.4311 10.5292 17.1343 12.0024 17.125C13.4754 17.1367 14.965 16.4342 15.8405 15.2521C15.939 15.1215 16.0282 14.9888 16.1123 14.8493Z" fill="currentColor"/><path d="M21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12C2.75 6.89137 6.89137 2.75 12 2.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
--- a/assets/icons/encryption.svg
+++ b/assets/icons/encryption.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 8.75a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm0 0v6m8.25-2.838v-4.97a2 2 0 0 0-1.367-1.898l-6.25-2.083a2 2 0 0 0-1.265 0l-6.25 2.083A2 2 0 0 0 3.75 6.942v4.97c0 4.973 4.25 7.338 8.25 9.496 4-2.158 8.25-4.523 8.25-9.496Z"/>
-</svg>
--- a/assets/icons/eye.svg
+++ b/assets/icons/eye.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M3.75 13.0199C8.54029 18.1132 15.4597 18.1132 20.25 13.0199" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M3.75 7.62257C6.14516 5.07587 9.0726 3.80251 12 3.80249C14.9274 3.80247 17.8549 5.07576 20.25 7.62238" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 17V20.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M8.25 16.5L6.75 18.9821" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M15.5 16.5L17.25 18.9821" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/fistbump-fill.svg
+++ b/assets/icons/fistbump-fill.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M12.7507 3.75C12.7507 3.33579 12.4149 3 12.0007 3C11.5865 3 11.2507 3.33579 11.2507 3.75V6.25C11.2507 6.66421 11.5865 7 12.0007 7C12.4149 7 12.7507 6.66421 12.7507 6.25V3.75Z" fill="currentColor"/><path d="M7.26594 5.19799C6.99969 4.88068 6.52662 4.8393 6.20932 5.10555C5.89201 5.3718 5.85062 5.84487 6.11687 6.16217L7.72384 8.07728C7.99009 8.39459 8.46316 8.43598 8.78047 8.16973C9.09777 7.90347 9.13916 7.43041 8.87291 7.1131L7.26594 5.19799Z" fill="currentColor"/><path d="M17.8726 6.16227C18.1389 5.84496 18.0975 5.37189 17.7802 5.10564C17.4629 4.83939 16.9898 4.88078 16.7235 5.19809L15.1166 7.1132C14.8503 7.4305 14.8917 7.90357 15.209 8.16982C15.5263 8.43607 15.9994 8.39468 16.2656 8.07738L17.8726 6.16227Z" fill="currentColor"/><path d="M5.22073 9C4.33013 9 3.52687 9.5355 3.18434 10.3576L2.78846 11.3077C2.61378 11.7269 2.20416 12 1.75 12C1.33579 12 1 12.3358 1 12.75V19.25C1 19.6642 1.33579 20 1.75 20H7.38937C9.39779 20 11.0763 18.4715 11.2637 16.4719L11.4255 14.746C11.6391 12.468 9.84697 10.5 7.559 10.5C7.46053 10.5 7.36858 10.4508 7.31396 10.3689L7.0563 9.98237C6.64715 9.36864 5.95834 9 5.22073 9Z" fill="currentColor"/><path d="M18.722 9C17.9844 9 17.2956 9.36864 16.8865 9.98237L16.6288 10.3689C16.5742 10.4508 16.4822 10.5 16.3838 10.5C14.0958 10.5 12.3037 12.468 12.5172 14.746L12.679 16.4719C12.8665 18.4715 14.545 20 16.5534 20H22.1928C22.607 20 22.9428 19.6642 22.9428 19.25V12.75C22.9428 12.3358 22.607 12 22.1928 12C21.7386 12 21.329 11.7269 21.1543 11.3077L20.7584 10.3576C20.4159 9.5355 19.6126 9 18.722 9Z" fill="currentColor"/>
+</svg>
--- a/assets/icons/fistbump.svg
+++ b/assets/icons/fistbump.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M1.75 19.25H7.38937C9.0107 19.25 10.3657 18.0161 10.517 16.4019L10.6788 14.676C10.8511 12.8379 9.40511 11.25 7.559 11.25C7.20977 11.25 6.88364 11.0755 6.68992 10.7849L6.43226 10.3984C6.16221 9.99331 5.70757 9.75 5.22073 9.75C4.6329 9.75 4.10273 10.1034 3.87664 10.6461L3.48077 11.5962C3.18964 12.2949 2.50694 12.75 1.75 12.75M22.1928 19.25H16.5534C14.9321 19.25 13.5771 18.0161 13.4258 16.4019L13.264 14.676C13.0916 12.8379 14.5377 11.25 16.3838 11.25C16.733 11.25 17.0591 11.0755 17.2528 10.7849L17.5105 10.3984C17.7806 9.99331 18.2352 9.75 18.722 9.75C19.3099 9.75 19.84 10.1034 20.0661 10.6461L20.462 11.5962C20.7531 12.2949 21.4358 12.75 22.1928 12.75M12.0007 3.75V6.25M6.69141 5.68008L8.29838 7.59519M17.2981 5.68018L15.6911 7.59529" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/group.svg
+++ b/assets/icons/group.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17.75 19.25h2.596c1.163 0 2.106-1.001 1.788-2.12-.733-2.573-2.465-4.38-5.134-4.38-.446 0-.866.05-1.26.147M11.25 7a3.25 3.25 0 1 1-6.5 0 3.25 3.25 0 0 1 6.5 0Zm8.5.5a2.75 2.75 0 1 1-5.5 0 2.75 2.75 0 0 1 5.5 0ZM2.08 18.126c.78-3.14 2.78-5.376 5.92-5.376s5.14 2.237 5.918 5.376c.28 1.128-.658 2.124-1.82 2.124H3.901c-1.162 0-2.1-.996-1.82-2.124Z"/>
-</svg>
--- a/assets/icons/inbox-fill.svg
+++ b/assets/icons/inbox-fill.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.00001 13.7453L3.00004 5.75C3.00004 4.23122 4.23126 3.00001 5.75004 3L18.25 3C19.7688 3 21 4.23122 21 5.75V13.7466C21 13.7477 21 13.7489 21 13.75L21 18.25C21 19.7688 19.7688 21 18.25 21H5.75C4.32614 21 3.15502 19.9179 3.0142 18.5312C3.00481 18.4387 3 18.3449 3 18.25M5.75004 4.5L18.25 4.5C18.9403 4.5 19.5 5.05964 19.5 5.75V13L15.9298 13C15.5695 13 15.2601 13.2562 15.1929 13.6102C14.9078 15.1135 13.5858 16.25 12 16.25C10.4142 16.25 9.09221 15.1135 8.80706 13.6102C8.73991 13.2562 8.43051 13 8.0702 13H4.50002L4.50004 5.75C4.50004 5.05965 5.05968 4.50001 5.75004 4.5Z" fill="currentColor"/><path d="M3 18.25V13.75C3 13.7484 3 13.7469 3.00001 13.7453" fill="currentColor"/>
+</svg>
--- a/assets/icons/inbox.svg
+++ b/assets/icons/inbox.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M3.75 12.75H8.0702C8.42126 14.6006 10.0472 16 12 16C13.9528 16 15.5787 14.6006 15.9298 12.75L20.25 12.75M18.25 20.25H5.75001C4.64543 20.25 3.75 19.3546 3.75001 18.25L3.75005 5.75C3.75005 4.64543 4.64548 3.75001 5.75005 3.75L18.25 3.75C19.3546 3.75 20.25 4.64543 20.25 5.75V18.25C20.25 19.3546 19.3546 20.25 18.25 20.25Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/info.svg
+++ b/assets/icons/info.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path fill="#000" fill-rule="evenodd" d="M12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2Zm-2 9a.75.75 0 0 1 .75-.75H12a.75.75 0 0 1 .75.75v5.25a.75.75 0 0 1-1.5 0v-4.5h-.5A.75.75 0 0 1 10 11Zm2-3.75a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M10.75 11H12L12 16.25M21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12C2.75 6.89137 6.89137 2.75 12 2.75C17.1086 2.75 21.25 6.89137 21.25 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 7.375C11.6548 7.375 11.375 7.65482 11.375 8C11.375 8.34518 11.6548 8.625 12 8.625C12.3452 8.625 12.625 8.34518 12.625 8C12.625 7.65482 12.3452 7.375 12 7.375Z" fill="currentColor" stroke="currentColor" stroke-width="0.25"/>
 </svg>
--- a/assets/icons/invite.svg
+++ b/assets/icons/invite.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M4.75 10.9853V4.75C4.75 3.64543 5.64543 2.75 6.75 2.75H17.25C18.3546 2.75 19.25 3.64543 19.25 4.75V10.9853M9.75 7.75H14.25M12.617 13.5499L19.9415 11.1744C20.5875 10.9649 21.25 11.4465 21.25 12.1256V18.25C21.25 19.3546 20.3546 20.25 19.25 20.25H4.75C3.64543 20.25 2.75 19.3546 2.75 18.25V12.1256C2.75 11.4465 3.41249 10.9649 4.0585 11.1744L11.383 13.5499C11.784 13.68 12.216 13.68 12.617 13.5499Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/link.svg
+++ b/assets/icons/link.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M9.75027 5.52371L10.7168 4.55722C13.1264 2.14759 17.0332 2.14759 19.4428 4.55722C21.8524 6.96684 21.8524 10.8736 19.4428 13.2832L18.4742 14.2519M5.52886 9.74513L4.55722 10.7168C2.14759 13.1264 2.1476 17.0332 4.55722 19.4428C6.96684 21.8524 10.8736 21.8524 13.2832 19.4428L14.2478 18.4782M9.5 14.5L14.5 9.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
--- a/assets/icons/logout.svg
+++ b/assets/icons/logout.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M20.25 12H9m11.25 0-4.5 4.5m4.5-4.5-4.5-4.5m-4.5 12.75h-5.5a2 2 0 0 1-2-2V5.75a2 2 0 0 1 2-2h5.5"/>
-</svg>
--- a/assets/icons/minimize.svg
+++ b/assets/icons/minimize.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M13.75 3.75v6.5m0 0h6.5m-6.5 0 6.5-6.5m-10 16.5v-6.5m0 0h-6.5m6.5 0-6.5 6.5"/>
-</svg>
--- a/assets/icons/moon.svg
+++ b/assets/icons/moon.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21.248 11.811a6.5 6.5 0 0 1-9.06-9.06 9.25 9.25 0 1 0 9.06 9.06Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M21.2481 11.8112C20.1889 12.56 18.8958 13 17.5 13C13.9101 13 11 10.0899 11 6.5C11 5.10416 11.44 3.81108 12.1888 2.75189C12.126 2.75063 12.0631 2.75 12 2.75C6.89137 2.75 2.75 6.89137 2.75 12C2.75 17.1086 6.89137 21.25 12 21.25C17.1086 21.25 21.25 17.1086 21.25 12C21.25 11.9369 21.2494 11.874 21.2481 11.8112Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/open-url.svg
+++ b/assets/icons/open-url.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M18.25 14v3.05c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874c-.428.218-.988.218-2.108.218h-8.1c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874c-.218-.428-.218-.988-.218-2.108V8.875c0-1.05 0-1.574.192-1.98a2 2 0 0 1 .953-.953c.406-.192.93-.192 1.98-.192H9.25m4.5-2h6.5m0 0v6.5m0-6.5L11 13"/>
-</svg>
--- a/assets/icons/panel-left-open.svg
+++ b/assets/icons/panel-left-open.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path fill="#000" fill-rule="evenodd" d="M9 4.5v15h9.25c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H9ZM3 5.75A2.75 2.75 0 0 1 5.75 3h12.5A2.75 2.75 0 0 1 21 5.75v12.5A2.75 2.75 0 0 1 18.25 21H5.75A2.75 2.75 0 0 1 3 18.25V5.75Z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.25 4C20.7688 4 22 5.23122 22 6.75V17.25C22 18.7688 20.7688 20 19.25 20H4.75C3.23122 20 2 18.7688 2 17.25V6.75C2 5.23122 3.23122 4 4.75 4H19.25ZM6.25 7.5C5.83579 7.5 5.5 7.83579 5.5 8.25V15.75C5.5 16.1642 5.83579 16.5 6.25 16.5C6.66421 16.5 7 16.1642 7 15.75V8.25C7 7.83579 6.66421 7.5 6.25 7.5Z" fill="currentColor"/>
 </svg>
--- a/assets/icons/panel-left.svg
+++ b/assets/icons/panel-left.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.75 5.75a2 2 0 0 1 2-2h12.5a2 2 0 0 1 2 2v12.5a2 2 0 0 1-2 2H5.75a2 2 0 0 1-2-2V5.75Zm5-1.75v16"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M6.25 8.25V15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/panel-right-open.svg
+++ b/assets/icons/panel-right-open.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path fill="#000" fill-rule="evenodd" d="M15 4.5v15H5.75c-.69 0-1.25-.56-1.25-1.25V5.75c0-.69.56-1.25 1.25-1.25H15Zm6 1.25A2.75 2.75 0 0 0 18.25 3H5.75A2.75 2.75 0 0 0 3 5.75v12.5A2.75 2.75 0 0 0 5.75 21h12.5A2.75 2.75 0 0 0 21 18.25V5.75Z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.75 4C3.23122 4 2 5.23122 2 6.75V17.25C2 18.7688 3.23122 20 4.75 20H19.25C20.7688 20 22 18.7688 22 17.25V6.75C22 5.23122 20.7688 4 19.25 4H4.75ZM17.75 7.5C18.1642 7.5 18.5 7.83579 18.5 8.25V15.75C18.5 16.1642 18.1642 16.5 17.75 16.5C17.3358 16.5 17 16.1642 17 15.75V8.25C17 7.83579 17.3358 7.5 17.75 7.5Z" fill="currentColor"/>
 </svg>
--- a/assets/icons/panel-right.svg
+++ b/assets/icons/panel-right.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15.25 4v16M3.75 5.75a2 2 0 0 1 2-2h12.5a2 2 0 0 1 2 2v12.5a2 2 0 0 1-2 2H5.75a2 2 0 0 1-2-2V5.75Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M17.75 8.25V15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/paper-plane-fill.svg
+++ b/assets/icons/paper-plane-fill.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.66936 5.12886C2.12122 3.64104 3.6759 2.24953 5.09409 2.95862L20.0468 10.435C21.3366 11.0799 21.3366 12.9205 20.0468 13.5655L5.09409 21.0418C3.67589 21.7509 2.12122 20.3594 2.66936 18.8715L4.92467 12.75H9.25021C9.66442 12.75 10.0002 12.4142 10.0002 12C10.0002 11.5858 9.66442 11.25 9.25021 11.25H4.92452L2.66936 5.12886Z" fill="currentColor"/>
+</svg>
--- a/assets/icons/plus-circle-fill.svg
+++ b/assets/icons/plus-circle-fill.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M128,24A104,104,0,1,0,232,128,104.13,104.13,0,0,0,128,24Zm40,112H136v32a8,8,0,0,1-16,0V136H88a8,8,0,0,1,0-16h32V88a8,8,0,0,1,16,0v32h32a8,8,0,0,1,0,16Z"></path></svg>
--- a/assets/icons/plus-circle.svg
+++ b/assets/icons/plus-circle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M16.2426 12.0005H7.75736M12 16.2431V7.75781M21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12C2.75 6.89137 6.89137 2.75 12 2.75C17.1086 2.75 21.25 6.89137 21.25 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
--- a/assets/icons/plus-fill.svg
+++ b/assets/icons/plus-fill.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M12 6a1 1 0 0 1 1 1v4h4a1 1 0 1 1 0 2h-4v4a1 1 0 1 1-2 0v-4H7a1 1 0 1 1 0-2h4V7a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/plus.svg
+++ b/assets/icons/plus.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 4v8m0 0v8m0-8H4m8 0h8"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M12 6.75V12M12 12V17.25M12 12H6.75M12 12H17.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/profile.svg
+++ b/assets/icons/profile.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M17.75 2.75H6.25C5.14543 2.75 4.25 3.64543 4.25 4.75V19.25C4.25 20.3546 5.14543 21.25 6.25 21.25H17.75C18.8546 21.25 19.75 20.3546 19.75 19.25V4.75C19.75 3.64543 18.8546 2.75 17.75 2.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="12" cy="12.25" r="2.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M16 21C16 18.7909 14.2091 17 12 17C9.79086 17 8 18.7909 8 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M9.75 6.25H14.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
--- a/assets/icons/refresh.svg
+++ b/assets/icons/refresh.svg
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" d="M13 21a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm8-10a1 1 0 1 0-2 0 1 1 0 0 0 2 0Zm-1.07 3.268a1 1 0 1 1-1 1.732 1 1 0 0 1 1-1.732Zm-2.562 5.026a1 1 0 1 0-1-1.732 1 1 0 0 0 1 1.732ZM18.927 8a1 1 0 1 1-1-1.732 1 1 0 0 1 1 1.732Z"/>
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.25 14.75v5.5h-5.5M9 19.688a8.25 8.25 0 1 1 6.25-15.273"/>
-</svg>
--- a/assets/icons/relay.svg
+++ b/assets/icons/relay.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="9.25" r="1.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75 21.25L11.75 9.25H12.25L16.25 21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M9.5 17.75H14.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75693 12.7501C6.08102 10.7234 6.08103 7.77679 7.75693 5.75M16.2431 5.75C17.919 7.77679 17.919 10.7234 16.2431 12.7501" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M5.06494 2.7574C1.64285 6.40823 1.64502 12.1018 5.07145 15.75M18.9281 2.75C22.3572 6.40053 22.3573 12.0993 18.9285 15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/reply.svg
+++ b/assets/icons/reply.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="m1.845 11.45 8.146-7.535a.75.75 0 0 1 1.259.55V8c0 .276.228.5.504.504C19.84 8.632 22 11.92 22 20.25c-1.47-2.94-2.22-4.679-10.245-4.748a.501.501 0 0 0-.505.498v3.535a.75.75 0 0 1-1.26.55L1.846 12.55a.75.75 0 0 1 0-1.1Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M1.84521 11.4494L9.99071 3.91478C10.471 3.47055 11.25 3.81116 11.25 4.46535V7.99994C11.25 8.27608 11.478 8.49949 11.7541 8.50388C19.8394 8.63247 22 11.9205 22 20.2499C20.5303 17.3105 19.7806 15.5711 11.7551 15.5021C11.4789 15.4997 11.25 15.7238 11.25 15.9999V19.5345C11.25 20.1887 10.471 20.5293 9.99071 20.0851L1.84521 12.5505C1.52425 12.2536 1.52425 11.7463 1.84521 11.4494Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/report.svg
+++ b/assets/icons/report.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m20.001 16-2 2m0 0-2 2m2-2-2-2m2 2 2 2m-8.147-6.749c-3.319.058-5.832 2.055-6.87 4.862-.41 1.105.535 2.137 1.713 2.137h5.554m-.397-6.999L12 13.25c.52 0 1.021.047 1.5.138m-1.647-.137A7.89 7.89 0 0 0 10 13.5m5.75-7a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z"/>
-</svg>
--- a/assets/icons/resize-corner.svg
+++ b/assets/icons/resize-corner.svg
@@ -1,9 +0,0 @@
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="list-filter" transform="translate(16.142767, 16.107233) rotate(-45.000000) translate(-16.142767, -16.107233) translate(3.642767, 10.491117)" stroke="#000000" stroke-width="2">
-            <line x1="0.454058454" y1="0.48959236" x2="24.1421356" y2="0.843145751" stroke-linecap="square"></line>
-            <line x1="4.69669914" y1="6.14644661" x2="20.1188954" y2="5.79289322"></line>
-            <line x1="9.06066017" y1="10.732233" x2="15.3033009" y2="10.3890873"></line>
-        </g>
-    </g>
-</svg>
--- a/assets/icons/search.svg
+++ b/assets/icons/search.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m20 20-3.873-3.873m0 0A7.25 7.25 0 1 0 5.873 5.873a7.25 7.25 0 0 0 10.253 10.253Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M20 20L16.1265 16.1265M16.1265 16.1265C17.4385 14.8145 18.25 13.002 18.25 11C18.25 6.99594 15.0041 3.75 11 3.75C6.99594 3.75 3.75 6.99594 3.75 11C3.75 15.0041 6.99594 18.25 11 18.25C13.002 18.25 14.8145 17.4385 16.1265 16.1265Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/server.svg
+++ b/assets/icons/server.svg
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.5" d="M21.25 12V6.75a2 2 0 0 0-2-2H4.75a2 2 0 0 0-2 2V12m18.5 0H2.75m18.5 0v5.25a2 2 0 0 1-2 2H4.75a2 2 0 0 1-2-2V12"/>
-  <path fill="currentColor" stroke="currentColor" stroke-width=".5" d="M6.5 14.875a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Zm0-7.25a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Z"/>
-</svg>
--- a/assets/icons/settings.svg
+++ b/assets/icons/settings.svg
@@ -1,4 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="m7.878 5.214-.703-.162a1.77 1.77 0 0 0-2.123 2.123l.162.703a2 2 0 0 1-.84 2.114l-.854.57a1.728 1.728 0 0 0 0 2.876l.855.57a2 2 0 0 1 .84 2.114l-.163.703a1.77 1.77 0 0 0 2.123 2.123l.703-.162a2 2 0 0 1 2.114.84l.57.854a1.728 1.728 0 0 0 2.876 0l.57-.855a2 2 0 0 1 2.114-.84l.703.163a1.77 1.77 0 0 0 2.123-2.123l-.162-.703a2 2 0 0 1 .84-2.114l.854-.57a1.728 1.728 0 0 0 0-2.876l-.855-.57a2 2 0 0 1-.84-2.114l.163-.703a1.77 1.77 0 0 0-2.123-2.123l-.703.162a2 2 0 0 1-2.114-.84l-.57-.854a1.728 1.728 0 0 0-2.876 0l-.57.855a2 2 0 0 1-2.114.84Z"/>
-  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="M14.75 12a2.75 2.75 0 1 1-5.5 0 2.75 2.75 0 0 1 5.5 0Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M7.878 5.21415L7.17474 5.05186C6.58003 4.91462 5.95657 5.09343 5.525 5.525C5.09343 5.95657 4.91462 6.58003 5.05186 7.17474L5.21415 7.878C5.40122 8.6886 5.06696 9.53036 4.37477 9.99182L3.51965 10.5619C3.03881 10.8825 2.75 11.4221 2.75 12C2.75 12.5779 3.03881 13.1175 3.51965 13.4381L4.37477 14.0082C5.06696 14.4696 5.40122 15.3114 5.21415 16.122L5.05186 16.8253C4.91462 17.42 5.09343 18.0434 5.525 18.475C5.95657 18.9066 6.58003 19.0854 7.17474 18.9481L7.878 18.7858C8.6886 18.5988 9.53036 18.933 9.99182 19.6252L10.5619 20.4804C10.8825 20.9612 11.4221 21.25 12 21.25C12.5779 21.25 13.1175 20.9612 13.4381 20.4804L14.0082 19.6252C14.4696 18.933 15.3114 18.5988 16.122 18.7858L16.8253 18.9481C17.42 19.0854 18.0434 18.9066 18.475 18.475C18.9066 18.0434 19.0854 17.42 18.9481 16.8253L18.7858 16.122C18.5988 15.3114 18.933 14.4696 19.6252 14.0082L20.4804 13.4381C20.9612 13.1175 21.25 12.5779 21.25 12C21.25 11.4221 20.9612 10.8825 20.4804 10.5619L19.6252 9.99182C18.933 9.53036 18.5988 8.6886 18.7858 7.878L18.9481 7.17473C19.0854 6.58003 18.9066 5.95657 18.475 5.525C18.0434 5.09343 17.42 4.91462 16.8253 5.05186L16.122 5.21415C15.3114 5.40122 14.4696 5.06696 14.0082 4.37477L13.4381 3.51965C13.1175 3.03881 12.5779 2.75 12 2.75C11.4221 2.75 10.8825 3.03881 10.5619 3.51965L9.99182 4.37477C9.53036 5.06696 8.6886 5.40122 7.878 5.21415Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M14.75 12C14.75 13.5188 13.5188 14.75 12 14.75C10.4812 14.75 9.25 13.5188 9.25 12C9.25 10.4812 10.4812 9.25 12 9.25C13.5188 9.25 14.75 10.4812 14.75 12Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/shield.svg
+++ b/assets/icons/shield.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M20.25 6.94155C20.25 6.08069 19.6991 5.31641 18.8825 5.04418L12.6325 2.96085C12.2219 2.824 11.7781 2.824 11.3675 2.96085L5.11754 5.04418C4.30086 5.31641 3.75 6.08069 3.75 6.94155V11.9124C3.75 16.8848 8 19.25 12 21.4079C16 19.25 20.25 16.8848 20.25 11.9124V6.94155Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/ship.svg
+++ b/assets/icons/ship.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.75 20.25L6.26353 19.4903M6.26353 19.4903L6.95233 19.3414C7.23089 19.2812 7.51911 19.2812 7.79767 19.3414L11.5773 20.1586C11.8559 20.2188 12.1441 20.2188 12.4227 20.1586L16.2023 19.3414C16.4809 19.2812 16.7691 19.2812 17.0477 19.3414L17.7365 19.4903M6.26353 19.4903C5.08645 17.9188 4.46034 16.5675 4.08992 15.0117C3.8539 14.0205 4.52677 13.0678 5.51689 12.827L11.5273 11.365C11.8379 11.2894 12.1621 11.2894 12.4727 11.365L18.4831 12.827C19.4732 13.0678 20.1461 14.0205 19.9101 15.0117C19.5397 16.5675 18.9136 17.9188 17.7365 19.4903M17.7365 19.4903L21.25 20.25M5.75 12.75V7.75C5.75 7.19772 6.19772 6.75 6.75 6.75H17.25C17.8023 6.75 18.25 7.19772 18.25 7.75V12.75M9.75 6.75V3.75C9.75 3.19772 10.1977 2.75 10.75 2.75H13.25C13.8023 2.75 14.25 3.19772 14.25 3.75V6.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/signal.svg
+++ b/assets/icons/signal.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 17v2m6-6v6m6-10v10m6-14v14"/>
-</svg>
--- a/assets/icons/sun.svg
+++ b/assets/icons/sun.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M11.998 3.29V1.769M5.84 18.158l-1.077 1.078m7.235 2.997v-1.524m7.235-15.944-1.077 1.077M20.707 12h1.523m-4.074 6.159 1.077 1.077M1.766 12h1.523m1.474-7.235L5.84 5.842m9.87 2.446a5.25 5.25 0 1 1-7.424 7.424 5.25 5.25 0 0 1 7.424-7.424Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M11.9982 3.29083V1.76758M5.83985 18.1586L4.76275 19.2357M11.9982 22.2327V20.7094M19.2334 4.76468L18.1562 5.84179M20.707 12.0001H22.2303M18.1562 18.1586L19.2334 19.2357M1.76562 12.0001H3.28888M4.76267 4.76462L5.83977 5.84173M15.7104 8.28781C17.7606 10.3381 17.7606 13.6622 15.7104 15.7124C13.6601 17.7627 10.336 17.7627 8.28574 15.7124C6.23548 13.6622 6.23548 10.3381 8.28574 8.28781C10.336 6.23756 13.6601 6.23756 15.7104 8.28781Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/upload.svg
+++ b/assets/icons/upload.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 0 1 4.75 2h8.5A2.75 2.75 0 0 1 16 4.75V8h3.25A2.75 2.75 0 0 1 22 10.75v8.5A2.75 2.75 0 0 1 19.25 22h-8.5A2.75 2.75 0 0 1 8 19.25V16H4.75A2.75 2.75 0 0 1 2 13.25v-8.5ZM14.5 8V4.75c0-.69-.56-1.25-1.25-1.25h-8.5c-.69 0-1.25.56-1.25 1.25v5.991l.983-.644a2.75 2.75 0 0 1 3.033.012l.5.334A2.75 2.75 0 0 1 10.75 8h3.75ZM5 6.25a1.25 1.25 0 1 1 2.5 0 1.25 1.25 0 0 1-2.5 0Zm8.39 6.292a.75.75 0 0 1 .766.027l2.8 1.8a.75.75 0 0 1 0 1.262l-2.8 1.8A.75.75 0 0 1 13 16.8v-3.6a.75.75 0 0 1 .39-.658Z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M12 19.25V13L14.5 15.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 13L9.5 15.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.375 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V5.75C2.75 4.64543 3.64543 3.75 4.75 3.75H8.92963C9.59834 3.75 10.2228 4.0842 10.5937 4.6406L11.7031 6.3047C11.8886 6.5829 12.2008 6.75 12.5352 6.75H19.25C20.3546 6.75 21.25 7.64543 21.25 8.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H16.625" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/usb.svg
+++ b/assets/icons/usb.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M10 5.75V7.25M14 5.75V7.25M3.75 10.25H20.25V19.25C20.25 20.3546 19.3546 21.25 18.25 21.25H5.75C4.64543 21.25 3.75 20.3546 3.75 19.25V10.25ZM5.75 2.75H18.25V10.25H5.75V2.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/warning.svg
+++ b/assets/icons/warning.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 9.02v2.993M12 15h.01M10.277 3.99 3.275 15.998C2.499 17.328 3.458 19 4.998 19h14.004c1.54 0 2.5-1.671 1.723-3.002L13.723 3.99c-.77-1.32-2.677-1.32-3.447 0ZM12.25 15a.25.25 0 1 1-.5 0 .25.25 0 0 1 .5 0Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="12" r="9.25" stroke="currentColor" stroke-width="1.5"/><path d="M11.3121 12.3511L11.0582 7.9983C11.0266 7.45662 11.4574 7 12 7C12.5426 7 12.9734 7.45662 12.9418 7.9983L12.6879 12.3511C12.6666 12.7154 12.365 13 12 13C11.635 13 11.3334 12.7154 11.3121 12.3511Z" fill="currentColor"/><circle cx="11.9999" cy="15.8998" r="1.1" fill="currentColor"/>
 </svg>
--- a/assets/icons/zoom.svg
+++ b/assets/icons/zoom.svg
@@ -0,0 +1,58 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+    <path
+        d="M4.75 9.25V4.75H9.25"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M19.25 9.25V4.75H14.75"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M19.25 14.75V19.25H14.75"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M4.75 14.75V19.25H9.25"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M5 5L9.5 9.5"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M19 5L14.5 9.5"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M19 19L14.5 14.5"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M5 19L9.5 14.5"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+</svg>
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -6,16 +6,17 @@ publish.workspace = true

 [dependencies]
 common = { path = "../common" }
-state = { path = "../state" }

 gpui.workspace = true
 gpui_tokio.workspace = true
 reqwest.workspace = true
-nostr-sdk.workspace = true
 anyhow.workspace = true
 smol.workspace = true
 log.workspace = true
 smallvec.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true

 semver = "1.0.27"
 tempfile = "3.23.0"
+futures.workspace = true
--- a/crates/auto_update/src/lib.rs
+++ b/crates/auto_update/src/lib.rs
@@ -4,21 +4,39 @@ use std::sync::Arc;
 use std::time::Duration;

 use anyhow::{anyhow, Context as AnyhowContext, Error};
-use common::BOOTSTRAP_RELAYS;
 use gpui::http_client::{AsyncBody, HttpClient};
 use gpui::{
    App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, Global, Subscription, Task,
 };
-use nostr_sdk::prelude::*;
 use semver::Version;
+use serde::Deserialize;
 use smallvec::{smallvec, SmallVec};
 use smol::fs::File;
 use smol::process::Command;
-use state::NostrRegistry;

-const APP_PUBKEY: &str = "npub1y9jvl5vznq49eh9f2gj7679v4042kj80lp7p8fte3ql2cr7hty7qsyca8q";
+const GITHUB_API_URL: &str = "https://api.github.com";
+const COOP_UPDATE_EXPLANATION: &str = "COOP_UPDATE_EXPLANATION";
+
+fn get_github_repo_owner() -> String {
+    std::env::var("COOP_GITHUB_REPO_OWNER").unwrap_or_else(|_| "your-username".to_string())
+}
+
+fn get_github_repo_name() -> String {
+    std::env::var("COOP_GITHUB_REPO_NAME").unwrap_or_else(|_| "your-repo".to_string())
+}
+
+fn is_flatpak_installation() -> bool {
+    // Check if app is installed via Flatpak
+    std::env::var("FLATPAK_ID").is_ok() || std::env::var(COOP_UPDATE_EXPLANATION).is_ok()
+}

 pub fn init(cx: &mut App) {
+    // Skip auto-update initialization if installed via Flatpak
+    if is_flatpak_installation() {
+        log::info!("Skipping auto-update initialization: App is installed via Flatpak");
+        return;
+    }
+
    AutoUpdater::set_global(cx.new(AutoUpdater::new), cx);
 }

@@ -109,7 +127,7 @@ impl Drop for MacOsUnmounter<'_> {
 pub enum AutoUpdateStatus {
    Idle,
    Checking,
-    Checked { files: Vec<EventId> },
+    Checked { download_url: String },
    Installing,
    Updated,
    Errored { msg: Box<String> },
@@ -130,8 +148,8 @@ impl AutoUpdateStatus {
        matches!(self, Self::Updated)
    }

-    pub fn checked(files: Vec<EventId>) -> Self {
-        Self::Checked { files }
+    pub fn checked(download_url: String) -> Self {
+        Self::Checked { download_url }
    }

    pub fn error(e: String) -> Self {
@@ -139,6 +157,18 @@ impl AutoUpdateStatus {
    }
 }

+#[derive(Debug, Deserialize)]
+pub struct GitHubRelease {
+    pub tag_name: String,
+    pub assets: Vec<GitHubAsset>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct GitHubAsset {
+    pub name: String,
+    pub browser_download_url: String,
+}
+
 #[derive(Debug)]
 pub struct AutoUpdater {
    /// Current status of the auto updater
@@ -173,36 +203,32 @@ impl AutoUpdater {
        let mut tasks = smallvec![];

        tasks.push(
-            // Subscribe to get the new update event in the bootstrap relays
-            Self::subscribe_to_updates(cx),
-        );
-
-        tasks.push(
-            // Subscribe to get the new update event in the bootstrap relays
+            // Check for updates after 2 minutes
            cx.spawn(async move |this, cx| {
-                // Check for updates after 2 minutes
                cx.background_executor()
                    .timer(Duration::from_secs(120))
                    .await;

                // Update the status to checking
-                _ = this.update(cx, |this, cx| {
+                this.update(cx, |this, cx| {
                    this.set_status(AutoUpdateStatus::Checking, cx);
-                });
+                })
+                .ok();

                match Self::check_for_updates(async_version, cx).await {
-                    Ok(ids) => {
-                        // Update the status to downloading
-                        _ = this.update(cx, |this, cx| {
-                            this.set_status(AutoUpdateStatus::checked(ids), cx);
-                        });
+                    Ok(download_url) => {
+                        // Update the status to checked with download URL
+                        this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::checked(download_url), cx);
+                        })
+                        .ok();
                    }
                    Err(e) => {
-                        _ = this.update(cx, |this, cx| {
+                        log::warn!("Failed to check for updates: {e}");
+                        this.update(cx, |this, cx| {
                            this.set_status(AutoUpdateStatus::Idle, cx);
-                        });
-
-                        log::warn!("{e}");
+                        })
+                        .ok();
                    }
                }
            }),
@@ -211,8 +237,8 @@ impl AutoUpdater {
        subscriptions.push(
            // Observe the status
            cx.observe_self(|this, cx| {
-                if let AutoUpdateStatus::Checked { files } = this.status.clone() {
-                    this.get_latest_release(&files, cx);
+                if let AutoUpdateStatus::Checked { download_url } = this.status.clone() {
+                    this.download_and_install(&download_url, cx);
                }
            }),
        );
@@ -230,118 +256,82 @@ impl AutoUpdater {
        cx.notify();
    }

-    fn subscribe_to_updates(cx: &App) -> Task<()> {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
+    fn check_for_updates(version: Version, cx: &AsyncApp) -> Task<Result<String, Error>> {
        cx.background_spawn(async move {
-            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
+            let client = reqwest::Client::new();
+            let repo_owner = get_github_repo_owner();
+            let repo_name = get_github_repo_name();
+            let url = format!(
+                "{}/repos/{}/{}/releases/latest",
+                GITHUB_API_URL, repo_owner, repo_name
+            );

-            let filter = Filter::new()
-                .kind(Kind::ReleaseArtifactSet)
-                .author(app_pubkey)
-                .limit(1);
-
-            if let Err(e) = client
-                .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+            let response = client
+                .get(&url)
+                .header("User-Agent", "Coop-Auto-Updater")
+                .send()
                .await
-            {
-                log::error!("Failed to subscribe to updates: {e}");
-            };
-        })
-    }
+                .context("Failed to fetch GitHub releases")?;

-    fn check_for_updates(version: Version, cx: &AsyncApp) -> Task<Result<Vec<EventId>, Error>> {
-        let client = cx.update(|cx| {
-            let nostr = NostrRegistry::global(cx);
-            nostr.read(cx).client()
-        });
+            if !response.status().is_success() {
+                return Err(anyhow!("GitHub API returned error: {}", response.status()));
+            }

-        cx.background_spawn(async move {
-            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
+            let release: GitHubRelease = response
+                .json()
+                .await
+                .context("Failed to parse GitHub release")?;

-            let filter = Filter::new()
-                .kind(Kind::ReleaseArtifactSet)
-                .author(app_pubkey)
-                .limit(1);
+            // Parse version from tag (remove 'v' prefix if present)
+            let tag_version = release.tag_name.trim_start_matches('v');
+            let new_version = Version::parse(tag_version).context(format!(
+                "Failed to parse version from tag: {}",
+                release.tag_name
+            ))?;

-            if let Some(event) = client.database().query(filter).await?.first_owned() {
-                let new_version: Version = event
-                    .tags
-                    .find(TagKind::d())
-                    .and_then(|tag| tag.content())
-                    .and_then(|content| content.split("@").last())
-                    .and_then(|content| Version::parse(content).ok())
-                    .context("Failed to parse version")?;
+            if new_version > version {
+                // Find the appropriate asset for the current platform
+                let current_os = std::env::consts::OS;
+                let asset_name = match current_os {
+                    "macos" => "Coop.dmg",
+                    "linux" => "coop.tar.gz",
+                    "windows" => "Coop.exe",
+                    _ => return Err(anyhow!("Unsupported OS: {}", current_os)),
+                };

-                if new_version > version {
-                    // Get all file metadata event ids
-                    let ids: Vec<EventId> = event.tags.event_ids().copied().collect();
+                let download_url = release
+                    .assets
+                    .iter()
+                    .find(|asset| asset.name == asset_name)
+                    .map(|asset| asset.browser_download_url.clone())
+                    .context(format!(
+                        "No {} asset found in release {}",
+                        asset_name, release.tag_name
+                    ))?;

-                    let filter = Filter::new()
-                        .kind(Kind::FileMetadata)
-                        .author(app_pubkey)
-                        .ids(ids.clone());
-
-                    // Get all files for this release
-                    client
-                        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
-                        .await?;
-
-                    Ok(ids)
-                } else {
-                    Err(anyhow!("No update available"))
-                }
+                Ok(download_url)
            } else {
-                Err(anyhow!("No update available"))
+                Err(anyhow!(
+                    "No update available. Current: {}, Latest: {}",
+                    version,
+                    new_version
+                ))
            }
        })
    }

-    fn get_latest_release(&mut self, ids: &[EventId], cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
+    fn download_and_install(&mut self, download_url: &str, cx: &mut Context<Self>) {
        let http_client = cx.http_client();
-        let ids = ids.to_vec();
+        let download_url = download_url.to_string();

        let task: Task<Result<(InstallerDir, PathBuf), Error>> = cx.background_spawn(async move {
-            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
-            let os = std::env::consts::OS;
+            let installer_dir = InstallerDir::new().await?;
+            let target_path = Self::target_path(&installer_dir).await?;

-            let filter = Filter::new()
-                .kind(Kind::FileMetadata)
-                .author(app_pubkey)
-                .ids(ids);
+            // Download the release
+            download(&download_url, &target_path, http_client).await?;

-            // Get all urls for this release
-            let events = client.database().query(filter).await?;
-
-            for event in events.into_iter() {
-                // Only process events that match current platform
-                if event.content != os {
-                    continue;
-                }
-
-                // Parse the url
-                let url = event
-                    .tags
-                    .find(TagKind::Url)
-                    .and_then(|tag| tag.content())
-                    .and_then(|content| Url::parse(content).ok())
-                    .context("Failed to parse url")?;
-
-                let installer_dir = InstallerDir::new().await?;
-                let target_path = Self::target_path(&installer_dir).await?;
-
-                // Download the release
-                download(url.as_str(), &target_path, http_client).await?;
-
-                return Ok((installer_dir, target_path));
-            }
-
-            Err(anyhow!("Failed to get latest release"))
+            Ok((installer_dir, target_path))
        });

        self._tasks.push(
@@ -374,6 +364,7 @@ impl AutoUpdater {
    async fn target_path(installer_dir: &InstallerDir) -> Result<PathBuf, Error> {
        let filename = match std::env::consts::OS {
            "macos" => anyhow::Ok("Coop.dmg"),
+            "linux" => Ok("coop.tar.gz"),
            "windows" => Ok("Coop.exe"),
            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
        }?;
@@ -388,6 +379,7 @@ impl AutoUpdater {
    ) -> Result<(), Error> {
        match std::env::consts::OS {
            "macos" => install_release_macos(&installer_dir, target_path, cx).await,
+            "linux" => install_release_linux(&installer_dir, target_path, cx).await,
            "windows" => install_release_windows(target_path).await,
            unsupported_os => anyhow::bail!("Not supported: {unsupported_os}"),
        }
@@ -460,6 +452,75 @@ async fn install_release_macos(
    Ok(())
 }

+async fn install_release_linux(
+    temp_dir: &InstallerDir,
+    downloaded_tar_gz: PathBuf,
+    cx: &AsyncApp,
+) -> Result<(), Error> {
+    let running_app_path = cx.update(|cx| cx.app_path())?;
+
+    // Extract the tar.gz file
+    let extracted = temp_dir.path().join("coop");
+    smol::fs::create_dir_all(&extracted)
+        .await
+        .context("failed to create directory to extract update")?;
+
+    let output = Command::new("tar")
+        .arg("-xzf")
+        .arg(&downloaded_tar_gz)
+        .arg("-C")
+        .arg(&extracted)
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to extract {:?} to {:?}: {:?}",
+        downloaded_tar_gz,
+        extracted,
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    // Find the extracted app directory
+    let mut entries = smol::fs::read_dir(&extracted).await?;
+    let mut app_dir = None;
+
+    use smol::stream::StreamExt;
+
+    while let Some(entry) = entries.next().await {
+        let entry = entry?;
+        let path = entry.path();
+        if path.is_dir() {
+            app_dir = Some(path);
+            break;
+        }
+    }
+
+    let from = app_dir.context("No app directory found in archive")?;
+
+    // Copy to the current installation directory
+    let output = Command::new("rsync")
+        .args(["-av", "--delete"])
+        .arg(&from)
+        .arg(
+            running_app_path
+                .parent()
+                .context("No parent directory for app")?,
+        )
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to copy app from {:?} to {:?}: {:?}",
+        from,
+        running_app_path.parent(),
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
+}
+
 async fn install_release_windows(downloaded_installer: PathBuf) -> Result<(), Error> {
    //const CREATE_NO_WINDOW: u32 = 0x08000000;

--- a/crates/chat/src/lib.rs
+++ b/crates/chat/src/lib.rs
@@ -7,16 +7,14 @@ use std::time::Duration;

 use anyhow::{anyhow, Context as AnyhowContext, Error};
 use common::EventUtils;
-use device::DeviceRegistry;
-use flume::Sender;
 use fuzzy_matcher::skim::SkimMatcherV2;
 use fuzzy_matcher::FuzzyMatcher;
 use gpui::{
-    App, AppContext, Context, Entity, EventEmitter, Global, Subscription, Task, WeakEntity,
+    App, AppContext, Context, Entity, EventEmitter, Global, Subscription, Task, WeakEntity, Window,
 };
 use nostr_sdk::prelude::*;
 use smallvec::{smallvec, SmallVec};
-use state::{tracker, NostrRegistry, GIFTWRAP_SUBSCRIPTION};
+use state::{NostrRegistry, RelayState, DEVICE_GIFTWRAP, TIMEOUT, USER_GIFTWRAP};

 mod message;
 mod room;
@@ -24,8 +22,8 @@ mod room;
 pub use message::*;
 pub use room::*;

-pub fn init(cx: &mut App) {
-    ChatRegistry::set_global(cx.new(ChatRegistry::new), cx);
+pub fn init(window: &mut Window, cx: &mut App) {
+    ChatRegistry::set_global(cx.new(|cx| ChatRegistry::new(window, cx)), cx);
 }

 struct GlobalChatRegistry(Entity<ChatRegistry>);
@@ -45,11 +43,9 @@ pub enum ChatEvent {

 /// Channel signal.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-enum NostrEvent {
+enum Signal {
    /// Message received from relay pool
    Message(NewMessage),
-    /// Unwrapping status
-    Unwrapping(bool),
    /// Eose received from relay pool
    Eose,
 }
@@ -57,23 +53,17 @@ enum NostrEvent {
 /// Chat Registry
 #[derive(Debug)]
 pub struct ChatRegistry {
+    /// Relay state for messaging relay list
+    messaging_relay_list: Entity<RelayState>,
+
    /// Collection of all chat rooms
    rooms: Vec<Entity<Room>>,

-    /// Loading status of the registry
-    loading: bool,
-
    /// Tracking the status of unwrapping gift wrap events.
    tracking_flag: Arc<AtomicBool>,

-    /// Channel's sender for communication between nostr and gpui
-    sender: Sender<NostrEvent>,
-
-    /// Handle notifications asynchronous task
-    notifications: Option<Task<Result<(), Error>>>,
-
-    /// Tasks for asynchronous operations
-    tasks: Vec<Task<()>>,
+    /// Async tasks
+    tasks: SmallVec<[Task<Result<(), Error>>; 2]>,

    /// Subscriptions
    _subscriptions: SmallVec<[Subscription; 1]>,
@@ -93,79 +83,52 @@ impl ChatRegistry {
    }

    /// Create a new chat registry instance
-    fn new(cx: &mut Context<Self>) -> Self {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let messaging_relay_list = cx.new(|_| RelayState::default());
        let nostr = NostrRegistry::global(cx);
-        let identity = nostr.read(cx).identity();

-        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(true));
-
-        // Channel for communication between nostr and gpui
-        let (tx, rx) = flume::bounded::<NostrEvent>(2048);
-
-        let mut tasks = vec![];
        let mut subscriptions = smallvec![];

        subscriptions.push(
-            // Observe the identity
-            cx.observe(&identity, |this, state, cx| {
-                if state.read(cx).has_public_key() {
-                    // Handle nostr notifications
-                    this.handle_notifications(cx);
-                    // Track unwrapping progress
-                    this.tracking(cx);
+            // Observe the nip65 state and load chat rooms on every state change
+            cx.observe(&nostr, |this, state, cx| {
+                match state.read(cx).relay_list_state() {
+                    RelayState::Idle => {
+                        this.reset(cx);
+                    }
+                    RelayState::Configured => {
+                        this.ensure_messaging_relays(cx);
+                    }
+                    _ => {}
                }
            }),
        );

        subscriptions.push(
-            // Observe the device signer state
-            cx.observe(&device_signer, |this, state, cx| {
-                if state.read(cx).is_some() {
-                    this.handle_notifications(cx);
+            // Observe the nip17 state and load chat rooms on every state change
+            cx.observe(&messaging_relay_list, |this, state, cx| {
+                match state.read(cx) {
+                    RelayState::Configured => {
+                        this.get_messages(cx);
+                    }
+                    _ => {
+                        this.get_rooms(cx);
+                    }
                }
            }),
        );

-        tasks.push(
-            // Update GPUI states
-            cx.spawn(async move |this, cx| {
-                while let Ok(message) = rx.recv_async().await {
-                    match message {
-                        NostrEvent::Message(message) => {
-                            this.update(cx, |this, cx| {
-                                this.new_message(message, cx);
-                            })
-                            .ok();
-                        }
-                        NostrEvent::Eose => {
-                            this.update(cx, |this, cx| {
-                                this.get_rooms(cx);
-                            })
-                            .ok();
-                        }
-                        NostrEvent::Unwrapping(status) => {
-                            this.update(cx, |this, cx| {
-                                this.set_loading(status, cx);
-                                this.get_rooms(cx);
-                            })
-                            .ok();
-                        }
-                    };
-                }
-            }),
-        );
+        // Run at the end of current cycle
+        cx.defer_in(window, |this, _window, cx| {
+            this.handle_notifications(cx);
+            this.tracking(cx);
+        });

        Self {
+            messaging_relay_list,
            rooms: vec![],
-            loading: true,
-            tracking_flag,
-            sender: tx.clone(),
-            notifications: None,
-            tasks,
+            tracking_flag: Arc::new(AtomicBool::new(false)),
+            tasks: smallvec![],
            _subscriptions: subscriptions,
        }
    }
@@ -174,22 +137,23 @@ 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();
+
+        let initialized_at = Timestamp::now();
+        let sub_id1 = SubscriptionId::new(DEVICE_GIFTWRAP);
+        let sub_id2 = SubscriptionId::new(USER_GIFTWRAP);
+
+        // Channel for communication between nostr and gpui
+        let (tx, rx) = flume::bounded::<Signal>(1024);

        self.tasks.push(cx.background_spawn(async move {
-            let initialized_at = Timestamp::now();
-            let subscription_id = SubscriptionId::new(GIFTWRAP_SUBSCRIPTION);
-
+            let device_signer = signer.get_encryption_signer().await;
            let mut notifications = client.notifications();
            let mut processed_events = HashSet::new();

-            while let Ok(notification) = notifications.recv().await {
-                let RelayPoolNotification::Message { message, .. } = notification else {
+            while let Some(notification) = notifications.next().await {
+                let ClientNotification::Message { message, .. } = notification else {
                    // Skip non-message notifications
                    continue;
                };
@@ -206,99 +170,187 @@ impl ChatRegistry {
                            continue;
                        }

+                        log::info!("Received gift wrap event: {:?}", event);
+
                        // Extract the rumor from the gift wrap event
                        match Self::extract_rumor(&client, &device_signer, event.as_ref()).await {
                            Ok(rumor) => match rumor.created_at >= initialized_at {
                                true => {
-                                    // Check if the event is sent by coop
-                                    let sent_by_coop = {
-                                        let tracker = tracker().read().await;
-                                        tracker.is_sent_by_coop(&event.id)
-                                    };
-                                    // No need to emit if sent by coop
-                                    // the event is already emitted
-                                    if !sent_by_coop {
-                                        let new_message = NewMessage::new(event.id, rumor);
-                                        let signal = NostrEvent::Message(new_message);
+                                    let new_message = NewMessage::new(event.id, rumor);
+                                    let signal = Signal::Message(new_message);

-                                        tx.send_async(signal).await.ok();
-                                    }
+                                    tx.send_async(signal).await?;
                                }
                                false => {
                                    status.store(true, Ordering::Release);
                                }
                            },
                            Err(e) => {
-                                log::warn!("Failed to unwrap: {e}");
+                                log::warn!("Failed to unwrap the gift wrap event: {e}");
                            }
                        }
                    }
                    RelayMessage::EndOfStoredEvents(id) => {
-                        if id.as_ref() == &subscription_id {
-                            tx.send_async(NostrEvent::Eose).await.ok();
+                        if id.as_ref() == &sub_id1 || id.as_ref() == &sub_id2 {
+                            tx.send_async(Signal::Eose).await?;
                        }
                    }
                    _ => {}
                }
            }
+
+            Ok(())
+        }));
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            while let Ok(message) = rx.recv_async().await {
+                match message {
+                    Signal::Message(message) => {
+                        this.update(cx, |this, cx| {
+                            this.new_message(message, cx);
+                        })?;
+                    }
+                    Signal::Eose => {
+                        this.update(cx, |this, cx| {
+                            this.get_rooms(cx);
+                        })?;
+                    }
+                };
+            }
+
+            Ok(())
        }));
    }

    /// Tracking the status of unwrapping gift wrap events.
    fn tracking(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
        let status = self.tracking_flag.clone();
-        let tx = self.sender.clone();

-        self.notifications = Some(cx.background_spawn(async move {
-            let loop_duration = Duration::from_secs(12);
-
-            let mut is_start_processing = false;
-            let mut total_loops = 0;
+        self.tasks.push(cx.background_spawn(async move {
+            let loop_duration = Duration::from_secs(10);

            loop {
-                if client.has_signer().await {
-                    total_loops += 1;
-
-                    if status.load(Ordering::Acquire) {
-                        is_start_processing = true;
-                        // Reset gift wrap processing flag
-                        _ = status.compare_exchange(
-                            true,
-                            false,
-                            Ordering::Release,
-                            Ordering::Relaxed,
-                        );
-
-                        tx.send_async(NostrEvent::Unwrapping(true)).await.ok();
-                    } else {
-                        // Only run further if we are already processing
-                        // Wait until after 2 loops to prevent exiting early while events are still being processed
-                        if is_start_processing && total_loops >= 2 {
-                            tx.send_async(NostrEvent::Unwrapping(false)).await.ok();
-
-                            // Reset the counter
-                            is_start_processing = false;
-                            total_loops = 0;
-                        }
-                    }
+                if status.load(Ordering::Acquire) {
+                    _ = status.compare_exchange(true, false, Ordering::Release, Ordering::Relaxed);
                }
                smol::Timer::after(loop_duration).await;
            }
        }));
    }

-    /// Get the loading status of the chat registry
-    pub fn loading(&self) -> bool {
-        self.loading
+    fn ensure_messaging_relays(&mut self, cx: &mut Context<Self>) {
+        let state = self.messaging_relay_list.downgrade();
+        let task = self.verify_relays(cx);
+
+        self.tasks.push(cx.spawn(async move |_this, cx| {
+            let result = task.await?;
+
+            // Update state
+            state.update(cx, |this, cx| {
+                *this = result;
+                cx.notify();
+            })?;
+
+            Ok(())
+        }));
    }

-    /// Set the loading status of the chat registry
-    pub fn set_loading(&mut self, loading: bool, cx: &mut Context<Self>) {
-        self.loading = loading;
-        cx.notify();
+    // Verify messaging relay list for current user
+    fn verify_relays(&mut self, cx: &mut Context<Self>) -> Task<Result<RelayState, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let signer = nostr.read(cx).signer();
+        let public_key = signer.public_key().unwrap();
+
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
+        cx.background_spawn(async move {
+            let urls = write_relays.await;
+
+            // Construct filter for inbox relays
+            let filter = Filter::new()
+                .kind(Kind::InboxRelays)
+                .author(public_key)
+                .limit(1);
+
+            // Construct target for subscription
+            let target: HashMap<&RelayUrl, Filter> =
+                urls.iter().map(|relay| (relay, filter.clone())).collect();
+
+            // Stream events from user's write relays
+            let mut stream = client
+                .stream_events(target)
+                .timeout(Duration::from_secs(TIMEOUT))
+                .await?;
+
+            while let Some((_url, res)) = stream.next().await {
+                match res {
+                    Ok(event) => {
+                        log::info!("Received relay list event: {event:?}");
+                        return Ok(RelayState::Configured);
+                    }
+                    Err(e) => {
+                        log::error!("Failed to receive relay list event: {e}");
+                    }
+                }
+            }
+
+            Ok(RelayState::NotConfigured)
+        })
+    }
+
+    /// Get all messages for current user
+    fn get_messages(&mut self, cx: &mut Context<Self>) {
+        let task = self.subscribe_to_giftwrap_events(cx);
+
+        self.tasks.push(cx.spawn(async move |_this, _cx| {
+            task.await?;
+
+            // Update state
+
+            Ok(())
+        }));
+    }
+
+    /// Continuously get gift wrap events for the current user in their messaging relays
+    fn subscribe_to_giftwrap_events(&mut self, cx: &mut Context<Self>) -> Task<Result<(), Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let signer = nostr.read(cx).signer();
+        let public_key = signer.public_key().unwrap();
+
+        let messaging_relays = nostr.read(cx).messaging_relays(&public_key, cx);
+
+        cx.background_spawn(async move {
+            let urls = messaging_relays.await;
+            let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
+            let id = SubscriptionId::new(USER_GIFTWRAP);
+
+            // Construct target for subscription
+            let target: HashMap<&RelayUrl, Filter> =
+                urls.iter().map(|relay| (relay, filter.clone())).collect();
+
+            let output = client.subscribe(target).with_id(id).await?;
+
+            log::info!(
+                "Successfully subscribed to gift-wrap messages on: {:?}",
+                output.success
+            );
+
+            Ok(())
+        })
+    }
+
+    /// Get the relay state
+    pub fn relay_state(&self, cx: &App) -> RelayState {
+        self.messaging_relay_list.read(cx).clone()
+    }
+
+    /// Get the loading status of the chat registry
+    pub fn loading(&self) -> bool {
+        self.tracking_flag.load(Ordering::Acquire)
    }

    /// Get a weak reference to a room by its ID.
@@ -309,47 +361,60 @@ impl ChatRegistry {
            .map(|this| this.downgrade())
    }

-    /// Get all ongoing rooms.
-    pub fn ongoing_rooms(&self, cx: &App) -> Vec<Entity<Room>> {
+    /// Get all rooms based on the filter.
+    pub fn rooms(&self, filter: &RoomKind, cx: &App) -> Vec<Entity<Room>> {
        self.rooms
            .iter()
-            .filter(|room| room.read(cx).kind == RoomKind::Ongoing)
+            .filter(|room| &room.read(cx).kind == filter)
            .cloned()
            .collect()
    }

-    /// Get all request rooms.
-    pub fn request_rooms(&self, cx: &App) -> Vec<Entity<Room>> {
+    /// Count the number of rooms based on the filter.
+    pub fn count(&self, filter: &RoomKind, cx: &App) -> usize {
        self.rooms
            .iter()
-            .filter(|room| room.read(cx).kind != RoomKind::Ongoing)
-            .cloned()
-            .collect()
+            .filter(|room| &room.read(cx).kind == filter)
+            .count()
    }

    /// Add a new room to the start of list.
    pub fn add_room<I>(&mut self, room: I, cx: &mut Context<Self>)
    where
-        I: Into<Room>,
+        I: Into<Room> + 'static,
    {
-        self.rooms.insert(0, cx.new(|_| room.into()));
-        cx.notify();
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.spawn(async move |this, cx| {
+            let signer = client.signer()?;
+            let public_key = signer.get_public_key().await.ok()?;
+            let room: Room = room.into().organize(&public_key);
+
+            this.update(cx, |this, cx| {
+                this.rooms.insert(0, cx.new(|_| room));
+                cx.emit(ChatEvent::Ping);
+                cx.notify();
+            })
+            .ok()
+        })
+        .detach();
    }

    /// Emit an open room event.
+    ///
    /// If the room is new, add it to the registry.
-    pub fn emit_room(&mut self, room: WeakEntity<Room>, cx: &mut Context<Self>) {
-        if let Some(room) = room.upgrade() {
-            let id = room.read(cx).id;
+    pub fn emit_room(&mut self, room: &Entity<Room>, cx: &mut Context<Self>) {
+        // Get the room's ID.
+        let id = room.read(cx).id;

-            // If the room is new, add it to the registry.
-            if !self.rooms.iter().any(|r| r.read(cx).id == id) {
-                self.rooms.insert(0, room);
-            }
-
-            // Emit the open room event.
-            cx.emit(ChatEvent::OpenRoom(id));
+        // If the room is new, add it to the registry.
+        if !self.rooms.iter().any(|r| r.read(cx).id == id) {
+            self.rooms.insert(0, room.to_owned());
        }
+
+        // Emit the open room event.
+        cx.emit(ChatEvent::OpenRoom(id));
    }

    /// Close a room.
@@ -365,28 +430,27 @@ impl ChatRegistry {
        cx.notify();
    }

-    /// Search rooms by their name.
-    pub fn search(&self, query: &str, cx: &App) -> Vec<Entity<Room>> {
+    /// Finding rooms based on a query.
+    pub fn find(&self, query: &str, cx: &App) -> Vec<Entity<Room>> {
        let matcher = SkimMatcherV2::default();

-        self.rooms
-            .iter()
-            .filter(|room| {
-                matcher
-                    .fuzzy_match(room.read(cx).display_name(cx).as_ref(), query)
-                    .is_some()
-            })
-            .cloned()
-            .collect()
-    }
-
-    /// Search rooms by public keys.
-    pub fn search_by_public_key(&self, public_key: PublicKey, cx: &App) -> Vec<Entity<Room>> {
-        self.rooms
-            .iter()
-            .filter(|room| room.read(cx).members.contains(&public_key))
-            .cloned()
-            .collect()
+        if let Ok(public_key) = PublicKey::parse(query) {
+            self.rooms
+                .iter()
+                .filter(|room| room.read(cx).members.contains(&public_key))
+                .cloned()
+                .collect()
+        } else {
+            self.rooms
+                .iter()
+                .filter(|room| {
+                    matcher
+                        .fuzzy_match(room.read(cx).display_name(cx).as_ref(), query)
+                        .is_some()
+                })
+                .cloned()
+                .collect()
+        }
    }

    /// Reset the registry.
@@ -427,23 +491,16 @@ impl ChatRegistry {
    pub fn get_rooms(&mut self, cx: &mut Context<Self>) {
        let task = self.get_rooms_from_database(cx);

-        self.tasks.push(
-            // Run and finished in the background
-            cx.spawn(async move |this, cx| {
-                match task.await {
-                    Ok(rooms) => {
-                        this.update(cx, move |this, cx| {
-                            this.extend_rooms(rooms, cx);
-                            this.sort(cx);
-                        })
-                        .ok();
-                    }
-                    Err(e) => {
-                        log::error!("Failed to load rooms: {e}")
-                    }
-                };
-            }),
-        );
+        cx.spawn(async move |this, cx| {
+            let rooms = task.await.ok()?;
+
+            this.update(cx, move |this, cx| {
+                this.extend_rooms(rooms, cx);
+                this.sort(cx);
+            })
+            .ok()
+        })
+        .detach();
    }

    /// Create a task to load rooms from the database
@@ -452,10 +509,13 @@ impl ChatRegistry {
        let client = nostr.read(cx).client();

        cx.background_spawn(async move {
-            let signer = client.signer().await?;
+            let signer = client.signer().context("Signer not found")?;
            let public_key = signer.get_public_key().await?;
+
+            // Get contacts
            let contacts = client.database().contacts_public_keys(public_key).await?;

+            // Construct authored filter
            let authored_filter = Filter::new()
                .kind(Kind::ApplicationSpecificData)
                .custom_tag(SingleLetterTag::lowercase(Alphabet::A), public_key);
@@ -463,6 +523,7 @@ impl ChatRegistry {
            // Get all authored events
            let authored = client.database().query(authored_filter).await?;

+            // Construct addressed filter
            let addressed_filter = Filter::new()
                .kind(Kind::ApplicationSpecificData)
                .custom_tag(SingleLetterTag::lowercase(Alphabet::P), public_key);
@@ -473,6 +534,7 @@ impl ChatRegistry {
            // Merge authored and addressed events
            let events = authored.merge(addressed);

+            // Collect results
            let mut rooms: HashSet<Room> = HashSet::new();
            let mut grouped: HashMap<u64, Vec<UnsignedEvent>> = HashMap::new();

@@ -488,24 +550,21 @@ impl ChatRegistry {
            for (_id, mut messages) in grouped.into_iter() {
                messages.sort_by_key(|m| Reverse(m.created_at));

+                // Always use the latest message
                let Some(latest) = messages.first() else {
                    continue;
                };

-                let mut room = Room::from(latest);
-
-                if rooms.iter().any(|r| r.id == room.id) {
-                    continue;
-                }
-
-                let mut public_keys = room.members();
-                public_keys.retain(|pk| pk != &public_key);
+                // Construct the room from the latest message.
+                //
+                // Call `.organize` to ensure the current user is at the end of the list.
+                let mut room = Room::from(latest).organize(&public_key);

                // Check if the user has responded to the room
                let user_sent = messages.iter().any(|m| m.pubkey == public_key);

                // Check if public keys are from the user's contacts
-                let is_contact = public_keys.iter().any(|k| contacts.contains(k));
+                let is_contact = room.members.iter().any(|k| contacts.contains(k));

                // Set the room's kind based on status
                if user_sent || is_contact {
@@ -519,6 +578,24 @@ impl ChatRegistry {
        })
    }

+    /// Parse a nostr event into a message and push it to the belonging room
+    ///
+    /// If the room doesn't exist, it will be created.
+    /// Updates room ordering based on the most recent messages.
+    pub fn new_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
+        match self.rooms.iter().find(|e| e.read(cx).id == message.room) {
+            Some(room) => {
+                room.update(cx, |this, cx| {
+                    this.push_message(message, cx);
+                });
+            }
+            None => {
+                // Push the new room to the front of the list
+                self.add_room(message.rumor, cx);
+            }
+        }
+    }
+
    /// Trigger a refresh of the opened chat rooms by their IDs
    pub fn refresh_rooms(&mut self, ids: Option<Vec<u64>>, cx: &mut Context<Self>) {
        if let Some(ids) = ids {
@@ -532,54 +609,7 @@ impl ChatRegistry {
        }
    }

-    /// Parse a Nostr event into a Coop Message and push it to the belonging room
-    ///
-    /// If the room doesn't exist, it will be created.
-    /// Updates room ordering based on the most recent messages.
-    pub fn new_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        // Get the unique id
-        let id = message.rumor.uniq_id();
-        // Get the author
-        let author = message.rumor.pubkey;
-
-        match self.rooms.iter().find(|room| room.read(cx).id == id) {
-            Some(room) => {
-                let new_message = message.rumor.created_at > room.read(cx).created_at;
-                let created_at = message.rumor.created_at;
-
-                // Update room
-                room.update(cx, |this, cx| {
-                    // Update the last timestamp if the new message is newer
-                    if new_message {
-                        this.set_created_at(created_at, cx);
-                    }
-
-                    // Set this room is ongoing if the new message is from current user
-                    if author == nostr.read(cx).identity().read(cx).public_key() {
-                        this.set_ongoing(cx);
-                    }
-
-                    // Emit the new message to the room
-                    this.emit_message(message, cx);
-                });
-
-                // Resort all rooms in the registry by their created at (after updated)
-                if new_message {
-                    self.sort(cx);
-                }
-            }
-            None => {
-                // Push the new room to the front of the list
-                self.add_room(&message.rumor, cx);
-
-                // Notify the UI about the new room
-                cx.emit(ChatEvent::Ping);
-            }
-        }
-    }
-
-    // Unwraps a gift-wrapped event and processes its contents.
+    /// Unwraps a gift-wrapped event and processes its contents.
    async fn extract_rumor(
        client: &Client,
        device_signer: &Option<Arc<dyn NostrSigner>>,
@@ -603,35 +633,50 @@ impl ChatRegistry {
        Ok(rumor_unsigned)
    }

-    // Helper method to try unwrapping with different signers
+    /// Helper method to try unwrapping with different signers
    async fn try_unwrap(
        client: &Client,
        device_signer: &Option<Arc<dyn NostrSigner>>,
        gift_wrap: &Event,
    ) -> Result<UnwrappedGift, Error> {
-        if let Some(signer) = device_signer.as_ref() {
-            let seal = signer
-                .nip44_decrypt(&gift_wrap.pubkey, &gift_wrap.content)
-                .await?;
+        // Try with the device signer first
+        if let Some(signer) = device_signer {
+            if let Ok(unwrapped) = Self::try_unwrap_with(gift_wrap, signer).await {
+                return Ok(unwrapped);
+            };
+        };

-            let seal: Event = Event::from_json(seal)?;
-            seal.verify_with_ctx(&SECP256K1)?;
-
-            let rumor = signer.nip44_decrypt(&seal.pubkey, &seal.content).await?;
-            let rumor = UnsignedEvent::from_json(rumor)?;
-
-            return Ok(UnwrappedGift {
-                sender: seal.pubkey,
-                rumor,
-            });
-        }
-
-        let signer = client.signer().await?;
-        let unwrapped = UnwrappedGift::from_gift_wrap(&signer, gift_wrap).await?;
+        // Try with the user's signer
+        let user_signer = client.signer().context("Signer not found")?;
+        let unwrapped = UnwrappedGift::from_gift_wrap(user_signer, gift_wrap).await?;

        Ok(unwrapped)
    }

+    /// Attempts to unwrap a gift wrap event with a given signer.
+    async fn try_unwrap_with(
+        gift_wrap: &Event,
+        signer: &Arc<dyn NostrSigner>,
+    ) -> Result<UnwrappedGift, Error> {
+        // Get the sealed event
+        let seal = signer
+            .nip44_decrypt(&gift_wrap.pubkey, &gift_wrap.content)
+            .await?;
+
+        // Verify the sealed event
+        let seal: Event = Event::from_json(seal)?;
+        seal.verify_with_ctx(&SECP256K1)?;
+
+        // Get the rumor event
+        let rumor = signer.nip44_decrypt(&seal.pubkey, &seal.content).await?;
+        let rumor = UnsignedEvent::from_json(rumor)?;
+
+        Ok(UnwrappedGift {
+            sender: seal.pubkey,
+            rumor,
+        })
+    }
+
    /// Stores an unwrapped event in local database with reference to original
    async fn set_rumor(client: &Client, id: EventId, rumor: &UnsignedEvent) -> Result<(), Error> {
        let rumor_id = rumor.id.context("Rumor is missing an event id")?;
--- a/crates/chat/src/message.rs
+++ b/crates/chat/src/message.rs
@@ -1,17 +1,25 @@
 use std::hash::Hash;

+use common::EventUtils;
 use nostr_sdk::prelude::*;

 /// New message.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct NewMessage {
+    pub room: u64,
    pub gift_wrap: EventId,
    pub rumor: UnsignedEvent,
 }

 impl NewMessage {
    pub fn new(gift_wrap: EventId, rumor: UnsignedEvent) -> Self {
-        Self { gift_wrap, rumor }
+        let room = rumor.uniq_id();
+
+        Self {
+            room,
+            gift_wrap,
+            rumor,
+        }
    }
 }

--- a/crates/chat/src/room.rs
+++ b/crates/chat/src/room.rs
@@ -1,81 +1,66 @@
 use std::cmp::Ordering;
-use std::collections::{HashMap, HashSet};
 use std::hash::{Hash, Hasher};
 use std::time::Duration;

-use anyhow::Error;
+use anyhow::{Context as AnyhowContext, Error};
 use common::EventUtils;
 use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use person::{Person, PersonRegistry};
-use state::{tracker, NostrRegistry};
+use settings::{RoomConfig, SignerKind};
+use state::{NostrRegistry, TIMEOUT};

-use crate::NewMessage;
-
-const SEND_RETRY: usize = 10;
+use crate::{ChatRegistry, NewMessage};

 #[derive(Debug, Clone)]
 pub struct SendReport {
    pub receiver: PublicKey,
-    pub status: Option<Output<EventId>>,
+    pub gift_wrap_id: Option<EventId>,
    pub error: Option<SharedString>,
-    pub on_hold: Option<Event>,
-    pub encryption: bool,
-    pub relays_not_found: bool,
-    pub device_not_found: bool,
+    pub output: Option<Output<EventId>>,
 }

 impl SendReport {
    pub fn new(receiver: PublicKey) -> Self {
        Self {
            receiver,
-            status: None,
+            gift_wrap_id: None,
            error: None,
-            on_hold: None,
-            encryption: false,
-            relays_not_found: false,
-            device_not_found: false,
+            output: None,
        }
    }

-    pub fn status(mut self, output: Output<EventId>) -> Self {
-        self.status = Some(output);
+    /// Set the gift wrap ID.
+    pub fn gift_wrap_id(mut self, gift_wrap_id: EventId) -> Self {
+        self.gift_wrap_id = Some(gift_wrap_id);
        self
    }

-    pub fn error(mut self, error: impl Into<SharedString>) -> Self {
+    /// Set the output.
+    pub fn output(mut self, output: Output<EventId>) -> Self {
+        self.output = Some(output);
+        self
+    }
+
+    /// Set the error message.
+    pub fn error<T>(mut self, error: T) -> Self
+    where
+        T: Into<SharedString>,
+    {
        self.error = Some(error.into());
        self
    }

-    pub fn on_hold(mut self, event: Event) -> Self {
-        self.on_hold = Some(event);
-        self
+    /// Returns true if the send is pending.
+    pub fn pending(&self) -> bool {
+        self.output.is_none() && self.error.is_none()
    }

-    pub fn encryption(mut self) -> Self {
-        self.encryption = true;
-        self
-    }
-
-    pub fn relays_not_found(mut self) -> Self {
-        self.relays_not_found = true;
-        self
-    }
-
-    pub fn device_not_found(mut self) -> Self {
-        self.device_not_found = true;
-        self
-    }
-
-    pub fn is_relay_error(&self) -> bool {
-        self.error.is_some() || self.relays_not_found
-    }
-
-    pub fn is_sent_success(&self) -> bool {
-        if let Some(output) = self.status.as_ref() {
-            !output.success.is_empty()
+    /// Returns true if the send was successful.
+    pub fn success(&self) -> bool {
+        if let Some(output) = self.output.as_ref() {
+            !output.failed.is_empty()
        } else {
            false
        }
@@ -99,18 +84,25 @@ pub enum RoomKind {
    Ongoing,
 }

-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Room {
    /// Conversation ID
    pub id: u64,
+
    /// The timestamp of the last message in the room
    pub created_at: Timestamp,
+
    /// Subject of the room
    pub subject: Option<SharedString>,
+
    /// All members of the room
-    pub members: Vec<PublicKey>,
+    pub(super) members: Vec<PublicKey>,
+
    /// Kind
    pub kind: RoomKind,
+
+    /// Configuration
+    config: RoomConfig,
 }

 impl Ord for Room {
@@ -145,11 +137,7 @@ impl From<&UnsignedEvent> for Room {
    fn from(val: &UnsignedEvent) -> Self {
        let id = val.uniq_id();
        let created_at = val.created_at;
-
-        // Get the members from the event's tags and event's pubkey
        let members = val.extract_public_keys();
-
-        // Get subject from tags
        let subject = val
            .tags
            .find(TagKind::Subject)
@@ -161,38 +149,50 @@ impl From<&UnsignedEvent> for Room {
            subject,
            members,
            kind: RoomKind::default(),
+            config: RoomConfig::default(),
        }
    }
 }

+impl From<UnsignedEvent> for Room {
+    fn from(val: UnsignedEvent) -> Self {
+        Room::from(&val)
+    }
+}
+
 impl Room {
    /// Constructs a new room with the given receiver and tags.
-    pub fn new(subject: Option<String>, author: PublicKey, receivers: Vec<PublicKey>) -> Self {
-        // Convert receiver's public keys into tags
-        let mut tags: Tags = Tags::from_list(
-            receivers
-                .iter()
-                .map(|pubkey| Tag::public_key(pubkey.to_owned()))
-                .collect(),
-        );
-
-        // Add subject if it is present
-        if let Some(subject) = subject {
-            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
-                subject,
-            )));
-        }
+    pub fn new<T>(author: PublicKey, receivers: T) -> Self
+    where
+        T: IntoIterator<Item = PublicKey>,
+    {
+        // Map receiver public keys to tags
+        let tags = Tags::from_list(receivers.into_iter().map(Tag::public_key).collect());

+        // Construct an unsigned event for a direct message
+        //
+        // WARNING: never sign this event
        let mut event = EventBuilder::new(Kind::PrivateDirectMessage, "")
            .tags(tags)
            .build(author);

-        // Generate event ID
+        // Ensure that the ID is set
        event.ensure_id();

        Room::from(&event)
    }

+    /// Organizes the members of the room by moving the target member to the end.
+    ///
+    /// Always call this function to ensure the current user is at the end of the list.
+    pub fn organize(mut self, target: &PublicKey) -> Self {
+        if let Some(index) = self.members.iter().position(|member| member == target) {
+            let member = self.members.remove(index);
+            self.members.push(member);
+        }
+        self
+    }
+
    /// Sets the kind of the room and returns the modified room
    pub fn kind(mut self, kind: RoomKind) -> Self {
        self.kind = kind;
@@ -227,28 +227,6 @@ impl Room {
        self.members.clone()
    }

-    /// Returns the members of the room with their messaging relays
-    pub fn members_with_relays(&self, cx: &App) -> Task<Vec<(PublicKey, Vec<RelayUrl>)>> {
-        let nostr = NostrRegistry::global(cx);
-        let mut tasks = vec![];
-
-        for member in self.members.iter() {
-            let task = nostr.read(cx).messaging_relays(member, cx);
-            tasks.push((*member, task));
-        }
-
-        cx.background_spawn(async move {
-            let mut results = vec![];
-
-            for (public_key, task) in tasks.into_iter() {
-                let urls = task.await;
-                results.push((public_key, urls));
-            }
-
-            results
-        })
-    }
-
    /// Checks if the room has more than two members (group)
    pub fn is_group(&self) -> bool {
        self.members.len() > 2
@@ -277,17 +255,7 @@ impl Room {
    /// Display member is always different from the current user.
    pub fn display_member(&self, cx: &App) -> Person {
        let persons = PersonRegistry::global(cx);
-        let nostr = NostrRegistry::global(cx);
-        let public_key = nostr.read(cx).identity().read(cx).public_key();
-
-        let target_member = self
-            .members
-            .iter()
-            .find(|&member| member != &public_key)
-            .or_else(|| self.members.first())
-            .expect("Room should have at least one member");
-
-        persons.read(cx).get(target_member, cx)
+        persons.read(cx).get(&self.members[0], cx)
    }

    /// Merge the names of the first two members of the room.
@@ -308,7 +276,7 @@ impl Room {
                .collect::<Vec<_>>()
                .join(", ");

-            if profiles.len() > 2 {
+            if profiles.len() > 3 {
                name = format!("{}, +{}", name, profiles.len() - 2);
            }

@@ -318,9 +286,21 @@ impl Room {
        }
    }

-    /// Emits a new message signal to the current room
-    pub fn emit_message(&self, message: NewMessage, cx: &mut Context<Self>) {
+    /// Push a new message to the current room
+    pub fn push_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
+        let created_at = message.rumor.created_at;
+        let new_message = created_at > self.created_at;
+
+        // Emit the incoming message event
        cx.emit(RoomEvent::Incoming(message));
+
+        if new_message {
+            self.set_created_at(created_at, cx);
+            // Sort chats after emitting a new message
+            ChatRegistry::global(cx).update(cx, |this, cx| {
+                this.sort(cx);
+            });
+        }
    }

    /// Emits a signal to reload the current room's messages.
@@ -329,32 +309,43 @@ impl Room {
    }

    /// Get gossip relays for each member
-    pub fn connect(&self, cx: &App) -> Task<Result<(), Error>> {
+    pub fn early_connect(&self, cx: &App) -> Task<Result<(), Error>> {
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();
+
        let members = self.members();
-        let id = SubscriptionId::new(format!("room-{}", self.id));
+        let subscription_id = SubscriptionId::new(format!("room-{}", self.id));

        cx.background_spawn(async move {
-            let signer = client.signer().await?;
+            let signer = client.signer().context("Signer not found")?;
            let public_key = signer.get_public_key().await?;

-            // Subscription options
-            let opts = SubscribeAutoCloseOptions::default()
-                .timeout(Some(Duration::from_secs(2)))
-                .exit_policy(ReqExitPolicy::ExitOnEOSE);
-
            for member in members.into_iter() {
                if member == public_key {
                    continue;
                };

-                // Construct a filter for gossip relays
-                let filter = Filter::new().kind(Kind::RelayList).author(member).limit(1);
+                // Construct a filter for messaging relays
+                let inbox = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(member)
+                    .limit(1);
+
+                // Construct a filter for announcement
+                let announcement = Filter::new()
+                    .kind(Kind::Custom(10044))
+                    .author(member)
+                    .limit(1);

                // Subscribe to get member's gossip relays
                client
-                    .subscribe_with_id(id.clone(), filter, Some(opts))
+                    .subscribe(vec![inbox, announcement])
+                    .with_id(subscription_id.clone())
+                    .close_on(
+                        SubscribeAutoCloseOptions::default()
+                            .timeout(Some(Duration::from_secs(TIMEOUT)))
+                            .exit_policy(ReqExitPolicy::ExitOnEOSE),
+                    )
                    .await?;
            }

@@ -386,68 +377,265 @@ impl Room {
        })
    }

-    /// Create a new message event (unsigned)
-    pub fn create_message(&self, content: &str, replies: &[EventId], cx: &App) -> UnsignedEvent {
+    // Construct a rumor event for direct message
+    pub fn rumor<S, I>(&self, content: S, replies: I, cx: &App) -> Option<UnsignedEvent>
+    where
+        S: Into<String>,
+        I: IntoIterator<Item = EventId>,
+    {
+        let kind = Kind::PrivateDirectMessage;
+        let content: String = content.into();
+        let replies: Vec<EventId> = replies.into_iter().collect();
+
+        let persons = PersonRegistry::global(cx);
        let nostr = NostrRegistry::global(cx);

-        // Get current user
-        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        // Get current user's public key
+        let sender = nostr.read(cx).signer().public_key()?;

-        // Get room's subject
-        let subject = self.subject.clone();
+        // Get all members
+        let members: Vec<Person> = self
+            .members
+            .iter()
+            .filter(|public_key| public_key != &&sender)
+            .map(|member| persons.read(cx).get(member, cx))
+            .collect();

+        // Construct event's tags
        let mut tags = vec![];

-        // Add receivers
-        //
-        // NOTE: current user will be removed from the list of receivers
-        for member in self.members.iter() {
-            // Get relay hint if available
-            let relay_url = nostr.read(cx).relay_hint(member, cx);
-
-            // Construct a public key tag with relay hint
-            let tag = TagStandard::PublicKey {
-                public_key: member.to_owned(),
-                relay_url,
-                alias: None,
-                uppercase: false,
-            };
-
-            tags.push(Tag::from_standardized_without_cell(tag));
-        }
-
-        // Add subject tag if it's present
-        if let Some(value) = subject {
+        // Add subject tag if present
+        if let Some(value) = self.subject.as_ref() {
            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
                value.to_string(),
            )));
        }

-        // Add reply/quote tag
-        if replies.len() == 1 {
-            tags.push(Tag::event(replies[0]))
-        } else {
-            for id in replies {
-                let tag = TagStandard::Quote {
-                    event_id: id.to_owned(),
-                    relay_url: None,
-                    public_key: None,
-                };
-                tags.push(Tag::from_standardized_without_cell(tag))
-            }
+        // Add all reply tags
+        for id in replies.into_iter() {
+            tags.push(Tag::event(id))
        }

-        // Construct a direct message event
-        //
-        // WARNING: never sign and send this event to relays
-        let mut event = EventBuilder::new(Kind::PrivateDirectMessage, content)
-            .tags(tags)
-            .build(public_key);
+        // Add all receiver tags
+        for member in members.into_iter() {
+            // Skip current user
+            if member.public_key() == sender {
+                continue;
+            }

-        // Ensure the event id has been generated
+            tags.push(Tag::from_standardized_without_cell(
+                TagStandard::PublicKey {
+                    public_key: member.public_key(),
+                    relay_url: member.messaging_relay_hint(),
+                    alias: None,
+                    uppercase: false,
+                },
+            ));
+        }
+
+        // Construct a direct message rumor event
+        // WARNING: never sign and send this event to relays
+        let mut event = EventBuilder::new(kind, content).tags(tags).build(sender);
+
+        // Ensure that the ID is set
        event.ensure_id();

-        event
+        Some(event)
+    }
+
+    /// Send rumor event to all members's messaging relays
+    pub fn send(&self, rumor: UnsignedEvent, cx: &App) -> Option<Task<Vec<SendReport>>> {
+        let persons = PersonRegistry::global(cx);
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let signer = nostr.read(cx).signer();
+
+        // Get room's config
+        let config = self.config.clone();
+
+        // Get current user's public key
+        let sender = nostr.read(cx).signer().public_key()?;
+
+        // Get all members (excluding sender)
+        let members: Vec<Person> = self
+            .members
+            .iter()
+            .filter(|public_key| public_key != &&sender)
+            .map(|member| persons.read(cx).get(member, cx))
+            .collect();
+
+        Some(cx.background_spawn(async move {
+            let signer_kind = config.signer_kind();
+            let user_signer = signer.get().await;
+            let encryption_signer = signer.get_encryption_signer().await;
+
+            let mut reports = Vec::new();
+
+            for member in members {
+                let relays = member.messaging_relays();
+                let announcement = member.announcement();
+
+                // Skip if member has no messaging relays
+                if relays.is_empty() {
+                    reports.push(SendReport::new(member.public_key()).error("No messaging relays"));
+                    continue;
+                }
+
+                // Ensure relay connections
+                for url in relays.iter() {
+                    client
+                        .add_relay(url)
+                        .and_connect()
+                        .capabilities(RelayCapabilities::GOSSIP)
+                        .await
+                        .ok();
+                }
+
+                // When forced to use encryption signer, skip if receiver has no announcement
+                if signer_kind.encryption() && announcement.is_none() {
+                    reports
+                        .push(SendReport::new(member.public_key()).error("Encryption not found"));
+                    continue;
+                }
+
+                // Determine receiver and signer based on signer kind
+                let (receiver, signer_to_use) = match signer_kind {
+                    SignerKind::Auto => {
+                        if let Some(announcement) = announcement {
+                            if let Some(enc_signer) = encryption_signer.as_ref() {
+                                (announcement.public_key(), enc_signer.clone())
+                            } else {
+                                (member.public_key(), user_signer.clone())
+                            }
+                        } else {
+                            (member.public_key(), user_signer.clone())
+                        }
+                    }
+                    SignerKind::Encryption => {
+                        let Some(encryption_signer) = encryption_signer.as_ref() else {
+                            reports.push(
+                                SendReport::new(member.public_key()).error("Encryption not found"),
+                            );
+                            continue;
+                        };
+                        let Some(announcement) = announcement else {
+                            reports.push(
+                                SendReport::new(member.public_key())
+                                    .error("Announcement not found"),
+                            );
+                            continue;
+                        };
+                        (announcement.public_key(), encryption_signer.clone())
+                    }
+                    SignerKind::User => (member.public_key(), user_signer.clone()),
+                };
+
+                // Create and send gift-wrapped event
+                match EventBuilder::gift_wrap(&signer_to_use, &receiver, rumor.clone(), []).await {
+                    Ok(event) => {
+                        match client
+                            .send_event(&event)
+                            .to(relays)
+                            .ack_policy(AckPolicy::none())
+                            .await
+                        {
+                            Ok(output) => {
+                                reports.push(
+                                    SendReport::new(member.public_key())
+                                        .gift_wrap_id(event.id)
+                                        .output(output),
+                                );
+                            }
+                            Err(e) => {
+                                reports.push(
+                                    SendReport::new(member.public_key()).error(e.to_string()),
+                                );
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(member.public_key()).error(e.to_string()));
+                    }
+                }
+            }
+
+            reports
+        }))
+    }
+
+    /*
+    * /// Create a new unsigned message event
+    pub fn create_message(
+        &self,
+        content: &str,
+        replies: Vec<EventId>,
+        cx: &App,
+    ) -> Task<Result<UnsignedEvent, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let subject = self.subject.clone();
+        let content = content.to_string();
+
+        let mut member_and_relay_hints = HashMap::new();
+
+        // Populate the hashmap with member and relay hint tasks
+        for member in self.members.iter() {
+            let hint = nostr.read(cx).relay_hint(member, cx);
+            member_and_relay_hints.insert(member.to_owned(), hint);
+        }
+
+        cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
+
+            // List of event tags for each receiver
+            let mut tags = vec![];
+
+            for (member, task) in member_and_relay_hints.into_iter() {
+                // Skip current user
+                if member == public_key {
+                    continue;
+                }
+
+                // Get relay hint if available
+                let relay_url = task.await;
+
+                // Construct a public key tag with relay hint
+                let tag = TagStandard::PublicKey {
+                    public_key: member,
+                    relay_url,
+                    alias: None,
+                    uppercase: false,
+                };
+
+                tags.push(Tag::from_standardized_without_cell(tag));
+            }
+
+            // Add subject tag if present
+            if let Some(value) = subject {
+                tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                    value.to_string(),
+                )));
+            }
+
+            // Add all reply tags
+            for id in replies {
+                tags.push(Tag::event(id))
+            }
+
+            // Construct a direct message event
+            //
+            // WARNING: never sign and send this event to relays
+            let mut event = EventBuilder::new(Kind::PrivateDirectMessage, content)
+                .tags(tags)
+                .build(public_key);
+
+            // Ensure the event ID has been generated
+            event.ensure_id();
+
+            Ok(event)
+        })
    }

    /// Create a task to send a message to all room members
@@ -459,46 +647,27 @@ impl Room {
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();

-        // Get current user's public key and relays
-        let current_user = nostr.read(cx).identity().read(cx).public_key();
-        let current_user_relays = nostr.read(cx).messaging_relays(&current_user, cx);
-
+        let mut members = self.members();
        let rumor = rumor.to_owned();

-        // Get all members and their messaging relays
-        let task = self.members_with_relays(cx);
-
        cx.background_spawn(async move {
-            let signer = client.signer().await?;
-            let current_user_relays = current_user_relays.await;
-            let mut members = task.await;
+            let signer = client.signer().context("Signer not found")?;
+            let current_user = signer.get_public_key().await?;

            // Remove the current user's public key from the list of receivers
            // the current user will be handled separately
-            members.retain(|(this, _)| this != &current_user);
+            members.retain(|this| this != &current_user);

            // Collect the send reports
            let mut reports: Vec<SendReport> = vec![];

-            for (receiver, relays) in members.into_iter() {
-                // Check if there are any relays to send the message to
-                if relays.is_empty() {
-                    reports.push(SendReport::new(receiver).relays_not_found());
-                    continue;
-                }
-
-                // Ensure relay connection
-                for url in relays.iter() {
-                    client.add_relay(url).await?;
-                    client.connect_relay(url).await?;
-                }
-
+            for receiver in members.into_iter() {
                // Construct the gift wrap event
                let event =
-                    EventBuilder::gift_wrap(&signer, &receiver, rumor.clone(), vec![]).await?;
+                    EventBuilder::gift_wrap(signer, &receiver, rumor.clone(), vec![]).await?;

                // Send the gift wrap event to the messaging relays
-                match client.send_event_to(relays, &event).await {
+                match client.send_event(&event).to_nip17().await {
                    Ok(output) => {
                        let id = output.id().to_owned();
                        let auth = output.failed.iter().any(|(_, s)| s.starts_with("auth-"));
@@ -536,24 +705,12 @@ impl Room {

            // Construct the gift-wrapped event
            let event =
-                EventBuilder::gift_wrap(&signer, &current_user, rumor.clone(), vec![]).await?;
+                EventBuilder::gift_wrap(signer, &current_user, rumor.clone(), vec![]).await?;

            // Only send a backup message to current user if sent successfully to others
            if reports.iter().all(|r| r.is_sent_success()) {
-                // Check if there are any relays to send the event to
-                if current_user_relays.is_empty() {
-                    reports.push(SendReport::new(current_user).relays_not_found());
-                    return Ok(reports);
-                }
-
-                // Ensure relay connection
-                for url in current_user_relays.iter() {
-                    client.add_relay(url).await?;
-                    client.connect_relay(url).await?;
-                }
-
                // Send the event to the messaging relays
-                match client.send_event_to(current_user_relays, &event).await {
+                match client.send_event(&event).to_nip17().await {
                    Ok(output) => {
                        reports.push(SendReport::new(current_user).status(output));
                    }
@@ -591,7 +748,7 @@ impl Room {

                    if let Some(event) = client.database().event_by_id(id).await? {
                        for url in urls.into_iter() {
-                            let relay = client.pool().relay(url).await?;
+                            let relay = client.relay(url).await?.context("Relay not found")?;
                            let id = relay.send_event(&event).await?;

                            let resent: Output<EventId> = Output {
@@ -622,4 +779,5 @@ impl Room {
            Ok(resend_reports)
        })
    }
+    */
 }
--- a/crates/chat_ui/Cargo.toml
+++ b/crates/chat_ui/Cargo.toml
@@ -21,11 +21,10 @@ anyhow.workspace = true
 itertools.workspace = true
 smallvec.workspace = true
 smol.workspace = true
+flume.workspace = true
 log.workspace = true
 serde.workspace = true
 serde_json.workspace = true

-indexset = "0.12.3"
-emojis = "0.6.4"
 once_cell = "1.19.0"
 regex = "1"
--- a/crates/chat_ui/src/actions.rs
+++ b/crates/chat_ui/src/actions.rs
@@ -2,6 +2,13 @@ use gpui::Action;
 use nostr_sdk::prelude::*;
 use serde::Deserialize;

+#[derive(Action, Clone, PartialEq, Eq, Deserialize)]
+#[action(namespace = chat, no_json)]
+pub enum Command {
+    Insert(&'static str),
+    ChangeSubject(&'static str),
+}
+
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
 #[action(namespace = chat, no_json)]
 pub struct SeenOn(pub EventId);
--- a/crates/chat_ui/src/emoji.rs
+++ b/crates/chat_ui/src/emoji.rs
@@ -1,139 +0,0 @@
-use std::sync::OnceLock;
-
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, px, App, AppContext, Corner, Element, InteractiveElement, IntoElement, ParentElement,
-    RenderOnce, SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window,
-};
-use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
-use ui::input::InputState;
-use ui::popover::{Popover, PopoverContent};
-use ui::{Icon, Sizable, Size};
-
-static EMOJIS: OnceLock<Vec<SharedString>> = OnceLock::new();
-
-fn get_emojis() -> &'static Vec<SharedString> {
-    EMOJIS.get_or_init(|| {
-        let mut emojis: Vec<SharedString> = vec![];
-
-        emojis.extend(
-            emojis::Group::SmileysAndEmotion
-                .emojis()
-                .map(|e| SharedString::from(e.as_str()))
-                .collect::<Vec<SharedString>>(),
-        );
-
-        emojis
-    })
-}
-
-#[derive(IntoElement)]
-pub struct EmojiPicker {
-    target: Option<WeakEntity<InputState>>,
-    icon: Option<Icon>,
-    anchor: Option<Corner>,
-    size: Size,
-}
-
-impl EmojiPicker {
-    pub fn new() -> Self {
-        Self {
-            size: Size::default(),
-            target: None,
-            anchor: None,
-            icon: None,
-        }
-    }
-
-    pub fn target(mut self, target: WeakEntity<InputState>) -> Self {
-        self.target = Some(target);
-        self
-    }
-
-    pub fn icon(mut self, icon: impl Into<Icon>) -> Self {
-        self.icon = Some(icon.into());
-        self
-    }
-
-    #[allow(dead_code)]
-    pub fn anchor(mut self, corner: Corner) -> Self {
-        self.anchor = Some(corner);
-        self
-    }
-}
-
-impl Sizable for EmojiPicker {
-    fn with_size(mut self, size: impl Into<Size>) -> Self {
-        self.size = size.into();
-        self
-    }
-}
-
-impl RenderOnce for EmojiPicker {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        Popover::new("emojis")
-            .map(|this| {
-                if let Some(corner) = self.anchor {
-                    this.anchor(corner)
-                } else {
-                    this.anchor(gpui::Corner::BottomLeft)
-                }
-            })
-            .trigger(
-                Button::new("emojis-trigger")
-                    .when_some(self.icon, |this, icon| this.icon(icon))
-                    .ghost()
-                    .with_size(self.size),
-            )
-            .content(move |window, cx| {
-                let input = self.target.clone();
-
-                cx.new(|cx| {
-                    PopoverContent::new(window, cx, move |_window, cx| {
-                        div()
-                            .flex()
-                            .flex_wrap()
-                            .items_center()
-                            .gap_2()
-                            .children(get_emojis().iter().map(|e| {
-                                div()
-                                    .id(e.clone())
-                                    .flex_auto()
-                                    .size_10()
-                                    .flex()
-                                    .items_center()
-                                    .justify_center()
-                                    .rounded(cx.theme().radius)
-                                    .child(e.clone())
-                                    .hover(|this| this.bg(cx.theme().ghost_element_hover))
-                                    .on_click({
-                                        let item = e.clone();
-                                        let input = input.clone();
-
-                                        move |_, window, cx| {
-                                            if let Some(input) = input.as_ref() {
-                                                _ = input.update(cx, |this, cx| {
-                                                    let value = this.value();
-                                                    let new_text = if value.is_empty() {
-                                                        format!("{item}")
-                                                    } else if value.ends_with(" ") {
-                                                        format!("{value}{item}")
-                                                    } else {
-                                                        format!("{value} {item}")
-                                                    };
-                                                    this.set_value(new_text, window, cx);
-                                                });
-                                            }
-                                        }
-                                    })
-                            }))
-                            .into_any()
-                    })
-                    .scrollable()
-                    .max_h(px(300.))
-                    .max_w(px(300.))
-                })
-            })
-    }
-}
--- a/crates/chat_ui/src/lib.rs
+++ b/crates/chat_ui/src/lib.rs
@@ -1,44 +1,44 @@
-use std::collections::HashSet;
-use std::time::Duration;
+use std::collections::{BTreeMap, BTreeSet, HashSet};
+use std::sync::Arc;

 pub use actions::*;
-use chat::{Message, RenderedMessage, Room, RoomEvent, RoomKind, SendReport};
+use anyhow::{Context as AnyhowContext, Error};
+use chat::{Message, RenderedMessage, Room, RoomEvent, SendReport};
 use common::{nip96_upload, RenderedTimestamp};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, img, list, px, red, relative, rems, svg, white, AnyElement, App, AppContext,
+    deferred, div, img, list, px, red, relative, rems, svg, white, AnyElement, App, AppContext,
    ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
    IntoElement, ListAlignment, ListOffset, ListState, MouseButton, ObjectFit, ParentElement,
-    PathPromptOptions, Render, RetainAllImageCache, SharedString, StatefulInteractiveElement,
-    Styled, StyledImage, Subscription, Task, WeakEntity, Window,
+    PathPromptOptions, Render, SharedString, StatefulInteractiveElement, Styled, StyledImage,
+    Subscription, Task, WeakEntity, Window,
 };
 use gpui_tokio::Tokio;
-use indexset::{BTreeMap, BTreeSet};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use person::{Person, PersonRegistry};
 use settings::AppSettings;
 use smallvec::{smallvec, SmallVec};
 use smol::fs;
+use smol::lock::RwLock;
 use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
-use ui::context_menu::ContextMenuExt;
 use ui::dock_area::panel::{Panel, PanelEvent};
+use ui::indicator::Indicator;
 use ui::input::{InputEvent, InputState, TextInput};
+use ui::menu::{ContextMenuExt, DropdownMenu};
 use ui::notification::Notification;
-use ui::popup_menu::PopupMenuExt;
+use ui::scroll::Scrollbar;
 use ui::{
-    h_flex, v_flex, ContextModal, Disableable, Icon, IconName, InteractiveElementExt, Sizable,
-    StyledExt,
+    h_flex, v_flex, Disableable, Icon, IconName, InteractiveElementExt, Sizable, StyledExt,
+    WindowExtension,
 };

-use crate::emoji::EmojiPicker;
 use crate::text::RenderedText;

 mod actions;
-mod emoji;
 mod text;

 pub fn init(room: WeakEntity<Room>, window: &mut Window, cx: &mut App) -> Entity<ChatPanel> {
@@ -49,7 +49,6 @@ pub fn init(room: WeakEntity<Room>, window: &mut Window, cx: &mut App) -> Entity
 pub struct ChatPanel {
    id: SharedString,
    focus_handle: FocusHandle,
-    image_cache: Entity<RetainAllImageCache>,

    /// Chat Room
    room: WeakEntity<Room>,
@@ -63,12 +62,15 @@ pub struct ChatPanel {
    /// Mapping message ids to their rendered texts
    rendered_texts_by_id: BTreeMap<EventId, RenderedText>,

-    /// Mapping message ids to their reports
-    reports_by_id: BTreeMap<EventId, Vec<SendReport>>,
+    /// Mapping message (rumor event) ids to their reports
+    reports_by_id: Entity<BTreeMap<EventId, Vec<SendReport>>>,

    /// Input state
    input: Entity<InputState>,

+    /// Sent message ids
+    sent_ids: Arc<RwLock<Vec<EventId>>>,
+
    /// Replies to
    replies_to: Entity<HashSet<EventId>>,

@@ -79,97 +81,63 @@ pub struct ChatPanel {
    uploading: bool,

    /// Async operations
-    tasks: SmallVec<[Task<()>; 2]>,
+    tasks: Vec<Task<Result<(), Error>>>,

    /// Event subscriptions
-    _subscriptions: SmallVec<[Subscription; 2]>,
+    subscriptions: SmallVec<[Subscription; 2]>,
 }

 impl ChatPanel {
    pub fn new(room: WeakEntity<Room>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        // Define attachments and replies_to entities
+        let attachments = cx.new(|_| vec![]);
+        let replies_to = cx.new(|_| HashSet::new());
+        let reports_by_id = cx.new(|_| BTreeMap::new());
+
+        // Define list of messages
+        let messages = BTreeSet::from([Message::system()]);
+        let list_state = ListState::new(messages.len(), ListAlignment::Bottom, px(1024.));
+
+        // Get room id and name
+        let (id, name) = room
+            .read_with(cx, |this, _cx| {
+                let id = this.id.to_string().into();
+                let name = this.display_name(cx);
+
+                (id, name)
+            })
+            .unwrap_or(("Unknown".into(), "Message...".into()));
+
+        // Define input state
        let input = cx.new(|cx| {
            InputState::new(window, cx)
-                .placeholder("Message...")
+                .placeholder(format!("Message {}", name))
                .auto_grow(1, 20)
                .prevent_new_line_on_enter()
                .clean_on_escape()
        });

-        let attachments = cx.new(|_| vec![]);
-        let replies_to = cx.new(|_| HashSet::new());
-
-        let messages = BTreeSet::from([Message::system()]);
-        let list_state = ListState::new(messages.len(), ListAlignment::Bottom, px(1024.));
-
-        let id: SharedString = room
-            .read_with(cx, |this, _cx| this.id.to_string().into())
-            .unwrap_or("Unknown".into());
-
-        let mut subscriptions = smallvec![];
-        let mut tasks = smallvec![];
-
-        if let Ok(connect) = room.read_with(cx, |this, cx| this.connect(cx)) {
-            tasks.push(
-                // Get messaging relays and encryption keys announcement for each member
-                cx.background_spawn(async move {
-                    if let Err(e) = connect.await {
-                        log::error!("Failed to initialize room: {}", e);
-                    }
-                }),
-            );
-        };
-
-        if let Ok(get_messages) = room.read_with(cx, |this, cx| this.get_messages(cx)) {
-            tasks.push(
-                // Load all messages belonging to this room
-                cx.spawn_in(window, async move |this, cx| {
-                    let result = get_messages.await;
-
-                    this.update_in(cx, |this, window, cx| {
-                        match result {
-                            Ok(events) => {
-                                this.insert_messages(&events, cx);
-                            }
-                            Err(e) => {
-                                window.push_notification(e.to_string(), cx);
-                            }
-                        };
-                    })
-                    .ok();
-                }),
-            );
-        }
-
-        if let Some(room) = room.upgrade() {
-            subscriptions.push(
-                // Subscribe to room events
-                cx.subscribe_in(&room, window, move |this, _room, event, window, cx| {
-                    match event {
-                        RoomEvent::Incoming(message) => {
-                            this.insert_message(message, false, cx);
-                        }
-                        RoomEvent::Reload => {
-                            this.load_messages(window, cx);
-                        }
-                    };
-                }),
-            );
-        }
-
-        subscriptions.push(
-            // Subscribe to input events
-            cx.subscribe_in(
-                &input,
-                window,
-                move |this: &mut Self, _input, event, window, cx| {
+        // Define subscriptions
+        let subscriptions =
+            smallvec![
+                cx.subscribe_in(&input, window, move |this, _input, event, window, cx| {
                    if let InputEvent::PressEnter { .. } = event {
-                        this.send_message(window, cx);
+                        this.send_text_message(window, cx);
                    };
-                },
-            ),
-        );
+                })
+            ];
+
+        // Define all functions that will run after the current cycle
+        cx.defer_in(window, |this, window, cx| {
+            this.connect(window, cx);
+            this.handle_notifications(cx);
+
+            this.subscribe_room_events(window, cx);
+            this.get_messages(window, cx);
+        });

        Self {
+            focus_handle: cx.focus_handle(),
            id,
            messages,
            room,
@@ -178,38 +146,113 @@ impl ChatPanel {
            replies_to,
            attachments,
            rendered_texts_by_id: BTreeMap::new(),
-            reports_by_id: BTreeMap::new(),
+            reports_by_id,
+            sent_ids: Arc::new(RwLock::new(Vec::new())),
            uploading: false,
-            image_cache: RetainAllImageCache::new(cx),
-            focus_handle: cx.focus_handle(),
-            _subscriptions: subscriptions,
-            tasks,
+            subscriptions,
+            tasks: vec![],
        }
    }

+    /// Handle nostr notifications
+    fn handle_notifications(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let sent_ids = self.sent_ids.clone();
+
+        let (tx, rx) = flume::bounded::<(EventId, RelayUrl)>(256);
+
+        self.tasks.push(cx.background_spawn(async move {
+            let mut notifications = client.notifications();
+
+            while let Some(notification) = notifications.next().await {
+                if let ClientNotification::Message {
+                    message: RelayMessage::Ok { event_id, .. },
+                    relay_url,
+                } = notification
+                {
+                    let sent_ids = sent_ids.read().await;
+
+                    if sent_ids.contains(&event_id) {
+                        tx.send_async((event_id, relay_url)).await.ok();
+                    }
+                }
+            }
+
+            Ok(())
+        }));
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            while let Ok((event_id, relay_url)) = rx.recv_async().await {
+                this.update(cx, |this, cx| {
+                    this.reports_by_id.update(cx, |this, cx| {
+                        for reports in this.values_mut() {
+                            for report in reports.iter_mut() {
+                                if let Some(output) = report.output.as_mut() {
+                                    if output.id() == &event_id {
+                                        output.success.insert(relay_url.clone());
+                                        cx.notify();
+                                    }
+                                }
+                            }
+                        }
+                    });
+                })?;
+            }
+
+            Ok(())
+        }));
+    }
+
+    fn subscribe_room_events(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(room) = self.room.upgrade() else {
+            return;
+        };
+
+        self.subscriptions.push(
+            // Subscribe to room events
+            cx.subscribe_in(&room, window, move |this, _room, event, window, cx| {
+                match event {
+                    RoomEvent::Incoming(message) => {
+                        this.insert_message(message, false, cx);
+                    }
+                    RoomEvent::Reload => {
+                        this.get_messages(window, cx);
+                    }
+                };
+            }),
+        );
+    }
+
+    /// Get all necessary data for each member
+    fn connect(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(connect) = self.room.read_with(cx, |this, cx| this.early_connect(cx)) else {
+            return;
+        };
+
+        self.tasks.push(cx.background_spawn(connect));
+    }
+
    /// Load all messages belonging to this room
-    fn load_messages(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Ok(get_messages) = self.room.read_with(cx, |this, cx| this.get_messages(cx)) {
-            self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-                let result = get_messages.await;
+    fn get_messages(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(get_messages) = self.room.read_with(cx, |this, cx| this.get_messages(cx)) else {
+            return;
+        };

-                this.update_in(cx, |this, window, cx| {
-                    match result {
-                        Ok(events) => {
-                            this.insert_messages(&events, cx);
-                        }
-                        Err(e) => {
-                            window.push_notification(Notification::error(e.to_string()), cx);
-                        }
-                    };
-                })
-                .ok();
-            }));
-        }
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            let events = get_messages.await?;
+
+            // Update message list
+            this.update(cx, |this, cx| {
+                this.insert_messages(&events, cx);
+            })?;
+
+            Ok(())
+        }));
    }

-    /// Get user input content and merged all attachments
-    fn input_content(&self, cx: &Context<Self>) -> String {
+    /// Get user input content and merged all attachments if available
+    fn get_input_value(&self, cx: &Context<Self>) -> String {
        // Get input's value
        let mut content = self.input.read(cx).value().trim().to_string();

@@ -233,10 +276,9 @@ impl ChatPanel {
        content
    }

-    /// Send a message to all members of the chat
-    fn send_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn send_text_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        // Get the message which includes all attachments
-        let content = self.input_content(cx);
+        let content = self.get_input_value(cx);

        // Return if message is empty
        if content.trim().is_empty() {
@@ -244,79 +286,97 @@ impl ChatPanel {
            return;
        }

-        // Get the current room entity
-        let Some(room) = self.room.upgrade().map(|this| this.read(cx)) else {
+        self.send_message(&content, window, cx);
+    }
+
+    /// Send a message to all members of the chat
+    fn send_message(&mut self, value: &str, window: &mut Window, cx: &mut Context<Self>) {
+        if value.trim().is_empty() {
+            window.push_notification("Cannot send an empty message", cx);
+            return;
+        }
+
+        // Get room entity
+        let room = self.room.clone();
+
+        // Get content and replies
+        let replies: Vec<EventId> = self.replies_to.read(cx).iter().copied().collect();
+        let content = value.to_string();
+
+        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+            let room = room.upgrade().context("Room is not available")?;
+
+            this.update_in(cx, |this, window, cx| {
+                match room.read(cx).rumor(content, replies, cx) {
+                    Some(rumor) => {
+                        this.insert_message(&rumor, true, cx);
+                        this.send_and_wait(rumor, window, cx);
+                        this.clear(window, cx);
+                    }
+                    None => {
+                        window.push_notification("Failed to create message", cx);
+                    }
+                }
+            })?;
+
+            Ok(())
+        }));
+    }
+
+    /// Send message in the background and wait for the response
+    fn send_and_wait(&mut self, rumor: UnsignedEvent, window: &mut Window, cx: &mut Context<Self>) {
+        let sent_ids = self.sent_ids.clone();
+        // This can't fail, because we already ensured that the ID is set
+        let id = rumor.id.unwrap();
+
+        let Some(room) = self.room.upgrade() else {
            return;
        };

-        // Get replies_to if it's present
-        let replies: Vec<EventId> = self.replies_to.read(cx).iter().copied().collect();
-
-        // Create a temporary message for optimistic update
-        let rumor = room.create_message(&content, replies.as_ref(), cx);
-        let rumor_id = rumor.id.unwrap();
-
-        // Create a task for sending the message in the background
-        let send_message = room.send_message(&rumor, cx);
-
-        // Optimistically update message list
-        cx.spawn_in(window, async move |this, cx| {
-            // Wait for the delay
-            cx.background_executor()
-                .timer(Duration::from_millis(100))
-                .await;
-
-            // Update the message list and reset the states
-            this.update_in(cx, |this, window, cx| {
-                this.remove_all_replies(cx);
-                this.remove_all_attachments(cx);
-
-                // Reset the input to its default state
-                this.input.update(cx, |this, cx| {
-                    this.set_loading(false, cx);
-                    this.set_disabled(false, cx);
-                    this.set_value("", window, cx);
-                });
-
-                // Update the message list
-                this.insert_message(&rumor, true, cx);
-            })
-            .ok();
-        })
-        .detach();
+        let Some(task) = room.read(cx).send(rumor, cx) else {
+            window.push_notification("Failed to send message", cx);
+            return;
+        };

        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            let result = send_message.await;
+            let outputs = task.await;

-            this.update_in(cx, |this, window, cx| {
-                match result {
-                    Ok(reports) => {
-                        // Update room's status
-                        this.room
-                            .update(cx, |this, cx| {
-                                if this.kind != RoomKind::Ongoing {
-                                    // Update the room kind to ongoing,
-                                    // but keep the room kind if send failed
-                                    if reports.iter().all(|r| !r.is_sent_success()) {
-                                        this.kind = RoomKind::Ongoing;
-                                        cx.notify();
-                                    }
-                                }
-                            })
-                            .ok();
+            // Add sent IDs to the list
+            let mut sent_ids = sent_ids.write().await;
+            sent_ids.extend(outputs.iter().filter_map(|output| output.gift_wrap_id));

-                        // Insert the sent reports
-                        this.reports_by_id.insert(rumor_id, reports);
+            // Update the state
+            this.update(cx, |this, cx| {
+                this.insert_reports(id, outputs, cx);
+            })?;

-                        cx.notify();
-                    }
-                    Err(e) => {
-                        window.push_notification(e.to_string(), cx);
-                    }
-                }
-            })
-            .ok();
-        }));
+            Ok(())
+        }))
+    }
+
+    /// Clear the input field, attachments, and replies
+    ///
+    /// Only run after sending a message
+    fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.input.update(cx, |this, cx| {
+            this.set_value("", window, cx);
+        });
+        self.attachments.update(cx, |this, cx| {
+            this.clear();
+            cx.notify();
+        });
+        self.replies_to.update(cx, |this, cx| {
+            this.clear();
+            cx.notify();
+        })
+    }
+
+    /// Insert reports
+    fn insert_reports(&mut self, id: EventId, reports: Vec<SendReport>, cx: &mut Context<Self>) {
+        self.reports_by_id.update(cx, |this, cx| {
+            this.insert(id, reports);
+            cx.notify();
+        });
    }

    /// Insert a message into the chat panel
@@ -349,23 +409,33 @@ impl ChatPanel {
        }
    }

-    /// Check if a message failed to send by its ID
-    fn is_sent_failed(&self, id: &EventId) -> bool {
+    /// Check if a message is pending
+    fn sent_pending(&self, id: &EventId, cx: &App) -> bool {
        self.reports_by_id
+            .read(cx)
            .get(id)
-            .is_some_and(|reports| reports.iter().all(|r| !r.is_sent_success()))
+            .is_some_and(|reports| reports.iter().any(|r| r.pending()))
    }

    /// Check if a message was sent successfully by its ID
-    fn is_sent_success(&self, id: &EventId) -> Option<bool> {
+    fn sent_success(&self, id: &EventId, cx: &App) -> bool {
        self.reports_by_id
+            .read(cx)
            .get(id)
-            .map(|reports| reports.iter().all(|r| r.is_sent_success()))
+            .is_some_and(|reports| reports.iter().any(|r| r.success()))
    }

-    /// Get the sent reports for a message by its ID
-    fn sent_reports(&self, id: &EventId) -> Option<&Vec<SendReport>> {
-        self.reports_by_id.get(id)
+    /// Check if a message failed to send by its ID
+    fn sent_failed(&self, id: &EventId, cx: &App) -> Option<bool> {
+        self.reports_by_id
+            .read(cx)
+            .get(id)
+            .map(|reports| reports.iter().all(|r| !r.success()))
+    }
+
+    /// Get all sent reports for a message by its ID
+    fn sent_reports(&self, id: &EventId, cx: &App) -> Option<Vec<SendReport>> {
+        self.reports_by_id.read(cx).get(id).cloned()
    }

    /// Get a message by its ID
@@ -414,13 +484,6 @@ impl ChatPanel {
        });
    }

-    fn remove_all_replies(&mut self, cx: &mut Context<Self>) {
-        self.replies_to.update(cx, |this, cx| {
-            this.clear();
-            cx.notify();
-        });
-    }
-
    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();
@@ -435,9 +498,9 @@ impl ChatPanel {
            prompt: None,
        });

-        cx.spawn_in(window, async move |this, cx| {
-            let mut paths = path.await.ok()?.ok()??;
-            let path = paths.pop()?;
+        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+            let mut paths = path.await??.context("Not found")?;
+            let path = paths.pop().context("No path")?;

            let upload = Tokio::spawn(cx, async move {
                let file = fs::read(path).await.ok()?;
@@ -466,9 +529,8 @@ impl ChatPanel {
                .ok();
            }

-            Some(())
-        })
-        .detach();
+            Ok(())
+        }));
    }

    fn set_uploading(&mut self, uploading: bool, cx: &mut Context<Self>) {
@@ -492,28 +554,21 @@ impl ChatPanel {
        });
    }

-    fn remove_all_attachments(&mut self, cx: &mut Context<Self>) {
-        self.attachments.update(cx, |this, cx| {
-            this.clear();
-            cx.notify();
-        });
-    }
-
    fn profile(&self, public_key: &PublicKey, cx: &Context<Self>) -> Person {
        let persons = PersonRegistry::global(cx);
        persons.read(cx).get(public_key, cx)
    }

    fn render_announcement(&self, ix: usize, cx: &Context<Self>) -> AnyElement {
+        const MSG: &str =
+            "This conversation is private. Only members can see each other's messages.";
+
        v_flex()
            .id(ix)
-            .group("")
-            .h_32()
+            .h_40()
            .w_full()
-            .relative()
            .gap_3()
-            .px_3()
-            .py_2()
+            .p_3()
            .items_center()
            .justify_center()
            .text_center()
@@ -523,12 +578,10 @@ impl ChatPanel {
            .child(
                svg()
                    .path("brand/coop.svg")
-                    .size_10()
-                    .text_color(cx.theme().elevated_surface_background),
+                    .size_12()
+                    .text_color(cx.theme().ghost_element_active),
            )
-            .child(SharedString::from(
-                "This conversation is private. Only members can see each other's messages.",
-            ))
+            .child(SharedString::from(MSG))
            .into_any_element()
    }

@@ -566,7 +619,7 @@ impl ChatPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> AnyElement {
-        if let Some(message) = self.messages.get_index(ix) {
+        if let Some(message) = self.messages.iter().nth(ix) {
            match message {
                Message::User(rendered) => {
                    let text = self
@@ -591,7 +644,7 @@ impl ChatPanel {
        &self,
        ix: usize,
        message: &RenderedMessage,
-        text: AnyElement,
+        rendered_text: AnyElement,
        cx: &Context<Self>,
    ) -> AnyElement {
        let id = message.id;
@@ -602,10 +655,13 @@ impl ChatPanel {
        let has_replies = !replies.is_empty();

        // Check if message is sent failed
-        let is_sent_failed = self.is_sent_failed(&id);
+        let sent_pending = self.sent_pending(&id, cx);

        // Check if message is sent successfully
-        let is_sent_success = self.is_sent_success(&id);
+        let sent_success = self.sent_success(&id, cx);
+
+        // Check if message is sent failed
+        let sent_failed = self.sent_failed(&id, cx);

        // Hide avatar setting
        let hide_avatar = AppSettings::get_hide_avatar(cx);
@@ -653,18 +709,21 @@ impl ChatPanel {
                                            .child(author.name()),
                                    )
                                    .child(message.created_at.to_human_time())
-                                    .when_some(is_sent_success, |this, status| {
-                                        this.when(status, |this| {
-                                            this.child(self.render_message_sent(&id, cx))
-                                        })
+                                    .when(sent_pending, |this| {
+                                        this.child(deferred(Indicator::new().small()))
+                                    })
+                                    .when(sent_success, |this| {
+                                        this.child(deferred(self.render_sent_indicator(&id, cx)))
                                    }),
                            )
                            .when(has_replies, |this| {
                                this.children(self.render_message_replies(replies, cx))
                            })
-                            .child(text)
-                            .when(is_sent_failed, |this| {
-                                this.child(self.render_message_reports(&id, cx))
+                            .child(rendered_text)
+                            .when_some(sent_failed, |this, failed| {
+                                this.when(failed, |this| {
+                                    this.child(deferred(self.render_message_reports(&id, cx)))
+                                })
                            }),
                    ),
            )
@@ -729,11 +788,11 @@ impl ChatPanel {
        items
    }

-    fn render_message_sent(&self, id: &EventId, _cx: &Context<Self>) -> impl IntoElement {
+    fn render_sent_indicator(&self, id: &EventId, cx: &Context<Self>) -> impl IntoElement {
        div()
            .id(SharedString::from(id.to_hex()))
            .child(SharedString::from("• Sent"))
-            .when_some(self.sent_reports(id).cloned(), |this, reports| {
+            .when_some(self.sent_reports(id, cx), |this, reports| {
                this.on_click(move |_e, window, cx| {
                    let reports = reports.clone();

@@ -765,7 +824,7 @@ impl ChatPanel {
            .child(SharedString::from(
                "Failed to send message. Click to see details.",
            ))
-            .when_some(self.sent_reports(id).cloned(), |this, reports| {
+            .when_some(self.sent_reports(id, cx), |this, reports| {
                this.on_click(move |_e, window, cx| {
                    let reports = reports.clone();

@@ -808,48 +867,6 @@ impl ChatPanel {
                            .child(name.clone()),
                    ),
            )
-            .when(report.relays_not_found, |this| {
-                this.child(
-                    h_flex()
-                        .flex_wrap()
-                        .justify_center()
-                        .p_2()
-                        .h_20()
-                        .w_full()
-                        .text_sm()
-                        .rounded(cx.theme().radius)
-                        .bg(cx.theme().danger_background)
-                        .text_color(cx.theme().danger_foreground)
-                        .child(
-                            div()
-                                .flex_1()
-                                .w_full()
-                                .text_center()
-                                .child(SharedString::from("Messaging Relays not found")),
-                        ),
-                )
-            })
-            .when(report.device_not_found, |this| {
-                this.child(
-                    h_flex()
-                        .flex_wrap()
-                        .justify_center()
-                        .p_2()
-                        .h_20()
-                        .w_full()
-                        .text_sm()
-                        .rounded(cx.theme().radius)
-                        .bg(cx.theme().danger_background)
-                        .text_color(cx.theme().danger_foreground)
-                        .child(
-                            div()
-                                .flex_1()
-                                .w_full()
-                                .text_center()
-                                .child(SharedString::from("Encryption Key not found")),
-                        ),
-                )
-            })
            .when_some(report.error.clone(), |this, error| {
                this.child(
                    h_flex()
@@ -865,7 +882,7 @@ impl ChatPanel {
                        .child(div().flex_1().w_full().text_center().child(error)),
                )
            })
-            .when_some(report.status.clone(), |this, output| {
+            .when_some(report.output.clone(), |this, output| {
                this.child(
                    v_flex()
                        .gap_2()
@@ -992,9 +1009,9 @@ impl ChatPanel {
                    .icon(IconName::Ellipsis)
                    .small()
                    .ghost()
-                    .popup_menu({
+                    .dropdown_menu({
                        let id = id.to_owned();
-                        move |this, _, _| this.menu("Seen on", Box::new(SeenOn(id)))
+                        move |this, _window, _cx| this.menu("Seen on", Box::new(SeenOn(id)))
                    }),
            )
            .group_hover("", |this| this.visible())
@@ -1115,6 +1132,25 @@ impl ChatPanel {

        items
    }
+
+    fn on_command(&mut self, command: &Command, window: &mut Window, cx: &mut Context<Self>) {
+        match command {
+            Command::Insert(content) => {
+                self.send_message(content, window, cx);
+            }
+            Command::ChangeSubject(subject) => {
+                if self
+                    .room
+                    .update(cx, |this, cx| {
+                        this.set_subject(*subject, cx);
+                    })
+                    .is_err()
+                {
+                    window.push_notification(Notification::error("Failed to change subject"), cx);
+                }
+            }
+        }
+    }
 }

 impl Panel for ChatPanel {
@@ -1149,61 +1185,86 @@ impl Focusable for ChatPanel {
 impl Render for ChatPanel {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
-            .image_cache(self.image_cache.clone())
+            .on_action(cx.listener(Self::on_command))
            .size_full()
            .child(
-                list(
-                    self.list_state.clone(),
-                    cx.processor(|this, ix, window, cx| {
-                        // Get and render message by index
-                        this.render_message(ix, window, cx)
-                    }),
-                )
-                .flex_1(),
+                div()
+                    .flex_1()
+                    .size_full()
+                    .child(
+                        list(
+                            self.list_state.clone(),
+                            cx.processor(move |this, ix, window, cx| {
+                                this.render_message(ix, window, cx)
+                            }),
+                        )
+                        .size_full(),
+                    )
+                    .child(Scrollbar::vertical(&self.list_state)),
            )
            .child(
-                div()
+                v_flex()
                    .flex_shrink_0()
+                    .p_2()
                    .w_full()
-                    .relative()
-                    .px_3()
-                    .py_2()
+                    .gap_1p5()
+                    .children(self.render_attachment_list(window, cx))
+                    .children(self.render_reply_list(window, cx))
                    .child(
-                        v_flex()
-                            .gap_1p5()
-                            .children(self.render_attachment_list(window, cx))
-                            .children(self.render_reply_list(window, cx))
+                        h_flex()
+                            .items_end()
                            .child(
-                                div()
-                                    .w_full()
-                                    .flex()
-                                    .items_end()
-                                    .gap_2p5()
+                                Button::new("upload")
+                                    .icon(IconName::Plus)
+                                    .tooltip("Upload media")
+                                    .loading(self.uploading)
+                                    .disabled(self.uploading)
+                                    .ghost()
+                                    .large()
+                                    .on_click(cx.listener(move |this, _ev, window, cx| {
+                                        this.upload(window, cx);
+                                    })),
+                            )
+                            .child(
+                                TextInput::new(&self.input)
+                                    .appearance(false)
+                                    .flex_1()
+                                    .text_sm(),
+                            )
+                            .child(
+                                h_flex()
+                                    .pl_1()
+                                    .gap_1()
                                    .child(
-                                        h_flex()
-                                            .gap_1()
-                                            .text_color(cx.theme().text_muted)
-                                            .child(
-                                                Button::new("upload")
-                                                    .icon(IconName::Upload)
-                                                    .loading(self.uploading)
-                                                    .disabled(self.uploading)
-                                                    .ghost()
-                                                    .large()
-                                                    .on_click(cx.listener(
-                                                        move |this, _, window, cx| {
-                                                            this.upload(window, cx);
-                                                        },
-                                                    )),
-                                            )
-                                            .child(
-                                                EmojiPicker::new()
-                                                    .target(self.input.downgrade())
-                                                    .icon(IconName::EmojiFill)
-                                                    .large(),
+                                        Button::new("emoji")
+                                            .icon(IconName::Emoji)
+                                            .ghost()
+                                            .large()
+                                            .dropdown_menu_with_anchor(
+                                                gpui::Corner::BottomLeft,
+                                                move |this, _window, _cx| {
+                                                    this.horizontal()
+                                                        .menu("👍", Box::new(Command::Insert("👍")))
+                                                        .menu("👎", Box::new(Command::Insert("👎")))
+                                                        .menu("😄", Box::new(Command::Insert("😄")))
+                                                        .menu("🎉", Box::new(Command::Insert("🎉")))
+                                                        .menu("😕", Box::new(Command::Insert("😕")))
+                                                        .menu("❤️", Box::new(Command::Insert("❤️")))
+                                                        .menu("🚀", Box::new(Command::Insert("🚀")))
+                                                        .menu("👀", Box::new(Command::Insert("👀")))
+                                                },
                                            ),
                                    )
-                                    .child(TextInput::new(&self.input)),
+                                    .child(
+                                        Button::new("send")
+                                            .icon(IconName::PaperPlaneFill)
+                                            .disabled(self.uploading)
+                                            .ghost()
+                                            .large()
+                                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                                this.send_text_message(window, cx);
+                                            })),
+                                    ),
                            ),
                    ),
            )
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -6,6 +6,7 @@ publish.workspace = true

 [dependencies]
 gpui.workspace = true
+nostr.workspace = true
 nostr-sdk.workspace = true

 anyhow.workspace = true
@@ -19,5 +20,3 @@ log.workspace = true

 dirs = "5.0"
 qrcode = "0.14.1"
-whoami = "1.6.1"
-nostr = { git = "https://github.com/rust-nostr/nostr" }
--- a/crates/common/src/constants.rs
+++ b/crates/common/src/constants.rs
@@ -1,31 +0,0 @@
-pub const CLIENT_NAME: &str = "Coop";
-pub const APP_ID: &str = "su.reya.coop";
-
-/// Bootstrap Relays.
-pub const BOOTSTRAP_RELAYS: [&str; 4] = [
-    "wss://relay.damus.io",
-    "wss://relay.primal.net",
-    "wss://relay.nos.social",
-    "wss://user.kindpag.es",
-];
-
-/// Search Relays.
-pub const SEARCH_RELAYS: [&str; 2] = ["wss://search.nos.today", "wss://relay.noswhere.com"];
-
-/// Default relay for Nostr Connect
-pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nsec.app";
-
-/// Default retry count for fetching NIP-17 relays
-pub const RELAY_RETRY: u64 = 2;
-
-/// Default retry count for sending messages
-pub const SEND_RETRY: u64 = 10;
-
-/// Default timeout (in seconds) for Nostr Connect
-pub const NOSTR_CONNECT_TIMEOUT: u64 = 200;
-
-/// Default timeout (in seconds) for Nostr Connect (Bunker)
-pub const BUNKER_TIMEOUT: u64 = 30;
-
-/// Default width of the sidebar.
-pub const DEFAULT_SIDEBAR_WIDTH: f32 = 240.;
--- a/crates/common/src/lib.rs
+++ b/crates/common/src/lib.rs
@@ -1,68 +1,11 @@
-use std::sync::OnceLock;
-
-pub use constants::*;
 pub use debounced_delay::*;
 pub use display::*;
 pub use event::*;
-pub use nip05::*;
 pub use nip96::*;
-use nostr_sdk::prelude::*;
 pub use paths::*;

-mod constants;
 mod debounced_delay;
 mod display;
 mod event;
-mod nip05;
 mod nip96;
 mod paths;
-
-static APP_NAME: OnceLock<String> = OnceLock::new();
-static NIP65_RELAYS: OnceLock<Vec<(RelayUrl, Option<RelayMetadata>)>> = OnceLock::new();
-static NIP17_RELAYS: OnceLock<Vec<RelayUrl>> = OnceLock::new();
-
-/// Get the app name
-pub fn app_name() -> &'static String {
-    APP_NAME.get_or_init(|| {
-        let devicename = whoami::devicename();
-        let platform = whoami::platform();
-
-        format!("{CLIENT_NAME} on {platform} ({devicename})")
-    })
-}
-
-/// Default NIP-65 Relays. Used for new account
-pub fn default_nip65_relays() -> &'static Vec<(RelayUrl, Option<RelayMetadata>)> {
-    NIP65_RELAYS.get_or_init(|| {
-        vec![
-            (
-                RelayUrl::parse("wss://nostr.mom").unwrap(),
-                Some(RelayMetadata::Read),
-            ),
-            (
-                RelayUrl::parse("wss://nostr.bitcoiner.social").unwrap(),
-                Some(RelayMetadata::Read),
-            ),
-            (
-                RelayUrl::parse("wss://nos.lol").unwrap(),
-                Some(RelayMetadata::Write),
-            ),
-            (
-                RelayUrl::parse("wss://relay.snort.social").unwrap(),
-                Some(RelayMetadata::Write),
-            ),
-            (RelayUrl::parse("wss://relay.primal.net").unwrap(), None),
-            (RelayUrl::parse("wss://relay.damus.io").unwrap(), None),
-        ]
-    })
-}
-
-/// Default NIP-17 Relays. Used for new account
-pub fn default_nip17_relays() -> &'static Vec<RelayUrl> {
-    NIP17_RELAYS.get_or_init(|| {
-        vec![
-            RelayUrl::parse("wss://nip17.com").unwrap(),
-            RelayUrl::parse("wss://auth.nostr1.com").unwrap(),
-        ]
-    })
-}
--- a/crates/common/src/nip96.rs
+++ b/crates/common/src/nip96.rs
@@ -72,11 +72,10 @@ pub async fn nip96_upload(
    let json: Value = res.json().await?;

    let config = nip96::ServerConfig::from_json(json.to_string())?;
-    let signer = if client.has_signer().await {
-        client.signer().await?
-    } else {
-        Keys::generate().into_nostr_signer()
-    };
+    let signer = client
+        .signer()
+        .cloned()
+        .unwrap_or(Keys::generate().into_nostr_signer());

    let url = upload(&signer, &config, file, None).await?;

--- a/crates/coop/Cargo.toml
+++ b/crates/coop/Cargo.toml
@@ -43,6 +43,7 @@ person = { path = "../person" }
 relay_auth = { path = "../relay_auth" }

 gpui.workspace = true
+gpui_platform.workspace = true
 gpui_tokio.workspace = true
 reqwest_client.workspace = true

--- a/crates/coop/src/chatspace.rs
+++ b/crates/coop/src/chatspace.rs
@@ -1,677 +0,0 @@
-use std::sync::Arc;
-
-use auto_update::{AutoUpdateStatus, AutoUpdater};
-use chat::{ChatEvent, ChatRegistry};
-use chat_ui::{CopyPublicKey, OpenPublicKey};
-use common::DEFAULT_SIDEBAR_WIDTH;
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    deferred, div, px, relative, rems, App, AppContext, Axis, ClipboardItem, Context, Entity,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString,
-    StatefulInteractiveElement, Styled, Subscription, Window,
-};
-use key_store::{Credential, KeyItem, KeyStore};
-use nostr_connect::prelude::*;
-use person::PersonRegistry;
-use relay_auth::RelayAuth;
-use smallvec::{smallvec, SmallVec};
-use state::NostrRegistry;
-use theme::{ActiveTheme, Theme, ThemeMode, ThemeRegistry};
-use title_bar::TitleBar;
-use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
-use ui::dock_area::dock::DockPlacement;
-use ui::dock_area::panel::PanelView;
-use ui::dock_area::{ClosePanel, DockArea, DockItem};
-use ui::modal::ModalButtonProps;
-use ui::popup_menu::PopupMenuExt;
-use ui::{h_flex, v_flex, ContextModal, IconName, Root, Sizable, StyledExt};
-
-use crate::actions::{
-    reset, DarkMode, KeyringPopup, Logout, Settings, Themes, ViewProfile, ViewRelays,
-};
-use crate::user::viewer;
-use crate::views::compose::compose_button;
-use crate::views::{onboarding, preferences, setup_relay, startup, welcome};
-use crate::{login, new_identity, sidebar, user};
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<ChatSpace> {
-    cx.new(|cx| ChatSpace::new(window, cx))
-}
-
-pub fn login(window: &mut Window, cx: &mut App) {
-    let panel = login::init(window, cx);
-    ChatSpace::set_center_panel(panel, window, cx);
-}
-
-pub fn new_account(window: &mut Window, cx: &mut App) {
-    let panel = new_identity::init(window, cx);
-    ChatSpace::set_center_panel(panel, window, cx);
-}
-
-#[derive(Debug)]
-pub struct ChatSpace {
-    /// App's Title Bar
-    title_bar: Entity<TitleBar>,
-
-    /// App's Dock Area
-    dock: Entity<DockArea>,
-
-    /// Determines if the chat space is ready to use
-    ready: bool,
-
-    /// Event subscriptions
-    _subscriptions: SmallVec<[Subscription; 4]>,
-}
-
-impl ChatSpace {
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let nostr = NostrRegistry::global(cx);
-        let chat = ChatRegistry::global(cx);
-        let keystore = KeyStore::global(cx);
-
-        let title_bar = cx.new(|_| TitleBar::new());
-        let dock = cx.new(|cx| DockArea::new(window, cx));
-
-        let identity = nostr.read(cx).identity();
-
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(
-            // Automatically sync theme with system appearance
-            window.observe_window_appearance(|window, cx| {
-                Theme::sync_system_appearance(Some(window), cx);
-            }),
-        );
-
-        subscriptions.push(
-            // Observe account entity changes
-            cx.observe_in(&identity, window, move |this, state, window, cx| {
-                if !this.ready && state.read(cx).has_public_key() {
-                    this.set_default_layout(window, cx);
-
-                    // Load all chat room in the database if available
-                    let chat = ChatRegistry::global(cx);
-                    chat.update(cx, |this, cx| {
-                        this.get_rooms(cx);
-                    });
-                };
-            }),
-        );
-
-        subscriptions.push(
-            // Observe keystore entity changes
-            cx.observe_in(&keystore, window, move |_this, state, window, cx| {
-                if state.read(cx).initialized {
-                    let backend = state.read(cx).backend();
-
-                    cx.spawn_in(window, async move |this, cx| {
-                        let result = backend
-                            .read_credentials(&KeyItem::User.to_string(), cx)
-                            .await;
-
-                        this.update_in(cx, |this, window, cx| {
-                            match result {
-                                Ok(Some((user, secret))) => {
-                                    let credential = Credential::new(user, secret);
-                                    this.set_startup_layout(credential, window, cx);
-                                }
-                                _ => {
-                                    this.set_onboarding_layout(window, cx);
-                                }
-                            };
-                        })
-                        .ok();
-                    })
-                    .detach();
-                }
-            }),
-        );
-
-        subscriptions.push(
-            // Observe all events emitted by the chat registry
-            cx.subscribe_in(&chat, window, move |this, chat, ev, window, cx| {
-                match ev {
-                    ChatEvent::OpenRoom(id) => {
-                        if let Some(room) = chat.read(cx).room(id, cx) {
-                            this.dock.update(cx, |this, cx| {
-                                this.add_panel(
-                                    Arc::new(chat_ui::init(room, window, cx)),
-                                    DockPlacement::Center,
-                                    window,
-                                    cx,
-                                );
-                            });
-                        }
-                    }
-                    ChatEvent::CloseRoom(..) => {
-                        this.dock.update(cx, |this, cx| {
-                            // Force focus to the tab panel
-                            this.focus_tab_panel(window, cx);
-                            // Dispatch the close panel action
-                            cx.defer_in(window, |_, window, cx| {
-                                window.dispatch_action(Box::new(ClosePanel), cx);
-                                window.close_all_modals(cx);
-                            });
-                        });
-                    }
-                    _ => {}
-                };
-            }),
-        );
-
-        subscriptions.push(
-            // Observe the chat registry
-            cx.observe(&chat, move |this, chat, cx| {
-                let ids = this.get_all_panels(cx);
-
-                chat.update(cx, |this, cx| {
-                    this.refresh_rooms(ids, cx);
-                });
-            }),
-        );
-
-        Self {
-            dock,
-            title_bar,
-            ready: false,
-            _subscriptions: subscriptions,
-        }
-    }
-
-    fn set_onboarding_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let panel = Arc::new(onboarding::init(window, cx));
-        let center = DockItem::panel(panel);
-
-        self.dock.update(cx, |this, cx| {
-            this.reset(window, cx);
-            this.set_center(center, window, cx);
-        });
-    }
-
-    fn set_startup_layout(&mut self, cre: Credential, window: &mut Window, cx: &mut Context<Self>) {
-        let panel = Arc::new(startup::init(cre, window, cx));
-        let center = DockItem::panel(panel);
-
-        self.dock.update(cx, |this, cx| {
-            this.reset(window, cx);
-            this.set_center(center, window, cx);
-        });
-    }
-
-    fn set_default_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let weak_dock = self.dock.downgrade();
-
-        let sidebar = Arc::new(sidebar::init(window, cx));
-        let center = Arc::new(welcome::init(window, cx));
-
-        let left = DockItem::panel(sidebar);
-        let center = DockItem::split_with_sizes(
-            Axis::Vertical,
-            vec![DockItem::tabs(vec![center], None, &weak_dock, window, cx)],
-            vec![None],
-            &weak_dock,
-            window,
-            cx,
-        );
-
-        self.ready = true;
-        self.dock.update(cx, |this, cx| {
-            this.set_left_dock(left, Some(px(DEFAULT_SIDEBAR_WIDTH)), true, window, cx);
-            this.set_center(center, window, cx);
-        });
-    }
-
-    fn on_settings(&mut self, _ev: &Settings, window: &mut Window, cx: &mut Context<Self>) {
-        let view = preferences::init(window, cx);
-
-        window.open_modal(cx, move |modal, _window, _cx| {
-            modal
-                .title(SharedString::from("Preferences"))
-                .width(px(520.))
-                .child(view.clone())
-        });
-    }
-
-    fn on_profile(&mut self, _ev: &ViewProfile, window: &mut Window, cx: &mut Context<Self>) {
-        let view = user::init(window, cx);
-        let entity = view.downgrade();
-
-        window.open_modal(cx, move |modal, _window, _cx| {
-            let entity = entity.clone();
-
-            modal
-                .title("Profile")
-                .confirm()
-                .child(view.clone())
-                .button_props(ModalButtonProps::default().ok_text("Update"))
-                .on_ok(move |_, window, cx| {
-                    entity
-                        .update(cx, |this, cx| {
-                            let persons = PersonRegistry::global(cx);
-                            let set_metadata = this.set_metadata(cx);
-
-                            cx.spawn_in(window, async move |this, cx| {
-                                let result = set_metadata.await;
-
-                                this.update_in(cx, |_, window, cx| {
-                                    match result {
-                                        Ok(person) => {
-                                            persons.update(cx, |this, cx| {
-                                                this.insert(person, cx);
-                                                // Close the edit profile modal
-                                                window.close_all_modals(cx);
-                                            });
-                                        }
-                                        Err(e) => {
-                                            window.push_notification(e.to_string(), cx);
-                                        }
-                                    };
-                                })
-                                .ok();
-                            })
-                            .detach();
-                        })
-                        .ok();
-
-                    // false to keep the modal open
-                    false
-                })
-        });
-    }
-
-    fn on_relays(&mut self, _ev: &ViewRelays, window: &mut Window, cx: &mut Context<Self>) {
-        let view = setup_relay::init(window, cx);
-        let entity = view.downgrade();
-
-        window.open_modal(cx, move |this, _window, _cx| {
-            let entity = entity.clone();
-
-            this.confirm()
-                .title(SharedString::from("Set Up Messaging Relays"))
-                .child(view.clone())
-                .button_props(ModalButtonProps::default().ok_text("Update"))
-                .on_ok(move |_, window, cx| {
-                    entity
-                        .update(cx, |this, cx| {
-                            this.set_relays(window, cx);
-                        })
-                        .ok();
-
-                    // false to keep the modal open
-                    false
-                })
-        });
-    }
-
-    fn on_dark_mode(&mut self, _ev: &DarkMode, window: &mut Window, cx: &mut Context<Self>) {
-        if cx.theme().mode.is_dark() {
-            Theme::change(ThemeMode::Light, Some(window), cx);
-        } else {
-            Theme::change(ThemeMode::Dark, Some(window), cx);
-        }
-    }
-
-    fn on_themes(&mut self, _ev: &Themes, window: &mut Window, cx: &mut Context<Self>) {
-        window.open_modal(cx, move |this, _window, cx| {
-            let registry = ThemeRegistry::global(cx);
-            let themes = registry.read(cx).themes();
-
-            this.title("Select theme")
-                .show_close(true)
-                .overlay_closable(true)
-                .child(v_flex().gap_2().pb_4().children({
-                    let mut items = Vec::with_capacity(themes.len());
-
-                    for (name, theme) in themes.iter() {
-                        items.push(
-                            h_flex()
-                                .h_10()
-                                .justify_between()
-                                .child(
-                                    v_flex()
-                                        .child(
-                                            div()
-                                                .text_sm()
-                                                .text_color(cx.theme().text)
-                                                .line_height(relative(1.3))
-                                                .child(theme.name.clone()),
-                                        )
-                                        .child(
-                                            div()
-                                                .text_xs()
-                                                .text_color(cx.theme().text_muted)
-                                                .child(theme.author.clone()),
-                                        ),
-                                )
-                                .child(
-                                    Button::new(format!("change-{name}"))
-                                        .label("Set")
-                                        .small()
-                                        .ghost()
-                                        .on_click({
-                                            let theme = theme.clone();
-                                            move |_ev, window, cx| {
-                                                Theme::apply_theme(theme.clone(), Some(window), cx);
-                                            }
-                                        }),
-                                ),
-                        );
-                    }
-
-                    items
-                }))
-        })
-    }
-
-    fn on_sign_out(&mut self, _e: &Logout, _window: &mut Window, cx: &mut Context<Self>) {
-        reset(cx);
-    }
-
-    fn on_open_pubkey(&mut self, ev: &OpenPublicKey, window: &mut Window, cx: &mut Context<Self>) {
-        let public_key = ev.0;
-        let view = viewer::init(public_key, window, cx);
-
-        window.open_modal(cx, move |this, _window, _cx| {
-            this.alert()
-                .show_close(true)
-                .overlay_closable(true)
-                .child(view.clone())
-                .button_props(ModalButtonProps::default().ok_text("View on njump.me"))
-                .on_ok(move |_, _window, cx| {
-                    let bech32 = public_key.to_bech32().unwrap();
-                    let url = format!("https://njump.me/{bech32}");
-
-                    // Open the URL in the default browser
-                    cx.open_url(&url);
-
-                    // false to keep the modal open
-                    false
-                })
-        });
-    }
-
-    fn on_copy_pubkey(&mut self, ev: &CopyPublicKey, window: &mut Window, cx: &mut Context<Self>) {
-        let Ok(bech32) = ev.0.to_bech32();
-        cx.write_to_clipboard(ClipboardItem::new_string(bech32));
-        window.push_notification("Copied", cx);
-    }
-
-    fn on_keyring(&mut self, _ev: &KeyringPopup, window: &mut Window, cx: &mut Context<Self>) {
-        window.open_modal(cx, move |this, _window, _cx| {
-            this.show_close(true)
-                .title(SharedString::from("Keyring is disabled"))
-                .child(
-                    v_flex()
-                        .gap_2()
-                        .pb_4()
-                        .text_sm()
-                        .child(SharedString::from("Coop cannot access the Keyring Service on your system. By design, Coop uses Keyring to store your credentials."))
-                        .child(SharedString::from("Without access to Keyring, Coop will store your credentials as plain text."))
-                        .child(SharedString::from("If you want to store your credentials in the Keyring, please enable Keyring and allow Coop to access it.")),
-                )
-        });
-    }
-
-    fn get_all_panels(&self, cx: &App) -> Option<Vec<u64>> {
-        let ids: Vec<u64> = self
-            .dock
-            .read(cx)
-            .items
-            .panel_ids(cx)
-            .into_iter()
-            .filter_map(|panel| panel.parse::<u64>().ok())
-            .collect();
-
-        Some(ids)
-    }
-
-    fn set_center_panel<P>(panel: P, window: &mut Window, cx: &mut App)
-    where
-        P: PanelView,
-    {
-        if let Some(Some(root)) = window.root::<Root>() {
-            if let Ok(chatspace) = root.read(cx).view().clone().downcast::<ChatSpace>() {
-                let panel = Arc::new(panel);
-                let center = DockItem::panel(panel);
-
-                chatspace.update(cx, |this, cx| {
-                    this.dock.update(cx, |this, cx| {
-                        this.set_center(center, window, cx);
-                    });
-                });
-            }
-        }
-    }
-
-    fn titlebar_left(&mut self, _window: &mut Window, cx: &Context<Self>) -> impl IntoElement {
-        let nostr = NostrRegistry::global(cx);
-        let chat = ChatRegistry::global(cx);
-        let status = chat.read(cx).loading();
-
-        if !nostr.read(cx).identity().read(cx).has_public_key() {
-            return div();
-        }
-
-        h_flex()
-            .gap_2()
-            .h_6()
-            .w_full()
-            .child(compose_button())
-            .when(status, |this| {
-                this.child(deferred(
-                    h_flex()
-                        .px_2()
-                        .h_6()
-                        .gap_1()
-                        .text_xs()
-                        .rounded_full()
-                        .bg(cx.theme().surface_background)
-                        .child(SharedString::from(
-                            "Getting messages. This may take a while...",
-                        )),
-                ))
-            })
-    }
-
-    fn titlebar_right(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let auto_update = AutoUpdater::global(cx);
-
-        let relay_auth = RelayAuth::global(cx);
-        let pending_requests = relay_auth.read(cx).pending_requests(cx);
-
-        let nostr = NostrRegistry::global(cx);
-        let identity = nostr.read(cx).identity();
-
-        h_flex()
-            .gap_2()
-            .map(|this| match auto_update.read(cx).status.as_ref() {
-                AutoUpdateStatus::Checking => this.child(
-                    div()
-                        .text_xs()
-                        .text_color(cx.theme().text_muted)
-                        .child(SharedString::from("Checking for Coop updates...")),
-                ),
-                AutoUpdateStatus::Installing => this.child(
-                    div()
-                        .text_xs()
-                        .text_color(cx.theme().text_muted)
-                        .child(SharedString::from("Installing updates...")),
-                ),
-                AutoUpdateStatus::Errored { msg } => this.child(
-                    div()
-                        .text_xs()
-                        .text_color(cx.theme().text_muted)
-                        .child(SharedString::from(msg.as_ref())),
-                ),
-                AutoUpdateStatus::Updated => this.child(
-                    div()
-                        .id("restart")
-                        .text_xs()
-                        .text_color(cx.theme().text_muted)
-                        .child(SharedString::from("Updated. Click to restart"))
-                        .on_click(|_ev, _window, cx| {
-                            cx.restart();
-                        }),
-                ),
-                _ => this.child(div()),
-            })
-            .when(pending_requests > 0, |this| {
-                this.child(
-                    h_flex()
-                        .id("requests")
-                        .h_6()
-                        .px_2()
-                        .items_center()
-                        .justify_center()
-                        .text_xs()
-                        .rounded_full()
-                        .bg(cx.theme().warning_background)
-                        .text_color(cx.theme().warning_foreground)
-                        .hover(|this| this.bg(cx.theme().warning_hover))
-                        .active(|this| this.bg(cx.theme().warning_active))
-                        .child(SharedString::from(format!(
-                            "You have {} pending authentication requests",
-                            pending_requests
-                        )))
-                        .on_click(move |_ev, window, cx| {
-                            relay_auth.update(cx, |this, cx| {
-                                this.re_ask(window, cx);
-                            });
-                        }),
-                )
-            })
-            .when_some(identity.read(cx).public_key, |this, public_key| {
-                let persons = PersonRegistry::global(cx);
-                let profile = persons.read(cx).get(&public_key, cx);
-
-                let keystore = KeyStore::global(cx);
-                let is_using_file_keystore = keystore.read(cx).is_using_file_keystore();
-
-                let keyring_label = if is_using_file_keystore {
-                    SharedString::from("Disabled")
-                } else {
-                    SharedString::from("Enabled")
-                };
-
-                this.child(
-                    Button::new("user")
-                        .small()
-                        .reverse()
-                        .transparent()
-                        .icon(IconName::CaretDown)
-                        .child(Avatar::new(profile.avatar()).size(rems(1.45)))
-                        .popup_menu(move |this, _window, _cx| {
-                            this.label(profile.name())
-                                .menu_with_icon(
-                                    "Profile",
-                                    IconName::EmojiFill,
-                                    Box::new(ViewProfile),
-                                )
-                                .menu_with_icon(
-                                    "Messaging Relays",
-                                    IconName::Server,
-                                    Box::new(ViewRelays),
-                                )
-                                .separator()
-                                .label(SharedString::from("Keyring Service"))
-                                .menu_with_icon_and_disabled(
-                                    keyring_label.clone(),
-                                    IconName::Encryption,
-                                    Box::new(KeyringPopup),
-                                    !is_using_file_keystore,
-                                )
-                                .separator()
-                                .menu_with_icon("Dark Mode", IconName::Sun, Box::new(DarkMode))
-                                .menu_with_icon("Themes", IconName::Moon, Box::new(Themes))
-                                .menu_with_icon("Settings", IconName::Settings, Box::new(Settings))
-                                .menu_with_icon("Sign Out", IconName::Logout, Box::new(Logout))
-                        }),
-                )
-            })
-    }
-
-    fn titlebar_center(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let entity = cx.entity().downgrade();
-        let panel = self.dock.read(cx).items.view();
-        let title = panel.title(cx);
-        let id = panel.panel_id(cx);
-
-        if id == "Onboarding" {
-            return div();
-        };
-
-        h_flex()
-            .flex_1()
-            .w_full()
-            .justify_center()
-            .text_center()
-            .font_semibold()
-            .text_sm()
-            .child(
-                div().flex_1().child(
-                    Button::new("back")
-                        .icon(IconName::ArrowLeft)
-                        .small()
-                        .ghost_alt()
-                        .rounded()
-                        .on_click(move |_ev, window, cx| {
-                            entity
-                                .update(cx, |this, cx| {
-                                    this.set_onboarding_layout(window, cx);
-                                })
-                                .expect("Entity has been released");
-                        }),
-                ),
-            )
-            .child(div().flex_1().child(title))
-            .child(div().flex_1())
-    }
-}
-
-impl Render for ChatSpace {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let modal_layer = Root::render_modal_layer(window, cx);
-        let notification_layer = Root::render_notification_layer(window, cx);
-
-        let left = self.titlebar_left(window, cx).into_any_element();
-        let right = self.titlebar_right(window, cx).into_any_element();
-        let center = self.titlebar_center(cx).into_any_element();
-        let single_panel = self.dock.read(cx).items.panel_ids(cx).is_empty();
-
-        // Update title bar children
-        self.title_bar.update(cx, |this, _cx| {
-            if single_panel {
-                this.set_children(vec![center]);
-            } else {
-                this.set_children(vec![left, right]);
-            }
-        });
-
-        div()
-            .id(SharedString::from("chatspace"))
-            .on_action(cx.listener(Self::on_settings))
-            .on_action(cx.listener(Self::on_profile))
-            .on_action(cx.listener(Self::on_relays))
-            .on_action(cx.listener(Self::on_dark_mode))
-            .on_action(cx.listener(Self::on_themes))
-            .on_action(cx.listener(Self::on_sign_out))
-            .on_action(cx.listener(Self::on_open_pubkey))
-            .on_action(cx.listener(Self::on_copy_pubkey))
-            .on_action(cx.listener(Self::on_keyring))
-            .relative()
-            .size_full()
-            .child(
-                v_flex()
-                    .size_full()
-                    // Title Bar
-                    .child(self.title_bar.clone())
-                    // Dock
-                    .child(self.dock.clone()),
-            )
-            // Notifications
-            .children(notification_layer)
-            // Modals
-            .children(modal_layer)
-    }
-}
--- a/crates/coop/src/dialogs/mod.rs
+++ b/crates/coop/src/dialogs/mod.rs
@@ -0,0 +1 @@
+pub mod screening;
--- a/crates/coop/src/dialogs/screening.rs
+++ b/crates/coop/src/dialogs/screening.rs
@@ -1,454 +1,511 @@
-use std::time::Duration;
-
-use common::{nip05_verify, shorten_pubkey, RenderedProfile, RenderedTimestamp, BOOTSTRAP_RELAYS};
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, px, relative, rems, uniform_list, App, AppContext, Context, Div, Entity,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Task, Window,
-};
-use gpui_tokio::Tokio;
-use nostr_sdk::prelude::*;
-use person::{Person, PersonRegistry};
-use smallvec::{smallvec, SmallVec};
-use state::NostrRegistry;
-use theme::ActiveTheme;
-use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
-use ui::indicator::Indicator;
-use ui::{h_flex, v_flex, ContextModal, Icon, IconName, Sizable, StyledExt};
-
-pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<Screening> {
-    cx.new(|cx| Screening::new(public_key, window, cx))
-}
-
-pub struct Screening {
-    profile: Person,
-    verified: bool,
-    followed: bool,
-    last_active: Option<Timestamp>,
-    mutual_contacts: Vec<Profile>,
-    _tasks: SmallVec<[Task<()>; 3]>,
-}
-
-impl Screening {
-    pub fn new(public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
-        let persons = PersonRegistry::global(cx);
-        let profile = persons.read(cx).get(&public_key, cx);
-
-        let mut tasks = smallvec![];
-
-        let contact_check: Task<Result<(bool, Vec<Profile>), Error>> = cx.background_spawn({
-            let client = nostr.read(cx).client();
-            async move {
-                let signer = client.signer().await?;
-                let signer_pubkey = signer.get_public_key().await?;
-
-                // Check if user is in contact list
-                let contacts = client.database().contacts_public_keys(signer_pubkey).await;
-                let followed = contacts.unwrap_or_default().contains(&public_key);
-
-                // Check mutual contacts
-                let contact_list = Filter::new().kind(Kind::ContactList).pubkey(public_key);
-                let mut mutual_contacts = vec![];
-
-                if let Ok(events) = client.database().query(contact_list).await {
-                    for event in events.into_iter().filter(|ev| ev.pubkey != signer_pubkey) {
-                        if let Ok(metadata) = client.database().metadata(event.pubkey).await {
-                            let profile = Profile::new(event.pubkey, metadata.unwrap_or_default());
-                            mutual_contacts.push(profile);
-                        }
-                    }
-                }
-
-                Ok((followed, mutual_contacts))
-            }
-        });
-
-        let activity_check = cx.background_spawn(async move {
-            let filter = Filter::new().author(public_key).limit(1);
-            let mut activity: Option<Timestamp> = None;
-
-            if let Ok(mut stream) = client
-                .stream_events_from(BOOTSTRAP_RELAYS, filter, Duration::from_secs(2))
-                .await
-            {
-                while let Some((_url, event)) = stream.next().await {
-                    if let Ok(event) = event {
-                        activity = Some(event.created_at);
-                    }
-                }
-            }
-
-            activity
-        });
-
-        let addr_check = if let Some(address) = profile.metadata().nip05 {
-            Some(Tokio::spawn(cx, async move {
-                nip05_verify(public_key, &address).await.unwrap_or(false)
-            }))
-        } else {
-            None
-        };
-
-        tasks.push(
-            // Run the contact check in the background
-            cx.spawn_in(window, async move |this, cx| {
-                if let Ok((followed, mutual_contacts)) = contact_check.await {
-                    this.update(cx, |this, cx| {
-                        this.followed = followed;
-                        this.mutual_contacts = mutual_contacts;
-                        cx.notify();
-                    })
-                    .ok();
-                }
-            }),
-        );
-
-        tasks.push(
-            // Run the activity check in the background
-            cx.spawn_in(window, async move |this, cx| {
-                let active = activity_check.await;
-
-                this.update(cx, |this, cx| {
-                    this.last_active = active;
-                    cx.notify();
-                })
-                .ok();
-            }),
-        );
-
-        tasks.push(
-            // Run the NIP-05 verification in the background
-            cx.spawn_in(window, async move |this, cx| {
-                if let Some(task) = addr_check {
-                    if let Ok(verified) = task.await {
-                        this.update(cx, |this, cx| {
-                            this.verified = verified;
-                            cx.notify();
-                        })
-                        .ok();
-                    }
-                }
-            }),
-        );
-
-        Self {
-            profile,
-            verified: false,
-            followed: false,
-            last_active: None,
-            mutual_contacts: vec![],
-            _tasks: tasks,
-        }
-    }
-
-    fn address(&self, _cx: &Context<Self>) -> Option<String> {
-        self.profile.metadata().nip05
-    }
-
-    fn open_njump(&mut self, _window: &mut Window, cx: &mut App) {
-        let Ok(bech32) = self.profile.public_key().to_bech32();
-        cx.open_url(&format!("https://njump.me/{bech32}"));
-    }
-
-    fn report(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-        let public_key = self.profile.public_key();
-
-        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let signer = client.signer().await?;
-            let tag = Tag::public_key_report(public_key, Report::Impersonation);
-            let event = EventBuilder::report(vec![tag], "").sign(&signer).await?;
-
-            // Send the report to the public relays
-            client.send_event_to(BOOTSTRAP_RELAYS, &event).await?;
-
-            Ok(())
-        });
-
-        cx.spawn_in(window, async move |_, cx| {
-            if task.await.is_ok() {
-                cx.update(|window, cx| {
-                    window.close_modal(cx);
-                    window.push_notification("Report submitted successfully", cx);
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn mutual_contacts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let contacts = self.mutual_contacts.clone();
-
-        window.open_modal(cx, move |this, _window, _cx| {
-            let contacts = contacts.clone();
-            let total = contacts.len();
-
-            this.title(SharedString::from("Mutual contacts")).child(
-                v_flex().gap_1().pb_4().child(
-                    uniform_list("contacts", total, move |range, _window, cx| {
-                        let mut items = Vec::with_capacity(total);
-
-                        for ix in range {
-                            if let Some(contact) = contacts.get(ix) {
-                                items.push(
-                                    h_flex()
-                                        .h_11()
-                                        .w_full()
-                                        .px_2()
-                                        .gap_1p5()
-                                        .rounded(cx.theme().radius)
-                                        .text_sm()
-                                        .hover(|this| {
-                                            this.bg(cx.theme().elevated_surface_background)
-                                        })
-                                        .child(Avatar::new(contact.avatar()).size(rems(1.75)))
-                                        .child(contact.display_name()),
-                                );
-                            }
-                        }
-
-                        items
-                    })
-                    .h(px(300.)),
-                ),
-            )
-        });
-    }
-}
-
-impl Render for Screening {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let shorten_pubkey = shorten_pubkey(self.profile.public_key(), 8);
-        let total_mutuals = self.mutual_contacts.len();
-        let last_active = self.last_active.map(|_| true);
-
-        v_flex()
-            .gap_4()
-            .child(
-                v_flex()
-                    .gap_3()
-                    .items_center()
-                    .justify_center()
-                    .text_center()
-                    .child(Avatar::new(self.profile.avatar()).size(rems(4.)))
-                    .child(
-                        div()
-                            .font_semibold()
-                            .line_height(relative(1.25))
-                            .child(self.profile.name()),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .gap_3()
-                    .child(
-                        h_flex()
-                            .p_1()
-                            .flex_1()
-                            .h_7()
-                            .justify_center()
-                            .rounded_full()
-                            .bg(cx.theme().surface_background)
-                            .text_sm()
-                            .truncate()
-                            .text_ellipsis()
-                            .text_center()
-                            .line_height(relative(1.))
-                            .child(shorten_pubkey),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                Button::new("njump")
-                                    .label("View on njump.me")
-                                    .secondary()
-                                    .small()
-                                    .rounded()
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.open_njump(window, cx);
-                                    })),
-                            )
-                            .child(
-                                Button::new("report")
-                                    .tooltip("Report as a scam or impostor")
-                                    .icon(IconName::Report)
-                                    .danger()
-                                    .rounded()
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.report(window, cx);
-                                    })),
-                            ),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .gap_3()
-                    .child(
-                        h_flex()
-                            .items_start()
-                            .gap_2()
-                            .text_sm()
-                            .child(status_badge(Some(self.followed), cx))
-                            .child(
-                                v_flex()
-                                    .text_sm()
-                                    .child(SharedString::from("Contact"))
-                                    .child(
-                                        div()
-                                            .line_clamp(1)
-                                            .text_color(cx.theme().text_muted)
-                                            .child({
-                                                if self.followed {
-                                                    SharedString::from("This person is one of your contacts.")
-                                                } else {
-                                                    SharedString::from("This person is not one of your contacts.")
-                                                }
-                                            }),
-                                    ),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .items_start()
-                            .gap_2()
-                            .text_sm()
-                            .child(status_badge(last_active, cx))
-                            .child(
-                                v_flex()
-                                    .text_sm()
-                                    .child(
-                                        h_flex()
-                                            .gap_0p5()
-                                            .child(SharedString::from("Activity on Public Relays"))
-                                            .child(
-                                                Button::new("active")
-                                                    .icon(IconName::Info)
-                                                    .xsmall()
-                                                    .ghost()
-                                                    .rounded()
-                                                    .tooltip("This may be inaccurate if the user only publishes to their private relays."),
-                                            ),
-                                    )
-                                    .child(
-                                        div()
-                                            .w_full()
-                                            .line_clamp(1)
-                                            .text_color(cx.theme().text_muted)
-                                            .map(|this| {
-                                                if let Some(date) = self.last_active {
-                                                    this.child(SharedString::from(format!(
-                                                        "Last active: {}.",
-                                                        date.to_human_time()
-                                                    )))
-                                                } else {
-                                                    this.child(SharedString::from("This person hasn't had any activity."))
-                                                }
-                                            }),
-                                    ),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .items_start()
-                            .gap_2()
-                            .child(status_badge(Some(self.verified), cx))
-                            .child(
-                                v_flex()
-                                    .text_sm()
-                                    .child({
-                                        if let Some(addr) = self.address(cx) {
-                                            SharedString::from(format!("{} validation", addr))
-                                        } else {
-                                            SharedString::from("Friendly Address (NIP-05) validation")
-                                        }
-                                    })
-                                    .child(
-                                        div()
-                                            .line_clamp(1)
-                                            .text_color(cx.theme().text_muted)
-                                            .child({
-                                                if self.address(cx).is_some() {
-                                                    if self.verified {
-                                                        SharedString::from("The address matches the user's public key.")
-                                                    } else {
-                                                        SharedString::from("The address does not match the user's public key.")
-                                                    }
-                                                } else {
-                                                    SharedString::from("This person has not set up their friendly address")
-                                                }
-                                            }),
-                                    ),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .items_start()
-                            .gap_2()
-                            .child(status_badge(Some(total_mutuals > 0), cx))
-                            .child(
-                                v_flex()
-                                    .text_sm()
-                                    .child(
-                                        h_flex()
-                                            .gap_0p5()
-                                            .child(SharedString::from("Mutual contacts"))
-                                            .child(
-                                                Button::new("mutuals")
-                                                    .icon(IconName::Info)
-                                                    .xsmall()
-                                                    .ghost()
-                                                    .rounded()
-                                                    .on_click(cx.listener(
-                                                        move |this, _, window, cx| {
-                                                            this.mutual_contacts(window, cx);
-                                                        },
-                                                    )),
-                                            ),
-                                    )
-                                    .child(
-                                        div()
-                                            .line_clamp(1)
-                                            .text_color(cx.theme().text_muted)
-                                            .child({
-                                                if total_mutuals > 0 {
-                                                    SharedString::from(format!(
-                                                        "You have {} mutual contacts with this person.",
-                                                        total_mutuals
-                                                    ))
-                                                } else {
-                                                    SharedString::from("You don't have any mutual contacts with this person.")
-                                                }
-                                            }),
-                                    ),
-                            ),
-                    ),
-            )
-    }
-}
-
-fn status_badge(status: Option<bool>, cx: &App) -> Div {
-    h_flex()
-        .size_6()
-        .justify_center()
-        .flex_shrink_0()
-        .map(|this| {
-            if let Some(status) = status {
-                this.child(Icon::new(IconName::CheckCircleFill).small().text_color({
-                    if status {
-                        cx.theme().icon_accent
-                    } else {
-                        cx.theme().icon_muted
-                    }
-                }))
-            } else {
-                this.child(Indicator::new().small())
-            }
-        })
-}
+use std::collections::HashMap;
+use std::time::Duration;
+
+use anyhow::{Context as AnyhowContext, Error};
+use common::{shorten_pubkey, RenderedTimestamp};
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, px, relative, rems, uniform_list, App, AppContext, Context, Div, Entity,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Task, Window,
+};
+use nostr_sdk::prelude::*;
+use person::{Person, PersonRegistry};
+use smallvec::{smallvec, SmallVec};
+use state::{NostrAddress, NostrRegistry, BOOTSTRAP_RELAYS, TIMEOUT};
+use theme::ActiveTheme;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::indicator::Indicator;
+use ui::{h_flex, v_flex, Icon, IconName, Sizable, StyledExt, WindowExtension};
+
+pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<Screening> {
+    cx.new(|cx| Screening::new(public_key, window, cx))
+}
+
+/// Screening
+pub struct Screening {
+    /// Public Key of the person being screened.
+    public_key: PublicKey,
+
+    /// Whether the person's address is verified.
+    verified: bool,
+
+    /// Whether the person is followed by current user.
+    followed: bool,
+
+    /// Last time the person was active.
+    last_active: Option<Timestamp>,
+
+    /// All mutual contacts of the person being screened.
+    mutual_contacts: Vec<PublicKey>,
+
+    /// Async tasks
+    tasks: SmallVec<[Task<()>; 3]>,
+}
+
+impl Screening {
+    pub fn new(public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        cx.defer_in(window, move |this, _window, cx| {
+            this.check_contact(cx);
+            this.check_wot(cx);
+            this.check_last_activity(cx);
+            this.verify_identifier(cx);
+        });
+
+        Self {
+            public_key,
+            verified: false,
+            followed: false,
+            last_active: None,
+            mutual_contacts: vec![],
+            tasks: smallvec![],
+        }
+    }
+
+    fn check_contact(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let public_key = self.public_key;
+
+        let task: Task<Result<bool, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let signer_pubkey = signer.get_public_key().await?;
+
+            // Check if user is in contact list
+            let contacts = client.database().contacts_public_keys(signer_pubkey).await;
+            let followed = contacts.unwrap_or_default().contains(&public_key);
+
+            Ok(followed)
+        });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            let result = task.await.unwrap_or(false);
+
+            this.update(cx, |this, cx| {
+                this.followed = result;
+                cx.notify();
+            })
+            .ok();
+        }));
+    }
+
+    fn check_wot(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let public_key = self.public_key;
+
+        let task: Task<Result<Vec<PublicKey>, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let signer_pubkey = signer.get_public_key().await?;
+
+            // Check mutual contacts
+            let filter = Filter::new().kind(Kind::ContactList).pubkey(public_key);
+            let mut mutual_contacts = vec![];
+
+            if let Ok(events) = client.database().query(filter).await {
+                for event in events.into_iter().filter(|ev| ev.pubkey != signer_pubkey) {
+                    mutual_contacts.push(event.pubkey);
+                }
+            }
+
+            Ok(mutual_contacts)
+        });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(contacts) => {
+                    this.update(cx, |this, cx| {
+                        this.mutual_contacts = contacts;
+                        cx.notify();
+                    })
+                    .ok();
+                }
+                Err(e) => {
+                    log::error!("Failed to fetch mutual contacts: {}", e);
+                }
+            };
+        }));
+    }
+
+    fn check_last_activity(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let public_key = self.public_key;
+
+        let task: Task<Option<Timestamp>> = cx.background_spawn(async move {
+            let filter = Filter::new().author(public_key).limit(1);
+            let mut activity: Option<Timestamp> = None;
+
+            // Construct target for subscription
+            let target = BOOTSTRAP_RELAYS
+                .into_iter()
+                .map(|relay| (relay, vec![filter.clone()]))
+                .collect::<HashMap<_, _>>();
+
+            if let Ok(mut stream) = client
+                .stream_events(target)
+                .timeout(Duration::from_secs(TIMEOUT))
+                .await
+            {
+                while let Some((_url, event)) = stream.next().await {
+                    if let Ok(event) = event {
+                        activity = Some(event.created_at);
+                    }
+                }
+            }
+
+            activity
+        });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            let result = task.await;
+
+            this.update(cx, |this, cx| {
+                this.last_active = result;
+                cx.notify();
+            })
+            .ok();
+        }));
+    }
+
+    fn verify_identifier(&mut self, cx: &mut Context<Self>) {
+        let http_client = cx.http_client();
+        let public_key = self.public_key;
+
+        // Skip if the user doesn't have a NIP-05 identifier
+        let Some(address) = self.address(cx) else {
+            return;
+        };
+
+        let task: Task<Result<bool, Error>> =
+            cx.background_spawn(async move { address.verify(&http_client, &public_key).await });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            let result = task.await.unwrap_or(false);
+
+            this.update(cx, |this, cx| {
+                this.verified = result;
+                cx.notify();
+            })
+            .ok();
+        }));
+    }
+
+    fn profile(&self, cx: &Context<Self>) -> Person {
+        let persons = PersonRegistry::global(cx);
+        persons.read(cx).get(&self.public_key, cx)
+    }
+
+    fn address(&self, cx: &Context<Self>) -> Option<Nip05Address> {
+        self.profile(cx)
+            .metadata()
+            .nip05
+            .and_then(|addr| Nip05Address::parse(&addr).ok())
+    }
+
+    fn open_njump(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(bech32) = self.profile(cx).public_key().to_bech32();
+        cx.open_url(&format!("https://njump.me/{bech32}"));
+    }
+
+    fn report(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let public_key = self.public_key;
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let tag = Tag::public_key_report(public_key, Report::Impersonation);
+            let builder = EventBuilder::report(vec![tag], "");
+            let event = client.sign_event_builder(builder).await?;
+
+            // Send the report to the public relays
+            client.send_event(&event).to(BOOTSTRAP_RELAYS).await?;
+
+            Ok(())
+        });
+
+        self.tasks.push(cx.spawn_in(window, async move |_, cx| {
+            if task.await.is_ok() {
+                cx.update(|window, cx| {
+                    window.close_modal(cx);
+                    window.push_notification("Report submitted successfully", cx);
+                })
+                .ok();
+            }
+        }));
+    }
+
+    fn mutual_contacts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let contacts = self.mutual_contacts.clone();
+
+        window.open_modal(cx, move |this, _window, _cx| {
+            let contacts = contacts.clone();
+            let total = contacts.len();
+
+            this.title(SharedString::from("Mutual contacts")).child(
+                v_flex().gap_1().pb_4().child(
+                    uniform_list("contacts", total, move |range, _window, cx| {
+                        let persons = PersonRegistry::global(cx);
+                        let mut items = Vec::with_capacity(total);
+
+                        for ix in range {
+                            let Some(contact) = contacts.get(ix) else {
+                                continue;
+                            };
+                            let profile = persons.read(cx).get(contact, cx);
+
+                            items.push(
+                                h_flex()
+                                    .h_11()
+                                    .w_full()
+                                    .px_2()
+                                    .gap_1p5()
+                                    .rounded(cx.theme().radius)
+                                    .text_sm()
+                                    .hover(|this| this.bg(cx.theme().elevated_surface_background))
+                                    .child(Avatar::new(profile.avatar()).size(rems(1.75)))
+                                    .child(profile.name()),
+                            );
+                        }
+
+                        items
+                    })
+                    .h(px(300.)),
+                ),
+            )
+        });
+    }
+}
+
+impl Render for Screening {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let profile = self.profile(cx);
+        let shorten_pubkey = shorten_pubkey(self.public_key, 8);
+
+        let total_mutuals = self.mutual_contacts.len();
+        let last_active = self.last_active.map(|_| true);
+
+        v_flex()
+            .gap_4()
+            .child(
+                v_flex()
+                    .gap_3()
+                    .items_center()
+                    .justify_center()
+                    .text_center()
+                    .child(Avatar::new(profile.avatar()).size(rems(4.)))
+                    .child(
+                        div()
+                            .font_semibold()
+                            .line_height(relative(1.25))
+                            .child(profile.name()),
+                    ),
+            )
+            .child(
+                h_flex()
+                    .gap_3()
+                    .child(
+                        h_flex()
+                            .p_1()
+                            .flex_1()
+                            .h_7()
+                            .justify_center()
+                            .rounded_full()
+                            .bg(cx.theme().surface_background)
+                            .text_sm()
+                            .truncate()
+                            .text_ellipsis()
+                            .text_center()
+                            .line_height(relative(1.))
+                            .child(shorten_pubkey),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .child(
+                                Button::new("njump")
+                                    .label("View on njump.me")
+                                    .secondary()
+                                    .small()
+                                    .rounded()
+                                    .on_click(cx.listener(move |this, _e, window, cx| {
+                                        this.open_njump(window, cx);
+                                    })),
+                            )
+                            .child(
+                                Button::new("report")
+                                    .tooltip("Report as a scam or impostor")
+                                    .icon(IconName::Boom)
+                                    .danger()
+                                    .rounded()
+                                    .on_click(cx.listener(move |this, _e, window, cx| {
+                                        this.report(window, cx);
+                                    })),
+                            ),
+                    ),
+            )
+            .child(
+                v_flex()
+                    .gap_3()
+                    .child(
+                        h_flex()
+                            .items_start()
+                            .gap_2()
+                            .text_sm()
+                            .child(status_badge(Some(self.followed), cx))
+                            .child(
+                                v_flex()
+                                    .text_sm()
+                                    .child(SharedString::from("Contact"))
+                                    .child(
+                                        div()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if self.followed {
+                                                    SharedString::from("This person is one of your contacts.")
+                                                } else {
+                                                    SharedString::from("This person is not one of your contacts.")
+                                                }
+                                            }),
+                                    ),
+                            ),
+                    )
+                    .child(
+                        h_flex()
+                            .items_start()
+                            .gap_2()
+                            .text_sm()
+                            .child(status_badge(last_active, cx))
+                            .child(
+                                v_flex()
+                                    .text_sm()
+                                    .child(
+                                        h_flex()
+                                            .gap_0p5()
+                                            .child(SharedString::from("Activity on Public Relays"))
+                                            .child(
+                                                Button::new("active")
+                                                    .icon(IconName::Info)
+                                                    .xsmall()
+                                                    .ghost()
+                                                    .rounded()
+                                                    .tooltip("This may be inaccurate if the user only publishes to their private relays."),
+                                            ),
+                                    )
+                                    .child(
+                                        div()
+                                            .w_full()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .map(|this| {
+                                                if let Some(date) = self.last_active {
+                                                    this.child(SharedString::from(format!(
+                                                        "Last active: {}.",
+                                                        date.to_human_time()
+                                                    )))
+                                                } else {
+                                                    this.child(SharedString::from("This person hasn't had any activity."))
+                                                }
+                                            }),
+                                    ),
+                            ),
+                    )
+                    .child(
+                        h_flex()
+                            .items_start()
+                            .gap_2()
+                            .child(status_badge(Some(self.verified), cx))
+                            .child(
+                                v_flex()
+                                    .text_sm()
+                                    .child({
+                                        if let Some(addr) = self.address(cx) {
+                                            SharedString::from(format!("{} validation", addr))
+                                        } else {
+                                            SharedString::from("Friendly Address (NIP-05) validation")
+                                        }
+                                    })
+                                    .child(
+                                        div()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if self.address(cx).is_some() {
+                                                    if self.verified {
+                                                        SharedString::from("The address matches the user's public key.")
+                                                    } else {
+                                                        SharedString::from("The address does not match the user's public key.")
+                                                    }
+                                                } else {
+                                                    SharedString::from("This person has not set up their friendly address")
+                                                }
+                                            }),
+                                    ),
+                            ),
+                    )
+                    .child(
+                        h_flex()
+                            .items_start()
+                            .gap_2()
+                            .child(status_badge(Some(total_mutuals > 0), cx))
+                            .child(
+                                v_flex()
+                                    .text_sm()
+                                    .child(
+                                        h_flex()
+                                            .gap_0p5()
+                                            .child(SharedString::from("Mutual contacts"))
+                                            .child(
+                                                Button::new("mutuals")
+                                                    .icon(IconName::Info)
+                                                    .xsmall()
+                                                    .ghost()
+                                                    .rounded()
+                                                    .on_click(cx.listener(
+                                                        move |this, _, window, cx| {
+                                                            this.mutual_contacts(window, cx);
+                                                        },
+                                                    )),
+                                            ),
+                                    )
+                                    .child(
+                                        div()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if total_mutuals > 0 {
+                                                    SharedString::from(format!(
+                                                        "You have {} mutual contacts with this person.",
+                                                        total_mutuals
+                                                    ))
+                                                } else {
+                                                    SharedString::from("You don't have any mutual contacts with this person.")
+                                                }
+                                            }),
+                                    ),
+                            ),
+                    ),
+            )
+    }
+}
+
+fn status_badge(status: Option<bool>, cx: &App) -> Div {
+    h_flex()
+        .size_6()
+        .justify_center()
+        .flex_shrink_0()
+        .map(|this| {
+            if let Some(status) = status {
+                this.child(Icon::new(IconName::CheckCircle).small().text_color({
+                    if status {
+                        cx.theme().icon_accent
+                    } else {
+                        cx.theme().icon_muted
+                    }
+                }))
+            } else {
+                this.child(Indicator::new().small())
+            }
+        })
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" viewBox="0 0 256 256"><path d="M213.66,53.66,163.31,104H192a8,8,0,0,1,0,16H144a8,8,0,0,1-8-8V64a8,8,0,0,1,16,0V92.69l50.34-50.35a8,8,0,0,1,11.32,11.32ZM112,136H64a8,8,0,0,0,0,16H92.69L42.34,202.34a8,8,0,0,0,11.32,11.32L104,163.31V192a8,8,0,0,0,16,0V144A8,8,0,0,0,112,136Z"></path></svg>`