chore: merge conflicts

Author: aorumbayev

crates/algokit_utils/src/applications/app_client/mod.rs

@@ -24,7 +24,7 @@ pub use types::{
     AppClientBareCallParams, AppClientJsonParams, AppClientMethodCallParams, AppClientParams,
     AppSourceMaps, CompilationParams, FundAppAccountParams,
 };
-pub use utils::transform_tx_error;
+pub use utils::transform_transaction_error;
 
 /// A client for interacting with an Algorand smart contract application (ARC-56 focused).
 pub struct AppClient {

crates/algokit_utils/src/applications/app_factory/sender.rs

@@ -99,7 +99,9 @@ impl<'a> TransactionSender<'a> {
             .send()
             .app_create_method_call(create_params, send_params)
             .await
-            .map_err(|e| super::utils::transform_tx_error_for_factory(self.factory, e, false))?;
+            .map_err(|e| {
+                super::utils::transform_transaction_error_for_factory(self.factory, e, false)
+            })?;
 
         let app_client = AppClient::new(AppClientParams {
             app_id: Some(result.app_id),
@@ -159,7 +161,9 @@ impl<'a> TransactionSender<'a> {
             .send()
             .app_update_method_call(update_params, send_params)
             .await
-            .map_err(|e| super::utils::transform_tx_error_for_factory(self.factory, e, false))
+            .map_err(|e| {
+                super::utils::transform_transaction_error_for_factory(self.factory, e, false)
+            })
     }
 
     /// Send an app delete via method call
@@ -197,7 +201,9 @@ impl<'a> TransactionSender<'a> {
             .send()
             .app_delete_method_call(delete_params, send_params)
             .await
-            .map_err(|e| super::utils::transform_tx_error_for_factory(self.factory, e, true))
+            .map_err(|e| {
+                super::utils::transform_transaction_error_for_factory(self.factory, e, true)
+            })
     }
 }
 
@@ -266,7 +272,9 @@ impl BareTransactionSender<'_> {
             .send()
             .app_create(create_params, send_params)
             .await
-            .map_err(|e| super::utils::transform_tx_error_for_factory(self.factory, e, false))?;
+            .map_err(|e| {
+                super::utils::transform_transaction_error_for_factory(self.factory, e, false)
+            })?;
 
         let app_client = AppClient::new(AppClientParams {
             app_id: Some(result.app_id),
@@ -320,7 +328,9 @@ impl BareTransactionSender<'_> {
             .send()
             .app_update(update_params, send_params)
             .await
-            .map_err(|e| super::utils::transform_tx_error_for_factory(self.factory, e, false))
+            .map_err(|e| {
+                super::utils::transform_transaction_error_for_factory(self.factory, e, false)
+            })
     }
 
     /// Send an app delete (bare)
@@ -352,6 +362,8 @@ impl BareTransactionSender<'_> {
             .send()
             .app_delete(delete_params, send_params)
             .await
-            .map_err(|e| super::utils::transform_tx_error_for_factory(self.factory, e, true))
+            .map_err(|e| {
+                super::utils::transform_transaction_error_for_factory(self.factory, e, true)
+            })
     }
 }

crates/algokit_utils/src/applications/app_factory/utils.rs

@@ -71,7 +71,7 @@ pub(crate) fn merge_create_args_with_defaults(
 }
 
 /// Transform a transaction error using AppClient logic error exposure for factory flows.
-pub(crate) fn transform_tx_error_for_factory(
+pub(crate) fn transform_transaction_error_for_factory(
     factory: &AppFactory,
     err: crate::transactions::TransactionSenderError,
     is_clear: bool,
@@ -86,5 +86,5 @@ pub(crate) fn transform_tx_error_for_factory(
             source_maps: None,
         },
     );
-    crate::applications::app_client::transform_tx_error(&client, err, is_clear)
+    crate::applications::app_client::transform_transaction_error(&client, err, is_clear)
 }

crates/algokit_utils/tests/applications/app_factory.rs

@@ -552,7 +552,7 @@ async fn deploy_app_update_detects_extra_pages_as_breaking_change(
             Some(t)
         },
         updatable: Some(true),
-        deletable: Some(true),
+        deletable: None,
         source_maps: None,
     });
 
@@ -583,7 +583,7 @@ async fn deploy_app_update_detects_extra_pages_as_breaking_change(
                 t.insert("VALUE".to_string(), TealTemplateValue::Int(2));
                 Some(t)
             },
-            updatable: None,
+            updatable: Some(true),
             deletable: None,
             source_maps: None,
         });