fix conflicts

rainlanguage · Feb 20, 2025 · bd3cbe7 · bd3cbe7
1 parent 48b3934
commit bd3cbe7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/crates/js_api/src/gui/deposits.rs b/crates/js_api/src/gui/deposits.rs
@@ -1,5 +1,5 @@
 use super::*;
-use rain_orderbook_app_settings::gui::GuiDeposit;
+use rain_orderbook_app_settings::gui::GuiDepositCfg;
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Tsify)]
 pub struct TokenDeposit {
@@ -12,7 +12,7 @@ impl_wasm_traits!(TokenDeposit);
 
 #[wasm_bindgen]
 impl DotrainOrderGui {
-    fn get_gui_deposit(&self, key: &str) -> Result<GuiDeposit, GuiError> {
+    fn get_gui_deposit(&self, key: &str) -> Result<GuiDepositCfg, GuiError> {
         let deployment = self.get_current_deployment()?;
         let gui_deposit = deployment
             .deposits

diff --git a/crates/js_api/src/gui/state_management.rs b/crates/js_api/src/gui/state_management.rs
@@ -22,23 +22,23 @@ impl DotrainOrderGui {
         Ok(URL_SAFE.encode(hash))
     }
 
-    fn create_preset(value: &field_values::PairValue, default_value: String) -> GuiPreset {
+    fn create_preset(value: &field_values::PairValue, default_value: String) -> GuiPresetCfg {
         if value.is_preset {
-            GuiPreset {
+            GuiPresetCfg {
                 id: value.value.clone(),
                 name: None,
                 value: default_value,
             }
         } else {
-            GuiPreset {
+            GuiPresetCfg {
                 id: "".to_string(),
                 name: None,
                 value: value.value.clone(),
             }
         }
     }
 
-    fn preset_to_pair_value(preset: GuiPreset) -> field_values::PairValue {
+    fn preset_to_pair_value(preset: GuiPresetCfg) -> field_values::PairValue {
         if preset.id != "" {
             field_values::PairValue {
                 is_preset: true,
@@ -58,7 +58,7 @@ impl DotrainOrderGui {
         is_input: bool,
     ) -> Result<BTreeMap<(bool, u8), Option<String>>, GuiError> {
         let mut vault_ids = BTreeMap::new();
-        for (i, vault_id) in Order::parse_vault_ids(documents, order_key, is_input)?
+        for (i, vault_id) in OrderCfg::parse_vault_ids(documents, order_key, is_input)?
             .iter()
             .enumerate()
         {
@@ -257,7 +257,7 @@ impl DotrainOrderGui {
     #[wasm_bindgen(js_name = "executeStateUpdateCallback")]
     pub fn execute_state_update_callback(&self) -> Result<(), GuiError> {
         if let Some(callback) = &self.state_update_callback {
-            let state = to_value(&self.serialize_state()?)?;
+            let state = to_js_value(&self.serialize_state()?)?;
             callback.call1(&JsValue::UNDEFINED, &state).map_err(|e| {
                 GuiError::JsError(format!("Failed to execute state update callback: {:?}", e))
             })?;