chore: bump version

* avoid string allocation

* cache image

* .

* .

* .

* fix

Cargo.lock

@@ -87,9 +87,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arbitrary"
@@ -190,7 +190,7 @@ dependencies = [
 
 [[package]]
 name = "assets"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "gpui",
@@ -428,7 +428,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "auto_update"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "cargo-packager-updater",
@@ -510,12 +510,9 @@ dependencies = [
 
 [[package]]
 name = "base62"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0104d4d8d15e458f21dcd027ea350bf38e4364954909402f4da075aca8d0f136"
+checksum = "1adf9755786e27479693dedd3271691a92b5e242ab139cacb9fb8e7fb5381111"
-dependencies = [
- "rustversion",
-]
 
 [[package]]
 name = "base64"
@@ -912,9 +909,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.37"
+version = "1.2.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44"
+checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1029,7 +1026,7 @@ dependencies = [
 
 [[package]]
 name = "client_keys"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "global",
@@ -1131,7 +1128,7 @@ dependencies = [
 [[package]]
 name = "collections"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "indexmap",
  "rustc-hash 2.1.1",
@@ -1166,7 +1163,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1239,7 +1236,7 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "coop"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "assets",
@@ -1572,7 +1569,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1739,14 +1736,14 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "embed-resource"
-version = "3.0.5"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6d81016d6c977deefb2ef8d8290da019e27cc26167e102185da528e6c0ab38"
+checksum = "55a075fc573c64510038d7ee9abc7990635863992f83ebc52c8b433b8411a02e"
 dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 0.9.5",
+ "toml 0.9.7",
  "vswhom",
  "winreg",
 ]
@@ -1976,9 +1973,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
 
 [[package]]
 name = "flatbuffers"
@@ -2378,7 +2375,7 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.5+wasi-0.2.4",
+ "wasi 0.14.7+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
@@ -2406,7 +2403,7 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "global"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "dirs 5.0.1",
@@ -2499,7 +2496,7 @@ dependencies = [
 [[package]]
 name = "gpui"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "anyhow",
  "as-raw-xcb-connection",
@@ -2571,6 +2568,7 @@ dependencies = [
  "thiserror 2.0.16",
  "usvg",
  "util",
+ "util_macros",
  "uuid",
  "waker-fn",
  "wayland-backend",
@@ -2592,7 +2590,7 @@ dependencies = [
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2604,7 +2602,7 @@ dependencies = [
 [[package]]
 name = "gpui_tokio"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "anyhow",
  "gpui",
@@ -2673,6 +2671,12 @@ dependencies = [
  "foldhash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2818,7 +2822,7 @@ dependencies = [
 [[package]]
 name = "http_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2838,7 +2842,7 @@ dependencies = [
 [[package]]
 name = "http_client_tls"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "rustls",
  "rustls-platform-verifier",
@@ -2915,9 +2919,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
  "base64",
  "bytes",
@@ -2941,7 +2945,7 @@ dependencies = [
 
 [[package]]
 name = "i18n"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "rust-i18n",
 ]
@@ -3141,13 +3145,14 @@ checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
 [[package]]
 name = "indexmap"
-version = "2.11.1"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -3335,9 +3340,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.78"
+version = "0.3.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
+checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -3412,12 +3417,12 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.3",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -3561,9 +3566,9 @@ dependencies = [
 
 [[package]]
 name = "lyon_geom"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce9333c02ea4517fd31207f126124352ad59975218c114c55dbb8f9d56fd4b45"
+checksum = "4e16770d760c7848b0c1c2d209101e408207a65168109509f8483837a36cf2e7"
 dependencies = [
  "arrayvec",
  "euclid",
@@ -3629,7 +3634,7 @@ dependencies = [
 [[package]]
 name = "media"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "anyhow",
  "bindgen 0.71.1",
@@ -3867,9 +3872,9 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
 [[package]]
 name = "normpath"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c178369371fd7db523726931e50d430b560e3059665abc537ba3277e9274c9c4"
+checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b"
 dependencies = [
  "windows-sys 0.61.0",
 ]
@@ -3877,7 +3882,7 @@ dependencies = [
 [[package]]
 name = "nostr"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#b1016f439ef1da5f8fdeae14368f5b7340414389"
+source = "git+https://github.com/rust-nostr/nostr#418e34bcab62869c80cd86bf7c6ace1b9960b09d"
 dependencies = [
  "aes",
  "base64",
@@ -3901,7 +3906,7 @@ dependencies = [
 [[package]]
 name = "nostr-connect"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#b1016f439ef1da5f8fdeae14368f5b7340414389"
+source = "git+https://github.com/rust-nostr/nostr#418e34bcab62869c80cd86bf7c6ace1b9960b09d"
 dependencies = [
  "async-utility",
  "nostr",
@@ -3913,7 +3918,7 @@ dependencies = [
 [[package]]
 name = "nostr-database"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#b1016f439ef1da5f8fdeae14368f5b7340414389"
+source = "git+https://github.com/rust-nostr/nostr#418e34bcab62869c80cd86bf7c6ace1b9960b09d"
 dependencies = [
  "flatbuffers",
  "lru",
@@ -3924,7 +3929,7 @@ dependencies = [
 [[package]]
 name = "nostr-lmdb"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#b1016f439ef1da5f8fdeae14368f5b7340414389"
+source = "git+https://github.com/rust-nostr/nostr#418e34bcab62869c80cd86bf7c6ace1b9960b09d"
 dependencies = [
  "async-utility",
  "flume",
@@ -3938,7 +3943,7 @@ dependencies = [
 [[package]]
 name = "nostr-relay-pool"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#b1016f439ef1da5f8fdeae14368f5b7340414389"
+source = "git+https://github.com/rust-nostr/nostr#418e34bcab62869c80cd86bf7c6ace1b9960b09d"
 dependencies = [
  "async-utility",
  "async-wsocket",
@@ -3955,7 +3960,7 @@ dependencies = [
 [[package]]
 name = "nostr-sdk"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#b1016f439ef1da5f8fdeae14368f5b7340414389"
+source = "git+https://github.com/rust-nostr/nostr#418e34bcab62869c80cd86bf7c6ace1b9960b09d"
 dependencies = [
  "async-utility",
  "nostr",
@@ -4469,6 +4474,17 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
+[[package]]
+name = "perf"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
+dependencies = [
+ "collections",
+ "serde",
+ "serde_json",
+ "workspace-hack",
+]
+
 [[package]]
 name = "phf"
 version = "0.11.3"
@@ -4676,11 +4692,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.23.6",
 ]
 
 [[package]]
@@ -4744,9 +4760,9 @@ dependencies = [
 
 [[package]]
 name = "pxfm"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55f4fedc84ed39cb7a489322318976425e42a147e2be79d8f878e2884f94e84"
+checksum = "83f9b339b02259ada5c0f4a389b7fb472f933aa17ce176fd2ad98f28bb401fde"
 dependencies = [
  "num-traits",
 ]
@@ -5069,7 +5085,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "derive_refineable",
  "workspace-hack",
@@ -5106,7 +5122,7 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "registry"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "common",
@@ -5223,7 +5239,7 @@ dependencies = [
 [[package]]
 name = "reqwest_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5435,9 +5451,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.31"
+version = "0.23.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -5458,7 +5474,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.4.0",
+ "security-framework 3.5.0",
 ]
 
 [[package]]
@@ -5495,7 +5511,7 @@ dependencies = [
  "rustls-native-certs",
  "rustls-platform-verifier-android",
  "rustls-webpki",
- "security-framework 3.4.0",
+ "security-framework 3.5.0",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
  "windows-sys 0.59.0",
@@ -5509,9 +5525,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.5"
+version = "0.103.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a37813727b78798e53c2bec3f5e8fe12a6d6f8389bf9ca7802add4c9905ad8"
+checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -5728,9 +5744,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640"
+checksum = "cc198e42d9b7510827939c9a15f5062a0c913f3371d765977e586d2fe6c16f4a"
 dependencies = [
  "bitflags 2.9.4",
  "core-foundation 0.10.1",
@@ -5758,7 +5774,7 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
 [[package]]
 name = "semantic_version"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "anyhow",
  "serde",
@@ -5773,9 +5789,9 @@ checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 
 [[package]]
 name = "serde"
-version = "1.0.223"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a505d71960adde88e293da5cb5eda57093379f64e61cf77bf0e6a63af07a7bac"
+checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
 dependencies = [
  "serde_core",
  "serde_derive",
@@ -5783,18 +5799,18 @@ dependencies = [
 
 [[package]]
 name = "serde_core"
-version = "1.0.223"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20f57cbd357666aa7b3ac84a90b4ea328f1d4ddb6772b430caa5d9e1309bb9e9"
+checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.223"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d428d07faf17e306e699ec1e91996e5a165ba5d6bce5b5155173e91a8a01a56"
+checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5870,11 +5886,11 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -5904,7 +5920,7 @@ dependencies = [
 
 [[package]]
 name = "settings"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "global",
@@ -5971,7 +5987,7 @@ dependencies = [
 
 [[package]]
 name = "signer_proxy"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "atomic-destructor",
@@ -6210,7 +6226,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "arrayvec",
  "log",
@@ -6513,7 +6529,7 @@ dependencies = [
 
 [[package]]
 name = "theme"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "gpui",
@@ -6585,11 +6601,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.43"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
+ "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -6675,7 +6692,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "title_bar"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "common",
@@ -6733,9 +6750,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd"
 dependencies = [
  "rustls",
  "tokio",
@@ -6791,19 +6808,19 @@ dependencies = [
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
- "toml_edit",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
 name = "toml"
-version = "0.9.5"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0"
 dependencies = [
  "indexmap",
- "serde",
+ "serde_core",
- "serde_spanned 1.0.0",
+ "serde_spanned 1.0.2",
- "toml_datetime 0.7.0",
+ "toml_datetime 0.7.2",
  "toml_parser",
  "toml_writer",
  "winnow",
@@ -6820,11 +6837,11 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -6842,10 +6859,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "toml_parser"
+name = "toml_edit"
-version = "1.0.2"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+checksum = "f3effe7c0e86fdff4f69cdd2ccc1b96f933e24811c5441d44904e8683e27184b"
+dependencies = [
+ "indexmap",
+ "toml_datetime 0.7.2",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627"
 dependencies = [
  "winnow",
 ]
@@ -6858,9 +6887,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "toml_writer"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109"
 
 [[package]]
 name = "tower"
@@ -7046,7 +7075,7 @@ dependencies = [
 
 [[package]]
 name = "ui"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "common",
@@ -7240,7 +7269,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 [[package]]
 name = "util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
 dependencies = [
  "anyhow",
  "async-fs",
@@ -7272,6 +7301,17 @@ dependencies = [
  "workspace-hack",
 ]
 
+[[package]]
+name = "util_macros"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#681a4adc42df0c93b95fd1a36a3ad47eaca086c0"
+dependencies = [
+ "perf",
+ "quote",
+ "syn 2.0.106",
+ "workspace-hack",
+]
+
 [[package]]
 name = "uuid"
 version = "1.18.1"
@@ -7409,18 +7449,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.14.5+wasi-0.2.4"
+version = "0.14.7+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
 dependencies = [
  "wasip2",
 ]
 
 [[package]]
 name = "wasip2"
-version = "1.0.0+wasi-0.2.4"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
  "wit-bindgen",
 ]
@@ -7433,9 +7473,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.101"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
+checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7446,9 +7486,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.101"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
+checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c"
 dependencies = [
  "bumpalo",
  "log",
@@ -7460,9 +7500,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.51"
+version = "0.4.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe"
+checksum = "a0b221ff421256839509adbb55998214a70d829d3a28c69b4a6672e9d2a42f67"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -7473,9 +7513,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.101"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
+checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7483,9 +7523,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.101"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
+checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7496,9 +7536,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.101"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
+checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf"
 dependencies = [
  "unicode-ident",
 ]
@@ -7603,9 +7643,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.78"
+version = "0.3.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12"
+checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8293,9 +8333,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.45.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "workspace-hack"
@@ -8351,9 +8391,9 @@ checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
 
 [[package]]
 name = "xattr"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 dependencies = [
  "libc",
  "rustix 1.1.2",

Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*"]
 default-members = ["crates/coop"]
 
 [workspace.package]
-version = "0.2.8"
+version = "0.2.9"
 edition = "2021"
 publish = false
 
@@ -58,3 +58,7 @@ opt-level = "z"
 lto = true
 codegen-units = 1
 panic = "abort"
+
+[profile.profiling]
+inherits = "release"
+debug = true

crates/client_keys/src/lib.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::Ordering;
 
+use global::app_state;
 use global::constants::KEYRING_URL;
-use global::css;
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Window};
 use nostr_sdk::prelude::*;
 use smallvec::{smallvec, SmallVec};
@@ -61,7 +61,7 @@ impl ClientKeys {
             return;
         }
 
-        let css = css();
+        let app_state = app_state();
         let read_client_keys = cx.read_credentials(KEYRING_URL);
 
         cx.spawn_in(window, async move |this, cx| {
@@ -76,7 +76,7 @@ impl ClientKeys {
                     this.set_keys(Some(keys), false, true, cx);
                 })
                 .ok();
-            } else if css.is_first_run.load(Ordering::Acquire) {
+            } else if app_state.is_first_run.load(Ordering::Acquire) {
                 // If this is the first run, generate new keys and use them for the client keys
                 this.update(cx, |this, cx| {
                     this.new_keys(cx);

crates/common/src/display.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, Error};
 use chrono::{Local, TimeZone};
 use global::constants::IMAGE_RESIZE_SERVICE;
-use gpui::{Image, ImageFormat};
+use gpui::{Image, ImageFormat, SharedString, SharedUri};
 use nostr_sdk::prelude::*;
 use qrcode::render::svg;
 use qrcode::QrCode;
@@ -15,87 +15,92 @@ const HOURS_IN_DAY: i64 = 24;
 const DAYS_IN_MONTH: i64 = 30;
 const FALLBACK_IMG: &str = "https://image.nostr.build/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png";
 
-pub trait ReadableProfile {
+pub trait RenderedProfile {
-    fn avatar_url(&self, proxy: bool) -> String;
+    fn avatar(&self, proxy: bool) -> SharedUri;
-    fn display_name(&self) -> String;
+    fn display_name(&self) -> SharedString;
 }
 
-impl ReadableProfile for Profile {
+impl RenderedProfile for Profile {
-    fn avatar_url(&self, proxy: bool) -> String {
+    fn avatar(&self, proxy: bool) -> SharedUri {
         self.metadata()
             .picture
             .as_ref()
             .filter(|picture| !picture.is_empty())
             .map(|picture| {
                 if proxy {
-                    format!(
+                    let url = format!(
                         "{IMAGE_RESIZE_SERVICE}/?url={picture}&w=100&h=100&fit=cover&mask=circle&default={FALLBACK_IMG}&n=-1"
-                    )
+                    );
+
+                    SharedUri::from(url)
                 } else {
-                    picture.into()
+                    SharedUri::from(picture)
                 }
             })
-            .unwrap_or_else(|| "brand/avatar.png".into())
+            .unwrap_or_else(|| SharedUri::from("brand/avatar.png"))
     }
 
-    fn display_name(&self) -> String {
+    fn display_name(&self) -> SharedString {
         if let Some(display_name) = self.metadata().display_name.as_ref() {
             if !display_name.is_empty() {
-                return display_name.into();
+                return SharedString::from(display_name);
             }
         }
 
         if let Some(name) = self.metadata().name.as_ref() {
             if !name.is_empty() {
-                return name.into();
+                return SharedString::from(name);
             }
         }
 
-        shorten_pubkey(self.public_key(), 4)
+        SharedString::from(shorten_pubkey(self.public_key(), 4))
     }
 }
 
-pub trait ReadableTimestamp {
+pub trait RenderedTimestamp {
-    fn to_human_time(&self) -> String;
+    fn to_human_time(&self) -> SharedString;
-    fn to_ago(&self) -> String;
+    fn to_ago(&self) -> SharedString;
 }
 
-impl ReadableTimestamp for Timestamp {
+impl RenderedTimestamp for Timestamp {
-    fn to_human_time(&self) -> String {
+    fn to_human_time(&self) -> SharedString {
         let input_time = match Local.timestamp_opt(self.as_u64() as i64, 0) {
             chrono::LocalResult::Single(time) => time,
-            _ => return "9999".into(),
+            _ => return SharedString::from("9999"),
         };
 
         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 == now_date => SharedString::from(format!("Today at {time_format}")),
-            date if date == yesterday_date => format!("Yesterday at {time_format}"),
+            date if date == yesterday_date => {
-            _ => format!("{}, {time_format}", input_time.format("%d/%m/%y")),
+                SharedString::from(format!("Yesterday at {time_format}"))
+            }
+            _ => SharedString::from(format!("{}, {time_format}", input_time.format("%d/%m/%y"))),
         }
     }
 
-    fn to_ago(&self) -> String {
+    fn to_ago(&self) -> SharedString {
         let input_time = match Local.timestamp_opt(self.as_u64() as i64, 0) {
             chrono::LocalResult::Single(time) => time,
-            _ => return "1m".into(),
+            _ => return SharedString::from("1m"),
         };
 
         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_seconds() < SECONDS_IN_MINUTE => SharedString::from(NOW),
-            d if d.num_minutes() < MINUTES_IN_HOUR => format!("{}m", d.num_minutes()),
+            d if d.num_minutes() < MINUTES_IN_HOUR => {
-            d if d.num_hours() < HOURS_IN_DAY => format!("{}h", d.num_hours()),
+                SharedString::from(format!("{}m", d.num_minutes()))
-            d if d.num_days() < DAYS_IN_MONTH => format!("{}d", d.num_days()),
+            }
-            _ => input_time.format("%b %d").to_string(),
+            d if d.num_hours() < HOURS_IN_DAY => SharedString::from(format!("{}h", d.num_hours())),
+            d if d.num_days() < DAYS_IN_MONTH => SharedString::from(format!("{}d", d.num_days())),
+            _ => SharedString::from(input_time.format("%b %d").to_string()),
         }
     }
 }

crates/common/src/event.rs

@@ -45,3 +45,39 @@ impl EventUtils for Event {
         a == b
     }
 }
+
+impl EventUtils for UnsignedEvent {
+    fn uniq_id(&self) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        let mut pubkeys: Vec<PublicKey> = vec![];
+
+        // Add all public keys from event
+        pubkeys.push(self.pubkey);
+        pubkeys.extend(self.tags.public_keys().collect::<Vec<_>>());
+
+        // Generate unique hash
+        pubkeys
+            .into_iter()
+            .unique()
+            .sorted()
+            .collect::<Vec<_>>()
+            .hash(&mut hasher);
+
+        hasher.finish()
+    }
+
+    fn all_pubkeys(&self) -> Vec<PublicKey> {
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
+        public_keys.push(self.pubkey);
+
+        public_keys
+    }
+
+    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool {
+        let pubkeys = self.all_pubkeys();
+        let a: HashSet<_> = pubkeys.iter().collect();
+        let b: HashSet<_> = other.iter().collect();
+
+        a == b
+    }
+}

crates/common/src/handle_auth.rs

@@ -1,14 +0,0 @@
-use nostr_connect::prelude::*;
-
-#[derive(Debug, Clone)]
-pub struct CoopAuthUrlHandler;
-
-impl AuthUrlHandler for CoopAuthUrlHandler {
-    fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
-        Box::pin(async move {
-            log::info!("Received Auth URL: {auth_url}");
-            webbrowser::open(auth_url.as_str())?;
-            Ok(())
-        })
-    }
-}

crates/common/src/lib.rs

@@ -1,6 +1,5 @@
 pub mod debounced_delay;
 pub mod display;
 pub mod event;
-pub mod handle_auth;
 pub mod nip05;
 pub mod nip96;

crates/coop/Cargo.toml

@@ -14,7 +14,7 @@ product-name = "Coop"
 description = "Chat Freely, Stay Private on Nostr"
 identifier = "su.reya.coop"
 category = "SocialNetworking"
-version = "0.2.8"
+version = "0.2.9"
 out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]
@@ -62,5 +62,5 @@ oneshot.workspace = true
 flume.workspace = true
 webbrowser.workspace = true
 
-tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
 indexset = "0.12.3"
+tracing-subscriber = { version = "0.3.18", features = ["fmt"] }

crates/coop/src/actions.rs

@@ -1,10 +1,24 @@
 use std::sync::Mutex;
 
 use gpui::{actions, App};
+use nostr_connect::prelude::*;
 
 actions!(coop, [ReloadMetadata, DarkMode, Settings, Logout, Quit]);
 actions!(sidebar, [Reload, RelayStatus]);
 
+#[derive(Debug, Clone)]
+pub struct CoopAuthUrlHandler;
+
+impl AuthUrlHandler for CoopAuthUrlHandler {
+    fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
+        Box::pin(async move {
+            log::info!("Received Auth URL: {auth_url}");
+            webbrowser::open(auth_url.as_str())?;
+            Ok(())
+        })
+    }
+}
+
 pub fn load_embedded_fonts(cx: &App) {
     let asset_source = cx.asset_source();
     let font_paths = asset_source.list("fonts").unwrap();

crates/coop/src/chatspace.rs

@@ -7,18 +7,18 @@ use std::time::Duration;
 use anyhow::{anyhow, Error};
 use auto_update::AutoUpdater;
 use client_keys::ClientKeys;
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use common::event::EventUtils;
 use global::constants::{
     ACCOUNT_IDENTIFIER, BOOTSTRAP_RELAYS, DEFAULT_SIDEBAR_WIDTH, METADATA_BATCH_LIMIT,
     METADATA_BATCH_TIMEOUT, SEARCH_RELAYS,
 };
-use global::{css, nostr_client, AuthRequest, Notice, SignalKind, UnwrappingStatus};
+use global::{app_state, nostr_client, AuthRequest, Notice, SignalKind, UnwrappingStatus};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, px, rems, App, AppContext, AsyncWindowContext, Axis, Context, Entity, InteractiveElement,
+    deferred, div, px, rems, App, AppContext, AsyncWindowContext, Axis, Context, Entity,
-    IntoElement, ParentElement, Render, SharedString, StatefulInteractiveElement, Styled,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString,
-    Subscription, Task, WeakEntity, Window,
+    StatefulInteractiveElement, Styled, Subscription, Task, WeakEntity, Window,
 };
 use i18n::{shared_t, t};
 use itertools::Itertools;
@@ -70,13 +70,13 @@ pub struct ChatSpace {
     dock: Entity<DockArea>,
 
     // All authentication requests
-    auth_requests: HashMap<RelayUrl, AuthRequest>,
+    auth_requests: Entity<HashMap<RelayUrl, AuthRequest>>,
 
     // Local state to determine if the user has set up NIP-17 relays
     nip17_relays: bool,
 
     // All subscriptions for observing the app state
-    _subscriptions: SmallVec<[Subscription; 3]>,
+    _subscriptions: SmallVec<[Subscription; 4]>,
 
     // All long running tasks
     _tasks: SmallVec<[Task<()>; 5]>,
@@ -90,10 +90,18 @@ impl ChatSpace {
 
         let title_bar = cx.new(|_| TitleBar::new());
         let dock = cx.new(|cx| DockArea::new(window, cx));
+        let auth_requests = cx.new(|_| HashMap::new());
 
         let mut subscriptions = smallvec![];
         let mut tasks = smallvec![];
 
+        subscriptions.push(
+            // Automatically sync theme with system appearance
+            window.observe_window_appearance(|window, cx| {
+                Theme::sync_system_appearance(Some(window), cx);
+            }),
+        );
+
         subscriptions.push(
             // Observe the client keys and show an alert modal if they fail to initialize
             cx.observe_in(&client_keys, window, |this, keys, window, cx| {
@@ -183,7 +191,7 @@ impl ChatSpace {
         Self {
             dock,
             title_bar,
-            auth_requests: HashMap::new(),
+            auth_requests,
             nip17_relays: true,
             _subscriptions: subscriptions,
             _tasks: tasks,
@@ -213,7 +221,7 @@ impl ChatSpace {
 
     async fn observe_signer() {
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
         let stream_timeout = Duration::from_secs(5);
         let loop_duration = Duration::from_secs(1);
 
@@ -229,7 +237,10 @@ impl ChatSpace {
             };
 
             // Notify the app that the signer has been set.
-            css.signal.send(SignalKind::SignerSet(public_key)).await;
+            app_state
+                .signal
+                .send(SignalKind::SignerSet(public_key))
+                .await;
 
             // Subscribe to the NIP-65 relays for the public key.
             let filter = Filter::new()
@@ -248,12 +259,12 @@ impl ChatSpace {
                         nip65_found = true;
                     } else {
                         // Timeout
-                        css.signal.send(SignalKind::RelaysNotFound).await;
+                        app_state.signal.send(SignalKind::RelaysNotFound).await;
                     }
                 }
                 Err(e) => {
                     log::error!("Error fetching NIP-65 Relay: {e:?}");
-                    css.signal.send(SignalKind::RelaysNotFound).await;
+                    app_state.signal.send(SignalKind::RelaysNotFound).await;
                 }
             };
 
@@ -270,12 +281,12 @@ impl ChatSpace {
                             break;
                         } else {
                             // Timeout
-                            css.signal.send(SignalKind::RelaysNotFound).await;
+                            app_state.signal.send(SignalKind::RelaysNotFound).await;
                         }
                     }
                     Err(e) => {
                         log::error!("Error fetching NIP-17 Relay: {e:?}");
-                        css.signal.send(SignalKind::RelaysNotFound).await;
+                        app_state.signal.send(SignalKind::RelaysNotFound).await;
                     }
                 };
             }
@@ -286,7 +297,7 @@ impl ChatSpace {
 
     async fn observe_giftwrap() {
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
         let loop_duration = Duration::from_secs(20);
         let mut is_start_processing = false;
         let mut total_loops = 0;
@@ -295,11 +306,11 @@ impl ChatSpace {
             if client.has_signer().await {
                 total_loops += 1;
 
-                if css.gift_wrap_processing.load(Ordering::Acquire) {
+                if app_state.gift_wrap_processing.load(Ordering::Acquire) {
                     is_start_processing = true;
 
                     // Reset gift wrap processing flag
-                    let _ = css.gift_wrap_processing.compare_exchange(
+                    let _ = app_state.gift_wrap_processing.compare_exchange(
                         true,
                         false,
                         Ordering::Release,
@@ -307,13 +318,13 @@ impl ChatSpace {
                     );
 
                     let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Processing);
-                    css.signal.send(signal).await;
+                    app_state.signal.send(signal).await;
                 } else {
                     // Only run further if we are already processing
                     // Wait until after 2 loops to prevent exiting early while events are still being processed
                     if is_start_processing && total_loops >= 2 {
                         let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Complete);
-                        css.signal.send(signal).await;
+                        app_state.signal.send(signal).await;
 
                         // Reset the counter
                         is_start_processing = false;
@@ -327,7 +338,7 @@ impl ChatSpace {
     }
 
     async fn process_batching_metadata() {
-        let css = css();
+        let app_state = app_state();
         let timeout = Duration::from_millis(METADATA_BATCH_TIMEOUT);
         let mut processed_pubkeys: HashSet<PublicKey> = HashSet::new();
         let mut batch: HashSet<PublicKey> = HashSet::new();
@@ -342,7 +353,7 @@ impl ChatSpace {
         loop {
             let futs = smol::future::or(
                 async move {
-                    if let Ok(public_key) = css.ingester.receiver().recv_async().await {
+                    if let Ok(public_key) = app_state.ingester.receiver().recv_async().await {
                         BatchEvent::PublicKey(public_key)
                     } else {
                         BatchEvent::Closed
@@ -379,7 +390,7 @@ impl ChatSpace {
 
     async fn process_nostr_events() -> Result<(), Error> {
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
 
         let mut processed_events: HashSet<EventId> = HashSet::new();
         let mut challenges: HashSet<Cow<'_, str>> = HashSet::new();
@@ -393,7 +404,8 @@ impl ChatSpace {
             match message {
                 RelayMessage::Event { event, .. } => {
                     // Keep track of which relays have seen this event
-                    css.seen_on_relays
+                    app_state
+                        .seen_on_relays
                         .write()
                         .await
                         .entry(event.id)
@@ -423,18 +435,18 @@ impl ChatSpace {
                                     for relay in relays.clone().into_iter() {
                                         if client.add_relay(relay).await.is_err() {
                                             let notice = Notice::RelayFailed(relay.clone());
-                                            css.signal.send(SignalKind::Notice(notice)).await;
+                                            app_state.signal.send(SignalKind::Notice(notice)).await;
                                         }
                                         if client.connect_relay(relay).await.is_err() {
                                             let notice = Notice::RelayFailed(relay.clone());
-                                            css.signal.send(SignalKind::Notice(notice)).await;
+                                            app_state.signal.send(SignalKind::Notice(notice)).await;
                                         }
                                     }
 
                                     // Subscribe to gift wrap events only in the current user's NIP-17 relays
                                     Self::fetch_gift_wrap(relays, event.pubkey).await;
                                 } else {
-                                    css.signal.send(SignalKind::RelaysNotFound).await;
+                                    app_state.signal.send(SignalKind::RelaysNotFound).await;
                                 }
                             }
                         }
@@ -447,7 +459,11 @@ impl ChatSpace {
                                     Filter::new().limit(limit).authors(public_keys).kinds(kinds);
 
                                 client
-                                    .subscribe_to(BOOTSTRAP_RELAYS, filter, css.auto_close_opts)
+                                    .subscribe_to(
+                                        BOOTSTRAP_RELAYS,
+                                        filter,
+                                        app_state.auto_close_opts,
+                                    )
                                     .await
                                     .ok();
                             }
@@ -456,7 +472,7 @@ impl ChatSpace {
                             let metadata = Metadata::from_json(&event.content).unwrap_or_default();
                             let profile = Profile::new(event.pubkey, metadata);
 
-                            css.signal.send(SignalKind::NewProfile(profile)).await;
+                            app_state.signal.send(SignalKind::NewProfile(profile)).await;
                         }
                         Kind::GiftWrap => {
                             Self::unwrap_gift_wrap(&event).await;
@@ -465,28 +481,32 @@ impl ChatSpace {
                     }
                 }
                 RelayMessage::EndOfStoredEvents(subscription_id) => {
-                    if *subscription_id == css.gift_wrap_sub_id {
+                    if *subscription_id == app_state.gift_wrap_sub_id {
                         let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Processing);
-                        css.signal.send(signal).await;
+                        app_state.signal.send(signal).await;
                     }
                 }
                 RelayMessage::Auth { challenge } => {
                     if challenges.insert(challenge.clone()) {
                         let req = AuthRequest::new(challenge, relay_url);
                         // Send a signal to the ingester to handle the auth request
-                        css.signal.send(SignalKind::Auth(req)).await;
+                        app_state.signal.send(SignalKind::Auth(req)).await;
                     }
                 }
                 RelayMessage::Ok {
                     event_id, message, ..
                 } => {
                     // Keep track of events sent by Coop
-                    css.sent_ids.write().await.insert(event_id);
+                    app_state.sent_ids.write().await.insert(event_id);
 
                     // Keep track of events that need to be resent
                     match MachineReadablePrefix::parse(&message) {
                         Some(MachineReadablePrefix::AuthRequired) => {
-                            css.resend_queue.write().await.insert(event_id, relay_url);
+                            app_state
+                                .resend_queue
+                                .write()
+                                .await
+                                .insert(event_id, relay_url);
                         }
                         Some(_) => {}
                         None => {}
@@ -500,10 +520,10 @@ impl ChatSpace {
     }
 
     async fn process_nostr_signals(view: WeakEntity<ChatSpace>, cx: &mut AsyncWindowContext) {
-        let css = css();
+        let app_state = app_state();
         let mut is_open_proxy_modal = false;
 
-        while let Ok(signal) = css.signal.receiver().recv_async().await {
+        while let Ok(signal) = app_state.signal.receiver().recv_async().await {
             cx.update(|window, cx| {
                 let registry = Registry::global(cx);
                 let settings = AppSettings::global(cx);
@@ -611,10 +631,10 @@ impl ChatSpace {
     /// Fetches a single event by kind and public key
     pub async fn fetch_single_event(kind: Kind, public_key: PublicKey) {
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
         let filter = Filter::new().kind(kind).author(public_key).limit(1);
 
-        if let Err(e) = client.subscribe(filter, css.auto_close_opts).await {
+        if let Err(e) = client.subscribe(filter, app_state.auto_close_opts).await {
             log::info!("Failed to subscribe: {e}");
         }
     }
@@ -622,11 +642,11 @@ impl ChatSpace {
     /// Fetches gift wrap events for a given public key and relays
     pub async fn fetch_gift_wrap(relays: Vec<&RelayUrl>, public_key: PublicKey) {
         let client = nostr_client();
-        let sub_id = css().gift_wrap_sub_id.clone();
+        let id = app_state().gift_wrap_sub_id.clone();
         let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
 
         if client
-            .subscribe_with_id_to(relays.clone(), sub_id, filter, None)
+            .subscribe_with_id_to(relays.clone(), id, filter, None)
             .await
             .is_ok()
         {
@@ -641,7 +661,7 @@ impl ChatSpace {
         }
 
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
 
         let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
         let limit = public_keys.len() * kinds.len() + 20;
@@ -650,7 +670,7 @@ impl ChatSpace {
         let filter = Filter::new().authors(public_keys).kinds(kinds).limit(limit);
 
         client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, css.auto_close_opts)
+            .subscribe_to(BOOTSTRAP_RELAYS, filter, app_state.auto_close_opts)
             .await
             .ok();
     }
@@ -698,7 +718,7 @@ impl ChatSpace {
     /// Unwraps a gift-wrapped event and processes its contents.
     async fn unwrap_gift_wrap(target: &Event) {
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
         let mut message: Option<Event> = None;
 
         if let Ok(event) = Self::get_unwrapped_event(target.id).await {
@@ -718,21 +738,24 @@ impl ChatSpace {
         if let Some(event) = message {
             // Send all pubkeys to the metadata batch to sync data
             for public_key in event.all_pubkeys() {
-                css.ingester.send(public_key).await;
+                app_state.ingester.send(public_key).await;
             }
 
-            match event.created_at >= css.init_at {
+            match event.created_at >= app_state.init_at {
                 // New message: send a signal to notify the UI
                 true => {
                     // A small delay to prevent UI flickering
                     smol::Timer::after(Duration::from_millis(200)).await;
-                    css.signal
+                    app_state
+                        .signal
                         .send(SignalKind::NewMessage((target.id, event)))
                         .await;
                 }
                 // Old message: Coop is probably processing the user's messages during initial load
                 false => {
-                    css.gift_wrap_processing.store(true, Ordering::Release);
+                    app_state
+                        .gift_wrap_processing
+                        .store(true, Ordering::Release);
                 }
             }
         }
@@ -783,7 +806,7 @@ impl ChatSpace {
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             let client = nostr_client();
-            let css = css();
+            let app_state = app_state();
             let signer = client.signer().await?;
 
             // Construct event
@@ -814,7 +837,7 @@ impl ChatSpace {
                             relay.resubscribe().await?;
 
                             // Get all failed events that need to be resent
-                            let mut queue = css.resend_queue.write().await;
+                            let mut queue = app_state.resend_queue.write().await;
 
                             let ids: Vec<EventId> = queue
                                 .iter()
@@ -833,8 +856,8 @@ impl ChatSpace {
                                             success: HashSet::from([relay_url]),
                                         };
 
-                                        css.sent_ids.write().await.insert(event_id);
+                                        app_state.sent_ids.write().await.insert(event_id);
-                                        css.resent_ids.write().await.push(output);
+                                        app_state.resent_ids.write().await.push(output);
                                     }
                                 }
                             }
@@ -939,28 +962,33 @@ impl ChatSpace {
     }
 
     fn reopen_auth_request(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        for (_, request) in self.auth_requests.clone().into_iter() {
+        for (_, request) in self.auth_requests.read(cx).clone() {
             self.open_auth_request(request, window, cx);
         }
     }
 
     fn push_auth_request(&mut self, req: &AuthRequest, cx: &mut Context<Self>) {
-        self.auth_requests.insert(req.url.clone(), req.to_owned());
+        self.auth_requests.update(cx, |this, cx| {
+            this.insert(req.url.clone(), req.to_owned());
             cx.notify();
+        });
     }
 
     fn sending_auth_request(&mut self, challenge: &str, cx: &mut Context<Self>) {
-        for (_, req) in self.auth_requests.iter_mut() {
+        self.auth_requests.update(cx, |this, cx| {
+            for (_, req) in this.iter_mut() {
                 if req.challenge == challenge {
                     req.sending = true;
                     cx.notify();
                 }
             }
+        });
     }
 
-    fn is_sending_auth_request(&self, challenge: &str, _cx: &App) -> bool {
+    fn is_sending_auth_request(&self, challenge: &str, cx: &App) -> bool {
         if let Some(req) = self
             .auth_requests
+            .read(cx)
             .iter()
             .find(|(_, req)| req.challenge == challenge)
         {
@@ -971,8 +999,10 @@ impl ChatSpace {
     }
 
     fn remove_auth_request(&mut self, challenge: &str, cx: &mut Context<Self>) {
-        self.auth_requests.retain(|_, r| r.challenge != challenge);
+        self.auth_requests.update(cx, |this, cx| {
+            this.retain(|_, r| r.challenge != challenge);
             cx.notify();
+        });
     }
 
     fn set_onboarding_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -992,7 +1022,7 @@ impl ChatSpace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let panel = Arc::new(account::init(secret, profile, window, cx));
+        let panel = Arc::new(account::init(profile, secret, window, cx));
         let center = DockItem::panel(panel);
 
         self.dock.update(cx, |this, cx| {
@@ -1092,7 +1122,7 @@ impl ChatSpace {
     ) {
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             let client = nostr_client();
-            let css = css();
+            let app_state = app_state();
 
             let filter = Filter::new().kind(Kind::PrivateDirectMessage);
 
@@ -1111,7 +1141,7 @@ impl ChatSpace {
                 .authors(pubkeys);
 
             client
-                .subscribe_to(BOOTSTRAP_RELAYS, filter, css.auto_close_opts)
+                .subscribe_to(BOOTSTRAP_RELAYS, filter, app_state.auto_close_opts)
                 .await?;
 
             Ok(())
@@ -1131,7 +1161,7 @@ impl ChatSpace {
     fn on_sign_out(&mut self, _e: &Logout, _window: &mut Window, cx: &mut Context<Self>) {
         cx.background_spawn(async move {
             let client = nostr_client();
-            let css = css();
+            let app_state = app_state();
 
             let filter = Filter::new()
                 .kind(Kind::ApplicationSpecificData)
@@ -1144,7 +1174,7 @@ impl ChatSpace {
             client.reset().await;
 
             // Notify the channel about the signer being unset
-            css.signal.send(SignalKind::SignerUnset).await;
+            app_state.signal.send(SignalKind::SignerUnset).await;
         })
         .detach();
     }
@@ -1254,7 +1284,7 @@ impl ChatSpace {
             .w_full()
             .child(compose_button())
             .when(status != &UnwrappingStatus::Complete, |this| {
-                this.child(
+                this.child(deferred(
                     h_flex()
                         .px_2()
                         .h_6()
@@ -1263,7 +1293,7 @@ impl ChatSpace {
                         .rounded_full()
                         .bg(cx.theme().surface_background)
                         .child(shared_t!("loading.label")),
-                )
+                ))
             })
     }
 
@@ -1276,7 +1306,7 @@ impl ChatSpace {
         let proxy = AppSettings::get_proxy_user_avatars(cx);
         let updating = AutoUpdater::read_global(cx).status.is_updating();
         let updated = AutoUpdater::read_global(cx).status.is_updated();
-        let auth_requests = self.auth_requests.len();
+        let auth_requests = self.auth_requests.read(cx).len();
 
         h_flex()
             .gap_1()
@@ -1341,7 +1371,7 @@ impl ChatSpace {
                     .reverse()
                     .transparent()
                     .icon(IconName::CaretDown)
-                    .child(Avatar::new(profile.avatar_url(proxy)).size(rems(1.49)))
+                    .child(Avatar::new(profile.avatar(proxy)).size(rems(1.49)))
                     .popup_menu(|this, _window, _cx| {
                         this.menu(t!("user.dark_mode"), Box::new(DarkMode))
                             .menu(t!("user.settings"), Box::new(Settings))
@@ -1368,7 +1398,7 @@ impl ChatSpace {
 
             this._tasks.push(cx.background_spawn(async move {
                 let client = nostr_client();
-                let css = css();
+                let app_state = app_state();
 
                 if proxy.start().await.is_ok() {
                     webbrowser::open(&url).ok();
@@ -1399,7 +1429,7 @@ impl ChatSpace {
 
                             break;
                         } else {
-                            css.signal.send(SignalKind::ProxyDown).await;
+                            app_state.signal.send(SignalKind::ProxyDown).await;
                         }
                         smol::Timer::after(Duration::from_secs(1)).await;
                     }
@@ -1464,6 +1494,7 @@ impl Render for ChatSpace {
         }
 
         div()
+            .id(SharedString::from("chatspace"))
             .on_action(cx.listener(Self::on_settings))
             .on_action(cx.listener(Self::on_dark_mode))
             .on_action(cx.listener(Self::on_sign_out))

crates/coop/src/main.rs

@@ -2,13 +2,12 @@ use std::sync::Arc;
 
 use assets::Assets;
 use global::constants::{APP_ID, APP_NAME};
-use global::{css, nostr_client};
+use global::{app_state, nostr_client};
 use gpui::{
     point, px, size, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem, SharedString,
     TitlebarOptions, WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind,
     WindowOptions,
 };
-use theme::Theme;
 use ui::Root;
 
 use crate::actions::{load_embedded_fonts, quit, Quit};
@@ -27,7 +26,7 @@ fn main() {
     let _client = nostr_client();
 
     // Initialize the coop simple storage
-    let _css = css();
+    let _app_state = app_state();
 
     // Initialize the Application
     let app = Application::new()
@@ -79,13 +78,6 @@ fn main() {
             // Bring the app to the foreground
             cx.activate(true);
 
-            // 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 the tokio runtime

crates/coop/src/views/account.rs

@@ -2,15 +2,15 @@ use std::time::Duration;
 
 use anyhow::Error;
 use client_keys::ClientKeys;
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
-use common::handle_auth::CoopAuthUrlHandler;
 use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
-use global::{css, nostr_client, SignalKind};
+use global::{app_state, nostr_client, SignalKind};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, relative, rems, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter,
-    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
-    StatefulInteractiveElement, Styled, Task, WeakEntity, Window,
+    RetainAllImageCache, SharedString, StatefulInteractiveElement, Styled, Subscription, Task,
+    WeakEntity, Window,
 };
 use i18n::{shared_t, t};
 use nostr_connect::prelude::*;
@@ -22,18 +22,20 @@ use ui::button::{Button, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::indicator::Indicator;
 use ui::input::{InputState, TextInput};
+use ui::notification::Notification;
 use ui::popup_menu::PopupMenu;
-use ui::{h_flex, v_flex, ContextModal, Disableable, Sizable, StyledExt};
+use ui::{h_flex, v_flex, ContextModal, Sizable, StyledExt};
 
+use crate::actions::CoopAuthUrlHandler;
 use crate::chatspace::ChatSpace;
 
 pub fn init(
-    secret: String,
     profile: Profile,
+    secret: String,
     window: &mut Window,
     cx: &mut App,
 ) -> Entity<Account> {
-    Account::new(secret, profile, window, cx)
+    cx.new(|cx| Account::new(secret, profile, window, cx))
 }
 
 pub struct Account {
@@ -42,18 +44,33 @@ pub struct Account {
     is_bunker: bool,
     is_extension: bool,
     loading: bool,
-    // Panel
+
     name: SharedString,
     focus_handle: FocusHandle,
+    image_cache: Entity<RetainAllImageCache>,
+
+    _subscriptions: SmallVec<[Subscription; 1]>,
     _tasks: SmallVec<[Task<()>; 1]>,
 }
 
 impl Account {
-    fn new(secret: String, profile: Profile, _window: &mut Window, cx: &mut App) -> Entity<Self> {
+    fn new(secret: String, profile: Profile, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let is_bunker = secret.starts_with("bunker://");
         let is_extension = secret.starts_with("extension");
 
-        cx.new(|cx| Self {
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Clear the local state when user closes the account panel
+            cx.on_release_in(window, move |this, window, cx| {
+                this.stored_secret.clear();
+                this.image_cache.update(cx, |this, cx| {
+                    this.clear(window, cx);
+                });
+            }),
+        );
+
+        Self {
             profile,
             is_bunker,
             is_extension,
@@ -61,8 +78,10 @@ impl Account {
             loading: false,
             name: "Account".into(),
             focus_handle: cx.focus_handle(),
+            image_cache: RetainAllImageCache::new(cx),
+            _subscriptions: subscriptions,
             _tasks: smallvec![],
-        })
+        }
     }
 
     fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -93,8 +112,8 @@ impl Account {
         signer.auth_url_handler(CoopAuthUrlHandler);
 
         self._tasks.push(
-            // Handle connection
+            // Handle connection in the background
-            cx.spawn_in(window, async move |_this, cx| {
+            cx.spawn_in(window, async move |this, cx| {
                 let client = nostr_client();
 
                 match signer.bunker_uri().await {
@@ -103,8 +122,9 @@ impl Account {
                         client.set_signer(signer).await;
                     }
                     Err(e) => {
-                        cx.update(|window, cx| {
+                        this.update_in(cx, |this, window, cx| {
-                            window.push_notification(e.to_string(), cx);
+                            this.set_loading(false, cx);
+                            window.push_notification(Notification::error(e.to_string()), cx);
                         })
                         .ok();
                     }
@@ -248,7 +268,7 @@ impl Account {
             // Reset the nostr client in the background
             cx.background_spawn(async move {
                 let client = nostr_client();
-                let css = css();
+                let app_state = app_state();
 
                 let filter = Filter::new()
                     .kind(Kind::ApplicationSpecificData)
@@ -261,7 +281,7 @@ impl Account {
                 client.unset_signer().await;
 
                 // Notify the channel about the signer being unset
-                css.signal.send(SignalKind::SignerUnset).await;
+                app_state.signal.send(SignalKind::SignerUnset).await;
             }),
         );
     }
@@ -301,6 +321,7 @@ impl Focusable for Account {
 impl Render for Account {
     fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
+            .image_cache(self.image_cache.clone())
             .relative()
             .size_full()
             .gap_10()
@@ -342,12 +363,10 @@ impl Render for Account {
                             .id("account")
                             .h_10()
                             .w_72()
-                            .bg(cx.theme().element_background)
+                            .bg(cx.theme().elevated_surface_background)
-                            .text_color(cx.theme().element_foreground)
                             .rounded_lg()
                             .text_sm()
-                            .map(|this| {
+                            .when(self.loading, |this| {
-                                if self.loading {
                                 this.child(
                                     div()
                                         .size_full()
@@ -356,32 +375,60 @@ impl Render for Account {
                                         .justify_center()
                                         .child(Indicator::new().small()),
                                 )
-                                } else {
+                            })
+                            .when(!self.loading, |this| {
+                                let avatar = self.profile.avatar(true);
+                                let name = self.profile.display_name();
+
                                 this.child(
-                                        div()
+                                    h_flex()
                                         .h_full()
-                                            .flex()
-                                            .items_center()
                                         .justify_center()
                                         .gap_2()
-                                            .child(shared_t!("onboarding.choose_account"))
                                         .child(
                                             h_flex()
                                                 .gap_1()
-                                                    .child(
+                                                .child(Avatar::new(avatar).size(rems(1.5)))
-                                                        Avatar::new(self.profile.avatar_url(true))
+                                                .child(div().pb_px().font_semibold().child(name)),
-                                                            .size(rems(1.5)),
                                         )
                                         .child(
                                             div()
-                                                            .pb_px()
+                                                .when(self.is_bunker, |this| {
-                                                            .font_semibold()
+                                                    let label = SharedString::from("Nostr Connect");
-                                                            .child(self.profile.display_name()),
+
-                                                    ),
+                                                    this.child(
+                                                        div()
+                                                            .py_0p5()
+                                                            .px_2()
+                                                            .text_xs()
+                                                            .bg(cx.theme().secondary_active)
+                                                            .text_color(
+                                                                cx.theme().secondary_foreground,
+                                                            )
+                                                            .rounded_full()
+                                                            .child(label),
+                                                    )
+                                                })
+                                                .when(self.is_extension, |this| {
+                                                    let label = SharedString::from("Extension");
+
+                                                    this.child(
+                                                        div()
+                                                            .py_0p5()
+                                                            .px_2()
+                                                            .text_xs()
+                                                            .bg(cx.theme().secondary_active)
+                                                            .text_color(
+                                                                cx.theme().secondary_foreground,
+                                                            )
+                                                            .rounded_full()
+                                                            .child(label),
+                                                    )
+                                                }),
                                         ),
                                 )
-                                }
                             })
+                            .active(|this| this.bg(cx.theme().element_active))
                             .hover(|this| this.bg(cx.theme().element_hover))
                             .on_click(cx.listener(move |this, _e, window, cx| {
                                 this.login(window, cx);
@@ -391,7 +438,6 @@ impl Render for Account {
                         Button::new("logout")
                             .label(t!("user.sign_out"))
                             .ghost()
-                            .disabled(self.loading)
                             .on_click(cx.listener(move |this, _e, window, cx| {
                                 this.logout(window, cx);
                             })),

crates/coop/src/views/chat/mod.rs

@@ -1,15 +1,14 @@
 use std::collections::HashMap;
 
-use anyhow::anyhow;
+use common::display::{RenderedProfile, RenderedTimestamp};
-use common::display::{ReadableProfile, ReadableTimestamp};
 use common::nip96::nip96_upload;
-use global::{css, nostr_client};
+use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, img, list, px, red, relative, rems, svg, white, Action, AnyElement, App, AppContext,
     ClipboardItem, Context, Element, Entity, EventEmitter, Flatten, FocusHandle, Focusable,
     InteractiveElement, IntoElement, ListAlignment, ListOffset, ListState, MouseButton, ObjectFit,
-    ParentElement, PathPromptOptions, Render, RetainAllImageCache, SharedString,
+    ParentElement, PathPromptOptions, Render, RetainAllImageCache, SharedString, SharedUri,
     StatefulInteractiveElement, Styled, StyledImage, Subscription, Task, Window,
 };
 use gpui_tokio::Tokio;
@@ -31,6 +30,7 @@ use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::emoji_picker::EmojiPicker;
 use ui::input::{InputEvent, InputState, TextInput};
 use ui::modal::ModalButtonProps;
+use ui::notification::Notification;
 use ui::popup_menu::{PopupMenu, PopupMenuExt};
 use ui::text::RenderedText;
 use ui::{
@@ -215,7 +215,6 @@ impl Chat {
             id: room.read(cx).id.to_string().into(),
             image_cache: RetainAllImageCache::new(cx),
             focus_handle: cx.focus_handle(),
-            uploading: false,
             rendered_texts_by_id: BTreeMap::new(),
             reports_by_id: BTreeMap::new(),
             relays,
@@ -225,6 +224,7 @@ impl Chat {
             input,
             replies_to,
             attachments,
+            uploading: false,
             _subscriptions: subscriptions,
             _tasks: tasks,
         }
@@ -282,15 +282,17 @@ impl Chat {
         let attachments = self.attachments.read(cx);
 
         if !attachments.is_empty() {
-            content = format!(
+            let urls = attachments
-                "{}\n{}",
-                content,
-                attachments
                 .iter()
                 .map(|url| url.to_string())
                 .collect_vec()
-                    .join("\n")
+                .join("\n");
-            )
+
+            if content.is_empty() {
+                content = urls;
+            } else {
+                content = format!("{content}\n{urls}");
+            }
         }
 
         content
@@ -298,7 +300,7 @@ impl Chat {
 
     /// Check if the event is sent by Coop
     fn is_sent_by_coop(&self, gift_wrap_id: &EventId) -> bool {
-        css().sent_ids.read_blocking().contains(gift_wrap_id)
+        app_state().sent_ids.read_blocking().contains(gift_wrap_id)
     }
 
     /// Send a message to all members of the chat
@@ -342,6 +344,9 @@ impl Chat {
             // Remove all replies
             this.remove_all_replies(cx);
 
+            // remove all attachments
+            this.remove_all_attachments(cx);
+
             // Reset the input state
             this.input.update(cx, |this, cx| {
                 this.set_loading(false, cx);
@@ -533,73 +538,74 @@ impl Chat {
     }
 
     fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.uploading {
-            return;
-        }
-        // Block the upload button to until current task is resolved
-        self.uploading(true, cx);
-
         // Get the user's configured NIP96 server
         let nip96_server = AppSettings::get_media_server(cx);
 
-        // Open native file dialog
+        let path = cx.prompt_for_paths(PathPromptOptions {
-        let paths = cx.prompt_for_paths(PathPromptOptions {
             files: true,
             directories: false,
             multiple: false,
             prompt: None,
         });
 
-        let task = Tokio::spawn(cx, async move {
+        cx.spawn_in(window, async move |this, cx| {
-            match Flatten::flatten(paths.await.map_err(|e| e.into())) {
+            let mut paths = path.await.ok()?.ok()??;
-                Ok(Some(mut paths)) => {
+            let path = paths.pop()?;
-                    if let Some(path) = paths.pop() {
-                        let file = fs::read(path).await?;
-                        let url = nip96_upload(nostr_client(), &nip96_server, file).await?;
 
-                        Ok(url)
+            let upload = Tokio::spawn(cx, async move {
-                    } else {
+                let client = nostr_client();
-                        Err(anyhow!("Path not found"))
+                let file = fs::read(path).await.ok()?;
-                    }
+                let url = nip96_upload(client, &nip96_server, file).await.ok()?;
-                }
+
-                Ok(None) => Err(anyhow!("User cancelled")),
+                Some(url)
-                Err(e) => Err(anyhow!("File dialog error: {e}")),
-            }
             });
 
-        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(task) = upload {
+                this.update(cx, |this, cx| {
+                    this.set_uploading(true, cx);
+                })
+                .ok();
+
                 match Flatten::flatten(task.await.map_err(|e| e.into())) {
-                Ok(Ok(url)) => {
+                    Ok(Some(url)) => {
                         this.update(cx, |this, cx| {
                             this.add_attachment(url, cx);
+                            this.set_uploading(false, cx);
                         })
                         .ok();
                     }
-                Ok(Err(e)) => {
+                    Ok(None) => {
-                    log::warn!("User cancelled: {e}");
+                        this.update_in(cx, |this, window, cx| {
-                    this.update(cx, |this, cx| {
+                            window.push_notification("Failed to upload file", cx);
-                        this.uploading(false, cx);
+                            this.set_uploading(false, cx);
                         })
                         .ok();
                     }
                     Err(e) => {
                         this.update_in(cx, |this, window, cx| {
-                        window.push_notification(e.to_string(), cx);
+                            window.push_notification(Notification::error(e.to_string()), cx);
-                        this.uploading(false, cx);
+                            this.set_uploading(false, cx);
                         })
                         .ok();
                     }
                 }
+            }
+
+            Some(())
         })
         .detach();
     }
 
+    fn set_uploading(&mut self, uploading: bool, cx: &mut Context<Self>) {
+        self.uploading = uploading;
+        cx.notify();
+    }
+
     fn add_attachment(&mut self, url: Url, cx: &mut Context<Self>) {
         self.attachments.update(cx, |this, cx| {
             this.push(url);
             cx.notify();
         });
-        self.uploading(false, cx);
     }
 
     fn remove_attachment(&mut self, url: &Url, _window: &mut Window, cx: &mut Context<Self>) {
@@ -611,9 +617,11 @@ impl Chat {
         });
     }
 
-    fn uploading(&mut self, status: bool, cx: &mut Context<Self>) {
+    fn remove_all_attachments(&mut self, cx: &mut Context<Self>) {
-        self.uploading = status;
+        self.attachments.update(cx, |this, cx| {
+            this.clear();
             cx.notify();
+        });
     }
 
     fn render_announcement(&mut self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
@@ -721,7 +729,7 @@ impl Chat {
                     .flex()
                     .gap_3()
                     .when(!hide_avatar, |this| {
-                        this.child(Avatar::new(author.avatar_url(proxy)).size(rems(2.)))
+                        this.child(Avatar::new(author.avatar(proxy)).size(rems(2.)))
                     })
                     .child(
                         v_flex()
@@ -740,7 +748,7 @@ impl Chat {
                                             .text_color(cx.theme().text)
                                             .child(author.display_name()),
                                     )
-                                    .child(div().child(message.created_at.to_human_time()))
+                                    .child(message.created_at.to_human_time())
                                     .when_some(is_sent_success, |this, status| {
                                         this.when(status, |this| {
                                             this.child(self.render_message_sent(&id, cx))
@@ -776,14 +784,12 @@ impl Chat {
             .child(self.render_actions(&id, cx))
             .on_mouse_down(
                 MouseButton::Middle,
-                cx.listener(move |this, _event, _window, cx| {
+                cx.listener(move |this, _, _window, cx| {
                     this.copy_message(&id, cx);
                 }),
             )
-            .on_double_click(cx.listener({
+            .on_double_click(cx.listener(move |this, _, _window, cx| {
-                move |this, _event, _window, cx| {
                 this.reply_to(&id, cx);
-                }
             }))
             .hover(|this| this.bg(cx.theme().surface_background))
             .into_any_element()
@@ -820,7 +826,7 @@ impl Chat {
                             .w_full()
                             .text_ellipsis()
                             .line_clamp(1)
-                            .child(message.content.clone()),
+                            .child(SharedString::from(&message.content)),
                     )
                     .hover(|this| this.bg(cx.theme().elevated_surface_background))
                     .on_click({
@@ -894,7 +900,7 @@ impl Chat {
         let registry = Registry::read_global(cx);
         let profile = registry.get_person(&report.receiver, cx);
         let name = profile.display_name();
-        let avatar = profile.avatar_url(true);
+        let avatar = profile.avatar(true);
 
         v_flex()
             .gap_2()
@@ -1086,15 +1092,12 @@ impl Chat {
     }
 
     fn render_attachment(&self, url: &Url, cx: &Context<Self>) -> impl IntoElement {
-        let url = url.clone();
-        let path: SharedString = url.to_string().into();
-
         div()
             .id(SharedString::from(url.to_string()))
             .relative()
             .w_16()
             .child(
-                img(path.clone())
+                img(SharedUri::from(url.to_string()))
                     .size_16()
                     .shadow_lg()
                     .rounded(cx.theme().radius)
@@ -1113,9 +1116,12 @@ impl Chat {
                     .bg(red())
                     .child(Icon::new(IconName::Close).size_2().text_color(white())),
             )
-            .on_click(cx.listener(move |this, _, window, cx| {
+            .on_click({
+                let url = url.clone();
+                cx.listener(move |this, _, window, cx| {
                     this.remove_attachment(&url, window, cx);
-            }))
+                })
+            })
     }
 
     fn render_attachment_list(
@@ -1180,7 +1186,7 @@ impl Chat {
                         .text_sm()
                         .text_ellipsis()
                         .line_clamp(1)
-                        .child(text.content.clone()),
+                        .child(SharedString::from(&text.content)),
                 )
         } else {
             div()
@@ -1263,7 +1269,7 @@ impl Chat {
 
         let task: Task<Result<Vec<RelayUrl>, Error>> = cx.background_spawn(async move {
             let client = nostr_client();
-            let css = css();
+            let app_state = app_state();
             let mut relays: Vec<RelayUrl> = vec![];
 
             let filter = Filter::new()
@@ -1273,7 +1279,7 @@ impl Chat {
 
             if let Some(event) = client.database().query(filter).await?.first_owned() {
                 if let Some(Ok(id)) = event.tags.identifier().map(EventId::parse) {
-                    if let Some(urls) = css.seen_on_relays.read().await.get(&id).cloned() {
+                    if let Some(urls) = app_state.seen_on_relays.read().await.get(&id).cloned() {
                         relays.extend(urls);
                     }
                 }
@@ -1397,9 +1403,7 @@ impl Render for Chat {
                     .px_3()
                     .py_2()
                     .child(
-                        div()
+                        v_flex()
-                            .flex()
-                            .flex_col()
                             .gap_1p5()
                             .children(self.render_attachment_list(window, cx))
                             .children(self.render_reply_list(window, cx))
@@ -1418,10 +1422,10 @@ impl Render for Chat {
                                             .child(
                                                 Button::new("upload")
                                                     .icon(IconName::Upload)
+                                                    .loading(self.uploading)
+                                                    .disabled(self.uploading)
                                                     .ghost()
                                                     .large()
-                                                    .disabled(self.uploading)
-                                                    .loading(self.uploading)
                                                     .on_click(cx.listener(
                                                         move |this, _, window, cx| {
                                                             this.upload(window, cx);

crates/coop/src/views/chat/subject.rs

@@ -2,7 +2,7 @@ use gpui::{
     div, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString,
     Styled, Window,
 };
-use i18n::t;
+use i18n::{shared_t, t};
 use theme::ActiveTheme;
 use ui::input::{InputState, TextInput};
 use ui::{v_flex, Sizable};
@@ -41,7 +41,7 @@ impl Render for Subject {
                 div()
                     .text_sm()
                     .text_color(cx.theme().text_muted)
-                    .child(SharedString::new(t!("subject.title"))),
+                    .child(shared_t!("subject.title")),
             )
             .child(TextInput::new(&self.input).small())
             .child(
@@ -49,7 +49,7 @@ impl Render for Subject {
                     .text_xs()
                     .italic()
                     .text_color(cx.theme().text_placeholder)
-                    .child(SharedString::new(t!("subject.help_text"))),
+                    .child(shared_t!("subject.help_text")),
             )
     }
 }

crates/coop/src/views/compose.rs

@@ -2,20 +2,20 @@ use std::ops::Range;
 use std::time::Duration;
 
 use anyhow::{anyhow, Error};
-use common::display::{ReadableProfile, TextUtils};
+use common::display::{RenderedProfile, TextUtils};
 use common::nip05::nip05_profile;
 use global::constants::BOOTSTRAP_RELAYS;
-use global::nostr_client;
+use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, px, relative, rems, uniform_list, AppContext, Context, Entity, InteractiveElement,
+    div, px, relative, rems, uniform_list, App, AppContext, Context, Entity, InteractiveElement,
-    IntoElement, ParentElement, Render, SharedString, StatefulInteractiveElement, Styled,
+    IntoElement, ParentElement, Render, RetainAllImageCache, SharedString,
-    Subscription, Task, Window,
+    StatefulInteractiveElement, Styled, Subscription, Task, Window,
 };
-use i18n::t;
+use gpui_tokio::Tokio;
-use itertools::Itertools;
+use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
-use registry::room::{Room, RoomKind};
+use registry::room::Room;
 use registry::Registry;
 use settings::AppSettings;
 use smallvec::{smallvec, SmallVec};
@@ -24,6 +24,7 @@ use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::input::{InputEvent, InputState, TextInput};
+use ui::modal::ModalButtonProps;
 use ui::notification::Notification;
 use ui::{h_flex, v_flex, ContextModal, Disableable, Icon, IconName, Sizable, StyledExt};
 
@@ -37,19 +38,43 @@ pub fn compose_button() -> impl IntoElement {
             .rounded()
             .on_click(move |_, window, cx| {
                 let compose = cx.new(|cx| Compose::new(window, cx));
-                let title = SharedString::new(t!("sidebar.direct_messages"));
+                let weak_view = compose.downgrade();
 
-                window.open_modal(cx, move |modal, _window, _cx| {
+                window.open_modal(cx, move |modal, _window, cx| {
-                    modal.title(title.clone()).child(compose.clone())
+                    let weak_view = weak_view.clone();
+                    let label = if compose.read(cx).selected(cx).len() > 1 {
+                        shared_t!("compose.create_group_dm_button")
+                    } else {
+                        shared_t!("compose.create_dm_button")
+                    };
+
+                    modal
+                        .alert()
+                        .overlay_closable(true)
+                        .keyboard(true)
+                        .show_close(true)
+                        .button_props(ModalButtonProps::default().ok_text(label))
+                        .title(shared_t!("sidebar.direct_messages"))
+                        .child(compose.clone())
+                        .on_ok(move |_, window, cx| {
+                            weak_view
+                                .update(cx, |this, cx| {
+                                    this.submit(window, cx);
+                                })
+                                .ok();
+
+                            // false to prevent the modal from closing
+                            false
+                        })
                 })
             }),
     )
 }
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 struct Contact {
     public_key: PublicKey,
-    select: bool,
+    selected: bool,
 }
 
 impl AsRef<PublicKey> for Contact {
@@ -62,12 +87,12 @@ impl Contact {
     pub fn new(public_key: PublicKey) -> Self {
         Self {
             public_key,
-            select: false,
+            selected: false,
         }
     }
 
-    pub fn select(mut self) -> Self {
+    pub fn selected(mut self) -> Self {
-        self.select = true;
+        self.selected = true;
         self
     }
 }
@@ -75,53 +100,50 @@ impl Contact {
 pub struct Compose {
     /// Input for the room's subject
     title_input: Entity<InputState>,
+
     /// Input for the room's members
     user_input: Entity<InputState>,
-    /// The current user's contacts
+
-    contacts: Vec<Entity<Contact>>,
+    /// User's contacts
-    /// Input error message
+    contacts: Entity<Vec<Contact>>,
+
+    /// Error message
     error_message: Entity<Option<SharedString>>,
-    adding: bool,
+
-    submitting: bool,
+    image_cache: Entity<RetainAllImageCache>,
-    #[allow(dead_code)]
+    _subscriptions: SmallVec<[Subscription; 2]>,
-    subscriptions: SmallVec<[Subscription; 1]>,
+    _tasks: SmallVec<[Task<()>; 1]>,
 }
 
 impl Compose {
     pub fn new(window: &mut Window, cx: &mut Context<'_, Self>) -> Self {
+        let contacts = cx.new(|_| vec![]);
+        let error_message = cx.new(|_| None);
+
         let user_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder(t!("compose.placeholder_npub")));
+            cx.new(|cx| InputState::new(window, cx).placeholder("npub or nprofile..."));
 
         let title_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder(t!("compose.placeholder_title")));
+            cx.new(|cx| InputState::new(window, cx).placeholder("Family...(Optional)"));
 
-        let error_message = cx.new(|_| None);
         let mut subscriptions = smallvec![];
-
+        let mut tasks = smallvec![];
-        // Handle Enter event for user input
-        subscriptions.push(cx.subscribe_in(
-            &user_input,
-            window,
-            move |this, _input, event, window, cx| {
-                if let InputEvent::PressEnter { .. } = event {
-                    this.add_and_select_contact(window, cx)
-                };
-            },
-        ));
 
         let get_contacts: Task<Result<Vec<Contact>, Error>> = cx.background_spawn(async move {
             let client = nostr_client();
             let signer = client.signer().await?;
             let public_key = signer.get_public_key().await?;
             let profiles = client.database().contacts(public_key).await?;
-            let contacts = profiles
+            let contacts: Vec<Contact> = profiles
                 .into_iter()
                 .map(|profile| Contact::new(profile.public_key()))
-                .collect_vec();
+                .collect();
 
             Ok(contacts)
         });
 
+        tasks.push(
+            // Load all contacts
             cx.spawn_in(window, async move |this, cx| {
                 match get_contacts.await {
                     Ok(contacts) => {
@@ -137,126 +159,150 @@ impl Compose {
                         .ok();
                     }
                 };
+            }),
+        );
+
+        subscriptions.push(
+            // Clear the image cache when sidebar is closed
+            cx.on_release_in(window, move |this, window, cx| {
+                this.image_cache.update(cx, |this, cx| {
+                    this.clear(window, cx);
                 })
-        .detach();
+            }),
+        );
+
+        subscriptions.push(
+            // Handle Enter event for user input
+            cx.subscribe_in(
+                &user_input,
+                window,
+                move |this, _input, event, window, cx| {
+                    if let InputEvent::PressEnter { .. } = event {
+                        this.add_and_select_contact(window, cx)
+                    };
+                },
+            ),
+        );
 
         Self {
-            adding: false,
-            submitting: false,
-            contacts: vec![],
             title_input,
             user_input,
             error_message,
-            subscriptions,
+            contacts,
+            image_cache: RetainAllImageCache::new(cx),
+            _subscriptions: subscriptions,
+            _tasks: tasks,
         }
     }
 
-    async fn request_metadata(client: &Client, public_key: PublicKey) -> Result<(), Error> {
+    async fn request_metadata(public_key: PublicKey) -> Result<(), Error> {
-        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+        let client = nostr_client();
+        let app_state = app_state();
         let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
         let filter = Filter::new().author(public_key).kinds(kinds).limit(10);
 
         client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+            .subscribe_to(BOOTSTRAP_RELAYS, filter, app_state.auto_close_opts)
             .await?;
 
         Ok(())
     }
 
-    pub fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let public_keys: Vec<PublicKey> = self.selected(cx);
-
-        if public_keys.is_empty() {
-            self.set_error(Some(t!("compose.receiver_required").into()), cx);
-            return;
-        };
-
-        // Show loading spinner
-        self.set_submitting(true, cx);
-
-        // Convert selected pubkeys into Nostr tags
-        let mut tag_list: Vec<Tag> = public_keys.iter().map(|pk| Tag::public_key(*pk)).collect();
-
-        // Add subject if it is present
-        if !self.title_input.read(cx).value().is_empty() {
-            tag_list.push(Tag::custom(
-                TagKind::Subject,
-                vec![self.title_input.read(cx).value().to_string()],
-            ));
-        }
-
-        let event: Task<Result<Room, Error>> = cx.background_spawn(async move {
-            let signer = nostr_client().signer().await?;
-            let public_key = signer.get_public_key().await?;
-
-            let room = EventBuilder::private_msg_rumor(public_keys[0], "")
-                .tags(Tags::from_list(tag_list))
-                .build(public_key)
-                .sign(&Keys::generate())
-                .await
-                .map(|event| Room::new(&event).kind(RoomKind::Ongoing))?;
-
-            Ok(room)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match event.await {
-                Ok(room) => {
-                    cx.update(|window, cx| {
-                        let registry = Registry::global(cx);
-                        // Reset local state
-                        this.update(cx, |this, cx| {
-                            this.set_submitting(false, cx);
-                        })
-                        .ok();
-                        // Create and insert the new room into the registry
-                        registry.update(cx, |this, cx| {
-                            this.push_room(cx.new(|_| room), cx);
-                        });
-                        // Close the current modal
-                        window.close_modal(cx);
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    this.update(cx, |this, cx| {
-                        this.set_error(Some(e.to_string().into()), cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
     fn extend_contacts<I>(&mut self, contacts: I, cx: &mut Context<Self>)
     where
         I: IntoIterator<Item = Contact>,
     {
-        self.contacts
+        self.contacts.update(cx, |this, cx| {
-            .extend(contacts.into_iter().map(|contact| cx.new(|_| contact)));
+            this.extend(contacts);
             cx.notify();
+        });
     }
 
-    fn push_contact(&mut self, contact: Contact, cx: &mut Context<Self>) {
+    fn push_contact(&mut self, contact: Contact, window: &mut Window, cx: &mut Context<Self>) {
-        if !self
+        let pk = contact.public_key;
-            .contacts
+
-            .iter()
+        if !self.contacts.read(cx).iter().any(|c| c.public_key == pk) {
-            .any(|e| e.read(cx).public_key == contact.public_key)
+            self._tasks.push(cx.background_spawn(async move {
-        {
+                Self::request_metadata(pk).await.ok();
-            self.contacts.insert(0, cx.new(|_| contact));
+            }));
+
+            cx.defer_in(window, |this, window, cx| {
+                this.contacts.update(cx, |this, cx| {
+                    this.insert(0, contact);
                     cx.notify();
+                });
+                this.user_input.update(cx, |this, cx| {
+                    this.set_value("", window, cx);
+                    this.set_loading(false, cx);
+                });
+            });
         } else {
             self.set_error(Some(t!("compose.contact_existed").into()), cx);
         }
     }
 
-    fn selected(&self, cx: &Context<Self>) -> Vec<PublicKey> {
+    fn select_contact(&mut self, public_key: PublicKey, cx: &mut Context<Self>) {
+        self.contacts.update(cx, |this, cx| {
+            if let Some(contact) = this.iter_mut().find(|c| c.public_key == public_key) {
+                contact.selected = true;
+            }
+            cx.notify();
+        });
+    }
+
+    fn add_and_select_contact(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let content = self.user_input.read(cx).value().to_string();
+
+        // Show loading indicator in the input
+        self.user_input.update(cx, |this, cx| {
+            this.set_loading(true, cx);
+        });
+
+        if let Ok(public_key) = content.to_public_key() {
+            let contact = Contact::new(public_key).selected();
+            self.push_contact(contact, window, cx);
+        } else if content.contains("@") {
+            let task = Tokio::spawn(cx, async move {
+                if let Ok(profile) = nip05_profile(&content).await {
+                    let public_key = profile.public_key;
+                    let contact = Contact::new(public_key).selected();
+
+                    Ok(contact)
+                } else {
+                    Err(anyhow!("Not found"))
+                }
+            });
+
+            cx.spawn_in(window, async move |this, cx| {
+                match task.await {
+                    Ok(Ok(contact)) => {
+                        this.update_in(cx, |this, window, cx| {
+                            this.push_contact(contact, window, cx);
+                        })
+                        .ok();
+                    }
+                    Ok(Err(e)) => {
+                        this.update(cx, |this, cx| {
+                            this.set_error(Some(e.to_string().into()), cx);
+                        })
+                        .ok();
+                    }
+                    Err(e) => {
+                        log::error!("Tokio error: {e}");
+                    }
+                };
+            })
+            .detach();
+        }
+    }
+
+    fn selected(&self, cx: &App) -> Vec<PublicKey> {
         self.contacts
+            .read(cx)
             .iter()
             .filter_map(|contact| {
-                if contact.read(cx).select {
+                if contact.selected {
-                    Some(contact.read(cx).public_key)
+                    Some(contact.public_key)
                 } else {
                     None
                 }
@@ -264,84 +310,49 @@ impl Compose {
             .collect()
     }
 
-    fn add_and_select_contact(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let content = self.user_input.read(cx).value().to_string();
+        let registry = Registry::global(cx);
+        let public_keys: Vec<PublicKey> = self.selected(cx);
 
-        // Prevent multiple requests
+        if !self.user_input.read(cx).value().is_empty() {
-        self.set_adding(true, cx);
+            self.add_and_select_contact(window, cx);
-
-        // Show loading indicator in the input
-        self.user_input.update(cx, |this, cx| {
-            this.set_loading(true, cx);
-        });
-
-        let task: Task<Result<Contact, Error>> = if content.contains("@") {
-            cx.background_spawn(async move {
-                let (tx, rx) = oneshot::channel::<Option<Nip05Profile>>();
-
-                nostr_sdk::async_utility::task::spawn(async move {
-                    let profile = nip05_profile(&content).await.ok();
-                    tx.send(profile).ok();
-                });
-
-                if let Ok(Some(profile)) = rx.await {
-                    let client = nostr_client();
-                    let public_key = profile.public_key;
-                    let contact = Contact::new(public_key).select();
-
-                    Self::request_metadata(client, public_key).await?;
-
-                    Ok(contact)
-                } else {
-                    Err(anyhow!(t!("common.not_found")))
-                }
-            })
-        } else if let Ok(public_key) = content.to_public_key() {
-            cx.background_spawn(async move {
-                let client = nostr_client();
-                let contact = Contact::new(public_key).select();
-
-                Self::request_metadata(client, public_key).await?;
-
-                Ok(contact)
-            })
-        } else {
-            self.set_error(Some(t!("common.pubkey_invalid").into()), cx);
             return;
         };
 
-        cx.spawn_in(window, async move |this, cx| {
+        if public_keys.is_empty() {
-            match task.await {
+            self.set_error(Some(t!("compose.receiver_required").into()), cx);
-                Ok(contact) => {
+            return;
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.push_contact(contact, cx);
-                            this.set_adding(false, cx);
-                            this.user_input.update(cx, |this, cx| {
-                                this.set_value("", window, cx);
-                                this.set_loading(false, cx);
-                            });
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    this.update(cx, |this, cx| {
-                        this.set_error(Some(e.to_string().into()), cx);
-                    })
-                    .ok();
-                }
         };
-        })
+
-        .detach();
+        // Convert selected pubkeys into Nostr tags
+        let mut tags: Tags = Tags::from_list(
+            public_keys
+                .iter()
+                .map(|pubkey| Tag::public_key(pubkey.to_owned()))
+                .collect(),
+        );
+
+        // Add subject if it is present
+        if !self.title_input.read(cx).value().is_empty() {
+            tags.push(Tag::custom(
+                TagKind::Subject,
+                vec![self.title_input.read(cx).value().to_string()],
+            ));
+        }
+
+        // Create a new room
+        let room = Room::new(public_keys[0], tags, cx);
+
+        // Insert the new room into the registry
+        registry.update(cx, |this, cx| {
+            this.push_room(cx.new(|_| room), cx);
+        });
+
+        // Close the current modal
+        window.close_modal(cx);
     }
 
     fn set_error(&mut self, error: impl Into<Option<SharedString>>, cx: &mut Context<Self>) {
-        if self.adding {
-            self.set_adding(false, cx);
-        }
-
         // Unlock the user input
         self.user_input.update(cx, |this, cx| {
             this.set_loading(false, cx);
@@ -364,48 +375,35 @@ impl Compose {
         .detach();
     }
 
-    fn set_adding(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.adding = status;
-        cx.notify();
-    }
-
-    fn set_submitting(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.submitting = status;
-        cx.notify();
-    }
-
     fn list_items(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
         let proxy = AppSettings::get_proxy_user_avatars(cx);
         let registry = Registry::read_global(cx);
-        let mut items = Vec::with_capacity(self.contacts.len());
+        let mut items = Vec::with_capacity(self.contacts.read(cx).len());
 
         for ix in range {
-            let Some(entity) = self.contacts.get(ix).cloned() else {
+            let Some(contact) = self.contacts.read(cx).get(ix) else {
                 continue;
             };
 
-            let public_key = entity.read(cx).as_ref();
+            let public_key = contact.public_key;
-            let profile = registry.get_person(public_key, cx);
+            let profile = registry.get_person(&public_key, cx);
-            let selected = entity.read(cx).select;
 
             items.push(
                 h_flex()
                     .id(ix)
-                    .px_1()
+                    .px_2()
-                    .h_9()
+                    .h_11()
                     .w_full()
                     .justify_between()
                     .rounded(cx.theme().radius)
                     .child(
-                        div()
+                        h_flex()
-                            .flex()
-                            .items_center()
                             .gap_1p5()
                             .text_sm()
-                            .child(Avatar::new(profile.avatar_url(proxy)).size(rems(1.75)))
+                            .child(Avatar::new(profile.avatar(proxy)).size(rems(1.75)))
                             .child(profile.display_name()),
                     )
-                    .when(selected, |this| {
+                    .when(contact.selected, |this| {
                         this.child(
                             Icon::new(IconName::CheckCircleFill)
                                 .small()
@@ -413,11 +411,8 @@ impl Compose {
                         )
                     })
                     .hover(|this| this.bg(cx.theme().elevated_surface_background))
-                    .on_click(cx.listener(move |_this, _event, _window, cx| {
+                    .on_click(cx.listener(move |this, _, _window, cx| {
-                        entity.update(cx, |this, cx| {
+                        this.select_contact(public_key, cx);
-                            this.select = !this.select;
-                            cx.notify();
-                        });
                     })),
             );
         }
@@ -428,24 +423,18 @@ impl Compose {
 
 impl Render for Compose {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let label = if self.submitting {
-            t!("compose.creating_dm_button")
-        } else if self.selected(cx).len() > 1 {
-            t!("compose.create_group_dm_button")
-        } else {
-            t!("compose.create_dm_button")
-        };
-
         let error = self.error_message.read(cx).as_ref();
+        let loading = self.user_input.read(cx).loading(cx);
+        let contacts = self.contacts.read(cx);
 
         v_flex()
-            .mb_4()
+            .image_cache(self.image_cache.clone())
             .gap_2()
             .child(
                 div()
                     .text_sm()
                     .text_color(cx.theme().text_muted)
-                    .child(SharedString::new(t!("compose.description"))),
+                    .child(shared_t!("compose.description")),
             )
             .when_some(error, |this, msg| {
                 this.child(
@@ -466,13 +455,13 @@ impl Render for Compose {
                         div()
                             .text_sm()
                             .font_semibold()
-                            .child(SharedString::new(t!("compose.subject_label"))),
+                            .child(shared_t!("compose.subject_label")),
                     )
                     .child(TextInput::new(&self.title_input).small().appearance(false)),
             )
             .child(
                 v_flex()
-                    .my_1()
+                    .pt_1()
                     .gap_2()
                     .child(
                         v_flex()
@@ -481,22 +470,18 @@ impl Render for Compose {
                                 div()
                                     .text_sm()
                                     .font_semibold()
-                                    .child(SharedString::new(t!("compose.to_label"))),
+                                    .child(shared_t!("compose.to_label")),
                             )
-                            .child(
-                                h_flex()
-                                    .gap_1()
                             .child(
                                 TextInput::new(&self.user_input)
                                     .small()
-                                            .disabled(self.adding),
+                                    .disabled(loading)
-                                    )
+                                    .suffix(
-                                    .child(
                                         Button::new("add")
                                             .icon(IconName::PlusCircleFill)
-                                            .ghost()
+                                            .transparent()
-                                            .loading(self.adding)
+                                            .small()
-                                            .disabled(self.adding)
+                                            .disabled(loading)
                                             .on_click(cx.listener(move |this, _, window, cx| {
                                                 this.add_and_select_contact(window, cx);
                                             })),
@@ -504,7 +489,7 @@ impl Render for Compose {
                             ),
                     )
                     .map(|this| {
-                        if self.contacts.is_empty() {
+                        if contacts.is_empty() {
                             this.child(
                                 v_flex()
                                     .h_24()
@@ -512,48 +497,32 @@ impl Render for Compose {
                                     .items_center()
                                     .justify_center()
                                     .text_center()
+                                    .text_xs()
                                     .child(
                                         div()
-                                            .text_xs()
                                             .font_semibold()
                                             .line_height(relative(1.2))
-                                            .child(SharedString::new(t!(
+                                            .child(shared_t!("compose.no_contacts_message")),
-                                                "compose.no_contacts_message"
-                                            ))),
                                     )
                                     .child(
-                                        div().text_xs().text_color(cx.theme().text_muted).child(
+                                        div()
-                                            SharedString::new(t!(
+                                            .text_color(cx.theme().text_muted)
-                                                "compose.no_contacts_description"
+                                            .child(shared_t!("compose.no_contacts_description")),
-                                            )),
-                                        ),
                                     ),
                             )
                         } else {
                             this.child(
                                 uniform_list(
                                     "contacts",
-                                    self.contacts.len(),
+                                    contacts.len(),
                                     cx.processor(move |this, range, _window, cx| {
                                         this.list_items(range, cx)
                                     }),
                                 )
-                                .min_h(px(300.)),
+                                .h(px(300.)),
                             )
                         }
                     }),
             )
-            .child(
-                Button::new("create_dm_btn")
-                    .label(label)
-                    .primary()
-                    .small()
-                    .w_full()
-                    .loading(self.submitting)
-                    .disabled(self.submitting || self.adding)
-                    .on_click(cx.listener(move |this, _event, window, cx| {
-                        this.submit(window, cx);
-                    })),
-            )
     }
 }

crates/coop/src/views/edit_profile.rs

@@ -8,7 +8,7 @@ use gpui::{
     div, img, App, AppContext, Context, Entity, Flatten, IntoElement, ParentElement,
     PathPromptOptions, Render, SharedString, Styled, Task, Window,
 };
-use i18n::t;
+use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
 use settings::AppSettings;
 use smol::fs;
@@ -260,7 +260,7 @@ impl Render for EditProfile {
                     .flex_col()
                     .gap_1()
                     .text_sm()
-                    .child(SharedString::new(t!("profile.label_name")))
+                    .child(shared_t!("profile.label_name"))
                     .child(TextInput::new(&self.name_input).small()),
             )
             .child(
@@ -269,7 +269,7 @@ impl Render for EditProfile {
                     .flex_col()
                     .gap_1()
                     .text_sm()
-                    .child(SharedString::new(t!("profile.label_website")))
+                    .child(shared_t!("profile.label_website"))
                     .child(TextInput::new(&self.website_input).small()),
             )
             .child(
@@ -278,7 +278,7 @@ impl Render for EditProfile {
                     .flex_col()
                     .gap_1()
                     .text_sm()
-                    .child(SharedString::new(t!("profile.label_bio")))
+                    .child(shared_t!("profile.label_bio"))
                     .child(TextInput::new(&self.bio_input).small()),
             )
     }

crates/coop/src/views/login.rs

@@ -1,7 +1,6 @@
 use std::time::Duration;
 
 use client_keys::ClientKeys;
-use common::handle_auth::CoopAuthUrlHandler;
 use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
 use global::nostr_client;
 use gpui::prelude::FluentBuilder;
@@ -19,6 +18,8 @@ use ui::input::{InputEvent, InputState, TextInput};
 use ui::popup_menu::PopupMenu;
 use ui::{v_flex, ContextModal, Disableable, Sizable, StyledExt};
 
+use crate::actions::CoopAuthUrlHandler;
+
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Login> {
     Login::new(window, cx)
 }

crates/coop/src/views/preferences.rs

@@ -1,4 +1,4 @@
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use gpui::http_client::Url;
 use gpui::{
     div, px, relative, rems, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
@@ -141,7 +141,7 @@ impl Render for Preferences {
                                 h_flex()
                                     .id("user")
                                     .gap_2()
-                                    .child(Avatar::new(profile.avatar_url(proxy)).size(rems(2.4)))
+                                    .child(Avatar::new(profile.avatar(proxy)).size(rems(2.4)))
                                     .child(
                                         div()
                                             .flex_1()

crates/coop/src/views/screening.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use common::display::{shorten_pubkey, ReadableProfile, ReadableTimestamp};
+use common::display::{shorten_pubkey, RenderedProfile, RenderedTimestamp};
 use common::nip05::nip05_verify;
 use global::constants::BOOTSTRAP_RELAYS;
 use global::nostr_client;
@@ -202,9 +202,7 @@ impl Screening {
                                         .hover(|this| {
                                             this.bg(cx.theme().elevated_surface_background)
                                         })
-                                        .child(
+                                        .child(Avatar::new(contact.avatar(true)).size(rems(1.75)))
-                                            Avatar::new(contact.avatar_url(true)).size(rems(1.75)),
-                                        )
                                         .child(contact.display_name()),
                                 );
                             }
@@ -234,7 +232,7 @@ impl Render for Screening {
                     .items_center()
                     .justify_center()
                     .text_center()
-                    .child(Avatar::new(self.profile.avatar_url(proxy)).size(rems(4.)))
+                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
                     .child(
                         div()
                             .font_semibold()

crates/coop/src/views/setup_relay.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use anyhow::{anyhow, Error};
 use global::constants::NIP17_RELAYS;
-use global::{css, nostr_client};
+use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, px, uniform_list, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
@@ -218,7 +218,7 @@ impl SetupRelay {
             }
 
             // Fetch gift wrap events
-            let sub_id = css().gift_wrap_sub_id.clone();
+            let sub_id = app_state().gift_wrap_sub_id.clone();
             let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
 
             if client

crates/coop/src/views/sidebar/list_item.rs

@@ -3,7 +3,7 @@ use std::rc::Rc;
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, rems, App, ClickEvent, InteractiveElement, IntoElement, ParentElement as _, RenderOnce,
-    SharedString, StatefulInteractiveElement, Styled, Window,
+    SharedString, SharedUri, StatefulInteractiveElement, Styled, Window,
 };
 use i18n::t;
 use nostr_sdk::prelude::*;
@@ -24,7 +24,7 @@ pub struct RoomListItem {
     room_id: Option<u64>,
     public_key: Option<PublicKey>,
     name: Option<SharedString>,
-    avatar: Option<SharedString>,
+    avatar: Option<SharedUri>,
     created_at: Option<SharedString>,
     kind: Option<RoomKind>,
     #[allow(clippy::type_complexity)]
@@ -60,7 +60,7 @@ impl RoomListItem {
         self
     }
 
-    pub fn avatar(mut self, avatar: impl Into<SharedString>) -> Self {
+    pub fn avatar(mut self, avatar: impl Into<SharedUri>) -> Self {
         self.avatar = Some(avatar.into());
         self
     }

crates/coop/src/views/sidebar/mod.rs

@@ -4,13 +4,13 @@ use std::time::Duration;
 
 use anyhow::{anyhow, Error};
 use common::debounced_delay::DebouncedDelay;
-use common::display::{ReadableTimestamp, TextUtils};
+use common::display::{RenderedTimestamp, TextUtils};
 use global::constants::{BOOTSTRAP_RELAYS, SEARCH_RELAYS};
-use global::{css, nostr_client, UnwrappingStatus};
+use global::{app_state, nostr_client, UnwrappingStatus};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    deferred, div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity,
-    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
     RetainAllImageCache, SharedString, Styled, Subscription, Task, Window,
 };
 use gpui_tokio::Tokio;
@@ -56,7 +56,7 @@ pub struct Sidebar {
     focus_handle: FocusHandle,
     image_cache: Entity<RetainAllImageCache>,
     #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 2]>,
+    subscriptions: SmallVec<[Subscription; 3]>,
 }
 
 impl Sidebar {
@@ -77,23 +77,30 @@ impl Sidebar {
         let registry = Registry::global(cx);
         let mut subscriptions = smallvec![];
 
-        subscriptions.push(cx.subscribe_in(
+        subscriptions.push(
-            &registry,
+            // Clear the image cache when sidebar is closed
-            window,
+            cx.on_release_in(window, move |this, window, cx| {
-            move |this, _, event, _window, cx| {
+                this.image_cache.update(cx, |this, cx| {
+                    this.clear(window, cx);
+                })
+            }),
+        );
+
+        subscriptions.push(
+            // Subscribe for registry new events
+            cx.subscribe_in(&registry, window, move |this, _, event, _window, cx| {
                 if let RegistryEvent::NewRequest(kind) = event {
                     this.indicator.update(cx, |this, cx| {
                         *this = Some(kind.to_owned());
                         cx.notify();
                     });
                 }
-            },
+            }),
-        ));
+        );
 
-        subscriptions.push(cx.subscribe_in(
+        subscriptions.push(
-            &find_input,
+            // Subscribe for find input events
-            window,
+            cx.subscribe_in(&find_input, window, |this, _state, event, window, cx| {
-            |this, _state, event, window, cx| {
                 match event {
                     InputEvent::PressEnter { .. } => this.search(window, cx),
                     InputEvent::Change(text) => {
@@ -112,8 +119,8 @@ impl Sidebar {
                     }
                     _ => {}
                 }
-            },
+            }),
-        ));
+        );
 
         Self {
             name: "Sidebar".into(),
@@ -155,7 +162,7 @@ impl Sidebar {
         Self::request_metadata(client, public_key).await?;
 
         // Create a temporary room
-        let room = Room::new(&event).rearrange_by(identity);
+        let room = Room::from(&event).current_user(identity);
 
         Ok(room)
     }
@@ -530,8 +537,8 @@ impl Sidebar {
     fn on_manage(&mut self, _ev: &RelayStatus, window: &mut Window, cx: &mut Context<Self>) {
         let task: Task<Result<Vec<Relay>, Error>> = cx.background_spawn(async move {
             let client = nostr_client();
-            let css = css();
+            let app_state = app_state();
-            let subscription = client.subscription(&css.gift_wrap_sub_id).await;
+            let subscription = client.subscription(&app_state.gift_wrap_sub_id).await;
             let mut relays: Vec<Relay> = vec![];
 
             for (url, _filter) in subscription.into_iter() {
@@ -744,9 +751,9 @@ impl Render for Sidebar {
                                     .tooltip(t!("sidebar.all_conversations_tooltip"))
                                     .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
                                         this.when(kind == &RoomKind::Ongoing, |this| {
-                                            this.child(
+                                            this.child(deferred(
                                                 div().size_1().rounded_full().bg(cx.theme().cursor),
-                                            )
+                                            ))
                                         })
                                     })
                                     .small()
@@ -765,9 +772,9 @@ impl Render for Sidebar {
                                     .tooltip(t!("sidebar.requests_tooltip"))
                                     .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
                                         this.when(kind != &RoomKind::Ongoing, |this| {
-                                            this.child(
+                                            this.child(deferred(
                                                 div().size_1().rounded_full().bg(cx.theme().cursor),
-                                            )
+                                            ))
                                         })
                                     })
                                     .small()
@@ -809,7 +816,7 @@ impl Render for Sidebar {
                     .when(!loading && total_rooms == 0, |this| {
                         this.map(|this| {
                             if self.filter(&RoomKind::Ongoing, cx) {
-                                this.child(
+                                this.child(deferred(
                                     v_flex()
                                         .py_2()
                                         .gap_1p5()
@@ -830,9 +837,9 @@ impl Render for Sidebar {
                                                 .line_height(relative(1.25))
                                                 .child(shared_t!("sidebar.no_conversations_label")),
                                         ),
-                                )
+                                ))
                             } else {
-                                this.child(
+                                this.child(deferred(
                                     v_flex()
                                         .py_2()
                                         .gap_1p5()
@@ -853,7 +860,7 @@ impl Render for Sidebar {
                                                 .line_height(relative(1.25))
                                                 .child(shared_t!("sidebar.no_requests_label")),
                                         ),
-                                )
+                                ))
                             }
                         })
                     })

crates/coop/src/views/user_profile.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use common::nip05::nip05_verify;
 use global::nostr_client;
 use gpui::prelude::FluentBuilder;
@@ -128,9 +128,8 @@ impl UserProfile {
 impl Render for UserProfile {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let proxy = AppSettings::get_proxy_user_avatars(cx);
-
+        let bech32 = self.profile.public_key().to_bech32().unwrap();
-        let Ok(bech32) = self.profile.public_key().to_bech32();
+        let shared_bech32 = SharedString::from(bech32);
-        let shared_bech32 = SharedString::new(bech32);
 
         v_flex()
             .gap_4()
@@ -140,7 +139,7 @@ impl Render for UserProfile {
                     .items_center()
                     .justify_center()
                     .text_center()
-                    .child(Avatar::new(self.profile.avatar_url(proxy)).size(rems(4.)))
+                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
                     .child(
                         v_flex()
                             .child(
@@ -194,7 +193,7 @@ impl Render for UserProfile {
                         div()
                             .block()
                             .text_color(cx.theme().text_muted)
-                            .child("Public Key:"),
+                            .child(SharedString::from("Public Key:")),
                     )
                     .child(
                         h_flex()
@@ -245,7 +244,8 @@ impl Render for UserProfile {
                                 self.profile
                                     .metadata()
                                     .about
-                                    .unwrap_or(t!("profile.no_bio").to_string()),
+                                    .map(SharedString::from)
+                                    .unwrap_or(shared_t!("profile.no_bio")),
                             ),
                     ),
             )

crates/coop/src/views/welcome.rs

@@ -95,7 +95,7 @@ impl Render for Welcome {
                                 div()
                                     .font_semibold()
                                     .text_color(cx.theme().text_muted)
-                                    .child("coop on nostr"),
+                                    .child(SharedString::from("coop on nostr")),
                             )
                             .child(
                                 div()

crates/global/src/lib.rs

@@ -146,7 +146,7 @@ impl Ingester {
 
 /// A simple storage to store all states that using across the application.
 #[derive(Debug)]
-pub struct CoopSimpleStorage {
+pub struct AppState {
     pub init_at: Timestamp,
 
     pub last_used_at: Option<Timestamp>,
@@ -172,13 +172,13 @@ pub struct CoopSimpleStorage {
     pub ingester: Ingester,
 }
 
-impl Default for CoopSimpleStorage {
+impl Default for AppState {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl CoopSimpleStorage {
+impl AppState {
     pub fn new() -> Self {
         let init_at = Timestamp::now();
         let first_run = first_run();
@@ -205,7 +205,7 @@ impl CoopSimpleStorage {
 }
 
 static NOSTR_CLIENT: OnceLock<Client> = OnceLock::new();
-static COOP_SIMPLE_STORAGE: OnceLock<CoopSimpleStorage> = OnceLock::new();
+static APP_STATE: OnceLock<AppState> = OnceLock::new();
 
 pub fn nostr_client() -> &'static Client {
     NOSTR_CLIENT.get_or_init(|| {
@@ -223,15 +223,15 @@ pub fn nostr_client() -> &'static Client {
             .automatic_authentication(false)
             .verify_subscriptions(false)
             .sleep_when_idle(SleepWhenIdle::Enabled {
-                timeout: Duration::from_secs(30),
+                timeout: Duration::from_secs(300),
             });
 
         ClientBuilder::default().database(lmdb).opts(opts).build()
     })
 }
 
-pub fn css() -> &'static CoopSimpleStorage {
+pub fn app_state() -> &'static AppState {
-    COOP_SIMPLE_STORAGE.get_or_init(CoopSimpleStorage::new)
+    APP_STATE.get_or_init(AppState::new)
 }
 
 fn first_run() -> bool {

crates/i18n/src/lib.rs

@@ -29,10 +29,10 @@ macro_rules! init {
 #[macro_export]
 macro_rules! shared_t {
     ($key:expr) => {
-        SharedString::new(t!($key))
+        SharedString::from(t!($key))
     };
     ($key:expr, $($param:ident = $value:expr),+) => {
-        SharedString::new(t!($key, $($param = $value),+))
+        SharedString::from(t!($key, $($param = $value),+))
     };
 }
 

crates/registry/src/lib.rs

@@ -324,7 +324,7 @@ impl Registry {
                 let is_ongoing = client.database().count(filter).await.unwrap_or(1) >= 1;
 
                 // Create a new room
-                let room = Room::new(&event).rearrange_by(public_key);
+                let room = Room::from(&event).current_user(public_key);
 
                 if is_ongoing || bypassed {
                     rooms.insert(room.kind(RoomKind::Ongoing));
@@ -458,9 +458,7 @@ impl Registry {
                 });
             }
         } else {
-            let room = Room::new(&event)
+            let room = Room::from(&event).current_user(identity);
-                .kind(RoomKind::default())
-                .rearrange_by(identity);
 
             // Push the new room to the front of the list
             self.add_room(cx.new(|_| room), cx);

crates/registry/src/room.rs

@@ -4,11 +4,11 @@ use std::hash::{Hash, Hasher};
 use std::time::Duration;
 
 use anyhow::Error;
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use common::event::EventUtils;
 use global::constants::SEND_RETRY;
-use global::{css, nostr_client};
+use global::{app_state, nostr_client};
-use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
+use gpui::{App, AppContext, Context, EventEmitter, SharedString, SharedUri, Task};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 
@@ -124,13 +124,13 @@ impl Eq for Room {}
 
 impl EventEmitter<RoomSignal> for Room {}
 
-impl Room {
+impl From<&Event> for Room {
-    pub fn new(event: &Event) -> Self {
+    fn from(val: &Event) -> Self {
-        let id = event.uniq_id();
+        let id = val.uniq_id();
-        let created_at = event.created_at;
+        let created_at = val.created_at;
 
         // Get the members from the event's tags and event's pubkey
-        let members = event
+        let members = val
             .all_pubkeys()
             .into_iter()
             .unique()
@@ -138,20 +138,20 @@ impl Room {
             .collect_vec();
 
         // Get the subject from the event's tags
-        let subject = if let Some(tag) = event.tags.find(TagKind::Subject) {
+        let subject = if let Some(tag) = val.tags.find(TagKind::Subject) {
             tag.content().map(|s| s.to_owned())
         } else {
             None
         };
 
         // Get the picture from the event's tags
-        let picture = if let Some(tag) = event.tags.find(TagKind::custom("picture")) {
+        let picture = if let Some(tag) = val.tags.find(TagKind::custom("picture")) {
             tag.content().map(|s| s.to_owned())
         } else {
             None
         };
 
-        Self {
+        Room {
             id,
             created_at,
             subject,
@@ -160,47 +160,82 @@ impl Room {
             kind: RoomKind::default(),
         }
     }
-
-    /// Sets the kind of the room and returns the modified room
-    ///
-    /// This is a builder-style method that allows chaining room modifications.
-    ///
-    /// # Arguments
-    ///
-    /// * `kind` - The RoomKind to set for this room
-    ///
-    /// # Returns
-    ///
-    /// The modified Room instance with the new kind
-    pub fn kind(mut self, kind: RoomKind) -> Self {
-        self.kind = kind;
-        self
 }
 
-    /// Sets the rearrange_by field of the room and returns the modified room
+impl From<&UnsignedEvent> for Room {
-    ///
+    fn from(val: &UnsignedEvent) -> Self {
-    /// This is a builder-style method that allows chaining room modifications.
+        let id = val.uniq_id();
-    ///
+        let created_at = val.created_at;
-    /// # Arguments
+
-    ///
+        // Get the members from the event's tags and event's pubkey
-    /// * `rearrange_by` - The PublicKey to set for rearranging the member list
+        let members = val
-    ///
+            .all_pubkeys()
-    /// # Returns
+            .into_iter()
-    ///
+            .unique()
-    /// The modified Room instance with the new member list after rearrangement
+            .sorted()
-    pub fn rearrange_by(mut self, rearrange_by: PublicKey) -> Self {
+            .collect_vec();
+
+        // Get the subject from the event's tags
+        let subject = if let Some(tag) = val.tags.find(TagKind::Subject) {
+            tag.content().map(|s| s.to_owned())
+        } else {
+            None
+        };
+
+        // Get the picture from the event's tags
+        let picture = if let Some(tag) = val.tags.find(TagKind::custom("picture")) {
+            tag.content().map(|s| s.to_owned())
+        } else {
+            None
+        };
+
+        Room {
+            id,
+            created_at,
+            subject,
+            picture,
+            members,
+            kind: RoomKind::default(),
+        }
+    }
+}
+
+impl Room {
+    /// Constructs a new room instance with a given receiver.
+    pub fn new(receiver: PublicKey, tags: Tags, cx: &App) -> Self {
+        let identity = Registry::read_global(cx).identity(cx);
+
+        let mut event = EventBuilder::private_msg_rumor(receiver, "")
+            .tags(tags)
+            .build(identity.public_key());
+
+        // Ensure event ID is generated
+        event.ensure_id();
+
+        Room::from(&event).current_user(identity.public_key())
+    }
+
+    /// Constructs a new room instance from an nostr event.
+    pub fn from(event: impl Into<Room>) -> Self {
+        event.into()
+    }
+
+    /// Call this function to ensure the current user is always at the bottom of the members list
+    pub fn current_user(mut self, public_key: PublicKey) -> Self {
         let (not_match, matches): (Vec<PublicKey>, Vec<PublicKey>) =
-            self.members.iter().partition(|&key| key != &rearrange_by);
+            self.members.iter().partition(|&key| key != &public_key);
         self.members = not_match;
         self.members.extend(matches);
         self
     }
 
+    /// Sets the kind of the room and returns the modified room
+    pub fn kind(mut self, kind: RoomKind) -> Self {
+        self.kind = kind;
+        self
+    }
+
     /// Set the room kind to ongoing
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The context to notify about the update
     pub fn set_ongoing(&mut self, cx: &mut Context<Self>) {
         if self.kind != RoomKind::Ongoing {
             self.kind = RoomKind::Ongoing;
@@ -209,89 +244,45 @@ impl Room {
     }
 
     /// 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: impl Into<Timestamp>, cx: &mut Context<Self>) {
         self.created_at = created_at.into();
         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);
         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);
         cx.notify();
     }
 
     /// Gets the display name for the room
-    ///
+    pub fn display_name(&self, cx: &App) -> SharedString {
-    /// If the room has a subject set, that will be used as the display name.
-    /// Otherwise, it will generate a name based on the room members.
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The application context
-    ///
-    /// # Returns
-    ///
-    /// A string containing the display name
-    pub fn display_name(&self, cx: &App) -> String {
         if let Some(subject) = self.subject.clone() {
-            subject
+            SharedString::from(subject)
         } else {
-            self.merge_name(cx)
+            self.merged_name(cx)
         }
     }
 
     /// Gets the display image for the room
-    ///
+    pub fn display_image(&self, proxy: bool, cx: &App) -> SharedUri {
-    /// The image is determined by:
-    /// - The room's picture if set
-    /// - The first member's avatar for 1:1 chats
-    /// - A default group image for group chats
-    ///
-    /// # Arguments
-    ///
-    /// * `proxy` - Whether to use the proxy for the avatar URL
-    /// * `cx` - The application context
-    ///
-    /// # Returns
-    ///
-    /// A string containing the image path or URL
-    pub fn display_image(&self, proxy: bool, cx: &App) -> String {
         if let Some(picture) = self.picture.as_ref() {
-            picture.clone()
+            SharedUri::from(picture)
         } else if !self.is_group() {
-            self.first_member(cx).avatar_url(proxy)
+            self.first_member(cx).avatar(proxy)
         } else {
-            "brand/group.png".into()
+            SharedUri::from("brand/group.png")
         }
     }
 
@@ -304,7 +295,7 @@ impl Room {
     }
 
     /// Merge the names of the first two members of the room.
-    pub(crate) fn merge_name(&self, cx: &App) -> String {
+    pub(crate) fn merged_name(&self, cx: &App) -> SharedString {
         let registry = Registry::read_global(cx);
 
         if self.is_group() {
@@ -317,7 +308,7 @@ impl Room {
             let mut name = profiles
                 .iter()
                 .take(2)
-                .map(|p| p.display_name())
+                .map(|p| p.name())
                 .collect::<Vec<_>>()
                 .join(", ");
 
@@ -325,7 +316,7 @@ impl Room {
                 name = format!("{}, +{}", name, profiles.len() - 2);
             }
 
-            name
+            SharedString::from(name)
         } else {
             self.first_member(cx).display_name()
         }
@@ -420,6 +411,7 @@ impl Room {
         }
 
         let mut event = builder.tags(tags).build(receiver);
+
         // Ensure event ID is set
         event.ensure_id();
 
@@ -440,7 +432,7 @@ impl Room {
         let mut public_keys = self.members.clone();
 
         cx.background_spawn(async move {
-            let css = css();
+            let app_state = app_state();
             let client = nostr_client();
             let signer = client.signer().await?;
             let public_key = signer.get_public_key().await?;
@@ -500,15 +492,10 @@ impl Room {
                         if auth_required {
                             // Wait for authenticated and resent event successfully
                             for attempt in 0..=SEND_RETRY {
+                                let ids = app_state.resent_ids.read().await;
+
                                 // Check if event was successfully resent
-                                if let Some(output) = css
+                                if let Some(output) = ids.iter().find(|e| e.id() == &id).cloned() {
-                                    .resent_ids
-                                    .read()
-                                    .await
-                                    .iter()
-                                    .find(|e| e.id() == &id)
-                                    .cloned()
-                                {
                                     let output = SendReport::new(pubkey).status(output).tags(&tags);
                                     reports.push(output);
                                     break;

crates/ui/src/input/state.rs

@@ -781,6 +781,11 @@ impl InputState {
         self
     }
 
+    /// Get the loading state of the input field.
+    pub fn loading(&self, _cx: &App) -> bool {
+        self.loading
+    }
+
     /// Set true to show indicator at the input right.
     pub fn set_loading(&mut self, loading: bool, cx: &mut Context<Self>) {
         self.loading = loading;

crates/ui/src/root.rs

@@ -194,7 +194,7 @@ impl Root {
         }
     }
 
-    // Render Notification layer.
+    /// Render Notification layer.
     pub fn render_notification_layer(
         window: &mut Window,
         cx: &mut App,

crates/ui/src/text.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 use std::sync::Arc;
 
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use gpui::{
     AnyElement, AnyView, App, ElementId, HighlightStyle, InteractiveText, IntoElement,
     SharedString, StyledText, UnderlineStyle, Window,

locales/app.yml

@@ -315,10 +315,6 @@ preferences:
     en: "Display"
 
 compose:
-  placeholder_npub:
-    en: "npub or nprofile..."
-  placeholder_title:
-    en: "Family...(Optional)"
   create_dm_button:
     en: "Create DM"
   creating_dm_button: