From b0f6c8948eb17237414f1bd34ca776fec71a4858 Mon Sep 17 00:00:00 2001 From: matiasbzurovski <164921079+matiasbzurovski@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:58:05 +0200 Subject: [PATCH] Add HomeCard::StartRadQuest on wallet creation (#190) * Show RadQuest card after wallet creation * Fix sort --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/wallet/home_cards/manager.rs | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 675a040a3..baeb5ba10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2593,7 +2593,7 @@ dependencies = [ [[package]] name = "sargon" -version = "1.0.29" +version = "1.0.30" dependencies = [ "actix-rt", "aes-gcm", diff --git a/Cargo.toml b/Cargo.toml index e1fc413cf..750ac70de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sargon" -version = "1.0.29" +version = "1.0.30" edition = "2021" build = "build.rs" diff --git a/src/wallet/home_cards/manager.rs b/src/wallet/home_cards/manager.rs index fa2a18b01..1e389141d 100644 --- a/src/wallet/home_cards/manager.rs +++ b/src/wallet/home_cards/manager.rs @@ -71,8 +71,7 @@ impl HomeCardsManager { pub async fn wallet_created(&self) -> Result<()> { let default_cards = HomeCards::from_iter([ HomeCard::Connector, - // TODO: Uncomment when RadQuest is public - // HomeCard::StartRadQuest, + HomeCard::StartRadQuest, ]); let updated_cards = self .update_cards(|write_guard| { @@ -151,10 +150,10 @@ impl HomeCardsManager { f(&mut write_guard); let updated_cards = write_guard.clone(); - updated_cards.sort(); + let sorted_cards = updated_cards.sort(); - self.observer.handle_cards_update(updated_cards.clone()); - Ok(updated_cards) + self.observer.handle_cards_update(sorted_cards.clone()); + Ok(sorted_cards) } fn insert_cards( @@ -342,15 +341,17 @@ mod tests { observer.clone(), ); let expected_cards = HomeCards::from_iter(vec![ - // TODO: Uncomment when RadQuest is public - // HomeCard::StartRadQuest, + HomeCard::StartRadQuest, HomeCard::Connector, ]); manager.wallet_created().await.unwrap(); - let handled_cards = observer.handled_cards.lock().unwrap().clone(); - pretty_assertions::assert_eq!(handled_cards, Some(expected_cards)); + let handled_cards = + observer.handled_cards.lock().unwrap().clone().unwrap(); + pretty_assertions::assert_eq!(handled_cards, expected_cards); + pretty_assertions::assert_eq!(handled_cards[0], expected_cards[0]); + pretty_assertions::assert_eq!(handled_cards[1], expected_cards[1]); } #[actix_rt::test] @@ -370,8 +371,7 @@ mod tests { #[actix_rt::test] async fn test_wallet_created_with_stored_cards() { let expected_cards = HomeCards::from_iter(vec![ - // TODO: Uncomment when RadQuest is public - // HomeCard::StartRadQuest, + HomeCard::StartRadQuest, HomeCard::Connector, ]); let observer = Arc::new(MockHomeCardsObserver::new());