From 8156d9d0469f3c6223919d9e4464393b6bc87abb Mon Sep 17 00:00:00 2001 From: reya Date: Tue, 11 Mar 2025 13:22:44 +0700 Subject: [PATCH] chore: small fixes --- Cargo.lock | 169 +++++++++++---------- crates/app/src/device.rs | 12 +- crates/app/src/views/onboarding.rs | 187 +++++++++++------------- crates/app/src/views/sidebar/compose.rs | 6 +- 4 files changed, 178 insertions(+), 196 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6aa1f6..c151193 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,7 +152,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -327,7 +327,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -362,7 +362,7 @@ checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -491,9 +491,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "bb97d56060ee67d285efb8001fec9d2a4c710c32efd2e14b5cbb5ba71930fc2d" [[package]] name = "bech32" @@ -520,7 +520,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.99", + "syn 2.0.100", "which", ] @@ -541,7 +541,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -669,7 +669,7 @@ source = "git+https://github.com/kvark/blade?rev=b16f5c7bd873c7126f48c82c39e7ae6 dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -768,7 +768,7 @@ checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -837,7 +837,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.99", + "syn 2.0.100", "tempfile", "toml", ] @@ -975,9 +975,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" dependencies = [ "clap_builder", "clap_derive", @@ -985,9 +985,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" dependencies = [ "anstream", "anstyle", @@ -997,14 +997,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1380,9 +1380,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7747ac3a66a06f4ee6718686c8ea976d2d05fb30ada93ebd76b3f9aef97257c" +checksum = "07e9666f4a9a948d4f1dff0c08a4512b0f7c86414b23960104c243c10d79f4c3" dependencies = [ "ctor-proc-macro", "dtor", @@ -1416,13 +1416,13 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "proc-macro2", "quote", @@ -1489,7 +1489,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1518,9 +1518,9 @@ dependencies = [ [[package]] name = "dtor" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf39a0bfd1f94d62ffdb2802a7e6244c0f34f6ebacf5d4c26547d08cd1d67a5" +checksum = "222ef136a1c687d4aa0395c175f2c4586e379924c352fd02f7870cf7de783c23" dependencies = [ "dtor-proc-macro", ] @@ -1608,7 +1608,7 @@ checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1857,7 +1857,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1986,7 +1986,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -2166,7 +2166,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2253,7 +2253,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "proc-macro2", "quote", @@ -2476,7 +2476,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "anyhow", "bytes", @@ -2693,7 +2693,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -2764,9 +2764,9 @@ checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" [[package]] name = "indexmap" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -2803,7 +2803,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3169,7 +3169,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "anyhow", "bindgen 0.70.1", @@ -3505,7 +3505,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3781,9 +3781,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad" [[package]] name = "oneshot" @@ -3998,7 +3998,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4033,7 +4033,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4129,11 +4129,11 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.7.35", + "zerocopy 0.8.23", ] [[package]] @@ -4143,7 +4143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1ccf34da56fc294e7d4ccf69a85992b7dfb826b7cf57bac6a70bba3494cc08a" dependencies = [ "proc-macro2", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4180,7 +4180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30" dependencies = [ "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4489,7 +4489,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "derive_refineable", ] @@ -4618,7 +4618,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "anyhow", "bytes", @@ -4695,7 +4695,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.99", + "syn 2.0.100", "walkdir", ] @@ -4752,9 +4752,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657" +checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825" dependencies = [ "bitflags 2.9.0", "errno", @@ -4926,7 +4926,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5011,7 +5011,7 @@ checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "anyhow", "serde", @@ -5025,22 +5025,22 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5051,7 +5051,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5084,7 +5084,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5315,7 +5315,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5327,7 +5327,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "arrayvec", "log", @@ -5452,9 +5452,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.99" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -5487,7 +5487,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5568,7 +5568,7 @@ dependencies = [ "fastrand 2.3.0", "getrandom 0.3.1", "once_cell", - "rustix 1.0.1", + "rustix 1.0.2", "windows-sys 0.59.0", ] @@ -5618,7 +5618,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5629,7 +5629,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5748,7 +5748,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5882,7 +5882,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -6152,7 +6152,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#22d9b5d8ca6e1d7ed868abcc8ba81098e2ef6da9" +source = "git+https://github.com/zed-industries/zed#1a3597d726c3e37d4e9284ad6a009235df7ae96c" dependencies = [ "anyhow", "async-fs", @@ -6339,7 +6339,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "wasm-bindgen-shared", ] @@ -6374,7 +6374,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6624,7 +6624,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -6635,7 +6635,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -7071,7 +7071,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "synstructure", ] @@ -7120,7 +7120,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "zbus_names", "zvariant", "zvariant_utils", @@ -7150,7 +7150,6 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "byteorder", "zerocopy-derive 0.7.35", ] @@ -7171,7 +7170,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -7182,7 +7181,7 @@ checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -7202,7 +7201,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "synstructure", ] @@ -7223,7 +7222,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -7245,7 +7244,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -7297,7 +7296,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "zvariant_utils", ] @@ -7311,6 +7310,6 @@ dependencies = [ "quote", "serde", "static_assertions", - "syn 2.0.99", + "syn 2.0.100", "winnow", ] diff --git a/crates/app/src/device.rs b/crates/app/src/device.rs index d77dc4d..ed4f4ef 100644 --- a/crates/app/src/device.rs +++ b/crates/app/src/device.rs @@ -265,8 +265,7 @@ impl Device { // Fetch user's metadata let metadata = client .fetch_metadata(public_key, Duration::from_secs(2)) - .await - .unwrap_or_default() + .await? .unwrap_or_default(); // Get user's inbox relays @@ -693,6 +692,11 @@ impl Device { }); cx.spawn_in(window, |_, mut cx| async move { + // No need to update if device keys are already available + if get_device_keys().await.is_some() { + return; + } + if let Err(e) = task.await { cx.update(|window, cx| { window.push_notification( @@ -821,7 +825,7 @@ impl Device { this.keyboard(false) .closable(false) - .width(px(420.)) + .width(px(430.)) .title("Your Messaging Relays are not configured") .child(relays.clone()) .footer( @@ -857,7 +861,7 @@ impl Device { this.keyboard(false) .closable(false) - .width(px(420.)) + .width(px(430.)) .child( div() .flex() diff --git a/crates/app/src/views/onboarding.rs b/crates/app/src/views/onboarding.rs index 5433a3c..5f09f3f 100644 --- a/crates/app/src/views/onboarding.rs +++ b/crates/app/src/views/onboarding.rs @@ -235,6 +235,89 @@ impl Render for Onboarding { ) .child(div().w_72().w_full().flex().flex_col().gap_2().map(|this| { match self.open { + PageKind::Connect => this + .when_some(self.connect_url.read(cx).as_ref(), |this, path| { + this.child( + div() + .mb_2() + .p_2() + .size_72() + .flex() + .flex_col() + .items_center() + .justify_center() + .gap_2() + .rounded_lg() + .shadow_md() + .when(cx.theme().appearance.is_dark(), |this| { + this.shadow_none().border_1().border_color( + cx.theme().base.step(cx, ColorScaleStep::SIX), + ) + }) + .bg(cx.theme().background) + .child(img(path.as_path()).h_64()), + ) + }) + .child( + div() + .text_xs() + .text_center() + .font_semibold() + .line_height(relative(1.2)) + .child("Scan this QR to connect"), + ) + .child( + Button::new("wait_for_connection") + .label("Waiting for connection") + .primary() + .w_full() + .loading(true) + .disabled(true), + ) + .child( + Button::new("use_url") + .label("Use Bunker URL") + .custom( + ButtonCustomVariant::new(window, cx) + .color( + cx.theme().base.step(cx, ColorScaleStep::THREE), + ) + .border( + cx.theme().base.step(cx, ColorScaleStep::THREE), + ) + .hover( + cx.theme().base.step(cx, ColorScaleStep::FOUR), + ) + .active( + cx.theme().base.step(cx, ColorScaleStep::FIVE), + ) + .foreground( + cx.theme() + .base + .step(cx, ColorScaleStep::TWELVE), + ), + ) + .w_full() + .on_click(cx.listener(move |this, _, window, cx| { + this.open(PageKind::Bunker, window, cx); + })), + ) + .child( + div() + .my_2() + .w_full() + .h_px() + .bg(cx.theme().base.step(cx, ColorScaleStep::THREE)), + ) + .child( + Button::new("cancel") + .label("Cancel") + .ghost() + .w_full() + .on_click(cx.listener(move |this, _, window, cx| { + this.open(PageKind::Selection, window, cx); + })), + ), PageKind::Bunker => this .child( div() @@ -270,108 +353,6 @@ impl Render for Onboarding { this.connect(window, cx); })), ) - .child( - Button::new("use_url") - .label("Get Connection URL") - .custom( - ButtonCustomVariant::new(window, cx) - .color( - cx.theme().base.step(cx, ColorScaleStep::THREE), - ) - .border( - cx.theme().base.step(cx, ColorScaleStep::THREE), - ) - .hover( - cx.theme().base.step(cx, ColorScaleStep::FOUR), - ) - .active( - cx.theme().base.step(cx, ColorScaleStep::FIVE), - ) - .foreground( - cx.theme() - .base - .step(cx, ColorScaleStep::TWELVE), - ), - ) - .w_full() - .on_click(cx.listener(move |this, _, window, cx| { - this.wait_for_connection(window, cx); - })), - ) - .child( - div() - .my_2() - .w_full() - .h_px() - .bg(cx.theme().base.step(cx, ColorScaleStep::THREE)), - ) - .child( - Button::new("cancel") - .label("Cancel") - .ghost() - .w_full() - .on_click(cx.listener(move |this, _, window, cx| { - this.open(PageKind::Selection, window, cx); - })), - ), - PageKind::Connect => this - .when_some(self.connect_url.read(cx).as_ref(), |this, path| { - this.child( - div() - .mb_2() - .p_2() - .size_72() - .flex() - .flex_col() - .items_center() - .justify_center() - .gap_2() - .rounded_lg() - .shadow_md() - .when(cx.theme().appearance.is_dark(), |this| { - this.shadow_none().border_1().border_color( - cx.theme().base.step(cx, ColorScaleStep::SIX), - ) - }) - .bg(cx.theme().background) - .child(img(path.as_path()).h_64()), - ) - }) - .child( - div() - .text_xs() - .text_center() - .font_semibold() - .line_height(relative(1.2)) - .child("Scan this QR to connect"), - ) - .child( - Button::new("wait_for_connection") - .label("Waiting for connection") - .custom( - ButtonCustomVariant::new(window, cx) - .color( - cx.theme().base.step(cx, ColorScaleStep::THREE), - ) - .border( - cx.theme().base.step(cx, ColorScaleStep::THREE), - ) - .hover( - cx.theme().base.step(cx, ColorScaleStep::FOUR), - ) - .active( - cx.theme().base.step(cx, ColorScaleStep::FIVE), - ) - .foreground( - cx.theme() - .base - .step(cx, ColorScaleStep::TWELVE), - ), - ) - .w_full() - .loading(true) - .disabled(true), - ) .child( div() .my_2() @@ -395,7 +376,7 @@ impl Render for Onboarding { .primary() .w_full() .on_click(cx.listener(move |this, _, window, cx| { - this.open(PageKind::Bunker, window, cx); + this.wait_for_connection(window, cx); })), ) .child( diff --git a/crates/app/src/views/sidebar/compose.rs b/crates/app/src/views/sidebar/compose.rs index a9a7c08..0706ece 100644 --- a/crates/app/src/views/sidebar/compose.rs +++ b/crates/app/src/views/sidebar/compose.rs @@ -221,8 +221,7 @@ impl Compose { let metadata = client .fetch_metadata(public_key, Duration::from_secs(2)) - .await - .unwrap_or_default() + .await? .unwrap_or_default(); Ok(NostrProfile::new(public_key, metadata)) @@ -237,8 +236,7 @@ impl Compose { cx.background_spawn(async move { let metadata = client .fetch_metadata(public_key, Duration::from_secs(2)) - .await - .unwrap_or_default() + .await? .unwrap_or_default(); Ok(NostrProfile::new(public_key, metadata))