From a96e8d0a6d9adfab123d81a9ed1cb885b19b3f4f Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Mon, 4 Jul 2022 12:44:06 +0200
Subject: [PATCH 01/16] terminal-tui: Add basic application framework

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 Cargo.lock                     | 1252 ++++++++++++++++++++------------
 Cargo.toml                     |    1 +
 terminal-tui/Cargo.toml        |   10 +
 terminal-tui/src/components.rs |  427 +++++++++++
 terminal-tui/src/layout.rs     |   50 ++
 terminal-tui/src/lib.rs        |  159 ++++
 terminal-tui/src/theme.rs      |    7 +
 7 files changed, 1434 insertions(+), 472 deletions(-)
 create mode 100644 terminal-tui/Cargo.toml
 create mode 100644 terminal-tui/src/components.rs
 create mode 100644 terminal-tui/src/layout.rs
 create mode 100644 terminal-tui/src/lib.rs
 create mode 100644 terminal-tui/src/theme.rs

diff --git a/Cargo.lock b/Cargo.lock
index c8c0908b..1d7c1417 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,7 +25,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8"
 dependencies = [
  "crypto-common",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
 ]
 
 [[package]]
@@ -47,43 +47,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
 
 [[package]]
-name = "aho-corasick"
-version = "0.7.18"
+name = "ahash"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "memchr",
+ "getrandom 0.2.8",
+ "once_cell",
+ "version_check",
 ]
 
 [[package]]
-name = "android_system_properties"
-version = "0.1.4"
+name = "aho-corasick"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
- "libc",
+ "memchr",
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "android_system_properties"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
- "winapi 0.3.9",
+ "libc",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.57"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
 name = "arc-swap"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"
+checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
 
 [[package]]
 name = "arrayref"
@@ -128,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -139,39 +141,42 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.6.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
+checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7"
 dependencies = [
+ "async-lock",
+ "autocfg",
  "concurrent-queue",
  "futures-lite",
  "libc",
  "log",
- "once_cell",
  "parking",
  "polling",
  "slab",
- "socket2 0.4.4",
+ "socket2 0.4.7",
  "waker-fn",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
+checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
 dependencies = [
  "event-listener",
+ "futures-lite",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
+checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
 dependencies = [
  "async-io",
+ "autocfg",
  "blocking",
  "cfg-if 1.0.0",
  "event-listener",
@@ -205,15 +210,15 @@ dependencies = [
 
 [[package]]
 name = "async-task"
-version = "4.2.0"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
+checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.53"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
+checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -293,16 +298,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "instant",
  "rand 0.8.5",
 ]
 
 [[package]]
 name = "base-x"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74"
+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
 
 [[package]]
 name = "base16ct"
@@ -334,9 +339,9 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
 [[package]]
 name = "base64"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64ct"
@@ -461,16 +466,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
  "block-padding 0.2.1",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
 ]
 
 [[package]]
 name = "block-buffer"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
 ]
 
 [[package]]
@@ -539,15 +544,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.9.1"
+version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
 
 [[package]]
 name = "byte-slice-cast"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "byte-tools"
@@ -557,9 +562,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.9.1"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
+checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f"
 
 [[package]]
 name = "byteorder"
@@ -606,9 +611,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
 [[package]]
 name = "camino"
-version = "1.0.7"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23"
+checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
 dependencies = [
  "serde",
 ]
@@ -624,22 +629,29 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
+checksum = "406c859255d568f4f742b3146d51851f3bfd49f734a2c289d9107c4395ee0062"
 dependencies = [
  "camino",
  "cargo-platform",
  "semver",
  "serde",
  "serde_json",
+ "thiserror",
 ]
 
+[[package]]
+name = "cassowary"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
+
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
 dependencies = [
  "jobserver",
 ]
@@ -710,7 +722,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
 ]
 
 [[package]]
