From 9f0bde4710e416f8a0679f2f53a136021b2fbd82 Mon Sep 17 00:00:00 2001
From: Sosthene00 <674694@protonmail.ch>
Date: Mon, 8 Apr 2024 18:33:08 +0200
Subject: [PATCH] refactor get_receiving_address

---
 crates/sp_client/src/api.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/sp_client/src/api.rs b/crates/sp_client/src/api.rs
index 130c40f..ea6bd9e 100644
--- a/crates/sp_client/src/api.rs
+++ b/crates/sp_client/src/api.rs
@@ -24,7 +24,7 @@ use sp_backend::spclient::{derive_keys_from_seed, OutputList, SpClient};
 use sp_backend::spclient::{SpWallet, SpendKey};
 
 use crate::images;
-use crate::network::{BitcoinNetworkMsg, BitcoinTopic};
+use crate::network::{BitcoinNetworkMsg, BitcoinTopic, AnkNetworkMsg, AnkTopic};
 use crate::silentpayments::check_transaction;
 use crate::user::{lock_connected_users, User, UserWallets, CONNECTED_USERS};
 
@@ -134,9 +134,14 @@ pub fn generate_sp_wallet(
 }
 
 #[wasm_bindgen]
-pub fn get_receiving_address(sp_client: String) -> String {
-    let sp_client: SpClient = serde_json::from_str(&sp_client).unwrap();
-    sp_client.get_receiving_address()
+pub fn get_receiving_address(pre_id: String) -> ApiResult<String> {
+    if let Some(my_wallets) = lock_connected_users()?.get(&pre_id) {
+        Ok(my_wallets.recover.get_client().get_receiving_address())
+    } else {
+        Err(ApiError {
+            message: "Unknown user pre_id".to_owned(),
+        })
+    }
 }
 
 #[wasm_bindgen]