diff --git a/lib/features/scene/bloc/create_scene/create_scene_bloc.dart b/lib/features/scene/bloc/create_scene/create_scene_bloc.dart
index de6886e..fbe4ca7 100644
--- a/lib/features/scene/bloc/create_scene/create_scene_bloc.dart
+++ b/lib/features/scene/bloc/create_scene/create_scene_bloc.dart
@@ -48,8 +48,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
   String conditionRule = 'or';
   EffectiveTime? effectiveTime;
 
-  FutureOr<void> _onAddSceneTask(
-      AddTaskEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _onAddSceneTask(AddTaskEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneLoading());
     if (event.isAutomation == true) {
       final copyList = List<SceneStaticFunction>.from(automationTempTasksList);
@@ -84,8 +83,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     }
   }
 
-  void addToTempTaskList(
-      TempHoldSceneTasksEvent event, Emitter<CreateSceneState> emit) {
+  void addToTempTaskList(TempHoldSceneTasksEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneLoading());
     bool updated = false;
     for (var element in tempTasksList) {
@@ -139,8 +137,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     ));
   }
 
-  void addToTempAutomationTaskList(
-      TempHoldSceneTasksEvent event, Emitter<CreateSceneState> emit) {
+  void addToTempAutomationTaskList(TempHoldSceneTasksEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneLoading());
     bool updated = false;
     for (var element in automationTempTasksList) {
@@ -162,10 +159,8 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
           ],
           comparator: automationComparatorValues[element.code],
         );
-        automationTempTasksList[automationTempTasksList.indexOf(element)] =
-            updatedElement;
-        automationSelectedValues[updatedElement.code] =
-            event.deviceControlModel.value;
+        automationTempTasksList[automationTempTasksList.indexOf(element)] = updatedElement;
+        automationSelectedValues[updatedElement.code] = event.deviceControlModel.value;
         updated = true;
         break;
       }
@@ -185,12 +180,10 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
             icon: '',
           ),
         ],
-        comparator:
-            automationComparatorValues[event.deviceControlModel.code] ?? '==',
+        comparator: automationComparatorValues[event.deviceControlModel.code] ?? '==',
       );
       automationTempTasksList.add(newElement);
-      automationSelectedValues[newElement.code] =
-          event.deviceControlModel.value;
+      automationSelectedValues[newElement.code] = event.deviceControlModel.value;
     }
     emit(AddSceneTask(
       tasksList: tasksList,
@@ -199,8 +192,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     ));
   }
 
-  FutureOr<void> _selectedValue(
-      SelectedValueEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _selectedValue(SelectedValueEvent event, Emitter<CreateSceneState> emit) {
     if (event.isAutomation == true) {
       automationSelectedValues[event.code] = event.value;
       automationComparatorValues[event.code] = event.comparator ?? '==';
@@ -228,8 +220,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     ));
   }
 
-  FutureOr<void> _removeTaskById(
-      RemoveTaskByIdEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _removeTaskById(RemoveTaskByIdEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneLoading());
     if (event.isAutomation == true) {
       for (var element in automationTasksList) {
@@ -302,8 +293,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
             : await SceneApi.createScene(event.createSceneModel!);
       } else if (event.createAutomationModel != null) {
         response = event.updateScene
-            ? await SceneApi.updateAutomation(
-                event.createAutomationModel!, event.sceneId)
+            ? await SceneApi.updateAutomation(event.createAutomationModel!, event.sceneId)
             : await SceneApi.createAutomation(event.createAutomationModel!);
       }
 
@@ -332,8 +322,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     }
   }
 
-  FutureOr<void> _clearTaskList(
-      ClearTaskListEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _clearTaskList(ClearTaskListEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneLoading());
     automationTasksList.clear();
     tasksList.clear();
@@ -354,14 +343,12 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
           : await SceneApi.getSceneDetails(event.sceneId);
       if (response.id.isNotEmpty) {
         if (event.isAutomation) {
-          automationTasksList = List<SceneStaticFunction>.from(
-              getTaskListFunctionsFromApi(
-                  actions: [],
-                  isAutomation: true,
-                  conditions: response.conditions));
+          automationTasksList = List<SceneStaticFunction>.from(getTaskListFunctionsFromApi(
+              actions: [], isAutomation: true, conditions: response.conditions));
           tasksList = List<SceneStaticFunction>.from(
-              getTaskListFunctionsFromApi(
-                  actions: response.actions, isAutomation: false));
+              getTaskListFunctionsFromApi(actions: response.actions, isAutomation: false));
+
+          conditionRule = response.decisionExpr ?? conditionRule;
 
           emit(AddSceneTask(
             automationTasksList: automationTasksList,
@@ -370,8 +357,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
           ));
         } else {
           tasksList = List<SceneStaticFunction>.from(
-              getTaskListFunctionsFromApi(
-                  actions: response.actions, isAutomation: false));
+              getTaskListFunctionsFromApi(actions: response.actions, isAutomation: false));
           emit(AddSceneTask(
             tasksList: tasksList,
             condition: conditionRule,
@@ -385,8 +371,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     }
   }
 
-  FutureOr<void> _clearTempTaskList(
-      ClearTempTaskListEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _clearTempTaskList(ClearTempTaskListEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneLoading());
     if (event.isAutomation == true) {
       automationTempTasksList.clear();
@@ -435,17 +420,13 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     }
   }
 
-  FutureOr<void> _deleteScene(
-      DeleteSceneEvent event, Emitter<CreateSceneState> emit) async {
+  FutureOr<void> _deleteScene(DeleteSceneEvent event, Emitter<CreateSceneState> emit) async {
     emit(DeleteSceneLoading());
 
     try {
-      final response =
-          sceneType.name == CreateSceneEnum.deviceStatusChanges.name
-              ? await SceneApi.deleteAutomation(
-                  automationId: event.sceneId, unitUuid: event.unitUuid)
-              : await SceneApi.deleteScene(
-                  sceneId: event.sceneId, unitUuid: event.unitUuid);
+      final response = sceneType.name == CreateSceneEnum.deviceStatusChanges.name
+          ? await SceneApi.deleteAutomation(automationId: event.sceneId, unitUuid: event.unitUuid)
+          : await SceneApi.deleteScene(sceneId: event.sceneId, unitUuid: event.unitUuid);
       if (response == true) {
         emit(const DeleteSceneSuccess(true));
       } else {
@@ -456,8 +437,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     }
   }
 
-  FutureOr<void> _updateTaskValue(
-      UpdateTaskEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _updateTaskValue(UpdateTaskEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneLoading());
     if (event.isAutomation == true) {
       for (var i = 0; i < automationTasksList.length; i++) {
@@ -485,8 +465,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     ));
   }
 
-  FutureOr<void> _selectConditionRule(
-      SelectConditionEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _selectConditionRule(SelectConditionEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneInitial());
     if (event.condition.contains('any')) {
       conditionRule = 'or';
@@ -501,8 +480,7 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     ));
   }
 
-  FutureOr<void> _sceneTypeEvent(
-      SceneTypeEvent event, Emitter<CreateSceneState> emit) {
+  FutureOr<void> _sceneTypeEvent(SceneTypeEvent event, Emitter<CreateSceneState> emit) {
     emit(CreateSceneInitial());
 
     if (event.type == CreateSceneEnum.tabToRun) {