@@ -726,26 +738,26 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.1.14"
+version = "3.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535434c063ced786eb04aaf529308092c5ab60889e8fe24275d15de07b01fa97"
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
 dependencies = [
  "atty",
  "bitflags",
  "clap_derive",
  "clap_lex",
  "indexmap",
- "lazy_static",
+ "once_cell",
  "strsim",
  "termcolor",
- "textwrap",
+ "textwrap 0.16.0",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.1.7"
+version = "3.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -756,11 +768,11 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.2.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
 dependencies = [
- "os_str_bytes 6.0.0",
+ "os_str_bytes 6.3.1",
 ]
 
 [[package]]
@@ -771,9 +783,9 @@ checksum = "218d6bd3dde8e442a975fa1cd233c0e5fded7596bccfe39f58eca98d22421e0a"
 
 [[package]]
 name = "cmake"
-version = "0.1.48"
+version = "0.1.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
+checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
 dependencies = [
  "cc",
 ]
@@ -803,6 +815,16 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
 [[package]]
 name = "coins-bip32"
 version = "0.7.0"
@@ -813,7 +835,7 @@ dependencies = [
  "bs58",
  "coins-core",
  "digest 0.10.5",
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "hmac",
  "k256",
  "lazy_static",
@@ -830,7 +852,7 @@ checksum = "2a11892bcac83b4c6e95ab84b5b06c76d9d70ad73548dd07418269c5c7977171"
 dependencies = [
  "bitvec 0.17.4",
  "coins-bip32",
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "hex",
  "hmac",
  "pbkdf2 0.11.0",
@@ -850,13 +872,13 @@ dependencies = [
  "bech32",
  "blake2",
  "digest 0.10.5",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "hex",
  "ripemd",
  "serde",
  "serde_derive",
  "sha2 0.10.6",
- "sha3 0.10.4",
+ "sha3 0.10.6",
  "thiserror",
 ]
 
@@ -903,23 +925,22 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "1.2.2"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
 dependencies = [
  "cache-padded",
 ]
 
 [[package]]
 name = "console"
-version = "0.15.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
 dependencies = [
  "encode_unicode",
+ "lazy_static",
  "libc",
- "once_cell",
- "regex",
  "terminal_size",
  "unicode-width",
  "winapi 0.3.9",
@@ -957,9 +978,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 dependencies = [
  "libc",
 ]
@@ -975,9 +996,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
+checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-channel",
@@ -989,9 +1010,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -999,9 +1020,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
@@ -1010,23 +1031,22 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.8"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
+checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
 dependencies = [
  "autocfg",
  "cfg-if 1.0.0",
  "crossbeam-utils",
- "lazy_static",
  "memoffset",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -1034,12 +1054,36 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
 dependencies = [
  "cfg-if 1.0.0",
- "lazy_static",
+]
+
+[[package]]
+name = "crossterm"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+dependencies = [
+ "bitflags",
+ "crossterm_winapi",
+ "libc",
+ "mio 0.8.5",
+ "parking_lot 0.12.1",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
+dependencies = [
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1050,12 +1094,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f2b443d17d49dad5ef0ede301c3179cc923b8822f3393b4d2c28c269dd4a122"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
- "generic-array 0.14.5",
- "rand_core 0.6.3",
+ "generic-array 0.14.6",
+ "rand_core 0.6.4",
  "subtle",
  "zeroize",
 ]
@@ -1066,7 +1110,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "typenum",
 ]
 
@@ -1076,15 +1120,15 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "subtle",
 ]
 
 [[package]]
 name = "ctor"
-version = "0.1.22"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
 dependencies = [
  "quote",
  "syn",
@@ -1112,6 +1156,50 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "cxx"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dashmap"
 version = "4.0.2"
@@ -1124,13 +1212,15 @@ dependencies = [
 
 [[package]]
 name = "dashmap"
-version = "5.3.2"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b5a84352d6654d195b2365e38b5a7eacfdca4ad1b375196a1f76c6d7dd01ce"
+checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown 0.12.0",
+ "hashbrown 0.12.3",
  "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.4",
 ]
 
 [[package]]
@@ -1183,9 +1273,9 @@ dependencies = [
 
 [[package]]
 name = "dialoguer"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8c8ae48e400addc32a8710c8d62d55cb84249a7d58ac4cd959daecfbaddc545"
+checksum = "a92e7e37ecef6857fdc0c0c5d42fd5b0938e46590c2183cc92dd310a6d078eb1"
 dependencies = [
  "console",
  "tempfile",
@@ -1194,9 +1284,9 @@ dependencies = [
 
 [[package]]
 name = "diff"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
 [[package]]
 name = "digest"
@@ -1213,7 +1303,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
 ]
 
 [[package]]
@@ -1222,7 +1312,7 @@ version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
 dependencies = [
- "block-buffer 0.10.2",
+ "block-buffer 0.10.3",
  "crypto-common",
  "subtle",
 ]
@@ -1259,21 +1349,21 @@ dependencies = [
 
 [[package]]
 name = "dunce"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541"
+checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
+checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
 
 [[package]]
 name = "ecdsa"
-version = "0.14.7"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85789ce7dfbd0f0624c07ef653a08bb2ebf43d3e16531361f46d36dd54334fed"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
  "der",
  "elliptic-curve",
@@ -1283,24 +1373,24 @@ dependencies = [
 
 [[package]]
 name = "ed25519-zebra"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
+checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
 dependencies = [
  "curve25519-dalek",
+ "hashbrown 0.12.3",
  "hex",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "serde",
  "sha2 0.9.9",
- "thiserror",
  "zeroize",
 ]
 
 [[package]]
 name = "either"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 dependencies = [
  "serde",
 ]
@@ -1316,10 +1406,10 @@ dependencies = [
  "der",
  "digest 0.10.5",
  "ff",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "group",
  "pkcs8",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "sec1",
  "subtle",
  "zeroize",
@@ -1367,7 +1457,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.6",
- "sha3 0.10.4",
+ "sha3 0.10.6",
  "thiserror",
  "uuid 0.8.2",
 ]
@@ -1378,13 +1468,13 @@ version = "17.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4966fba78396ff92db3b817ee71143eccd98acf0f876b8d600e585a670c5d1b"
 dependencies = [
- "ethereum-types",
+ "ethereum-types 0.13.1",
  "hex",
  "once_cell",
  "regex",
  "serde",
  "serde_json",
- "sha3 0.10.4",
+ "sha3 0.10.6",
  "thiserror",
  "uint",
 ]
@@ -1396,9 +1486,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef"
 dependencies = [
  "crunchy",
- "fixed-hash",
+ "fixed-hash 0.7.0",
+ "impl-rlp",
+ "impl-serde 0.3.2",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethbloom"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+dependencies = [
+ "crunchy",
+ "fixed-hash 0.8.0",
  "impl-rlp",
- "impl-serde",
+ "impl-serde 0.4.0",
  "tiny-keccak",
 ]
 
@@ -1408,11 +1511,25 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6"
 dependencies = [
- "ethbloom",
- "fixed-hash",
+ "ethbloom 0.12.1",
+ "fixed-hash 0.7.0",
+ "impl-rlp",
+ "impl-serde 0.3.2",
+ "primitive-types 0.11.1",
+ "uint",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81224dc661606574f5a0f28c9947d0ee1d93ff11c5f1c4e7272f52e8c0b5483c"
+dependencies = [
+ "ethbloom 0.13.0",
+ "fixed-hash 0.8.0",
  "impl-rlp",
- "impl-serde",
- "primitive-types",
+ "impl-serde 0.4.0",
+ "primitive-types 0.12.1",
  "uint",
 ]
 
@@ -1473,7 +1590,7 @@ dependencies = [
  "dunce",
  "ethers-core",
  "eyre",
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "hex",
  "proc-macro2",
  "quote",
@@ -1514,7 +1631,7 @@ dependencies = [
  "elliptic-curve",
  "ethabi",
  "fastrlp",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "hex",
  "k256",
  "once_cell",
@@ -1539,7 +1656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b279a3d00bd219caa2f9a34451b4accbfa9a1eaafc26dcda9d572591528435f0"
 dependencies = [
  "ethers-core",
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "reqwest",
  "semver",
  "serde",
@@ -1582,12 +1699,12 @@ checksum = "e46482e4d1e79b20c338fd9db9e166184eb387f0a4e7c05c5b5c0aa2e8c8900c"
 dependencies = [
  "async-trait",
  "auto_impl",
- "base64 0.13.0",
+ "base64 0.13.1",
  "ethers-core",
  "futures-core",
  "futures-timer",
  "futures-util",
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "hashers",
  "hex",
  "http",
@@ -1633,9 +1750,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "eyre"
@@ -1655,9 +1772,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
  "instant",
 ]
@@ -1671,15 +1788,15 @@ dependencies = [
  "arrayvec 0.7.2",
  "auto_impl",
  "bytes 1.2.1",
- "ethereum-types",
+ "ethereum-types 0.13.1",
  "fastrlp-derive",
 ]
 
 [[package]]
 name = "fastrlp-derive"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fa41ebc231af281098b11ad4a4f6182ec9096902afffe948034a20d4e1385a"
+checksum = "d6e454d03710df0cd95ce075d7731ce3fa35fb3779c15270cd491bc5f2ef9355"
 dependencies = [
  "bytes 1.2.1",
  "proc-macro2",
@@ -1689,11 +1806,11 @@ dependencies = [
 
 [[package]]
 name = "ff"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -1709,14 +1826,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
+checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
- "winapi 0.3.9",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1731,6 +1848,18 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "fixed-hash"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
+dependencies = [
+ "byteorder",
+ "rand 0.8.5",
+ "rustc-hex",
+ "static_assertions",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.2.0"
@@ -1739,13 +1868,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "flate2"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
 dependencies = [
- "cfg-if 1.0.0",
  "crc32fast",
- "libc",
  "libz-sys",
  "miniz_oxide",
 ]
@@ -1773,11 +1900,10 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "matches",
  "percent-encoding",
 ]
 
@@ -1824,9 +1950,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1839,9 +1965,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1849,15 +1975,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1866,9 +1992,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
 
 [[package]]
 name = "futures-lite"
@@ -1898,9 +2024,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1909,15 +2035,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
 
 [[package]]
 name = "futures-task"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
 
 [[package]]
 name = "futures-timer"
@@ -1927,9 +2053,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1952,7 +2078,7 @@ dependencies = [
  "bytes 0.5.6",
  "futures",
  "memchr",
- "pin-project 0.4.29",
+ "pin-project 0.4.30",
 ]
 
 [[package]]
@@ -1975,9 +2101,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
 dependencies = [
  "serde",
  "typenum",
@@ -1997,14 +2123,14 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
  "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
@@ -2130,9 +2256,9 @@ dependencies = [
 
 [[package]]
 name = "git-packetline"
-version = "0.12.4"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd72d1851a70ec9dbffb5e70bf59848ae0a5d86bfc3f1d764c65bbf958a881d"
+checksum = "f80cbb5c48737d89cfb2ba74b8b62df2c36a4ce98ad8225e4125be37453c7fde"
 dependencies = [
  "bstr",
  "futures-io",
@@ -2217,7 +2343,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf6d78c8a68ab3ba1cd42684dbe0233e81a28301321c4a66417285e47cd79c6b"
 dependencies = [
- "dashmap 5.3.2",
+ "dashmap 5.4.0",
  "libc",
  "once_cell",
  "signal-hook",
@@ -2277,9 +2403,9 @@ dependencies = [
 
 [[package]]
 name = "git-validate"
-version = "0.5.3"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58bafc6cd6f455a95997c47823182dd62cdb47f03564c44c6b6d910221801dc"
+checksum = "7af1453adfe6011f0ef71824591b7cdd85850c27bbf3dc8fa855574bed2fe107"
 dependencies = [
  "bstr",
  "quick-error 2.0.1",
@@ -2302,9 +2428,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
+checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -2332,20 +2458,20 @@ dependencies = [
 
 [[package]]
 name = "group"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
  "ff",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
 name = "h2"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
 dependencies = [
  "bytes 1.2.1",
  "fnv",
@@ -2372,21 +2498,18 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
 dependencies = [
- "ahash",
+ "ahash 0.3.8",
  "autocfg",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
-[[package]]
-name = "hashbrown"
-version = "0.12.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.6",
+]
 
 [[package]]
 name = "hashers"
@@ -2441,29 +2564,29 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
+checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
 dependencies = [
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes 1.2.1",
  "fnv",
- "itoa 1.0.1",
+ "itoa 1.0.4",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes 1.2.1",
  "http",
@@ -2472,9 +2595,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
@@ -2490,9 +2613,9 @@ checksum = "86cce260d758a9aa3d7c4b99d55c815a540f8a37514ba6046ab6be402a157cb0"
 
 [[package]]
 name = "hyper"
-version = "0.14.18"
+version = "0.14.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
+checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064"
 dependencies = [
  "bytes 1.2.1",
  "futures-channel",
@@ -2503,9 +2626,9 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 1.0.1",
+ "itoa 1.0.4",
  "pin-project-lite",
- "socket2 0.4.4",
+ "socket2 0.4.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -2520,31 +2643,41 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
 dependencies = [
  "http",
  "hyper",
- "rustls 0.20.4",
+ "rustls 0.20.7",
  "tokio",
  "tokio-rustls",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.46"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
+ "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "matches",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -2593,7 +2726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9"
 dependencies = [
  "bitmaps",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "rand_xoshiro",
  "sized-chunks",
  "typenum",
@@ -2641,6 +2774,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "impl-serde"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "impl-trait-for-tuples"
 version = "0.2.2"
@@ -2660,12 +2802,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
 name = "indexmap"
-version = "1.8.1"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg",
- "hashbrown 0.11.2",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -2706,7 +2848,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
 ]
 
 [[package]]
@@ -2738,9 +2880,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
 
 [[package]]
 name = "itertools"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
  "either",
 ]
@@ -2753,24 +2895,24 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
 
 [[package]]
 name = "jobserver"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.58"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2813,22 +2955,22 @@ dependencies = [
 
 [[package]]
 name = "k256"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3636d281d46c3b64182eb3a0a42b7b483191a2ecc3f05301fa67403f7c9bc949"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
 dependencies = [
  "cfg-if 1.0.0",
  "ecdsa",
  "elliptic-curve",
  "sha2 0.10.6",
- "sha3 0.10.4",
+ "sha3 0.10.6",
 ]
 
 [[package]]
 name = "keccak"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
+checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
 
 [[package]]
 name = "kernel32-sys"
@@ -2840,6 +2982,29 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "lazy-regex"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae9656bf98b413727b974a451039bc00ce546c3de9440cb4a7b65222b71e17cc"
+dependencies = [
+ "lazy-regex-proc_macros",
+ "once_cell",
+ "regex",
+]
+
+[[package]]
+name = "lazy-regex-proc_macros"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3c3042a5f73640f091fda4175798f2b51c2107deeab18e3017873a4772dd36"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2860,15 +3025,15 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "lexopt"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de7513aea7d10dc0694d719ac53de3b74f1600e41b9f81ed9f395d8ec36a2a70"
+checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
 
 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
 
 [[package]]
 name = "libgit2-sys"
@@ -2931,7 +3096,7 @@ dependencies = [
  "notify",
  "num_cpus",
  "once_cell",
- "parking_lot 0.12.0",
+ "parking_lot 0.12.1",
  "percent-encoding",
  "picky-asn1",
  "picky-asn1-der",
@@ -2950,7 +3115,7 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "sized-vec",
- "socket2 0.4.4",
+ "socket2 0.4.7",
  "tempfile",
  "thiserror",
  "time",
@@ -2978,9 +3143,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.6"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e"
+checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
 dependencies = [
  "cc",
  "cmake",
@@ -3029,6 +3194,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "link-cplusplus"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "link-crypto"
 version = "0.1.0"
@@ -3079,7 +3253,7 @@ dependencies = [
  "im",
  "lazy_static",
  "once_cell",
- "parking_lot 0.12.0",
+ "parking_lot 0.12.1",
  "pin-project 1.0.12",
  "regex",
  "rustc-hash",
@@ -3149,7 +3323,7 @@ dependencies = [
  "itertools",
  "link-crypto",
  "link-git",
- "parking_lot 0.12.0",
+ "parking_lot 0.12.1",
  "radicle-data",
  "radicle-std-ext",
  "rand 0.8.5",
@@ -3176,9 +3350,9 @@ dependencies = [
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "lnk-clib"
@@ -3195,7 +3369,7 @@ dependencies = [
  "once_cell",
  "serde",
  "serde_json",
- "socket2 0.4.4",
+ "socket2 0.4.7",
  "thiserror",
  "tokio",
  "tracing",
@@ -3305,9 +3479,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -3388,9 +3562,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.5.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
 dependencies = [
  "adler",
 ]
@@ -3429,16 +3603,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
  "libc",
  "log",
- "miow 0.3.7",
- "ntapi",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "windows-sys",
 ]
 
 [[package]]
@@ -3510,7 +3682,7 @@ dependencies = [
  "blake2s_simd",
  "blake3",
  "digest 0.9.0",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "multihash-derive",
  "sha-1 0.9.8",
  "sha2 0.9.9",
@@ -3534,9 +3706,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.37"
+version = "0.2.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
+checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -3686,32 +3858,23 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
 dependencies = [
  "hermit-abi",
  "libc",
 ]
 
-[[package]]
-name = "num_threads"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "number_prefix"
 version = "0.4.0"
@@ -3729,9 +3892,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.14.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "opaque-debug"
@@ -3747,9 +3910,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.41"
+version = "0.10.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
@@ -3779,18 +3942,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "111.22.0+1.1.1q"
+version = "111.24.0+1.1.1s"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
+checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.75"
+version = "0.9.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
 dependencies = [
  "autocfg",
  "cc",
@@ -3808,9 +3971,9 @@ checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
 
 [[package]]
 name = "os_str_bytes"
-version = "6.0.0"
+version = "6.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9"
 
 [[package]]
 name = "output_vt100"
@@ -3885,12 +4048,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.3",
+ "parking_lot_core 0.9.4",
 ]
 
 [[package]]
@@ -3909,9 +4072,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -3927,7 +4090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8"
 dependencies = [
  "base64ct",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -3938,7 +4101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
 dependencies = [
  "base64ct",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -3965,9 +4128,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "petgraph"
@@ -4055,7 +4218,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3033675030de806aba1d5470949701b7c9f1dbf77e3bb17bd12e5f945e560ba"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
  "oid",
  "picky-asn1",
  "picky-asn1-der",
@@ -4064,11 +4227,11 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "0.4.29"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909"
+checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a"
 dependencies = [
- "pin-project-internal 0.4.29",
+ "pin-project-internal 0.4.30",
 ]
 
 [[package]]
@@ -4082,9 +4245,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.29"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a"
+checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4126,16 +4289,17 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
 [[package]]
 name = "polling"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
 dependencies = [
+ "autocfg",
  "cfg-if 1.0.0",
  "libc",
  "log",
@@ -4156,20 +4320,20 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "pretty_assertions"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
 dependencies = [
- "ansi_term",
  "ctor",
  "diff",
  "output_vt100",
+ "yansi",
 ]
 
 [[package]]
@@ -4178,19 +4342,33 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
 dependencies = [
- "fixed-hash",
+ "fixed-hash 0.7.0",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde 0.3.2",
+ "uint",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+dependencies = [
+ "fixed-hash 0.8.0",
  "impl-codec",
  "impl-rlp",
- "impl-serde",
+ "impl-serde 0.4.0",
  "uint",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.3"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
 dependencies = [
+ "once_cell",
  "thiserror",
  "toml",
 ]
@@ -4221,9 +4399,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
 dependencies = [
  "unicode-ident",
 ]
@@ -4320,9 +4498,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
@@ -4708,7 +4886,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "automerge",
- "base64 0.13.0",
+ "base64 0.13.1",
  "byteorder",
  "chrono",
  "coins-bip32",
@@ -4738,7 +4916,7 @@ dependencies = [
  "toml",
  "ureq",
  "url",
- "uuid 1.1.2",
+ "uuid 1.2.1",
  "walletconnect",
  "zeroize",
 ]
@@ -4792,7 +4970,7 @@ dependencies = [
  "chacha20poly1305",
  "ed25519-zebra",
  "futures",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "lazy_static",
  "lnk-cryptovec",
  "lnk-thrussh-agent",
@@ -4835,6 +5013,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "radicle-terminal-tui"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "tui-realm-stdlib",
+ "tuirealm",
+]
+
 [[package]]
 name = "radium"
 version = "0.3.0"
@@ -4869,7 +5056,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -4889,7 +5076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -4903,11 +5090,11 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
 ]
 
 [[package]]
@@ -4934,7 +5121,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
 dependencies = [
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -4943,14 +5130,14 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
 dependencies = [
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
+checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
 dependencies = [
  "autocfg",
  "crossbeam-deque",
@@ -4960,9 +5147,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
+checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -4972,9 +5159,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags",
 ]
@@ -4985,16 +5172,16 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "redox_syscall",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.5.5"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5009,9 +5196,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "remove_dir_all"
@@ -5024,11 +5211,11 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.11"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
  "bytes 1.2.1",
  "encoding_rs",
  "futures-core",
@@ -5040,12 +5227,12 @@ dependencies = [
  "hyper-rustls",
  "ipnet",
  "js-sys",
- "lazy_static",
  "log",
  "mime",
+ "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.20.4",
+ "rustls 0.20.7",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -5063,9 +5250,9 @@ dependencies = [
 
 [[package]]
 name = "rfc6979"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88c86280f057430a52f4861551b092a01b419b8eacefc7c995eacb9dc132fe32"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
  "crypto-bigint",
  "hmac",
@@ -5089,18 +5276,18 @@ dependencies = [
 
 [[package]]
 name = "ripemd"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e2ee464e763f6527991a6d532142e3c2016eb9907cc081401c11862c26a840"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
 dependencies = [
  "digest 0.10.5",
 ]
 
 [[package]]
 name = "rlp"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
 dependencies = [
  "bytes 1.2.1",
  "rustc-hex",
@@ -5185,7 +5372,7 @@ version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
  "log",
  "ring",
  "sct 0.6.1",
@@ -5194,9 +5381,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.20.4"
+version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
+checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
 dependencies = [
  "log",
  "ring",
@@ -5210,7 +5397,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
 ]
 
 [[package]]
@@ -5233,9 +5420,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
 [[package]]
 name = "safe-transaction-client"
@@ -5284,6 +5471,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "scratch"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+
 [[package]]
 name = "scrypt"
 version = "0.8.1"
@@ -5337,7 +5530,7 @@ checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
 dependencies = [
  "base16ct",
  "der",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
  "pkcs8",
  "subtle",
  "zeroize",
@@ -5345,9 +5538,9 @@ dependencies = [
 
 [[package]]
 name = "secstr"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49fa8c1d89e7dc5e2776fbf507d8b088ff61bbaf83bf4da1cc9ed1c061358104"
+checksum = "e04f657244f605c4cf38f6de5993e8bd050c8a303f86aeabff142d5c7c113e12"
 dependencies = [
  "libc",
 ]
@@ -5369,9 +5562,9 @@ checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
 
 [[package]]
 name = "serde"
-version = "1.0.144"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
 dependencies = [
  "serde_derive",
 ]
@@ -5388,9 +5581,9 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54"
+checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b"
 dependencies = [
  "serde",
 ]
@@ -5408,9 +5601,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.144"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5419,12 +5612,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.80"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f972498cf015f7c0746cac89ebe1d6ef10c293b94175a243a2d9442c163d9944"
+checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
 dependencies = [
  "indexmap",
- "itoa 1.0.1",
+ "itoa 1.0.4",
  "ryu",
  "serde",
 ]
@@ -5436,16 +5629,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.1",
+ "itoa 1.0.4",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
  "indexmap",
  "ryu",
@@ -5543,9 +5736,9 @@ dependencies = [
 
 [[package]]
 name = "sha3"
-version = "0.10.4"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaedf34ed289ea47c2b741bb72e5357a209512d67bcd4bda44359e5bf0470f56"
+checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
 dependencies = [
  "digest 0.10.5",
  "keccak",
@@ -5553,14 +5746,25 @@ dependencies = [
 
 [[package]]
 name = "signal-hook"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
+checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
 dependencies = [
  "libc",
  "signal-hook-registry",
 ]
 
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+dependencies = [
+ "libc",
+ "mio 0.8.5",
+ "signal-hook",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.0"
@@ -5572,19 +5776,19 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.6.3"
+version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
  "digest 0.10.5",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "similar"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
+checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
 
 [[package]]
 name = "siphasher"
@@ -5613,15 +5817,24 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "smawk"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
 
 [[package]]
 name = "smol_str"
@@ -5645,9 +5858,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -5711,9 +5924,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5786,24 +5999,35 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.15.0"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d"
+dependencies = [
+ "smawk",
+ "unicode-linebreak",
+ "unicode-width",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5812,14 +6036,20 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.9"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
+checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
 dependencies = [
- "libc",
- "num_threads",
+ "serde",
+ "time-core",
 ]
 
+[[package]]
+name = "time-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+
 [[package]]
 name = "timeago"
 version = "0.3.1"
@@ -5852,28 +6082,28 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.18.0"
+version = "1.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b"
+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
 dependencies = [
+ "autocfg",
  "bytes 1.2.1",
  "libc",
  "memchr",
- "mio 0.8.2",
+ "mio 0.8.5",
  "num_cpus",
- "once_cell",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.4.4",
+ "socket2 0.4.7",
  "tokio-macros",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5882,20 +6112,20 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.23.3"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e"
+checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
- "rustls 0.20.4",
+ "rustls 0.20.7",
  "tokio",
  "webpki 0.22.0",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
 dependencies = [
  "bytes 1.2.1",
  "futures-core",
@@ -5916,15 +6146,15 @@ dependencies = [
 
 [[package]]
 name = "tower-service"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.36"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -5935,9 +6165,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5946,9 +6176,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
  "once_cell",
 ]
@@ -5969,6 +6199,55 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
+[[package]]
+name = "tui"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1"
+dependencies = [
+ "bitflags",
+ "cassowary",
+ "crossterm",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "tui-realm-stdlib"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66f252bf8b07c6fd708ddd6349b5f044ae5b488b26929c745728d9c7e2cebfa6"
+dependencies = [
+ "textwrap 0.15.2",
+ "tuirealm",
+ "unicode-width",
+]
+
+[[package]]
+name = "tuirealm"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "265411b5606f400459af94fbc5aae6a7bc0e98094d08cb5868390c932be88e26"
+dependencies = [
+ "bitflags",
+ "crossterm",
+ "lazy-regex",
+ "thiserror",
+ "tui",
+ "tuirealm_derive",
+]
+
+[[package]]
+name = "tuirealm_derive"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0adcdaf59881626555558eae08f8a53003c8a1961723b4d7a10c51599abbc81"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "typenum"
 version = "1.15.0"
@@ -5977,9 +6256,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "uint"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
+checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601"
 dependencies = [
  "byteorder",
  "crunchy",
@@ -6004,24 +6283,40 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
+dependencies = [
+ "hashbrown 0.12.3",
+ "regex",
+]
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+
 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unicode-xid"
@@ -6059,15 +6354,15 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9399fa2f927a3d327187cbd201480cee55bee6ac5d3c77dd27f0c6814cff16d5"
+checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
  "chunked_transfer",
  "log",
  "once_cell",
- "rustls 0.20.4",
+ "rustls 0.20.7",
  "serde",
  "serde_json",
  "url",
@@ -6077,13 +6372,12 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
  "form_urlencoded",
  "idna",
- "matches",
  "percent-encoding",
  "serde",
 ]
@@ -6094,17 +6388,17 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "serde",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
+checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.8",
  "rand 0.8.5",
  "serde",
 ]
@@ -6170,7 +6464,7 @@ source = "git+https://github.com/radicle-dev/walletconnect-rs?branch=master#bca5
 dependencies = [
  "atty",
  "data-encoding",
- "ethereum-types",
+ "ethereum-types 0.14.0",
  "ethers-core",
  "futures",
  "jsonrpc-core",
@@ -6207,12 +6501,6 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -6221,9 +6509,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -6231,13 +6519,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -6246,9 +6534,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.30"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -6258,9 +6546,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6268,9 +6556,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6281,9 +6569,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "wasm-timer"
@@ -6302,9 +6590,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.57"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6332,9 +6620,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
+checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
 dependencies = [
  "webpki 0.22.0",
 ]
@@ -6393,46 +6681,60 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
+ "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
  "windows_x86_64_msvc",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
 
 [[package]]
 name = "winreg"
@@ -6498,6 +6800,12 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
 [[package]]
 name = "zeroize"
 version = "1.5.7"
diff --git a/Cargo.toml b/Cargo.toml
index 69ba768e..c7a1df17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ members = [
   "anchor",
   "account",
   "terminal",
+  "terminal-tui",
   "common",
   "checkout",
   "cli",
diff --git a/terminal-tui/Cargo.toml b/terminal-tui/Cargo.toml
new file mode 100644
index 00000000..a42f66f9
--- /dev/null
+++ b/terminal-tui/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "radicle-terminal-tui"
+version = "0.1.0"
+edition = "2018"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+anyhow = { version = "1.0" }
+tuirealm = { version = "1.7.0" }
+tui-realm-stdlib = { version = "1.1.6" }
diff --git a/terminal-tui/src/components.rs b/terminal-tui/src/components.rs
new file mode 100644
index 00000000..737b504e
--- /dev/null
+++ b/terminal-tui/src/components.rs
@@ -0,0 +1,427 @@
+use tuirealm::command::{Cmd, CmdResult};
+use tuirealm::props::{AttrValue, Attribute, Color, Props, Style, TextModifiers};
+use tuirealm::tui::layout::Rect;
+use tuirealm::tui::text::Span;
+
+use tuirealm::{Frame, MockComponent, State};
+
+use crate::layout::{ComponentLayout, HorizontalLayout};
+
+const WHITESPACE: char = ' ';
+
+impl From<&Label> for Span<'_> {
+    fn from(label: &Label) -> Self {
+        Span::styled(label.text.clone(), Style::default())
+    }
+}
+
+/// A label that can be styled using a foreground color and text modifiers.
+/// Its height is fixed, its width depends on the length of the text it displays.
+#[derive(Clone)]
+pub struct Label {
+    attributes: Props,
+    text: String,
+}
+
+impl Label {
+    pub fn new(text: &str) -> Self {
+        Self {
+            attributes: Props::default(),
+            text: text.to_owned(),
+        }
+        .height(1)
+        .width(text.chars().count() as u16)
+    }
+
+    pub fn foreground(mut self, fg: Color) -> Self {
+        self.attr(Attribute::Foreground, AttrValue::Color(fg));
+        self
+    }
+
+    pub fn modifiers(mut self, m: TextModifiers) -> Self {
+        self.attr(Attribute::TextProps, AttrValue::TextModifiers(m));
+        self
+    }
+
+    fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+
+    fn width(mut self, w: u16) -> Self {
+        self.attr(Attribute::Width, AttrValue::Size(w));
+        self
+    }
+}
+
+impl MockComponent for Label {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        use tui_realm_stdlib::Label;
+
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+        let foreground = self
+            .attributes
+            .get_or(Attribute::Foreground, AttrValue::Color(Color::Reset))
+            .unwrap_color();
+
+        if display {
+            let mut label = match self.attributes.get(Attribute::TextProps) {
+                Some(modifiers) => Label::default()
+                    .foreground(foreground)
+                    .modifiers(modifiers.unwrap_text_modifiers())
+                    .text(self.text.clone()),
+                None => Label::default()
+                    .foreground(foreground)
+                    .text(self.text.clone()),
+            };
+
+            label.view(frame, area);
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::None
+    }
+
+    fn perform(&mut self, _cmd: Cmd) -> CmdResult {
+        CmdResult::None
+    }
+}
+
+/// A label with colored background that can be styled further by using a foreground
+/// color and text modifiers. Its height is fixed, its width depends on the length of
+/// the text it displays.
+#[derive(Clone)]
+pub struct HighlightedLabel {
+    attributes: Props,
+    text: String,
+}
+
+impl HighlightedLabel {
+    pub fn new(text: &str) -> Self {
+        let text = format!(" {} ", text);
+
+        Self {
+            attributes: Props::default(),
+            text: text.clone(),
+        }
+        .height(1)
+        .width(text.chars().count() as u16)
+    }
+
+    pub fn foreground(mut self, fg: Color) -> Self {
+        self.attr(Attribute::Foreground, AttrValue::Color(fg));
+        self
+    }
+
+    pub fn background(mut self, bg: Color) -> Self {
+        self.attr(Attribute::Background, AttrValue::Color(bg));
+        self
+    }
+
+    pub fn modifiers(mut self, m: TextModifiers) -> Self {
+        self.attr(Attribute::TextProps, AttrValue::TextModifiers(m));
+        self
+    }
+
+    fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+
+    fn width(mut self, w: u16) -> Self {
+        self.attr(Attribute::Width, AttrValue::Size(w));
+        self
+    }
+}
+
+impl MockComponent for HighlightedLabel {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        use tui_realm_stdlib::Label;
+
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+        let foreground = self
+            .attributes
+            .get_or(Attribute::Foreground, AttrValue::Color(Color::Reset))
+            .unwrap_color();
+        let background = self
+            .attributes
+            .get_or(Attribute::Background, AttrValue::Color(Color::Reset))
+            .unwrap_color();
+
+        if display {
+            let mut label = match self.attributes.get(Attribute::TextProps) {
+                Some(modifiers) => Label::default()
+                    .foreground(foreground)
+                    .background(background)
+                    .modifiers(modifiers.unwrap_text_modifiers())
+                    .text(self.text.clone()),
+                None => Label::default()
+                    .foreground(foreground)
+                    .background(background)
+                    .text(self.text.clone()),
+            };
+
+            label.view(frame, area);
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::None
+    }
+
+    fn perform(&mut self, _cmd: Cmd) -> CmdResult {
+        CmdResult::None
+    }
+}
+
+/// An application title that consists of a highlighted label and a empty label that
+/// fills out any remaining space in a horizontal layout.
+pub struct ApplicationTitle {
+    attributes: Props,
+    label: HighlightedLabel,
+    spacer: Label,
+}
+
+impl ApplicationTitle {
+    pub fn new(text: &str) -> Self {
+        Self {
+            attributes: Props::default(),
+            label: HighlightedLabel::new(text)
+                .foreground(Color::White)
+                .background(Color::Rgb(238, 111, 248))
+                .modifiers(TextModifiers::BOLD),
+            spacer: Label::new(""),
+        }
+        .height(1)
+    }
+
+    fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+}
+
+impl MockComponent for ApplicationTitle {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+
+        if display {
+            let layout = HorizontalLayout::new(
+                vec![Box::new(self.label.clone()), Box::new(self.spacer.clone())],
+                area,
+            )
+            .build();
+
+            for (mut component, area) in layout {
+                component.view(frame, area);
+            }
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::None
+    }
+
+    fn perform(&mut self, _cmd: Cmd) -> CmdResult {
+        CmdResult::None
+    }
+}
+
+/// A shortcut that consists of a label displaying the "hotkey", a label that displays
+/// the action and a spacer between them.
+#[derive(Clone)]
+pub struct Shortcut {
+    attributes: Props,
+    short: Label,
+    long: Label,
+    spacer: Label,
+}
+
+impl Shortcut {
+    pub fn new(short: &str, long: &str) -> Self {
+        let short = Label::new(short).foreground(Color::Rgb(100, 100, 100));
+        let long = Label::new(long).foreground(Color::Rgb(70, 70, 70));
+        let spacer = Label::new(&format!("{}", WHITESPACE));
+
+        Self {
+            attributes: Props::default(),
+            short: short.clone(),
+            long: long.clone(),
+            spacer: spacer.clone(),
+        }
+        .height(1)
+        .width(
+            short
+                .attributes
+                .get(Attribute::Width)
+                .unwrap()
+                .unwrap_size()
+                + spacer
+                    .attributes
+                    .get(Attribute::Width)
+                    .unwrap()
+                    .unwrap_size()
+                + long.attributes.get(Attribute::Width).unwrap().unwrap_size(),
+        )
+    }
+
+    fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+
+    fn width(mut self, w: u16) -> Self {
+        self.attr(Attribute::Width, AttrValue::Size(w));
+        self
+    }
+}
+
+impl MockComponent for Shortcut {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+
+        if display {
+            let layout = HorizontalLayout::new(
+                vec![
+                    Box::new(self.short.clone()),
+                    Box::new(self.spacer.clone()),
+                    Box::new(self.long.clone()),
+                ],
+                area,
+            )
+            .build();
+
+            for (mut component, area) in layout {
+                component.view(frame, area);
+            }
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::None
+    }
+
+    fn perform(&mut self, _cmd: Cmd) -> CmdResult {
+        CmdResult::None
+    }
+}
+
+/// A shortcut bar that displays multiple shortcuts and separates them with a
+/// divider.
+pub struct ShortcutBar {
+    attributes: Props,
+    shortcuts: Vec<Shortcut>,
+    divider: Label,
+}
+
+impl ShortcutBar {
+    pub fn child(mut self, shortcut: Shortcut) -> Self {
+        self.shortcuts = [self.shortcuts, vec![shortcut]].concat();
+        self
+    }
+
+    fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+}
+
+impl Default for ShortcutBar {
+    fn default() -> Self {
+        Self {
+            attributes: Props::default(),
+            shortcuts: vec![],
+            divider: Label::new(" ∙ ").foreground(Color::Rgb(70, 70, 70)),
+        }
+        .height(1)
+    }
+}
+
+impl MockComponent for ShortcutBar {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+
+        if display {
+            let mut components: Vec<Box<dyn MockComponent>> = vec![];
+            let mut shortcuts = self.shortcuts.iter_mut().peekable();
+
+            while let Some(shortcut) = shortcuts.next() {
+                if shortcuts.peek().is_some() {
+                    components.push(Box::new(shortcut.clone()));
+                    components.push(Box::new(self.divider.clone()))
+                } else {
+                    components.push(Box::new(shortcut.clone()));
+                }
+            }
+
+            let layout = HorizontalLayout::new(components, area).build();
+            for (mut component, area) in layout {
+                component.view(frame, area);
+            }
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::None
+    }
+
+    fn perform(&mut self, _cmd: Cmd) -> CmdResult {
+        CmdResult::None
+    }
+}
diff --git a/terminal-tui/src/layout.rs b/terminal-tui/src/layout.rs
new file mode 100644
index 00000000..96411098
--- /dev/null
+++ b/terminal-tui/src/layout.rs
@@ -0,0 +1,50 @@
+use tuirealm::props::{AttrValue, Attribute};
+use tuirealm::tui::layout::Rect;
+
+use tuirealm::tui::layout::{Constraint, Direction, Layout};
+use tuirealm::MockComponent;
+
+type BoxedComponent = Box<dyn MockComponent>;
+
+/// Trait that should be implemented by layouts that take multiple components
+/// and build a tui-realm layout based on the components and their size attributes.
+pub trait ComponentLayout {
+    fn build(self) -> Vec<(BoxedComponent, Rect)>;
+}
+
+/// A layout that packs components horizontally based on their width.
+pub struct HorizontalLayout {
+    components: Vec<BoxedComponent>,
+    area: Rect,
+}
+
+impl HorizontalLayout {
+    pub fn new(components: Vec<BoxedComponent>, area: Rect) -> Self {
+        Self { components, area }
+    }
+}
+
+impl ComponentLayout for HorizontalLayout {
+    fn build(self) -> Vec<(BoxedComponent, Rect)> {
+        let constraints = self
+            .components
+            .iter()
+            .map(|c| {
+                Constraint::Length(
+                    c.query(Attribute::Width)
+                        .unwrap_or(AttrValue::Size(0))
+                        .unwrap_size(),
+                )
+            })
+            .collect::<Vec<_>>();
+        let layout = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints(constraints)
+            .split(self.area);
+
+        self.components
+            .into_iter()
+            .zip(layout.into_iter())
+            .collect()
+    }
+}
diff --git a/terminal-tui/src/lib.rs b/terminal-tui/src/lib.rs
new file mode 100644
index 00000000..25abfc14
--- /dev/null
+++ b/terminal-tui/src/lib.rs
@@ -0,0 +1,159 @@
+use std::hash::Hash;
+use std::time::Duration;
+
+use anyhow::{Error, Result};
+
+use tuirealm::terminal::TerminalBridge;
+
+use tuirealm::application::PollStrategy;
+use tuirealm::props::{AttrValue, Attribute};
+// use tuirealm::terminal::TerminalBridge;
+use tuirealm::tui::layout::Rect;
+use tuirealm::{Application, EventListenerCfg, NoUserEvent};
+use tuirealm::{Component, Frame};
+
+pub mod components;
+pub mod layout;
+pub mod theme;
+
+/// A proxy that abstracts the tui-realm-specific application.
+pub struct App<Id, Message>
+where
+    Id: Eq + PartialEq + Clone + Hash,
+    Message: Eq,
+{
+    backend: Application<Id, Message, NoUserEvent>,
+}
+
+impl<Id, Message> Default for App<Id, Message>
+where
+    Id: Eq + PartialEq + Clone + Hash,
+    Message: Eq,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<Id, Message> App<Id, Message>
+where
+    Id: Eq + PartialEq + Clone + Hash,
+    Message: Eq,
+{
+    pub fn new() -> Self {
+        let backend = Application::init(
+            EventListenerCfg::default().default_input_listener(Duration::from_millis(10)),
+        );
+        Self { backend }
+    }
+
+    pub fn mount<C>(&mut self, id: Id, component: C) -> Result<(), Error>
+    where
+        C: Component<Message, NoUserEvent> + 'static,
+    {
+        self.backend.mount(id, Box::new(component), vec![])?;
+        Ok(())
+    }
+
+    pub fn activate(&mut self, id: Id) -> Result<(), Error> {
+        self.backend.active(&id)?;
+        Ok(())
+    }
+
+    pub fn query(&self, id: Id, attr: Attribute) -> Option<AttrValue> {
+        self.backend.query(&id, attr).ok().flatten()
+    }
+
+    pub fn view(&mut self, id: Id, frame: &mut Frame, area: Rect) {
+        self.backend.view(&id, frame, area);
+    }
+
+    pub fn poll(&mut self) -> Vec<Message> {
+        match self.backend.tick(PollStrategy::Once) {
+            Ok(messages) => messages,
+            _ => vec![],
+        }
+    }
+}
+
+/// Trait that must be implemented by client applications in order to be run
+/// as tui-application using tui-realm. Implementors act as models to the
+/// tui-realm application that can be polled for new messages, updated
+/// accordingly and rendered with new state.
+///
+/// Please see `examples/` for further information on how to use it.
+pub trait Tui<Id, Message>
+where
+    Id: Eq + PartialEq + Clone + Hash,
+    Message: Eq,
+{
+    /// Should initialize an application by mounting and activating components.
+    fn init(&mut self, app: &mut App<Id, Message>) -> Result<()>;
+
+    /// Should update the current state by handling a message from the view.
+    fn update(&mut self, app: &mut App<Id, Message>);
+
+    /// Should draw the application to a frame.
+    fn view(&mut self, app: &mut App<Id, Message>, frame: &mut Frame);
+
+    /// Should return true if the application is requested to quit.
+    fn quit(&self) -> bool;
+}
+
+/// A tui-window using the cross-platform Terminal helper provided
+/// by tui-realm.
+pub struct Window {
+    /// Helper around `Terminal` to quickly setup and perform on terminal.
+    pub terminal: TerminalBridge,
+}
+
+impl Default for Window {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Provides a way to create and run a new tui-application.
+impl Window {
+    /// Creates a tui-window using the default cross-platform Terminal
+    /// helper and panics if its creation fails.
+    pub fn new() -> Self {
+        Self {
+            terminal: TerminalBridge::new().expect("Cannot create terminal bridge"),
+        }
+    }
+
+    /// Runs this tui-window with the tui-application given and performs the
+    /// following steps:
+    /// 1. Enter alternative terminal screen
+    /// 2. Run main loop until application should quit and with each iteration
+    ///    - poll new events (tick or user event)
+    ///    - update application state
+    ///    - redraw view
+    /// 3. Leave alternative terminal screen
+    pub fn run<T, Id, Message>(&mut self, tui: &mut T) -> Result<()>
+    where
+        T: Tui<Id, Message>,
+        Id: Eq + PartialEq + Clone + Hash,
+        Message: Eq,
+    {
+        let _ = self.terminal.enable_raw_mode();
+        let _ = self.terminal.enter_alternate_screen();
+        let mut app = App::default();
+
+        tui.init(&mut app)?;
+
+        while !tui.quit() {
+            tui.update(&mut app);
+
+            self.terminal.raw_mut().draw(|frame| {
+                tui.view(&mut app, frame);
+            })?;
+        }
+
+        let _ = self.terminal.leave_alternate_screen();
+        let _ = self.terminal.disable_raw_mode();
+
+        Ok(())
+    }
+}
diff --git a/terminal-tui/src/theme.rs b/terminal-tui/src/theme.rs
new file mode 100644
index 00000000..17f36734
--- /dev/null
+++ b/terminal-tui/src/theme.rs
@@ -0,0 +1,7 @@
+pub struct Theme {}
+
+impl Theme {
+    pub fn default_dark() -> Self {
+        Self {}
+    }
+}

From c96d6fd5d9d0826a533590f3228f75a4f08eda7f Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Tue, 5 Jul 2022 13:21:33 +0200
Subject: [PATCH 02/16] terminal-tui: Add demo application

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 terminal-tui/examples/tui-demo/app.rs        | 118 +++++++++++++++++++
 terminal-tui/examples/tui-demo/components.rs |  48 ++++++++
 terminal-tui/examples/tui-demo/main.rs       |  20 ++++
 3 files changed, 186 insertions(+)
 create mode 100644 terminal-tui/examples/tui-demo/app.rs
 create mode 100644 terminal-tui/examples/tui-demo/components.rs
 create mode 100644 terminal-tui/examples/tui-demo/main.rs

diff --git a/terminal-tui/examples/tui-demo/app.rs b/terminal-tui/examples/tui-demo/app.rs
new file mode 100644
index 00000000..6e4f8ef6
--- /dev/null
+++ b/terminal-tui/examples/tui-demo/app.rs
@@ -0,0 +1,118 @@
+use anyhow::Result;
+
+use tui_realm_stdlib::Textarea;
+use tuirealm::props::{AttrValue, Attribute, BorderSides, Borders, Color, TextSpan};
+use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
+use tuirealm::Frame;
+
+use radicle_terminal_tui as tui;
+// use tui::components::{ShortcutItem, Shortcuts, Title};
+use tui::components::{ApplicationTitle, Shortcut, ShortcutBar};
+use tui::{App, Tui};
+
+/// Messages handled by this tui-application.
+#[derive(Debug, Eq, PartialEq)]
+pub enum Message {
+    Quit,
+}
+
+/// All components known to the application.
+#[derive(Debug, Eq, PartialEq, Clone, Hash)]
+pub enum Id {
+    Title,
+    Content,
+    Shortcuts,
+}
+
+/// App-window used by this application.
+pub struct Demo {
+    quit: bool,
+}
+
+/// Creates a new application using a tui-realm-application, mounts all
+/// components and sets focus to a default one.
+impl Demo {
+    pub fn demo_content() -> Vec<TextSpan> {
+        vec![
+            TextSpan::new("# Getting started")
+                .underlined()
+                .fg(Color::Cyan),
+            TextSpan::new(String::new()),
+            TextSpan::from("This is a basic Radicle TUI application."),
+        ]
+    }
+
+    fn layout(app: &mut App<Id, Message>, frame: &mut Frame) -> Vec<Rect> {
+        let area = frame.size();
+        let title_h = app
+            .query(Id::Title, Attribute::Height)
+            .unwrap_or(AttrValue::Size(0))
+            .unwrap_size();
+        let shortcuts_h = app
+            .query(Id::Shortcuts, Attribute::Height)
+            .unwrap_or(AttrValue::Size(0))
+            .unwrap_size();
+        let container_h = area.height.saturating_sub(title_h + shortcuts_h);
+
+        Layout::default()
+            .direction(Direction::Vertical)
+            .margin(1)
+            .constraints(
+                [
+                    Constraint::Length(title_h),
+                    Constraint::Length(container_h - 2),
+                    Constraint::Length(shortcuts_h),
+                ]
+                .as_ref(),
+            )
+            .split(area)
+    }
+}
+
+impl Default for Demo {
+    fn default() -> Self {
+        Self { quit: false }
+    }
+}
+
+impl Tui<Id, Message> for Demo {
+    fn init(&mut self, app: &mut App<Id, Message>) -> Result<()> {
+        app.mount(Id::Title, ApplicationTitle::new("my-project"))?;
+        app.mount(
+            Id::Content,
+            Textarea::default()
+                .borders(Borders::default().sides(BorderSides::NONE))
+                .text_rows(&Self::demo_content()),
+        )?;
+        app.mount(
+            Id::Shortcuts,
+            ShortcutBar::default()
+                .child(Shortcut::new("q", "quit"))
+                .child(Shortcut::new("p", "print")),
+        )?;
+        // We need to give focus to a component then
+        app.activate(Id::Title)?;
+
+        Ok(())
+    }
+
+    fn view(&mut self, app: &mut App<Id, Message>, frame: &mut Frame) {
+        let layout = Self::layout(app, frame);
+
+        app.view(Id::Title, frame, layout[0]);
+        app.view(Id::Content, frame, layout[1]);
+        app.view(Id::Shortcuts, frame, layout[2]);
+    }
+
+    fn update(&mut self, app: &mut App<Id, Message>) {
+        for message in app.poll() {
+            match message {
+                Message::Quit => self.quit = true,
+            }
+        }
+    }
+
+    fn quit(&self) -> bool {
+        self.quit
+    }
+}
diff --git a/terminal-tui/examples/tui-demo/components.rs b/terminal-tui/examples/tui-demo/components.rs
new file mode 100644
index 00000000..702e41ff
--- /dev/null
+++ b/terminal-tui/examples/tui-demo/components.rs
@@ -0,0 +1,48 @@
+use tui_realm_stdlib::Textarea;
+
+use tuirealm::event::{Event, Key, KeyEvent};
+use tuirealm::{Component, NoUserEvent};
+
+use radicle_terminal_tui as tui;
+use tui::components::{ApplicationTitle, ShortcutBar};
+
+use super::app::Message;
+
+/// Since `terminal-tui` does not know the type of messages that are being
+/// passed around in the app, the following handlers need to be implemented for
+/// each component used.
+impl Component<Message, NoUserEvent> for ApplicationTitle {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        match event {
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('q'),
+                ..
+            }) => Some(Message::Quit),
+            _ => None,
+        }
+    }
+}
+
+impl Component<Message, NoUserEvent> for Textarea {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        match event {
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('q'),
+                ..
+            }) => Some(Message::Quit),
+            _ => None,
+        }
+    }
+}
+
+impl Component<Message, NoUserEvent> for ShortcutBar {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        match event {
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('q'),
+                ..
+            }) => Some(Message::Quit),
+            _ => None,
+        }
+    }
+}
diff --git a/terminal-tui/examples/tui-demo/main.rs b/terminal-tui/examples/tui-demo/main.rs
new file mode 100644
index 00000000..a4a27ad6
--- /dev/null
+++ b/terminal-tui/examples/tui-demo/main.rs
@@ -0,0 +1,20 @@
+use anyhow::Result;
+
+use radicle_terminal_tui as tui;
+use tui::Window;
+
+/// App-specific window implementation.
+mod app;
+
+/// Event handler implementations for app-specific message types, since
+/// these are not known to `terminal-tui` and need to exist for every component
+/// used.
+mod components;
+
+/// Runs a basic tui-application with a title, some content and shortcuts.
+fn main() -> Result<()> {
+    let mut window = Window::default();
+    window.run(&mut app::Demo::default())?;
+
+    Ok(())
+}

From 79c4788ce29ea3a286e77cf3542616edd58c6251 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Wed, 6 Jul 2022 08:54:39 +0200
Subject: [PATCH 03/16] terminal-tui: Implement tab container component

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 terminal-tui/src/components.rs | 218 ++++++++++++++++++++++++++++++++-
 1 file changed, 214 insertions(+), 4 deletions(-)

diff --git a/terminal-tui/src/components.rs b/terminal-tui/src/components.rs
index 737b504e..c5537aef 100644
--- a/terminal-tui/src/components.rs
+++ b/terminal-tui/src/components.rs
@@ -1,12 +1,14 @@
 use tuirealm::command::{Cmd, CmdResult};
 use tuirealm::props::{AttrValue, Attribute, Color, Props, Style, TextModifiers};
-use tuirealm::tui::layout::Rect;
-use tuirealm::tui::text::Span;
-
-use tuirealm::{Frame, MockComponent, State};
+use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
+use tuirealm::tui::text::{Span, Spans};
+use tuirealm::tui::widgets::Tabs;
+use tuirealm::{Frame, MockComponent, State, StateValue};
 
 use crate::layout::{ComponentLayout, HorizontalLayout};
 
+type BoxedComponent = Box<dyn MockComponent>;
+
 const WHITESPACE: char = ' ';
 
 impl From<&Label> for Span<'_> {
@@ -425,3 +427,211 @@ impl MockComponent for ShortcutBar {
         CmdResult::None
     }
 }
+
+/// A tab header that displays all labels horizontally aligned and separated
+/// by a divider. Highlights the label defined by the current tab index.
+#[derive(Clone)]
+pub struct TabHeader {
+    attributes: Props,
+    tabs: Vec<Label>,
+    divider: Label,
+    state: TabState,
+}
+
+impl TabHeader {
+    pub fn child(mut self, tab: Label) -> Self {
+        self.tabs = [self.tabs, vec![tab]].concat();
+        self.state.len = self.tabs.len() as u16;
+        self
+    }
+
+    pub fn foreground(mut self, fg: Color) -> Self {
+        self.attr(Attribute::Foreground, AttrValue::Color(fg));
+        self
+    }
+
+    pub fn highlight(mut self, fg: Color) -> Self {
+        self.attr(Attribute::HighlightedColor, AttrValue::Color(fg));
+        self
+    }
+
+    fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+}
+
+impl Default for TabHeader {
+    fn default() -> Self {
+        Self {
+            attributes: Props::default(),
+            tabs: vec![],
+            divider: Label::new("|").foreground(Color::Rgb(70, 70, 70)),
+            state: TabState::default(),
+        }
+        .height(1)
+        .foreground(Color::Rgb(70, 70, 70))
+        .highlight(Color::Rgb(100, 100, 100))
+    }
+}
+
+impl MockComponent for TabHeader {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        let selected = self.state().unwrap_one().unwrap_u16();
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+        let foreground = self
+            .attributes
+            .get_or(Attribute::Foreground, AttrValue::Color(Color::Reset))
+            .unwrap_color();
+        let highlight = self
+            .attributes
+            .get_or(Attribute::HighlightedColor, AttrValue::Color(Color::Reset))
+            .unwrap_color();
+
+        if display {
+            let spans = self
+                .tabs
+                .iter()
+                .map(|tab| Spans::from(vec![Span::from(tab)]))
+                .collect::<Vec<_>>();
+
+            let tabs = Tabs::new(spans)
+                .style(Style::default().fg(foreground))
+                .highlight_style(Style::default().fg(highlight))
+                .divider(Span::from(&self.divider))
+                .select(selected as usize);
+
+            frame.render_widget(tabs, area);
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::One(StateValue::U16(self.state.selected))
+    }
+
+    fn perform(&mut self, cmd: Cmd) -> CmdResult {
+        use tuirealm::command::Direction;
+
+        match cmd {
+            Cmd::Move(Direction::Right) => {
+                let prev = self.state.selected;
+                self.state.incr_tab_index(true);
+                if prev != self.state.selected {
+                    CmdResult::Changed(self.state())
+                } else {
+                    CmdResult::None
+                }
+            }
+            _ => CmdResult::None,
+        }
+    }
+}
+
+/// A container with a tab header. Displays the component selected by the index
+/// held in the header state.
+#[derive(Default)]
+pub struct TabContainer {
+    attributes: Props,
+    header: TabHeader,
+    children: Vec<BoxedComponent>,
+}
+
+impl TabContainer {
+    pub fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+
+    pub fn child(mut self, title: String, component: impl MockComponent + 'static) -> Self {
+        self.header = self
+            .header
+            .child(Label::new(&title).foreground(Color::Rgb(70, 70, 70)));
+        self.children.push(Box::new(component));
+        self
+    }
+}
+
+impl MockComponent for TabContainer {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+        let tab_header_height = self
+            .header
+            .query(Attribute::Height)
+            .unwrap_or(AttrValue::Size(1))
+            .unwrap_size();
+        let selected = self.header.state().unwrap_one().unwrap_u16();
+
+        if display {
+            let layout = Layout::default()
+                .direction(Direction::Vertical)
+                .vertical_margin(1)
+                .constraints(
+                    [Constraint::Length(tab_header_height), Constraint::Length(0)].as_ref(),
+                )
+                .split(area);
+
+            self.header.view(frame, layout[0]);
+
+            if let Some(child) = self.children.get_mut(selected as usize) {
+                child.view(frame, layout[1]);
+            }
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::None
+    }
+
+    fn perform(&mut self, cmd: Cmd) -> CmdResult {
+        CmdResult::Batch(
+            [
+                self.children
+                    .iter_mut()
+                    .map(|child| child.perform(cmd))
+                    .collect(),
+                vec![self.header.perform(cmd)],
+            ]
+            .concat(),
+        )
+    }
+}
+
+/// State that holds the index of a selected tab item and the count of all tab items.
+/// The index can be increased and will start at 0, if length was reached.
+#[derive(Clone, Default)]
+pub struct TabState {
+    pub selected: u16,
+    pub len: u16,
+}
+
+impl TabState {
+    pub fn incr_tab_index(&mut self, rewind: bool) {
+        if self.selected + 1 < self.len {
+            self.selected += 1;
+        } else if rewind {
+            self.selected = 0;
+        }
+    }
+}

From 28fabd469711e084477d831209b78c7bc48292e2 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Wed, 6 Jul 2022 08:56:16 +0200
Subject: [PATCH 04/16] terminal-tui: Use tab container in demo app

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 terminal-tui/examples/tui-demo/app.rs        | 37 ++++++++++++++------
 terminal-tui/examples/tui-demo/components.rs | 21 +++++++++--
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/terminal-tui/examples/tui-demo/app.rs b/terminal-tui/examples/tui-demo/app.rs
index 6e4f8ef6..35873c06 100644
--- a/terminal-tui/examples/tui-demo/app.rs
+++ b/terminal-tui/examples/tui-demo/app.rs
@@ -6,8 +6,7 @@ use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
 use tuirealm::Frame;
 
 use radicle_terminal_tui as tui;
-// use tui::components::{ShortcutItem, Shortcuts, Title};
-use tui::components::{ApplicationTitle, Shortcut, ShortcutBar};
+use tui::components::{ApplicationTitle, Shortcut, ShortcutBar, TabContainer};
 use tui::{App, Tui};
 
 /// Messages handled by this tui-application.
@@ -32,16 +31,22 @@ pub struct Demo {
 /// Creates a new application using a tui-realm-application, mounts all
 /// components and sets focus to a default one.
 impl Demo {
-    pub fn demo_content() -> Vec<TextSpan> {
+    pub fn welcome_content() -> Vec<TextSpan> {
         vec![
-            TextSpan::new("# Getting started")
-                .underlined()
-                .fg(Color::Cyan),
+            TextSpan::new("# Welcome").fg(Color::Cyan),
             TextSpan::new(String::new()),
             TextSpan::from("This is a basic Radicle TUI application."),
         ]
     }
 
+    pub fn help_content() -> Vec<TextSpan> {
+        vec![
+            TextSpan::new("# Help").fg(Color::Cyan),
+            TextSpan::new(String::new()),
+            TextSpan::from("Please see https://radicle.xyz for further information."),
+        ]
+    }
+
     fn layout(app: &mut App<Id, Message>, frame: &mut Frame) -> Vec<Rect> {
         let area = frame.size();
         let title_h = app
@@ -80,18 +85,28 @@ impl Tui<Id, Message> for Demo {
         app.mount(Id::Title, ApplicationTitle::new("my-project"))?;
         app.mount(
             Id::Content,
-            Textarea::default()
-                .borders(Borders::default().sides(BorderSides::NONE))
-                .text_rows(&Self::demo_content()),
+            TabContainer::default()
+                .child(
+                    String::from("Welcome"),
+                    Textarea::default()
+                        .borders(Borders::default().sides(BorderSides::NONE))
+                        .text_rows(&Self::welcome_content()),
+                )
+                .child(
+                    String::from("Help"),
+                    Textarea::default()
+                        .borders(Borders::default().sides(BorderSides::NONE))
+                        .text_rows(&Self::help_content()),
+                ),
         )?;
         app.mount(
             Id::Shortcuts,
             ShortcutBar::default()
                 .child(Shortcut::new("q", "quit"))
-                .child(Shortcut::new("p", "print")),
+                .child(Shortcut::new("?", "help")),
         )?;
         // We need to give focus to a component then
-        app.activate(Id::Title)?;
+        app.activate(Id::Content)?;
 
         Ok(())
     }
diff --git a/terminal-tui/examples/tui-demo/components.rs b/terminal-tui/examples/tui-demo/components.rs
index 702e41ff..4084d15f 100644
--- a/terminal-tui/examples/tui-demo/components.rs
+++ b/terminal-tui/examples/tui-demo/components.rs
@@ -1,10 +1,11 @@
 use tui_realm_stdlib::Textarea;
 
+use tuirealm::command::{Cmd, CmdResult, Direction};
 use tuirealm::event::{Event, Key, KeyEvent};
-use tuirealm::{Component, NoUserEvent};
+use tuirealm::{Component, MockComponent, NoUserEvent};
 
 use radicle_terminal_tui as tui;
-use tui::components::{ApplicationTitle, ShortcutBar};
+use tui::components::{ApplicationTitle, ShortcutBar, TabContainer};
 
 use super::app::Message;
 
@@ -46,3 +47,19 @@ impl Component<Message, NoUserEvent> for ShortcutBar {
         }
     }
 }
+
+impl Component<Message, NoUserEvent> for TabContainer {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        let _ = match event {
+            Event::Keyboard(KeyEvent { code: Key::Tab, .. }) => {
+                self.perform(Cmd::Move(Direction::Right))
+            }
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('q'),
+                ..
+            }) => return Some(Message::Quit),
+            _ => CmdResult::None,
+        };
+        None
+    }
+}

From c5a6aad273a7d5aec6e93ceca335dfe6536901e6 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Thu, 7 Jul 2022 22:13:32 +0200
Subject: [PATCH 05/16] terminal-tui: Add support for stateful lists

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 terminal-tui/src/lib.rs   |  2 +-
 terminal-tui/src/state.rs | 70 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 terminal-tui/src/state.rs

diff --git a/terminal-tui/src/lib.rs b/terminal-tui/src/lib.rs
index 25abfc14..9b7bf779 100644
--- a/terminal-tui/src/lib.rs
+++ b/terminal-tui/src/lib.rs
@@ -7,12 +7,12 @@ use tuirealm::terminal::TerminalBridge;
 
 use tuirealm::application::PollStrategy;
 use tuirealm::props::{AttrValue, Attribute};
-// use tuirealm::terminal::TerminalBridge;
 use tuirealm::tui::layout::Rect;
 use tuirealm::{Application, EventListenerCfg, NoUserEvent};
 use tuirealm::{Component, Frame};
 
 pub mod components;
+pub mod state;
 pub mod layout;
 pub mod theme;
 
diff --git a/terminal-tui/src/state.rs b/terminal-tui/src/state.rs
new file mode 100644
index 00000000..87e971f2
--- /dev/null
+++ b/terminal-tui/src/state.rs
@@ -0,0 +1,70 @@
+/// List of items that keeps track of the selection.
+pub struct Items<T> {
+    values: Vec<T>,
+    selected: usize,
+}
+
+impl<T> Items<T> {
+    pub fn all(&self) -> &Vec<T> {
+        &self.values
+    }
+
+    pub fn selected(&self) -> Option<&T> {
+        self.values.get(self.selected)
+    }
+
+    pub fn select_index(&mut self, index: usize) {
+        self.selected = index
+    }
+
+    pub fn selected_index(&self) -> usize {
+        self.selected
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.values.is_empty()
+    }
+
+    pub fn count(&self) -> usize {
+        self.values.len()
+    }
+}
+
+/// List of items that won't cycle through the selection,
+/// but rather stops selecting a new item at the beginning
+/// and the end of the list.
+pub struct ListState<T> {
+    items: Items<T>,
+}
+
+impl<T> ListState<T> {
+    pub fn new(items: Vec<T>) -> Self {
+        Self {
+            items: Items {
+                values: items,
+                selected: 0,
+            },
+        }
+    }
+
+    pub fn items(&self) -> &Items<T> {
+        &self.items
+    }
+
+    pub fn select_previous(&mut self) {
+        let index = match self.items.selected_index() == 0 {
+            true => 0,
+            false => self.items.selected_index() - 1,
+        };
+        self.items.select_index(index);
+    }
+
+    pub fn select_next(&mut self) {
+        let len = self.items.all().len();
+        let index = match self.items.selected_index() >= len - 1 {
+            true => len - 1,
+            false => self.items.selected_index() + 1,
+        };
+        self.items.select_index(index);
+    }
+}
\ No newline at end of file

From 0db1e8c831ee23dd0fb7d209b725f35d16b69008 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Thu, 7 Jul 2022 22:14:48 +0200
Subject: [PATCH 06/16] terminal-tui: Improve tab layout

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 terminal-tui/src/state.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-tui/src/state.rs b/terminal-tui/src/state.rs
index 87e971f2..c1fc2d54 100644
--- a/terminal-tui/src/state.rs
+++ b/terminal-tui/src/state.rs
@@ -67,4 +67,4 @@ impl<T> ListState<T> {
         };
         self.items.select_index(index);
     }
-}
\ No newline at end of file
+}

From f8b80aa8fe2931701057c7cdf8acb3e8d918fdd3 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Fri, 8 Jul 2022 17:33:41 +0200
Subject: [PATCH 07/16] terminal-tui: Support context component

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 terminal-tui/src/components.rs | 91 ++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/terminal-tui/src/components.rs b/terminal-tui/src/components.rs
index c5537aef..ffb689ed 100644
--- a/terminal-tui/src/components.rs
+++ b/terminal-tui/src/components.rs
@@ -635,3 +635,94 @@ impl TabState {
         }
     }
 }
+
+/// A single-line component, that displays multiple spans containing
+/// context information.
+pub struct ContextBar {
+    attributes: Props,
+    context: HighlightedLabel,
+    id: HighlightedLabel,
+    title: HighlightedLabel,
+    author: HighlightedLabel,
+    count: HighlightedLabel,
+}
+
+impl ContextBar {
+    pub fn new(context: &str, id: &str, title: &str, author: &str, count: &str) -> Self {
+        Self {
+            attributes: Props::default(),
+            context: HighlightedLabel::new(context).background(Color::Rgb(238, 111, 248)),
+            id: HighlightedLabel::new(id)
+                .foreground(Color::Rgb(117, 113, 249))
+                .background(Color::Rgb(40, 40, 40)),
+            title: HighlightedLabel::new(title)
+                .foreground(Color::Rgb(70, 70, 70))
+                .background(Color::Rgb(40, 40, 40)),
+            author: HighlightedLabel::new(author)
+                .foreground(Color::Rgb(117, 113, 249))
+                .background(Color::Rgb(40, 40, 40)),
+            count: HighlightedLabel::new(count)
+                .foreground(Color::Rgb(70, 70, 70))
+                .background(Color::Rgb(50, 50, 50)),
+        }
+        .height(1)
+    }
+
+    fn height(mut self, h: u16) -> Self {
+        self.attr(Attribute::Height, AttrValue::Size(h));
+        self
+    }
+}
+
+impl MockComponent for ContextBar {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        let display = self
+            .attributes
+            .get_or(Attribute::Display, AttrValue::Flag(true))
+            .unwrap_flag();
+
+        let context_w = self.context.query(Attribute::Width).unwrap().unwrap_size();
+        let id_w = self.id.query(Attribute::Width).unwrap().unwrap_size();
+        let author_w = self.author.query(Attribute::Width).unwrap().unwrap_size();
+        let count_w = self.count.query(Attribute::Width).unwrap().unwrap_size();
+
+        if display {
+            let layout = HorizontalLayout::new(
+                vec![
+                    Box::new(self.context.clone()),
+                    Box::new(self.id.clone()),
+                    Box::new(
+                        self.title.clone().width(
+                            area.width
+                                .saturating_sub(context_w + id_w + author_w + count_w),
+                        ),
+                    ),
+                    Box::new(self.author.clone()),
+                    Box::new(self.count.clone()),
+                ],
+                area,
+            )
+            .build();
+
+            for (mut component, area) in layout {
+                component.view(frame, area);
+            }
+        }
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value)
+    }
+
+    fn state(&self) -> State {
+        State::None
+    }
+
+    fn perform(&mut self, _cmd: Cmd) -> CmdResult {
+        CmdResult::None
+    }
+}

From e98c35345568f210fcdf80316906408a9bb6d5b5 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Tue, 27 Sep 2022 15:04:38 +0200
Subject: [PATCH 08/16] terminal-tui: Add global event listener to demo

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 terminal-tui/examples/tui-demo/app.rs        | 26 ++++++++++-
 terminal-tui/examples/tui-demo/components.rs | 45 +++++++++-----------
 terminal-tui/src/lib.rs                      | 13 ++++--
 3 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/terminal-tui/examples/tui-demo/app.rs b/terminal-tui/examples/tui-demo/app.rs
index 35873c06..423dad9a 100644
--- a/terminal-tui/examples/tui-demo/app.rs
+++ b/terminal-tui/examples/tui-demo/app.rs
@@ -1,14 +1,18 @@
 use anyhow::Result;
 
 use tui_realm_stdlib::Textarea;
+
+use tuirealm::event::{Key, KeyEvent, KeyModifiers};
 use tuirealm::props::{AttrValue, Attribute, BorderSides, Borders, Color, TextSpan};
 use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
-use tuirealm::Frame;
+use tuirealm::{Frame, Sub, SubClause, SubEventClause};
 
 use radicle_terminal_tui as tui;
 use tui::components::{ApplicationTitle, Shortcut, ShortcutBar, TabContainer};
 use tui::{App, Tui};
 
+use super::components::GlobalListener;
+
 /// Messages handled by this tui-application.
 #[derive(Debug, Eq, PartialEq)]
 pub enum Message {
@@ -18,6 +22,7 @@ pub enum Message {
 /// All components known to the application.
 #[derive(Debug, Eq, PartialEq, Clone, Hash)]
 pub enum Id {
+    Global,
     Title,
     Content,
     Shortcuts,
@@ -82,7 +87,8 @@ impl Default for Demo {
 
 impl Tui<Id, Message> for Demo {
     fn init(&mut self, app: &mut App<Id, Message>) -> Result<()> {
-        app.mount(Id::Title, ApplicationTitle::new("my-project"))?;
+        // Add app components
+        app.mount(Id::Title, ApplicationTitle::new("my-project"), vec![])?;
         app.mount(
             Id::Content,
             TabContainer::default()
@@ -98,13 +104,29 @@ impl Tui<Id, Message> for Demo {
                         .borders(Borders::default().sides(BorderSides::NONE))
                         .text_rows(&Self::help_content()),
                 ),
+            vec![],
         )?;
         app.mount(
             Id::Shortcuts,
             ShortcutBar::default()
                 .child(Shortcut::new("q", "quit"))
                 .child(Shortcut::new("?", "help")),
+            vec![],
+        )?;
+
+        // Add global key listener and subscribe to key events
+        app.mount(
+            Id::Global,
+            GlobalListener::default(),
+            vec![Sub::new(
+                SubEventClause::Keyboard(KeyEvent {
+                    code: Key::Char('q'),
+                    modifiers: KeyModifiers::NONE,
+                }),
+                SubClause::Always,
+            )],
         )?;
+
         // We need to give focus to a component then
         app.activate(Id::Content)?;
 
diff --git a/terminal-tui/examples/tui-demo/components.rs b/terminal-tui/examples/tui-demo/components.rs
index 4084d15f..75e2cb63 100644
--- a/terminal-tui/examples/tui-demo/components.rs
+++ b/terminal-tui/examples/tui-demo/components.rs
@@ -1,4 +1,4 @@
-use tui_realm_stdlib::Textarea;
+use tui_realm_stdlib::{Phantom, Textarea};
 
 use tuirealm::command::{Cmd, CmdResult, Direction};
 use tuirealm::event::{Event, Key, KeyEvent};
@@ -9,10 +9,12 @@ use tui::components::{ApplicationTitle, ShortcutBar, TabContainer};
 
 use super::app::Message;
 
-/// Since `terminal-tui` does not know the type of messages that are being
-/// passed around in the app, the following handlers need to be implemented for
-/// each component used.
-impl Component<Message, NoUserEvent> for ApplicationTitle {
+#[derive(Default, MockComponent)]
+pub struct GlobalListener {
+    component: Phantom,
+}
+
+impl Component<Message, NoUserEvent> for GlobalListener {
     fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
         match event {
             Event::Keyboard(KeyEvent {
@@ -24,27 +26,24 @@ impl Component<Message, NoUserEvent> for ApplicationTitle {
     }
 }
 
+/// Since `terminal-tui` does not know the type of messages that are being
+/// passed around in the app, the following handlers need to be implemented for
+/// each component used.
+impl Component<Message, NoUserEvent> for ApplicationTitle {
+    fn on(&mut self, _event: Event<NoUserEvent>) -> Option<Message> {
+        None
+    }
+}
+
 impl Component<Message, NoUserEvent> for Textarea {
-    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
-        match event {
-            Event::Keyboard(KeyEvent {
-                code: Key::Char('q'),
-                ..
-            }) => Some(Message::Quit),
-            _ => None,
-        }
+    fn on(&mut self, _event: Event<NoUserEvent>) -> Option<Message> {
+        None
     }
 }
 
 impl Component<Message, NoUserEvent> for ShortcutBar {
-    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
-        match event {
-            Event::Keyboard(KeyEvent {
-                code: Key::Char('q'),
-                ..
-            }) => Some(Message::Quit),
-            _ => None,
-        }
+    fn on(&mut self, _event: Event<NoUserEvent>) -> Option<Message> {
+        None
     }
 }
 
@@ -54,10 +53,6 @@ impl Component<Message, NoUserEvent> for TabContainer {
             Event::Keyboard(KeyEvent { code: Key::Tab, .. }) => {
                 self.perform(Cmd::Move(Direction::Right))
             }
-            Event::Keyboard(KeyEvent {
-                code: Key::Char('q'),
-                ..
-            }) => return Some(Message::Quit),
             _ => CmdResult::None,
         };
         None
diff --git a/terminal-tui/src/lib.rs b/terminal-tui/src/lib.rs
index 9b7bf779..d04a7c38 100644
--- a/terminal-tui/src/lib.rs
+++ b/terminal-tui/src/lib.rs
@@ -9,11 +9,11 @@ use tuirealm::application::PollStrategy;
 use tuirealm::props::{AttrValue, Attribute};
 use tuirealm::tui::layout::Rect;
 use tuirealm::{Application, EventListenerCfg, NoUserEvent};
-use tuirealm::{Component, Frame};
+use tuirealm::{Component, Frame, Sub};
 
 pub mod components;
-pub mod state;
 pub mod layout;
+pub mod state;
 pub mod theme;
 
 /// A proxy that abstracts the tui-realm-specific application.
@@ -47,11 +47,16 @@ where
         Self { backend }
     }
 
-    pub fn mount<C>(&mut self, id: Id, component: C) -> Result<(), Error>
+    pub fn mount<C>(
+        &mut self,
+        id: Id,
+        component: C,
+        subs: Vec<Sub<Id, NoUserEvent>>,
+    ) -> Result<(), Error>
     where
         C: Component<Message, NoUserEvent> + 'static,
     {
-        self.backend.mount(id, Box::new(component), vec![])?;
+        self.backend.mount(id, Box::new(component), subs)?;
         Ok(())
     }
 

From 9995e6b02138c548ff83621420faeb134a376993 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Wed, 6 Jul 2022 21:41:02 +0200
Subject: [PATCH 09/16] issue: Run basic tui w/ --interactive

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 Cargo.lock                  |  4 ++
 issue/Cargo.toml            |  4 ++
 issue/src/lib.rs            | 20 ++++++++
 issue/src/tui.rs            |  2 +
 issue/src/tui/app.rs        | 92 +++++++++++++++++++++++++++++++++++++
 issue/src/tui/components.rs | 34 ++++++++++++++
 6 files changed, 156 insertions(+)
 create mode 100644 issue/src/tui.rs
 create mode 100644 issue/src/tui/app.rs
 create mode 100644 issue/src/tui/components.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1d7c1417..9e1cf7b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4697,8 +4697,12 @@ dependencies = [
  "librad",
  "radicle-common",
  "radicle-terminal",
+ "radicle-terminal-tui",
  "serde",
+ "serde_json",
  "serde_yaml",
+ "tui-realm-stdlib",
+ "tuirealm",
 ]
 
 [[package]]
diff --git a/issue/Cargo.toml b/issue/Cargo.toml
index 4263427c..5c9aa5de 100644
--- a/issue/Cargo.toml
+++ b/issue/Cargo.toml
@@ -11,6 +11,10 @@ lexopt = { version = "0.2" }
 anyhow = { version = "1.0" }
 librad = { version = "0" }
 radicle-terminal = { path = "../terminal" }
+radicle-terminal-tui = { path = "../terminal-tui" }
 radicle-common = { path = "../common" }
+tuirealm = { version = "1.7.0" }
+tui-realm-stdlib = { version = "1.1.6" }
+serde_json = { version = "1.0" }
 serde_yaml = { version = "0.8" }
 serde = { version = "1.0" }
diff --git a/issue/src/lib.rs b/issue/src/lib.rs
index 4d4c0f00..a8f30875 100644
--- a/issue/src/lib.rs
+++ b/issue/src/lib.rs
@@ -8,6 +8,11 @@ use radicle_common::args::{Args, Error, Help};
 use radicle_common::cobs::issue::*;
 use radicle_common::{cobs, keys, project};
 use radicle_terminal as term;
+use radicle_terminal_tui::Window;
+
+mod tui;
+
+use tui::app;
 
 pub const HELP: Help = Help {
     name: "issue",
@@ -21,6 +26,7 @@ Usage
     rad issue delete <id>
     rad issue react <id> [--emoji <char>]
     rad issue list
+    rad issue interactive
 
 Options
 
@@ -41,6 +47,7 @@ pub enum OperationName {
     React,
     Delete,
     List,
+    Interactive,
 }
 
 impl Default for OperationName {
@@ -67,6 +74,7 @@ pub enum Operation {
         reaction: cobs::Reaction,
     },
     List,
+    Interactive,
 }
 
 /// Tool options.
@@ -125,6 +133,7 @@ impl Args for Options {
                     "d" | "delete" => op = Some(OperationName::Delete),
                     "l" | "list" => op = Some(OperationName::List),
                     "r" | "react" => op = Some(OperationName::React),
+                    "i" | "interactive" => op = Some(OperationName::Interactive),
 
                     unknown => anyhow::bail!("unknown operation '{}'", unknown),
                 },
@@ -158,6 +167,7 @@ impl Args for Options {
                 id: id.ok_or_else(|| anyhow!("an issue id to remove must be provided"))?,
             },
             OperationName::List => Operation::List,
+            OperationName::Interactive => Operation::Interactive,
         };
 
         Ok((Options { op }, vec![]))
@@ -235,7 +245,17 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         Operation::Delete { id } => {
             issues.remove(&project, &id)?;
         }
+        Operation::Interactive => {
+            tui()?;
+        }
     }
 
     Ok(())
 }
+
+fn tui() -> anyhow::Result<()> {
+    let mut window = Window::default();
+    window.run(&mut app::IssueTui::default())?;
+
+    Ok(())
+}
diff --git a/issue/src/tui.rs b/issue/src/tui.rs
new file mode 100644
index 00000000..13545c46
--- /dev/null
+++ b/issue/src/tui.rs
@@ -0,0 +1,2 @@
+pub mod app;
+pub mod components;
diff --git a/issue/src/tui/app.rs b/issue/src/tui/app.rs
new file mode 100644
index 00000000..a379861b
--- /dev/null
+++ b/issue/src/tui/app.rs
@@ -0,0 +1,92 @@
+use anyhow::Result;
+
+use tuirealm::props::{AttrValue, Attribute};
+use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
+use tuirealm::Frame;
+
+use radicle_terminal_tui as tui;
+use tui::components::{ApplicationTitle, Shortcut, ShortcutBar};
+use tui::{App, Tui};
+
+/// Messages handled by this tui-application.
+#[derive(Debug, Eq, PartialEq)]
+pub enum Message {
+    Quit,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone, Hash)]
+pub enum Id {
+    Title,
+    Shortcuts,
+}
+
+/// App-window used by this application.
+#[derive(Default)]
+pub struct IssueTui {
+    quit: bool,
+}
+
+/// Creates a new application using a tui-realm-application, mounts all
+/// components and sets focus to a default one.
+impl IssueTui {
+    fn layout(app: &mut App<Id, Message>, frame: &mut Frame) -> Vec<Rect> {
+        let area = frame.size();
+        let title_h = app
+            .query(Id::Title, Attribute::Height)
+            .unwrap_or(AttrValue::Size(0))
+            .unwrap_size();
+        let shortcuts_h = app
+            .query(Id::Shortcuts, Attribute::Height)
+            .unwrap_or(AttrValue::Size(0))
+            .unwrap_size();
+        let container_h = area.height.saturating_sub(title_h + shortcuts_h);
+
+        Layout::default()
+            .direction(Direction::Vertical)
+            .margin(1)
+            .constraints(
+                [
+                    Constraint::Length(title_h),
+                    Constraint::Length(container_h - 2),
+                    Constraint::Length(shortcuts_h),
+                ]
+                .as_ref(),
+            )
+            .split(area)
+    }
+}
+
+impl Tui<Id, Message> for IssueTui {
+    fn init(&mut self, app: &mut App<Id, Message>) -> Result<()> {
+        app.mount(Id::Title, ApplicationTitle::new("my-project"), vec![])?;
+        app.mount(
+            Id::Shortcuts,
+            ShortcutBar::default().child(Shortcut::new("q", "quit")),
+            vec![],
+        )?;
+
+        // We need to give focus to a component then
+        app.activate(Id::Title)?;
+
+        Ok(())
+    }
+
+    fn view(&mut self, app: &mut App<Id, Message>, frame: &mut Frame) {
+        let layout = Self::layout(app, frame);
+
+        app.view(Id::Title, frame, layout[0]);
+        app.view(Id::Shortcuts, frame, layout[2]);
+    }
+
+    fn update(&mut self, app: &mut App<Id, Message>) {
+        for message in app.poll() {
+            match message {
+                Message::Quit => self.quit = true,
+            }
+        }
+    }
+
+    fn quit(&self) -> bool {
+        self.quit
+    }
+}
diff --git a/issue/src/tui/components.rs b/issue/src/tui/components.rs
new file mode 100644
index 00000000..cb0362c1
--- /dev/null
+++ b/issue/src/tui/components.rs
@@ -0,0 +1,34 @@
+use tuirealm::event::{Event, Key, KeyEvent};
+use tuirealm::{Component, NoUserEvent};
+
+use radicle_terminal_tui as tui;
+use tui::components::{ApplicationTitle, ShortcutBar};
+
+use super::app::Message;
+
+/// Since `terminal-tui` does not know the type of messages that are being
+/// passed around in the app, the following handlers need to be implemented for
+/// every component used.
+impl Component<Message, NoUserEvent> for ApplicationTitle {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        match event {
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('q'),
+                ..
+            }) => Some(Message::Quit),
+            _ => None,
+        }
+    }
+}
+
+impl Component<Message, NoUserEvent> for ShortcutBar {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        match event {
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('q'),
+                ..
+            }) => Some(Message::Quit),
+            _ => None,
+        }
+    }
+}

From c6f173be611557dbdc59d0d6daf51a9c300e44cf Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Wed, 6 Jul 2022 22:25:29 +0200
Subject: [PATCH 10/16] issue: Disable tui feature by default

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 issue/Cargo.toml | 11 +++++++----
 issue/src/lib.rs | 14 +++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/issue/Cargo.toml b/issue/Cargo.toml
index 5c9aa5de..4e2205f0 100644
--- a/issue/Cargo.toml
+++ b/issue/Cargo.toml
@@ -10,11 +10,14 @@ description = "Manage radicle issues"
 lexopt = { version = "0.2" }
 anyhow = { version = "1.0" }
 librad = { version = "0" }
-radicle-terminal = { path = "../terminal" }
-radicle-terminal-tui = { path = "../terminal-tui" }
 radicle-common = { path = "../common" }
-tuirealm = { version = "1.7.0" }
-tui-realm-stdlib = { version = "1.1.6" }
+radicle-terminal = { path = "../terminal" }
+radicle-terminal-tui = { path = "../terminal-tui", optional = true }
+tuirealm = { version = "1.7.0", optional = true  }
+tui-realm-stdlib = { version = "1.1.6", optional = true  }
 serde_json = { version = "1.0" }
 serde_yaml = { version = "0.8" }
 serde = { version = "1.0" }
+
+[features]
+tui = ["radicle-terminal-tui", "tuirealm", "tui-realm-stdlib"]
\ No newline at end of file
diff --git a/issue/src/lib.rs b/issue/src/lib.rs
index a8f30875..38e9e021 100644
--- a/issue/src/lib.rs
+++ b/issue/src/lib.rs
@@ -8,12 +8,10 @@ use radicle_common::args::{Args, Error, Help};
 use radicle_common::cobs::issue::*;
 use radicle_common::{cobs, keys, project};
 use radicle_terminal as term;
-use radicle_terminal_tui::Window;
 
+#[cfg(feature = "tui")]
 mod tui;
 
-use tui::app;
-
 pub const HELP: Help = Help {
     name: "issue",
     description: env!("CARGO_PKG_DESCRIPTION"),
@@ -253,9 +251,19 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
     Ok(())
 }
 
+#[cfg(feature = "tui")]
 fn tui() -> anyhow::Result<()> {
+    use radicle_terminal_tui::Window;
+    use tui::app;
+
     let mut window = Window::default();
     window.run(&mut app::IssueTui::default())?;
 
     Ok(())
 }
+
+#[cfg(not(feature = "tui"))]
+fn tui() -> anyhow::Result<()> {
+    term::warning("Could not run tui. Please activate feature 'tui'.");
+    Ok(())
+}

From 433f186595fb384b53d760955b5da883ced60f49 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Thu, 7 Jul 2022 13:04:52 +0200
Subject: [PATCH 11/16] issue: Add open/closed tabs in tui

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 issue/src/lib.rs            | 22 +++++++---
 issue/src/tui/app.rs        | 86 +++++++++++++++++++++++++++++++++++--
 issue/src/tui/components.rs | 21 ++++++++-
 3 files changed, 119 insertions(+), 10 deletions(-)

diff --git a/issue/src/lib.rs b/issue/src/lib.rs
index 38e9e021..b15385dc 100644
--- a/issue/src/lib.rs
+++ b/issue/src/lib.rs
@@ -4,8 +4,12 @@ use std::str::FromStr;
 
 use anyhow::{anyhow, Context};
 
+use librad::git::storage::ReadOnly;
+use librad::git::Urn;
+
 use radicle_common::args::{Args, Error, Help};
 use radicle_common::cobs::issue::*;
+// use radicle_common::cobs::shared::*;
 use radicle_common::{cobs, keys, project};
 use radicle_terminal as term;
 
@@ -244,7 +248,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
             issues.remove(&project, &id)?;
         }
         Operation::Interactive => {
-            tui()?;
+            tui(&storage, &project, &issues)?;
         }
     }
 
@@ -252,18 +256,26 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
 }
 
 #[cfg(feature = "tui")]
-fn tui() -> anyhow::Result<()> {
+fn tui<S: AsRef<ReadOnly>>(storage: &S, project: &Urn, store: &IssueStore) -> anyhow::Result<()> {
     use radicle_terminal_tui::Window;
     use tui::app;
 
-    let mut window = Window::default();
-    window.run(&mut app::IssueTui::default())?;
+    if let Some(metadata) = project::get(&storage, &project)? {
+        let mut window = Window::default();
+        window.run(&mut app::IssueTui::new(&storage, &metadata, &store))?;
+    } else {
+        anyhow::bail!("Could not load project metadata.");
+    }
 
     Ok(())
 }
 
 #[cfg(not(feature = "tui"))]
-fn tui() -> anyhow::Result<()> {
+fn tui<S: AsRef<ReadOnly>>(
+    _storage: &S,
+    _project: &Urn,
+    _store: &IssueStore,
+) -> anyhow::Result<()> {
     term::warning("Could not run tui. Please activate feature 'tui'.");
     Ok(())
 }
diff --git a/issue/src/tui/app.rs b/issue/src/tui/app.rs
index a379861b..e2bdae93 100644
--- a/issue/src/tui/app.rs
+++ b/issue/src/tui/app.rs
@@ -1,11 +1,18 @@
 use anyhow::Result;
 
-use tuirealm::props::{AttrValue, Attribute};
+use tui_realm_stdlib::Textarea;
+
+use tuirealm::props::{AttrValue, Attribute, BorderSides, Borders};
 use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
 use tuirealm::Frame;
 
+use librad::git::storage::ReadOnly;
+
+use radicle_common::cobs::issue::*;
+use radicle_common::project;
+
 use radicle_terminal_tui as tui;
-use tui::components::{ApplicationTitle, Shortcut, ShortcutBar};
+use tui::components::{ApplicationTitle, Shortcut, ShortcutBar, TabContainer};
 use tui::{App, Tui};
 
 /// Messages handled by this tui-application.
@@ -17,15 +24,43 @@ pub enum Message {
 #[derive(Debug, Eq, PartialEq, Clone, Hash)]
 pub enum Id {
     Title,
+    Content,
     Shortcuts,
 }
 
+#[derive(Default)]
+pub struct IssueGroups {
+    open: Vec<(IssueId, Issue)>,
+    closed: Vec<(IssueId, Issue)>,
+}
+
 /// App-window used by this application.
 #[derive(Default)]
 pub struct IssueTui {
+    /// Issues currently displayed by this tui.
+    issues: IssueGroups,
+    /// True if application should quit.
     quit: bool,
 }
 
+impl IssueTui {
+    pub fn new<S: AsRef<ReadOnly>>(
+        storage: &S,
+        metadata: &project::Metadata,
+        store: &IssueStore,
+    ) -> Self {
+        let issues = match Self::load_issues(storage, metadata, store) {
+            Ok(issues) => issues,
+            Err(_) => vec![],
+        };
+
+        Self {
+            issues: Self::group_issues(&issues),
+            quit: false,
+        }
+    }
+}
+
 /// Creates a new application using a tui-realm-application, mounts all
 /// components and sets focus to a default one.
 impl IssueTui {
@@ -54,11 +89,55 @@ impl IssueTui {
             )
             .split(area)
     }
+
+    fn load_issues<S: AsRef<ReadOnly>>(
+        storage: &S,
+        metadata: &project::Metadata,
+        store: &IssueStore,
+    ) -> Result<Vec<(IssueId, Issue)>> {
+        let mut issues = store.all(&metadata.urn)?;
+        Self::resolve_issues(storage, &mut issues);
+        Ok(issues)
+    }
+
+    fn resolve_issues<S: AsRef<ReadOnly>>(storage: &S, issues: &mut Vec<(IssueId, Issue)>) {
+        let _ = issues
+            .iter_mut()
+            .map(|(_, issue)| issue.resolve(&storage).ok())
+            .collect::<Vec<_>>();
+    }
+
+    fn group_issues(issues: &Vec<(IssueId, Issue)>) -> IssueGroups {
+        let mut open = issues.clone();
+        let mut closed = issues.clone();
+
+        open.retain(|(_, issue)| issue.state() == State::Open);
+        closed.retain(|(_, issue)| issue.state() != State::Open);
+
+        IssueGroups {
+            open: open,
+            closed: closed,
+        }
+    }
 }
 
 impl Tui<Id, Message> for IssueTui {
     fn init(&mut self, app: &mut App<Id, Message>) -> Result<()> {
         app.mount(Id::Title, ApplicationTitle::new("my-project"), vec![])?;
+        app.mount(
+            Id::Content,
+            TabContainer::default()
+                .child(
+                    format!("{} Open", self.issues.open.len()),
+                    Textarea::default().borders(Borders::default().sides(BorderSides::NONE)),
+                )
+                .child(
+                    format!("{} Closed", self.issues.closed.len()),
+                    Textarea::default().borders(Borders::default().sides(BorderSides::NONE)),
+                ),
+            vec![],
+        )?;
+
         app.mount(
             Id::Shortcuts,
             ShortcutBar::default().child(Shortcut::new("q", "quit")),
@@ -66,7 +145,7 @@ impl Tui<Id, Message> for IssueTui {
         )?;
 
         // We need to give focus to a component then
-        app.activate(Id::Title)?;
+        app.activate(Id::Content)?;
 
         Ok(())
     }
@@ -75,6 +154,7 @@ impl Tui<Id, Message> for IssueTui {
         let layout = Self::layout(app, frame);
 
         app.view(Id::Title, frame, layout[0]);
+        app.view(Id::Content, frame, layout[1]);
         app.view(Id::Shortcuts, frame, layout[2]);
     }
 
diff --git a/issue/src/tui/components.rs b/issue/src/tui/components.rs
index cb0362c1..9e269232 100644
--- a/issue/src/tui/components.rs
+++ b/issue/src/tui/components.rs
@@ -1,8 +1,9 @@
+use tuirealm::command::{Cmd, Direction};
 use tuirealm::event::{Event, Key, KeyEvent};
-use tuirealm::{Component, NoUserEvent};
+use tuirealm::{Component, MockComponent, NoUserEvent};
 
 use radicle_terminal_tui as tui;
-use tui::components::{ApplicationTitle, ShortcutBar};
+use tui::components::{ApplicationTitle, ShortcutBar, TabContainer};
 
 use super::app::Message;
 
@@ -32,3 +33,19 @@ impl Component<Message, NoUserEvent> for ShortcutBar {
         }
     }
 }
+
+impl Component<Message, NoUserEvent> for TabContainer {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        match event {
+            Event::Keyboard(KeyEvent { code: Key::Tab, .. }) => {
+                self.perform(Cmd::Move(Direction::Right));
+                None
+            }
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('q'),
+                ..
+            }) => Some(Message::Quit),
+            _ => None,
+        }
+    }
+}

From 811a17d06d1ff67e9e25196bb32b6485fdc17c40 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Fri, 8 Jul 2022 01:17:03 +0200
Subject: [PATCH 12/16] issue: Introduce global listener to tui

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 issue/src/tui/app.rs        | 18 +++++++++++++++++-
 issue/src/tui/components.rs | 29 ++++++++++++++++-------------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/issue/src/tui/app.rs b/issue/src/tui/app.rs
index e2bdae93..aae21c0d 100644
--- a/issue/src/tui/app.rs
+++ b/issue/src/tui/app.rs
@@ -2,9 +2,10 @@ use anyhow::Result;
 
 use tui_realm_stdlib::Textarea;
 
+use tuirealm::event::{Key, KeyEvent, KeyModifiers};
 use tuirealm::props::{AttrValue, Attribute, BorderSides, Borders};
 use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
-use tuirealm::Frame;
+use tuirealm::{Frame, Sub, SubClause, SubEventClause};
 
 use librad::git::storage::ReadOnly;
 
@@ -15,6 +16,8 @@ use radicle_terminal_tui as tui;
 use tui::components::{ApplicationTitle, Shortcut, ShortcutBar, TabContainer};
 use tui::{App, Tui};
 
+use super::components::GlobalListener;
+
 /// Messages handled by this tui-application.
 #[derive(Debug, Eq, PartialEq)]
 pub enum Message {
@@ -23,6 +26,7 @@ pub enum Message {
 
 #[derive(Debug, Eq, PartialEq, Clone, Hash)]
 pub enum Id {
+    Global,
     Title,
     Content,
     Shortcuts,
@@ -144,6 +148,18 @@ impl Tui<Id, Message> for IssueTui {
             vec![],
         )?;
 
+        app.mount(
+            Id::Global,
+            GlobalListener::default(),
+            vec![Sub::new(
+                SubEventClause::Keyboard(KeyEvent {
+                    code: Key::Char('q'),
+                    modifiers: KeyModifiers::NONE,
+                }),
+                SubClause::Always,
+            )],
+        )?;
+
         // We need to give focus to a component then
         app.activate(Id::Content)?;
 
diff --git a/issue/src/tui/components.rs b/issue/src/tui/components.rs
index 9e269232..7481fc39 100644
--- a/issue/src/tui/components.rs
+++ b/issue/src/tui/components.rs
@@ -1,3 +1,5 @@
+use tui_realm_stdlib::Phantom;
+
 use tuirealm::command::{Cmd, Direction};
 use tuirealm::event::{Event, Key, KeyEvent};
 use tuirealm::{Component, MockComponent, NoUserEvent};
@@ -10,7 +12,12 @@ use super::app::Message;
 /// Since `terminal-tui` does not know the type of messages that are being
 /// passed around in the app, the following handlers need to be implemented for
 /// every component used.
-impl Component<Message, NoUserEvent> for ApplicationTitle {
+#[derive(Default, MockComponent)]
+pub struct GlobalListener {
+    component: Phantom,
+}
+
+impl Component<Message, NoUserEvent> for GlobalListener {
     fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
         match event {
             Event::Keyboard(KeyEvent {
@@ -22,15 +29,15 @@ impl Component<Message, NoUserEvent> for ApplicationTitle {
     }
 }
 
+impl Component<Message, NoUserEvent> for ApplicationTitle {
+    fn on(&mut self, _event: Event<NoUserEvent>) -> Option<Message> {
+        None
+    }
+}
+
 impl Component<Message, NoUserEvent> for ShortcutBar {
-    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
-        match event {
-            Event::Keyboard(KeyEvent {
-                code: Key::Char('q'),
-                ..
-            }) => Some(Message::Quit),
-            _ => None,
-        }
+    fn on(&mut self, _event: Event<NoUserEvent>) -> Option<Message> {
+        None
     }
 }
 
@@ -41,10 +48,6 @@ impl Component<Message, NoUserEvent> for TabContainer {
                 self.perform(Cmd::Move(Direction::Right));
                 None
             }
-            Event::Keyboard(KeyEvent {
-                code: Key::Char('q'),
-                ..
-            }) => Some(Message::Quit),
             _ => None,
         }
     }

From 8ab393e46267ffe532f080e82ff197f49c2a4a21 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Fri, 8 Jul 2022 01:18:09 +0200
Subject: [PATCH 13/16] issue: Implement issue lists in tui

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 Cargo.lock                     | 272 +++++++++++++++++++++++++++++----
 issue/Cargo.toml               |   5 +-
 issue/src/tui/app.rs           |  51 +++++--
 issue/src/tui/components.rs    | 134 +++++++++++++++-
 terminal-tui/src/components.rs |  23 +--
 terminal-tui/src/state.rs      |   6 +-
 6 files changed, 429 insertions(+), 62 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9e1cf7b6..8ee2c81c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -146,7 +146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7"
 dependencies = [
  "async-lock",
- "autocfg",
+ "autocfg 1.1.0",
  "concurrent-queue",
  "futures-lite",
  "libc",
@@ -176,7 +176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
 dependencies = [
  "async-io",
- "autocfg",
+ "autocfg 1.1.0",
  "blocking",
  "cfg-if 1.0.0",
  "event-listener",
@@ -265,6 +265,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "autocfg"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
+dependencies = [
+ "autocfg 1.1.0",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -705,8 +714,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
 dependencies = [
  "iana-time-zone",
+ "js-sys",
  "num-integer",
  "num-traits",
+ "time 0.1.44",
+ "wasm-bindgen",
  "winapi 0.3.9",
 ]
 
@@ -775,6 +787,15 @@ dependencies = [
  "os_str_bytes 6.3.1",
 ]
 
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "clru"
 version = "0.5.0"
@@ -1035,7 +1056,7 @@ version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "cfg-if 1.0.0",
  "crossbeam-utils",
  "memoffset",
@@ -1926,6 +1947,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -2499,7 +2526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
 dependencies = [
  "ahash 0.3.8",
- "autocfg",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -2806,7 +2833,7 @@ version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "hashbrown 0.12.3",
 ]
 
@@ -2874,9 +2901,19 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+
+[[package]]
+name = "isolang"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "265ef164908329e47e753c769b14cbb27434abf0c41984dca201484022f09ce5"
+dependencies = [
+ "phf 0.7.24",
+ "phf_codegen 0.7.24",
+]
 
 [[package]]
 name = "itertools"
@@ -3118,7 +3155,7 @@ dependencies = [
  "socket2 0.4.7",
  "tempfile",
  "thiserror",
- "time",
+ "time 0.3.17",
  "tokio",
  "toml",
  "tracing",
@@ -3483,7 +3520,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "scopeguard",
 ]
 
@@ -3525,7 +3562,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -3830,7 +3867,7 @@ version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "num-traits",
 ]
 
@@ -3840,7 +3877,7 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "num-integer",
  "num-traits",
 ]
@@ -3851,7 +3888,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "num-integer",
  "num-traits",
 ]
@@ -3862,7 +3899,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -3955,7 +3992,7 @@ version = "0.9.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "cc",
  "libc",
  "openssl-src",
@@ -4152,13 +4189,32 @@ dependencies = [
  "rustc_version",
 ]
 
+[[package]]
+name = "phf"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+dependencies = [
+ "phf_shared 0.7.24",
+]
+
 [[package]]
 name = "phf"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.8.0",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+dependencies = [
+ "phf_generator 0.7.24",
+ "phf_shared 0.7.24",
 ]
 
 [[package]]
@@ -4167,8 +4223,18 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
 dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+dependencies = [
+ "phf_shared 0.7.24",
+ "rand 0.6.5",
 ]
 
 [[package]]
@@ -4177,17 +4243,26 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.8.0",
  "rand 0.7.3",
 ]
 
+[[package]]
+name = "phf_shared"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+dependencies = [
+ "siphasher 0.2.3",
+]
+
 [[package]]
 name = "phf_shared"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.10",
 ]
 
 [[package]]
@@ -4299,7 +4374,7 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "cfg-if 1.0.0",
  "libc",
  "log",
@@ -4701,6 +4776,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
+ "timeago",
  "tui-realm-stdlib",
  "tuirealm",
 ]
@@ -5038,6 +5114,25 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
+[[package]]
+name = "rand"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+dependencies = [
+ "autocfg 0.1.8",
+ "libc",
+ "rand_chacha 0.1.1",
+ "rand_core 0.4.2",
+ "rand_hc 0.1.0",
+ "rand_isaac",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg 0.1.2",
+ "rand_xorshift",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -5048,7 +5143,7 @@ dependencies = [
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
- "rand_hc",
+ "rand_hc 0.2.0",
  "rand_pcg 0.2.1",
 ]
 
@@ -5063,6 +5158,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+dependencies = [
+ "autocfg 0.1.8",
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -5083,6 +5188,21 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -5101,6 +5221,15 @@ dependencies = [
  "getrandom 0.2.8",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -5110,6 +5239,50 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+dependencies = [
+ "libc",
+ "rand_core 0.4.2",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+dependencies = [
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.2",
+ "rdrand",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+dependencies = [
+ "autocfg 0.1.8",
+ "rand_core 0.4.2",
+]
+
 [[package]]
 name = "rand_pcg"
 version = "0.2.1"
@@ -5128,6 +5301,15 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rand_xoshiro"
 version = "0.6.0"
@@ -5143,7 +5325,7 @@ version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "crossbeam-deque",
  "either",
  "rayon-core",
@@ -5161,6 +5343,15 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -5794,6 +5985,12 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
 
+[[package]]
+name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+
 [[package]]
 name = "siphasher"
 version = "0.3.10"
@@ -5825,7 +6022,7 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -5997,8 +6194,8 @@ dependencies = [
  "dirs",
  "fnv",
  "nom 5.1.2",
- "phf",
- "phf_codegen",
+ "phf 0.8.0",
+ "phf_codegen 0.8.0",
 ]
 
 [[package]]
@@ -6038,6 +6235,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "time"
 version = "0.3.17"
@@ -6059,6 +6267,10 @@ name = "timeago"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ec32dde57efb15c035ac074118d7f32820451395f28cb0524a01d4e94983b26"
+dependencies = [
+ "chrono",
+ "isolang",
+]
 
 [[package]]
 name = "tiny-keccak"
@@ -6090,7 +6302,7 @@ version = "1.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
 dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
  "bytes 1.2.1",
  "libc",
  "memchr",
@@ -6505,6 +6717,12 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/issue/Cargo.toml b/issue/Cargo.toml
index 4e2205f0..b4cd9cf0 100644
--- a/issue/Cargo.toml
+++ b/issue/Cargo.toml
@@ -13,8 +13,9 @@ librad = { version = "0" }
 radicle-common = { path = "../common" }
 radicle-terminal = { path = "../terminal" }
 radicle-terminal-tui = { path = "../terminal-tui", optional = true }
-tuirealm = { version = "1.7.0", optional = true  }
-tui-realm-stdlib = { version = "1.1.6", optional = true  }
+timeago = { version = "0.3.1" }
+tuirealm = { version = "1.7.0", optional = true }
+tui-realm-stdlib = { version = "1.1.6", optional = true }
 serde_json = { version = "1.0" }
 serde_yaml = { version = "0.8" }
 serde = { version = "1.0" }
diff --git a/issue/src/tui/app.rs b/issue/src/tui/app.rs
index aae21c0d..4621e3af 100644
--- a/issue/src/tui/app.rs
+++ b/issue/src/tui/app.rs
@@ -1,14 +1,13 @@
 use anyhow::Result;
 
-use tui_realm_stdlib::Textarea;
-
 use tuirealm::event::{Key, KeyEvent, KeyModifiers};
-use tuirealm::props::{AttrValue, Attribute, BorderSides, Borders};
+use tuirealm::props::{AttrValue, Attribute};
 use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
 use tuirealm::{Frame, Sub, SubClause, SubEventClause};
 
 use librad::git::storage::ReadOnly;
 
+use radicle_common::cobs::issue::State as IssueState;
 use radicle_common::cobs::issue::*;
 use radicle_common::project;
 
@@ -16,14 +15,16 @@ use radicle_terminal_tui as tui;
 use tui::components::{ApplicationTitle, Shortcut, ShortcutBar, TabContainer};
 use tui::{App, Tui};
 
-use super::components::GlobalListener;
+use super::components::{GlobalListener, IssueList};
 
 /// Messages handled by this tui-application.
 #[derive(Debug, Eq, PartialEq)]
 pub enum Message {
+    TabChanged(usize),
     Quit,
 }
 
+/// All components known to this tui-application.
 #[derive(Debug, Eq, PartialEq, Clone, Hash)]
 pub enum Id {
     Global,
@@ -32,6 +33,12 @@ pub enum Id {
     Shortcuts,
 }
 
+#[derive(Debug, Eq, PartialEq, Clone, Copy, Hash)]
+pub enum Group {
+    Open,
+    Closed,
+}
+
 #[derive(Default)]
 pub struct IssueGroups {
     open: Vec<(IssueId, Issue)>,
@@ -43,6 +50,8 @@ pub struct IssueGroups {
 pub struct IssueTui {
     /// Issues currently displayed by this tui.
     issues: IssueGroups,
+    /// Current issue.
+    active: Option<(Group, IssueId)>,
     /// True if application should quit.
     quit: bool,
 }
@@ -60,6 +69,7 @@ impl IssueTui {
 
         Self {
             issues: Self::group_issues(&issues),
+            active: None,
             quit: false,
         }
     }
@@ -115,8 +125,8 @@ impl IssueTui {
         let mut open = issues.clone();
         let mut closed = issues.clone();
 
-        open.retain(|(_, issue)| issue.state() == State::Open);
-        closed.retain(|(_, issue)| issue.state() != State::Open);
+        open.retain(|(_, issue)| issue.state() == IssueState::Open);
+        closed.retain(|(_, issue)| issue.state() != IssueState::Open);
 
         IssueGroups {
             open: open,
@@ -133,13 +143,35 @@ impl Tui<Id, Message> for IssueTui {
             TabContainer::default()
                 .child(
                     format!("{} Open", self.issues.open.len()),
-                    Textarea::default().borders(Borders::default().sides(BorderSides::NONE)),
+                    IssueList::new(self.issues.open.clone(), Group::Open),
                 )
                 .child(
                     format!("{} Closed", self.issues.closed.len()),
-                    Textarea::default().borders(Borders::default().sides(BorderSides::NONE)),
+                    IssueList::new(self.issues.closed.clone(), Group::Closed),
                 ),
-            vec![],
+            vec![
+                Sub::new(
+                    SubEventClause::Keyboard(KeyEvent {
+                        code: Key::Tab,
+                        modifiers: KeyModifiers::NONE,
+                    }),
+                    SubClause::Always,
+                ),
+                Sub::new(
+                    SubEventClause::Keyboard(KeyEvent {
+                        code: Key::Up,
+                        modifiers: KeyModifiers::NONE,
+                    }),
+                    SubClause::Always,
+                ),
+                Sub::new(
+                    SubEventClause::Keyboard(KeyEvent {
+                        code: Key::Down,
+                        modifiers: KeyModifiers::NONE,
+                    }),
+                    SubClause::Always,
+                ),
+            ],
         )?;
 
         app.mount(
@@ -178,6 +210,7 @@ impl Tui<Id, Message> for IssueTui {
         for message in app.poll() {
             match message {
                 Message::Quit => self.quit = true,
+                _ => {}
             }
         }
     }
diff --git a/issue/src/tui/components.rs b/issue/src/tui/components.rs
index 7481fc39..ecbf9a6e 100644
--- a/issue/src/tui/components.rs
+++ b/issue/src/tui/components.rs
@@ -1,12 +1,24 @@
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use timeago;
+
 use tui_realm_stdlib::Phantom;
 
-use tuirealm::command::{Cmd, Direction};
+use tuirealm::command::{Cmd, CmdResult, Direction};
 use tuirealm::event::{Event, Key, KeyEvent};
-use tuirealm::{Component, MockComponent, NoUserEvent};
+use tuirealm::props::{AttrValue, Attribute, Color, Props, Style};
+use tuirealm::tui::layout::Rect;
+use tuirealm::tui::style::Modifier;
+use tuirealm::tui::text::{Span, Spans};
+use tuirealm::tui::widgets::{List as TuiList, ListItem, ListState as TuiListState};
+use tuirealm::{Component, Frame, MockComponent, NoUserEvent, State, StateValue};
 
+use radicle_common::cobs::issue::*;
 use radicle_terminal_tui as tui;
 use tui::components::{ApplicationTitle, ShortcutBar, TabContainer};
+use tui::state::ListState;
 
+use super::app::Group;
 use super::app::Message;
 
 /// Since `terminal-tui` does not know the type of messages that are being
@@ -45,10 +57,126 @@ impl Component<Message, NoUserEvent> for TabContainer {
     fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
         match event {
             Event::Keyboard(KeyEvent { code: Key::Tab, .. }) => {
-                self.perform(Cmd::Move(Direction::Right));
+                match self.perform(Cmd::Move(Direction::Right)) {
+                    CmdResult::Changed(State::One(StateValue::Usize(index))) => {
+                        Some(Message::TabChanged(index))
+                    }
+                    _ => None,
+                }
+            }
+            Event::Keyboard(KeyEvent { code: Key::Up, .. }) => {
+                self.perform(Cmd::Move(Direction::Up));
+                None
+            }
+            Event::Keyboard(KeyEvent {
+                code: Key::Down, ..
+            }) => {
+                self.perform(Cmd::Move(Direction::Down));
                 None
             }
             _ => None,
         }
     }
 }
+
+pub struct IssueList {
+    props: Props,
+    group: Group,
+    issues: ListState<(IssueId, Issue)>,
+}
+
+impl IssueList {
+    pub fn new(issues: Vec<(IssueId, Issue)>, group: Group) -> Self {
+        Self {
+            props: Props::default(),
+            group: group,
+            issues: ListState::new(issues),
+        }
+    }
+
+    fn items(&self, _id: &IssueId, issue: &Issue) -> ListItem {
+        let fmt = timeago::Formatter::new();
+        let now = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
+        let timeago = Duration::from_secs(now - issue.comment.timestamp.as_secs());
+
+        let lines = vec![
+            Spans::from(Span::styled(
+                issue.title.clone(),
+                Style::default().fg(Color::Rgb(117, 113, 249)),
+            )),
+            Spans::from(vec![
+                Span::styled(
+                    issue.author.name(),
+                    Style::default()
+                        .fg(Color::Rgb(79, 75, 187))
+                        .add_modifier(Modifier::ITALIC),
+                ),
+                Span::raw(String::from(" ")),
+                Span::styled(
+                    fmt.convert(timeago),
+                    Style::default()
+                        .fg(Color::Rgb(70, 70, 70))
+                        .add_modifier(Modifier::ITALIC),
+                ),
+            ]),
+        ];
+        ListItem::new(lines)
+    }
+}
+
+impl MockComponent for IssueList {
+    fn view(&mut self, render: &mut Frame, area: Rect) {
+        let items = self
+            .issues
+            .items()
+            .all()
+            .iter()
+            .map(|(id, issue)| self.items(id, issue))
+            .collect::<Vec<_>>();
+
+        let list = TuiList::new(items)
+            .style(Style::default().fg(Color::White))
+            .highlight_style(Style::default().fg(Color::Rgb(238, 111, 248)))
+            .highlight_symbol("│ ")
+            .repeat_highlight_symbol(true);
+
+        let mut state: TuiListState = TuiListState::default();
+
+        state.select(Some(self.issues.items().selected_index()));
+        render.render_stateful_widget(list, area, &mut state);
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.props.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.props.set(attr, value);
+    }
+
+    fn state(&self) -> State {
+        State::One(StateValue::Usize(self.issues.items().selected_index()))
+    }
+
+    fn perform(&mut self, cmd: Cmd) -> CmdResult {
+        match cmd {
+            Cmd::Move(Direction::Up) => {
+                self.issues.select_previous();
+            }
+            Cmd::Move(Direction::Down) => {
+                self.issues.select_next();
+            }
+            _ => {}
+        }
+        CmdResult::None
+    }
+}
+
+impl Component<Message, NoUserEvent> for IssueList {
+    fn on(&mut self, ev: Event<NoUserEvent>) -> Option<Message> {
+        None
+    }
+}
diff --git a/terminal-tui/src/components.rs b/terminal-tui/src/components.rs
index ffb689ed..a3b7066e 100644
--- a/terminal-tui/src/components.rs
+++ b/terminal-tui/src/components.rs
@@ -568,20 +568,13 @@ impl MockComponent for TabContainer {
             .attributes
             .get_or(Attribute::Display, AttrValue::Flag(true))
             .unwrap_flag();
-        let tab_header_height = self
-            .header
-            .query(Attribute::Height)
-            .unwrap_or(AttrValue::Size(1))
-            .unwrap_size();
         let selected = self.header.state().unwrap_one().unwrap_u16();
 
         if display {
             let layout = Layout::default()
                 .direction(Direction::Vertical)
                 .vertical_margin(1)
-                .constraints(
-                    [Constraint::Length(tab_header_height), Constraint::Length(0)].as_ref(),
-                )
+                .constraints([Constraint::Length(2), Constraint::Length(0)].as_ref())
                 .split(area);
 
             self.header.view(frame, layout[0]);
@@ -605,16 +598,10 @@ impl MockComponent for TabContainer {
     }
 
     fn perform(&mut self, cmd: Cmd) -> CmdResult {
-        CmdResult::Batch(
-            [
-                self.children
-                    .iter_mut()
-                    .map(|child| child.perform(cmd))
-                    .collect(),
-                vec![self.header.perform(cmd)],
-            ]
-            .concat(),
-        )
+        let selected = self.header.state().unwrap_one().unwrap_u16();
+        let child = self.children.get_mut(selected as usize).unwrap();
+
+        CmdResult::Batch(vec![self.header.perform(cmd), child.perform(cmd)])
     }
 }
 
diff --git a/terminal-tui/src/state.rs b/terminal-tui/src/state.rs
index c1fc2d54..9c306ff4 100644
--- a/terminal-tui/src/state.rs
+++ b/terminal-tui/src/state.rs
@@ -54,15 +54,15 @@ impl<T> ListState<T> {
     pub fn select_previous(&mut self) {
         let index = match self.items.selected_index() == 0 {
             true => 0,
-            false => self.items.selected_index() - 1,
+            false => self.items.selected_index().saturating_sub(1),
         };
         self.items.select_index(index);
     }
 
     pub fn select_next(&mut self) {
         let len = self.items.all().len();
-        let index = match self.items.selected_index() >= len - 1 {
-            true => len - 1,
+        let index = match self.items.selected_index() >= len.saturating_sub(1) {
+            true => len.saturating_sub(1),
             false => self.items.selected_index() + 1,
         };
         self.items.select_index(index);

From b305479ce28366ecdd380c9705a3b4127c08f6fa Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Fri, 8 Jul 2022 02:48:02 +0200
Subject: [PATCH 14/16] issue: Add issue via tui

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 issue/src/lib.rs | 83 +++++++++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/issue/src/lib.rs b/issue/src/lib.rs
index b15385dc..75a15545 100644
--- a/issue/src/lib.rs
+++ b/issue/src/lib.rs
@@ -201,43 +201,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
             }
         }
         Operation::Create { title, description } => {
-            let meta = Metadata {
-                title: title.unwrap_or("Enter a title".to_owned()),
-                labels: vec![],
-            };
-            let yaml = serde_yaml::to_string(&meta)?;
-            let doc = format!(
-                "{}---\n\n{}",
-                yaml,
-                description.unwrap_or("Enter a description...".to_owned())
-            );
-
-            if let Some(text) = term::Editor::new().edit(&doc)? {
-                let mut meta = String::new();
-                let mut frontmatter = false;
-                let mut lines = text.lines();
-
-                while let Some(line) = lines.by_ref().next() {
-                    if line.trim() == "---" {
-                        if frontmatter {
-                            break;
-                        } else {
-                            frontmatter = true;
-                            continue;
-                        }
-                    }
-                    if frontmatter {
-                        meta.push_str(line);
-                        meta.push('\n');
-                    }
-                }
-
-                let description: String = lines.collect::<Vec<&str>>().join("\n");
-                let meta: Metadata =
-                    serde_yaml::from_str(&meta).context("failed to parse yaml front-matter")?;
-
-                issues.create(&project, &meta.title, description.trim(), &meta.labels)?;
-            }
+            create(&project, &issues, title, description)?;
         }
         Operation::List => {
             for (id, issue) in issues.all(&project)? {
@@ -255,6 +219,51 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
     Ok(())
 }
 
+fn create(
+    project: &Urn,
+    store: &IssueStore,
+    title: Option<String>,
+    description: Option<String>,
+) -> anyhow::Result<()> {
+    let meta = Metadata {
+        title: title.unwrap_or("Enter a title".to_owned()),
+        labels: vec![],
+    };
+    let yaml = serde_yaml::to_string(&meta)?;
+    let doc = format!(
+        "{}---\n\n{}",
+        yaml,
+        description.unwrap_or("Enter a description...".to_owned())
+    );
+
+    if let Some(text) = term::Editor::new().edit(&doc)? {
+        let mut meta = String::new();
+        let mut frontmatter = false;
+        let mut lines = text.lines();
+
+        while let Some(line) = lines.by_ref().next() {
+            if line.trim() == "---" {
+                if frontmatter {
+                    break;
+                } else {
+                    frontmatter = true;
+                    continue;
+                }
+            }
+            if frontmatter {
+                meta.push_str(line);
+                meta.push('\n');
+            }
+        }
+        let description: String = lines.collect::<Vec<&str>>().join("\n");
+        let meta: Metadata =
+            serde_yaml::from_str(&meta).context("failed to parse yaml front-matter")?;
+
+        store.create(&project, &meta.title, description.trim(), &meta.labels)?;
+    }
+    Ok(())
+}
+
 #[cfg(feature = "tui")]
 fn tui<S: AsRef<ReadOnly>>(storage: &S, project: &Urn, store: &IssueStore) -> anyhow::Result<()> {
     use radicle_terminal_tui::Window;

From 77d8f0c1f65f31d3283989927db4d87e57f591d9 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Fri, 8 Jul 2022 17:33:00 +0200
Subject: [PATCH 15/16] issue: Implement tui component for comments

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 issue/src/tui/app.rs        |  74 ++++++++++++++++----
 issue/src/tui/components.rs | 132 +++++++++++++++++++++++++++++++++---
 terminal-tui/src/lib.rs     |  18 +++++
 3 files changed, 198 insertions(+), 26 deletions(-)

diff --git a/issue/src/tui/app.rs b/issue/src/tui/app.rs
index 4621e3af..bbd9077b 100644
--- a/issue/src/tui/app.rs
+++ b/issue/src/tui/app.rs
@@ -15,12 +15,14 @@ use radicle_terminal_tui as tui;
 use tui::components::{ApplicationTitle, Shortcut, ShortcutBar, TabContainer};
 use tui::{App, Tui};
 
-use super::components::{GlobalListener, IssueList};
+use super::components::{CommentList, GlobalListener, IssueList};
 
 /// Messages handled by this tui-application.
 #[derive(Debug, Eq, PartialEq)]
 pub enum Message {
     TabChanged(usize),
+    EnterDetail(IssueId),
+    LeaveDetail,
     Quit,
 }
 
@@ -29,14 +31,21 @@ pub enum Message {
 pub enum Id {
     Global,
     Title,
-    Content,
+    Browser,
+    Detail,
     Shortcuts,
 }
 
-#[derive(Debug, Eq, PartialEq, Clone, Copy, Hash)]
-pub enum Group {
-    Open,
-    Closed,
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub enum Mode {
+    Browser,
+    Detail,
+}
+
+impl Default for Mode {
+    fn default() -> Self {
+        Mode::Browser
+    }
 }
 
 #[derive(Default)]
@@ -45,13 +54,19 @@ pub struct IssueGroups {
     closed: Vec<(IssueId, Issue)>,
 }
 
+impl From<&IssueGroups> for Vec<(IssueId, Issue)> {
+    fn from(groups: &IssueGroups) -> Self {
+        [groups.open.clone(), groups.closed.clone()].concat()
+    }
+}
+
 /// App-window used by this application.
 #[derive(Default)]
 pub struct IssueTui {
     /// Issues currently displayed by this tui.
     issues: IssueGroups,
-    /// Current issue.
-    active: Option<(Group, IssueId)>,
+    /// Represents the active view
+    mode: Mode,
     /// True if application should quit.
     quit: bool,
 }
@@ -69,7 +84,7 @@ impl IssueTui {
 
         Self {
             issues: Self::group_issues(&issues),
-            active: None,
+            mode: Mode::Browser,
             quit: false,
         }
     }
@@ -139,15 +154,15 @@ impl Tui<Id, Message> for IssueTui {
     fn init(&mut self, app: &mut App<Id, Message>) -> Result<()> {
         app.mount(Id::Title, ApplicationTitle::new("my-project"), vec![])?;
         app.mount(
-            Id::Content,
+            Id::Browser,
             TabContainer::default()
                 .child(
                     format!("{} Open", self.issues.open.len()),
-                    IssueList::new(self.issues.open.clone(), Group::Open),
+                    IssueList::new(self.issues.open.clone()),
                 )
                 .child(
                     format!("{} Closed", self.issues.closed.len()),
-                    IssueList::new(self.issues.closed.clone(), Group::Closed),
+                    IssueList::new(self.issues.closed.clone()),
                 ),
             vec![
                 Sub::new(
@@ -174,6 +189,8 @@ impl Tui<Id, Message> for IssueTui {
             ],
         )?;
 
+        app.mount(Id::Detail, CommentList::<()>::new(vec![]), vec![])?;
+
         app.mount(
             Id::Shortcuts,
             ShortcutBar::default().child(Shortcut::new("q", "quit")),
@@ -193,7 +210,7 @@ impl Tui<Id, Message> for IssueTui {
         )?;
 
         // We need to give focus to a component then
-        app.activate(Id::Content)?;
+        app.activate(Id::Browser)?;
 
         Ok(())
     }
@@ -201,8 +218,15 @@ impl Tui<Id, Message> for IssueTui {
     fn view(&mut self, app: &mut App<Id, Message>, frame: &mut Frame) {
         let layout = Self::layout(app, frame);
 
-        app.view(Id::Title, frame, layout[0]);
-        app.view(Id::Content, frame, layout[1]);
+        match self.mode {
+            Mode::Browser => {
+                app.view(Id::Title, frame, layout[0]);
+                app.view(Id::Browser, frame, layout[1]);
+            }
+            Mode::Detail => {
+                app.view(Id::Detail, frame, layout[1]);
+            }
+        }
         app.view(Id::Shortcuts, frame, layout[2]);
     }
 
@@ -210,6 +234,26 @@ impl Tui<Id, Message> for IssueTui {
         for message in app.poll() {
             match message {
                 Message::Quit => self.quit = true,
+                Message::EnterDetail(issue_id) => {
+                    let issues = Vec::<(IssueId, Issue)>::from(&self.issues);
+                    if let Some((_, issue)) = issues.iter().find(|(id, _)| *id == issue_id) {
+                        let comments = issue
+                            .comments()
+                            .iter()
+                            .map(|comment| comment.clone())
+                            .collect::<Vec<_>>();
+
+                        self.mode = Mode::Detail;
+
+                        app.remount(Id::Detail, CommentList::new(comments), vec![])
+                            .ok();
+                        app.activate(Id::Detail).ok();
+                    }
+                }
+                Message::LeaveDetail => {
+                    self.mode = Mode::Browser;
+                    app.blur().ok();
+                }
                 _ => {}
             }
         }
diff --git a/issue/src/tui/components.rs b/issue/src/tui/components.rs
index ecbf9a6e..5d8fdbaf 100644
--- a/issue/src/tui/components.rs
+++ b/issue/src/tui/components.rs
@@ -1,7 +1,10 @@
+use std::str::FromStr;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use timeago;
 
+use librad::collaborative_objects::ObjectId;
+
 use tui_realm_stdlib::Phantom;
 
 use tuirealm::command::{Cmd, CmdResult, Direction};
@@ -14,11 +17,11 @@ use tuirealm::tui::widgets::{List as TuiList, ListItem, ListState as TuiListStat
 use tuirealm::{Component, Frame, MockComponent, NoUserEvent, State, StateValue};
 
 use radicle_common::cobs::issue::*;
+use radicle_common::cobs::Comment;
 use radicle_terminal_tui as tui;
 use tui::components::{ApplicationTitle, ShortcutBar, TabContainer};
 use tui::state::ListState;
 
-use super::app::Group;
 use super::app::Message;
 
 /// Since `terminal-tui` does not know the type of messages that are being
@@ -64,6 +67,20 @@ impl Component<Message, NoUserEvent> for TabContainer {
                     _ => None,
                 }
             }
+            Event::Keyboard(KeyEvent {
+                code: Key::Enter, ..
+            }) => match self.perform(Cmd::Submit) {
+                CmdResult::Batch(batch) => batch.iter().fold(None, |_, result| match result {
+                    CmdResult::Submit(State::One(StateValue::String(id))) => {
+                        match ObjectId::from_str(&id) {
+                            Ok(id) => Some(Message::EnterDetail(id)),
+                            Err(_) => None,
+                        }
+                    }
+                    _ => None,
+                }),
+                _ => None,
+            },
             Event::Keyboard(KeyEvent { code: Key::Up, .. }) => {
                 self.perform(Cmd::Move(Direction::Up));
                 None
@@ -80,16 +97,14 @@ impl Component<Message, NoUserEvent> for TabContainer {
 }
 
 pub struct IssueList {
-    props: Props,
-    group: Group,
+    attributes: Props,
     issues: ListState<(IssueId, Issue)>,
 }
 
 impl IssueList {
-    pub fn new(issues: Vec<(IssueId, Issue)>, group: Group) -> Self {
+    pub fn new(issues: Vec<(IssueId, Issue)>) -> Self {
         Self {
-            props: Props::default(),
-            group: group,
+            attributes: Props::default(),
             issues: ListState::new(issues),
         }
     }
@@ -150,11 +165,11 @@ impl MockComponent for IssueList {
     }
 
     fn query(&self, attr: Attribute) -> Option<AttrValue> {
-        self.props.get(attr)
+        self.attributes.get(attr)
     }
 
     fn attr(&mut self, attr: Attribute, value: AttrValue) {
-        self.props.set(attr, value);
+        self.attributes.set(attr, value);
     }
 
     fn state(&self) -> State {
@@ -165,18 +180,113 @@ impl MockComponent for IssueList {
         match cmd {
             Cmd::Move(Direction::Up) => {
                 self.issues.select_previous();
+                let selected = self.issues.items().selected_index();
+                CmdResult::Changed(State::One(StateValue::Usize(selected)))
             }
             Cmd::Move(Direction::Down) => {
                 self.issues.select_next();
+                let selected = self.issues.items().selected_index();
+                CmdResult::Changed(State::One(StateValue::Usize(selected)))
             }
-            _ => {}
+            Cmd::Submit => {
+                let (id, _) = self.issues.items().selected().unwrap();
+                CmdResult::Submit(State::One(StateValue::String(id.to_string())))
+            }
+            _ => CmdResult::None,
         }
-        CmdResult::None
     }
 }
 
 impl Component<Message, NoUserEvent> for IssueList {
-    fn on(&mut self, ev: Event<NoUserEvent>) -> Option<Message> {
+    fn on(&mut self, _event: Event<NoUserEvent>) -> Option<Message> {
         None
     }
 }
+
+pub struct CommentList<R> {
+    attributes: Props,
+    comments: ListState<Comment<R>>,
+}
+
+impl<R> CommentList<R> {
+    pub fn new(comments: Vec<Comment<R>>) -> Self {
+        Self {
+            attributes: Props::default(),
+            comments: ListState::new(comments),
+        }
+    }
+
+    fn items(&self, comment: &Comment<R>) -> ListItem {
+        let lines = vec![Spans::from(Span::styled(
+            comment.body.clone(),
+            Style::default().fg(Color::Rgb(117, 113, 249)),
+        ))];
+        ListItem::new(lines)
+    }
+}
+
+impl<R> MockComponent for CommentList<R> {
+    fn view(&mut self, render: &mut Frame, area: Rect) {
+        let items = self
+            .comments
+            .items()
+            .all()
+            .iter()
+            .map(|comment| self.items(comment))
+            .collect::<Vec<_>>();
+
+        let list = TuiList::new(items)
+            .style(Style::default().fg(Color::White))
+            .highlight_style(Style::default().fg(Color::Rgb(238, 111, 248)))
+            .highlight_symbol("│ ")
+            .repeat_highlight_symbol(true);
+
+        let mut state: TuiListState = TuiListState::default();
+        state.select(Some(self.comments.items().selected_index()));
+        render.render_stateful_widget(list, area, &mut state);
+    }
+
+    fn query(&self, attr: Attribute) -> Option<AttrValue> {
+        self.attributes.get(attr)
+    }
+
+    fn attr(&mut self, attr: Attribute, value: AttrValue) {
+        self.attributes.set(attr, value);
+    }
+
+    fn state(&self) -> State {
+        State::One(StateValue::Usize(self.comments.items().selected_index()))
+    }
+
+    fn perform(&mut self, cmd: Cmd) -> CmdResult {
+        match cmd {
+            Cmd::Move(Direction::Up) => {
+                self.comments.select_previous();
+            }
+            Cmd::Move(Direction::Down) => {
+                self.comments.select_next();
+            }
+            _ => {}
+        }
+        CmdResult::None
+    }
+}
+
+impl<R> Component<Message, NoUserEvent> for CommentList<R> {
+    fn on(&mut self, event: Event<NoUserEvent>) -> Option<Message> {
+        match event {
+            Event::Keyboard(KeyEvent {
+                code: Key::Down, ..
+            }) => {
+                self.perform(Cmd::Move(Direction::Down));
+                None
+            }
+            Event::Keyboard(KeyEvent { code: Key::Up, .. }) => {
+                self.perform(Cmd::Move(Direction::Up));
+                None
+            }
+            Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => Some(Message::LeaveDetail),
+            _ => None,
+        }
+    }
+}
diff --git a/terminal-tui/src/lib.rs b/terminal-tui/src/lib.rs
index d04a7c38..796b058e 100644
--- a/terminal-tui/src/lib.rs
+++ b/terminal-tui/src/lib.rs
@@ -60,6 +60,24 @@ where
         Ok(())
     }
 
+    pub fn remount<C>(
+        &mut self,
+        id: Id,
+        component: C,
+        subs: Vec<Sub<Id, NoUserEvent>>,
+    ) -> Result<(), Error>
+    where
+        C: Component<Message, NoUserEvent> + 'static,
+    {
+        self.backend.remount(id, Box::new(component), subs)?;
+        Ok(())
+    }
+
+    pub fn blur(&mut self) -> Result<(), Error> {
+        self.backend.blur()?;
+        Ok(())
+    }
+
     pub fn activate(&mut self, id: Id) -> Result<(), Error> {
         self.backend.active(&id)?;
         Ok(())

From d2d95825aec6c01d416d2779be3c73853369f172 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@zirkular.io>
Date: Sat, 9 Jul 2022 00:55:06 +0200
Subject: [PATCH 16/16] issue: Implement comment browser in tui

Signed-off-by: Erik Kundt <erik@zirkular.io>
---
 issue/src/lib.rs            |   2 +-
 issue/src/tui.rs            |   1 +
 issue/src/tui/app.rs        |  85 +++++++++--------------
 issue/src/tui/components.rs | 131 +++++++++++++++++++++++++++++++-----
 issue/src/tui/issue.rs      |  83 +++++++++++++++++++++++
 5 files changed, 229 insertions(+), 73 deletions(-)
 create mode 100644 issue/src/tui/issue.rs

diff --git a/issue/src/lib.rs b/issue/src/lib.rs
index 75a15545..077292f3 100644
--- a/issue/src/lib.rs
+++ b/issue/src/lib.rs
@@ -259,7 +259,7 @@ fn create(
         let meta: Metadata =
             serde_yaml::from_str(&meta).context("failed to parse yaml front-matter")?;
 
-        store.create(&project, &meta.title, description.trim(), &meta.labels)?;
+        store.create(project, &meta.title, description.trim(), &meta.labels)?;
     }
     Ok(())
 }
diff --git a/issue/src/tui.rs b/issue/src/tui.rs
index 13545c46..5840ae9e 100644
--- a/issue/src/tui.rs
+++ b/issue/src/tui.rs
@@ -1,2 +1,3 @@
 pub mod app;
 pub mod components;
+pub mod issue;
diff --git a/issue/src/tui/app.rs b/issue/src/tui/app.rs
index bbd9077b..ec368e07 100644
--- a/issue/src/tui/app.rs
+++ b/issue/src/tui/app.rs
@@ -1,22 +1,25 @@
 use anyhow::Result;
 
+use librad::git::storage::ReadOnly;
+
 use tuirealm::event::{Key, KeyEvent, KeyModifiers};
 use tuirealm::props::{AttrValue, Attribute};
 use tuirealm::tui::layout::{Constraint, Direction, Layout, Rect};
 use tuirealm::{Frame, Sub, SubClause, SubEventClause};
 
-use librad::git::storage::ReadOnly;
-
-use radicle_common::cobs::issue::State as IssueState;
 use radicle_common::cobs::issue::*;
 use radicle_common::project;
 
 use radicle_terminal_tui as tui;
+
 use tui::components::{ApplicationTitle, Shortcut, ShortcutBar, TabContainer};
 use tui::{App, Tui};
 
 use super::components::{CommentList, GlobalListener, IssueList};
 
+use super::issue;
+use super::issue::{GroupedIssues, WrappedComment};
+
 /// Messages handled by this tui-application.
 #[derive(Debug, Eq, PartialEq)]
 pub enum Message {
@@ -48,23 +51,11 @@ impl Default for Mode {
     }
 }
 
-#[derive(Default)]
-pub struct IssueGroups {
-    open: Vec<(IssueId, Issue)>,
-    closed: Vec<(IssueId, Issue)>,
-}
-
-impl From<&IssueGroups> for Vec<(IssueId, Issue)> {
-    fn from(groups: &IssueGroups) -> Self {
-        [groups.open.clone(), groups.closed.clone()].concat()
-    }
-}
-
 /// App-window used by this application.
 #[derive(Default)]
 pub struct IssueTui {
     /// Issues currently displayed by this tui.
-    issues: IssueGroups,
+    issues: GroupedIssues,
     /// Represents the active view
     mode: Mode,
     /// True if application should quit.
@@ -77,14 +68,14 @@ impl IssueTui {
         metadata: &project::Metadata,
         store: &IssueStore,
     ) -> Self {
-        let issues = match Self::load_issues(storage, metadata, store) {
+        let issues = match issue::load(storage, metadata, store) {
             Ok(issues) => issues,
             Err(_) => vec![],
         };
 
         Self {
-            issues: Self::group_issues(&issues),
-            mode: Mode::Browser,
+            issues: GroupedIssues::from(&issues),
+            mode: Mode::default(),
             quit: false,
         }
     }
@@ -111,43 +102,13 @@ impl IssueTui {
             .constraints(
                 [
                     Constraint::Length(title_h),
-                    Constraint::Length(container_h - 2),
+                    Constraint::Length(container_h.saturating_sub(2)),
                     Constraint::Length(shortcuts_h),
                 ]
                 .as_ref(),
             )
             .split(area)
     }
-
-    fn load_issues<S: AsRef<ReadOnly>>(
-        storage: &S,
-        metadata: &project::Metadata,
-        store: &IssueStore,
-    ) -> Result<Vec<(IssueId, Issue)>> {
-        let mut issues = store.all(&metadata.urn)?;
-        Self::resolve_issues(storage, &mut issues);
-        Ok(issues)
-    }
-
-    fn resolve_issues<S: AsRef<ReadOnly>>(storage: &S, issues: &mut Vec<(IssueId, Issue)>) {
-        let _ = issues
-            .iter_mut()
-            .map(|(_, issue)| issue.resolve(&storage).ok())
-            .collect::<Vec<_>>();
-    }
-
-    fn group_issues(issues: &Vec<(IssueId, Issue)>) -> IssueGroups {
-        let mut open = issues.clone();
-        let mut closed = issues.clone();
-
-        open.retain(|(_, issue)| issue.state() == IssueState::Open);
-        closed.retain(|(_, issue)| issue.state() != IssueState::Open);
-
-        IssueGroups {
-            open: open,
-            closed: closed,
-        }
-    }
 }
 
 impl Tui<Id, Message> for IssueTui {
@@ -189,7 +150,7 @@ impl Tui<Id, Message> for IssueTui {
             ],
         )?;
 
-        app.mount(Id::Detail, CommentList::<()>::new(vec![]), vec![])?;
+        app.mount(Id::Detail, CommentList::<()>::new(None, vec![]), vec![])?;
 
         app.mount(
             Id::Shortcuts,
@@ -236,17 +197,31 @@ impl Tui<Id, Message> for IssueTui {
                 Message::Quit => self.quit = true,
                 Message::EnterDetail(issue_id) => {
                     let issues = Vec::<(IssueId, Issue)>::from(&self.issues);
-                    if let Some((_, issue)) = issues.iter().find(|(id, _)| *id == issue_id) {
+                    if let Some((id, issue)) = issues.iter().find(|(id, _)| *id == issue_id) {
                         let comments = issue
                             .comments()
                             .iter()
-                            .map(|comment| comment.clone())
+                            .map(|comment| WrappedComment::Reply {
+                                comment: comment.clone(),
+                            })
                             .collect::<Vec<_>>();
 
                         self.mode = Mode::Detail;
 
-                        app.remount(Id::Detail, CommentList::new(comments), vec![])
-                            .ok();
+                        let comments = [
+                            vec![WrappedComment::Root {
+                                comment: issue.comment.clone(),
+                            }],
+                            comments,
+                        ]
+                        .concat();
+
+                        app.remount(
+                            Id::Detail,
+                            CommentList::new(Some((*id, issue.clone())), comments),
+                            vec![],
+                        )
+                        .ok();
                         app.activate(Id::Detail).ok();
                     }
                 }
diff --git a/issue/src/tui/components.rs b/issue/src/tui/components.rs
index 5d8fdbaf..4c26b99c 100644
--- a/issue/src/tui/components.rs
+++ b/issue/src/tui/components.rs
@@ -5,24 +5,27 @@ use timeago;
 
 use librad::collaborative_objects::ObjectId;
 
-use tui_realm_stdlib::Phantom;
+use tui_realm_stdlib::{utils, Phantom};
 
 use tuirealm::command::{Cmd, CmdResult, Direction};
 use tuirealm::event::{Event, Key, KeyEvent};
-use tuirealm::props::{AttrValue, Attribute, Color, Props, Style};
-use tuirealm::tui::layout::Rect;
+use tuirealm::props::{AttrValue, Attribute, Color, Props, Style, TextSpan};
+use tuirealm::tui::layout::{Constraint, Layout, Rect};
 use tuirealm::tui::style::Modifier;
 use tuirealm::tui::text::{Span, Spans};
 use tuirealm::tui::widgets::{List as TuiList, ListItem, ListState as TuiListState};
 use tuirealm::{Component, Frame, MockComponent, NoUserEvent, State, StateValue};
 
 use radicle_common::cobs::issue::*;
-use radicle_common::cobs::Comment;
+use radicle_common::cobs::Timestamp;
+
 use radicle_terminal_tui as tui;
-use tui::components::{ApplicationTitle, ShortcutBar, TabContainer};
+
+use tui::components::{ApplicationTitle, ContextBar, ShortcutBar, TabContainer};
 use tui::state::ListState;
 
 use super::app::Message;
+use super::issue::WrappedComment;
 
 /// Since `terminal-tui` does not know the type of messages that are being
 /// passed around in the app, the following handlers need to be implemented for
@@ -143,7 +146,7 @@ impl IssueList {
 }
 
 impl MockComponent for IssueList {
-    fn view(&mut self, render: &mut Frame, area: Rect) {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
         let items = self
             .issues
             .items()
@@ -161,7 +164,7 @@ impl MockComponent for IssueList {
         let mut state: TuiListState = TuiListState::default();
 
         state.select(Some(self.issues.items().selected_index()));
-        render.render_stateful_widget(list, area, &mut state);
+        frame.render_stateful_widget(list, area, &mut state);
     }
 
     fn query(&self, attr: Attribute) -> Option<AttrValue> {
@@ -205,34 +208,119 @@ impl Component<Message, NoUserEvent> for IssueList {
 
 pub struct CommentList<R> {
     attributes: Props,
-    comments: ListState<Comment<R>>,
+    comments: ListState<WrappedComment<R>>,
+    issue: Option<(IssueId, Issue)>,
 }
 
 impl<R> CommentList<R> {
-    pub fn new(comments: Vec<Comment<R>>) -> Self {
+    pub fn new(issue: Option<(IssueId, Issue)>, comments: Vec<WrappedComment<R>>) -> Self {
         Self {
             attributes: Props::default(),
             comments: ListState::new(comments),
+            issue: issue,
         }
     }
 
-    fn items(&self, comment: &Comment<R>) -> ListItem {
-        let lines = vec![Spans::from(Span::styled(
-            comment.body.clone(),
-            Style::default().fg(Color::Rgb(117, 113, 249)),
-        ))];
+    fn items(&self, comment: &WrappedComment<R>, width: u16) -> ListItem {
+        let (author, body, reactions, timestamp, indent) = comment.author_info();
+        let reactions = reactions
+            .iter()
+            .map(|(r, _)| format!("{} ", r.emoji))
+            .collect::<String>();
+
+        let lines = [
+            Self::body(body, indent, width),
+            vec![
+                Spans::from(String::new()),
+                Spans::from(Self::meta(author, reactions, timestamp, indent)),
+                Spans::from(String::new()),
+            ],
+        ]
+        .concat();
         ListItem::new(lines)
     }
+
+    fn body<'a>(body: String, indent: u16, width: u16) -> Vec<Spans<'a>> {
+        let props = Props::default();
+        let body = TextSpan::new(body).fg(Color::Rgb(150, 150, 150));
+
+        let lines = utils::wrap_spans(&[body], (width - indent) as usize, &props)
+            .iter()
+            .map(|line| Spans::from(format!("{}{}", whitespaces(indent), line.0[0].content)))
+            .collect::<Vec<_>>();
+        lines
+    }
+
+    fn meta<'a>(
+        author: String,
+        reactions: String,
+        timestamp: Timestamp,
+        indent: u16,
+    ) -> Vec<Span<'a>> {
+        let fmt = timeago::Formatter::new();
+        let now = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
+        let timeago = Duration::from_secs(now - timestamp.as_secs());
+
+        vec![
+            Span::raw(whitespaces(indent)),
+            Span::styled(
+                author,
+                Style::default()
+                    .fg(Color::Rgb(79, 75, 187))
+                    .add_modifier(Modifier::ITALIC),
+            ),
+            Span::raw(whitespaces(1)),
+            Span::styled(
+                fmt.convert(timeago),
+                Style::default()
+                    .fg(Color::Rgb(70, 70, 70))
+                    .add_modifier(Modifier::ITALIC),
+            ),
+            Span::raw(whitespaces(1)),
+            Span::raw(reactions),
+        ]
+    }
 }
 
 impl<R> MockComponent for CommentList<R> {
-    fn view(&mut self, render: &mut Frame, area: Rect) {
+    fn view(&mut self, frame: &mut Frame, area: Rect) {
+        use tuirealm::tui::layout::Direction;
+
+        let mut context = match &self.issue {
+            Some((id, issue)) => ContextBar::new(
+                "Issue",
+                &format!("{}", id),
+                issue.title(),
+                &issue.author().name(),
+                &format!("{}", self.comments.items().count()),
+            ),
+            None => ContextBar::new("Issue", "", "", "", ""),
+        };
+        let context_h = context.query(Attribute::Height).unwrap().unwrap_size();
+        let spacer_h = 1;
+
+        let list_h = area.height.saturating_sub(context_h);
+        let layout = Layout::default()
+            .direction(Direction::Vertical)
+            .constraints(
+                [
+                    Constraint::Length(list_h.saturating_sub(spacer_h)),
+                    Constraint::Length(context_h),
+                    Constraint::Length(spacer_h),
+                ]
+                .as_ref(),
+            )
+            .split(area);
+
         let items = self
             .comments
             .items()
             .all()
             .iter()
-            .map(|comment| self.items(comment))
+            .map(|comment| self.items(comment, area.width))
             .collect::<Vec<_>>();
 
         let list = TuiList::new(items)
@@ -243,7 +331,9 @@ impl<R> MockComponent for CommentList<R> {
 
         let mut state: TuiListState = TuiListState::default();
         state.select(Some(self.comments.items().selected_index()));
-        render.render_stateful_widget(list, area, &mut state);
+        frame.render_stateful_widget(list, layout[0], &mut state);
+
+        context.view(frame, layout[1]);
     }
 
     fn query(&self, attr: Attribute) -> Option<AttrValue> {
@@ -290,3 +380,10 @@ impl<R> Component<Message, NoUserEvent> for CommentList<R> {
         }
     }
 }
+
+pub fn whitespaces(indent: u16) -> String {
+    match String::from_utf8(vec![b' '; indent as usize]) {
+        Ok(spaces) => spaces,
+        Err(_) => String::new(),
+    }
+}
diff --git a/issue/src/tui/issue.rs b/issue/src/tui/issue.rs
new file mode 100644
index 00000000..e497f2d2
--- /dev/null
+++ b/issue/src/tui/issue.rs
@@ -0,0 +1,83 @@
+use anyhow::Result;
+
+use librad::git::storage::ReadOnly;
+
+use radicle_common::cobs::issue::State;
+use radicle_common::cobs::issue::*;
+use radicle_common::cobs::{Comment, Reaction, Timestamp};
+
+use radicle_common::project;
+
+#[derive(Default)]
+pub struct GroupedIssues {
+    pub open: Vec<(IssueId, Issue)>,
+    pub closed: Vec<(IssueId, Issue)>,
+}
+
+impl From<&GroupedIssues> for Vec<(IssueId, Issue)> {
+    fn from(groups: &GroupedIssues) -> Self {
+        [groups.open.clone(), groups.closed.clone()].concat()
+    }
+}
+
+impl From<&Vec<(IssueId, Issue)>> for GroupedIssues {
+    fn from(issues: &Vec<(IssueId, Issue)>) -> Self {
+        let mut open = issues.clone();
+        let mut closed = issues.clone();
+
+        open.retain(|(_, issue)| issue.state() == State::Open);
+        closed.retain(|(_, issue)| issue.state() != State::Open);
+
+        Self {
+            open: open,
+            closed: closed,
+        }
+    }
+}
+
+#[derive(Clone)]
+pub enum WrappedComment<R> {
+    Root { comment: Comment<()> },
+    Reply { comment: Comment<R> },
+}
+
+impl<R> WrappedComment<R> {
+    pub fn author_info(&self) -> (String, String, Vec<(&Reaction, &usize)>, Timestamp, u16) {
+        let (author, body, reactions, timestamp, indent) = match self {
+            WrappedComment::Root { comment } => (
+                comment.author.name(),
+                comment.body.clone(),
+                comment.reactions.iter().collect::<Vec<_>>(),
+                comment.timestamp,
+                0,
+            ),
+            WrappedComment::Reply { comment } => (
+                comment.author.name(),
+                comment.body.clone(),
+                comment.reactions.iter().collect::<Vec<_>>(),
+                comment.timestamp,
+                4,
+            ),
+        };
+
+        (author, body, reactions, timestamp, indent)
+    }
+}
+
+pub fn load<S: AsRef<ReadOnly>>(
+    storage: &S,
+    metadata: &project::Metadata,
+    store: &IssueStore,
+) -> Result<Vec<(IssueId, Issue)>> {
+    let mut issues = store.all(&metadata.urn)?;
+    resolve(storage, &mut issues);
+
+    Ok(issues)
+}
+
+pub fn resolve<S: AsRef<ReadOnly>>(storage: &S, issues: &mut Vec<(IssueId, Issue)>) {
+    let _ = issues
+        .iter_mut()
+        .map(|(_, issue)| issue.resolve(&storage).ok())
+        .collect::<Vec<_>>();
+}