Skip to content

Commit

Permalink
check for select tokens before getting token infos
Browse files Browse the repository at this point in the history
  • Loading branch information
findolor committed Feb 24, 2025
1 parent cae18bb commit d374861
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
25 changes: 23 additions & 2 deletions crates/js_api/src/gui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,28 @@ impl DotrainOrderGui {

#[wasm_bindgen(js_name = "getAllTokenInfos")]
pub async fn get_all_token_infos(&self) -> Result<AllTokenInfos, GuiError> {
let token_infos = self.dotrain_order.orderbook_yaml().get_token_keys()?;
let select_tokens = self.get_select_tokens()?;

let token_keys = match select_tokens.0.is_empty() {
true => {
let order_key = DeploymentCfg::parse_order_key(
self.dotrain_order.dotrain_yaml().documents,
&self.selected_deployment,
)?;
OrderCfg::parse_io_token_keys(
self.dotrain_order.dotrain_yaml().documents,
&order_key,
)?
}
false => select_tokens
.0
.iter()
.map(|token| token.key.clone())
.collect(),
};

let mut result = Vec::new();
for key in token_infos.iter() {
for key in token_keys.iter() {
result.push(self.get_token_info(key.clone()).await?);
}
Ok(AllTokenInfos(result))
Expand Down Expand Up @@ -237,6 +256,8 @@ pub enum GuiError {
DepositNotSet(String),
#[error("Orderbook not found")]
OrderbookNotFound,
#[error("Order not found: {0}")]
OrderNotFound(String),
#[error("Deserialized dotrain mismatch")]
DotrainMismatch,
#[error("Vault id not found for output index: {0}")]
Expand Down
2 changes: 1 addition & 1 deletion crates/js_api/src/gui/select_tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use rain_orderbook_app_settings::{
use std::str::FromStr;

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Tsify)]
pub struct SelectTokens(Vec<GuiSelectTokensCfg>);
pub struct SelectTokens(pub Vec<GuiSelectTokensCfg>);
impl_wasm_traits!(SelectTokens);

#[wasm_bindgen]
Expand Down

0 comments on commit d374861

Please sign in to comment.