chore: update gpui

feat: Emoji Picker (#18 )
* wip: emoji picker * update
2025-04-28 15:08:47 +07:00 · 2025-04-26 08:39:52 +07:00 · 2025-04-23 09:05:50 +07:00 · 2025-04-23 08:16:26 +07:00 · 2025-04-22 15:10:36 +07:00 · 2025-04-21 15:19:01 +07:00
125 changed files with 8139 additions and 4804 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,12 @@
 [workspace]
-members = ["crates/*"]
-default-members = ["crates/app"]
 resolver = "2"
+members = ["crates/*"]
+default-members = ["crates/coop"]
+
+[workspace.package]
+version = "0.1.5"
+edition = "2021"
+publish = false

 [workspace.dependencies]
 coop = { path = "crates/*" }
@@ -11,8 +16,10 @@ gpui = { git = "https://github.com/zed-industries/zed" }
 reqwest_client = { git = "https://github.com/zed-industries/zed" }

 # Nostr
+nostr = { git = "https://github.com/rust-nostr/nostr", features = ["parser"] }
 nostr-relay-builder = { git = "https://github.com/rust-nostr/nostr" }
 nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
+nostr-keyring = { git = "https://github.com/rust-nostr/nostr" }
 nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [
 	"lmdb",
 	"nip96",
@@ -22,8 +29,10 @@ nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [
 	"nip05",
 ] }

+# Others
+emojis = "0.6.4"
 smol = "2"
-oneshot = { git = "https://github.com/faern/oneshot" }
+oneshot = "0.1.10"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 dirs = "5.0"
@@ -32,7 +41,7 @@ futures = "0.3.30"
 chrono = "0.4.38"
 tracing = "0.1.40"
 anyhow = "1.0.44"
-smallvec = "1.13.2"
+smallvec = "1.14.0"
 rust-embed = "8.5.0"
 log = "0.4"

--- a/Packager.toml
+++ b/Packager.toml
@@ -1,18 +1,18 @@
 name = "coop"
 description = "Coop is a cross-platform Nostr client designed for secure communication focus on simplicity and customizability."
 product-name = "Coop"
+version = "0.1.5"
+category = "SocialNetworking"
 identifier = "su.reya.coop"
-version = "0.1.2"
 resources = ["assets/*/*", "Cargo.toml", "./LICENSE", "./README.md"]
-icons = [
-  "assets/brand/32x32.png",
-  "assets/brand/128x128.png",
-  "assets/brand/128x128@2x.png",
-  "assets/brand/icon.icns",
-  "assets/brand/icon.ico",
-]
+binaries = [ { path = "coop", main = true } ]
 before-packaging-command = "cargo build --release"
 out-dir = "./target/release"
-binaries = [
-	{ path = "coop", main = true },
+icons = [
+  "crates/coop/resources/32x32.png",
+  "crates/coop/resources/128x128.png",
+  "crates/coop/resources/128x128@2x.png",
+  "crates/coop/resources/app-icon.icns",
+  "crates/coop/resources/app-icon.png",
+  "crates/coop/resources/app-icon.ico",
 ]
--- a/assets/brand/avatar.png
+++ b/assets/brand/avatar.png
--- a/assets/icons/address-book.svg
+++ b/assets/icons/address-book.svg
@@ -0,0 +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="M19.25 21.25H6c-.69 0-1.25-.56-1.25-1.25M11.5 9.25h1M4.75 20V4.75a2 2 0 0 1 2-2h12.5v16H6c-.69 0-1.25.56-1.25 1.25Zm5-6.25s0-1.5 2.25-1.5 2.25 1.5 2.25 1.5h-4.5ZM13 9.25a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/>
+</svg>
--- a/assets/icons/chevron-down-small.svg
+++ b/assets/icons/chevron-down-small.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"/>
+  <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>
--- a/assets/icons/arrow-right.svg
+++ b/assets/icons/arrow-right.svg
@@ -0,0 +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>
--- a/assets/icons/arrows-in.svg
+++ b/assets/icons/arrows-in.svg
@@ -0,0 +1 @@
+<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/bubble-fill.svg
+++ b/assets/icons/bubble-fill.svg
@@ -0,0 +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="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10a9.967 9.967 0 0 1-4.098-.876.313.313 0 0 0-.195-.026l-3.471.78a1.75 1.75 0 0 1-2.084-2.12l.809-3.33a.313.313 0 0 0-.028-.204A9.965 9.965 0 0 1 2 12Zm4.5 0a1 1 0 1 0 2 0 1 1 0 0 0-2 0Zm4.5 0a1 1 0 1 0 2 0 1 1 0 0 0-2 0Zm5.5 1a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z" clip-rule="evenodd"/>
+</svg>
--- a/assets/icons/caret-down-fill.svg
+++ b/assets/icons/caret-down-fill.svg
@@ -0,0 +1 @@
+<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
@@ -0,0 +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 9-6.586 6.586a2 2 0 0 1-2.828 0L4 9"/>
+</svg>
--- a/assets/icons/caret-right.svg
+++ b/assets/icons/caret-right.svg
@@ -0,0 +1 @@
+<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>
--- a/assets/icons/caret-up.svg
+++ b/assets/icons/caret-up.svg
@@ -0,0 +1 @@
+<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>
--- a/assets/icons/check-circle-fill.svg
+++ b/assets/icons/check-circle-fill.svg
@@ -0,0 +1 @@
+<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
@@ -0,0 +1 @@
+<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>
--- a/assets/icons/check.svg
+++ b/assets/icons/check.svg
@@ -0,0 +1 @@
+<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>
--- a/assets/icons/chevron-down.svg
+++ b/assets/icons/chevron-down.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" d="M9.8 10.25c-1.052 0-1.633 1.221-.97 2.038l2.2 2.707c.5.616 1.44.616 1.94 0l2.2-2.707c.664-.817.082-2.038-.97-2.038H9.8Z"/>
-</svg>
--- a/assets/icons/circle-check.svg
+++ b/assets/icons/circle-check.svg
@@ -1,3 +0,0 @@
-<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 2Zm3.58 7.975a.75.75 0 0 0-1.16-.95l-3.976 4.859L9.03 12.47a.75.75 0 0 0-1.06 1.06l2 2a.75.75 0 0 0 1.11-.055l4.5-5.5Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/close-circle-fill.svg
+++ b/assets/icons/close-circle-fill.svg
--- a/assets/icons/close-circle.svg
+++ b/assets/icons/close-circle.svg
@@ -0,0 +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>
--- a/assets/icons/close.svg
+++ b/assets/icons/close.svg
@@ -1,3 +1 @@
-<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="M4.116 4.116a1.25 1.25 0 0 1 1.768 0L12 10.232l6.116-6.116a1.25 1.25 0 0 1 1.768 1.768L13.768 12l6.116 6.116a1.25 1.25 0 0 1-1.768 1.768L12 13.768l-6.116 6.116a1.25 1.25 0 0 1-1.768-1.768L10.232 12 4.116 5.884a1.25 1.25 0 0 1 0-1.768Z" clip-rule="evenodd"/>
-</svg>
+<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>
--- a/assets/icons/compose-fill.svg
+++ b/assets/icons/compose-fill.svg
@@ -1,3 +0,0 @@
-<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="M19.432 2.738c.505.54.728 1.327.443 2.133-.606 1.713-1.798 3.124-2.797 4.087a15.74 15.74 0 0 1-1.045.921l.137.1c.93.684 1.416 1.975.757 3.118-1.221 2.12-4.356 5.803-11.192 5.803a.753.753 0 0 1-.15-.015A32.702 32.702 0 0 0 5.5 21.25a.75.75 0 0 1-1.5 0c0-4.43.821-8.93 2.909-12.485 2.106-3.587 5.49-6.182 10.492-6.749a2.404 2.404 0 0 1 2.031.722Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/edit-fill.svg
+++ b/assets/icons/edit-fill.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="currentColor" d="M4 4.75A2.75 2.75 0 0 1 6.75 2h10.5A2.75 2.75 0 0 1 20 4.75v7.917a3.9 3.9 0 0 0-4.091.909l-3.75 3.75a2.25 2.25 0 0 0-.659 1.59v2.334c0 .263.045.515.128.75H6.75A2.75 2.75 0 0 1 4 19.25V4.75Z"/>
+  <path fill="currentColor" fill-rule="evenodd" d="M19.303 15.697a.9.9 0 0 0-1.273 0l-3.53 3.53V20.5h1.273l3.53-3.53a.9.9 0 0 0 0-1.273Zm-2.333-1.06a2.4 2.4 0 1 1 3.394 3.393l-3.75 3.75a.75.75 0 0 1-.53.22H13.75a.75.75 0 0 1-.75-.75v-2.333a.75.75 0 0 1 .22-.53l3.75-3.75Z" clip-rule="evenodd"/>
+</svg>
--- a/assets/icons/emoji-fill.svg
+++ b/assets/icons/emoji-fill.svg
@@ -0,0 +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.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/explore.svg
+++ b/assets/icons/explore.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 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10ZM8.405 10.2a.75.75 0 0 1-1.12.263l-2.428-1.82a.707.707 0 0 1-.204-.92 8.496 8.496 0 0 1 8.675-4.12c.409.064.653.475.553.877l-.77 3.084a.75.75 0 0 1-.545.546l-3.226.81a.75.75 0 0 0-.487.39l-.448.889Zm6.805 6.385a.75.75 0 0 1-.671.415h-2.135a.75.75 0 0 1-.624-.334l-1.436-2.153a.75.75 0 0 1 .095-.948l.433-.431a.75.75 0 0 1 .577-.217l1.403.09a.75.75 0 0 1 .37.125l2.233 1.5a.75.75 0 0 1 .252.958l-.498.995Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/folder.svg
+++ b/assets/icons/folder.svg
@@ -0,0 +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="M2.75 5.75v11.5a2 2 0 0 0 2 2h14.5a2 2 0 0 0 2-2v-8.5a2 2 0 0 0-2-2h-6.18a2 2 0 0 1-1.664-.89l-.812-1.22a2 2 0 0 0-1.664-.89H4.75a2 2 0 0 0-2 2Z"/>
+</svg>
--- a/assets/icons/group-fill.svg
+++ b/assets/icons/group-fill.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path fill="#000" d="M3.999 7a4 4 0 1 1 8 0 4 4 0 0 1-8 0Zm9.499.5a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0ZM7.999 12c-1.765 0-3.236.635-4.365 1.72-1.117 1.074-1.868 2.557-2.282 4.225C.932 19.64 2.351 21 3.9 21h8.197c1.55 0 2.968-1.361 2.548-3.055-.413-1.668-1.164-3.151-2.281-4.225-1.13-1.085-2.6-1.72-4.365-1.72Zm6.174.715c1.21 1.337 1.983 3.011 2.414 4.749.231.934.167 1.79-.103 2.536h3.86c1.538 0 2.996-1.365 2.51-3.075C22.06 14.14 20.103 12 16.997 12c-1.08 0-2.023.26-2.825.715Z"/>
-</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/mailbox-fill.svg
+++ b/assets/icons/mailbox-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M104,152a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H96A8,8,0,0,1,104,152ZM168,32h24a8,8,0,0,0,0-16H160a8,8,0,0,0-8,8V56h16Zm72,84v60a16,16,0,0,1-16,16H136v32a8,8,0,0,1-16,0V192H32a16,16,0,0,1-16-16V116A60.07,60.07,0,0,1,76,56h76v88a8,8,0,0,0,16,0V56h12A60.07,60.07,0,0,1,240,116Zm-120,0a44,44,0,0,0-88,0v60h88Z"></path></svg>
--- a/assets/icons/messages.svg
+++ b/assets/icons/messages.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" fill-rule="evenodd" d="M3 13.745V5.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.25M5.75 4.5h12.5c.69 0 1.25.56 1.25 1.25V13h-3.57a.75.75 0 0 0-.737.61 3.251 3.251 0 0 1-6.386 0A.75.75 0 0 0 8.07 13H4.5V5.75c0-.69.56-1.25 1.25-1.25Z" clip-rule="evenodd"/>
-  <path fill="currentColor" d="M3 18.25v-4.505"/>
-</svg>
--- a/assets/icons/plus-circle-fill.svg
+++ b/assets/icons/plus-circle-fill.svg
@@ -0,0 +1 @@
+<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/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 stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 19.25V13m0 0 2.5 2.5M12 13l-2.5 2.5m-2.125 3.75H4.75a2 2 0 0 1-2-2V5.75a2 2 0 0 1 2-2h4.18a2 2 0 0 1 1.664.89l1.11 1.665a1 1 0 0 0 .831.445h6.715a2 2 0 0 1 2 2v8.5a2 2 0 0 1-2 2h-2.625"/>
+  <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>
--- a/assets/icons/users-three-fill.svg
+++ b/assets/icons/users-three-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M64.12,147.8a4,4,0,0,1-4,4.2H16a8,8,0,0,1-7.8-6.17,8.35,8.35,0,0,1,1.62-6.93A67.79,67.79,0,0,1,37,117.51a40,40,0,1,1,66.46-35.8,3.94,3.94,0,0,1-2.27,4.18A64.08,64.08,0,0,0,64,144C64,145.28,64,146.54,64.12,147.8Zm182-8.91A67.76,67.76,0,0,0,219,117.51a40,40,0,1,0-66.46-35.8,3.94,3.94,0,0,0,2.27,4.18A64.08,64.08,0,0,1,192,144c0,1.28,0,2.54-.12,3.8a4,4,0,0,0,4,4.2H240a8,8,0,0,0,7.8-6.17A8.33,8.33,0,0,0,246.17,138.89Zm-89,43.18a48,48,0,1,0-58.37,0A72.13,72.13,0,0,0,65.07,212,8,8,0,0,0,72,224H184a8,8,0,0,0,6.93-12A72.15,72.15,0,0,0,157.19,182.07Z"></path></svg>
--- a/crates/account/Cargo.toml
+++ b/crates/account/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "account"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+ui = { path = "../ui" }
+common = { path = "../common" }
+global = { path = "../global" }
+
+gpui.workspace = true
+nostr-sdk.workspace = true
+anyhow.workspace = true
+smol.workspace = true
+smallvec.workspace = true
+log.workspace = true
--- a/crates/account/src/lib.rs
+++ b/crates/account/src/lib.rs
@@ -0,0 +1,230 @@
+use std::time::Duration;
+
+use anyhow::Error;
+use global::{
+    constants::{ALL_MESSAGES_SUB_ID, NEW_MESSAGE_SUB_ID},
+    get_client,
+};
+use gpui::{App, AppContext, Context, Entity, Global, Task, Window};
+use nostr_sdk::prelude::*;
+use ui::{notification::Notification, ContextModal};
+
+struct GlobalAccount(Entity<Account>);
+
+impl Global for GlobalAccount {}
+
+pub fn init(cx: &mut App) {
+    Account::set_global(cx.new(|_| Account { profile: None }), cx);
+}
+
+#[derive(Debug, Clone)]
+pub struct Account {
+    pub profile: Option<Profile>,
+}
+
+impl Account {
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalAccount>().0.clone()
+    }
+
+    pub fn set_global(account: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalAccount(account));
+    }
+
+    /// Login to the account using the given signer.
+    pub fn login<S>(&mut self, signer: S, window: &mut Window, cx: &mut Context<Self>)
+    where
+        S: NostrSigner + 'static,
+    {
+        let task: Task<Result<Profile, Error>> = cx.background_spawn(async move {
+            let client = get_client();
+            // Use user's signer for main signer
+            _ = client.set_signer(signer).await;
+
+            // Verify nostr signer and get public key
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+            log::info!("Logged in with public key: {:?}", public_key);
+
+            // Fetch user's metadata
+            let metadata = client
+                .fetch_metadata(public_key, Duration::from_secs(2))
+                .await?
+                .unwrap_or_default();
+
+            Ok(Profile::new(public_key, metadata))
+        });
+
+        cx.spawn_in(window, async move |this, cx| match task.await {
+            Ok(profile) => {
+                cx.update(|window, cx| {
+                    this.update(cx, |this, cx| {
+                        this.profile(profile, cx);
+
+                        cx.defer_in(window, |this, _, cx| {
+                            this.subscribe(cx);
+                        });
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+            Err(e) => {
+                cx.update(|window, cx| {
+                    window.push_notification(Notification::error(e.to_string()), cx)
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    /// Create a new account with the given metadata.
+    pub fn new_account(&mut self, metadata: Metadata, window: &mut Window, cx: &mut Context<Self>) {
+        const DEFAULT_NIP_65_RELAYS: [&str; 4] = [
+            "wss://relay.damus.io",
+            "wss://relay.primal.net",
+            "wss://relay.nostr.net",
+            "wss://nos.lol",
+        ];
+
+        const DEFAULT_MESSAGING_RELAYS: [&str; 2] =
+            ["wss://auth.nostr1.com", "wss://relay.0xchat.com"];
+
+        let keys = Keys::generate();
+        let public_key = keys.public_key();
+
+        let task: Task<Result<Profile, Error>> = cx.background_spawn(async move {
+            let client = get_client();
+
+            // Update signer
+            client.set_signer(keys).await;
+
+            // Set metadata
+            client.set_metadata(&metadata).await?;
+
+            // Create relay list
+            let tags: Vec<Tag> = DEFAULT_NIP_65_RELAYS
+                .into_iter()
+                .filter_map(|url| {
+                    if let Ok(url) = RelayUrl::parse(url) {
+                        Some(Tag::relay_metadata(url, None))
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+
+            let builder = EventBuilder::new(Kind::RelayList, "").tags(tags);
+
+            if let Err(e) = client.send_event_builder(builder).await {
+                log::error!("Failed to send relay list event: {}", e);
+            };
+
+            // Create messaging relay list
+            let tags: Vec<Tag> = DEFAULT_MESSAGING_RELAYS
+                .into_iter()
+                .filter_map(|url| {
+                    if let Ok(url) = RelayUrl::parse(url) {
+                        Some(Tag::relay(url))
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+
+            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
+
+            if let Err(e) = client.send_event_builder(builder).await {
+                log::error!("Failed to send messaging relay list event: {}", e);
+            };
+
+            Ok(Profile::new(public_key, metadata))
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(profile) = task.await {
+                cx.update(|window, cx| {
+                    this.update(cx, |this, cx| {
+                        this.profile(profile, cx);
+
+                        cx.defer_in(window, |this, _, cx| {
+                            this.subscribe(cx);
+                        });
+                    })
+                    .ok();
+                })
+                .ok();
+            } else {
+                cx.update(|window, cx| {
+                    window.push_notification(Notification::error("Failed to create account."), cx)
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    /// Sets the profile for the account.
+    pub fn profile(&mut self, profile: Profile, cx: &mut Context<Self>) {
+        self.profile = Some(profile);
+        cx.notify();
+    }
+
+    /// Subscribes to the current account's metadata.
+    pub fn subscribe(&self, cx: &mut Context<Self>) {
+        let Some(profile) = self.profile.as_ref() else {
+            return;
+        };
+
+        let user = profile.public_key();
+        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+
+        let metadata = Filter::new()
+            .kinds(vec![
+                Kind::Metadata,
+                Kind::ContactList,
+                Kind::InboxRelays,
+                Kind::MuteList,
+                Kind::SimpleGroups,
+            ])
+            .author(user)
+            .limit(10);
+
+        let data = Filter::new()
+            .author(user)
+            .since(Timestamp::now())
+            .kinds(vec![
+                Kind::Metadata,
+                Kind::ContactList,
+                Kind::MuteList,
+                Kind::SimpleGroups,
+                Kind::InboxRelays,
+                Kind::RelayList,
+            ]);
+
+        let msg = Filter::new().kind(Kind::GiftWrap).pubkey(user);
+        let new_msg = Filter::new().kind(Kind::GiftWrap).pubkey(user).limit(0);
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let client = get_client();
+            client.subscribe(metadata, Some(opts)).await?;
+            client.subscribe(data, None).await?;
+
+            let sub_id = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
+            client.subscribe_with_id(sub_id, msg, Some(opts)).await?;
+
+            let sub_id = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
+            client.subscribe_with_id(sub_id, new_msg, None).await?;
+
+            Ok(())
+        });
+
+        cx.spawn(async move |_, _| {
+            if let Err(e) = task.await {
+                log::error!("Error: {}", e);
+            }
+        })
+        .detach();
+    }
+}
--- a/crates/app/src/main.rs
+++ b/crates/app/src/main.rs
@@ -1,407 +0,0 @@
-use asset::Assets;
-use chats::registry::ChatRegistry;
-use common::{
-    constants::{ALL_MESSAGES_SUB_ID, APP_ID, APP_NAME, KEYRING_SERVICE, NEW_MESSAGE_SUB_ID},
-    profile::NostrProfile,
-};
-use futures::{select, FutureExt};
-use gpui::{
-    actions, px, size, App, AppContext, Application, AsyncApp, Bounds, KeyBinding, Menu, MenuItem,
-    WindowBounds, WindowKind, WindowOptions,
-};
-#[cfg(not(target_os = "linux"))]
-use gpui::{point, SharedString, TitlebarOptions};
-#[cfg(target_os = "linux")]
-use gpui::{WindowBackgroundAppearance, WindowDecorations};
-use log::{error, info};
-use nostr_sdk::{
-    pool::prelude::ReqExitPolicy, Client, Event, Filter, Keys, Kind, Metadata, PublicKey,
-    RelayMessage, RelayPoolNotification, SubscribeAutoCloseOptions,
-};
-use nostr_sdk::{prelude::NostrEventsDatabaseExt, FromBech32, SubscriptionId};
-use smol::Timer;
-use state::{get_client, initialize_client};
-use std::{collections::HashSet, mem, sync::Arc, time::Duration};
-use ui::{theme::Theme, Root};
-use views::{app, onboarding, startup};
-
-mod asset;
-mod views;
-
-actions!(coop, [Quit]);
-
-#[derive(Clone)]
-enum Signal {
-    /// Receive event
-    Event(Event),
-    /// Receive EOSE
-    Eose,
-}
-
-fn main() {
-    // Fix crash on startup
-    // TODO: why this is needed?
-    _ = rustls::crypto::ring::default_provider().install_default();
-    // Enable logging
-    tracing_subscriber::fmt::init();
-
-    let (event_tx, event_rx) = smol::channel::bounded::<Signal>(2048);
-    let (batch_tx, batch_rx) = smol::channel::bounded::<Vec<PublicKey>>(100);
-
-    // Initialize nostr client
-    let client = initialize_client();
-
-    // Initialize application
-    let app = Application::new()
-        .with_assets(Assets)
-        .with_http_client(Arc::new(reqwest_client::ReqwestClient::new()));
-
-    // Connect to default relays
-    app.background_executor()
-        .spawn(async {
-            _ = client.add_relay("wss://relay.damus.io/").await;
-            _ = client.add_relay("wss://relay.primal.net/").await;
-            _ = client.add_relay("wss://user.kindpag.es/").await;
-            _ = client.add_relay("wss://purplepag.es/").await;
-            _ = client.add_discovery_relay("wss://relaydiscovery.com").await;
-            _ = client.connect().await
-        })
-        .detach();
-
-    // Handle batch metadata
-    app.background_executor()
-        .spawn(async move {
-            const BATCH_SIZE: usize = 20;
-            const BATCH_TIMEOUT: Duration = Duration::from_millis(200);
-
-            let mut batch: HashSet<PublicKey> = HashSet::new();
-
-            loop {
-                let mut timeout = Box::pin(Timer::after(BATCH_TIMEOUT).fuse());
-
-                select! {
-                    pubkeys = batch_rx.recv().fuse() => {
-                        match pubkeys {
-                            Ok(keys) => {
-                                batch.extend(keys);
-                                if batch.len() >= BATCH_SIZE {
-                                    sync_metadata(client, mem::take(&mut batch)).await;
-                                }
-                            }
-                            Err(_) => break,
-                        }
-                    }
-                    _ = timeout => {
-                        if !batch.is_empty() {
-                            sync_metadata(client, mem::take(&mut batch)).await;
-                        }
-                    }
-                }
-            }
-        })
-        .detach();
-
-    // Handle notifications
-    app.background_executor()
-        .spawn(async move {
-            let rng_keys = Keys::generate();
-            let all_id = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
-            let new_id = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
-            let mut notifications = client.notifications();
-
-            while let Ok(notification) = notifications.recv().await {
-                if let RelayPoolNotification::Message { message, .. } = notification {
-                    match message {
-                        RelayMessage::Event {
-                            event,
-                            subscription_id,
-                        } => {
-                            match event.kind {
-                                Kind::GiftWrap => {
-                                    if let Ok(gift) = client.unwrap_gift_wrap(&event).await {
-                                        let mut pubkeys = vec![];
-
-                                        // Sign the rumor with the generated keys,
-                                        // this event will be used for internal only,
-                                        // and NEVER send to relays.
-                                        if let Ok(event) = gift.rumor.sign_with_keys(&rng_keys) {
-                                            pubkeys.extend(event.tags.public_keys());
-                                            pubkeys.push(event.pubkey);
-
-                                            // Save the event to the database, use for query directly.
-                                            if let Err(e) =
-                                                client.database().save_event(&event).await
-                                            {
-                                                error!("Failed to save event: {}", e);
-                                            }
-
-                                            // Send all pubkeys to the batch
-                                            if let Err(e) = batch_tx.send(pubkeys).await {
-                                                error!("Failed to send pubkeys to batch: {}", e)
-                                            }
-
-                                            // Send this event to the GPUI
-                                            if new_id == *subscription_id {
-                                                if let Err(e) =
-                                                    event_tx.send(Signal::Event(event)).await
-                                                {
-                                                    error!("Failed to send event to GPUI: {}", e)
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                Kind::ContactList => {
-                                    let pubkeys =
-                                        event.tags.public_keys().copied().collect::<HashSet<_>>();
-                                    sync_metadata(client, pubkeys).await;
-                                }
-                                _ => {}
-                            }
-                        }
-                        RelayMessage::EndOfStoredEvents(subscription_id) => {
-                            if all_id == *subscription_id {
-                                if let Err(e) = event_tx.send(Signal::Eose).await {
-                                    error!("Failed to send eose: {}", e)
-                                };
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-            }
-        })
-        .detach();
-
-    // Handle re-open window
-    app.on_reopen(move |cx| {
-        let client = get_client();
-        let (tx, rx) = oneshot::channel::<Option<NostrProfile>>();
-
-        cx.background_spawn(async move {
-            if let Ok(signer) = client.signer().await {
-                if let Ok(public_key) = signer.get_public_key().await {
-                    let metadata =
-                        if let Ok(Some(metadata)) = client.database().metadata(public_key).await {
-                            metadata
-                        } else {
-                            Metadata::new()
-                        };
-
-                    _ = tx.send(Some(NostrProfile::new(public_key, metadata)));
-                } else {
-                    _ = tx.send(None);
-                }
-            } else {
-                _ = tx.send(None);
-            }
-        })
-        .detach();
-
-        cx.spawn(|mut cx| async move {
-            if let Ok(result) = rx.await {
-                _ = restore_window(result, &mut cx).await;
-            }
-        })
-        .detach();
-    });
-
-    app.run(move |cx| {
-        // Initialize chat global state
-        chats::registry::init(cx);
-        // Initialize components
-        ui::init(cx);
-        // Bring the app to the foreground
-        cx.activate(true);
-        // Register the `quit` function
-        cx.on_action(quit);
-        // Register the `quit` function with CMD+Q
-        cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
-        // Set menu items
-        cx.set_menus(vec![Menu {
-            name: "Coop".into(),
-            items: vec![MenuItem::action("Quit", Quit)],
-        }]);
-
-        // Open window with default options
-        cx.open_window(
-            WindowOptions {
-                #[cfg(not(target_os = "linux"))]
-                titlebar: Some(TitlebarOptions {
-                    title: Some(SharedString::new_static(APP_NAME)),
-                    traffic_light_position: Some(point(px(9.0), px(9.0))),
-                    appears_transparent: true,
-                }),
-                window_bounds: Some(WindowBounds::Windowed(Bounds::centered(
-                    None,
-                    size(px(900.0), px(680.0)),
-                    cx,
-                ))),
-                #[cfg(target_os = "linux")]
-                window_background: WindowBackgroundAppearance::Transparent,
-                #[cfg(target_os = "linux")]
-                window_decorations: Some(WindowDecorations::Client),
-                kind: WindowKind::Normal,
-                ..Default::default()
-            },
-            |window, cx| {
-                window.set_window_title(APP_NAME);
-                window.set_app_id(APP_ID);
-
-                #[cfg(not(target_os = "linux"))]
-                window
-                    .observe_window_appearance(|window, cx| {
-                        Theme::sync_system_appearance(Some(window), cx);
-                    })
-                    .detach();
-
-                let handle = window.window_handle();
-                let root = cx.new(|cx| Root::new(startup::init(window, cx).into(), window, cx));
-
-                let task = cx.read_credentials(KEYRING_SERVICE);
-                let (tx, rx) = oneshot::channel::<Option<NostrProfile>>();
-
-                // Read credential in OS Keyring
-                cx.background_spawn(async {
-                    let profile = if let Ok(Some((npub, secret))) = task.await {
-                        let public_key = PublicKey::from_bech32(&npub).unwrap();
-                        let secret_hex = String::from_utf8(secret).unwrap();
-                        let keys = Keys::parse(&secret_hex).unwrap();
-
-                        // Update nostr signer
-                        _ = client.set_signer(keys).await;
-
-                        // Get user's metadata
-                        let metadata = if let Ok(Some(metadata)) =
-                            client.database().metadata(public_key).await
-                        {
-                            metadata
-                        } else {
-                            Metadata::new()
-                        };
-
-                        Some(NostrProfile::new(public_key, metadata))
-                    } else {
-                        None
-                    };
-
-                    _ = tx.send(profile)
-                })
-                .detach();
-
-                // Set root view based on credential status
-                cx.spawn(|mut cx| async move {
-                    if let Ok(Some(profile)) = rx.await {
-                        _ = cx.update_window(handle, |_, window, cx| {
-                            window.replace_root(cx, |window, cx| {
-                                Root::new(app::init(profile, window, cx).into(), window, cx)
-                            });
-                        });
-                    } else {
-                        _ = cx.update_window(handle, |_, window, cx| {
-                            window.replace_root(cx, |window, cx| {
-                                Root::new(onboarding::init(window, cx).into(), window, cx)
-                            });
-                        });
-                    }
-                })
-                .detach();
-
-                cx.spawn(|cx| async move {
-                    while let Ok(signal) = event_rx.recv().await {
-                        cx.update(|cx| {
-                            match signal {
-                                Signal::Eose => {
-                                    if let Some(chats) = ChatRegistry::global(cx) {
-                                        chats.update(cx, |this, cx| this.load_chat_rooms(cx))
-                                    }
-                                }
-                                Signal::Event(event) => {
-                                    if let Some(chats) = ChatRegistry::global(cx) {
-                                        chats.update(cx, |this, cx| this.push_message(event, cx))
-                                    }
-                                }
-                            };
-                        })
-                        .ok();
-                    }
-                })
-                .detach();
-
-                root
-            },
-        )
-        .expect("System error. Please re-open the app.");
-    });
-}
-
-async fn sync_metadata(client: &Client, buffer: HashSet<PublicKey>) {
-    let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-    let filter = Filter::new()
-        .authors(buffer.iter().cloned())
-        .kind(Kind::Metadata)
-        .limit(buffer.len());
-
-    if let Err(e) = client.subscribe(filter, Some(opts)).await {
-        error!("Subscribe error: {e}");
-    }
-}
-
-async fn restore_window(profile: Option<NostrProfile>, cx: &mut AsyncApp) -> anyhow::Result<()> {
-    let opts = cx
-        .update(|cx| WindowOptions {
-            #[cfg(not(target_os = "linux"))]
-            titlebar: Some(TitlebarOptions {
-                title: Some(SharedString::new_static(APP_NAME)),
-                traffic_light_position: Some(point(px(9.0), px(9.0))),
-                appears_transparent: true,
-            }),
-            window_bounds: Some(WindowBounds::Windowed(Bounds::centered(
-                None,
-                size(px(900.0), px(680.0)),
-                cx,
-            ))),
-            #[cfg(target_os = "linux")]
-            window_background: WindowBackgroundAppearance::Transparent,
-            #[cfg(target_os = "linux")]
-            window_decorations: Some(WindowDecorations::Client),
-            kind: WindowKind::Normal,
-            ..Default::default()
-        })
-        .expect("Failed to set window options.");
-
-    if let Some(profile) = profile {
-        _ = cx.open_window(opts, |window, cx| {
-            window.set_window_title(APP_NAME);
-            window.set_app_id(APP_ID);
-
-            #[cfg(not(target_os = "linux"))]
-            window
-                .observe_window_appearance(|window, cx| {
-                    Theme::sync_system_appearance(Some(window), cx);
-                })
-                .detach();
-
-            cx.new(|cx| Root::new(app::init(profile, window, cx).into(), window, cx))
-        });
-    } else {
-        _ = cx.open_window(opts, |window, cx| {
-            window.set_window_title(APP_NAME);
-            window.set_app_id(APP_ID);
-            window
-                .observe_window_appearance(|window, cx| {
-                    Theme::sync_system_appearance(Some(window), cx);
-                })
-                .detach();
-
-            cx.new(|cx| Root::new(onboarding::init(window, cx).into(), window, cx))
-        });
-    };
-
-    Ok(())
-}
-
-fn quit(_: &Quit, cx: &mut App) {
-    info!("Gracefully quitting the application . . .");
-    cx.quit();
-}
--- a/crates/app/src/views/app.rs
+++ b/crates/app/src/views/app.rs
@@ -1,365 +0,0 @@
-use common::profile::NostrProfile;
-use gpui::{
-    actions, div, img, impl_internal_actions, prelude::FluentBuilder, px, App, AppContext, Axis,
-    Context, Entity, InteractiveElement, IntoElement, ObjectFit, ParentElement, Render, Styled,
-    StyledImage, Window,
-};
-use nostr_sdk::prelude::*;
-use serde::Deserialize;
-use state::get_client;
-use std::sync::Arc;
-use ui::{
-    button::{Button, ButtonRounded, ButtonVariants},
-    dock_area::{dock::DockPlacement, DockArea, DockItem},
-    popup_menu::PopupMenuExt,
-    theme::{scale::ColorScaleStep, ActiveTheme, Appearance, Theme},
-    ContextModal, Icon, IconName, Root, Sizable, TitleBar,
-};
-
-use super::{chat, contacts, onboarding, profile, relays::Relays, settings, sidebar, welcome};
-
-#[derive(Clone, PartialEq, Eq, Deserialize)]
-pub enum PanelKind {
-    Room(u64),
-    Profile,
-    Contacts,
-    Settings,
-}
-
-#[derive(Clone, PartialEq, Eq, Deserialize)]
-pub struct AddPanel {
-    panel: PanelKind,
-    position: DockPlacement,
-}
-
-impl AddPanel {
-    pub fn new(panel: PanelKind, position: DockPlacement) -> Self {
-        Self { panel, position }
-    }
-}
-
-impl_internal_actions!(dock, [AddPanel]);
-actions!(account, [Logout]);
-
-pub fn init(account: NostrProfile, window: &mut Window, cx: &mut App) -> Entity<AppView> {
-    AppView::new(account, window, cx)
-}
-
-pub struct AppView {
-    account: NostrProfile,
-    relays: Entity<Option<Vec<String>>>,
-    dock: Entity<DockArea>,
-}
-
-impl AppView {
-    pub fn new(account: NostrProfile, window: &mut Window, cx: &mut App) -> Entity<Self> {
-        // Initialize dock layout
-        let dock = cx.new(|cx| DockArea::new(window, cx));
-        let weak_dock = dock.downgrade();
-
-        // Initialize left dock
-        let left_panel = DockItem::panel(Arc::new(sidebar::init(window, cx)));
-
-        // Initial central dock
-        let center_panel = DockItem::split_with_sizes(
-            Axis::Vertical,
-            vec![DockItem::tabs(
-                vec![Arc::new(welcome::init(window, cx))],
-                None,
-                &weak_dock,
-                window,
-                cx,
-            )],
-            vec![None],
-            &weak_dock,
-            window,
-            cx,
-        );
-
-        // Set default dock layout with left and central docks
-        _ = weak_dock.update(cx, |view, cx| {
-            view.set_left_dock(left_panel, Some(px(240.)), true, window, cx);
-            view.set_center(center_panel, window, cx);
-        });
-
-        cx.new(|cx| {
-            let public_key = account.public_key();
-            let relays = cx.new(|_| None);
-            let async_relays = relays.downgrade();
-
-            // Check user's messaging relays and determine user is ready for NIP17 or not.
-            // If not, show the setup modal and instruct user setup inbox relays
-            let client = get_client();
-            let window_handle = window.window_handle();
-            let (tx, rx) = oneshot::channel::<Option<Vec<String>>>();
-
-            let this = Self {
-                account,
-                relays,
-                dock,
-            };
-
-            cx.background_spawn(async move {
-                let filter = Filter::new()
-                    .kind(Kind::InboxRelays)
-                    .author(public_key)
-                    .limit(1);
-
-                let relays = if let Ok(events) = client.database().query(filter).await {
-                    if let Some(event) = events.first_owned() {
-                        Some(
-                            event
-                                .tags
-                                .filter_standardized(TagKind::Relay)
-                                .filter_map(|t| match t {
-                                    TagStandard::Relay(url) => Some(url.to_string()),
-
-                                    _ => None,
-                                })
-                                .collect::<Vec<_>>(),
-                        )
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                };
-
-                _ = tx.send(relays);
-            })
-            .detach();
-
-            cx.spawn(|this, mut cx| async move {
-                if let Ok(result) = rx.await {
-                    if let Some(relays) = result {
-                        _ = cx.update(|cx| {
-                            _ = async_relays.update(cx, |this, cx| {
-                                *this = Some(relays);
-                                cx.notify();
-                            });
-                        });
-                    } else {
-                        _ = cx.update_window(window_handle, |_, window, cx| {
-                            this.update(cx, |this: &mut Self, cx| {
-                                this.render_setup_relays(window, cx)
-                            })
-                        });
-                    }
-                }
-            })
-            .detach();
-
-            this
-        })
-    }
-
-    fn render_setup_relays(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let relays = cx.new(|cx| Relays::new(None, window, cx));
-
-        window.open_modal(cx, move |this, window, cx| {
-            let is_loading = relays.read(cx).loading();
-
-            this.keyboard(false)
-                .closable(false)
-                .width(px(420.))
-                .title("Your Messaging Relays are not configured")
-                .child(relays.clone())
-                .footer(
-                    div()
-                        .p_2()
-                        .border_t_1()
-                        .border_color(cx.theme().base.step(cx, ColorScaleStep::FIVE))
-                        .child(
-                            Button::new("update_inbox_relays_btn")
-                                .label("Update")
-                                .primary()
-                                .bold()
-                                .rounded(ButtonRounded::Large)
-                                .w_full()
-                                .loading(is_loading)
-                                .on_click(window.listener_for(&relays, |this, _, window, cx| {
-                                    this.update(window, cx);
-                                })),
-                        ),
-                )
-        });
-    }
-
-    fn render_edit_relay(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let relays = self.relays.read(cx).clone();
-        let view = cx.new(|cx| Relays::new(relays, window, cx));
-
-        window.open_modal(cx, move |this, window, cx| {
-            let is_loading = view.read(cx).loading();
-
-            this.width(px(420.))
-                .title("Edit your Messaging Relays")
-                .child(view.clone())
-                .footer(
-                    div()
-                        .p_2()
-                        .border_t_1()
-                        .border_color(cx.theme().base.step(cx, ColorScaleStep::FIVE))
-                        .child(
-                            Button::new("update_inbox_relays_btn")
-                                .label("Update")
-                                .primary()
-                                .bold()
-                                .rounded(ButtonRounded::Large)
-                                .w_full()
-                                .loading(is_loading)
-                                .on_click(window.listener_for(&view, |this, _, window, cx| {
-                                    this.update(window, cx);
-                                })),
-                        ),
-                )
-        });
-    }
-
-    fn render_appearance_button(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        Button::new("appearance")
-            .xsmall()
-            .ghost()
-            .map(|this| {
-                if cx.theme().appearance.is_dark() {
-                    this.icon(IconName::Sun)
-                } else {
-                    this.icon(IconName::Moon)
-                }
-            })
-            .on_click(cx.listener(|_, _, window, cx| {
-                if cx.theme().appearance.is_dark() {
-                    Theme::change(Appearance::Light, Some(window), cx);
-                } else {
-                    Theme::change(Appearance::Dark, Some(window), cx);
-                }
-            }))
-    }
-
-    fn render_relays_button(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        Button::new("relays")
-            .xsmall()
-            .ghost()
-            .icon(IconName::Relays)
-            .on_click(cx.listener(|this, _, window, cx| {
-                this.render_edit_relay(window, cx);
-            }))
-    }
-
-    fn render_account(&self) -> impl IntoElement {
-        Button::new("account")
-            .ghost()
-            .xsmall()
-            .reverse()
-            .icon(Icon::new(IconName::ChevronDownSmall))
-            .child(
-                img(self.account.avatar())
-                    .size_5()
-                    .rounded_full()
-                    .object_fit(ObjectFit::Cover),
-            )
-            .popup_menu(move |this, _, _cx| {
-                this.menu(
-                    "Profile",
-                    Box::new(AddPanel::new(PanelKind::Profile, DockPlacement::Right)),
-                )
-                .menu(
-                    "Contacts",
-                    Box::new(AddPanel::new(PanelKind::Contacts, DockPlacement::Right)),
-                )
-                .menu(
-                    "Settings",
-                    Box::new(AddPanel::new(PanelKind::Settings, DockPlacement::Center)),
-                )
-                .separator()
-                .menu("Change account", Box::new(Logout))
-            })
-    }
-
-    fn on_panel_action(&mut self, action: &AddPanel, window: &mut Window, cx: &mut Context<Self>) {
-        match &action.panel {
-            PanelKind::Room(id) => match chat::init(id, window, cx) {
-                Ok(panel) => {
-                    self.dock.update(cx, |dock_area, cx| {
-                        dock_area.add_panel(panel, action.position, window, cx);
-                    });
-                }
-                Err(e) => window.push_notification(e.to_string(), cx),
-            },
-            PanelKind::Profile => {
-                let panel = Arc::new(profile::init(self.account.clone(), window, cx));
-
-                self.dock.update(cx, |dock_area, cx| {
-                    dock_area.add_panel(panel, action.position, window, cx);
-                });
-            }
-            PanelKind::Contacts => {
-                let panel = Arc::new(contacts::init(window, cx));
-
-                self.dock.update(cx, |dock_area, cx| {
-                    dock_area.add_panel(panel, action.position, window, cx);
-                });
-            }
-            PanelKind::Settings => {
-                let panel = Arc::new(settings::init(window, cx));
-
-                self.dock.update(cx, |dock_area, cx| {
-                    dock_area.add_panel(panel, action.position, window, cx);
-                });
-            }
-        };
-    }
-
-    fn on_logout_action(&mut self, _action: &Logout, window: &mut Window, cx: &mut Context<Self>) {
-        cx.background_spawn(async move { get_client().reset().await })
-            .detach();
-
-        window.replace_root(cx, |window, cx| {
-            Root::new(onboarding::init(window, cx).into(), window, cx)
-        });
-    }
-}
-
-impl Render for AppView {
-    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);
-
-        div()
-            .relative()
-            .size_full()
-            .flex()
-            .flex_col()
-            // Main
-            .child(
-                TitleBar::new()
-                    // Left side
-                    .child(div())
-                    // Right side
-                    .child(
-                        div()
-                            .flex()
-                            .items_center()
-                            .justify_end()
-                            .gap_2()
-                            .px_2()
-                            .child(self.render_appearance_button(window, cx))
-                            .child(self.render_relays_button(window, cx))
-                            .child(self.render_account()),
-                    ),
-            )
-            .child(self.dock.clone())
-            .child(div().absolute().top_8().children(notification_layer))
-            .children(modal_layer)
-            .on_action(cx.listener(Self::on_panel_action))
-            .on_action(cx.listener(Self::on_logout_action))
-    }
-}
--- a/crates/app/src/views/chat.rs
+++ b/crates/app/src/views/chat.rs
@@ -1,854 +0,0 @@
-use anyhow::anyhow;
-use async_utility::task::spawn;
-use chats::{registry::ChatRegistry, room::Room};
-use common::{
-    constants::IMAGE_SERVICE,
-    last_seen::LastSeen,
-    profile::NostrProfile,
-    utils::{compare, nip96_upload},
-};
-use gpui::{
-    div, img, list, prelude::FluentBuilder, px, relative, svg, white, AnyElement, App, AppContext,
-    Context, Element, Entity, EventEmitter, Flatten, FocusHandle, Focusable, InteractiveElement,
-    IntoElement, ListAlignment, ListState, ObjectFit, ParentElement, PathPromptOptions, Render,
-    SharedString, StatefulInteractiveElement, Styled, StyledImage, Subscription, WeakEntity,
-    Window,
-};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use smol::fs;
-use state::get_client;
-use std::sync::Arc;
-use ui::{
-    button::{Button, ButtonRounded, ButtonVariants},
-    dock_area::panel::{Panel, PanelEvent},
-    input::{InputEvent, TextInput},
-    notification::Notification,
-    popup_menu::PopupMenu,
-    theme::{scale::ColorScaleStep, ActiveTheme},
-    v_flex, ContextModal, Icon, IconName, Sizable, StyledExt,
-};
-
-const ALERT: &str =
-    "This conversation is private. Only members of this chat can see each other's messages.";
-
-pub fn init(
-    id: &u64,
-    window: &mut Window,
-    cx: &mut App,
-) -> Result<Arc<Entity<Chat>>, anyhow::Error> {
-    if let Some(chats) = ChatRegistry::global(cx) {
-        if let Some(room) = chats.read(cx).get(id, cx) {
-            Ok(Arc::new(Chat::new(id, &room, window, cx)))
-        } else {
-            Err(anyhow!("Chat room is not exist"))
-        }
-    } else {
-        Err(anyhow!("Chat Registry is not initialized"))
-    }
-}
-
-#[derive(PartialEq, Eq)]
-struct ParsedMessage {
-    avatar: SharedString,
-    display_name: SharedString,
-    created_at: SharedString,
-    content: SharedString,
-}
-
-impl ParsedMessage {
-    pub fn new(profile: &NostrProfile, content: &str, created_at: Timestamp) -> Self {
-        let avatar = profile.avatar().into();
-        let display_name = profile.name().into();
-        let content = SharedString::new(content);
-        let created_at = LastSeen(created_at).human_readable();
-
-        Self {
-            avatar,
-            display_name,
-            created_at,
-            content,
-        }
-    }
-}
-
-#[derive(PartialEq, Eq)]
-enum Message {
-    User(Box<ParsedMessage>),
-    System(SharedString),
-    Placeholder,
-}
-
-impl Message {
-    pub fn new(message: ParsedMessage) -> Self {
-        Self::User(Box::new(message))
-    }
-
-    pub fn system(content: SharedString) -> Self {
-        Self::System(content)
-    }
-
-    pub fn placeholder() -> Self {
-        Self::Placeholder
-    }
-}
-
-pub struct Chat {
-    // Panel
-    id: SharedString,
-    closable: bool,
-    zoomable: bool,
-    focus_handle: FocusHandle,
-    // Chat Room
-    room: WeakEntity<Room>,
-    messages: Entity<Vec<Message>>,
-    new_messages: WeakEntity<Vec<Event>>,
-    list_state: ListState,
-    subscriptions: Vec<Subscription>,
-    // New Message
-    input: Entity<TextInput>,
-    // Media
-    attaches: Entity<Option<Vec<Url>>>,
-    is_uploading: bool,
-}
-
-impl Chat {
-    pub fn new(id: &u64, model: &Entity<Room>, window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let room = model.downgrade();
-        let new_messages = model.read(cx).new_messages.downgrade();
-
-        cx.new(|cx| {
-            let messages = cx.new(|_| vec![Message::placeholder()]);
-            let attaches = cx.new(|_| None);
-
-            let input = cx.new(|cx| {
-                TextInput::new(window, cx)
-                    .appearance(false)
-                    .text_size(ui::Size::Small)
-                    .placeholder("Message...")
-            });
-
-            let subscriptions = vec![cx.subscribe_in(
-                &input,
-                window,
-                move |this: &mut Chat, _, input_event, window, cx| {
-                    if let InputEvent::PressEnter = input_event {
-                        this.send_message(window, cx);
-                    }
-                },
-            )];
-
-            // Initialize list state
-            // [item_count] always equal to 1 at the beginning
-            let list_state = ListState::new(1, ListAlignment::Bottom, px(1024.), {
-                let this = cx.entity().downgrade();
-                move |ix, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.render_message(ix, window, cx).into_any_element()
-                    })
-                    .unwrap()
-                }
-            });
-
-            let mut this = Self {
-                closable: true,
-                zoomable: true,
-                focus_handle: cx.focus_handle(),
-                is_uploading: false,
-                id: id.to_string().into(),
-                room,
-                new_messages,
-                messages,
-                list_state,
-                input,
-                attaches,
-                subscriptions,
-            };
-
-            // Verify messaging relays of all members
-            this.verify_messaging_relays(cx);
-
-            // Load all messages from database
-            this.load_messages(cx);
-
-            // Subscribe and load new messages
-            this.load_new_messages(cx);
-
-            this
-        })
-    }
-
-    fn verify_messaging_relays(&self, cx: &mut Context<Self>) {
-        let Some(model) = self.room.upgrade() else {
-            return;
-        };
-
-        let room = model.read(cx);
-        let pubkeys: Vec<PublicKey> = room.members.iter().map(|m| m.public_key()).collect();
-        let client = get_client();
-        let (tx, rx) = oneshot::channel::<Vec<(PublicKey, bool)>>();
-
-        cx.background_spawn(async move {
-            let mut result = Vec::new();
-
-            for pubkey in pubkeys.into_iter() {
-                let filter = Filter::new()
-                    .kind(Kind::InboxRelays)
-                    .author(pubkey)
-                    .limit(1);
-
-                let is_ready = if let Ok(events) = client.database().query(filter).await {
-                    events.first_owned().is_some()
-                } else {
-                    false
-                };
-
-                result.push((pubkey, is_ready));
-            }
-
-            _ = tx.send(result);
-        })
-        .detach();
-
-        cx.spawn(|this, cx| async move {
-            if let Ok(result) = rx.await {
-                _ = cx.update(|cx| {
-                    _ = this.update(cx, |this, cx| {
-                        for item in result.into_iter() {
-                            if !item.1 {
-                                let name = this
-                                    .room
-                                    .read_with(cx, |this, _| this.name())
-                                    .unwrap_or("Unnamed".into());
-
-                                this.push_system_message(
-                                    format!("{} has not set up Messaging (DM) Relays, so they will NOT receive your messages.", name),
-                                    cx,
-                                );
-                            }
-                        }
-                    });
-                });
-            }
-        })
-        .detach();
-    }
-
-    fn load_messages(&self, cx: &mut Context<Self>) {
-        let Some(model) = self.room.upgrade() else {
-            return;
-        };
-
-        let client = get_client();
-        let (tx, rx) = oneshot::channel::<Events>();
-
-        let room = model.read(cx);
-        let pubkeys = room
-            .members
-            .iter()
-            .map(|m| m.public_key())
-            .collect::<Vec<_>>();
-
-        let recv = Filter::new()
-            .kind(Kind::PrivateDirectMessage)
-            .author(room.owner.public_key())
-            .pubkeys(pubkeys.iter().copied());
-
-        let send = Filter::new()
-            .kind(Kind::PrivateDirectMessage)
-            .authors(pubkeys)
-            .pubkey(room.owner.public_key());
-
-        cx.background_spawn(async move {
-            let Ok(recv_events) = client.database().query(recv).await else {
-                return;
-            };
-            let Ok(send_events) = client.database().query(send).await else {
-                return;
-            };
-            let events = recv_events.merge(send_events);
-
-            _ = tx.send(events);
-        })
-        .detach();
-
-        cx.spawn(|this, cx| async move {
-            if let Ok(events) = rx.await {
-                _ = cx.update(|cx| {
-                    _ = this.update(cx, |this, cx| {
-                        this.push_messages(events, cx);
-                    });
-                })
-            }
-        })
-        .detach();
-    }
-
-    fn push_system_message(&self, content: String, cx: &mut Context<Self>) {
-        let old_len = self.messages.read(cx).len();
-        let message = Message::system(content.into());
-
-        cx.update_entity(&self.messages, |this, cx| {
-            this.extend(vec![message]);
-            cx.notify();
-        });
-
-        self.list_state.splice(old_len..old_len, 1);
-    }
-
-    fn push_message(&self, content: String, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(model) = self.room.upgrade() else {
-            return;
-        };
-
-        let old_len = self.messages.read(cx).len();
-        let room = model.read(cx);
-        let message = Message::new(ParsedMessage::new(&room.owner, &content, Timestamp::now()));
-
-        // Update message list
-        cx.update_entity(&self.messages, |this, cx| {
-            this.extend(vec![message]);
-            cx.notify();
-        });
-
-        // Reset message input
-        cx.update_entity(&self.input, |this, cx| {
-            this.set_loading(false, window, cx);
-            this.set_disabled(false, window, cx);
-            this.set_text("", window, cx);
-            cx.notify();
-        });
-
-        self.list_state.splice(old_len..old_len, 1);
-    }
-
-    fn push_messages(&self, events: Events, cx: &mut Context<Self>) {
-        let Some(model) = self.room.upgrade() else {
-            return;
-        };
-
-        let old_len = self.messages.read(cx).len();
-        let room = model.read(cx);
-        let pubkeys = room.pubkeys();
-
-        let (messages, total) = {
-            let items: Vec<Message> = events
-                .into_iter()
-                .sorted_by_key(|ev| ev.created_at)
-                .filter_map(|ev| {
-                    let mut other_pubkeys: Vec<_> = ev.tags.public_keys().copied().collect();
-                    other_pubkeys.push(ev.pubkey);
-
-                    if compare(&other_pubkeys, &pubkeys) {
-                        let member = if let Some(member) =
-                            room.members.iter().find(|&m| m.public_key() == ev.pubkey)
-                        {
-                            member.to_owned()
-                        } else {
-                            room.owner.to_owned()
-                        };
-
-                        let message =
-                            Message::new(ParsedMessage::new(&member, &ev.content, ev.created_at));
-
-                        Some(message)
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-            let total = items.len();
-
-            (items, total)
-        };
-
-        cx.update_entity(&self.messages, |this, cx| {
-            this.extend(messages);
-            cx.notify();
-        });
-
-        self.list_state.splice(old_len..old_len, total);
-    }
-
-    fn load_new_messages(&mut self, cx: &mut Context<Self>) {
-        let Some(model) = self.new_messages.upgrade() else {
-            return;
-        };
-
-        let subscription = cx.observe(&model, |view, this, cx| {
-            let Some(model) = view.room.upgrade() else {
-                return;
-            };
-
-            let room = model.read(cx);
-            let old_messages = view.messages.read(cx);
-            let old_len = old_messages.len();
-
-            let items: Vec<Message> = this
-                .read(cx)
-                .iter()
-                .filter_map(|event| {
-                    if let Some(profile) = room.member(&event.pubkey) {
-                        let message = Message::new(ParsedMessage::new(
-                            &profile,
-                            &event.content,
-                            event.created_at,
-                        ));
-
-                        if !old_messages.iter().any(|old| old == &message) {
-                            Some(message)
-                        } else {
-                            None
-                        }
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-
-            let total = items.len();
-
-            cx.update_entity(&view.messages, |this, cx| {
-                let messages: Vec<Message> = items
-                    .into_iter()
-                    .filter_map(|new| {
-                        if !this.iter().any(|old| old == &new) {
-                            Some(new)
-                        } else {
-                            None
-                        }
-                    })
-                    .collect();
-
-                this.extend(messages);
-                cx.notify();
-            });
-
-            view.list_state.splice(old_len..old_len, total);
-        });
-
-        self.subscriptions.push(subscription);
-    }
-
-    fn send_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(model) = self.room.upgrade() else {
-            return;
-        };
-
-        // Get message
-        let mut content = self.input.read(cx).text();
-
-        // Get all attaches and merge its with message
-        if let Some(attaches) = self.attaches.read(cx).as_ref() {
-            let merged = attaches
-                .iter()
-                .map(|url| url.to_string())
-                .collect::<Vec<_>>()
-                .join("\n");
-
-            content = format!("{}\n{}", content, merged).into()
-        }
-
-        if content.is_empty() {
-            window.push_notification("Cannot send an empty message", cx);
-            return;
-        }
-
-        // Disable input when sending message
-        self.input.update(cx, |this, cx| {
-            this.set_loading(true, window, cx);
-            this.set_disabled(true, window, cx);
-        });
-
-        let client = get_client();
-        let window_handle = window.window_handle();
-        let (tx, rx) = oneshot::channel::<Vec<Error>>();
-
-        let room = model.read(cx);
-        let pubkeys = room.pubkeys();
-        let async_content = content.clone().to_string();
-        let tags: Vec<Tag> = room
-            .pubkeys()
-            .iter()
-            .filter_map(|pubkey| {
-                if pubkey != &room.owner.public_key() {
-                    Some(Tag::public_key(*pubkey))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        // Send message to all pubkeys
-        cx.background_spawn(async move {
-            let mut errors = Vec::new();
-
-            for pubkey in pubkeys.iter() {
-                if let Err(e) = client
-                    .send_private_msg(*pubkey, &async_content, tags.clone())
-                    .await
-                {
-                    errors.push(e);
-                }
-            }
-
-            _ = tx.send(errors);
-        })
-        .detach();
-
-        cx.spawn(|this, mut cx| async move {
-            _ = cx.update_window(window_handle, |_, window, cx| {
-                _ = this.update(cx, |this, cx| {
-                    this.push_message(content.to_string(), window, cx);
-                });
-            });
-
-            if let Ok(errors) = rx.await {
-                _ = cx.update_window(window_handle, |_, window, cx| {
-                    for error in errors.into_iter() {
-                        window.push_notification(
-                            Notification::error(error.to_string()).title("Message Failed to Send"),
-                            cx,
-                        );
-                    }
-                });
-            }
-        })
-        .detach();
-    }
-
-    fn upload_media(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let window_handle = window.window_handle();
-
-        let paths = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-        });
-
-        // Show loading spinner
-        self.set_loading(true, cx);
-
-        // TODO: support multiple upload
-        cx.spawn(move |this, mut cx| async move {
-            match Flatten::flatten(paths.await.map_err(|e| e.into())) {
-                Ok(Some(mut paths)) => {
-                    let path = paths.pop().unwrap();
-
-                    if let Ok(file_data) = fs::read(path).await {
-                        let (tx, rx) = oneshot::channel::<Url>();
-
-                        spawn(async move {
-                            let client = get_client();
-                            if let Ok(url) = nip96_upload(client, file_data).await {
-                                _ = tx.send(url);
-                            }
-                        });
-
-                        if let Ok(url) = rx.await {
-                            _ = cx.update_window(window_handle, |_, _, cx| {
-                                _ = this.update(cx, |this, cx| {
-                                    // Stop loading spinner
-                                    this.set_loading(false, cx);
-
-                                    this.attaches.update(cx, |this, cx| {
-                                        if let Some(model) = this.as_mut() {
-                                            model.push(url);
-                                        } else {
-                                            *this = Some(vec![url]);
-                                        }
-                                        cx.notify();
-                                    });
-                                });
-                            });
-                        }
-                    }
-                }
-                Ok(None) => {
-                    // Stop loading spinner
-                    if let Some(view) = this.upgrade() {
-                        cx.update_entity(&view, |this, cx| {
-                            this.set_loading(false, cx);
-                        })
-                        .unwrap();
-                    }
-                }
-                Err(_) => {}
-            }
-        })
-        .detach();
-    }
-
-    fn remove_media(&mut self, url: &Url, _window: &mut Window, cx: &mut Context<Self>) {
-        self.attaches.update(cx, |model, cx| {
-            if let Some(urls) = model.as_mut() {
-                let ix = urls.iter().position(|x| x == url).unwrap();
-                urls.remove(ix);
-                cx.notify();
-            }
-        });
-    }
-
-    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.is_uploading = status;
-        cx.notify();
-    }
-
-    fn render_message(
-        &self,
-        ix: usize,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        if let Some(message) = self.messages.read(cx).get(ix) {
-            div()
-                .group("")
-                .relative()
-                .flex()
-                .gap_3()
-                .w_full()
-                .p_2()
-                .map(|this| match message {
-                    Message::User(item) => this
-                        .hover(|this| this.bg(cx.theme().accent.step(cx, ColorScaleStep::ONE)))
-                        .child(
-                            div()
-                                .absolute()
-                                .left_0()
-                                .top_0()
-                                .w(px(2.))
-                                .h_full()
-                                .bg(cx.theme().transparent)
-                                .group_hover("", |this| {
-                                    this.bg(cx.theme().accent.step(cx, ColorScaleStep::NINE))
-                                }),
-                        )
-                        .child(
-                            img(item.avatar.clone())
-                                .size_8()
-                                .rounded_full()
-                                .flex_shrink_0(),
-                        )
-                        .child(
-                            div()
-                                .flex()
-                                .flex_col()
-                                .flex_initial()
-                                .overflow_hidden()
-                                .child(
-                                    div()
-                                        .flex()
-                                        .items_baseline()
-                                        .gap_2()
-                                        .text_xs()
-                                        .child(
-                                            div().font_semibold().child(item.display_name.clone()),
-                                        )
-                                        .child(div().child(item.created_at.clone()).text_color(
-                                            cx.theme().base.step(cx, ColorScaleStep::ELEVEN),
-                                        )),
-                                )
-                                .child(div().text_sm().child(item.content.clone())),
-                        ),
-                    Message::System(content) => this
-                        .items_center()
-                        .child(
-                            div()
-                                .absolute()
-                                .left_0()
-                                .top_0()
-                                .w(px(2.))
-                                .h_full()
-                                .bg(cx.theme().transparent)
-                                .group_hover("", |this| this.bg(cx.theme().danger)),
-                        )
-                        .child(
-                            img("brand/avatar.png")
-                                .size_8()
-                                .rounded_full()
-                                .flex_shrink_0(),
-                        )
-                        .text_xs()
-                        .text_color(cx.theme().danger)
-                        .child(content.clone()),
-                    Message::Placeholder => this
-                        .w_full()
-                        .h_32()
-                        .flex()
-                        .flex_col()
-                        .items_center()
-                        .justify_center()
-                        .text_center()
-                        .text_xs()
-                        .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
-                        .line_height(relative(1.2))
-                        .child(
-                            svg()
-                                .path("brand/coop.svg")
-                                .size_8()
-                                .text_color(cx.theme().base.step(cx, ColorScaleStep::THREE)),
-                        )
-                        .child(ALERT),
-                })
-        } else {
-            div()
-        }
-    }
-}
-
-impl Panel for Chat {
-    fn panel_id(&self) -> SharedString {
-        self.id.clone()
-    }
-
-    fn title(&self, cx: &App) -> AnyElement {
-        self.room
-            .read_with(cx, |this, _cx| {
-                let name = this.name();
-                let facepill: Vec<String> =
-                    this.members.iter().map(|member| member.avatar()).collect();
-
-                div()
-                    .flex()
-                    .items_center()
-                    .gap_1()
-                    .child(
-                        div()
-                            .flex()
-                            .flex_row_reverse()
-                            .items_center()
-                            .justify_start()
-                            .children(facepill.into_iter().enumerate().rev().map(|(ix, face)| {
-                                div().when(ix > 0, |div| div.ml_neg_1()).child(
-                                    img(face)
-                                        .size_4()
-                                        .rounded_full()
-                                        .object_fit(ObjectFit::Cover),
-                                )
-                            })),
-                    )
-                    .child(name)
-                    .into_any()
-            })
-            .unwrap_or("Unnamed".into_any())
-    }
-
-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Chat {}
-
-impl Focusable for Chat {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Chat {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .child(list(self.list_state.clone()).flex_1())
-            .child(
-                div().flex_shrink_0().p_2().child(
-                    div()
-                        .flex()
-                        .flex_col()
-                        .when_some(self.attaches.read(cx).as_ref(), |this, attaches| {
-                            this.gap_1p5().children(attaches.iter().map(|url| {
-                                let url = url.clone();
-                                let path: SharedString = url.to_string().into();
-
-                                div()
-                                    .id(path.clone())
-                                    .relative()
-                                    .w_16()
-                                    .child(
-                                        img(format!(
-                                            "{}/?url={}&w=128&h=128&fit=cover&n=-1",
-                                            IMAGE_SERVICE, path
-                                        ))
-                                        .size_16()
-                                        .shadow_lg()
-                                        .rounded(px(cx.theme().radius))
-                                        .object_fit(ObjectFit::ScaleDown),
-                                    )
-                                    .child(
-                                        div()
-                                            .absolute()
-                                            .top_neg_2()
-                                            .right_neg_2()
-                                            .size_4()
-                                            .flex()
-                                            .items_center()
-                                            .justify_center()
-                                            .rounded_full()
-                                            .bg(cx.theme().danger)
-                                            .child(
-                                                Icon::new(IconName::Close)
-                                                    .size_2()
-                                                    .text_color(white()),
-                                            ),
-                                    )
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        this.remove_media(&url, window, cx);
-                                    }))
-                            }))
-                        })
-                        .child(
-                            div()
-                                .w_full()
-                                .h_9()
-                                .flex()
-                                .items_center()
-                                .gap_2()
-                                .child(
-                                    Button::new("upload")
-                                        .icon(Icon::new(IconName::Upload))
-                                        .ghost()
-                                        .on_click(cx.listener(move |this, _, window, cx| {
-                                            this.upload_media(window, cx);
-                                        }))
-                                        .loading(self.is_uploading),
-                                )
-                                .child(
-                                    div()
-                                        .flex_1()
-                                        .flex()
-                                        .items_center()
-                                        .bg(cx.theme().base.step(cx, ColorScaleStep::THREE))
-                                        .rounded(px(cx.theme().radius))
-                                        .pl_2()
-                                        .pr_1()
-                                        .child(self.input.clone())
-                                        .child(
-                                            Button::new("send")
-                                                .ghost()
-                                                .xsmall()
-                                                .bold()
-                                                .rounded(ButtonRounded::Medium)
-                                                .label("SEND")
-                                                .on_click(cx.listener(|this, _, window, cx| {
-                                                    this.send_message(window, cx)
-                                                })),
-                                        ),
-                                ),
-                        ),
-                ),
-            )
-    }
-}
--- a/crates/app/src/views/contacts.rs
+++ b/crates/app/src/views/contacts.rs
@@ -1,168 +0,0 @@
-use common::profile::NostrProfile;
-use gpui::{
-    div, img, prelude::FluentBuilder, px, uniform_list, AnyElement, App, AppContext, Context,
-    Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, Styled, Window,
-};
-use nostr_sdk::prelude::*;
-use state::get_client;
-use ui::{
-    button::Button,
-    dock_area::panel::{Panel, PanelEvent},
-    indicator::Indicator,
-    popup_menu::PopupMenu,
-    theme::{scale::ColorScaleStep, ActiveTheme},
-    Sizable,
-};
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Contacts> {
-    Contacts::new(window, cx)
-}
-
-pub struct Contacts {
-    contacts: Entity<Option<Vec<NostrProfile>>>,
-    // Panel
-    name: SharedString,
-    closable: bool,
-    zoomable: bool,
-    focus_handle: FocusHandle,
-}
-
-impl Contacts {
-    pub fn new(_window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let contacts = cx.new(|_| None);
-        let async_contact = contacts.clone();
-
-        cx.spawn(|mut cx| async move {
-            let client = get_client();
-            let (tx, rx) = oneshot::channel::<Vec<NostrProfile>>();
-
-            cx.background_executor()
-                .spawn(async move {
-                    let signer = client.signer().await.unwrap();
-                    let public_key = signer.get_public_key().await.unwrap();
-
-                    if let Ok(profiles) = client.database().contacts(public_key).await {
-                        let members: Vec<NostrProfile> = profiles
-                            .into_iter()
-                            .map(|profile| {
-                                NostrProfile::new(profile.public_key(), profile.metadata())
-                            })
-                            .collect();
-
-                        _ = tx.send(members);
-                    }
-                })
-                .detach();
-
-            if let Ok(contacts) = rx.await {
-                _ = cx.update_entity(&async_contact, |this, cx| {
-                    *this = Some(contacts);
-                    cx.notify();
-                });
-            }
-        })
-        .detach();
-
-        cx.new(|cx| Self {
-            contacts,
-            name: "Contacts".into(),
-            closable: true,
-            zoomable: true,
-            focus_handle: cx.focus_handle(),
-        })
-    }
-}
-
-impl Panel for Contacts {
-    fn panel_id(&self) -> SharedString {
-        "ContactPanel".into()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Contacts {}
-
-impl Focusable for Contacts {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Contacts {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div().size_full().pt_2().px_2().map(|this| {
-            if let Some(contacts) = self.contacts.read(cx).clone() {
-                this.child(
-                    uniform_list(
-                        cx.entity().clone(),
-                        "contacts",
-                        contacts.len(),
-                        move |_, range, _window, cx| {
-                            let mut items = Vec::new();
-
-                            for ix in range {
-                                let item = contacts.get(ix).unwrap().clone();
-
-                                items.push(
-                                    div()
-                                        .w_full()
-                                        .h_9()
-                                        .px_2()
-                                        .flex()
-                                        .items_center()
-                                        .justify_between()
-                                        .rounded(px(cx.theme().radius))
-                                        .child(
-                                            div()
-                                                .flex()
-                                                .items_center()
-                                                .gap_2()
-                                                .text_xs()
-                                                .child(
-                                                    div()
-                                                        .flex_shrink_0()
-                                                        .child(img(item.avatar()).size_6()),
-                                                )
-                                                .child(item.name()),
-                                        )
-                                        .hover(|this| {
-                                            this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE))
-                                        }),
-                                );
-                            }
-
-                            items
-                        },
-                    )
-                    .h_full(),
-                )
-            } else {
-                this.flex()
-                    .items_center()
-                    .justify_center()
-                    .h_16()
-                    .child(Indicator::new().small())
-            }
-        })
-    }
-}
--- a/crates/app/src/views/mod.rs
+++ b/crates/app/src/views/mod.rs
@@ -1,11 +0,0 @@
-mod chat;
-mod contacts;
-mod profile;
-mod relays;
-mod settings;
-mod sidebar;
-mod welcome;
-
-pub mod app;
-pub mod onboarding;
-pub mod startup;
--- a/crates/app/src/views/onboarding.rs
+++ b/crates/app/src/views/onboarding.rs
@@ -1,419 +0,0 @@
-use common::{profile::NostrProfile, qr::create_qr, utils::preload};
-use gpui::{
-    div, img, prelude::FluentBuilder, relative, svg, App, AppContext, ClipboardItem, Context, Div,
-    Entity, IntoElement, ParentElement, Render, Styled, Subscription, Window,
-};
-use nostr_connect::prelude::*;
-use state::get_client;
-use std::{path::PathBuf, time::Duration};
-use ui::{
-    button::{Button, ButtonCustomVariant, ButtonVariants},
-    input::{InputEvent, TextInput},
-    notification::NotificationType,
-    theme::{scale::ColorScaleStep, ActiveTheme},
-    ContextModal, Root, Size, StyledExt,
-};
-
-use super::app;
-
-const ALPHA_MESSAGE: &str =
-    "Coop is in the alpha stage of development; It may contain bugs, unfinished features, or unexpected behavior.";
-const JOIN_URL: &str = "https://start.njump.me/";
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Onboarding> {
-    Onboarding::new(window, cx)
-}
-
-pub struct Onboarding {
-    app_keys: Keys,
-    connect_uri: NostrConnectURI,
-    qr_path: Option<PathBuf>,
-    nsec_input: Entity<TextInput>,
-    use_connect: bool,
-    use_privkey: bool,
-    is_loading: bool,
-    #[allow(dead_code)]
-    subscriptions: Vec<Subscription>,
-}
-
-impl Onboarding {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let app_keys = Keys::generate();
-
-        let connect_uri = NostrConnectURI::client(
-            app_keys.public_key(),
-            vec![RelayUrl::parse("wss://relay.nsec.app").unwrap()],
-            "Coop",
-        );
-
-        let nsec_input = cx.new(|cx| {
-            TextInput::new(window, cx)
-                .text_size(Size::XSmall)
-                .placeholder("nsec...")
-        });
-
-        // Save Connect URI as PNG file for display as QR Code
-        let qr_path = create_qr(connect_uri.to_string().as_str()).ok();
-
-        cx.new(|cx| {
-            // Handle Enter event for nsec input
-            let subscriptions = vec![cx.subscribe_in(
-                &nsec_input,
-                window,
-                move |this: &mut Self, _, input_event, window, cx| {
-                    if let InputEvent::PressEnter = input_event {
-                        this.privkey_login(window, cx);
-                    }
-                },
-            )];
-
-            Self {
-                app_keys,
-                connect_uri,
-                qr_path,
-                nsec_input,
-                use_connect: false,
-                use_privkey: false,
-                is_loading: false,
-                subscriptions,
-            }
-        })
-    }
-
-    fn use_connect(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let uri = self.connect_uri.clone();
-        let app_keys = self.app_keys.clone();
-        let window_handle = window.window_handle();
-
-        self.use_connect = true;
-        cx.notify();
-
-        cx.spawn(|_, mut cx| async move {
-            let (tx, rx) = oneshot::channel::<NostrProfile>();
-
-            cx.background_spawn(async move {
-                if let Ok(signer) = NostrConnect::new(uri, app_keys, Duration::from_secs(300), None)
-                {
-                    if let Ok(uri) = signer.bunker_uri().await {
-                        let client = get_client();
-
-                        if let Some(public_key) = uri.remote_signer_public_key() {
-                            let metadata = client
-                                .fetch_metadata(*public_key, Duration::from_secs(2))
-                                .await
-                                .ok()
-                                .unwrap_or_default();
-
-                            if tx.send(NostrProfile::new(*public_key, metadata)).is_ok() {
-                                _ = client.set_signer(signer).await;
-                                _ = preload(client, *public_key).await;
-                            }
-                        }
-                    }
-                }
-            })
-            .detach();
-
-            if let Ok(profile) = rx.await {
-                _ = cx.update_window(window_handle, |_, window, cx| {
-                    window.replace_root(cx, |window, cx| {
-                        Root::new(app::init(profile, window, cx).into(), window, cx)
-                    });
-                })
-            }
-        })
-        .detach();
-    }
-
-    fn use_privkey(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.use_privkey = true;
-        cx.notify();
-    }
-
-    fn reset(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.use_privkey = false;
-        self.use_connect = false;
-        cx.notify();
-    }
-
-    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.is_loading = status;
-        cx.notify();
-    }
-
-    fn privkey_login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let value = self.nsec_input.read(cx).text().to_string();
-        let window_handle = window.window_handle();
-
-        if !value.starts_with("nsec") || value.is_empty() {
-            window.push_notification((NotificationType::Warning, "Private Key is required"), cx);
-            return;
-        }
-
-        let keys = if let Ok(keys) = Keys::parse(&value) {
-            keys
-        } else {
-            window.push_notification((NotificationType::Warning, "Private Key isn't valid"), cx);
-            return;
-        };
-
-        // Show loading spinner
-        self.set_loading(true, cx);
-
-        cx.spawn(|_, mut cx| async move {
-            let client = get_client();
-            let (tx, rx) = oneshot::channel::<NostrProfile>();
-
-            cx.background_spawn(async move {
-                if let Ok(public_key) = keys.get_public_key().await {
-                    let metadata = client
-                        .fetch_metadata(public_key, Duration::from_secs(2))
-                        .await
-                        .ok()
-                        .unwrap_or_default();
-
-                    if tx.send(NostrProfile::new(public_key, metadata)).is_ok() {
-                        _ = client.set_signer(keys).await;
-                        _ = preload(client, public_key).await;
-                    }
-                }
-            })
-            .detach();
-
-            if let Ok(profile) = rx.await {
-                _ = cx.update_window(window_handle, |_, window, cx| {
-                    window.replace_root(cx, |window, cx| {
-                        Root::new(app::init(profile, window, cx).into(), window, cx)
-                    });
-                })
-            }
-        })
-        .detach();
-    }
-
-    fn render_selection(&self, window: &mut Window, cx: &mut Context<Self>) -> Div {
-        div()
-            .w_full()
-            .flex()
-            .flex_col()
-            .items_center()
-            .justify_center()
-            .gap_2()
-            .child(
-                Button::new("login_connect_btn")
-                    .label("Login with Nostr Connect")
-                    .primary()
-                    .w_full()
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.use_connect(window, cx);
-                    })),
-            )
-            .child(
-                Button::new("login_privkey_btn")
-                    .label("Login with Private Key")
-                    .custom(
-                        ButtonCustomVariant::new(window, cx)
-                            .color(cx.theme().base.step(cx, ColorScaleStep::THREE))
-                            .border(cx.theme().base.step(cx, ColorScaleStep::THREE))
-                            .hover(cx.theme().base.step(cx, ColorScaleStep::FOUR))
-                            .active(cx.theme().base.step(cx, ColorScaleStep::FIVE))
-                            .foreground(cx.theme().base.step(cx, ColorScaleStep::TWELVE)),
-                    )
-                    .w_full()
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.use_privkey(window, cx);
-                    })),
-            )
-            .child(
-                div()
-                    .my_2()
-                    .h_px()
-                    .rounded_md()
-                    .w_full()
-                    .bg(cx.theme().base.step(cx, ColorScaleStep::THREE)),
-            )
-            .child(
-                Button::new("join_btn")
-                    .label("Are you new? Join here!")
-                    .ghost()
-                    .w_full()
-                    .on_click(|_, _, cx| {
-                        cx.open_url(JOIN_URL);
-                    }),
-            )
-    }
-
-    fn render_connect_login(&self, cx: &mut Context<Self>) -> Div {
-        let connect_string = self.connect_uri.to_string();
-
-        div()
-            .w_full()
-            .flex()
-            .flex_col()
-            .items_center()
-            .justify_center()
-            .gap_2()
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .text_xs()
-                    .text_center()
-                    .child(
-                        div()
-                            .font_semibold()
-                            .line_height(relative(1.2))
-                            .child("Scan this QR Code in the Nostr Signer app"),
-                    )
-                    .child("Recommend: Amber (Android), nsec.app (web),..."),
-            )
-            .when_some(self.qr_path.clone(), |this, path| {
-                this.child(
-                    div()
-                        .mb_2()
-                        .p_2()
-                        .size_72()
-                        .flex()
-                        .flex_col()
-                        .items_center()
-                        .justify_center()
-                        .gap_2()
-                        .rounded_lg()
-                        .shadow_lg()
-                        .when(cx.theme().appearance.is_dark(), |this| {
-                            this.shadow_none()
-                                .border_1()
-                                .border_color(cx.theme().base.step(cx, ColorScaleStep::SIX))
-                        })
-                        .bg(cx.theme().background)
-                        .child(img(path).h_64()),
-                )
-            })
-            .child(
-                Button::new("copy")
-                    .label("Copy Connection String")
-                    .primary()
-                    .w_full()
-                    .on_click(move |_, _, cx| {
-                        cx.write_to_clipboard(ClipboardItem::new_string(connect_string.clone()))
-                    }),
-            )
-            .child(
-                Button::new("cancel")
-                    .label("Cancel")
-                    .ghost()
-                    .w_full()
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.reset(window, cx);
-                    })),
-            )
-    }
-
-    fn render_privkey_login(&self, cx: &mut Context<Self>) -> Div {
-        div()
-            .w_full()
-            .flex()
-            .flex_col()
-            .gap_2()
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .gap_1()
-                    .text_xs()
-                    .child("Private Key:")
-                    .child(self.nsec_input.clone()),
-            )
-            .child(
-                Button::new("login")
-                    .label("Login")
-                    .primary()
-                    .w_full()
-                    .loading(self.is_loading)
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.privkey_login(window, cx);
-                    })),
-            )
-            .child(
-                Button::new("cancel")
-                    .label("Cancel")
-                    .ghost()
-                    .w_full()
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.reset(window, cx);
-                    })),
-            )
-    }
-}
-
-impl Render for Onboarding {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
-            .relative()
-            .flex()
-            .items_center()
-            .justify_center()
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .items_center()
-                    .gap_8()
-                    .child(
-                        div()
-                            .flex()
-                            .flex_col()
-                            .items_center()
-                            .gap_4()
-                            .child(
-                                svg()
-                                    .path("brand/coop.svg")
-                                    .size_12()
-                                    .text_color(cx.theme().base.step(cx, ColorScaleStep::THREE)),
-                            )
-                            .child(
-                                div()
-                                    .text_center()
-                                    .child(
-                                        div()
-                                            .text_lg()
-                                            .font_semibold()
-                                            .line_height(relative(1.2))
-                                            .child("Welcome to Coop!"),
-                                    )
-                                    .child(
-                                        div()
-                                            .text_sm()
-                                            .text_color(
-                                                cx.theme().base.step(cx, ColorScaleStep::ELEVEN),
-                                            )
-                                            .child("A Nostr client for secure communication."),
-                                    ),
-                            ),
-                    )
-                    .child(div().w_72().map(|_| {
-                        if self.use_privkey {
-                            self.render_privkey_login(cx)
-                        } else if self.use_connect {
-                            self.render_connect_login(cx)
-                        } else {
-                            self.render_selection(window, cx)
-                        }
-                    })),
-            )
-            .child(
-                div()
-                    .absolute()
-                    .bottom_2()
-                    .w_full()
-                    .flex()
-                    .items_center()
-                    .justify_center()
-                    .text_xs()
-                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
-                    .text_align(gpui::TextAlign::Center)
-                    .child(ALPHA_MESSAGE),
-            )
-    }
-}
--- a/crates/app/src/views/relays.rs
+++ b/crates/app/src/views/relays.rs
@@ -1,265 +0,0 @@
-use gpui::{
-    div, prelude::FluentBuilder, px, uniform_list, AppContext, Context, Entity, FocusHandle,
-    InteractiveElement, IntoElement, ParentElement, Render, Styled, TextAlign, Window,
-};
-use nostr_sdk::prelude::*;
-use state::get_client;
-use ui::{
-    button::{Button, ButtonVariants},
-    input::{InputEvent, TextInput},
-    theme::{scale::ColorScaleStep, ActiveTheme},
-    ContextModal, IconName, Sizable,
-};
-
-const MESSAGE: &str = "In order to receive messages from others, you need to setup Messaging Relays. You can use the recommend relays or add more.";
-
-pub struct Relays {
-    relays: Entity<Vec<Url>>,
-    input: Entity<TextInput>,
-    focus_handle: FocusHandle,
-    is_loading: bool,
-}
-
-impl Relays {
-    pub fn new(
-        relays: Option<Vec<String>>,
-        window: &mut Window,
-        cx: &mut Context<'_, Self>,
-    ) -> Self {
-        let relays = cx.new(|_| {
-            if let Some(value) = relays {
-                value.into_iter().map(|v| Url::parse(&v).unwrap()).collect()
-            } else {
-                vec![
-                    Url::parse("wss://auth.nostr1.com").unwrap(),
-                    Url::parse("wss://relay.0xchat.com").unwrap(),
-                ]
-            }
-        });
-
-        let input = cx.new(|cx| {
-            TextInput::new(window, cx)
-                .text_size(ui::Size::XSmall)
-                .small()
-                .placeholder("wss://...")
-        });
-
-        cx.subscribe_in(&input, window, move |this, _, input_event, window, cx| {
-            if let InputEvent::PressEnter = input_event {
-                this.add(window, cx);
-            }
-        })
-        .detach();
-
-        Self {
-            relays,
-            input,
-            is_loading: false,
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    pub fn update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let relays = self.relays.read(cx).clone();
-        let window_handle = window.window_handle();
-
-        self.set_loading(true, cx);
-
-        let client = get_client();
-        let (tx, rx) = oneshot::channel();
-
-        cx.background_spawn(async move {
-            let signer = client.signer().await.expect("Signer is required");
-            let public_key = signer
-                .get_public_key()
-                .await
-                .expect("Cannot get public key");
-
-            // If user didn't have any NIP-65 relays, add default ones
-            // TODO: Is this really necessary?
-            if let Ok(relay_list) = client.database().relay_list(public_key).await {
-                if relay_list.is_empty() {
-                    let builder = EventBuilder::relay_list(vec![
-                        (RelayUrl::parse("wss://relay.damus.io/").unwrap(), None),
-                        (RelayUrl::parse("wss://relay.primal.net/").unwrap(), None),
-                        (RelayUrl::parse("wss://nos.lol/").unwrap(), None),
-                    ]);
-
-                    if let Err(e) = client.send_event_builder(builder).await {
-                        log::error!("Failed to send relay list event: {}", e)
-                    }
-                }
-            }
-
-            let tags: Vec<Tag> = relays
-                .into_iter()
-                .map(|relay| Tag::custom(TagKind::Relay, vec![relay.to_string()]))
-                .collect();
-
-            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
-
-            if let Ok(output) = client.send_event_builder(builder).await {
-                _ = tx.send(output.val);
-            };
-        })
-        .detach();
-
-        cx.spawn(|this, mut cx| async move {
-            if rx.await.is_ok() {
-                _ = cx.update_window(window_handle, |_, window, cx| {
-                    _ = this.update(cx, |this, cx| {
-                        this.set_loading(false, cx);
-                    });
-
-                    window.close_modal(cx);
-                });
-            }
-        })
-        .detach();
-    }
-
-    pub fn loading(&self) -> bool {
-        self.is_loading
-    }
-
-    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.is_loading = status;
-        cx.notify();
-    }
-
-    fn add(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let value = self.input.read(cx).text().to_string();
-
-        if !value.starts_with("ws") {
-            return;
-        }
-
-        if let Ok(url) = Url::parse(&value) {
-            self.relays.update(cx, |this, cx| {
-                if !this.contains(&url) {
-                    this.push(url);
-                    cx.notify();
-                }
-            });
-
-            self.input.update(cx, |this, cx| {
-                this.set_text("", window, cx);
-            });
-        }
-    }
-
-    fn remove(&mut self, ix: usize, _window: &mut Window, cx: &mut Context<Self>) {
-        self.relays.update(cx, |this, cx| {
-            this.remove(ix);
-            cx.notify();
-        });
-    }
-}
-
-impl Render for Relays {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .track_focus(&self.focus_handle)
-            .flex()
-            .flex_col()
-            .gap_2()
-            .child(
-                div()
-                    .px_2()
-                    .text_xs()
-                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
-                    .child(MESSAGE),
-            )
-            .child(
-                div()
-                    .px_2()
-                    .flex()
-                    .flex_col()
-                    .gap_2()
-                    .child(
-                        div()
-                            .flex()
-                            .items_center()
-                            .gap_2()
-                            .child(self.input.clone())
-                            .child(
-                                Button::new("add_relay_btn")
-                                    .icon(IconName::Plus)
-                                    .small()
-                                    .rounded(px(cx.theme().radius))
-                                    .on_click(
-                                        cx.listener(|this, _, window, cx| this.add(window, cx)),
-                                    ),
-                            ),
-                    )
-                    .map(|this| {
-                        let view = cx.entity();
-                        let relays = self.relays.read(cx).clone();
-                        let total = relays.len();
-
-                        if !relays.is_empty() {
-                            this.child(
-                                uniform_list(
-                                    view,
-                                    "relays",
-                                    total,
-                                    move |_, range, _window, cx| {
-                                        let mut items = Vec::new();
-
-                                        for ix in range {
-                                            let item = relays.get(ix).unwrap().clone().to_string();
-
-                                            items.push(
-                                                div().group("").w_full().h_9().py_0p5().child(
-                                                    div()
-                                                        .px_2()
-                                                        .h_full()
-                                                        .w_full()
-                                                        .flex()
-                                                        .items_center()
-                                                        .justify_between()
-                                                        .rounded(px(cx.theme().radius))
-                                                        .bg(cx
-                                                            .theme()
-                                                            .base
-                                                            .step(cx, ColorScaleStep::THREE))
-                                                        .text_xs()
-                                                        .child(item)
-                                                        .child(
-                                                            Button::new("remove_{ix}")
-                                                                .icon(IconName::Close)
-                                                                .xsmall()
-                                                                .ghost()
-                                                                .invisible()
-                                                                .group_hover("", |this| {
-                                                                    this.visible()
-                                                                })
-                                                                .on_click(cx.listener(
-                                                                    move |this, _, window, cx| {
-                                                                        this.remove(ix, window, cx)
-                                                                    },
-                                                                )),
-                                                        ),
-                                                ),
-                                            )
-                                        }
-
-                                        items
-                                    },
-                                )
-                                .min_h(px(120.)),
-                            )
-                        } else {
-                            this.h_20()
-                                .mb_2()
-                                .flex()
-                                .items_center()
-                                .justify_center()
-                                .text_xs()
-                                .text_align(TextAlign::Center)
-                                .child("Please add some relays.")
-                        }
-                    }),
-            )
-    }
-}
--- a/crates/app/src/views/settings.rs
+++ b/crates/app/src/views/settings.rs
@@ -1,76 +0,0 @@
-use gpui::{
-    div, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    IntoElement, ParentElement, Render, SharedString, Styled, Window,
-};
-use ui::{
-    button::Button,
-    dock_area::panel::{Panel, PanelEvent},
-    popup_menu::PopupMenu,
-};
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Settings> {
-    Settings::new(window, cx)
-}
-
-pub struct Settings {
-    name: SharedString,
-    closable: bool,
-    zoomable: bool,
-    focus_handle: FocusHandle,
-}
-
-impl Settings {
-    pub fn new(_window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self {
-            name: "Settings".into(),
-            closable: true,
-            zoomable: true,
-            focus_handle: cx.focus_handle(),
-        })
-    }
-}
-
-impl Panel for Settings {
-    fn panel_id(&self) -> SharedString {
-        "SettingsPanel".into()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Settings {}
-
-impl Focusable for Settings {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Settings {
-    fn render(&mut self, _window: &mut gpui::Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
-            .flex()
-            .items_center()
-            .justify_center()
-            .child("Settings")
-    }
-}
--- a/crates/app/src/views/sidebar/inbox.rs
+++ b/crates/app/src/views/sidebar/inbox.rs
@@ -1,182 +0,0 @@
-use crate::views::app::{AddPanel, PanelKind};
-use chats::registry::ChatRegistry;
-use gpui::{
-    div, img, percentage, prelude::FluentBuilder, px, relative, Context, InteractiveElement,
-    IntoElement, ParentElement, Render, SharedString, StatefulInteractiveElement, Styled,
-    TextAlign, Window,
-};
-use ui::{
-    dock_area::dock::DockPlacement,
-    skeleton::Skeleton,
-    theme::{scale::ColorScaleStep, ActiveTheme},
-    v_flex, Collapsible, Icon, IconName, StyledExt,
-};
-
-pub struct Inbox {
-    label: SharedString,
-    is_collapsed: bool,
-}
-
-impl Inbox {
-    pub fn new(_window: &mut Window, _cx: &mut Context<'_, Self>) -> Self {
-        Self {
-            label: "Inbox".into(),
-            is_collapsed: false,
-        }
-    }
-
-    fn render_skeleton(&self, total: i32) -> impl IntoIterator<Item = impl IntoElement> {
-        (0..total).map(|_| {
-            div()
-                .h_8()
-                .px_1()
-                .flex()
-                .items_center()
-                .gap_2()
-                .child(Skeleton::new().flex_shrink_0().size_6().rounded_full())
-                .child(Skeleton::new().w_20().h_3().rounded_sm())
-        })
-    }
-
-    fn render_item(&self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if let Some(chats) = ChatRegistry::global(cx) {
-            div().map(|this| {
-                let state = chats.read(cx);
-                let rooms = state.rooms();
-
-                if state.is_loading() {
-                    this.children(self.render_skeleton(5))
-                } else if rooms.is_empty() {
-                    this.px_1()
-                        .w_full()
-                        .h_20()
-                        .flex()
-                        .flex_col()
-                        .items_center()
-                        .justify_center()
-                        .text_align(TextAlign::Center)
-                        .rounded(px(cx.theme().radius))
-                        .bg(cx.theme().base.step(cx, ColorScaleStep::THREE))
-                        .child(
-                            div()
-                                .text_xs()
-                                .font_semibold()
-                                .line_height(relative(1.2))
-                                .child("No chats"),
-                        )
-                        .child(
-                            div()
-                                .text_xs()
-                                .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
-                                .child("Recent chats will appear here."),
-                        )
-                } else {
-                    this.children(rooms.iter().map(|model| {
-                        let room = model.read(cx);
-                        let room_id: SharedString = room.id.to_string().into();
-
-                        div()
-                            .id(room_id)
-                            .h_8()
-                            .px_1()
-                            .flex()
-                            .items_center()
-                            .justify_between()
-                            .text_xs()
-                            .rounded(px(cx.theme().radius))
-                            .hover(|this| this.bg(cx.theme().base.step(cx, ColorScaleStep::FOUR)))
-                            .child(div().flex_1().truncate().font_medium().map(|this| {
-                                if room.is_group {
-                                    this.flex()
-                                        .items_center()
-                                        .gap_2()
-                                        .child(img("brand/avatar.png").size_6().rounded_full())
-                                        .child(room.name())
-                                } else {
-                                    this.when_some(room.members.first(), |this, sender| {
-                                        this.flex()
-                                            .items_center()
-                                            .gap_2()
-                                            .child(
-                                                img(sender.avatar())
-                                                    .size_6()
-                                                    .rounded_full()
-                                                    .flex_shrink_0(),
-                                            )
-                                            .child(sender.name())
-                                    })
-                                }
-                            }))
-                            .child(
-                                div()
-                                    .flex_shrink_0()
-                                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
-                                    .child(room.last_seen.ago()),
-                            )
-                            .on_click({
-                                let id = room.id;
-                                cx.listener(move |this, _, window, cx| {
-                                    this.action(id, window, cx);
-                                })
-                            })
-                    }))
-                }
-            })
-        } else {
-            div().children(self.render_skeleton(5))
-        }
-    }
-
-    fn action(&self, id: u64, window: &mut Window, cx: &mut Context<Self>) {
-        window.dispatch_action(
-            Box::new(AddPanel::new(PanelKind::Room(id), DockPlacement::Center)),
-            cx,
-        );
-    }
-}
-
-impl Collapsible for Inbox {
-    fn collapsed(mut self, collapsed: bool) -> Self {
-        self.is_collapsed = collapsed;
-        self
-    }
-
-    fn is_collapsed(&self) -> bool {
-        self.is_collapsed
-    }
-}
-
-impl Render for Inbox {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .px_2()
-            .gap_1()
-            .child(
-                div()
-                    .id("inbox")
-                    .h_7()
-                    .px_1()
-                    .flex()
-                    .items_center()
-                    .rounded(px(cx.theme().radius))
-                    .text_xs()
-                    .font_semibold()
-                    .child(
-                        Icon::new(IconName::ChevronDown)
-                            .size_6()
-                            .when(self.is_collapsed, |this| {
-                                this.rotate(percentage(270. / 360.))
-                            }),
-                    )
-                    .child(self.label.clone())
-                    .hover(|this| this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE)))
-                    .on_click(cx.listener(move |view, _event, _window, cx| {
-                        view.is_collapsed = !view.is_collapsed;
-                        cx.notify();
-                    })),
-            )
-            .when(!self.is_collapsed, |this| {
-                this.child(self.render_item(window, cx))
-            })
-    }
-}
--- a/crates/app/src/views/sidebar/mod.rs
+++ b/crates/app/src/views/sidebar/mod.rs
@@ -1,157 +0,0 @@
-use crate::views::sidebar::inbox::Inbox;
-use compose::Compose;
-use gpui::{
-    div, px, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString,
-    StatefulInteractiveElement, Styled, Window,
-};
-use ui::{
-    button::{Button, ButtonRounded, ButtonVariants},
-    dock_area::panel::{Panel, PanelEvent},
-    popup_menu::PopupMenu,
-    theme::{scale::ColorScaleStep, ActiveTheme},
-    v_flex, ContextModal, Disableable, Icon, IconName, Sizable, StyledExt,
-};
-
-mod compose;
-mod inbox;
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Sidebar> {
-    Sidebar::new(window, cx)
-}
-
-pub struct Sidebar {
-    // Panel
-    name: SharedString,
-    closable: bool,
-    zoomable: bool,
-    focus_handle: FocusHandle,
-    // Dock
-    inbox: Entity<Inbox>,
-}
-
-impl Sidebar {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self::view(window, cx))
-    }
-
-    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let inbox = cx.new(|cx| Inbox::new(window, cx));
-
-        Self {
-            name: "Sidebar".into(),
-            closable: true,
-            zoomable: true,
-            focus_handle: cx.focus_handle(),
-            inbox,
-        }
-    }
-
-    fn show_compose(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let compose = cx.new(|cx| Compose::new(window, cx));
-
-        window.open_modal(cx, move |modal, window, cx| {
-            let label = compose.read(cx).label(window, cx);
-            let is_submitting = compose.read(cx).is_submitting();
-
-            modal
-                .title("Direct Messages")
-                .width(px(420.))
-                .child(compose.clone())
-                .footer(
-                    div()
-                        .p_2()
-                        .border_t_1()
-                        .border_color(cx.theme().base.step(cx, ColorScaleStep::FIVE))
-                        .child(
-                            Button::new("create_dm_btn")
-                                .label(label)
-                                .primary()
-                                .bold()
-                                .rounded(ButtonRounded::Large)
-                                .w_full()
-                                .loading(is_submitting)
-                                .disabled(is_submitting)
-                                .on_click(window.listener_for(&compose, |this, _, window, cx| {
-                                    this.compose(window, cx)
-                                })),
-                        ),
-                )
-        })
-    }
-}
-
-impl Panel for Sidebar {
-    fn panel_id(&self) -> SharedString {
-        "Sidebar".into()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Sidebar {}
-
-impl Focusable for Sidebar {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Sidebar {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .w_full()
-            .py_3()
-            .gap_3()
-            .child(
-                v_flex().px_2().gap_1().child(
-                    div()
-                        .id("new")
-                        .flex()
-                        .items_center()
-                        .gap_2()
-                        .px_1()
-                        .h_7()
-                        .text_xs()
-                        .font_semibold()
-                        .rounded(px(cx.theme().radius))
-                        .child(
-                            div()
-                                .size_6()
-                                .flex()
-                                .items_center()
-                                .justify_center()
-                                .rounded_full()
-                                .bg(cx.theme().accent.step(cx, ColorScaleStep::NINE))
-                                .child(
-                                    Icon::new(IconName::ComposeFill)
-                                        .small()
-                                        .text_color(cx.theme().base.darken(cx)),
-                                ),
-                        )
-                        .child("New Message")
-                        .hover(|this| this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE)))
-                        .on_click(cx.listener(|this, _, window, cx| this.show_compose(window, cx))),
-                ),
-            )
-            .child(self.inbox.clone())
-    }
-}
--- a/crates/app/src/views/startup.rs
+++ b/crates/app/src/views/startup.rs
@@ -1,32 +0,0 @@
-use gpui::{
-    div, svg, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, Styled, Window,
-};
-use ui::theme::{scale::ColorScaleStep, ActiveTheme};
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Startup> {
-    Startup::new(window, cx)
-}
-
-pub struct Startup {}
-
-impl Startup {
-    pub fn new(_window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|_| Self {})
-    }
-}
-
-impl Render for Startup {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
-            .flex()
-            .items_center()
-            .justify_center()
-            .child(
-                svg()
-                    .path("brand/coop.svg")
-                    .size_12()
-                    .text_color(cx.theme().base.step(cx, ColorScaleStep::THREE)),
-            )
-    }
-}
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "auto_update"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+global = { path = "../global" }
+
+gpui.workspace = true
+nostr-sdk.workspace = true
+anyhow.workspace = true
+smol.workspace = true
+log.workspace = true
+
+tempfile = "3.19.1"
+reqwest = { version = "0.12", features = ["stream"] }
--- a/crates/auto_update/src/lib.rs
+++ b/crates/auto_update/src/lib.rs
@@ -0,0 +1,350 @@
+use std::{
+    env::{self, consts::OS},
+    ffi::OsString,
+    path::PathBuf,
+};
+
+use anyhow::{anyhow, Context as _, Error};
+use global::get_client;
+use gpui::{App, AppContext, Context, Entity, Global, SemanticVersion, Task};
+use nostr_sdk::prelude::*;
+use smol::{
+    fs::{self, File},
+    io::AsyncWriteExt,
+    process::Command,
+};
+use tempfile::TempDir;
+
+struct GlobalAutoUpdate(Entity<AutoUpdater>);
+
+impl Global for GlobalAutoUpdate {}
+
+pub fn init(cx: &mut App) {
+    let env = env!("CARGO_PKG_VERSION");
+    let current_version: SemanticVersion = env.parse().expect("Invalid version in Cargo.toml");
+
+    AutoUpdater::set_global(
+        cx.new(|_| AutoUpdater {
+            current_version,
+            status: AutoUpdateStatus::Idle,
+        }),
+        cx,
+    );
+}
+
+struct MacOsUnmounter {
+    mount_path: PathBuf,
+}
+
+impl Drop for MacOsUnmounter {
+    fn drop(&mut self) {
+        let unmount_output = std::process::Command::new("hdiutil")
+            .args(["detach", "-force"])
+            .arg(&self.mount_path)
+            .output();
+
+        match unmount_output {
+            Ok(output) if output.status.success() => {
+                log::info!("Successfully unmounted the disk image");
+            }
+            Ok(output) => {
+                log::error!(
+                    "Failed to unmount disk image: {:?}",
+                    String::from_utf8_lossy(&output.stderr)
+                );
+            }
+            Err(error) => {
+                log::error!("Error while trying to unmount disk image: {:?}", error);
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum AutoUpdateStatus {
+    Idle,
+    Checking,
+    Downloading,
+    Installing,
+    Updated { binary_path: PathBuf },
+    Errored,
+}
+
+impl AutoUpdateStatus {
+    pub fn is_updated(&self) -> bool {
+        matches!(self, Self::Updated { .. })
+    }
+}
+
+#[derive(Debug)]
+pub struct AutoUpdater {
+    status: AutoUpdateStatus,
+    current_version: SemanticVersion,
+}
+
+impl AutoUpdater {
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalAutoUpdate>().0.clone()
+    }
+
+    pub fn set_global(auto_updater: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalAutoUpdate(auto_updater));
+    }
+
+    pub fn current_version(&self) -> SemanticVersion {
+        self.current_version
+    }
+
+    pub fn status(&self) -> AutoUpdateStatus {
+        self.status.clone()
+    }
+
+    pub fn set_status(&mut self, status: AutoUpdateStatus, cx: &mut Context<Self>) {
+        self.status = status;
+        cx.notify();
+    }
+
+    pub fn update(&mut self, event: Event, cx: &mut Context<Self>) {
+        self.set_status(AutoUpdateStatus::Checking, cx);
+
+        // Extract the version from the identifier tag
+        let ident = match event.tags.identifier() {
+            Some(i) => match i.split('@').next_back() {
+                Some(i) => i,
+                None => return,
+            },
+            None => return,
+        };
+
+        // Convert the version string to a SemanticVersion
+        let new_version: SemanticVersion = ident.parse().expect("Invalid version");
+
+        // Check if the new version is the same as the current version
+        if self.current_version == new_version {
+            self.set_status(AutoUpdateStatus::Idle, cx);
+            return;
+        };
+
+        // Download the new version
+        self.set_status(AutoUpdateStatus::Downloading, cx);
+
+        let task: Task<Result<(TempDir, PathBuf), Error>> = cx.background_spawn(async move {
+            let client = get_client();
+            let ids = event.tags.event_ids().copied();
+            let filter = Filter::new().ids(ids).kind(Kind::FileMetadata);
+            let events = client.database().query(filter).await?;
+
+            if let Some(event) = events.into_iter().find(|event| event.content == OS) {
+                let tag = event.tags.find(TagKind::Url).context("url not found")?;
+                let url = Url::parse(tag.content().context("invalid")?)?;
+
+                let temp_dir = tempfile::Builder::new().prefix("coop-update").tempdir()?;
+                let filename = match OS {
+                    "macos" => Ok("Coop.dmg"),
+                    "linux" => Ok("Coop.tar.gz"),
+                    "windows" => Ok("CoopUpdateInstaller.exe"),
+                    _ => Err(anyhow!("not supported: {:?}", OS)),
+                }?;
+
+                let downloaded_asset = temp_dir.path().join(filename);
+                let mut target_file = File::create(&downloaded_asset).await?;
+
+                let response = reqwest::get(url).await?;
+                let mut stream = response.bytes_stream();
+
+                while let Some(item) = stream.next().await {
+                    let chunk = item?;
+                    target_file.write_all(&chunk).await?;
+                }
+
+                log::info!("downloaded update. path:{:?}", downloaded_asset);
+
+                Ok((temp_dir, downloaded_asset))
+            } else {
+                Err(anyhow!("Not found"))
+            }
+        });
+
+        cx.spawn(async move |this, cx| {
+            if let Ok((temp_dir, downloaded_asset)) = task.await {
+                cx.update(|cx| {
+                    this.update(cx, |this, cx| {
+                        this.set_status(AutoUpdateStatus::Installing, cx);
+
+                        match OS {
+                            "macos" => this.install_release_macos(temp_dir, downloaded_asset, cx),
+                            "linux" => this.install_release_linux(temp_dir, downloaded_asset, cx),
+                            "windows" => this.install_release_windows(downloaded_asset, cx),
+                            _ => {}
+                        }
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn install_release_macos(&mut self, temp_dir: TempDir, asset: PathBuf, cx: &mut Context<Self>) {
+        let running_app_path = cx.app_path().unwrap();
+        let running_app_filename = running_app_path.file_name().unwrap();
+
+        let mount_path = temp_dir.path().join("Coop");
+
+        let mut mounted_app_path: OsString = mount_path.join(running_app_filename).into();
+        mounted_app_path.push("/");
+
+        let task: Task<Result<PathBuf, Error>> = cx.background_spawn(async move {
+            let output = Command::new("hdiutil")
+                .args(["attach", "-nobrowse"])
+                .arg(&asset)
+                .arg("-mountroot")
+                .arg(temp_dir.path())
+                .output()
+                .await?;
+
+            anyhow::ensure!(
+                output.status.success(),
+                "failed to mount: {:?}",
+                String::from_utf8_lossy(&output.stderr)
+            );
+
+            // Create an MacOsUnmounter that will be dropped (and thus unmount the disk) when this function exits
+            let _unmounter = MacOsUnmounter {
+                mount_path: mount_path.clone(),
+            };
+
+            let output = Command::new("rsync")
+                .args(["-av", "--delete"])
+                .arg(&mounted_app_path)
+                .arg(&running_app_path)
+                .output()
+                .await?;
+
+            anyhow::ensure!(
+                output.status.success(),
+                "failed to copy app: {:?}",
+                String::from_utf8_lossy(&output.stderr)
+            );
+
+            Ok(running_app_path)
+        });
+
+        cx.spawn(async move |this, cx| {
+            if let Ok(binary_path) = task.await {
+                cx.update(|cx| {
+                    this.update(cx, |this, cx| {
+                        this.status = AutoUpdateStatus::Updated { binary_path };
+                        cx.notify();
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn install_release_linux(&mut self, temp_dir: TempDir, asset: PathBuf, cx: &mut Context<Self>) {
+        let home_dir = PathBuf::from(env::var("HOME").unwrap());
+        let running_app_path = cx.app_path().unwrap();
+        let extracted = temp_dir.path().join("coop");
+
+        let task: Task<Result<PathBuf, Error>> = cx.background_spawn(async move {
+            fs::create_dir_all(&extracted).await?;
+
+            let output = Command::new("tar")
+                .arg("-xzf")
+                .arg(&asset)
+                .arg("-C")
+                .arg(&extracted)
+                .output()
+                .await?;
+
+            anyhow::ensure!(
+                output.status.success(),
+                "failed to extract {:?} to {:?}: {:?}",
+                asset,
+                extracted,
+                String::from_utf8_lossy(&output.stderr)
+            );
+
+            let app_folder_name: String = "coop.app".into();
+            let from = extracted.join(&app_folder_name);
+            let mut to = home_dir.join(".local");
+
+            let expected_suffix = format!("{}/libexec/coop", app_folder_name);
+
+            if let Some(prefix) = running_app_path
+                .to_str()
+                .and_then(|str| str.strip_suffix(&expected_suffix))
+            {
+                to = PathBuf::from(prefix);
+            }
+
+            let output = Command::new("rsync")
+                .args(["-av", "--delete"])
+                .arg(&from)
+                .arg(&to)
+                .output()
+                .await?;
+
+            anyhow::ensure!(
+                output.status.success(),
+                "failed to copy Coop update from {:?} to {:?}: {:?}",
+                from,
+                to,
+                String::from_utf8_lossy(&output.stderr)
+            );
+
+            Ok(to.join(expected_suffix))
+        });
+
+        cx.spawn(async move |this, cx| {
+            if let Ok(binary_path) = task.await {
+                cx.update(|cx| {
+                    this.update(cx, |this, cx| {
+                        this.status = AutoUpdateStatus::Updated { binary_path };
+                        cx.notify();
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn install_release_windows(&mut self, asset: PathBuf, cx: &mut Context<Self>) {
+        let task: Task<Result<PathBuf, Error>> = cx.background_spawn(async move {
+            let output = Command::new(asset)
+                .arg("/verysilent")
+                .arg("/update=true")
+                .arg("!desktopicon")
+                .arg("!quicklaunchicon")
+                .output()
+                .await?;
+            anyhow::ensure!(
+                output.status.success(),
+                "failed to start installer: {:?}",
+                String::from_utf8_lossy(&output.stderr)
+            );
+            Ok(std::env::current_exe()?)
+        });
+
+        cx.spawn(async move |this, cx| {
+            if let Ok(binary_path) = task.await {
+                cx.update(|cx| {
+                    this.update(cx, |this, cx| {
+                        this.status = AutoUpdateStatus::Updated { binary_path };
+                        cx.notify();
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+}
--- a/crates/chats/Cargo.toml
+++ b/crates/chats/Cargo.toml
@@ -1,17 +1,22 @@
 [package]
 name = "chats"
-version = "0.0.0"
-edition = "2021"
-publish = false
+version.workspace = true
+edition.workspace = true
+publish.workspace = true

 [dependencies]
+account = { path = "../account" }
 common = { path = "../common" }
-state = { path = "../state" }
+global = { path = "../global" }
+ui = { path = "../ui" }

 gpui.workspace = true
+nostr.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
 chrono.workspace = true
+smallvec.workspace = true
 smol.workspace = true
 oneshot.workspace = true
+log.workspace = true
--- a/crates/chats/src/constants.rs
+++ b/crates/chats/src/constants.rs
@@ -0,0 +1,5 @@
+pub(crate) const NOW: &str = "now";
+pub(crate) const SECONDS_IN_MINUTE: i64 = 60;
+pub(crate) const MINUTES_IN_HOUR: i64 = 60;
+pub(crate) const HOURS_IN_DAY: i64 = 24;
+pub(crate) const DAYS_IN_MONTH: i64 = 30;
--- a/crates/chats/src/lib.rs
+++ b/crates/chats/src/lib.rs
@@ -1,2 +1,307 @@
-pub mod registry;
+use std::{cmp::Reverse, collections::HashMap};
+
+use anyhow::{anyhow, Error};
+use common::room_hash;
+use global::get_client;
+use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task, Window};
+use itertools::Itertools;
+use nostr_sdk::prelude::*;
+use room::RoomKind;
+use smallvec::{smallvec, SmallVec};
+
+use crate::room::Room;
+
+mod constants;
+pub mod message;
 pub mod room;
+
+pub fn init(cx: &mut App) {
+    ChatRegistry::set_global(cx.new(ChatRegistry::new), cx);
+}
+
+struct GlobalChatRegistry(Entity<ChatRegistry>);
+
+impl Global for GlobalChatRegistry {}
+
+/// Main registry for managing chat rooms and user profiles
+///
+/// The ChatRegistry is responsible for:
+/// - Managing chat rooms and their states
+/// - Tracking user profiles
+/// - Loading room data from the lmdb
+/// - Handling messages and room creation
+pub struct ChatRegistry {
+    /// Collection of all chat rooms
+    rooms: Vec<Entity<Room>>,
+
+    /// Map of user public keys to their profile metadata
+    profiles: Entity<HashMap<PublicKey, Option<Metadata>>>,
+
+    /// Indicates if rooms are currently being loaded
+    loading: bool,
+
+    /// Subscriptions for observing changes
+    #[allow(dead_code)]
+    subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl ChatRegistry {
+    /// Retrieve the global ChatRegistry instance
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalChatRegistry>().0.clone()
+    }
+
+    /// Set the global ChatRegistry instance
+    pub fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalChatRegistry(state));
+    }
+
+    /// Create a new ChatRegistry instance
+    fn new(cx: &mut Context<Self>) -> Self {
+        let profiles = cx.new(|_| HashMap::new());
+        let mut subscriptions = smallvec![];
+
+        // Observe new Room creations to collect profile metadata
+        subscriptions.push(cx.observe_new::<Room>(|this, _, cx| {
+            let task = this.metadata(cx);
+
+            cx.spawn(async move |_, cx| {
+                if let Ok(data) = task.await {
+                    cx.update(|cx| {
+                        for (public_key, metadata) in data.into_iter() {
+                            Self::global(cx).update(cx, |this, cx| {
+                                this.add_profile(public_key, metadata, cx);
+                            })
+                        }
+                    })
+                    .ok();
+                }
+            })
+            .detach();
+        }));
+
+        Self {
+            rooms: vec![],
+            loading: true,
+            profiles,
+            subscriptions,
+        }
+    }
+
+    /// Get the global loading status
+    pub fn loading(&self) -> bool {
+        self.loading
+    }
+
+    /// Get a room by its ID.
+    pub fn room(&self, id: &u64, cx: &App) -> Option<Entity<Room>> {
+        self.rooms
+            .iter()
+            .find(|model| model.read(cx).id == *id)
+            .cloned()
+    }
+
+    /// Get all rooms grouped by their kind.
+    pub fn rooms(&self, cx: &App) -> HashMap<RoomKind, Vec<&Entity<Room>>> {
+        let mut groups = HashMap::new();
+        groups.insert(RoomKind::Ongoing, Vec::new());
+        groups.insert(RoomKind::Trusted, Vec::new());
+        groups.insert(RoomKind::Unknown, Vec::new());
+
+        for room in self.rooms.iter() {
+            let kind = room.read(cx).kind;
+            groups.entry(kind).or_insert_with(Vec::new).push(room);
+        }
+
+        groups
+    }
+
+    /// Get rooms by their kind.
+    pub fn rooms_by_kind(&self, kind: RoomKind, cx: &App) -> Vec<&Entity<Room>> {
+        self.rooms
+            .iter()
+            .filter(|room| room.read(cx).kind == kind)
+            .collect()
+    }
+
+    /// Get the IDs of all rooms.
+    pub fn room_ids(&self, cx: &mut Context<Self>) -> Vec<u64> {
+        self.rooms.iter().map(|room| room.read(cx).id).collect()
+    }
+
+    /// Load all rooms from the lmdb.
+    ///
+    /// This method:
+    /// 1. Fetches all private direct messages from the lmdb
+    /// 2. Groups them by ID
+    /// 3. Determines each room's type based on message frequency and trust status
+    /// 4. Creates Room entities for each unique room
+    pub fn load_rooms(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        type Rooms = Vec<(Event, usize, bool)>;
+
+        let task: Task<Result<Rooms, Error>> = cx.background_spawn(async move {
+            let client = get_client();
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            // Get messages sent by the user
+            let send = Filter::new()
+                .kind(Kind::PrivateDirectMessage)
+                .author(public_key);
+
+            // Get messages received by the user
+            let recv = Filter::new()
+                .kind(Kind::PrivateDirectMessage)
+                .pubkey(public_key);
+
+            let send_events = client.database().query(send).await?;
+            let recv_events = client.database().query(recv).await?;
+            let events = send_events.merge(recv_events);
+
+            let mut room_map: HashMap<u64, (Event, usize, bool)> = HashMap::new();
+
+            // Process each event and group by room hash
+            for event in events
+                .into_iter()
+                .filter(|ev| ev.tags.public_keys().peekable().peek().is_some())
+            {
+                let hash = room_hash(&event);
+
+                let filter = Filter::new().kind(Kind::ContactList).pubkey(event.pubkey);
+                let is_trust = client.database().count(filter).await? >= 1;
+
+                room_map
+                    .entry(hash)
+                    .and_modify(|(_, count, trusted)| {
+                        *count += 1;
+                        *trusted = is_trust;
+                    })
+                    .or_insert((event, 1, is_trust));
+            }
+
+            // Sort rooms by creation date (newest first)
+            let result: Vec<(Event, usize, bool)> = room_map
+                .into_values()
+                .sorted_by_key(|(ev, _, _)| Reverse(ev.created_at))
+                .collect();
+
+            Ok(result)
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(events) = task.await {
+                cx.update(|_, cx| {
+                    this.update(cx, |this, cx| {
+                        let ids = this.room_ids(cx);
+                        let rooms: Vec<Entity<Room>> = events
+                            .into_iter()
+                            .filter_map(|(event, count, trusted)| {
+                                let hash = room_hash(&event);
+                                if !ids.iter().any(|this| this == &hash) {
+                                    let kind = if count > 2 {
+                                        // If frequency count is greater than 2, mark this room as ongoing
+                                        RoomKind::Ongoing
+                                    } else if trusted {
+                                        RoomKind::Trusted
+                                    } else {
+                                        RoomKind::Unknown
+                                    };
+                                    Some(cx.new(|_| Room::new(&event).kind(kind)))
+                                } else {
+                                    None
+                                }
+                            })
+                            .collect();
+
+                        this.rooms.extend(rooms);
+                        this.rooms.sort_by_key(|r| Reverse(r.read(cx).created_at));
+                        this.loading = false;
+
+                        cx.notify();
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    /// Add a user profile to the registry
+    ///
+    /// Only adds the profile if it doesn't already exist or is currently none
+    pub fn add_profile(
+        &mut self,
+        public_key: PublicKey,
+        metadata: Option<Metadata>,
+        cx: &mut Context<Self>,
+    ) {
+        self.profiles.update(cx, |this, _cx| {
+            this.entry(public_key)
+                .and_modify(|entry| {
+                    if entry.is_none() {
+                        *entry = metadata.clone();
+                    }
+                })
+                .or_insert_with(|| metadata);
+        });
+    }
+
+    /// Get a user profile by public key
+    pub fn profile(&self, public_key: &PublicKey, cx: &App) -> Profile {
+        let metadata = if let Some(profile) = self.profiles.read(cx).get(public_key) {
+            profile.clone().unwrap_or_default()
+        } else {
+            Metadata::default()
+        };
+
+        Profile::new(*public_key, metadata)
+    }
+
+    /// Add a new room to the registry
+    ///
+    /// Returns an error if the room already exists
+    pub fn push(&mut self, room: Room, cx: &mut Context<Self>) -> Result<(), anyhow::Error> {
+        let room = cx.new(|_| room);
+
+        if !self
+            .rooms
+            .iter()
+            .any(|current| current.read(cx) == room.read(cx))
+        {
+            self.rooms.insert(0, room);
+            cx.notify();
+
+            Ok(())
+        } else {
+            Err(anyhow!("Room already exists"))
+        }
+    }
+
+    /// Push a new message to a room
+    ///
+    /// If the room doesn't exist, it will be created.
+    /// Updates room ordering based on the most recent messages.
+    pub fn push_message(&mut self, event: Event, window: &mut Window, cx: &mut Context<Self>) {
+        let id = room_hash(&event);
+
+        if let Some(room) = self.rooms.iter().find(|room| room.read(cx).id == id) {
+            room.update(cx, |this, cx| {
+                this.created_at(event.created_at, cx);
+
+                cx.defer_in(window, |this, window, cx| {
+                    this.emit_message(event, window, cx);
+                });
+            });
+
+            cx.defer_in(window, |this, _, cx| {
+                this.rooms
+                    .sort_by_key(|room| Reverse(room.read(cx).created_at));
+            });
+        } else {
+            // Push the new room to the front of the list
+            self.rooms.insert(0, cx.new(|_| Room::new(&event)));
+            cx.notify();
+        }
+    }
+}
--- a/crates/chats/src/message.rs
+++ b/crates/chats/src/message.rs
@@ -0,0 +1,145 @@
+use chrono::{Local, TimeZone};
+use gpui::SharedString;
+use nostr_sdk::prelude::*;
+
+/// # Message
+///
+/// Represents a message in the application.
+///
+/// ## Fields
+///
+/// - `id`: The unique identifier for the message
+/// - `content`: The text content of the message
+/// - `author`: Profile information about who created the message
+/// - `mentions`: List of profiles mentioned in the message
+/// - `created_at`: Timestamp when the message was created
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Message {
+    pub id: EventId,
+    pub content: String,
+    pub author: Profile,
+    pub mentions: Vec<Profile>,
+    pub created_at: Timestamp,
+}
+
+impl Message {
+    /// Creates a new message with the provided details
+    ///
+    /// # Arguments
+    ///
+    /// * `id` - Unique event identifier
+    /// * `content` - Message text content
+    /// * `author` - Profile of the message author
+    /// * `created_at` - When the message was created
+    ///
+    /// # Returns
+    ///
+    /// A new `Message` instance
+    pub fn new(id: EventId, content: String, author: Profile, created_at: Timestamp) -> Self {
+        Self {
+            id,
+            content,
+            author,
+            created_at,
+            mentions: vec![],
+        }
+    }
+
+    /// Adds or replaces mentions in the message
+    ///
+    /// # Arguments
+    ///
+    /// * `mentions` - New list of mentioned profiles
+    ///
+    /// # Returns
+    ///
+    /// The same message with updated mentions
+    pub fn with_mentions(mut self, mentions: impl IntoIterator<Item = Profile>) -> Self {
+        self.mentions.extend(mentions);
+        self
+    }
+
+    /// Formats the message timestamp as a human-readable relative time
+    ///
+    /// # Returns
+    ///
+    /// A formatted string like "Today at 12:30 PM", "Yesterday at 3:45 PM",
+    /// or a date and time for older messages
+    pub fn ago(&self) -> SharedString {
+        let input_time = match Local.timestamp_opt(self.created_at.as_u64() as i64, 0) {
+            chrono::LocalResult::Single(time) => time,
+            _ => return "Invalid timestamp".into(),
+        };
+
+        let now = Local::now();
+        let input_date = input_time.date_naive();
+        let now_date = now.date_naive();
+        let yesterday_date = (now - chrono::Duration::days(1)).date_naive();
+
+        let time_format = input_time.format("%H:%M %p");
+
+        match input_date {
+            date if date == now_date => format!("Today at {time_format}"),
+            date if date == yesterday_date => format!("Yesterday at {time_format}"),
+            _ => format!("{}, {time_format}", input_time.format("%d/%m/%y")),
+        }
+        .into()
+    }
+}
+
+/// # RoomMessage
+///
+/// Represents different types of messages that can appear in a room.
+///
+/// ## Variants
+///
+/// - `User`: A message sent by a user
+/// - `System`: A message generated by the system
+/// - `Announcement`: A special message type used for room announcements
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum RoomMessage {
+    /// User message
+    User(Box<Message>),
+    /// System message
+    System(SharedString),
+    /// Only use for UI purposes.
+    /// Placeholder will be used for display room announcement
+    Announcement,
+}
+
+impl RoomMessage {
+    /// Creates a new user message
+    ///
+    /// # Arguments
+    ///
+    /// * `message` - The message content
+    ///
+    /// # Returns
+    ///
+    /// A `RoomMessage::User` variant
+    pub fn user(message: Message) -> Self {
+        Self::User(Box::new(message))
+    }
+
+    /// Creates a new system message
+    ///
+    /// # Arguments
+    ///
+    /// * `content` - The system message content
+    ///
+    /// # Returns
+    ///
+    /// A `RoomMessage::System` variant
+    pub fn system(content: SharedString) -> Self {
+        Self::System(content)
+    }
+
+    /// Creates a new announcement placeholder
+    ///
+    /// # Returns
+    ///
+    /// A `RoomMessage::Announcement` variant
+    pub fn announcement() -> Self {
+        Self::Announcement
+    }
+}
--- a/crates/chats/src/registry.rs
+++ b/crates/chats/src/registry.rs
@@ -1,201 +0,0 @@
-use anyhow::anyhow;
-use common::utils::{compare, room_hash, signer_public_key};
-use gpui::{App, AppContext, Context, Entity, Global};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use state::get_client;
-use std::cmp::Reverse;
-
-use crate::room::Room;
-
-pub fn init(cx: &mut App) {
-    ChatRegistry::register(cx);
-}
-
-struct GlobalChatRegistry(Entity<ChatRegistry>);
-
-impl Global for GlobalChatRegistry {}
-
-pub struct ChatRegistry {
-    rooms: Vec<Entity<Room>>,
-    is_loading: bool,
-}
-
-impl ChatRegistry {
-    pub fn global(cx: &mut App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalChatRegistry>()
-            .map(|global| global.0.clone())
-    }
-
-    pub fn register(cx: &mut App) -> Entity<Self> {
-        Self::global(cx).unwrap_or_else(|| {
-            let entity = cx.new(Self::new);
-
-            // Set global state
-            cx.set_global(GlobalChatRegistry(entity.clone()));
-
-            // Observe and load metadata for any new rooms
-            cx.observe_new::<Room>(|this, _window, cx| {
-                let client = get_client();
-                let pubkeys = this.pubkeys();
-                let (tx, rx) = oneshot::channel::<Vec<(PublicKey, Metadata)>>();
-
-                cx.background_spawn(async move {
-                    let mut profiles = Vec::new();
-
-                    for public_key in pubkeys.into_iter() {
-                        if let Ok(metadata) = client.database().metadata(public_key).await {
-                            profiles.push((public_key, metadata.unwrap_or_default()));
-                        }
-                    }
-
-                    _ = tx.send(profiles);
-                })
-                .detach();
-
-                cx.spawn(|this, mut cx| async move {
-                    if let Ok(profiles) = rx.await {
-                        if let Some(room) = this.upgrade() {
-                            _ = cx.update_entity(&room, |this, cx| {
-                                for profile in profiles.into_iter() {
-                                    this.set_metadata(profile.0, profile.1);
-                                }
-                                cx.notify();
-                            });
-                        }
-                    }
-                })
-                .detach();
-            })
-            .detach();
-
-            entity
-        })
-    }
-
-    fn new(_cx: &mut Context<Self>) -> Self {
-        Self {
-            rooms: vec![],
-            is_loading: true,
-        }
-    }
-
-    pub fn current_rooms_ids(&self, cx: &mut Context<Self>) -> Vec<u64> {
-        self.rooms.iter().map(|room| room.read(cx).id).collect()
-    }
-
-    pub fn load_chat_rooms(&mut self, cx: &mut Context<Self>) {
-        let client = get_client();
-        let (tx, rx) = oneshot::channel::<Vec<Event>>();
-
-        cx.background_spawn(async move {
-            if let Ok(public_key) = signer_public_key(client).await {
-                let filter = Filter::new()
-                    .kind(Kind::PrivateDirectMessage)
-                    .author(public_key);
-
-                // Get all DM events from database
-                if let Ok(events) = client.database().query(filter).await {
-                    let result: Vec<Event> = events
-                        .into_iter()
-                        .filter(|ev| ev.tags.public_keys().peekable().peek().is_some())
-                        .unique_by(room_hash)
-                        .sorted_by_key(|ev| Reverse(ev.created_at))
-                        .collect();
-
-                    _ = tx.send(result);
-                }
-            }
-        })
-        .detach();
-
-        cx.spawn(|this, cx| async move {
-            if let Ok(events) = rx.await {
-                _ = cx.update(|cx| {
-                    _ = this.update(cx, |this, cx| {
-                        let current_rooms = this.current_rooms_ids(cx);
-                        let items: Vec<Entity<Room>> = events
-                            .into_iter()
-                            .filter_map(|ev| {
-                                let new = room_hash(&ev);
-                                // Filter all seen events
-                                if !current_rooms.iter().any(|this| this == &new) {
-                                    Some(cx.new(|cx| Room::parse(&ev, cx)))
-                                } else {
-                                    None
-                                }
-                            })
-                            .collect();
-
-                        this.rooms.extend(items);
-                        this.is_loading = false;
-
-                        cx.notify();
-                    });
-                });
-            }
-        })
-        .detach();
-    }
-
-    pub fn rooms(&self) -> &Vec<Entity<Room>> {
-        &self.rooms
-    }
-
-    pub fn is_loading(&self) -> bool {
-        self.is_loading
-    }
-
-    pub fn get(&self, id: &u64, cx: &App) -> Option<Entity<Room>> {
-        self.rooms
-            .iter()
-            .find(|model| &model.read(cx).id == id)
-            .cloned()
-    }
-
-    pub fn new_room(&mut self, room: Room, cx: &mut Context<Self>) -> Result<(), anyhow::Error> {
-        if !self
-            .rooms
-            .iter()
-            .any(|current| compare(&current.read(cx).pubkeys(), &room.pubkeys()))
-        {
-            self.rooms.insert(0, cx.new(|_| room));
-            cx.notify();
-
-            Ok(())
-        } else {
-            Err(anyhow!("Room is existed"))
-        }
-    }
-
-    pub fn push_message(&mut self, event: Event, cx: &mut Context<Self>) {
-        // Get all pubkeys from event's tags for comparision
-        let mut pubkeys: Vec<_> = event.tags.public_keys().copied().collect();
-        pubkeys.push(event.pubkey);
-
-        if let Some(room) = self
-            .rooms
-            .iter()
-            .find(|room| compare(&room.read(cx).pubkeys(), &pubkeys))
-        {
-            room.update(cx, |this, cx| {
-                this.last_seen.set(event.created_at);
-                this.new_messages.update(cx, |this, cx| {
-                    this.push(event);
-                    cx.notify();
-                });
-                cx.notify();
-            });
-
-            // Re sort rooms by last seen
-            self.rooms
-                .sort_by_key(|room| Reverse(room.read(cx).last_seen()));
-
-            cx.notify();
-        } else {
-            let room = cx.new(|cx| Room::parse(&event, cx));
-            self.rooms.insert(0, room);
-            cx.notify();
-        }
-    }
-}
--- a/crates/chats/src/room.rs
+++ b/crates/chats/src/room.rs
@@ -1,138 +1,617 @@
-use common::{
-    last_seen::LastSeen,
-    profile::NostrProfile,
-    utils::{compare, random_name, room_hash},
-};
-use gpui::{App, AppContext, Entity, SharedString};
+use std::sync::Arc;
+
+use account::Account;
+use anyhow::Error;
+use chrono::{Local, TimeZone};
+use common::{compare, profile::SharedProfile, room_hash};
+use global::get_client;
+use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task, Window};
+use itertools::Itertools;
 use nostr_sdk::prelude::*;
-use std::collections::HashSet;
+use smol::channel::Receiver;
+
+use crate::{
+    constants::{DAYS_IN_MONTH, HOURS_IN_DAY, MINUTES_IN_HOUR, NOW, SECONDS_IN_MINUTE},
+    message::{Message, RoomMessage},
+    ChatRegistry,
+};
+
+#[derive(Debug, Clone)]
+pub struct IncomingEvent {
+    pub event: RoomMessage,
+}
+
+#[derive(Debug)]
+pub enum SendStatus {
+    Sent(EventId),
+    Failed(Error),
+}
+
+#[derive(Clone, Copy, Hash, Debug, PartialEq, Eq, Default)]
+pub enum RoomKind {
+    Ongoing,
+    Trusted,
+    #[default]
+    Unknown,
+}

 pub struct Room {
    pub id: u64,
-    pub title: Option<SharedString>,
-    pub owner: NostrProfile,        // Owner always match current user
-    pub members: Vec<NostrProfile>, // Extract from event's tags
-    pub last_seen: LastSeen,
-    pub is_group: bool,
-    pub new_messages: Entity<Vec<Event>>, // Hold all new messages
+    pub created_at: Timestamp,
+    /// Subject of the room
+    pub subject: Option<SharedString>,
+    /// Picture of the room
+    pub picture: Option<SharedString>,
+    /// All members of the room
+    pub members: Arc<Vec<PublicKey>>,
+    /// Kind
+    pub kind: RoomKind,
 }

+impl EventEmitter<IncomingEvent> for Room {}
+
 impl PartialEq for Room {
    fn eq(&self, other: &Self) -> bool {
-        compare(&self.pubkeys(), &other.pubkeys())
+        self.id == other.id
    }
 }

 impl Room {
-    pub fn new(
-        id: u64,
-        owner: NostrProfile,
-        members: Vec<NostrProfile>,
-        title: Option<SharedString>,
-        last_seen: LastSeen,
-        cx: &mut App,
-    ) -> Self {
-        let new_messages = cx.new(|_| Vec::new());
-        let is_group = members.len() > 1;
-        let title = if title.is_none() {
-            Some(random_name(2).into())
-        } else {
-            title
-        };
-
-        Self {
-            id,
-            owner,
-            members,
-            title,
-            last_seen,
-            is_group,
-            new_messages,
-        }
-    }
-
-    /// Convert nostr event to room
-    pub fn parse(event: &Event, cx: &mut App) -> Room {
+    /// Creates a new Room instance from a Nostr event
+    ///
+    /// # Arguments
+    ///
+    /// * `event` - The Nostr event containing chat information
+    ///
+    /// # Returns
+    ///
+    /// A new Room instance with information extracted from the event
+    pub fn new(event: &Event) -> Self {
        let id = room_hash(event);
-        let last_seen = LastSeen(event.created_at);
+        let created_at = event.created_at;

-        // Always equal to current user
-        let owner = NostrProfile::new(event.pubkey, Metadata::default());
+        // Get all pubkeys from the event's tags
+        let mut pubkeys: Vec<PublicKey> = event.tags.public_keys().cloned().collect();
+        pubkeys.push(event.pubkey);

-        // Get all pubkeys that invole in this group
-        let members: Vec<NostrProfile> = event
-            .tags
-            .public_keys()
-            .collect::<HashSet<_>>()
-            .into_iter()
-            .map(|public_key| NostrProfile::new(*public_key, Metadata::default()))
-            .collect();
+        // Convert pubkeys into members
+        let members = Arc::new(pubkeys.into_iter().unique().sorted().collect());

-        // Get title from event's tags
-        let title = if let Some(tag) = event.tags.find(TagKind::Subject) {
+        // Get the subject from the event's tags
+        let subject = if let Some(tag) = event.tags.find(TagKind::Subject) {
            tag.content().map(|s| s.to_owned().into())
        } else {
            None
        };

-        Self::new(id, owner, members, title, last_seen, cx)
-    }
-
-    /// Set contact's metadata by public key
-    pub fn set_metadata(&mut self, public_key: PublicKey, metadata: Metadata) {
-        if self.owner.public_key() == public_key {
-            self.owner.set_metadata(&metadata);
-        }
-
-        for member in self.members.iter_mut() {
-            if member.public_key() == public_key {
-                member.set_metadata(&metadata);
-            }
-        }
-    }
-
-    /// Get room's member by public key
-    pub fn member(&self, public_key: &PublicKey) -> Option<NostrProfile> {
-        if &self.owner.public_key() == public_key {
-            Some(self.owner.clone())
+        // Get the picture from the event's tags
+        let picture = if let Some(tag) = event.tags.find(TagKind::custom("picture")) {
+            tag.content().map(|s| s.to_owned().into())
        } else {
-            self.members
-                .iter()
-                .find(|m| &m.public_key() == public_key)
-                .cloned()
+            None
+        };
+
+        Self {
+            id,
+            created_at,
+            subject,
+            picture,
+            members,
+            kind: RoomKind::Unknown,
        }
    }

-    /// Get room's display name
-    pub fn name(&self) -> String {
-        if self.members.len() <= 2 {
-            self.members
-                .iter()
-                .map(|profile| profile.name())
-                .collect::<Vec<_>>()
-                .join(", ")
+    /// Sets the kind of the room
+    ///
+    /// # Arguments
+    ///
+    /// * `kind` - The kind of room to set
+    ///
+    /// # Returns
+    ///
+    /// The room with the updated kind
+    pub fn kind(mut self, kind: RoomKind) -> Self {
+        self.kind = kind;
+        self
+    }
+
+    /// Calculates a human-readable representation of the time passed since room creation
+    ///
+    /// # Returns
+    ///
+    /// A SharedString representing the relative time since room creation:
+    /// - "now" for less than a minute
+    /// - "Xm" for minutes
+    /// - "Xh" for hours
+    /// - "Xd" for days
+    /// - Month and day (e.g. "Jan 15") for older dates
+    pub fn ago(&self) -> SharedString {
+        let input_time = match Local.timestamp_opt(self.created_at.as_u64() as i64, 0) {
+            chrono::LocalResult::Single(time) => time,
+            _ => return "1m".into(),
+        };
+
+        let now = Local::now();
+        let duration = now.signed_duration_since(input_time);
+
+        match duration {
+            d if d.num_seconds() < SECONDS_IN_MINUTE => NOW.into(),
+            d if d.num_minutes() < MINUTES_IN_HOUR => format!("{}m", d.num_minutes()),
+            d if d.num_hours() < HOURS_IN_DAY => format!("{}h", d.num_hours()),
+            d if d.num_days() < DAYS_IN_MONTH => format!("{}d", d.num_days()),
+            _ => input_time.format("%b %d").to_string(),
+        }
+        .into()
+    }
+
+    /// Gets the profile for a specific public key
+    ///
+    /// # Arguments
+    ///
+    /// * `public_key` - The public key to get the profile for
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// The Profile associated with the given public key
+    pub fn profile_by_pubkey(&self, public_key: &PublicKey, cx: &App) -> Profile {
+        ChatRegistry::global(cx).read(cx).profile(public_key, cx)
+    }
+
+    /// Gets the first member in the room that isn't the current user
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// The Profile of the first member in the room
+    pub fn first_member(&self, cx: &App) -> Profile {
+        let account = Account::global(cx).read(cx);
+        let Some(profile) = account.profile.clone() else {
+            return self.profile_by_pubkey(&self.members[0], cx);
+        };
+
+        if let Some(public_key) = self
+            .members
+            .iter()
+            .filter(|&pubkey| pubkey != &profile.public_key())
+            .collect::<Vec<_>>()
+            .first()
+        {
+            self.profile_by_pubkey(public_key, cx)
        } else {
-            let name = self
+            profile
+        }
+    }
+
+    /// Gets all avatars for members in the room
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// A vector of SharedString containing all members' avatars
+    pub fn avatars(&self, cx: &App) -> Vec<SharedString> {
+        let profiles: Vec<Profile> = self
+            .members
+            .iter()
+            .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
+            .collect();
+
+        profiles
+            .iter()
+            .map(|member| member.shared_avatar())
+            .collect()
+    }
+
+    /// Gets a formatted string of member names
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// A SharedString containing formatted member names:
+    /// - For a group chat: "name1, name2, +X" where X is the number of additional members
+    /// - For a direct message: just the name of the other person
+    pub fn names(&self, cx: &App) -> SharedString {
+        if self.is_group() {
+            let profiles = self
                .members
+                .iter()
+                .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
+                .collect::<Vec<_>>();
+
+            let mut name = profiles
                .iter()
                .take(2)
-                .map(|profile| profile.name())
+                .map(|profile| profile.shared_name())
                .collect::<Vec<_>>()
                .join(", ");

-            format!("{}, +{}", name, self.members.len() - 2)
+            if profiles.len() > 2 {
+                name = format!("{}, +{}", name, profiles.len() - 2);
+            }
+
+            name.into()
+        } else {
+            self.first_member(cx).shared_name()
        }
    }

-    pub fn last_seen(&self) -> &LastSeen {
-        &self.last_seen
+    /// Gets the display name for the room
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// A SharedString representing the display name:
+    /// - The subject of the room if it exists
+    /// - Otherwise, the formatted names of the members
+    pub fn display_name(&self, cx: &App) -> SharedString {
+        if let Some(subject) = self.subject.as_ref() {
+            subject.clone()
+        } else {
+            self.names(cx)
+        }
    }

-    /// Get all public keys from current room
-    pub fn pubkeys(&self) -> Vec<PublicKey> {
-        let mut pubkeys: Vec<_> = self.members.iter().map(|m| m.public_key()).collect();
-        pubkeys.push(self.owner.public_key());
+    /// Gets the display image for the room
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// An Option<SharedString> containing the avatar:
+    /// - For a direct message: the other person's avatar
+    /// - For a group chat: None
+    pub fn display_image(&self, cx: &App) -> Option<SharedString> {
+        if !self.is_group() {
+            Some(self.first_member(cx).shared_avatar())
+        } else {
+            None
+        }
+    }

-        pubkeys
+    /// Checks if the room is a group chat
+    ///
+    /// # Returns
+    ///
+    /// true if the room has more than 2 members, false otherwise
+    pub fn is_group(&self) -> bool {
+        self.members.len() > 2
+    }
+
+    /// Updates the creation timestamp of the room
+    ///
+    /// # Arguments
+    ///
+    /// * `created_at` - The new Timestamp to set
+    /// * `cx` - The context to notify about the update
+    pub fn created_at(&mut self, created_at: Timestamp, cx: &mut Context<Self>) {
+        self.created_at = created_at;
+        cx.notify();
+    }
+
+    /// Updates the subject of the room
+    ///
+    /// # Arguments
+    ///
+    /// * `subject` - The new subject to set
+    /// * `cx` - The context to notify about the update
+    pub fn subject(&mut self, subject: String, cx: &mut Context<Self>) {
+        self.subject = Some(subject.into());
+        cx.notify();
+    }
+
+    /// Updates the picture of the room
+    ///
+    /// # Arguments
+    ///
+    /// * `picture` - The new subject to set
+    /// * `cx` - The context to notify about the update
+    pub fn picture(&mut self, picture: String, cx: &mut Context<Self>) {
+        self.picture = Some(picture.into());
+        cx.notify();
+    }
+
+    /// Fetches metadata for all members in the room
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The context for the background task
+    ///
+    /// # Returns
+    ///
+    /// A Task that resolves to Result<Vec<(PublicKey, Option<Metadata>)>, Error>
+    #[allow(clippy::type_complexity)]
+    pub fn metadata(
+        &self,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Vec<(PublicKey, Option<Metadata>)>, Error>> {
+        let client = get_client();
+        let public_keys = self.members.clone();
+
+        cx.background_spawn(async move {
+            let mut output = vec![];
+
+            for public_key in public_keys.iter() {
+                let metadata = client.database().metadata(*public_key).await?;
+                output.push((*public_key, metadata));
+            }
+
+            Ok(output)
+        })
+    }
+
+    /// Checks which members have inbox relays set up
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// A Task that resolves to Result<Vec<(PublicKey, bool)>, Error> where
+    /// the boolean indicates if the member has inbox relays configured
+    pub fn messaging_relays(&self, cx: &App) -> Task<Result<Vec<(PublicKey, bool)>, Error>> {
+        let client = get_client();
+        let pubkeys = Arc::clone(&self.members);
+
+        cx.background_spawn(async move {
+            let mut result = Vec::with_capacity(pubkeys.len());
+
+            for pubkey in pubkeys.iter() {
+                let filter = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(*pubkey)
+                    .limit(1);
+
+                let is_ready = client.database().query(filter).await?.first().is_some();
+
+                result.push((*pubkey, is_ready));
+            }
+
+            Ok(result)
+        })
+    }
+
+    /// Sends a message to all members in the room
+    ///
+    /// # Arguments
+    ///
+    /// * `content` - The content of the message to send
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// A Task that resolves to Result<Vec<String>, Error> where the
+    /// strings contain error messages for any failed sends
+    pub fn send_message(&self, content: String, cx: &App) -> Option<Receiver<SendStatus>> {
+        let profile = Account::global(cx).read(cx).profile.clone()?;
+        let public_key = profile.public_key();
+
+        let subject = self.subject.clone();
+        let picture = self.picture.clone();
+        let pubkeys = self.members.clone();
+
+        let (tx, rx) = smol::channel::bounded::<SendStatus>(pubkeys.len());
+
+        cx.background_spawn(async move {
+            let client = get_client();
+
+            let mut tags: Vec<Tag> = pubkeys
+                .iter()
+                .filter_map(|pubkey| {
+                    if pubkey != &public_key {
+                        Some(Tag::public_key(*pubkey))
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+
+            // Add subject tag if it's present
+            if let Some(subject) = subject {
+                tags.push(Tag::from_standardized(TagStandard::Subject(
+                    subject.to_string(),
+                )));
+            }
+
+            // Add picture tag if it's present
+            if let Some(picture) = picture {
+                tags.push(Tag::custom(TagKind::custom("picture"), vec![picture]));
+            }
+
+            for pubkey in pubkeys.iter() {
+                match client
+                    .send_private_msg(*pubkey, &content, tags.clone())
+                    .await
+                {
+                    Ok(output) => {
+                        if let Err(e) = tx.send(SendStatus::Sent(output.val)).await {
+                            log::error!("Failed to send message to {}: {}", pubkey, e);
+                        }
+                    }
+                    Err(e) => {
+                        if let Err(e) = tx.send(SendStatus::Failed(e.into())).await {
+                            log::error!("Failed to send message to {}: {}", pubkey, e);
+                        }
+                    }
+                }
+            }
+        })
+        .detach();
+
+        Some(rx)
+    }
+
+    /// Loads all messages for this room from the database
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// A Task that resolves to Result<Vec<RoomMessage>, Error> containing
+    /// all messages for this room
+    pub fn load_messages(&self, cx: &App) -> Task<Result<Vec<RoomMessage>, Error>> {
+        let client = get_client();
+        let pubkeys = Arc::clone(&self.members);
+
+        let profiles: Vec<Profile> = pubkeys
+            .iter()
+            .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
+            .collect();
+
+        let filter = Filter::new()
+            .kind(Kind::PrivateDirectMessage)
+            .authors(pubkeys.to_vec())
+            .pubkeys(pubkeys.to_vec());
+
+        cx.background_spawn(async move {
+            let mut messages = vec![];
+            let parser = NostrParser::new();
+
+            // Get all events from database
+            let events = client
+                .database()
+                .query(filter)
+                .await?
+                .into_iter()
+                .sorted_by_key(|ev| ev.created_at)
+                .filter(|ev| {
+                    let mut other_pubkeys = ev.tags.public_keys().copied().collect::<Vec<_>>();
+                    other_pubkeys.push(ev.pubkey);
+                    // Check if the event is from a member of the room
+                    compare(&other_pubkeys, &pubkeys)
+                })
+                .collect::<Vec<_>>();
+
+            for event in events.into_iter() {
+                let mut mentions = vec![];
+                let id = event.id;
+                let created_at = event.created_at;
+                let content = event.content.clone();
+                let tokens = parser.parse(&content);
+
+                let author = profiles
+                    .iter()
+                    .find(|profile| profile.public_key() == event.pubkey)
+                    .cloned()
+                    .unwrap_or_else(|| Profile::new(event.pubkey, Metadata::default()));
+
+                let pubkey_tokens = tokens
+                    .filter_map(|token| match token {
+                        Token::Nostr(nip21) => match nip21 {
+                            Nip21::Pubkey(pubkey) => Some(pubkey),
+                            Nip21::Profile(profile) => Some(profile.public_key),
+                            _ => None,
+                        },
+                        _ => None,
+                    })
+                    .collect::<Vec<_>>();
+
+                for pubkey in pubkey_tokens {
+                    mentions.push(
+                        profiles
+                            .iter()
+                            .find(|profile| profile.public_key() == pubkey)
+                            .cloned()
+                            .unwrap_or_else(|| Profile::new(pubkey, Metadata::default())),
+                    );
+                }
+
+                let message = Message::new(id, content, author, created_at).with_mentions(mentions);
+                let room_message = RoomMessage::user(message);
+
+                messages.push(room_message);
+            }
+
+            Ok(messages)
+        })
+    }
+
+    /// Emits a message event to the GPUI
+    ///
+    /// # Arguments
+    ///
+    /// * `event` - The Nostr event to emit
+    /// * `window` - The Window to emit the event to
+    /// * `cx` - The context for the room
+    ///
+    /// # Effects
+    ///
+    /// Processes the event and emits an IncomingEvent to the UI when complete
+    pub fn emit_message(&self, event: Event, window: &mut Window, cx: &mut Context<Self>) {
+        let pubkeys = self.members.clone();
+        let profiles: Vec<Profile> = pubkeys
+            .iter()
+            .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
+            .collect();
+
+        let task: Task<Result<RoomMessage, Error>> = cx.background_spawn(async move {
+            let parser = NostrParser::new();
+            let id = event.id;
+            let created_at = event.created_at;
+            let content = event.content.clone();
+            let tokens = parser.parse(&content);
+            let mut mentions = vec![];
+
+            let author = profiles
+                .iter()
+                .find(|profile| profile.public_key() == event.pubkey)
+                .cloned()
+                .unwrap_or_else(|| Profile::new(event.pubkey, Metadata::default()));
+
+            let pubkey_tokens = tokens
+                .filter_map(|token| match token {
+                    Token::Nostr(nip21) => match nip21 {
+                        Nip21::Pubkey(pubkey) => Some(pubkey),
+                        Nip21::Profile(profile) => Some(profile.public_key),
+                        _ => None,
+                    },
+                    _ => None,
+                })
+                .collect::<Vec<_>>();
+
+            for pubkey in pubkey_tokens {
+                mentions.push(
+                    profiles
+                        .iter()
+                        .find(|profile| profile.public_key() == pubkey)
+                        .cloned()
+                        .unwrap_or_else(|| Profile::new(pubkey, Metadata::default())),
+                );
+            }
+
+            let message = Message::new(id, content, author, created_at).with_mentions(mentions);
+            let room_message = RoomMessage::user(message);
+
+            Ok(room_message)
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(message) = task.await {
+                cx.update(|_, cx| {
+                    this.update(cx, |_, cx| {
+                        cx.emit(IncomingEvent { event: message });
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
    }
 }
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,16 +1,18 @@
 [package]
 name = "common"
-version = "0.0.0"
-edition = "2021"
-publish = false
+version.workspace = true
+edition.workspace = true
+publish.workspace = true

 [dependencies]
+global = { path = "../global" }
+
 gpui.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
 chrono.workspace = true
-dirs.workspace = true
+smallvec.workspace = true

 random_name_generator = "0.3.6"
 qrcode-generator = "5.0.0"
--- a/crates/common/src/constants.rs
+++ b/crates/common/src/constants.rs
@@ -1,19 +0,0 @@
-pub const KEYRING_SERVICE: &str = "Coop Safe Storage";
-pub const APP_NAME: &str = "Coop";
-pub const APP_ID: &str = "su.reya.coop";
-
-/// Subscriptions
-pub const NEW_MESSAGE_SUB_ID: &str = "listen_new_giftwraps";
-pub const ALL_MESSAGES_SUB_ID: &str = "listen_all_giftwraps";
-
-/// Image Resizer Service
-pub const IMAGE_SERVICE: &str = "https://wsrv.nl";
-
-/// NIP96 Media Server
-pub const NIP96_SERVER: &str = "https://nostrmedia.com";
-
-/// Updater Public Key
-pub const UPDATER_PUBKEY: &str = "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDkxM0EzQTQyRTBBMENENTYKUldSV3phRGdRam82a1dtU0JqYll4VnBaVUpSWUxCWlVQbnRkUnNERS96MzFMWDhqNW5zOXplMEwK";
-/// Updater Server URL
-pub const UPDATER_URL: &str =
-    "https://cdn.crabnebula.app/update/lume/coop/{{target}}-{{arch}}/{{current_version}}";
--- a/crates/common/src/last_seen.rs
+++ b/crates/common/src/last_seen.rs
@@ -1,58 +0,0 @@
-use chrono::{Datelike, Local, TimeZone};
-use gpui::SharedString;
-use nostr_sdk::prelude::*;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct LastSeen(pub Timestamp);
-
-impl LastSeen {
-    pub fn ago(&self) -> SharedString {
-        let now = Local::now();
-        let input_time = Local.timestamp_opt(self.0.as_u64() as i64, 0).unwrap();
-        let diff = (now - input_time).num_hours();
-
-        if diff < 24 {
-            let duration = now.signed_duration_since(input_time);
-
-            if duration.num_seconds() < 60 {
-                "now".to_string().into()
-            } else if duration.num_minutes() == 1 {
-                "1m".to_string().into()
-            } else if duration.num_minutes() < 60 {
-                format!("{}m", duration.num_minutes()).into()
-            } else if duration.num_hours() == 1 {
-                "1h".to_string().into()
-            } else if duration.num_hours() < 24 {
-                format!("{}h", duration.num_hours()).into()
-            } else if duration.num_days() == 1 {
-                "1d".to_string().into()
-            } else {
-                format!("{}d", duration.num_days()).into()
-            }
-        } else {
-            input_time.format("%b %d").to_string().into()
-        }
-    }
-
-    pub fn human_readable(&self) -> SharedString {
-        let now = Local::now();
-        let input_time = Local.timestamp_opt(self.0.as_u64() as i64, 0).unwrap();
-
-        if input_time.day() == now.day() {
-            format!("Today at {}", input_time.format("%H:%M %p")).into()
-        } else if input_time.day() == now.day() - 1 {
-            format!("Yesterday at {}", input_time.format("%H:%M %p")).into()
-        } else {
-            format!(
-                "{}, {}",
-                input_time.format("%d/%m/%y"),
-                input_time.format("%H:%M %p")
-            )
-            .into()
-        }
-    }
-
-    pub fn set(&mut self, created_at: Timestamp) {
-        self.0 = created_at
-    }
-}
--- a/crates/common/src/lib.rs
+++ b/crates/common/src/lib.rs
@@ -1,5 +1,78 @@
-pub mod constants;
-pub mod last_seen;
+use std::{
+    collections::HashSet,
+    hash::{DefaultHasher, Hash, Hasher},
+    sync::Arc,
+};
+
+use anyhow::Context;
+use global::constants::NIP96_SERVER;
+use gpui::Image;
+use itertools::Itertools;
+use nostr_sdk::prelude::*;
+use qrcode_generator::QrCodeEcc;
+use rnglib::{Language, RNG};
+
 pub mod profile;
-pub mod qr;
-pub mod utils;
+
+pub async fn nip96_upload(client: &Client, file: Vec<u8>) -> anyhow::Result<Url, anyhow::Error> {
+    let signer = client.signer().await?;
+    let server_url = Url::parse(NIP96_SERVER)?;
+
+    let config: ServerConfig = nip96::get_server_config(server_url, None).await?;
+    let url = nip96::upload_data(&signer, &config, file, None, None).await?;
+
+    Ok(url)
+}
+
+pub fn room_hash(event: &Event) -> u64 {
+    let mut hasher = DefaultHasher::new();
+    let mut pubkeys: Vec<&PublicKey> = vec![];
+
+    // Add all public keys from event
+    pubkeys.push(&event.pubkey);
+    pubkeys.extend(event.tags.public_keys().collect::<Vec<_>>());
+
+    // Generate unique hash
+    pubkeys
+        .into_iter()
+        .unique()
+        .sorted()
+        .collect::<Vec<_>>()
+        .hash(&mut hasher);
+
+    hasher.finish()
+}
+
+pub fn device_pubkey(event: &Event) -> Result<PublicKey, anyhow::Error> {
+    let n_tag = event.tags.find(TagKind::custom("n")).context("Invalid")?;
+    let hex = n_tag.content().context("Invalid")?;
+    let pubkey = PublicKey::parse(hex)?;
+
+    Ok(pubkey)
+}
+
+pub fn random_name(length: usize) -> String {
+    let rng = RNG::from(&Language::Roman);
+    rng.generate_names(length, true).join("-").to_lowercase()
+}
+
+pub fn create_qr(data: &str) -> Result<Arc<Image>, anyhow::Error> {
+    let qr = qrcode_generator::to_png_to_vec_from_str(data, QrCodeEcc::Medium, 256)?;
+    let img = Arc::new(Image {
+        format: gpui::ImageFormat::Png,
+        bytes: qr.clone(),
+        id: 1,
+    });
+
+    Ok(img)
+}
+
+pub fn compare<T>(a: &[T], b: &[T]) -> bool
+where
+    T: Eq + Hash,
+{
+    let a: HashSet<_> = a.iter().collect();
+    let b: HashSet<_> = b.iter().collect();
+
+    a == b
+}
--- a/crates/common/src/profile.rs
+++ b/crates/common/src/profile.rs
@@ -1,86 +1,43 @@
-use crate::constants::IMAGE_SERVICE;
+use global::constants::IMAGE_SERVICE;
+use gpui::SharedString;
 use nostr_sdk::prelude::*;

-#[derive(Debug, Clone)]
-pub struct NostrProfile {
-    public_key: PublicKey,
-    metadata: Metadata,
+pub trait SharedProfile {
+    fn shared_avatar(&self) -> SharedString;
+    fn shared_name(&self) -> SharedString;
 }

-impl AsRef<PublicKey> for NostrProfile {
-    fn as_ref(&self) -> &PublicKey {
-        &self.public_key
-    }
-}
-
-impl AsRef<Metadata> for NostrProfile {
-    fn as_ref(&self) -> &Metadata {
-        &self.metadata
-    }
-}
-
-impl Eq for NostrProfile {}
-
-impl PartialEq for NostrProfile {
-    fn eq(&self, other: &Self) -> bool {
-        self.public_key() == other.public_key()
-    }
-}
-
-impl NostrProfile {
-    pub fn new(public_key: PublicKey, metadata: Metadata) -> Self {
-        Self {
-            public_key,
-            metadata,
-        }
-    }
-
-    /// Get contact's public key
-    pub fn public_key(&self) -> PublicKey {
-        self.public_key
-    }
-
-    /// Get contact's avatar
-    pub fn avatar(&self) -> String {
-        if let Some(picture) = &self.metadata.picture {
-            if picture.len() > 1 {
+impl SharedProfile for Profile {
+    fn shared_avatar(&self) -> SharedString {
+        self.metadata()
+            .picture
+            .as_ref()
+            .filter(|picture| !picture.is_empty())
+            .map(|picture| {
                format!(
-                    "{}/?url={}&w=100&h=100&fit=cover&mask=circle&n=-1",
+                    "{}/?url={}&w=100&h=100&fit=cover&mask=circle&n=-1&default=npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445.blossom.band/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png",
                    IMAGE_SERVICE, picture
                )
-            } else {
-                "brand/avatar.png".into()
-            }
-        } else {
-            "brand/avatar.png".into()
-        }
+                .into()
+            })
+            .unwrap_or_else(|| "brand/avatar.png".into())
    }

-    /// Get contact's name, fallback to public key as shorted format
-    pub fn name(&self) -> String {
-        if let Some(display_name) = &self.metadata.display_name {
+    fn shared_name(&self) -> SharedString {
+        if let Some(display_name) = self.metadata().display_name.as_ref() {
            if !display_name.is_empty() {
-                return display_name.to_owned();
+                return display_name.into();
            }
        }

-        if let Some(name) = &self.metadata.name {
+        if let Some(name) = self.metadata().name.as_ref() {
            if !name.is_empty() {
-                return name.to_owned();
+                return name.into();
            }
        }

-        let pubkey = self.public_key.to_string();
-        format!("{}:{}", &pubkey[0..4], &pubkey[pubkey.len() - 4..])
-    }
+        let pubkey = self.public_key().to_hex();

-    /// Get contact's metadata
-    pub fn metadata(&mut self) -> &Metadata {
-        &self.metadata
-    }
-
-    /// Set contact's metadata
-    pub fn set_metadata(&mut self, metadata: &Metadata) {
-        self.metadata = metadata.clone()
+        format!("{}:{}", &pubkey[0..4], &pubkey[pubkey.len() - 4..]).into()
    }
 }
--- a/crates/common/src/qr.rs
+++ b/crates/common/src/qr.rs
@@ -1,13 +0,0 @@
-use std::path::PathBuf;
-
-use dirs::config_dir;
-use qrcode_generator::QrCodeEcc;
-
-pub fn create_qr(data: &str) -> Result<PathBuf, anyhow::Error> {
-    let config_dir = config_dir().expect("Config directory not found");
-    let path = config_dir.join("Coop/nostr_connect.png");
-
-    qrcode_generator::to_png_to_file(data, QrCodeEcc::Low, 512, &path)?;
-
-    Ok(path)
-}
--- a/crates/common/src/utils.rs
+++ b/crates/common/src/utils.rs
@@ -1,91 +0,0 @@
-use crate::constants::{ALL_MESSAGES_SUB_ID, NEW_MESSAGE_SUB_ID, NIP96_SERVER};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use rnglib::{Language, RNG};
-use std::{
-    collections::HashSet,
-    hash::{DefaultHasher, Hash, Hasher},
-    time::Duration,
-};
-
-pub async fn signer_public_key(client: &Client) -> anyhow::Result<PublicKey, anyhow::Error> {
-    let signer = client.signer().await?;
-    let public_key = signer.get_public_key().await?;
-
-    Ok(public_key)
-}
-
-pub async fn preload(client: &Client, public_key: PublicKey) -> anyhow::Result<(), anyhow::Error> {
-    let sync_opts = SyncOptions::default();
-    let subscription = Filter::new()
-        .kind(Kind::ContactList)
-        .author(public_key)
-        .limit(1);
-
-    // Get contact list
-    _ = client.sync(subscription, &sync_opts).await;
-
-    let all_messages_sub_id = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
-    let new_message_sub_id = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
-
-    // Create a filter for getting all gift wrapped events send to current user
-    let all_messages = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
-
-    // Create a filter for getting new message
-    let new_message = Filter::new()
-        .kind(Kind::GiftWrap)
-        .pubkey(public_key)
-        .limit(0);
-
-    // Subscribe for all messages
-    _ = client
-        .subscribe_with_id(
-            all_messages_sub_id,
-            all_messages,
-            Some(
-                SubscribeAutoCloseOptions::default()
-                    .exit_policy(ReqExitPolicy::WaitDurationAfterEOSE(Duration::from_secs(3))),
-            ),
-        )
-        .await;
-
-    // Subscribe for new message
-    _ = client
-        .subscribe_with_id(new_message_sub_id, new_message, None)
-        .await;
-
-    Ok(())
-}
-
-pub async fn nip96_upload(client: &Client, file: Vec<u8>) -> anyhow::Result<Url, anyhow::Error> {
-    let signer = client.signer().await?;
-    let server_url = Url::parse(NIP96_SERVER)?;
-
-    let config: ServerConfig = nip96::get_server_config(server_url, None).await?;
-    let url = nip96::upload_data(&signer, &config, file, None, None).await?;
-
-    Ok(url)
-}
-
-pub fn room_hash(event: &Event) -> u64 {
-    let pubkeys: Vec<&PublicKey> = event.tags.public_keys().unique().collect();
-    let mut hasher = DefaultHasher::new();
-    // Generate unique hash
-    pubkeys.hash(&mut hasher);
-    hasher.finish()
-}
-
-pub fn random_name(length: usize) -> String {
-    let rng = RNG::from(&Language::Roman);
-    rng.generate_names(length, true).join("-").to_lowercase()
-}
-
-pub fn compare<T>(a: &[T], b: &[T]) -> bool
-where
-    T: Eq + Hash,
-{
-    let a: HashSet<_> = a.iter().collect();
-    let b: HashSet<_> = b.iter().collect();
-
-    a == b
-}
--- a/crates/coop/Cargo.toml
+++ b/crates/coop/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "coop"
-version = "0.1.2"
-edition = "2021"
-publish = false
+version.workspace = true
+edition.workspace = true
+publish.workspace = true

 [[bin]]
 name = "coop"
@@ -11,14 +11,17 @@ path = "src/main.rs"
 [dependencies]
 ui = { path = "../ui" }
 common = { path = "../common" }
-state = { path = "../state" }
+global = { path = "../global" }
 chats = { path = "../chats" }
+account = { path = "../account" }
+auto_update = { path = "../auto_update" }

 gpui.workspace = true
 reqwest_client.workspace = true

 nostr-connect.workspace = true
 nostr-sdk.workspace = true
+
 anyhow.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -26,9 +29,10 @@ itertools.workspace = true
 dirs.workspace = true
 rust-embed.workspace = true
 log.workspace = true
+smallvec.workspace = true
 smol.workspace = true
 oneshot.workspace = true

 rustls = "0.23.23"
-futures= "0.3"
+futures = "0.3"
 tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
--- a/crates/coop/resources/128x128.png
+++ b/crates/coop/resources/128x128.png
--- a/crates/coop/resources/128x128@2x.png
+++ b/crates/coop/resources/128x128@2x.png
--- a/crates/coop/resources/32x32.png
+++ b/crates/coop/resources/32x32.png
--- a/crates/coop/resources/app-icon.icns
+++ b/crates/coop/resources/app-icon.icns
--- a/crates/coop/resources/app-icon.ico
+++ b/crates/coop/resources/app-icon.ico
--- a/crates/coop/resources/app-icon.png
+++ b/crates/coop/resources/app-icon.png
--- a/crates/coop/src/asset.rs
+++ b/crates/coop/src/asset.rs
--- a/crates/coop/src/chatspace.rs
+++ b/crates/coop/src/chatspace.rs
@@ -0,0 +1,362 @@
+use account::Account;
+use anyhow::Error;
+use global::get_client;
+use gpui::{
+    div, image_cache, impl_internal_actions, prelude::FluentBuilder, px, App, AppContext, Axis,
+    Context, Entity, InteractiveElement, IntoElement, ParentElement, Render, Styled, Subscription,
+    Task, Window,
+};
+use nostr_sdk::prelude::*;
+use serde::Deserialize;
+use smallvec::{smallvec, SmallVec};
+use std::sync::Arc;
+use ui::{
+    button::{Button, ButtonVariants},
+    dock_area::{dock::DockPlacement, panel::PanelView, DockArea, DockItem},
+    theme::{ActiveTheme, Appearance, Theme},
+    ContextModal, IconName, Root, Sizable, TitleBar,
+};
+
+use crate::{
+    lru_cache::cache_provider,
+    views::{
+        chat, compose, contacts, login, new_account, onboarding, profile, relays, sidebar, welcome,
+    },
+};
+
+const CACHE_SIZE: usize = 200;
+const MODAL_WIDTH: f32 = 420.;
+const SIDEBAR_WIDTH: f32 = 280.;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<ChatSpace> {
+    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_account::init(window, cx);
+    ChatSpace::set_center_panel(panel, window, cx);
+}
+
+#[derive(Clone, PartialEq, Eq, Deserialize)]
+pub enum PanelKind {
+    Room(u64),
+    // More kind will be added here
+}
+
+#[derive(Clone, PartialEq, Eq, Deserialize)]
+pub enum ModalKind {
+    Profile,
+    Compose,
+    Contact,
+    Relay,
+    SetupRelay,
+}
+
+#[derive(Clone, PartialEq, Eq, Deserialize)]
+pub struct ToggleModal {
+    pub modal: ModalKind,
+}
+
+impl_internal_actions!(dock, [AddPanel, ToggleModal]);
+
+#[derive(Clone, PartialEq, Eq, Deserialize)]
+pub struct AddPanel {
+    panel: PanelKind,
+    position: DockPlacement,
+}
+
+impl AddPanel {
+    pub fn new(panel: PanelKind, position: DockPlacement) -> Self {
+        Self { panel, position }
+    }
+}
+
+pub struct ChatSpace {
+    titlebar: bool,
+    dock: Entity<DockArea>,
+    #[allow(unused)]
+    subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl ChatSpace {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        let dock = cx.new(|cx| {
+            let panel = Arc::new(onboarding::init(window, cx));
+            let center = DockItem::panel(panel);
+            let mut dock = DockArea::new(window, cx);
+            // Initialize the dock area with the center panel
+            dock.set_center(center, window, cx);
+            dock
+        });
+
+        cx.new(|cx| {
+            let account = Account::global(cx);
+            let mut subscriptions = smallvec![];
+
+            subscriptions.push(cx.observe_in(
+                &account,
+                window,
+                |this: &mut ChatSpace, account, window, cx| {
+                    if account.read(cx).profile.is_some() {
+                        this.open_chats(window, cx);
+                    } else {
+                        this.open_onboarding(window, cx);
+                    }
+                },
+            ));
+
+            Self {
+                dock,
+                subscriptions,
+                titlebar: false,
+            }
+        })
+    }
+
+    fn show_titlebar(&mut self, cx: &mut Context<Self>) {
+        self.titlebar = true;
+        cx.notify();
+    }
+
+    fn open_onboarding(&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.set_center(center, window, cx);
+        });
+    }
+
+    fn open_chats(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.show_titlebar(cx);
+
+        let weak_dock = self.dock.downgrade();
+        let left = DockItem::panel(Arc::new(sidebar::init(window, cx)));
+        let center = DockItem::split_with_sizes(
+            Axis::Vertical,
+            vec![DockItem::tabs(
+                vec![Arc::new(welcome::init(window, cx))],
+                None,
+                &weak_dock,
+                window,
+                cx,
+            )],
+            vec![None],
+            &weak_dock,
+            window,
+            cx,
+        );
+
+        self.dock.update(cx, |this, cx| {
+            this.set_left_dock(left, Some(px(SIDEBAR_WIDTH)), true, window, cx);
+            this.set_center(center, window, cx);
+        });
+
+        cx.defer_in(window, |this, window, cx| {
+            let verify_messaging_relays = this.verify_messaging_relays(cx);
+
+            cx.spawn_in(window, async move |_, cx| {
+                if let Ok(status) = verify_messaging_relays.await {
+                    if !status {
+                        cx.update(|window, cx| {
+                            window.dispatch_action(
+                                Box::new(ToggleModal {
+                                    modal: ModalKind::SetupRelay,
+                                }),
+                                cx,
+                            );
+                        })
+                        .ok();
+                    }
+                }
+            })
+            .detach();
+        });
+    }
+
+    fn verify_messaging_relays(&self, cx: &App) -> Task<Result<bool, Error>> {
+        cx.background_spawn(async move {
+            let client = get_client();
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            let filter = Filter::new()
+                .kind(Kind::InboxRelays)
+                .author(public_key)
+                .limit(1);
+
+            let exist = client.database().query(filter).await?.first().is_some();
+
+            Ok(exist)
+        })
+    }
+
+    fn on_panel_action(&mut self, action: &AddPanel, window: &mut Window, cx: &mut Context<Self>) {
+        match &action.panel {
+            PanelKind::Room(id) => {
+                // User must be logged in to open a room
+                match chat::init(id, window, cx) {
+                    Ok(panel) => {
+                        self.dock.update(cx, |dock_area, cx| {
+                            dock_area.add_panel(panel, action.position, window, cx);
+                        });
+                    }
+                    Err(e) => window.push_notification(e.to_string(), cx),
+                }
+            }
+        };
+    }
+
+    fn on_modal_action(
+        &mut self,
+        action: &ToggleModal,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match action.modal {
+            ModalKind::Profile => {
+                let profile = profile::init(window, cx);
+
+                window.open_modal(cx, move |modal, _, _| {
+                    modal
+                        .title("Profile")
+                        .width(px(MODAL_WIDTH))
+                        .child(profile.clone())
+                })
+            }
+            ModalKind::Compose => {
+                let compose = compose::init(window, cx);
+
+                window.open_modal(cx, move |modal, _, _| {
+                    modal
+                        .title("Direct Messages")
+                        .width(px(MODAL_WIDTH))
+                        .child(compose.clone())
+                })
+            }
+            ModalKind::Contact => {
+                let contacts = contacts::init(window, cx);
+
+                window.open_modal(cx, move |this, _window, _cx| {
+                    this.width(px(MODAL_WIDTH))
+                        .title("Contacts")
+                        .child(contacts.clone())
+                });
+            }
+            ModalKind::Relay => {
+                let relays = relays::init(window, cx);
+
+                window.open_modal(cx, move |this, _, _| {
+                    this.width(px(MODAL_WIDTH))
+                        .title("Edit your Messaging Relays")
+                        .child(relays.clone())
+                });
+            }
+            ModalKind::SetupRelay => {
+                let relays = relays::init(window, cx);
+
+                window.open_modal(cx, move |this, _, _| {
+                    this.width(px(MODAL_WIDTH))
+                        .title("Your Messaging Relays are not configured")
+                        .child(relays.clone())
+                });
+            }
+        };
+    }
+
+    pub(crate) fn set_center_panel<P: PanelView>(panel: P, window: &mut Window, cx: &mut App) {
+        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);
+                    });
+                });
+            }
+        }
+    }
+}
+
+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);
+
+        div()
+            .relative()
+            .size_full()
+            .child(
+                image_cache(cache_provider("image-cache", CACHE_SIZE))
+                    .size_full()
+                    .child(
+                        div()
+                            .flex()
+                            .flex_col()
+                            .size_full()
+                            // Title Bar
+                            .when(self.titlebar, |this| {
+                                this.child(
+                                    TitleBar::new()
+                                        // Left side
+                                        .child(div())
+                                        // Right side
+                                        .child(
+                                            div()
+                                                .flex()
+                                                .items_center()
+                                                .justify_end()
+                                                .gap_2()
+                                                .px_2()
+                                                .child(
+                                                    Button::new("appearance")
+                                                        .xsmall()
+                                                        .ghost()
+                                                        .map(|this| {
+                                                            if cx.theme().appearance.is_dark() {
+                                                                this.icon(IconName::Sun)
+                                                            } else {
+                                                                this.icon(IconName::Moon)
+                                                            }
+                                                        })
+                                                        .on_click(cx.listener(
+                                                            |_, _, window, cx| {
+                                                                if cx.theme().appearance.is_dark() {
+                                                                    Theme::change(
+                                                                        Appearance::Light,
+                                                                        Some(window),
+                                                                        cx,
+                                                                    );
+                                                                } else {
+                                                                    Theme::change(
+                                                                        Appearance::Dark,
+                                                                        Some(window),
+                                                                        cx,
+                                                                    );
+                                                                }
+                                                            },
+                                                        )),
+                                                ),
+                                        ),
+                                )
+                            })
+                            // Dock
+                            .child(self.dock.clone()),
+                    ),
+            )
+            // Notifications
+            .child(div().absolute().top_8().children(notification_layer))
+            // Modals
+            .children(modal_layer)
+            // Actions
+            .on_action(cx.listener(Self::on_panel_action))
+            .on_action(cx.listener(Self::on_modal_action))
+    }
+}
--- a/crates/coop/src/lru_cache.rs
+++ b/crates/coop/src/lru_cache.rs
@@ -0,0 +1,117 @@
+use std::{collections::HashMap, sync::Arc};
+
+use futures::FutureExt;
+use gpui::{
+    hash, AnyImageCache, App, AppContext, Asset, AssetLogger, Context, ElementId, Entity,
+    ImageAssetLoader, ImageCache, ImageCacheProvider, Window,
+};
+
+pub fn cache_provider(id: impl Into<ElementId>, max_items: usize) -> LruCacheProvider {
+    LruCacheProvider {
+        id: id.into(),
+        max_items,
+    }
+}
+
+pub struct LruCacheProvider {
+    id: ElementId,
+    max_items: usize,
+}
+
+impl ImageCacheProvider for LruCacheProvider {
+    fn provide(&mut self, window: &mut Window, cx: &mut App) -> AnyImageCache {
+        window
+            .with_global_id(self.id.clone(), |global_id, window| {
+                window.with_element_state::<Entity<LruCache>, _>(global_id, |lru_cache, _window| {
+                    let mut lru_cache =
+                        lru_cache.unwrap_or_else(|| cx.new(|cx| LruCache::new(self.max_items, cx)));
+                    if lru_cache.read(cx).max_items != self.max_items {
+                        lru_cache = cx.new(|cx| LruCache::new(self.max_items, cx));
+                    }
+                    (lru_cache.clone(), lru_cache)
+                })
+            })
+            .into()
+    }
+}
+
+struct LruCache {
+    max_items: usize,
+    usages: Vec<u64>,
+    cache: HashMap<u64, gpui::ImageCacheItem>,
+}
+
+impl LruCache {
+    fn new(max_items: usize, cx: &mut Context<Self>) -> Self {
+        cx.on_release(|simple_cache, cx| {
+            for (_, mut item) in std::mem::take(&mut simple_cache.cache) {
+                if let Some(Ok(image)) = item.get() {
+                    cx.drop_image(image, None);
+                }
+            }
+        })
+        .detach();
+
+        Self {
+            max_items,
+            usages: Vec::with_capacity(max_items),
+            cache: HashMap::with_capacity(max_items),
+        }
+    }
+}
+
+impl ImageCache for LruCache {
+    fn load(
+        &mut self,
+        resource: &gpui::Resource,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Option<Result<Arc<gpui::RenderImage>, gpui::ImageCacheError>> {
+        assert_eq!(self.usages.len(), self.cache.len());
+        assert!(self.cache.len() <= self.max_items);
+
+        let hash = hash(resource);
+
+        if let Some(item) = self.cache.get_mut(&hash) {
+            let current_ix = self
+                .usages
+                .iter()
+                .position(|item| *item == hash)
+                .expect("cache and usages must stay in sync");
+            self.usages.remove(current_ix);
+            self.usages.insert(0, hash);
+
+            return item.get();
+        }
+
+        let fut = AssetLogger::<ImageAssetLoader>::load(resource.clone(), cx);
+        let task = cx.background_executor().spawn(fut).shared();
+        if self.usages.len() == self.max_items {
+            let oldest = self.usages.pop().unwrap();
+            let mut image = self
+                .cache
+                .remove(&oldest)
+                .expect("cache and usages must be in sync");
+            if let Some(Ok(image)) = image.get() {
+                cx.drop_image(image, Some(window));
+            }
+        }
+        self.cache
+            .insert(hash, gpui::ImageCacheItem::Loading(task.clone()));
+        self.usages.insert(0, hash);
+
+        let entity = window.current_view();
+        window
+            .spawn(cx, {
+                async move |cx| {
+                    _ = task.await;
+                    cx.on_next_frame(move |_, cx| {
+                        cx.notify(entity);
+                    });
+                }
+            })
+            .detach();
+
+        None
+    }
+}
--- a/crates/coop/src/main.rs
+++ b/crates/coop/src/main.rs
@@ -0,0 +1,400 @@
+use anyhow::{anyhow, Error};
+use asset::Assets;
+use auto_update::AutoUpdater;
+use chats::ChatRegistry;
+use futures::{select, FutureExt};
+#[cfg(not(target_os = "linux"))]
+use global::constants::APP_NAME;
+use global::{
+    constants::{ALL_MESSAGES_SUB_ID, APP_ID, APP_PUBKEY, BOOTSTRAP_RELAYS, NEW_MESSAGE_SUB_ID},
+    get_client,
+};
+use gpui::{
+    actions, px, size, App, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem,
+    WindowBounds, WindowKind, WindowOptions,
+};
+#[cfg(not(target_os = "linux"))]
+use gpui::{point, SharedString, TitlebarOptions};
+#[cfg(target_os = "linux")]
+use gpui::{WindowBackgroundAppearance, WindowDecorations};
+use nostr_sdk::{
+    nips::nip01::Coordinate, pool::prelude::ReqExitPolicy, Client, Event, EventBuilder, EventId,
+    Filter, JsonUtil, Keys, Kind, Metadata, PublicKey, RelayMessage, RelayPoolNotification,
+    SubscribeAutoCloseOptions, SubscriptionId, Tag,
+};
+use smol::Timer;
+use std::{collections::HashSet, mem, sync::Arc, time::Duration};
+use ui::{theme::Theme, Root};
+
+pub(crate) mod asset;
+pub(crate) mod chatspace;
+pub(crate) mod lru_cache;
+pub(crate) mod views;
+
+actions!(coop, [Quit]);
+
+#[derive(Debug)]
+enum Signal {
+    /// Receive event
+    Event(Event),
+    /// Receive metadata
+    Metadata(Box<(PublicKey, Option<Metadata>)>),
+    /// Receive eose
+    Eose,
+    /// Receive app updates
+    AppUpdates(Event),
+}
+
+fn main() {
+    // Enable logging
+    tracing_subscriber::fmt::init();
+    // Fix crash on startup
+    _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
+
+    let (event_tx, event_rx) = smol::channel::bounded::<Signal>(2048);
+    let (batch_tx, batch_rx) = smol::channel::bounded::<Vec<PublicKey>>(500);
+
+    // Initialize nostr client
+    let client = get_client();
+    let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+
+    // Initialize application
+    let app = Application::new()
+        .with_assets(Assets)
+        .with_http_client(Arc::new(reqwest_client::ReqwestClient::new()));
+
+    // Connect to default relays
+    app.background_executor()
+        .spawn(async move {
+            for relay in BOOTSTRAP_RELAYS.into_iter() {
+                if let Err(e) = client.add_relay(relay).await {
+                    log::error!("Failed to add relay {}: {}", relay, e);
+                }
+            }
+
+            // Establish connection to bootstrap relays
+            client.connect().await;
+
+            log::info!("Connected to bootstrap relays");
+            log::info!("Subscribing to app updates...");
+
+            let coordinate = Coordinate {
+                kind: Kind::Custom(32267),
+                public_key: PublicKey::from_hex(APP_PUBKEY).expect("App Pubkey is invalid"),
+                identifier: APP_ID.into(),
+            };
+
+            let filter = Filter::new()
+                .kind(Kind::ReleaseArtifactSet)
+                .coordinate(&coordinate)
+                .limit(1);
+
+            if let Err(e) = client
+                .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                .await
+            {
+                log::error!("Failed to subscribe for app updates: {}", e);
+            }
+        })
+        .detach();
+
+    // Handle batch metadata
+    app.background_executor()
+        .spawn(async move {
+            const BATCH_SIZE: usize = 500;
+            const BATCH_TIMEOUT: Duration = Duration::from_millis(300);
+
+            let mut batch: HashSet<PublicKey> = HashSet::new();
+
+            loop {
+                let mut timeout = Box::pin(Timer::after(BATCH_TIMEOUT).fuse());
+
+                select! {
+                    pubkeys = batch_rx.recv().fuse() => {
+                        match pubkeys {
+                            Ok(keys) => {
+                                batch.extend(keys);
+                                if batch.len() >= BATCH_SIZE {
+                                    sync_metadata(mem::take(&mut batch), client, opts).await;
+                                }
+                            }
+                            Err(_) => break,
+                        }
+                    }
+                    _ = timeout => {
+                        if !batch.is_empty() {
+                            sync_metadata(mem::take(&mut batch), client, opts).await;
+                        }
+                    }
+                }
+            }
+        })
+        .detach();
+
+    // Handle notifications
+    app.background_executor()
+        .spawn(async move {
+            let rng_keys = Keys::generate();
+            let all_id = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
+            let new_id = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
+            let mut notifications = client.notifications();
+
+            while let Ok(notification) = notifications.recv().await {
+                if let RelayPoolNotification::Message { message, .. } = notification {
+                    match message {
+                        RelayMessage::Event {
+                            event,
+                            subscription_id,
+                        } => {
+                            match event.kind {
+                                Kind::GiftWrap => {
+                                    let event = match get_unwrapped(event.id).await {
+                                        Ok(event) => event,
+                                        Err(_) => match client.unwrap_gift_wrap(&event).await {
+                                            Ok(unwrap) => {
+                                                match unwrap.rumor.sign_with_keys(&rng_keys) {
+                                                    Ok(ev) => {
+                                                        set_unwrapped(event.id, &ev, &rng_keys)
+                                                            .await
+                                                            .ok();
+                                                        ev
+                                                    }
+                                                    Err(_) => continue,
+                                                }
+                                            }
+                                            Err(_) => continue,
+                                        },
+                                    };
+
+                                    let mut pubkeys = vec![];
+                                    pubkeys.extend(event.tags.public_keys());
+                                    pubkeys.push(event.pubkey);
+
+                                    // Send all pubkeys to the batch to sync metadata
+                                    batch_tx.send(pubkeys).await.ok();
+
+                                    // Save the event to the database, use for query directly.
+                                    client.database().save_event(&event).await.ok();
+
+                                    // Send this event to the GPUI
+                                    if new_id == *subscription_id {
+                                        event_tx.send(Signal::Event(event)).await.ok();
+                                    }
+                                }
+                                Kind::Metadata => {
+                                    let metadata = Metadata::from_json(&event.content).ok();
+
+                                    event_tx
+                                        .send(Signal::Metadata(Box::new((event.pubkey, metadata))))
+                                        .await
+                                        .ok();
+                                }
+                                Kind::ContactList => {
+                                    if let Ok(signer) = client.signer().await {
+                                        if let Ok(public_key) = signer.get_public_key().await {
+                                            if public_key == event.pubkey {
+                                                let pubkeys = event
+                                                    .tags
+                                                    .public_keys()
+                                                    .copied()
+                                                    .collect::<Vec<_>>();
+
+                                                batch_tx.send(pubkeys).await.ok();
+                                            }
+                                        }
+                                    }
+                                }
+                                Kind::ReleaseArtifactSet => {
+                                    let filter = Filter::new()
+                                        .ids(event.tags.event_ids().copied())
+                                        .kind(Kind::FileMetadata);
+
+                                    if let Err(e) = client
+                                        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                                        .await
+                                    {
+                                        log::error!("Failed to subscribe for file metadata: {}", e);
+                                    } else {
+                                        event_tx
+                                            .send(Signal::AppUpdates(event.into_owned()))
+                                            .await
+                                            .ok();
+                                    }
+                                }
+                                _ => {}
+                            }
+                        }
+                        RelayMessage::EndOfStoredEvents(subscription_id) => {
+                            if all_id == *subscription_id {
+                                event_tx.send(Signal::Eose).await.ok();
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        })
+        .detach();
+
+    app.run(move |cx| {
+        // Bring the app to the foreground
+        cx.activate(true);
+
+        // Register the `quit` function
+        cx.on_action(quit);
+
+        // Register the `quit` function with CMD+Q
+        cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
+
+        // Set menu items
+        cx.set_menus(vec![Menu {
+            name: "Coop".into(),
+            items: vec![MenuItem::action("Quit", Quit)],
+        }]);
+
+        // Set up the window options
+        let opts = WindowOptions {
+            #[cfg(not(target_os = "linux"))]
+            titlebar: Some(TitlebarOptions {
+                title: Some(SharedString::new_static(APP_NAME)),
+                traffic_light_position: Some(point(px(9.0), px(9.0))),
+                appears_transparent: true,
+            }),
+            window_bounds: Some(WindowBounds::Windowed(Bounds::centered(
+                None,
+                size(px(920.0), px(700.0)),
+                cx,
+            ))),
+            #[cfg(target_os = "linux")]
+            window_background: WindowBackgroundAppearance::Transparent,
+            #[cfg(target_os = "linux")]
+            window_decorations: Some(WindowDecorations::Client),
+            kind: WindowKind::Normal,
+            app_id: Some(APP_ID.to_owned()),
+            ..Default::default()
+        };
+
+        // Open a window with default options
+        cx.open_window(opts, |window, cx| {
+            // Automatically sync theme with system appearance
+            window
+                .observe_window_appearance(|window, cx| {
+                    Theme::sync_system_appearance(Some(window), cx);
+                })
+                .detach();
+
+            // Root Entity
+            cx.new(|cx| {
+                // Initialize components
+                ui::init(cx);
+
+                // Initialize auto update
+                auto_update::init(cx);
+
+                // Initialize chat state
+                chats::init(cx);
+
+                // Initialize account state
+                account::init(cx);
+
+                // Spawn a task to handle events from nostr channel
+                cx.spawn_in(window, async move |_, cx| {
+                    while let Ok(signal) = event_rx.recv().await {
+                        cx.update(|window, cx| {
+                            let chats = ChatRegistry::global(cx);
+                            let auto_updater = AutoUpdater::global(cx);
+
+                            match signal {
+                                Signal::Event(event) => {
+                                    chats.update(cx, |this, cx| {
+                                        this.push_message(event, window, cx)
+                                    });
+                                }
+                                Signal::Metadata(data) => {
+                                    chats.update(cx, |this, cx| {
+                                        this.add_profile(data.0, data.1, cx)
+                                    });
+                                }
+                                Signal::Eose => {
+                                    chats.update(cx, |this, cx| {
+                                        // This function maybe called multiple times
+                                        // TODO: only handle the last EOSE signal
+                                        this.load_rooms(window, cx)
+                                    });
+                                }
+                                Signal::AppUpdates(event) => {
+                                    // TODO: add settings for auto updates
+                                    auto_updater.update(cx, |this, cx| {
+                                        this.update(event, cx);
+                                    })
+                                }
+                            };
+                        })
+                        .ok();
+                    }
+                })
+                .detach();
+
+                Root::new(chatspace::init(window, cx).into(), window, cx)
+            })
+        })
+        .expect("Failed to open window. Please restart the application.");
+    });
+}
+
+async fn set_unwrapped(root: EventId, event: &Event, keys: &Keys) -> Result<(), Error> {
+    let client = get_client();
+    let event = EventBuilder::new(Kind::Custom(9001), event.as_json())
+        .tags(vec![Tag::event(root)])
+        .sign(keys)
+        .await?;
+
+    client.database().save_event(&event).await?;
+
+    Ok(())
+}
+
+async fn get_unwrapped(gift_wrap: EventId) -> Result<Event, Error> {
+    let client = get_client();
+    let filter = Filter::new()
+        .kind(Kind::Custom(9001))
+        .event(gift_wrap)
+        .limit(1);
+
+    if let Some(event) = client.database().query(filter).await?.first_owned() {
+        let parsed = Event::from_json(event.content)?;
+        Ok(parsed)
+    } else {
+        Err(anyhow!("Event not found"))
+    }
+}
+
+async fn sync_metadata(
+    buffer: HashSet<PublicKey>,
+    client: &Client,
+    opts: SubscribeAutoCloseOptions,
+) {
+    let kinds = vec![
+        Kind::Metadata,
+        Kind::ContactList,
+        Kind::InboxRelays,
+        Kind::UserStatus,
+    ];
+
+    let filter = Filter::new()
+        .authors(buffer.iter().cloned())
+        .limit(buffer.len() * kinds.len())
+        .kinds(kinds);
+
+    if let Err(e) = client
+        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+        .await
+    {
+        log::error!("Failed to sync metadata: {e}");
+    }
+}
+
+fn quit(_: &Quit, cx: &mut App) {
+    log::info!("Gracefully quitting the application . . .");
+    cx.quit();
+}
--- a/crates/coop/src/views/chat.rs
+++ b/crates/coop/src/views/chat.rs
@@ -0,0 +1,629 @@
+use anyhow::{anyhow, Error};
+use async_utility::task::spawn;
+use chats::{
+    message::RoomMessage,
+    room::{Room, SendStatus},
+    ChatRegistry,
+};
+use common::{nip96_upload, profile::SharedProfile};
+use global::{constants::IMAGE_SERVICE, get_client};
+use gpui::{
+    div, img, impl_internal_actions, list, prelude::FluentBuilder, px, relative, svg, white,
+    AnyElement, App, AppContext, Context, Element, Empty, Entity, EventEmitter, Flatten,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ListAlignment, ListState, ObjectFit,
+    ParentElement, PathPromptOptions, Render, SharedString, StatefulInteractiveElement, Styled,
+    StyledImage, Subscription, Window,
+};
+use nostr_sdk::prelude::*;
+use serde::Deserialize;
+use smallvec::{smallvec, SmallVec};
+use smol::fs;
+use std::{collections::HashMap, sync::Arc};
+use ui::{
+    button::{Button, ButtonVariants},
+    dock_area::panel::{Panel, PanelEvent},
+    emoji_picker::EmojiPicker,
+    input::{InputEvent, TextInput},
+    notification::Notification,
+    popup_menu::PopupMenu,
+    text::RichText,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    v_flex, ContextModal, Disableable, Icon, IconName, Size, StyledExt,
+};
+
+use crate::views::subject;
+
+const ALERT: &str = "has not set up Messaging (DM) Relays, so they will NOT receive your messages.";
+const DESC: &str = "This conversation is private. Only members can see each other's messages.";
+
+#[derive(Clone, PartialEq, Eq, Deserialize)]
+pub struct ChangeSubject(pub String);
+
+impl_internal_actions!(chat, [ChangeSubject]);
+
+pub fn init(id: &u64, window: &mut Window, cx: &mut App) -> Result<Arc<Entity<Chat>>, Error> {
+    if let Some(room) = ChatRegistry::global(cx).read(cx).room(id, cx) {
+        Ok(Arc::new(Chat::new(id, room, window, cx)))
+    } else {
+        Err(anyhow!("Chat Room not found."))
+    }
+}
+
+pub struct Chat {
+    // Panel
+    id: SharedString,
+    focus_handle: FocusHandle,
+    // Chat Room
+    room: Entity<Room>,
+    messages: Entity<Vec<RoomMessage>>,
+    text_data: HashMap<EventId, RichText>,
+    list_state: ListState,
+    // New Message
+    input: Entity<TextInput>,
+    // Media Attachment
+    attaches: Entity<Option<Vec<Url>>>,
+    is_uploading: bool,
+    #[allow(dead_code)]
+    subscriptions: SmallVec<[Subscription; 2]>,
+}
+
+impl Chat {
+    pub fn new(id: &u64, room: Entity<Room>, window: &mut Window, cx: &mut App) -> Entity<Self> {
+        let messages = cx.new(|_| vec![RoomMessage::announcement()]);
+        let attaches = cx.new(|_| None);
+        let input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .placeholder("Message...")
+        });
+
+        cx.new(|cx| {
+            let mut subscriptions = smallvec![];
+
+            subscriptions.push(cx.subscribe_in(
+                &input,
+                window,
+                move |this: &mut Self, _, event, window, cx| {
+                    if let InputEvent::PressEnter = event {
+                        this.send_message(window, cx);
+                    }
+                },
+            ));
+
+            subscriptions.push(cx.subscribe_in(
+                &room,
+                window,
+                move |this, _, event, _window, cx| {
+                    let old_len = this.messages.read(cx).len();
+                    let message = event.event.clone();
+
+                    cx.update_entity(&this.messages, |this, cx| {
+                        this.extend(vec![message]);
+                        cx.notify();
+                    });
+
+                    this.list_state.splice(old_len..old_len, 1);
+                },
+            ));
+
+            // Initialize list state
+            // [item_count] always equal to 1 at the beginning
+            let list_state = ListState::new(1, ListAlignment::Bottom, px(1024.), {
+                let this = cx.entity().downgrade();
+                move |ix, window, cx| {
+                    this.update(cx, |this, cx| {
+                        this.render_message(ix, window, cx).into_any_element()
+                    })
+                    .unwrap_or(Empty.into_any())
+                }
+            });
+
+            let this = Self {
+                focus_handle: cx.focus_handle(),
+                is_uploading: false,
+                id: id.to_string().into(),
+                text_data: HashMap::new(),
+                room,
+                messages,
+                list_state,
+                input,
+                attaches,
+                subscriptions,
+            };
+
+            // Verify messaging relays of all members
+            this.verify_messaging_relays(window, cx);
+
+            // Load all messages from database
+            this.load_messages(window, cx);
+
+            this
+        })
+    }
+
+    fn verify_messaging_relays(&self, window: &mut Window, cx: &mut Context<Self>) {
+        let room = self.room.read(cx);
+        let task = room.messaging_relays(cx);
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(result) = task.await {
+                cx.update(|_, cx| {
+                    this.update(cx, |this, cx| {
+                        result.into_iter().for_each(|item| {
+                            if !item.1 {
+                                let profile = this
+                                    .room
+                                    .read_with(cx, |this, _| this.profile_by_pubkey(&item.0, cx));
+
+                                this.push_system_message(
+                                    format!("{} {}", profile.shared_name(), ALERT),
+                                    cx,
+                                );
+                            }
+                        });
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn load_messages(&self, window: &mut Window, cx: &mut Context<Self>) {
+        let room = self.room.read(cx);
+        let task = room.load_messages(cx);
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(events) = task.await {
+                cx.update(|_, cx| {
+                    this.update(cx, |this, cx| {
+                        let old_len = this.messages.read(cx).len();
+                        let new_len = events.len();
+
+                        // Extend the messages list with the new events
+                        this.messages.update(cx, |this, cx| {
+                            this.extend(events);
+                            cx.notify();
+                        });
+
+                        // Update list state with the new messages
+                        this.list_state.splice(old_len..old_len, new_len);
+
+                        cx.notify();
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn push_system_message(&self, content: String, cx: &mut Context<Self>) {
+        let old_len = self.messages.read(cx).len();
+        let message = RoomMessage::system(content.into());
+
+        cx.update_entity(&self.messages, |this, cx| {
+            this.extend(vec![message]);
+            cx.notify();
+        });
+
+        self.list_state.splice(old_len..old_len, 1);
+    }
+
+    fn send_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let mut content = self.input.read(cx).text().to_string();
+
+        // Get all attaches and merge its with message
+        if let Some(attaches) = self.attaches.read(cx).as_ref() {
+            let merged = attaches
+                .iter()
+                .map(|url| url.to_string())
+                .collect::<Vec<_>>()
+                .join("\n");
+
+            content = format!("{}\n{}", content, merged)
+        }
+
+        // Check if content is empty
+        if content.is_empty() {
+            window.push_notification("Cannot send an empty message", cx);
+            return;
+        }
+
+        // Update input state
+        self.input.update(cx, |this, cx| {
+            this.set_loading(true, window, cx);
+            this.set_disabled(true, window, cx);
+        });
+
+        let room = self.room.read(cx);
+        let task = room.send_message(content, cx);
+
+        cx.spawn_in(window, async move |this, cx| {
+            let mut received = false;
+
+            match task {
+                Some(rx) => {
+                    while let Ok(message) = rx.recv().await {
+                        if let SendStatus::Failed(error) = message {
+                            cx.update(|window, cx| {
+                                window.push_notification(
+                                    Notification::error(error.to_string())
+                                        .title("Message Failed to Send"),
+                                    cx,
+                                );
+                            })
+                            .ok();
+                        } else if !received {
+                            cx.update(|window, cx| {
+                                this.update(cx, |this, cx| {
+                                    this.input.update(cx, |this, cx| {
+                                        this.set_loading(false, window, cx);
+                                        this.set_disabled(false, window, cx);
+                                        this.set_text("", window, cx);
+                                    });
+                                    received = true;
+                                })
+                                .ok();
+                            })
+                            .ok();
+                        }
+                    }
+                }
+                None => {
+                    cx.update(|window, cx| {
+                        window.push_notification(Notification::error("User is not logged in"), cx);
+                    })
+                    .ok();
+                }
+            }
+        })
+        .detach();
+    }
+
+    fn upload_media(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let paths = cx.prompt_for_paths(PathPromptOptions {
+            files: true,
+            directories: false,
+            multiple: false,
+        });
+
+        // Show loading spinner
+        self.set_loading(true, cx);
+
+        cx.spawn_in(window, async move |this, cx| {
+            match Flatten::flatten(paths.await.map_err(|e| e.into())) {
+                Ok(Some(mut paths)) => {
+                    let Some(path) = paths.pop() else {
+                        return;
+                    };
+
+                    if let Ok(file_data) = fs::read(path).await {
+                        let client = get_client();
+                        let (tx, rx) = oneshot::channel::<Url>();
+
+                        // spawn task via async_utility
+                        spawn(async move {
+                            if let Ok(url) = nip96_upload(client, file_data).await {
+                                _ = tx.send(url);
+                            }
+                        });
+
+                        if let Ok(url) = rx.await {
+                            cx.update(|_, cx| {
+                                this.update(cx, |this, cx| {
+                                    this.set_loading(false, cx);
+
+                                    this.attaches.update(cx, |this, cx| {
+                                        if let Some(model) = this.as_mut() {
+                                            model.push(url);
+                                        } else {
+                                            *this = Some(vec![url]);
+                                        }
+                                        cx.notify();
+                                    });
+                                })
+                                .ok();
+                            })
+                            .ok();
+                        }
+                    }
+                }
+                Ok(None) => {
+                    cx.update(|_, cx| {
+                        this.update(cx, |this, cx| {
+                            this.set_loading(false, cx);
+                        })
+                        .ok();
+                    })
+                    .ok();
+                }
+                Err(_) => {}
+            }
+        })
+        .detach();
+    }
+
+    fn remove_media(&mut self, url: &Url, _window: &mut Window, cx: &mut Context<Self>) {
+        self.attaches.update(cx, |model, cx| {
+            if let Some(urls) = model.as_mut() {
+                if let Some(ix) = urls.iter().position(|x| x == url) {
+                    urls.remove(ix);
+                    cx.notify();
+                }
+            }
+        });
+    }
+
+    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.is_uploading = status;
+        cx.notify();
+    }
+
+    fn render_message(
+        &mut self,
+        ix: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let Some(message) = self.messages.read(cx).get(ix) else {
+            return div().into_element();
+        };
+
+        let text_data = &mut self.text_data;
+
+        div()
+            .group("")
+            .w_full()
+            .relative()
+            .flex()
+            .gap_3()
+            .px_3()
+            .py_2()
+            .map(|this| match message {
+                RoomMessage::User(item) => {
+                    let text = text_data
+                        .entry(item.id)
+                        .or_insert_with(|| RichText::new(item.content.to_owned(), &item.mentions));
+
+                    this.hover(|this| this.bg(cx.theme().accent.step(cx, ColorScaleStep::ONE)))
+                        .text_sm()
+                        .child(
+                            div()
+                                .absolute()
+                                .left_0()
+                                .top_0()
+                                .w(px(2.))
+                                .h_full()
+                                .bg(cx.theme().transparent)
+                                .group_hover("", |this| {
+                                    this.bg(cx.theme().accent.step(cx, ColorScaleStep::NINE))
+                                }),
+                        )
+                        .child(img(item.author.shared_avatar()).size_8().flex_shrink_0())
+                        .child(
+                            div()
+                                .flex()
+                                .flex_col()
+                                .flex_initial()
+                                .overflow_hidden()
+                                .child(
+                                    div()
+                                        .flex()
+                                        .items_baseline()
+                                        .gap_2()
+                                        .child(
+                                            div().font_semibold().child(item.author.shared_name()),
+                                        )
+                                        .child(
+                                            div()
+                                                .text_color(
+                                                    cx.theme().base.step(cx, ColorScaleStep::NINE),
+                                                )
+                                                .child(item.ago()),
+                                        ),
+                                )
+                                .child(text.element("body".into(), window, cx)),
+                        )
+                }
+                RoomMessage::System(content) => this
+                    .items_center()
+                    .child(
+                        div()
+                            .absolute()
+                            .left_0()
+                            .top_0()
+                            .w(px(2.))
+                            .h_full()
+                            .bg(cx.theme().transparent)
+                            .group_hover("", |this| this.bg(cx.theme().danger)),
+                    )
+                    .child(img("brand/avatar.png").size_8().flex_shrink_0())
+                    .text_sm()
+                    .text_color(cx.theme().danger)
+                    .child(content.clone()),
+                RoomMessage::Announcement => this
+                    .w_full()
+                    .h_32()
+                    .flex()
+                    .flex_col()
+                    .items_center()
+                    .justify_center()
+                    .text_center()
+                    .text_xs()
+                    .text_color(cx.theme().base.step(cx, ColorScaleStep::NINE))
+                    .line_height(relative(1.3))
+                    .child(
+                        svg()
+                            .path("brand/coop.svg")
+                            .size_10()
+                            .text_color(cx.theme().base.step(cx, ColorScaleStep::THREE)),
+                    )
+                    .child(DESC),
+            })
+    }
+}
+
+impl Panel for Chat {
+    fn panel_id(&self) -> SharedString {
+        self.id.clone()
+    }
+
+    fn title(&self, cx: &App) -> AnyElement {
+        self.room.read_with(cx, |this, _| {
+            let facepill: Vec<SharedString> = this.avatars(cx);
+
+            div()
+                .flex()
+                .items_center()
+                .gap_1p5()
+                .child(
+                    div()
+                        .flex()
+                        .flex_row_reverse()
+                        .items_center()
+                        .justify_start()
+                        .children(
+                            facepill
+                                .into_iter()
+                                .enumerate()
+                                .rev()
+                                .map(|(ix, facepill)| {
+                                    div()
+                                        .when(ix > 0, |div| div.ml_neg_1())
+                                        .child(img(facepill).size_5())
+                                }),
+                        ),
+                )
+                .child(this.display_name(cx))
+                .into_any()
+        })
+    }
+
+    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
+        menu.track_focus(&self.focus_handle)
+    }
+
+    fn toolbar_buttons(&self, _window: &Window, cx: &App) -> Vec<Button> {
+        let id = self.room.read(cx).id;
+        let subject = self
+            .room
+            .read(cx)
+            .subject
+            .as_ref()
+            .map(|subject| subject.to_string());
+
+        let button = Button::new("subject")
+            .icon(IconName::EditFill)
+            .tooltip("Change Subject")
+            .on_click(move |_, window, cx| {
+                let subject = subject::init(id, subject.clone(), window, cx);
+
+                window.open_modal(cx, move |this, _window, _cx| {
+                    this.title("Change the subject of the conversation")
+                        .child(subject.clone())
+                });
+            });
+
+        vec![button]
+    }
+}
+
+impl EventEmitter<PanelEvent> for Chat {}
+
+impl Focusable for Chat {
+    fn focus_handle(&self, _: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Chat {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .child(list(self.list_state.clone()).flex_1())
+            .child(
+                div().flex_shrink_0().px_3().py_2().child(
+                    div()
+                        .flex()
+                        .flex_col()
+                        .when_some(self.attaches.read(cx).as_ref(), |this, attaches| {
+                            this.gap_1p5().children(attaches.iter().map(|url| {
+                                let url = url.clone();
+                                let path: SharedString = url.to_string().into();
+
+                                div()
+                                    .id(path.clone())
+                                    .relative()
+                                    .w_16()
+                                    .child(
+                                        img(format!(
+                                            "{}/?url={}&w=128&h=128&fit=cover&n=-1",
+                                            IMAGE_SERVICE, path
+                                        ))
+                                        .size_16()
+                                        .shadow_lg()
+                                        .rounded(px(cx.theme().radius))
+                                        .object_fit(ObjectFit::ScaleDown),
+                                    )
+                                    .child(
+                                        div()
+                                            .absolute()
+                                            .top_neg_2()
+                                            .right_neg_2()
+                                            .size_4()
+                                            .flex()
+                                            .items_center()
+                                            .justify_center()
+                                            .rounded_full()
+                                            .bg(cx.theme().danger)
+                                            .child(
+                                                Icon::new(IconName::Close)
+                                                    .size_2()
+                                                    .text_color(white()),
+                                            ),
+                                    )
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.remove_media(&url, window, cx);
+                                    }))
+                            }))
+                        })
+                        .child(
+                            div()
+                                .w_full()
+                                .flex()
+                                .items_center()
+                                .gap_2p5()
+                                .child(
+                                    div()
+                                        .flex()
+                                        .items_center()
+                                        .gap_1()
+                                        .text_color(
+                                            cx.theme().base.step(cx, ColorScaleStep::ELEVEN),
+                                        )
+                                        .child(
+                                            Button::new("upload")
+                                                .icon(Icon::new(IconName::Upload))
+                                                .ghost()
+                                                .disabled(self.is_uploading)
+                                                .loading(self.is_uploading)
+                                                .on_click(cx.listener(
+                                                    move |this, _, window, cx| {
+                                                        this.upload_media(window, cx);
+                                                    },
+                                                )),
+                                        )
+                                        .child(
+                                            EmojiPicker::new(self.input.downgrade())
+                                                .icon(IconName::EmojiFill),
+                                        ),
+                                )
+                                .child(self.input.clone()),
+                        ),
+                ),
+            )
+    }
+}
--- a/crates/app/src/views/sidebar/compose.rs
+++ b/crates/app/src/views/sidebar/compose.rs
@@ -1,28 +1,34 @@
-use async_utility::task::spawn;
-use chats::{registry::ChatRegistry, room::Room};
-use common::{
-    profile::NostrProfile,
-    utils::{random_name, signer_public_key},
+use anyhow::Error;
+use chats::{
+    room::{Room, RoomKind},
+    ChatRegistry,
 };
+use common::{profile::SharedProfile, random_name};
+use global::get_client;
 use gpui::{
    div, img, impl_internal_actions, prelude::FluentBuilder, px, relative, uniform_list, App,
    AppContext, Context, Entity, FocusHandle, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, TextAlign, Window,
+    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task, TextAlign,
+    Window,
 };
 use nostr_sdk::prelude::*;
 use serde::Deserialize;
+use smallvec::{smallvec, SmallVec};
 use smol::Timer;
-use state::get_client;
-use std::{collections::HashSet, time::Duration};
+use std::{
+    collections::{BTreeSet, HashSet},
+    time::Duration,
+};
 use ui::{
-    button::{Button, ButtonRounded},
+    button::{Button, ButtonVariants},
    input::{InputEvent, TextInput},
    theme::{scale::ColorScaleStep, ActiveTheme},
-    ContextModal, Icon, IconName, Sizable, Size, StyledExt,
+    ContextModal, Disableable, Icon, IconName, Sizable, Size, StyledExt,
 };

-const ALERT: &str =
-    "Start a conversation with someone using their npub or NIP-05 (like foo@bar.com).";
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Compose> {
+    cx.new(|cx| Compose::new(window, cx))
+}

 #[derive(Clone, PartialEq, Eq, Deserialize)]
 struct SelectContact(PublicKey);
@@ -32,14 +38,14 @@ impl_internal_actions!(contacts, [SelectContact]);
 pub struct Compose {
    title_input: Entity<TextInput>,
    user_input: Entity<TextInput>,
-    contacts: Entity<Vec<NostrProfile>>,
+    contacts: Entity<Vec<Profile>>,
    selected: Entity<HashSet<PublicKey>>,
    focus_handle: FocusHandle,
    is_loading: bool,
    is_submitting: bool,
    error_message: Entity<Option<SharedString>>,
    #[allow(dead_code)]
-    subscriptions: Vec<Subscription>,
+    subscriptions: SmallVec<[Subscription; 1]>,
 }

 impl Compose {
@@ -47,13 +53,12 @@ impl Compose {
        let contacts = cx.new(|_| Vec::new());
        let selected = cx.new(|_| HashSet::new());
        let error_message = cx.new(|_| None);
-        let mut subscriptions = Vec::new();

        let title_input = cx.new(|cx| {
            let name = random_name(2);
            let mut input = TextInput::new(window, cx)
                .appearance(false)
-                .text_size(Size::XSmall);
+                .text_size(Size::Small);

            input.set_placeholder("Family... . (Optional)");
            input.set_text(name, window, cx);
@@ -67,48 +72,40 @@ impl Compose {
                .placeholder("npub1...")
        });

+        let mut subscriptions = smallvec![];
+
        // Handle Enter event for user input
        subscriptions.push(cx.subscribe_in(
            &user_input,
            window,
-            move |this, input, input_event, window, cx| {
+            move |this, _, input_event, window, cx| {
                if let InputEvent::PressEnter = input_event {
-                    if input.read(cx).text().contains("@") {
-                        this.add_nip05(window, cx);
-                    } else {
-                        this.add_npub(window, cx)
-                    }
+                    this.add(window, cx);
                }
            },
        ));

-        let client = get_client();
-        let (tx, rx) = oneshot::channel::<Vec<NostrProfile>>();
+        cx.spawn(async move |this, cx| {
+            let task: Task<Result<BTreeSet<Profile>, Error>> = cx.background_spawn(async move {
+                let client = get_client();
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+                let profiles = client.database().contacts(public_key).await?;

-        cx.background_spawn(async move {
-            if let Ok(public_key) = signer_public_key(client).await {
-                if let Ok(profiles) = client.database().contacts(public_key).await {
-                    let members: Vec<NostrProfile> = profiles
-                        .into_iter()
-                        .map(|profile| NostrProfile::new(profile.public_key(), profile.metadata()))
-                        .collect();
+                Ok(profiles)
+            });

-                    _ = tx.send(members);
-                }
-            }
-        })
-        .detach();
-
-        cx.spawn(|this, cx| async move {
-            if let Ok(contacts) = rx.await {
-                _ = cx.update(|cx| {
+            if let Ok(contacts) = task.await {
+                cx.update(|cx| {
                    this.update(cx, |this, cx| {
                        this.contacts.update(cx, |this, cx| {
                            this.extend(contacts);
                            cx.notify();
                        });
                    })
-                });
+                    .ok()
+                })
+                .ok();
            }
        })
        .detach();
@@ -150,39 +147,36 @@ impl Compose {
        }

        let tags = Tags::from_list(tag_list);
-        let client = get_client();
-        let window_handle = window.window_handle();
-        let (tx, rx) = oneshot::channel::<Event>();

-        cx.background_spawn(async move {
-            let signer = client.signer().await.expect("Signer is required");
+        let event: Task<Result<Event, anyhow::Error>> = cx.background_spawn(async move {
+            let client = get_client();
+            let signer = client.signer().await?;
            // [IMPORTANT]
            // Make sure this event is never send,
-            // this event existed just use for convert to Coop's Chat Room later.
-            if let Ok(event) = EventBuilder::private_msg_rumor(*pubkeys.last().unwrap(), "")
+            // this event existed just use for convert to Coop's Room later.
+            let event = EventBuilder::private_msg_rumor(*pubkeys.last().unwrap(), "")
                .tags(tags)
                .sign(&signer)
-                .await
-            {
-                _ = tx.send(event)
-            };
-        })
-        .detach();
+                .await?;

-        cx.spawn(|this, mut cx| async move {
-            if let Ok(event) = rx.await {
-                _ = cx.update_window(window_handle, |_, window, cx| {
-                    // Stop loading spinner
-                    _ = this.update(cx, |this, cx| {
+            Ok(event)
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(event) = event.await {
+                cx.update(|window, cx| {
+                    this.update(cx, |this, cx| {
                        this.set_submitting(false, cx);
-                    });
+                    })
+                    .ok();

-                    if let Some(chats) = ChatRegistry::global(cx) {
-                        let room = Room::parse(&event, cx);
+                    let chats = ChatRegistry::global(cx);
+                    let room = Room::new(&event).kind(RoomKind::Ongoing);

-                        chats.update(cx, |state, cx| match state.new_room(room, cx) {
+                    chats.update(cx, |chats, cx| {
+                        match chats.push(room, cx) {
                            Ok(_) => {
-                                // TODO: open chat panel
+                                // TODO: automatically open newly created chat panel
                                window.close_modal(cx);
                            }
                            Err(e) => {
@@ -190,150 +184,91 @@ impl Compose {
                                    this.set_error(Some(e.to_string().into()), cx);
                                });
                            }
-                        });
-                    }
-                });
+                        }
+                    });
+                })
+                .ok();
            }
        })
        .detach();
    }

-    pub fn label(&self, _window: &Window, cx: &App) -> SharedString {
-        if self.selected.read(cx).len() > 1 {
-            "Create Group DM".into()
+    fn add(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let client = get_client();
+        let content = self.user_input.read(cx).text().to_string();
+
+        // Show loading spinner
+        self.set_loading(true, cx);
+
+        let task: Task<Result<Profile, anyhow::Error>> = if content.contains("@") {
+            cx.background_spawn(async move {
+                let profile = nip05::profile(&content, None).await?;
+                let public_key = profile.public_key;
+
+                let metadata = client
+                    .fetch_metadata(public_key, Duration::from_secs(2))
+                    .await?
+                    .unwrap_or_default();
+
+                Ok(Profile::new(public_key, metadata))
+            })
        } else {
-            "Create DM".into()
-        }
-    }
+            let Ok(public_key) = PublicKey::parse(&content) else {
+                self.set_loading(false, cx);
+                self.set_error(Some("Public Key is not valid".into()), cx);
+                return;
+            };

-    pub fn is_submitting(&self) -> bool {
-        self.is_submitting
-    }
+            cx.background_spawn(async move {
+                let metadata = client
+                    .fetch_metadata(public_key, Duration::from_secs(2))
+                    .await?
+                    .unwrap_or_default();

-    fn add_npub(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let window_handle = window.window_handle();
-        let content = self.user_input.read(cx).text().to_string();
-
-        // Show loading spinner
-        self.set_loading(true, cx);
-
-        let Ok(public_key) = PublicKey::parse(&content) else {
-            self.set_loading(false, cx);
-            self.set_error(Some("Public Key is not valid".into()), cx);
-            return;
+                Ok(Profile::new(public_key, metadata))
+            })
        };

-        if self
-            .contacts
-            .read(cx)
-            .iter()
-            .any(|c| c.public_key() == public_key)
-        {
-            self.set_loading(false, cx);
-            return;
-        };
+        cx.spawn_in(window, async move |this, cx| {
+            match task.await {
+                Ok(profile) => {
+                    cx.update(|window, cx| {
+                        this.update(cx, |this, cx| {
+                            let public_key = profile.public_key();

-        let client = get_client();
-        let (tx, rx) = oneshot::channel::<Metadata>();
+                            this.contacts.update(cx, |this, cx| {
+                                this.insert(0, profile);
+                                cx.notify();
+                            });

-        cx.background_spawn(async move {
-            let metadata = (client
-                .fetch_metadata(public_key, Duration::from_secs(2))
-                .await)
-                .unwrap_or_default();
+                            this.selected.update(cx, |this, cx| {
+                                this.insert(public_key);
+                                cx.notify();
+                            });

-            _ = tx.send(metadata);
-        })
-        .detach();
+                            // Stop loading indicator
+                            this.set_loading(false, cx);

-        cx.spawn(|this, mut cx| async move {
-            if let Ok(metadata) = rx.await {
-                _ = cx.update_window(window_handle, |_, window, cx| {
-                    _ = this.update(cx, |this, cx| {
-                        this.contacts.update(cx, |this, cx| {
-                            this.insert(0, NostrProfile::new(public_key, metadata));
-                            cx.notify();
-                        });
-
-                        this.selected.update(cx, |this, cx| {
-                            this.insert(public_key);
-                            cx.notify();
-                        });
-
-                        // Stop loading indicator
-                        this.set_loading(false, cx);
-
-                        // Clear input
-                        this.user_input.update(cx, |this, cx| {
-                            this.set_text("", window, cx);
-                            cx.notify();
-                        });
-                    });
-                });
-            }
-        })
-        .detach();
-    }
-
-    fn add_nip05(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let window_handle = window.window_handle();
-        let content = self.user_input.read(cx).text().to_string();
-
-        // Show loading spinner
-        self.set_loading(true, cx);
-
-        let client = get_client();
-        let (tx, rx) = oneshot::channel::<Option<NostrProfile>>();
-
-        cx.background_spawn(async move {
-            spawn(async move {
-                if let Ok(profile) = nip05::profile(&content, None).await {
-                    let metadata = (client
-                        .fetch_metadata(profile.public_key, Duration::from_secs(2))
-                        .await)
-                        .unwrap_or_default();
-
-                    _ = tx.send(Some(NostrProfile::new(profile.public_key, metadata)));
-                } else {
-                    _ = tx.send(None);
+                            // Clear input
+                            this.user_input.update(cx, |this, cx| {
+                                this.set_text("", window, cx);
+                                cx.notify();
+                            });
+                        })
+                        .ok();
+                    })
+                    .ok();
+                }
+                Err(e) => {
+                    cx.update(|_, cx| {
+                        this.update(cx, |this, cx| {
+                            this.set_loading(false, cx);
+                            this.set_error(Some(e.to_string().into()), cx);
+                        })
+                        .ok();
+                    })
+                    .ok();
                }
-            });
-        })
-        .detach();
-
-        cx.spawn(|this, mut cx| async move {
-            if let Ok(Some(profile)) = rx.await {
-                _ = cx.update_window(window_handle, |_, window, cx| {
-                    _ = this.update(cx, |this, cx| {
-                        let public_key = profile.public_key();
-
-                        this.contacts.update(cx, |this, cx| {
-                            this.insert(0, profile);
-                            cx.notify();
-                        });
-
-                        this.selected.update(cx, |this, cx| {
-                            this.insert(public_key);
-                            cx.notify();
-                        });
-
-                        // Stop loading indicator
-                        this.set_loading(false, cx);
-
-                        // Clear input
-                        this.user_input.update(cx, |this, cx| {
-                            this.set_text("", window, cx);
-                            cx.notify();
-                        });
-                    });
-                });
-            } else {
-                _ = cx.update_window(window_handle, |_, _, cx| {
-                    _ = this.update(cx, |this, cx| {
-                        this.set_loading(false, cx);
-                        this.set_error(Some("NIP-05 Address is not valid".into()), cx);
-                    });
-                });
            }
        })
        .detach();
@@ -346,14 +281,16 @@ impl Compose {
        });

        // Dismiss error after 2 seconds
-        cx.spawn(|this, cx| async move {
+        cx.spawn(async move |this, cx| {
            Timer::after(Duration::from_secs(2)).await;

-            _ = cx.update(|cx| {
+            cx.update(|cx| {
                this.update(cx, |this, cx| {
                    this.set_error(None, cx);
                })
-            });
+                .ok();
+            })
+            .ok();
        })
        .detach();
    }
@@ -387,6 +324,15 @@ impl Compose {

 impl Render for Compose {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        const DESCRIPTION: &str =
+            "Start a conversation with someone using their npub or NIP-05 (like foo@bar.com).";
+
+        let label: SharedString = if self.selected.read(cx).len() > 1 {
+            "Create Group DM".into()
+        } else {
+            "Create DM".into()
+        };
+
        div()
            .track_focus(&self.focus_handle)
            .on_action(cx.listener(Self::on_action_select))
@@ -395,15 +341,13 @@ impl Render for Compose {
            .gap_1()
            .child(
                div()
-                    .px_2()
-                    .text_xs()
+                    .text_sm()
                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
-                    .child(ALERT),
+                    .child(DESCRIPTION),
            )
            .when_some(self.error_message.read(cx).as_ref(), |this, msg| {
                this.child(
                    div()
-                        .px_2()
                        .text_xs()
                        .text_color(cx.theme().danger)
                        .child(msg.clone()),
@@ -413,13 +357,12 @@ impl Render for Compose {
                div().flex().flex_col().child(
                    div()
                        .h_10()
-                        .px_2()
                        .border_b_1()
                        .border_color(cx.theme().base.step(cx, ColorScaleStep::FIVE))
                        .flex()
                        .items_center()
                        .gap_1()
-                        .child(div().text_xs().font_semibold().child("Title:"))
+                        .child(div().pb_0p5().text_sm().font_semibold().child("Title:"))
                        .child(self.title_input.clone()),
                ),
            )
@@ -428,29 +371,9 @@ impl Render for Compose {
                    .flex()
                    .flex_col()
                    .gap_2()
-                    .child(div().px_2().text_xs().font_semibold().child("To:"))
-                    .child(
-                        div()
-                            .flex()
-                            .items_center()
-                            .gap_2()
-                            .px_2()
-                            .child(
-                                Button::new("add_user_to_compose_btn")
-                                    .icon(IconName::Plus)
-                                    .small()
-                                    .rounded(ButtonRounded::Size(px(9999.)))
-                                    .loading(self.is_loading)
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        if this.user_input.read(cx).text().contains("@") {
-                                            this.add_nip05(window, cx);
-                                        } else {
-                                            this.add_npub(window, cx);
-                                        }
-                                    })),
-                            )
-                            .child(self.user_input.clone()),
-                    )
+                    .mt_1()
+                    .child(div().text_sm().font_semibold().child("To:"))
+                    .child(self.user_input.clone())
                    .map(|this| {
                        let contacts = self.contacts.read(cx).clone();
                        let view = cx.entity();
@@ -499,32 +422,35 @@ impl Render for Compose {
                                                div()
                                                    .id(ix)
                                                    .w_full()
-                                                    .h_9()
+                                                    .h_10()
                                                    .px_2()
                                                    .flex()
                                                    .items_center()
                                                    .justify_between()
+                                                    .rounded(px(cx.theme().radius))
                                                    .child(
                                                        div()
                                                            .flex()
                                                            .items_center()
-                                                            .gap_2()
-                                                            .text_xs()
+                                                            .gap_3()
+                                                            .text_sm()
                                                            .child(
-                                                                div().flex_shrink_0().child(
-                                                                    img(item.avatar()).size_6(),
-                                                                ),
+                                                                img(item.shared_avatar())
+                                                                    .size_7()
+                                                                    .flex_shrink_0(),
                                                            )
-                                                            .child(item.name()),
+                                                            .child(item.shared_name()),
                                                    )
                                                    .when(is_select, |this| {
                                                        this.child(
-                                                            Icon::new(IconName::CircleCheck)
-                                                                .size_3()
-                                                                .text_color(cx.theme().base.step(
-                                                                    cx,
-                                                                    ColorScaleStep::TWELVE,
-                                                                )),
+                                                            Icon::new(IconName::CheckCircleFill)
+                                                                .small()
+                                                                .text_color(
+                                                                    cx.theme().accent.step(
+                                                                        cx,
+                                                                        ColorScaleStep::NINE,
+                                                                    ),
+                                                                ),
                                                        )
                                                    })
                                                    .hover(|this| {
@@ -547,10 +473,22 @@ impl Render for Compose {
                                        items
                                    },
                                )
-                                .min_h(px(250.)),
+                                .pb_4()
+                                .min_h(px(280.)),
                            )
                        }
                    }),
            )
+            .child(
+                div().mt_2().child(
+                    Button::new("create_dm_btn")
+                        .label(label)
+                        .primary()
+                        .w_full()
+                        .loading(self.is_submitting)
+                        .disabled(self.is_submitting)
+                        .on_click(cx.listener(|this, _, window, cx| this.compose(window, cx))),
+                ),
+            )
    }
 }
--- a/crates/coop/src/views/contacts.rs
+++ b/crates/coop/src/views/contacts.rs
@@ -0,0 +1,173 @@
+use std::collections::BTreeSet;
+
+use anyhow::Error;
+use common::profile::SharedProfile;
+use global::get_client;
+use gpui::{
+    div, img, prelude::FluentBuilder, px, uniform_list, AnyElement, App, AppContext, Context,
+    Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement,
+    Render, SharedString, Styled, Task, Window,
+};
+use itertools::Itertools;
+use nostr_sdk::prelude::*;
+use ui::{
+    button::Button,
+    dock_area::panel::{Panel, PanelEvent},
+    indicator::Indicator,
+    popup_menu::PopupMenu,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    Sizable,
+};
+
+const MIN_HEIGHT: f32 = 280.;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Contacts> {
+    Contacts::new(window, cx)
+}
+
+pub struct Contacts {
+    contacts: Option<Vec<Profile>>,
+    // Panel
+    name: SharedString,
+    closable: bool,
+    zoomable: bool,
+    focus_handle: FocusHandle,
+}
+
+impl Contacts {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| Self::view(window, cx))
+    }
+
+    fn view(_window: &mut Window, cx: &mut Context<Self>) -> Self {
+        cx.spawn(async move |this, cx| {
+            let client = get_client();
+
+            let task: Task<Result<BTreeSet<Profile>, Error>> = cx.background_spawn(async move {
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+                let profiles = client.database().contacts(public_key).await?;
+
+                Ok(profiles)
+            });
+
+            if let Ok(contacts) = task.await {
+                cx.update(|cx| {
+                    this.update(cx, |this, cx| {
+                        this.contacts = Some(contacts.into_iter().collect_vec());
+                        cx.notify();
+                    })
+                    .ok();
+                })
+                .ok();
+            }
+        })
+        .detach();
+
+        Self {
+            contacts: None,
+            name: "Contacts".into(),
+            closable: true,
+            zoomable: true,
+            focus_handle: cx.focus_handle(),
+        }
+    }
+}
+
+impl Panel for Contacts {
+    fn panel_id(&self) -> SharedString {
+        "ContactPanel".into()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+
+    fn closable(&self, _cx: &App) -> bool {
+        self.closable
+    }
+
+    fn zoomable(&self, _cx: &App) -> bool {
+        self.zoomable
+    }
+
+    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
+        menu.track_focus(&self.focus_handle)
+    }
+
+    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
+        vec![]
+    }
+}
+
+impl EventEmitter<PanelEvent> for Contacts {}
+
+impl Focusable for Contacts {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Contacts {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let entity = cx.entity().clone();
+
+        div().map(|this| {
+            if let Some(contacts) = self.contacts.clone() {
+                this.child(
+                    uniform_list(
+                        entity,
+                        "contacts",
+                        contacts.len(),
+                        move |_, range, _window, cx| {
+                            let mut items = Vec::with_capacity(contacts.len());
+
+                            for ix in range {
+                                if let Some(item) = contacts.get(ix) {
+                                    items.push(
+                                        div()
+                                            .w_full()
+                                            .h_9()
+                                            .px_2()
+                                            .flex()
+                                            .items_center()
+                                            .justify_between()
+                                            .rounded(px(cx.theme().radius))
+                                            .child(
+                                                div()
+                                                    .flex()
+                                                    .items_center()
+                                                    .gap_2()
+                                                    .text_xs()
+                                                    .child(
+                                                        div().flex_shrink_0().child(
+                                                            img(item.shared_avatar()).size_6(),
+                                                        ),
+                                                    )
+                                                    .child(item.shared_name()),
+                                            )
+                                            .hover(|this| {
+                                                this.bg(cx
+                                                    .theme()
+                                                    .base
+                                                    .step(cx, ColorScaleStep::THREE))
+                                            }),
+                                    );
+                                }
+                            }
+
+                            items
+                        },
+                    )
+                    .min_h(px(MIN_HEIGHT)),
+                )
+            } else {
+                this.flex()
+                    .items_center()
+                    .justify_center()
+                    .h_16()
+                    .child(Indicator::new().small())
+            }
+        })
+    }
+}
--- a/crates/coop/src/views/login.rs
+++ b/crates/coop/src/views/login.rs
@@ -0,0 +1,418 @@
+use std::{sync::Arc, time::Duration};
+
+use account::Account;
+use common::create_qr;
+use global::get_client_keys;
+use gpui::{
+    div, img, prelude::FluentBuilder, relative, AnyElement, App, AppContext, Context, Entity,
+    EventEmitter, FocusHandle, Focusable, Image, IntoElement, ParentElement, Render, SharedString,
+    Styled, Subscription, Window,
+};
+use nostr_connect::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use ui::{
+    button::{Button, ButtonVariants},
+    dock_area::panel::{Panel, PanelEvent},
+    input::{InputEvent, TextInput},
+    notification::Notification,
+    popup_menu::PopupMenu,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    ContextModal, Disableable, Sizable, Size, StyledExt,
+};
+
+const INPUT_INVALID: &str = "You must provide a valid Private Key or Bunker.";
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Login> {
+    Login::new(window, cx)
+}
+
+pub struct Login {
+    // Inputs
+    key_input: Entity<TextInput>,
+    error_message: Entity<Option<SharedString>>,
+    is_logging_in: bool,
+    // Nostr Connect
+    qr: Option<Arc<Image>>,
+    connect_relay: Entity<TextInput>,
+    connect_client: Entity<Option<NostrConnectURI>>,
+    // Panel
+    name: SharedString,
+    closable: bool,
+    zoomable: bool,
+    focus_handle: FocusHandle,
+    #[allow(unused)]
+    subscriptions: SmallVec<[Subscription; 3]>,
+}
+
+impl Login {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| Self::view(window, cx))
+    }
+
+    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let mut subscriptions = smallvec![];
+        let error_message = cx.new(|_| None);
+        let connect_client = cx.new(|_: &mut Context<'_, Option<NostrConnectURI>>| None);
+
+        let key_input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .placeholder("nsec... or bunker://...")
+        });
+
+        let connect_relay = cx.new(|cx| {
+            let mut input = TextInput::new(window, cx).text_size(Size::Small).small();
+            input.set_text("wss://relay.nsec.app", window, cx);
+            input
+        });
+
+        subscriptions.push(cx.subscribe_in(
+            &key_input,
+            window,
+            move |this, _, event, window, cx| {
+                if let InputEvent::PressEnter = event {
+                    this.login(window, cx);
+                }
+            },
+        ));
+
+        subscriptions.push(cx.subscribe_in(
+            &connect_relay,
+            window,
+            move |this, _, event, window, cx| {
+                if let InputEvent::PressEnter = event {
+                    this.change_relay(window, cx);
+                }
+            },
+        ));
+
+        subscriptions.push(
+            cx.observe_in(&connect_client, window, |this, uri, window, cx| {
+                let keys = get_client_keys().to_owned();
+                let account = Account::global(cx);
+
+                if let Some(uri) = uri.read(cx).clone() {
+                    if let Ok(qr) = create_qr(uri.to_string().as_str()) {
+                        this.qr = Some(qr);
+                        cx.notify();
+                    }
+
+                    match NostrConnect::new(uri, keys, Duration::from_secs(300), None) {
+                        Ok(signer) => {
+                            account.update(cx, |this, cx| {
+                                this.login(signer, window, cx);
+                            });
+                        }
+                        Err(e) => {
+                            window.push_notification(Notification::error(e.to_string()), cx);
+                        }
+                    }
+                }
+            }),
+        );
+
+        cx.spawn(async move |this, cx| {
+            cx.background_executor()
+                .timer(Duration::from_millis(500))
+                .await;
+
+            cx.update(|cx| {
+                this.update(cx, |this, cx| {
+                    let Ok(relay_url) =
+                        RelayUrl::parse(this.connect_relay.read(cx).text().to_string().as_str())
+                    else {
+                        return;
+                    };
+
+                    let client_pubkey = get_client_keys().public_key();
+                    let uri = NostrConnectURI::client(client_pubkey, vec![relay_url], "Coop");
+
+                    this.connect_client.update(cx, |this, cx| {
+                        *this = Some(uri);
+                        cx.notify();
+                    });
+                })
+            })
+            .ok();
+        })
+        .detach();
+
+        Self {
+            key_input,
+            connect_relay,
+            connect_client,
+            subscriptions,
+            error_message,
+            qr: None,
+            is_logging_in: false,
+            name: "Login".into(),
+            closable: true,
+            zoomable: true,
+            focus_handle: cx.focus_handle(),
+        }
+    }
+
+    fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.is_logging_in {
+            return;
+        };
+
+        self.set_logging_in(true, cx);
+
+        let content = self.key_input.read(cx).text();
+        let account = Account::global(cx);
+
+        if content.starts_with("nsec1") {
+            match SecretKey::parse(content.as_ref()) {
+                Ok(secret) => {
+                    let keys = Keys::new(secret);
+
+                    account.update(cx, |this, cx| {
+                        this.login(keys, window, cx);
+                    });
+                }
+                Err(e) => {
+                    self.set_error_message(e.to_string(), cx);
+                    self.set_logging_in(false, cx);
+                }
+            }
+        } else if content.starts_with("bunker://") {
+            let keys = get_client_keys().to_owned();
+
+            let Ok(uri) = NostrConnectURI::parse(content.as_ref()) else {
+                self.set_error_message("Bunker URL is not valid".to_owned(), cx);
+                self.set_logging_in(false, cx);
+                return;
+            };
+
+            match NostrConnect::new(uri, keys, Duration::from_secs(120), None) {
+                Ok(signer) => {
+                    account.update(cx, |this, cx| {
+                        this.login(signer, window, cx);
+                    });
+                }
+                Err(e) => {
+                    self.set_error_message(e.to_string(), cx);
+                    self.set_logging_in(false, cx);
+                }
+            }
+        } else {
+            window.push_notification(Notification::error(INPUT_INVALID), cx);
+            self.set_logging_in(false, cx);
+        };
+    }
+
+    fn change_relay(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(relay_url) =
+            RelayUrl::parse(self.connect_relay.read(cx).text().to_string().as_str())
+        else {
+            window.push_notification(Notification::error("Relay URL is not valid."), cx);
+            return;
+        };
+
+        let client_pubkey = get_client_keys().public_key();
+        let uri = NostrConnectURI::client(client_pubkey, vec![relay_url], "Coop");
+
+        self.connect_client.update(cx, |this, cx| {
+            *this = Some(uri);
+            cx.notify();
+        });
+    }
+
+    fn set_error_message(&mut self, message: String, cx: &mut Context<Self>) {
+        self.error_message.update(cx, |this, cx| {
+            *this = Some(SharedString::new(message));
+            cx.notify();
+        });
+    }
+
+    fn set_logging_in(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.is_logging_in = status;
+        cx.notify();
+    }
+}
+
+impl Panel for Login {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+
+    fn closable(&self, _cx: &App) -> bool {
+        self.closable
+    }
+
+    fn zoomable(&self, _cx: &App) -> bool {
+        self.zoomable
+    }
+
+    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
+        menu.track_focus(&self.focus_handle)
+    }
+
+    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
+        vec![]
+    }
+}
+
+impl EventEmitter<PanelEvent> for Login {}
+
+impl Focusable for Login {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Login {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .size_full()
+            .relative()
+            .flex()
+            .child(
+                div()
+                    .h_full()
+                    .flex_1()
+                    .flex()
+                    .items_center()
+                    .justify_center()
+                    .child(
+                        div()
+                            .w_80()
+                            .flex()
+                            .flex_col()
+                            .gap_8()
+                            .child(
+                                div()
+                                    .text_center()
+                                    .child(
+                                        div()
+                                            .text_center()
+                                            .text_xl()
+                                            .font_semibold()
+                                            .line_height(relative(1.3))
+                                            .child("Welcome Back!"),
+                                    )
+                                    .child(
+                                        div()
+                                            .text_color(
+                                                cx.theme().base.step(cx, ColorScaleStep::ELEVEN),
+                                            )
+                                            .child("Continue with Private Key or Bunker"),
+                                    ),
+                            )
+                            .child(
+                                div()
+                                    .flex()
+                                    .flex_col()
+                                    .gap_3()
+                                    .child(self.key_input.clone())
+                                    .child(
+                                        Button::new("login")
+                                            .label("Continue")
+                                            .primary()
+                                            .loading(self.is_logging_in)
+                                            .disabled(self.is_logging_in)
+                                            .on_click(cx.listener(move |this, _, window, cx| {
+                                                this.login(window, cx);
+                                            })),
+                                    )
+                                    .when_some(
+                                        self.error_message.read(cx).clone(),
+                                        |this, error| {
+                                            this.child(
+                                                div()
+                                                    .text_xs()
+                                                    .text_center()
+                                                    .text_color(cx.theme().danger)
+                                                    .child(error),
+                                            )
+                                        },
+                                    ),
+                            ),
+                    ),
+            )
+            .child(
+                div()
+                    .h_full()
+                    .flex_1()
+                    .flex()
+                    .items_center()
+                    .justify_center()
+                    .bg(cx.theme().base.step(cx, ColorScaleStep::TWO))
+                    .child(
+                        div()
+                            .flex()
+                            .flex_col()
+                            .items_center()
+                            .justify_center()
+                            .gap_3()
+                            .text_center()
+                            .child(
+                                div()
+                                    .text_center()
+                                    .child(
+                                        div()
+                                            .font_semibold()
+                                            .line_height(relative(1.2))
+                                            .text_color(
+                                                cx.theme().base.step(cx, ColorScaleStep::TWELVE),
+                                            )
+                                            .child("Continue with Nostr Connect"),
+                                    )
+                                    .child(
+                                        div()
+                                            .text_sm()
+                                            .text_color(
+                                                cx.theme().base.step(cx, ColorScaleStep::ELEVEN),
+                                            )
+                                            .child("Use Nostr Connect apps to scan the code"),
+                                    ),
+                            )
+                            .when_some(self.qr.clone(), |this, qr| {
+                                this.child(
+                                    div()
+                                        .mb_2()
+                                        .p_2()
+                                        .size_64()
+                                        .flex()
+                                        .flex_col()
+                                        .items_center()
+                                        .justify_center()
+                                        .gap_2()
+                                        .rounded_2xl()
+                                        .shadow_md()
+                                        .when(cx.theme().appearance.is_dark(), |this| {
+                                            this.shadow_none().border_1().border_color(
+                                                cx.theme().base.step(cx, ColorScaleStep::SIX),
+                                            )
+                                        })
+                                        .bg(cx.theme().background)
+                                        .child(img(qr).h_56()),
+                                )
+                            })
+                            .child(
+                                div()
+                                    .w_full()
+                                    .flex()
+                                    .items_center()
+                                    .justify_center()
+                                    .gap_1()
+                                    .child(self.connect_relay.clone())
+                                    .child(
+                                        Button::new("change")
+                                            .label("Change")
+                                            .ghost()
+                                            .small()
+                                            .on_click(cx.listener(move |this, _, window, cx| {
+                                                this.change_relay(window, cx);
+                                            })),
+                                    ),
+                            ),
+                    ),
+            )
+    }
+}
--- a/crates/coop/src/views/mod.rs
+++ b/crates/coop/src/views/mod.rs
@@ -0,0 +1,11 @@
+pub mod chat;
+pub mod compose;
+pub mod contacts;
+pub mod login;
+pub mod new_account;
+pub mod onboarding;
+pub mod profile;
+pub mod relays;
+pub mod sidebar;
+pub mod subject;
+pub mod welcome;
--- a/crates/coop/src/views/new_account.rs
+++ b/crates/coop/src/views/new_account.rs
@@ -0,0 +1,307 @@
+use account::Account;
+use async_utility::task::spawn;
+use common::nip96_upload;
+use global::{constants::IMAGE_SERVICE, get_client};
+use gpui::{
+    div, img, prelude::FluentBuilder, relative, AnyElement, App, AppContext, Context, Entity,
+    EventEmitter, Flatten, FocusHandle, Focusable, IntoElement, ParentElement, PathPromptOptions,
+    Render, SharedString, Styled, Window,
+};
+use nostr_sdk::prelude::*;
+use smol::fs;
+use std::str::FromStr;
+use ui::{
+    button::{Button, ButtonVariants},
+    dock_area::panel::{Panel, PanelEvent},
+    input::TextInput,
+    popup_menu::PopupMenu,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    Disableable, Icon, IconName, Sizable, Size, StyledExt,
+};
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<NewAccount> {
+    NewAccount::new(window, cx)
+}
+
+pub struct NewAccount {
+    name_input: Entity<TextInput>,
+    avatar_input: Entity<TextInput>,
+    bio_input: Entity<TextInput>,
+    is_uploading: bool,
+    is_submitting: bool,
+    // Panel
+    name: SharedString,
+    closable: bool,
+    zoomable: bool,
+    focus_handle: FocusHandle,
+}
+
+impl NewAccount {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| Self::view(window, cx))
+    }
+
+    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let name_input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .placeholder("Alice")
+        });
+
+        let avatar_input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .small()
+                .placeholder("https://example.com/avatar.jpg")
+        });
+
+        let bio_input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .multi_line()
+                .placeholder("A short introduce about you.")
+        });
+
+        Self {
+            name_input,
+            avatar_input,
+            bio_input,
+            is_uploading: false,
+            is_submitting: false,
+            name: "New Account".into(),
+            closable: true,
+            zoomable: true,
+            focus_handle: cx.focus_handle(),
+        }
+    }
+
+    fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.set_submitting(true, cx);
+
+        let avatar = self.avatar_input.read(cx).text().to_string();
+        let name = self.name_input.read(cx).text().to_string();
+        let bio = self.bio_input.read(cx).text().to_string();
+
+        let mut metadata = Metadata::new().display_name(name).about(bio);
+
+        if let Ok(url) = Url::from_str(&avatar) {
+            metadata = metadata.picture(url);
+        };
+
+        Account::global(cx).update(cx, |this, cx| {
+            this.new_account(metadata, window, cx);
+        });
+    }
+
+    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let avatar_input = self.avatar_input.downgrade();
+        let paths = cx.prompt_for_paths(PathPromptOptions {
+            files: true,
+            directories: false,
+            multiple: false,
+        });
+
+        self.set_uploading(true, cx);
+
+        cx.spawn_in(window, async move |this, cx| {
+            match Flatten::flatten(paths.await.map_err(|e| e.into())) {
+                Ok(Some(mut paths)) => {
+                    let Some(path) = paths.pop() else {
+                        cx.update(|_, cx| {
+                            this.update(cx, |this, cx| {
+                                this.set_uploading(false, cx);
+                            })
+                            .ok();
+                        })
+                        .ok();
+
+                        return;
+                    };
+
+                    if let Ok(file_data) = fs::read(path).await {
+                        let client = get_client();
+                        let (tx, rx) = oneshot::channel::<Url>();
+
+                        spawn(async move {
+                            if let Ok(url) = nip96_upload(client, file_data).await {
+                                _ = tx.send(url);
+                            }
+                        });
+
+                        if let Ok(url) = rx.await {
+                            cx.update(|window, cx| {
+                                // Stop loading spinner
+                                this.update(cx, |this, cx| {
+                                    this.set_uploading(false, cx);
+                                })
+                                .ok();
+
+                                // Set avatar input
+                                avatar_input
+                                    .update(cx, |this, cx| {
+                                        this.set_text(url.to_string(), window, cx);
+                                    })
+                                    .ok();
+                            })
+                            .ok();
+                        }
+                    }
+                }
+                Ok(None) => {
+                    cx.update(|_, cx| {
+                        this.update(cx, |this, cx| {
+                            this.set_uploading(false, cx);
+                        })
+                    })
+                    .ok();
+                }
+                Err(_) => {}
+            }
+        })
+        .detach();
+    }
+
+    fn set_submitting(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.is_submitting = status;
+        cx.notify();
+    }
+
+    fn set_uploading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.is_uploading = status;
+        cx.notify();
+    }
+}
+
+impl Panel for NewAccount {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+
+    fn closable(&self, _cx: &App) -> bool {
+        self.closable
+    }
+
+    fn zoomable(&self, _cx: &App) -> bool {
+        self.zoomable
+    }
+
+    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
+        menu.track_focus(&self.focus_handle)
+    }
+
+    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
+        vec![]
+    }
+}
+
+impl EventEmitter<PanelEvent> for NewAccount {}
+
+impl Focusable for NewAccount {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for NewAccount {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .size_full()
+            .relative()
+            .flex()
+            .flex_col()
+            .items_center()
+            .justify_center()
+            .gap_10()
+            .child(
+                div()
+                    .text_center()
+                    .text_lg()
+                    .font_semibold()
+                    .line_height(relative(1.3))
+                    .child("Create New Account"),
+            )
+            .child(
+                div()
+                    .w_72()
+                    .flex()
+                    .flex_col()
+                    .gap_3()
+                    .child(
+                        div()
+                            .w_full()
+                            .h_32()
+                            .flex()
+                            .flex_col()
+                            .items_center()
+                            .justify_center()
+                            .gap_2()
+                            .map(|this| {
+                                if self.avatar_input.read(cx).text().is_empty() {
+                                    this.child(img("brand/avatar.png").size_10().flex_shrink_0())
+                                } else {
+                                    this.child(
+                                        img(format!(
+                                            "{}/?url={}&w=100&h=100&fit=cover&mask=circle&n=-1",
+                                            IMAGE_SERVICE,
+                                            self.avatar_input.read(cx).text()
+                                        ))
+                                        .size_10()
+                                        .flex_shrink_0(),
+                                    )
+                                }
+                            })
+                            .child(
+                                Button::new("upload")
+                                    .label("Set Profile Picture")
+                                    .icon(Icon::new(IconName::Plus))
+                                    .ghost()
+                                    .small()
+                                    .disabled(self.is_submitting)
+                                    .loading(self.is_uploading)
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.upload(window, cx);
+                                    })),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .flex()
+                            .flex_col()
+                            .gap_1()
+                            .text_sm()
+                            .child("Name *:")
+                            .child(self.name_input.clone()),
+                    )
+                    .child(
+                        div()
+                            .flex()
+                            .flex_col()
+                            .gap_1()
+                            .text_sm()
+                            .child("Bio:")
+                            .child(self.bio_input.clone()),
+                    )
+                    .child(
+                        div()
+                            .my_2()
+                            .w_full()
+                            .h_px()
+                            .bg(cx.theme().base.step(cx, ColorScaleStep::THREE)),
+                    )
+                    .child(
+                        Button::new("submit")
+                            .label("Continue")
+                            .primary()
+                            .loading(self.is_submitting)
+                            .disabled(self.is_submitting || self.is_uploading)
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.submit(window, cx);
+                            })),
+                    ),
+            )
+    }
+}
--- a/crates/coop/src/views/onboarding.rs
+++ b/crates/coop/src/views/onboarding.rs
@@ -0,0 +1,140 @@
+use gpui::{
+    div, relative, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
+    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Window,
+};
+use ui::{
+    button::{Button, ButtonVariants},
+    dock_area::panel::{Panel, PanelEvent},
+    popup_menu::PopupMenu,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    Icon, IconName, StyledExt,
+};
+
+use crate::chatspace;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Onboarding> {
+    Onboarding::new(window, cx)
+}
+
+pub struct Onboarding {
+    name: SharedString,
+    closable: bool,
+    zoomable: bool,
+    focus_handle: FocusHandle,
+}
+
+impl Onboarding {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| Self::view(window, cx))
+    }
+
+    fn view(_window: &mut Window, cx: &mut Context<Self>) -> Self {
+        Self {
+            name: "Onboarding".into(),
+            closable: true,
+            zoomable: true,
+            focus_handle: cx.focus_handle(),
+        }
+    }
+}
+
+impl Panel for Onboarding {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+
+    fn closable(&self, _cx: &App) -> bool {
+        self.closable
+    }
+
+    fn zoomable(&self, _cx: &App) -> bool {
+        self.zoomable
+    }
+
+    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
+        menu.track_focus(&self.focus_handle)
+    }
+}
+
+impl EventEmitter<PanelEvent> for Onboarding {}
+
+impl Focusable for Onboarding {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Onboarding {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        const TITLE: &str = "Welcome to Coop!";
+        const SUBTITLE: &str = "Secure Communication on Nostr.";
+
+        div()
+            .py_4()
+            .size_full()
+            .flex()
+            .flex_col()
+            .items_center()
+            .justify_center()
+            .gap_10()
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .items_center()
+                    .gap_4()
+                    .child(
+                        svg()
+                            .path("brand/coop.svg")
+                            .size_16()
+                            .text_color(cx.theme().base.step(cx, ColorScaleStep::THREE)),
+                    )
+                    .child(
+                        div()
+                            .text_center()
+                            .child(
+                                div()
+                                    .text_xl()
+                                    .font_semibold()
+                                    .line_height(relative(1.3))
+                                    .child(TITLE),
+                            )
+                            .child(
+                                div()
+                                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
+                                    .child(SUBTITLE),
+                            ),
+                    ),
+            )
+            .child(
+                div()
+                    .w_72()
+                    .flex()
+                    .flex_col()
+                    .gap_2()
+                    .child(
+                        Button::new("continue_btn")
+                            .icon(Icon::new(IconName::ArrowRight))
+                            .label("Start Messaging")
+                            .primary()
+                            .reverse()
+                            .on_click(cx.listener(move |_, _, window, cx| {
+                                chatspace::new_account(window, cx);
+                            })),
+                    )
+                    .child(
+                        Button::new("login_btn")
+                            .label("Already have an account? Log in.")
+                            .ghost()
+                            .underline()
+                            .on_click(cx.listener(move |_, _, window, cx| {
+                                chatspace::login(window, cx);
+                            })),
+                    ),
+            )
+    }
+}
--- a/crates/coop/src/views/profile.rs
+++ b/crates/coop/src/views/profile.rs
@@ -1,97 +1,125 @@
 use async_utility::task::spawn;
-use common::{constants::IMAGE_SERVICE, profile::NostrProfile, utils::nip96_upload};
+use common::nip96_upload;
+use global::{constants::IMAGE_SERVICE, get_client};
 use gpui::{
-    div, img, prelude::FluentBuilder, AnyElement, App, AppContext, Context, Entity, EventEmitter,
-    Flatten, FocusHandle, Focusable, IntoElement, ParentElement, PathPromptOptions, Render,
-    SharedString, Styled, Window,
+    div, img, prelude::FluentBuilder, px, App, AppContext, Context, Entity, Flatten, IntoElement,
+    ParentElement, PathPromptOptions, Render, Styled, Task, Window,
 };
 use nostr_sdk::prelude::*;
 use smol::fs;
-use state::get_client;
-use std::str::FromStr;
+use std::{str::FromStr, time::Duration};
 use ui::{
    button::{Button, ButtonVariants},
-    dock_area::panel::{Panel, PanelEvent},
    input::TextInput,
-    popup_menu::PopupMenu,
-    ContextModal, Disableable, Sizable, Size,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    ContextModal, Disableable, IconName, Sizable, Size,
 };

-pub fn init(profile: NostrProfile, window: &mut Window, cx: &mut App) -> Entity<Profile> {
-    Profile::new(profile, window, cx)
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Profile> {
+    Profile::new(window, cx)
 }

 pub struct Profile {
-    profile: NostrProfile,
-    // Form
+    profile: Option<Metadata>,
    name_input: Entity<TextInput>,
    avatar_input: Entity<TextInput>,
    bio_input: Entity<TextInput>,
    website_input: Entity<TextInput>,
    is_loading: bool,
    is_submitting: bool,
-    // Panel
-    name: SharedString,
-    closable: bool,
-    zoomable: bool,
-    focus_handle: FocusHandle,
 }

 impl Profile {
-    pub fn new(mut profile: NostrProfile, window: &mut Window, cx: &mut App) -> Entity<Self> {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
        let name_input = cx.new(|cx| {
-            let mut input = TextInput::new(window, cx).text_size(Size::XSmall);
-            if let Some(name) = profile.metadata().display_name.as_ref() {
-                input.set_text(name, window, cx);
-            }
-            input
-        });
-        let avatar_input = cx.new(|cx| {
-            let mut input = TextInput::new(window, cx).text_size(Size::XSmall).small();
-            if let Some(picture) = profile.metadata().picture.as_ref() {
-                input.set_text(picture, window, cx);
-            }
-            input
-        });
-        let bio_input = cx.new(|cx| {
-            let mut input = TextInput::new(window, cx)
-                .text_size(Size::XSmall)
-                .multi_line();
-            if let Some(about) = profile.metadata().about.as_ref() {
-                input.set_text(about, window, cx);
-            } else {
-                input.set_placeholder("A short introduce about you.");
-            }
-            input
-        });
-        let website_input = cx.new(|cx| {
-            let mut input = TextInput::new(window, cx).text_size(Size::XSmall);
-            if let Some(website) = profile.metadata().website.as_ref() {
-                input.set_text(website, window, cx);
-            } else {
-                input.set_placeholder("https://your-website.com");
-            }
-            input
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .placeholder("Alice")
        });

-        cx.new(|cx| Self {
-            profile,
-            name_input,
-            avatar_input,
-            bio_input,
-            website_input,
-            is_loading: false,
-            is_submitting: false,
-            name: "Profile".into(),
-            closable: true,
-            zoomable: true,
-            focus_handle: cx.focus_handle(),
+        let avatar_input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::XSmall)
+                .small()
+                .placeholder("https://example.com/avatar.jpg")
+        });
+
+        let website_input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .placeholder("https://your-website.com")
+        });
+
+        let bio_input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(Size::Small)
+                .multi_line()
+                .placeholder("A short introduce about you.")
+        });
+
+        cx.new(|cx| {
+            let this = Self {
+                name_input,
+                avatar_input,
+                bio_input,
+                website_input,
+                profile: None,
+                is_loading: false,
+                is_submitting: false,
+            };
+
+            let task: Task<Result<Option<Metadata>, Error>> = cx.background_spawn(async move {
+                let client = get_client();
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+                let metadata = client
+                    .fetch_metadata(public_key, Duration::from_secs(2))
+                    .await?;
+
+                Ok(metadata)
+            });
+
+            cx.spawn_in(window, async move |this, cx| {
+                if let Ok(Some(metadata)) = task.await {
+                    cx.update(|window, cx| {
+                        this.update(cx, |this: &mut Profile, cx| {
+                            this.avatar_input.update(cx, |this, cx| {
+                                if let Some(avatar) = metadata.picture.as_ref() {
+                                    this.set_text(avatar, window, cx);
+                                }
+                            });
+                            this.bio_input.update(cx, |this, cx| {
+                                if let Some(bio) = metadata.about.as_ref() {
+                                    this.set_text(bio, window, cx);
+                                }
+                            });
+                            this.name_input.update(cx, |this, cx| {
+                                if let Some(display_name) = metadata.display_name.as_ref() {
+                                    this.set_text(display_name, window, cx);
+                                }
+                            });
+                            this.website_input.update(cx, |this, cx| {
+                                if let Some(website) = metadata.website.as_ref() {
+                                    this.set_text(website, window, cx);
+                                }
+                            });
+                            this.profile = Some(metadata);
+
+                            cx.notify();
+                        })
+                        .ok();
+                    })
+                    .ok();
+                }
+            })
+            .detach();
+
+            this
        })
    }

    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let avatar_input = self.avatar_input.downgrade();
-        let window_handle = window.window_handle();
        let paths = cx.prompt_for_paths(PathPromptOptions {
            files: true,
            directories: false,
@@ -101,7 +129,7 @@ impl Profile {
        // Show loading spinner
        self.set_loading(true, cx);

-        cx.spawn(move |this, mut cx| async move {
+        cx.spawn_in(window, async move |this, cx| {
            match Flatten::flatten(paths.await.map_err(|e| e.into())) {
                Ok(Some(mut paths)) => {
                    let path = paths.pop().unwrap();
@@ -117,32 +145,33 @@ impl Profile {
                        });

                        if let Ok(url) = rx.await {
-                            cx.update_window(window_handle, |_, window, cx| {
+                            cx.update(|window, cx| {
                                // Stop loading spinner
                                this.update(cx, |this, cx| {
                                    this.set_loading(false, cx);
                                })
-                                .unwrap();
+                                .ok();

                                // Set avatar input
                                avatar_input
                                    .update(cx, |this, cx| {
                                        this.set_text(url.to_string(), window, cx);
                                    })
-                                    .unwrap();
+                                    .ok();
                            })
-                            .unwrap();
+                            .ok();
                        }
                    }
                }
                Ok(None) => {
-                    // Stop loading spinner
-                    if let Some(view) = this.upgrade() {
-                        cx.update_entity(&view, |this, cx| {
+                    cx.update(|_, cx| {
+                        // Stop loading spinner
+                        this.update(cx, |this, cx| {
                            this.set_loading(false, cx);
                        })
-                        .unwrap();
-                    }
+                        .ok();
+                    })
+                    .ok();
                }
                Err(_) => {}
            }
@@ -150,11 +179,6 @@ impl Profile {
        .detach();
    }

-    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.is_loading = status;
-        cx.notify();
-    }
-
    fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        // Show loading spinner
        self.set_submitting(true, cx);
@@ -164,12 +188,13 @@ impl Profile {
        let bio = self.bio_input.read(cx).text().to_string();
        let website = self.website_input.read(cx).text().to_string();

-        let mut new_metadata = self
-            .profile
-            .metadata()
-            .to_owned()
-            .display_name(name)
-            .about(bio);
+        let old_metadata = if let Some(metadata) = self.profile.as_ref() {
+            metadata.clone()
+        } else {
+            Metadata::default()
+        };
+
+        let mut new_metadata = old_metadata.display_name(name).about(bio);

        if let Ok(url) = Url::from_str(&avatar) {
            new_metadata = new_metadata.picture(url);
@@ -179,100 +204,62 @@ impl Profile {
            new_metadata = new_metadata.website(url);
        }

-        let window_handle = window.window_handle();
-
-        cx.spawn(|this, mut cx| async move {
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
            let client = get_client();
-            let (tx, rx) = oneshot::channel::<EventId>();
+            _ = client.set_metadata(&new_metadata).await?;

-            cx.background_spawn(async move {
-                if let Ok(output) = client.set_metadata(&new_metadata).await {
-                    _ = tx.send(output.val);
-                }
-            })
-            .detach();
+            Ok(())
+        });

-            if rx.await.is_ok() {
-                cx.update_window(window_handle, |_, window, cx| {
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.is_ok() {
+                cx.update(|window, cx| {
                    this.update(cx, |this, cx| {
                        this.set_submitting(false, cx);
                        window.push_notification("Your profile has been updated successfully", cx);
                    })
-                    .unwrap()
+                    .ok();
                })
-                .unwrap();
+                .ok();
            }
        })
        .detach();
    }

+    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.is_loading = status;
+        cx.notify();
+    }
+
    fn set_submitting(&mut self, status: bool, cx: &mut Context<Self>) {
        self.is_submitting = status;
        cx.notify();
    }
 }

-impl Panel for Profile {
-    fn panel_id(&self) -> SharedString {
-        "ProfilePanel".into()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Profile {}
-
-impl Focusable for Profile {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
 impl Render for Profile {
    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
        div()
            .size_full()
-            .px_2()
            .flex()
            .flex_col()
            .gap_3()
            .child(
                div()
+                    .w_full()
+                    .h_32()
+                    .bg(cx.theme().base.step(cx, ColorScaleStep::TWO))
+                    .rounded(px(cx.theme().radius))
                    .flex()
                    .flex_col()
                    .items_center()
-                    .justify_end()
+                    .justify_center()
                    .gap_2()
-                    .w_full()
-                    .h_24()
                    .map(|this| {
                        let picture = self.avatar_input.read(cx).text();

                        if picture.is_empty() {
-                            this.child(
-                                img("brand/avatar.png")
-                                    .size_10()
-                                    .rounded_full()
-                                    .flex_shrink_0(),
-                            )
+                            this.child(img("brand/avatar.png").size_10().flex_shrink_0())
                        } else {
                            this.child(
                                img(format!(
@@ -281,29 +268,21 @@ impl Render for Profile {
                                    self.avatar_input.read(cx).text()
                                ))
                                .size_10()
-                                .rounded_full()
                                .flex_shrink_0(),
                            )
                        }
                    })
                    .child(
-                        div()
-                            .flex()
-                            .gap_1()
-                            .items_center()
-                            .w_full()
-                            .child(self.avatar_input.clone())
-                            .child(
-                                Button::new("upload")
-                                    .label("Upload")
-                                    .ghost()
-                                    .small()
-                                    .disabled(self.is_submitting)
-                                    .loading(self.is_loading)
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        this.upload(window, cx);
-                                    })),
-                            ),
+                        Button::new("upload")
+                            .icon(IconName::Upload)
+                            .label("Change")
+                            .ghost()
+                            .small()
+                            .disabled(self.is_loading || self.is_submitting)
+                            .loading(self.is_loading)
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.upload(window, cx);
+                            })),
                    ),
            )
            .child(
@@ -311,7 +290,7 @@ impl Render for Profile {
                    .flex()
                    .flex_col()
                    .gap_1()
-                    .text_xs()
+                    .text_sm()
                    .child("Name:")
                    .child(self.name_input.clone()),
            )
@@ -320,26 +299,25 @@ impl Render for Profile {
                    .flex()
                    .flex_col()
                    .gap_1()
-                    .text_xs()
-                    .child("Bio:")
-                    .child(self.bio_input.clone()),
+                    .text_sm()
+                    .child("Website:")
+                    .child(self.website_input.clone()),
            )
            .child(
                div()
                    .flex()
                    .flex_col()
                    .gap_1()
-                    .text_xs()
-                    .child("Website:")
-                    .child(self.website_input.clone()),
+                    .text_sm()
+                    .child("Bio:")
+                    .child(self.bio_input.clone()),
            )
            .child(
-                div().flex().items_center().justify_end().child(
+                div().mt_2().w_full().child(
                    Button::new("submit")
                        .label("Update")
                        .primary()
-                        .small()
-                        .disabled(self.is_loading)
+                        .disabled(self.is_loading || self.is_submitting)
                        .loading(self.is_submitting)
                        .on_click(cx.listener(move |this, _, window, cx| {
                            this.submit(window, cx);
--- a/crates/coop/src/views/relays.rs
+++ b/crates/coop/src/views/relays.rs
@@ -0,0 +1,350 @@
+use anyhow::Error;
+use global::{constants::NEW_MESSAGE_SUB_ID, get_client};
+use gpui::{
+    div, prelude::FluentBuilder, px, uniform_list, App, AppContext, Context, Entity, FocusHandle,
+    InteractiveElement, IntoElement, ParentElement, Render, Styled, Subscription, Task, TextAlign,
+    UniformList, Window,
+};
+use nostr_sdk::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use ui::{
+    button::{Button, ButtonVariants},
+    input::{InputEvent, TextInput},
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    ContextModal, Disableable, IconName, Sizable,
+};
+
+const MIN_HEIGHT: f32 = 200.0;
+const MESSAGE: &str = "In order to receive messages from others, you need to setup at least one Messaging Relay. You can use the recommend relays or add more.";
+const HELP_TEXT: &str = "Please add some relays.";
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Relays> {
+    Relays::new(window, cx)
+}
+
+pub struct Relays {
+    relays: Entity<Vec<RelayUrl>>,
+    input: Entity<TextInput>,
+    focus_handle: FocusHandle,
+    is_loading: bool,
+    #[allow(dead_code)]
+    subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl Relays {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        let input = cx.new(|cx| {
+            TextInput::new(window, cx)
+                .text_size(ui::Size::XSmall)
+                .small()
+                .placeholder("wss://example.com")
+        });
+
+        let relays = cx.new(|cx| {
+            let task: Task<Result<Vec<RelayUrl>, Error>> = cx.background_spawn(async move {
+                let client = get_client();
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+
+                let filter = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(public_key)
+                    .limit(1);
+
+                if let Some(event) = client.database().query(filter).await?.first_owned() {
+                    let relays = event
+                        .tags
+                        .filter(TagKind::Relay)
+                        .filter_map(|tag| RelayUrl::parse(tag.content()?).ok())
+                        .collect::<Vec<_>>();
+
+                    Ok(relays)
+                } else {
+                    let relays = vec![
+                        RelayUrl::parse("wss://auth.nostr1.com")?,
+                        RelayUrl::parse("wss://relay.0xchat.com")?,
+                    ];
+
+                    Ok(relays)
+                }
+            });
+
+            cx.spawn(async move |this, cx| {
+                if let Ok(relays) = task.await {
+                    cx.update(|cx| {
+                        this.update(cx, |this: &mut Vec<RelayUrl>, cx| {
+                            *this = relays;
+                            cx.notify();
+                        })
+                        .ok();
+                    })
+                    .ok();
+                }
+            })
+            .detach();
+
+            vec![]
+        });
+
+        cx.new(|cx| {
+            let mut subscriptions = smallvec![];
+
+            subscriptions.push(cx.subscribe_in(
+                &input,
+                window,
+                move |this: &mut Relays, _, input_event, window, cx| {
+                    if let InputEvent::PressEnter = input_event {
+                        this.add(window, cx);
+                    }
+                },
+            ));
+
+            Self {
+                relays,
+                input,
+                subscriptions,
+                is_loading: false,
+                focus_handle: cx.focus_handle(),
+            }
+        })
+    }
+
+    pub fn update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.set_loading(true, cx);
+
+        let relays = self.relays.read(cx).clone();
+        let task: Task<Result<EventId, Error>> = cx.background_spawn(async move {
+            let client = get_client();
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            // If user didn't have any NIP-65 relays, add default ones
+            if client.database().relay_list(public_key).await?.is_empty() {
+                let builder = EventBuilder::relay_list(vec![
+                    (RelayUrl::parse("wss://relay.damus.io/").unwrap(), None),
+                    (RelayUrl::parse("wss://relay.primal.net/").unwrap(), None),
+                ]);
+
+                if let Err(e) = client.send_event_builder(builder).await {
+                    log::error!("Failed to send relay list event: {}", e);
+                }
+            }
+
+            let tags: Vec<Tag> = relays
+                .iter()
+                .map(|relay| Tag::custom(TagKind::Relay, vec![relay.to_string()]))
+                .collect();
+
+            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
+            let output = client.send_event_builder(builder).await?;
+
+            // Connect to messaging relays
+            for relay in relays.into_iter() {
+                _ = client.add_relay(&relay).await;
+                _ = client.connect_relay(&relay).await;
+            }
+
+            let sub_id = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
+
+            // Close old subscription
+            client.unsubscribe(&sub_id).await;
+
+            // Subscribe to new messages
+            if let Err(e) = client
+                .subscribe_with_id(
+                    sub_id,
+                    Filter::new()
+                        .kind(Kind::GiftWrap)
+                        .pubkey(public_key)
+                        .limit(0),
+                    None,
+                )
+                .await
+            {
+                log::error!("Failed to subscribe to new messages: {}", e);
+            }
+
+            Ok(output.val)
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.is_ok() {
+                cx.update(|window, cx| {
+                    this.update(cx, |this, cx| {
+                        this.set_loading(false, cx);
+                        cx.notify();
+                    })
+                    .ok();
+
+                    window.close_modal(cx);
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.is_loading = status;
+        cx.notify();
+    }
+
+    fn add(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let value = self.input.read(cx).text().to_string();
+
+        if !value.starts_with("ws") {
+            return;
+        }
+
+        if let Ok(url) = RelayUrl::parse(&value) {
+            self.relays.update(cx, |this, cx| {
+                if !this.contains(&url) {
+                    this.push(url);
+                    cx.notify();
+                }
+            });
+
+            self.input.update(cx, |this, cx| {
+                this.set_text("", window, cx);
+            });
+        }
+    }
+
+    fn remove(&mut self, ix: usize, _window: &mut Window, cx: &mut Context<Self>) {
+        self.relays.update(cx, |this, cx| {
+            this.remove(ix);
+            cx.notify();
+        });
+    }
+
+    fn render_list(
+        &mut self,
+        relays: Vec<RelayUrl>,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> UniformList {
+        let view = cx.entity();
+        let total = relays.len();
+
+        uniform_list(view, "relays", total, move |_, range, _window, cx| {
+            let mut items = Vec::new();
+
+            for ix in range {
+                let item = relays.get(ix).unwrap().clone().to_string();
+
+                items.push(
+                    div().group("").w_full().h_9().py_0p5().child(
+                        div()
+                            .px_2()
+                            .h_full()
+                            .w_full()
+                            .flex()
+                            .items_center()
+                            .justify_between()
+                            .rounded(px(cx.theme().radius))
+                            .bg(cx.theme().base.step(cx, ColorScaleStep::THREE))
+                            .text_xs()
+                            .child(item)
+                            .child(
+                                Button::new("remove_{ix}")
+                                    .icon(IconName::Close)
+                                    .xsmall()
+                                    .ghost()
+                                    .invisible()
+                                    .group_hover("", |this| this.visible())
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.remove(ix, window, cx)
+                                    })),
+                            ),
+                    ),
+                )
+            }
+
+            items
+        })
+        .w_full()
+        .min_h(px(MIN_HEIGHT))
+    }
+
+    fn render_empty(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .h_20()
+            .mb_2()
+            .flex()
+            .items_center()
+            .justify_center()
+            .text_sm()
+            .text_align(TextAlign::Center)
+            .child(HELP_TEXT)
+    }
+}
+
+impl Render for Relays {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .track_focus(&self.focus_handle)
+            .size_full()
+            .flex()
+            .flex_col()
+            .justify_between()
+            .child(
+                div()
+                    .flex_1()
+                    .flex()
+                    .flex_col()
+                    .gap_2()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
+                            .child(MESSAGE),
+                    )
+                    .child(
+                        div()
+                            .w_full()
+                            .flex()
+                            .flex_col()
+                            .gap_3()
+                            .child(
+                                div()
+                                    .flex()
+                                    .items_center()
+                                    .w_full()
+                                    .gap_2()
+                                    .child(self.input.clone())
+                                    .child(
+                                        Button::new("add_relay_btn")
+                                            .icon(IconName::Plus)
+                                            .label("Add")
+                                            .small()
+                                            .ghost()
+                                            .rounded(px(cx.theme().radius))
+                                            .on_click(cx.listener(|this, _, window, cx| {
+                                                this.add(window, cx)
+                                            })),
+                                    ),
+                            )
+                            .map(|this| {
+                                let relays = self.relays.read(cx).clone();
+
+                                if !relays.is_empty() {
+                                    this.child(self.render_list(relays, window, cx))
+                                } else {
+                                    this.child(self.render_empty(window, cx))
+                                }
+                            }),
+                    ),
+            )
+            .child(
+                Button::new("submti")
+                    .label("Update")
+                    .primary()
+                    .w_full()
+                    .loading(self.is_loading)
+                    .disabled(self.is_loading)
+                    .on_click(cx.listener(|this, _, window, cx| {
+                        this.update(window, cx);
+                    })),
+            )
+    }
+}
--- a/crates/coop/src/views/sidebar/button.rs
+++ b/crates/coop/src/views/sidebar/button.rs
@@ -0,0 +1,58 @@
+use std::rc::Rc;
+
+use gpui::{
+    div, prelude::FluentBuilder, px, App, ClickEvent, Div, InteractiveElement, IntoElement,
+    ParentElement, RenderOnce, SharedString, StatefulInteractiveElement, Styled, Window,
+};
+use ui::{
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    Icon,
+};
+
+type Handler = Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>;
+
+#[derive(IntoElement)]
+pub struct SidebarButton {
+    base: Div,
+    label: SharedString,
+    icon: Option<Icon>,
+    handler: Handler,
+}
+
+impl SidebarButton {
+    pub fn new(label: impl Into<SharedString>) -> Self {
+        Self {
+            base: div().flex().items_center().gap_3().px_3().h_8(),
+            label: label.into(),
+            icon: None,
+            handler: Rc::new(|_, _, _| {}),
+        }
+    }
+
+    pub fn icon(mut self, icon: impl Into<Icon>) -> Self {
+        self.icon = Some(icon.into());
+        self
+    }
+
+    pub fn on_click(
+        mut self,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.handler = Rc::new(handler);
+        self
+    }
+}
+
+impl RenderOnce for SidebarButton {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let handler = self.handler.clone();
+
+        self.base
+            .id(self.label.clone())
+            .rounded(px(cx.theme().radius))
+            .when_some(self.icon, |this, icon| this.child(icon))
+            .child(self.label.clone())
+            .hover(|this| this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE)))
+            .on_click(move |ev, window, cx| handler(ev, window, cx))
+    }
+}
--- a/crates/coop/src/views/sidebar/folder.rs
+++ b/crates/coop/src/views/sidebar/folder.rs
@@ -0,0 +1,312 @@
+use std::rc::Rc;
+
+use gpui::{
+    div, percentage, prelude::FluentBuilder, px, App, ClickEvent, Div, Img, InteractiveElement,
+    IntoElement, ParentElement as _, RenderOnce, SharedString, StatefulInteractiveElement, Styled,
+    Window,
+};
+use ui::{
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    Collapsible, Icon, IconName, Sizable, StyledExt,
+};
+
+type Handler = Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>;
+
+#[derive(IntoElement)]
+pub struct Parent {
+    base: Div,
+    icon: Option<Icon>,
+    label: SharedString,
+    items: Vec<Folder>,
+    collapsed: bool,
+    handler: Handler,
+}
+
+impl Parent {
+    pub fn new(label: impl Into<SharedString>) -> Self {
+        Self {
+            base: div().flex().flex_col().gap_2(),
+            label: label.into(),
+            icon: None,
+            items: Vec::new(),
+            collapsed: false,
+            handler: Rc::new(|_, _, _| {}),
+        }
+    }
+
+    pub fn icon(mut self, icon: impl Into<Icon>) -> Self {
+        self.icon = Some(icon.into());
+        self
+    }
+
+    pub fn collapsed(mut self, collapsed: bool) -> Self {
+        self.collapsed = collapsed;
+        self
+    }
+
+    pub fn child(mut self, child: impl Into<Folder>) -> Self {
+        self.items.push(child.into());
+        self
+    }
+
+    #[allow(dead_code)]
+    pub fn children(mut self, children: impl IntoIterator<Item = impl Into<Folder>>) -> Self {
+        self.items = children.into_iter().map(Into::into).collect();
+        self
+    }
+
+    pub fn on_click(
+        mut self,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.handler = Rc::new(handler);
+        self
+    }
+}
+
+impl Collapsible for Parent {
+    fn is_collapsed(&self) -> bool {
+        self.collapsed
+    }
+
+    fn collapsed(mut self, collapsed: bool) -> Self {
+        self.collapsed = collapsed;
+        self
+    }
+}
+
+impl RenderOnce for Parent {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let handler = self.handler.clone();
+
+        self.base
+            .child(
+                div()
+                    .id(self.label.clone())
+                    .flex()
+                    .items_center()
+                    .gap_2()
+                    .px_2()
+                    .h_8()
+                    .rounded(px(cx.theme().radius))
+                    .text_sm()
+                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
+                    .font_medium()
+                    .child(
+                        Icon::new(IconName::CaretDown)
+                            .xsmall()
+                            .when(self.collapsed, |this| this.rotate(percentage(270. / 360.))),
+                    )
+                    .child(
+                        div()
+                            .flex()
+                            .items_center()
+                            .gap_2()
+                            .when_some(self.icon, |this, icon| this.child(icon.small()))
+                            .child(self.label.clone()),
+                    )
+                    .hover(|this| this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE)))
+                    .on_click(move |ev, window, cx| handler(ev, window, cx)),
+            )
+            .when(!self.collapsed, |this| {
+                this.child(div().flex().flex_col().gap_2().pl_3().children(self.items))
+            })
+    }
+}
+
+#[derive(IntoElement)]
+pub struct Folder {
+    base: Div,
+    icon: Option<Icon>,
+    label: SharedString,
+    items: Vec<FolderItem>,
+    collapsed: bool,
+    handler: Handler,
+}
+
+impl Folder {
+    pub fn new(label: impl Into<SharedString>) -> Self {
+        Self {
+            base: div().flex().flex_col().gap_2(),
+            label: label.into(),
+            icon: None,
+            items: Vec::new(),
+            collapsed: false,
+            handler: Rc::new(|_, _, _| {}),
+        }
+    }
+
+    pub fn icon(mut self, icon: impl Into<Icon>) -> Self {
+        self.icon = Some(icon.into());
+        self
+    }
+
+    pub fn collapsed(mut self, collapsed: bool) -> Self {
+        self.collapsed = collapsed;
+        self
+    }
+
+    pub fn children(mut self, children: impl IntoIterator<Item = impl Into<FolderItem>>) -> Self {
+        self.items = children.into_iter().map(Into::into).collect();
+        self
+    }
+
+    pub fn on_click(
+        mut self,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.handler = Rc::new(handler);
+        self
+    }
+}
+
+impl Collapsible for Folder {
+    fn is_collapsed(&self) -> bool {
+        self.collapsed
+    }
+
+    fn collapsed(mut self, collapsed: bool) -> Self {
+        self.collapsed = collapsed;
+        self
+    }
+}
+
+impl RenderOnce for Folder {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let handler = self.handler.clone();
+
+        self.base
+            .child(
+                div()
+                    .id(self.label.clone())
+                    .flex()
+                    .items_center()
+                    .gap_2()
+                    .px_2()
+                    .h_8()
+                    .rounded(px(cx.theme().radius))
+                    .text_sm()
+                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
+                    .font_medium()
+                    .child(
+                        Icon::new(IconName::CaretDown)
+                            .xsmall()
+                            .when(self.collapsed, |this| this.rotate(percentage(270. / 360.))),
+                    )
+                    .child(
+                        div()
+                            .flex()
+                            .items_center()
+                            .gap_2()
+                            .when_some(self.icon, |this, icon| this.child(icon.small()))
+                            .child(self.label.clone()),
+                    )
+                    .hover(|this| this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE)))
+                    .on_click(move |ev, window, cx| handler(ev, window, cx)),
+            )
+            .when(!self.collapsed, |this| {
+                this.child(div().flex().flex_col().gap_1().pl_6().children(self.items))
+            })
+    }
+}
+
+#[derive(IntoElement)]
+pub struct FolderItem {
+    ix: usize,
+    base: Div,
+    img: Option<Img>,
+    label: Option<SharedString>,
+    description: Option<SharedString>,
+    handler: Handler,
+}
+
+impl FolderItem {
+    pub fn new(ix: usize) -> Self {
+        Self {
+            ix,
+            base: div().h_8().w_full().px_2(),
+            img: None,
+            label: None,
+            description: None,
+            handler: Rc::new(|_, _, _| {}),
+        }
+    }
+
+    pub fn label(mut self, label: impl Into<SharedString>) -> Self {
+        self.label = Some(label.into());
+        self
+    }
+
+    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
+        self.description = Some(description.into());
+        self
+    }
+
+    pub fn img(mut self, img: Option<Img>) -> Self {
+        self.img = img;
+        self
+    }
+
+    pub fn on_click(
+        mut self,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.handler = Rc::new(handler);
+        self
+    }
+}
+
+impl RenderOnce for FolderItem {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let handler = self.handler.clone();
+
+        self.base
+            .id(self.ix)
+            .flex()
+            .items_center()
+            .justify_between()
+            .text_sm()
+            .rounded(px(cx.theme().radius))
+            .child(
+                div()
+                    .flex_1()
+                    .flex()
+                    .items_center()
+                    .gap_2()
+                    .truncate()
+                    .font_medium()
+                    .map(|this| {
+                        if let Some(img) = self.img {
+                            this.child(img.size_5().flex_shrink_0())
+                        } else {
+                            this.child(
+                                div()
+                                    .flex()
+                                    .justify_center()
+                                    .items_center()
+                                    .size_5()
+                                    .rounded_full()
+                                    .bg(cx.theme().accent.step(cx, ColorScaleStep::THREE))
+                                    .child(
+                                        Icon::new(IconName::UsersThreeFill).xsmall().text_color(
+                                            cx.theme().accent.step(cx, ColorScaleStep::TWELVE),
+                                        ),
+                                    ),
+                            )
+                        }
+                    })
+                    .when_some(self.label, |this, label| this.child(label)),
+            )
+            .when_some(self.description, |this, description| {
+                this.child(
+                    div()
+                        .flex_shrink_0()
+                        .text_xs()
+                        .text_color(cx.theme().base.step(cx, ColorScaleStep::TEN))
+                        .child(description),
+                )
+            })
+            .hover(|this| this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE)))
+            .on_click(move |ev, window, cx| handler(ev, window, cx))
+    }
+}
--- a/crates/coop/src/views/sidebar/mod.rs
+++ b/crates/coop/src/views/sidebar/mod.rs
@@ -0,0 +1,337 @@
+use account::Account;
+use button::SidebarButton;
+use chats::{
+    room::{Room, RoomKind},
+    ChatRegistry,
+};
+use common::profile::SharedProfile;
+use folder::{Folder, FolderItem, Parent};
+use global::get_client;
+use gpui::{
+    actions, div, img, prelude::FluentBuilder, AnyElement, App, AppContext, Context, Entity,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
+    SharedString, Styled, Task, Window,
+};
+use ui::{
+    button::{Button, ButtonVariants},
+    dock_area::{
+        dock::DockPlacement,
+        panel::{Panel, PanelEvent},
+    },
+    popup_menu::{PopupMenu, PopupMenuExt},
+    scroll::ScrollbarAxis,
+    skeleton::Skeleton,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    IconName, Sizable, StyledExt,
+};
+
+use crate::chatspace::{AddPanel, ModalKind, PanelKind, ToggleModal};
+
+mod button;
+mod folder;
+
+actions!(profile, [Logout]);
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Sidebar> {
+    Sidebar::new(window, cx)
+}
+
+pub struct Sidebar {
+    name: SharedString,
+    focus_handle: FocusHandle,
+    ongoing: bool,
+    incoming: bool,
+    trusted: bool,
+    unknown: bool,
+}
+
+impl Sidebar {
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| Self::view(window, cx))
+    }
+
+    fn view(_window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let focus_handle = cx.focus_handle();
+
+        Self {
+            name: "Chat Sidebar".into(),
+            ongoing: false,
+            incoming: false,
+            trusted: true,
+            unknown: true,
+            focus_handle,
+        }
+    }
+
+    fn ongoing(&mut self, cx: &mut Context<Self>) {
+        self.ongoing = !self.ongoing;
+        cx.notify();
+    }
+
+    fn incoming(&mut self, cx: &mut Context<Self>) {
+        self.incoming = !self.incoming;
+        cx.notify();
+    }
+
+    fn trusted(&mut self, cx: &mut Context<Self>) {
+        self.trusted = !self.trusted;
+        cx.notify();
+    }
+
+    fn unknown(&mut self, cx: &mut Context<Self>) {
+        self.unknown = !self.unknown;
+        cx.notify();
+    }
+
+    fn render_skeleton(&self, total: i32) -> impl IntoIterator<Item = impl IntoElement> {
+        (0..total).map(|_| {
+            div()
+                .h_8()
+                .w_full()
+                .px_1()
+                .flex()
+                .items_center()
+                .gap_2()
+                .child(Skeleton::new().flex_shrink_0().size_6().rounded_full())
+                .child(Skeleton::new().w_20().h_3().rounded_sm())
+        })
+    }
+
+    fn render_items(rooms: &Vec<&Entity<Room>>, cx: &Context<Self>) -> Vec<FolderItem> {
+        let mut items = Vec::with_capacity(rooms.len());
+
+        for room in rooms {
+            let room = room.read(cx);
+            let id = room.id;
+            let ago = room.ago();
+            let label = room.display_name(cx);
+            let img = room.display_image(cx).map(img);
+
+            let item = FolderItem::new(id as usize)
+                .label(label)
+                .description(ago)
+                .img(img)
+                .on_click({
+                    cx.listener(move |_, _, window, cx| {
+                        window.dispatch_action(
+                            Box::new(AddPanel::new(PanelKind::Room(id), DockPlacement::Center)),
+                            cx,
+                        );
+                    })
+                });
+
+            items.push(item);
+        }
+
+        items
+    }
+
+    fn on_logout(&mut self, _: &Logout, window: &mut Window, cx: &mut Context<Self>) {
+        let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
+            let client = get_client();
+            _ = client.reset().await;
+
+            Ok(())
+        });
+
+        cx.spawn_in(window, async move |_, cx| {
+            if task.await.is_ok() {
+                cx.update(|_, cx| {
+                    Account::global(cx).update(cx, |this, cx| {
+                        this.profile = None;
+                        cx.notify();
+                    });
+                })
+                .ok();
+            };
+        })
+        .detach();
+    }
+}
+
+impl Panel for Sidebar {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+
+    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
+        menu.track_focus(&self.focus_handle)
+    }
+
+    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
+        vec![]
+    }
+}
+
+impl EventEmitter<PanelEvent> for Sidebar {}
+
+impl Focusable for Sidebar {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Sidebar {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let account = Account::global(cx).read(cx).profile.as_ref();
+        let registry = ChatRegistry::global(cx).read(cx);
+
+        let rooms = registry.rooms(cx);
+        let loading = registry.loading();
+
+        let ongoing = rooms.get(&RoomKind::Ongoing);
+        let trusted = rooms.get(&RoomKind::Trusted);
+        let unknown = rooms.get(&RoomKind::Unknown);
+
+        div()
+            .scrollable(cx.entity_id(), ScrollbarAxis::Vertical)
+            .on_action(cx.listener(Self::on_logout))
+            .size_full()
+            .flex()
+            .flex_col()
+            .gap_3()
+            .pt_1()
+            .px_2()
+            .pb_2()
+            .when_some(account, |this, profile| {
+                this.child(
+                    div()
+                        .h_7()
+                        .px_1p5()
+                        .flex()
+                        .justify_between()
+                        .items_center()
+                        .child(
+                            div()
+                                .flex()
+                                .items_center()
+                                .gap_2()
+                                .text_sm()
+                                .font_semibold()
+                                .child(img(profile.shared_avatar()).size_7())
+                                .child(profile.shared_name()),
+                        )
+                        .child(
+                            Button::new("user_dropdown")
+                                .icon(IconName::Ellipsis)
+                                .small()
+                                .ghost()
+                                .popup_menu(|this, _window, _cx| {
+                                    this.menu(
+                                        "Profile",
+                                        Box::new(ToggleModal {
+                                            modal: ModalKind::Profile,
+                                        }),
+                                    )
+                                    .menu(
+                                        "Relays",
+                                        Box::new(ToggleModal {
+                                            modal: ModalKind::Relay,
+                                        }),
+                                    )
+                                    .separator()
+                                    .menu("Logout", Box::new(Logout))
+                                }),
+                        ),
+                )
+            })
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .gap_1()
+                    .text_sm()
+                    .font_medium()
+                    .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
+                    .child(
+                        SidebarButton::new("New Message")
+                            .icon(IconName::PlusCircleFill)
+                            .on_click(cx.listener(|_, _, window, cx| {
+                                window.dispatch_action(
+                                    Box::new(ToggleModal {
+                                        modal: ModalKind::Compose,
+                                    }),
+                                    cx,
+                                );
+                            })),
+                    )
+                    .child(
+                        SidebarButton::new("Contacts")
+                            .icon(IconName::AddressBook)
+                            .on_click(cx.listener(|_, _, window, cx| {
+                                window.dispatch_action(
+                                    Box::new(ToggleModal {
+                                        modal: ModalKind::Contact,
+                                    }),
+                                    cx,
+                                );
+                            })),
+                    ),
+            )
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .gap_2()
+                    .child(
+                        div()
+                            .px_2()
+                            .text_xs()
+                            .font_semibold()
+                            .text_color(cx.theme().base.step(cx, ColorScaleStep::NINE))
+                            .child("Messages"),
+                    )
+                    .map(|this| {
+                        if loading {
+                            this.children(self.render_skeleton(6))
+                        } else {
+                            this.when_some(ongoing, |this, rooms| {
+                                this.child(
+                                    Folder::new("Ongoing")
+                                        .icon(IconName::Folder)
+                                        .collapsed(self.ongoing)
+                                        .on_click(cx.listener(move |this, _, _, cx| {
+                                            this.ongoing(cx);
+                                        }))
+                                        .children(Self::render_items(rooms, cx)),
+                                )
+                            })
+                            .child(
+                                Parent::new("Incoming")
+                                    .icon(IconName::Folder)
+                                    .collapsed(self.incoming)
+                                    .on_click(cx.listener(move |this, _, _, cx| {
+                                        this.incoming(cx);
+                                    }))
+                                    .when_some(trusted, |this, rooms| {
+                                        this.child(
+                                            Folder::new("Trusted")
+                                                .icon(IconName::Folder)
+                                                .collapsed(self.trusted)
+                                                .on_click(cx.listener(move |this, _, _, cx| {
+                                                    this.trusted(cx);
+                                                }))
+                                                .children(Self::render_items(rooms, cx)),
+                                        )
+                                    })
+                                    .when_some(unknown, |this, rooms| {
+                                        this.child(
+                                            Folder::new("Unknown")
+                                                .icon(IconName::Folder)
+                                                .collapsed(self.unknown)
+                                                .on_click(cx.listener(move |this, _, _, cx| {
+                                                    this.unknown(cx);
+                                                }))
+                                                .children(Self::render_items(rooms, cx)),
+                                        )
+                                    }),
+                            )
+                        }
+                    }),
+            )
+    }
+}
--- a/crates/coop/src/views/subject.rs
+++ b/crates/coop/src/views/subject.rs
@@ -0,0 +1,111 @@
+use chats::ChatRegistry;
+use gpui::{
+    div, App, AppContext, Context, Entity, FocusHandle, InteractiveElement, IntoElement,
+    ParentElement, Render, Styled, Window,
+};
+use ui::{
+    button::{Button, ButtonVariants},
+    input::TextInput,
+    theme::{scale::ColorScaleStep, ActiveTheme},
+    ContextModal, Size,
+};
+
+pub fn init(
+    id: u64,
+    subject: Option<String>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<Subject> {
+    Subject::new(id, subject, window, cx)
+}
+
+pub struct Subject {
+    id: u64,
+    input: Entity<TextInput>,
+    focus_handle: FocusHandle,
+}
+
+impl Subject {
+    pub fn new(
+        id: u64,
+        subject: Option<String>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Entity<Self> {
+        let input = cx.new(|cx| {
+            let mut this = TextInput::new(window, cx).text_size(Size::Small);
+            if let Some(text) = subject.clone() {
+                this.set_text(text, window, cx);
+            } else {
+                this.set_placeholder("prepare for holidays...");
+            }
+            this
+        });
+
+        cx.new(|cx| Self {
+            id,
+            input,
+            focus_handle: cx.focus_handle(),
+        })
+    }
+
+    pub fn update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let registry = ChatRegistry::global(cx).read(cx);
+        let subject = self.input.read(cx).text();
+
+        if subject.is_empty() {
+            window.push_notification("Subject cannot be empty", cx);
+            return;
+        }
+
+        if let Some(room) = registry.room(&self.id, cx) {
+            room.update(cx, |this, cx| {
+                this.subject = Some(subject);
+                cx.notify();
+            });
+            window.close_modal(cx);
+        } else {
+            window.push_notification("Room not found", cx);
+        }
+    }
+}
+
+impl Render for Subject {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        const HELP_TEXT: &str = "Subject will be updated when you send a message.";
+
+        div()
+            .track_focus(&self.focus_handle)
+            .size_full()
+            .flex()
+            .flex_col()
+            .gap_3()
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .gap_1()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN))
+                            .child("Subject:"),
+                    )
+                    .child(self.input.clone())
+                    .child(
+                        div()
+                            .text_xs()
+                            .italic()
+                            .text_color(cx.theme().base.step(cx, ColorScaleStep::NINE))
+                            .child(HELP_TEXT),
+                    ),
+            )
+            .child(
+                Button::new("submit")
+                    .label("Change")
+                    .primary()
+                    .w_full()
+                    .on_click(cx.listener(|this, _, window, cx| this.update(window, cx))),
+            )
+    }
+}
--- a/crates/coop/src/views/welcome.rs
+++ b/crates/coop/src/views/welcome.rs
@@ -38,11 +38,11 @@ impl Welcome {

 impl Panel for Welcome {
    fn panel_id(&self) -> SharedString {
-        "WelcomePanel".into()
+        self.name.clone()
    }

    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
+        "👋".into_any_element()
    }

    fn closable(&self, _cx: &App) -> bool {
@@ -92,8 +92,8 @@ impl Render for Welcome {
                    .child(
                        div()
                            .child("coop on nostr.")
-                            .text_color(cx.theme().base.step(cx, ColorScaleStep::FOUR))
-                            .font_black()
+                            .text_color(cx.theme().base.step(cx, ColorScaleStep::NINE))
+                            .font_semibold()
                            .text_sm(),
                    ),
            )
--- a/crates/global/Cargo.toml
+++ b/crates/global/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "global"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+nostr-sdk.workspace = true
+dirs.workspace = true
+smol.workspace = true
+
+whoami = "1.5.2"
--- a/crates/global/src/constants.rs
+++ b/crates/global/src/constants.rs
@@ -0,0 +1,22 @@
+pub const APP_NAME: &str = "Coop";
+pub const APP_ID: &str = "su.reya.coop";
+pub const APP_PUBKEY: &str = "b1813fb01274b32cc5db6d1198e7c79dda0fb430899f63c7064f651a41d44f2b";
+
+/// Bootstrap relays
+pub const BOOTSTRAP_RELAYS: [&str; 5] = [
+    "wss://relay.damus.io",
+    "wss://relay.primal.net",
+    "wss://user.kindpag.es",
+    "wss://relaydiscovery.com",
+    "wss://purplepag.es",
+];
+
+/// Subscriptions
+pub const NEW_MESSAGE_SUB_ID: &str = "listen_new_giftwraps";
+pub const ALL_MESSAGES_SUB_ID: &str = "listen_all_giftwraps";
+
+/// Image Resizer Service
+pub const IMAGE_SERVICE: &str = "https://wsrv.nl";
+
+/// NIP96 Media Server
+pub const NIP96_SERVER: &str = "https://nostrmedia.com";
--- a/crates/global/src/lib.rs
+++ b/crates/global/src/lib.rs
@@ -0,0 +1,37 @@
+use nostr_sdk::prelude::*;
+use paths::nostr_file;
+
+use std::{sync::OnceLock, time::Duration};
+
+pub mod constants;
+pub mod paths;
+
+static CLIENT: OnceLock<Client> = OnceLock::new();
+static CLIENT_KEYS: OnceLock<Keys> = OnceLock::new();
+
+/// Nostr Client instance
+pub fn get_client() -> &'static Client {
+    CLIENT.get_or_init(|| {
+        // Setup database
+        let db_path = nostr_file();
+        let lmdb = NostrLMDB::open(db_path).expect("Database is NOT initialized");
+
+        // Client options
+        let opts = Options::new()
+            // NIP-65
+            // Coop is don't really need to enable this option,
+            // but this will help the client discover user's messaging relays efficiently.
+            .gossip(true)
+            // Skip all very slow relays
+            // Note: max delay is 800ms
+            .max_avg_latency(Duration::from_millis(800));
+
+        // Setup Nostr Client
+        ClientBuilder::default().database(lmdb).opts(opts).build()
+    })
+}
+
+/// Client Keys
+pub fn get_client_keys() -> &'static Keys {
+    CLIENT_KEYS.get_or_init(Keys::generate)
+}
--- a/crates/global/src/paths.rs
+++ b/crates/global/src/paths.rs
@@ -0,0 +1,64 @@
+use std::path::PathBuf;
+use std::sync::OnceLock;
+
+/// Returns the path to the user's home directory.
+pub fn home_dir() -> &'static PathBuf {
+    static HOME_DIR: OnceLock<PathBuf> = OnceLock::new();
+    HOME_DIR.get_or_init(|| dirs::home_dir().expect("failed to determine home directory"))
+}
+
+/// Returns the path to the configuration directory used by Coop.
+pub fn config_dir() -> &'static PathBuf {
+    static CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
+    CONFIG_DIR.get_or_init(|| {
+        if cfg!(target_os = "windows") {
+            return dirs::config_dir()
+                .expect("failed to determine RoamingAppData directory")
+                .join("Coop");
+        }
+
+        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
+            return if let Ok(flatpak_xdg_config) = std::env::var("FLATPAK_XDG_CONFIG_HOME") {
+                flatpak_xdg_config.into()
+            } else {
+                dirs::config_dir().expect("failed to determine XDG_CONFIG_HOME directory")
+            }
+            .join("coop");
+        }
+
+        home_dir().join(".config").join("coop")
+    })
+}
+
+/// Returns the path to the support directory used by Coop.
+pub fn support_dir() -> &'static PathBuf {
+    static SUPPORT_DIR: OnceLock<PathBuf> = OnceLock::new();
+    SUPPORT_DIR.get_or_init(|| {
+        if cfg!(target_os = "macos") {
+            return home_dir().join("Library/Application Support/Coop");
+        }
+
+        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
+            return if let Ok(flatpak_xdg_data) = std::env::var("FLATPAK_XDG_DATA_HOME") {
+                flatpak_xdg_data.into()
+            } else {
+                dirs::data_local_dir().expect("failed to determine XDG_DATA_HOME directory")
+            }
+            .join("coop");
+        }
+
+        if cfg!(target_os = "windows") {
+            return dirs::data_local_dir()
+                .expect("failed to determine LocalAppData directory")
+                .join("coop");
+        }
+
+        config_dir().clone()
+    })
+}
+
+/// Returns the path to the `nostr` file.
+pub fn nostr_file() -> &'static PathBuf {
+    static NOSTR_FILE: OnceLock<PathBuf> = OnceLock::new();
+    NOSTR_FILE.get_or_init(|| support_dir().join("nostr"))
+}
--- a/crates/state/Cargo.toml
+++ b/crates/state/Cargo.toml
@@ -1,9 +0,0 @@
-[package]
-name = "state"
-version = "0.0.0"
-edition = "2021"
-publish = false
-
-[dependencies]
-nostr-sdk.workspace = true
-dirs.workspace = true
--- a/crates/state/src/lib.rs
+++ b/crates/state/src/lib.rs
@@ -1,34 +0,0 @@
-use dirs::config_dir;
-use nostr_sdk::prelude::*;
-use std::{fs, sync::OnceLock, time::Duration};
-
-static CLIENT: OnceLock<Client> = OnceLock::new();
-
-pub fn initialize_client() -> &'static Client {
-    // Setup app data folder
-    let config_dir = config_dir().expect("Config directory not found");
-    let app_dir = config_dir.join("Coop/");
-
-    // Create app directory if it doesn't exist
-    _ = fs::create_dir_all(&app_dir);
-
-    // Setup database
-    let lmdb = NostrLMDB::open(app_dir.join("nostr")).expect("Database is NOT initialized");
-
-    // Client options
-    let opts = Options::new()
-        // NIP-65
-        .gossip(true)
-        // Skip all very slow relays
-        .max_avg_latency(Duration::from_millis(800));
-
-    // Setup Nostr Client
-    let client = ClientBuilder::default().database(lmdb).opts(opts).build();
-
-    CLIENT.set(client).expect("Client is already initialized!");
-    CLIENT.get().expect("Client is NOT initialized!")
-}
-
-pub fn get_client() -> &'static Client {
-    CLIENT.get().expect("Client is NOT initialized!")
-}
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -1,10 +1,13 @@
 [package]
 name = "ui"
-version = "0.0.0"
-edition = "2021"
-publish = false
+version.workspace = true
+edition.workspace = true
+publish.workspace = true

 [dependencies]
+common = { path = "../common" }
+
+nostr-sdk.workspace = true
 gpui.workspace = true
 smol.workspace = true
 serde.workspace = true
@@ -20,3 +23,5 @@ unicode-segmentation = "1.12.0"
 uuid = "1.10"
 once_cell = "1.19.0"
 image = "0.25.1"
+linkify = "0.10.0"
+emojis.workspace = true
--- a/crates/ui/src/button.rs
+++ b/crates/ui/src/button.rs
@@ -348,8 +348,7 @@ impl RenderOnce for Button {
                        Size::Size(px) => this.size(px),
                        Size::XSmall => this.size_5(),
                        Size::Small => this.size_6(),
-                        Size::Medium => this.size_8(),
-                        Size::Large => this.size_9(),
+                        _ => this.size_9(),
                    }
                } else {
                    // Normal Button
@@ -357,7 +356,8 @@ impl RenderOnce for Button {
                        Size::Size(size) => this.px(size * 0.2),
                        Size::XSmall => this.h_6().px_0p5(),
                        Size::Small => this.h_7().px_2(),
-                        _ => this.h_8().px_3(),
+                        Size::Large => this.h_10().px_3(),
+                        _ => this.h_9().px_2(),
                    }
                }
            })
@@ -437,10 +437,11 @@ impl RenderOnce for Button {
                    .id("label")
                    .items_center()
                    .justify_center()
+                    .text_sm()
                    .map(|this| match self.size {
-                        Size::XSmall => this.gap_0p5().text_xs(),
-                        Size::Small => this.gap_1().text_xs(),
-                        _ => this.gap_2().text_xs(),
+                        Size::XSmall => this.gap_0p5(),
+                        Size::Small => this.gap_1(),
+                        _ => this.gap_2().font_medium(),
                    })
                    .when(!self.loading, |this| {
                        this.when_some(self.icon, |this, icon| {
@@ -450,7 +451,6 @@ impl RenderOnce for Button {
                    .when(self.loading, |this| {
                        this.child(
                            Indicator::new()
-                                .with_size(self.size)
                                .when_some(self.loading_icon, |this, icon| this.icon(icon)),
                        )
                    })
@@ -634,7 +634,18 @@ impl ButtonVariant {
            _ => cx.theme().base.step(cx, ColorScaleStep::THREE),
        };

-        let fg = cx.theme().base.step(cx, ColorScaleStep::ELEVEN);
+        let fg = match self {
+            ButtonVariant::Primary => match cx.theme().accent.name().to_string().as_str() {
+                "Sky" => cx.theme().base.darken(cx),
+                "Mint" => cx.theme().base.darken(cx),
+                "Lime" => cx.theme().base.darken(cx),
+                "Amber" => cx.theme().base.darken(cx),
+                "Yellow" => cx.theme().base.darken(cx),
+                _ => cx.theme().accent.step(cx, ColorScaleStep::ONE),
+            },
+            _ => cx.theme().base.step(cx, ColorScaleStep::ELEVEN),
+        };
+
        let border = bg;
        let underline = self.underline(window, cx);
        let shadow = false;
--- a/crates/ui/src/clipboard.rs
+++ b/crates/ui/src/clipboard.rs
@@ -115,9 +115,8 @@ impl Element for Clipboard {
                                *copied.borrow_mut() = true;

                                let copied = copied.clone();
-                                cx.spawn(|cx| async move {
+                                cx.spawn(async move |cx| {
                                    cx.background_executor().timer(Duration::from_secs(2)).await;
-
                                    *copied.borrow_mut() = false;
                                })
                                .detach();
--- a/crates/ui/src/divider.rs
+++ b/crates/ui/src/divider.rs
@@ -1,9 +1,10 @@
-use crate::theme::{scale::ColorScaleStep, ActiveTheme};
 use gpui::{
    div, prelude::FluentBuilder as _, px, Axis, Div, Hsla, IntoElement, ParentElement, RenderOnce,
    SharedString, Styled,
 };

+use crate::theme::{scale::ColorScaleStep, ActiveTheme};
+
 /// A divider that can be either vertical or horizontal.
 #[derive(IntoElement)]
 pub struct Divider {
--- a/crates/ui/src/dock_area/dock.rs
+++ b/crates/ui/src/dock_area/dock.rs
@@ -358,8 +358,6 @@ impl Render for Dock {
            return div();
        }

-        let cache_style = gpui::StyleRefinement::default().v_flex().size_full();
-
        div()
            .relative()
            .overflow_hidden()
@@ -375,7 +373,7 @@ impl Render for Dock {
            .map(|this| match &self.panel {
                DockItem::Split { view, .. } => this.child(view.clone()),
                DockItem::Tabs { view, .. } => this.child(view.clone()),
-                DockItem::Panel { view, .. } => this.child(view.clone().view().cached(cache_style)),
+                DockItem::Panel { view, .. } => this.child(view.clone().view()),
            })
            .child(self.render_resize_handle(window, cx))
            .child(DockElement {
--- a/crates/ui/src/dock_area/mod.rs
+++ b/crates/ui/src/dock_area/mod.rs
@@ -574,8 +574,8 @@ impl DockArea {
                    window,
                    move |_, _, event, window, cx| {
                        if let PanelEvent::LayoutChanged = event {
-                            cx.spawn_in(window, |view, mut window| async move {
-                                _ = view.update_in(&mut window, |view, window, cx| {
+                            cx.spawn_in(window, async move |view, window| {
+                                _ = view.update_in(window, |view, window, cx| {
                                    view.update_toggle_button_tab_panels(window, cx)
                                });
                            })
@@ -609,8 +609,8 @@ impl DockArea {
                move |_, panel, event, window, cx| match event {
                    PanelEvent::ZoomIn => {
                        let panel = panel.clone();
-                        cx.spawn_in(window, |view, mut window| async move {
-                            _ = view.update_in(&mut window, |view, window, cx| {
+                        cx.spawn_in(window, async move |view, window| {
+                            _ = view.update_in(window, |view, window, cx| {
                                view.set_zoomed_in(panel, window, cx);
                                cx.notify();
                            });
@@ -618,15 +618,15 @@ impl DockArea {
                        .detach();
                    }
                    PanelEvent::ZoomOut => cx
-                        .spawn_in(window, |view, mut window| async move {
-                            _ = view.update_in(&mut window, |view, window, cx| {
+                        .spawn_in(window, async move |view, window| {
+                            _ = view.update_in(window, |view, window, cx| {
                                view.set_zoomed_out(window, cx);
                            });
                        })
                        .detach(),
                    PanelEvent::LayoutChanged => {
-                        cx.spawn_in(window, |view, mut window| async move {
-                            _ = view.update_in(&mut window, |view, window, cx| {
+                        cx.spawn_in(window, async move |view, window| {
+                            _ = view.update_in(window, |view, window, cx| {
                                view.update_toggle_button_tab_panels(window, cx)
                            });
                        })
--- a/crates/ui/src/dock_area/tab_panel.rs
+++ b/crates/ui/src/dock_area/tab_panel.rs
@@ -181,7 +181,7 @@ impl TabPanel {
        self.focus_active_panel(window, cx);

        // Sync the active state to all panels
-        cx.spawn(|view, cx| async move {
+        cx.spawn(async move |view, cx| {
            _ = cx.update(|cx| {
                _ = view.update(cx, |view, cx| {
                    if let Some(last_active) = view.panels.get(last_active_ix) {
@@ -255,7 +255,7 @@ impl TabPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        cx.spawn_in(window, |view, mut cx| async move {
+        cx.spawn_in(window, async move |view, cx| {
            cx.update(|window, cx| {
                view.update(cx, |view, cx| {
                    view.will_split_placement = Some(placement);
@@ -407,19 +407,19 @@ impl TabPanel {
        let build_popup_menu = move |this, cx: &App| view.read(cx).popup_menu(this, cx);

        h_flex()
-            .gap_2()
+            .gap_1()
            .occlude()
            .items_center()
            .children(
                self.toolbar_buttons(window, cx)
                    .into_iter()
-                    .map(|btn| btn.xsmall().ghost()),
+                    .map(|btn| btn.small().ghost()),
            )
            .when(self.is_zoomed, |this| {
                this.child(
                    Button::new("zoom")
-                        .icon(IconName::Minimize)
-                        .xsmall()
+                        .icon(IconName::ArrowIn)
+                        .small()
                        .ghost()
                        .tooltip("Zoom Out")
                        .on_click(cx.listener(|view, _, window, cx| {
@@ -430,7 +430,7 @@ impl TabPanel {
            .child(
                Button::new("menu")
                    .icon(IconName::Ellipsis)
-                    .xsmall()
+                    .small()
                    .ghost()
                    .popup_menu({
                        let zoomable = state.zoomable;
@@ -451,7 +451,7 @@ impl TabPanel {
            )
    }

-    fn render_dock_toggle_button(
+    fn _render_dock_toggle_button(
        &self,
        placement: DockPlacement,
        _window: &mut Window,
@@ -517,7 +517,7 @@ impl TabPanel {
        Some(
            Button::new(SharedString::from(format!("toggle-dock:{:?}", placement)))
                .icon(icon)
-                .xsmall()
+                .small()
                .ghost()
                .tooltip(match is_open {
                    true => "Collapse",
@@ -547,9 +547,6 @@ impl TabPanel {
        };

        let panel_style = dock_area.read(cx).panel_style;
-        let left_dock_button = self.render_dock_toggle_button(DockPlacement::Left, window, cx);
-        let bottom_dock_button = self.render_dock_toggle_button(DockPlacement::Bottom, window, cx);
-        let right_dock_button = self.render_dock_toggle_button(DockPlacement::Right, window, cx);

        if self.panels.len() == 1 && panel_style == PanelStyle::Default {
            let panel = self.panels.first().unwrap();
@@ -565,21 +562,6 @@ impl TabPanel {
                .h(px(30.))
                .py_2()
                .px_3()
-                .when(left_dock_button.is_some(), |this| this.pl_2())
-                .when(right_dock_button.is_some(), |this| this.pr_2())
-                .when(
-                    left_dock_button.is_some() || bottom_dock_button.is_some(),
-                    |this| {
-                        this.child(
-                            h_flex()
-                                .flex_shrink_0()
-                                .mr_1()
-                                .gap_1()
-                                .children(left_dock_button)
-                                .children(bottom_dock_button),
-                        )
-                    },
-                )
                .child(
                    div()
                        .id("tab")
@@ -612,8 +594,7 @@ impl TabPanel {
                        .flex_shrink_0()
                        .ml_1()
                        .gap_1()
-                        .child(self.render_toolbar(state, window, cx))
-                        .children(right_dock_button),
+                        .child(self.render_toolbar(state, window, cx)),
                )
                .into_any_element();
        }
@@ -622,22 +603,6 @@ impl TabPanel {

        TabBar::new("tab-bar")
            .track_scroll(self.tab_bar_scroll_handle.clone())
-            .when(
-                left_dock_button.is_some() || bottom_dock_button.is_some(),
-                |this| {
-                    this.prefix(
-                        h_flex()
-                            .items_center()
-                            .top_0()
-                            // Right -1 for avoid border overlap with the first tab
-                            .right(-px(1.))
-                            .h_full()
-                            .px_2()
-                            .children(left_dock_button)
-                            .children(bottom_dock_button),
-                    )
-                },
-            )
            .children(self.panels.iter().enumerate().filter_map(|(ix, panel)| {
                let mut active = state.active_panel.as_ref() == Some(panel);
                let disabled = self.is_collapsed;
@@ -723,8 +688,7 @@ impl TabPanel {
                    .h_full()
                    .px_2()
                    .gap_1()
-                    .child(self.render_toolbar(state, window, cx))
-                    .when_some(right_dock_button, |this, btn| this.child(btn)),
+                    .child(self.render_toolbar(state, window, cx)),
            )
            .into_any_element()
    }
@@ -986,7 +950,7 @@ impl TabPanel {
                });
            }

-            cx.spawn_in(window, |_, mut cx| async move {
+            cx.spawn_in(window, async move |_, cx| {
                cx.update(|window, cx| {
                    tab_panel.update(cx, |view, cx| view.remove_self_if_empty(window, cx))
                })
@@ -1021,9 +985,9 @@ impl TabPanel {

        self.is_zoomed = !self.is_zoomed;

-        cx.spawn(|view, cx| {
+        cx.spawn({
            let is_zoomed = self.is_zoomed;
-            async move {
+            async move |view, cx| {
                _ = cx.update(|cx| {
                    _ = view.update(cx, |view, cx| {
                        view.set_zoomed(is_zoomed, cx);
--- a/crates/ui/src/dropdown.rs
+++ b/crates/ui/src/dropdown.rs
@@ -661,9 +661,9 @@ where
                                    Some(icon) => icon,
                                    None => {
                                        if self.open {
-                                            IconName::ChevronUp
+                                            IconName::CaretUp
                                        } else {
-                                            IconName::ChevronDown
+                                            IconName::CaretDown
                                        }
                                    }
                                };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
reya	44f0650617	chore: update gpui	2025-04-28 15:08:47 +07:00
reya	107fedeafd	feat: Emoji Picker (#18 ) * wip: emoji picker * update	2025-04-26 08:39:52 +07:00
reya	17251be3fd	chore: improve ui responsiveness when send message	2025-04-23 09:05:50 +07:00
reya	73b2eac080	feat: add image cache	2025-04-23 08:16:26 +07:00
reya	86eca5803f	feat: add support for subject of conversation	2025-04-22 15:10:36 +07:00
reya	52a79dca08	chore: bump version	2025-04-21 15:19:01 +07:00
reya	87f038248c	chore: refactor account and fixes	2025-04-21 15:18:02 +07:00
reya	a30f2dcc8a	refactor ui (#17 ) * wip: redesign sidebar * wip: adjust dpi * update * update * refactor modal * fix modal	2025-04-18 13:43:07 +07:00
reya	5c5748a80c	chore: restructure	2025-04-13 08:03:22 +07:00
reya	b667dd3f1c	feat: Nostr Auto Updater (#16 ) * clean up * fix version * add auto updater * add windows	2025-04-12 12:33:30 +07:00
reya	3246abace1	refactor chats (#15 ) * refactor * update * update * update * remove nostrprofile struct * update * refactor contacts * prevent double login	2025-04-10 08:10:53 +07:00
reya	f7610cc9c9	feat: Chat Folders (#14 ) * add room kinds * add folders * adjust design * update * refactor * cache * update	2025-04-06 15:29:36 +07:00
reya	16530a3804	chore: only subscribe for metadata in specific relays	2025-03-28 18:53:43 +07:00
reya	b778bb13e4	chore: clean up	2025-03-28 17:34:42 +07:00
reya	cfc2300c0c	feat: Rich Text Rendering (#13 ) * add text * fix avatar is not show * refactor chats * improve rich text * add benchmark for text * update	2025-03-28 09:49:07 +07:00
reya	42d6328d82	chore: update gpui	2025-03-25 20:53:22 +07:00
reya	4c9533bfe4	chore: fix high cpu	2025-03-25 15:04:41 +07:00
reya	00cf7792e5	feat: Out-of-Box Experience (#12 ) * refactor app view * feat: onboarding * add back buttons in onboarding	2025-03-25 12:34:39 +07:00
reya	e15cbcc22c	chore: update deps	2025-03-19 08:30:19 +07:00
reya	348dc496a6	chore: bump version	2025-03-13 13:50:16 +07:00
reya	09df38a3b2	chore: fix build on linux	2025-03-13 13:22:31 +07:00
reya	cae96157ca	chore: release 0.1.4	2025-03-13 13:02:58 +07:00
reya	0a7f0475a4	chore: small fixes	2025-03-12 16:44:44 +07:00
reya	8156d9d046	chore: small fixes	2025-03-11 13:22:44 +07:00
reya	b92d446184	chore: follow up to `73b8a1a`	2025-03-10 14:56:18 +07:00
reya	73b8a1a6da	chore: some fixes for nip4e	2025-03-10 13:25:58 +07:00
reya	ba0b377cee	chore: update nstart url	2025-03-10 09:40:14 +07:00
reya	0822b46596	feat: follow-up to `d93cecb`	2025-03-10 08:34:41 +07:00
reya	d93cecbea3	chore: refactor NIP-4E implementation	2025-03-09 18:31:29 +07:00
reya	0887970374	chore: update deps	2025-03-08 19:32:07 +07:00
reya	a53b2181ab	feat: Implemented NIP-4e (#11 ) * chore: refactor account registry * wip: nip4e * chore: rename account to device * feat: nip44 encryption with master signer * update * refactor * feat: unwrap with device keys * chore: improve handler * chore: fix rustls * chore: refactor onboarding * chore: fix compose * chore: fix send message * chore: fix forgot to request device * fix send message * chore: fix deadlock * chore: small fixes * chore: improve * fix * refactor * refactor * refactor * fix * add fetch request * save keys * fix * update * update * update	2025-03-08 19:29:25 +07:00
reya	81664e3d4e	feat: add empty and loading states for the inbox section	2025-02-26 08:01:45 +07:00
reya	29ec6da872	chore: fix the issue when new user cannot see their messages	2025-02-25 18:21:10 +07:00
reya	111ab3b082	chore: internal changes	2025-02-25 15:22:24 +07:00
reya	1c4806bd92	chore: refactor chat room	2025-02-24 16:18:21 +07:00
reya	3f8c02aef8	chore: bump version	2025-02-23 14:14:20 +07:00
reya	b73babf274	feat: add new default avatar	2025-02-23 14:13:56 +07:00
reya	bbc778d5ca	feat: sharpen chat experiences (#9 ) * feat: add global account and refactor chat registry * chore: improve last seen * chore: reduce string alloc * wip: refactor room * chore: fix edit profile panel * chore: refactor open window in main * chore: refactor sidebar * chore: refactor room	2025-02-23 08:29:05 +07:00
reya	cfa628a8a6	feat: automatically load inbox on startup	2025-02-19 15:35:14 +07:00
				`@@ -0,0 +1 @@`
				`<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>`
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M64.12,147.8a4,4,0,0,1-4,4.2H16a8,8,0,0,1-7.8-6.17,8.35,8.35,0,0,1,1.62-6.93A67.79,67.79,0,0,1,37,117.51a40,40,0,1,1,66.46-35.8,3.94,3.94,0,0,1-2.27,4.18A64.08,64.08,0,0,0,64,144C64,145.28,64,146.54,64.12,147.8Zm182-8.91A67.76,67.76,0,0,0,219,117.51a40,40,0,1,0-66.46-35.8,3.94,3.94,0,0,0,2.27,4.18A64.08,64.08,0,0,1,192,144c0,1.28,0,2.54-.12,3.8a4,4,0,0,0,4,4.2H240a8,8,0,0,0,7.8-6.17A8.33,8.33,0,0,0,246.17,138.89Zm-89,43.18a48,48,0,1,0-58.37,0A72.13,72.13,0,0,0,65.07,212,8,8,0,0,0,72,224H184a8,8,0,0,0,6.93-12A72.15,72.15,0,0,0,157.19,182.07Z"></path></svg>