Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
===================================================================
diff -u -rbbb970aff112f09c189986f026055bec794afbd6 -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision bbb970aff112f09c189986f026055bec794afbd6)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    VHDTreatmentStatesData.cpp
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      02-Feb-2023
+ * \author  (last)      Dara Navaei
+ * \date    (last)      27-Oct-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  11-Apr-2021
  *
@@ -120,6 +120,7 @@
     ENUM_CHECK  ( GuiDialysisState, DIALYSIS_START_STATE                                                        )
     ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_STATE                                                           )
     ENUM_CHECK  ( GuiDialysisState, DIALYSIS_SALINE_BOLUS_STATE                                                 )
+    ENUM_CHECK  ( GuiDialysisState, DIALYSIS_BLOOD_LEAK_ZEROING_STATE                                           )
     ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES                                                      ) }
     ENUM_READ   ( GuiDialysisState, DIALYSIS_START_STATE                              , dyStart                 );
     ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_STATE                                 , dyUltrafiltration       );
@@ -150,24 +151,30 @@
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE                                                    )
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_STOP_STATE                                                      )
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE                                            )
+        ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE                                         )
         ENUM_CHECK_C( GuiRinsebackStates, NUM_OF_RINSEBACK_STATES                                                   ) }
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE                         , rbInit                );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RUN_STATE                               , rbRun                 );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE                            , rbPaused              );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_STOP_STATE                              , rbStop                );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE                    , rbAdditional          );
+        ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE                 , rbReconnect           );
     }
     txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to.
 
     // Recirculate states
     bool mRecirculate           = vData.mSubMode            == GuiTreatmentStates   ::TREATMENT_RECIRC_STATE                         ;
     if ( mRecirculate ) {
         ENUM_CHECK_O( GuiRecirculateStates, vData.mRecirculateState                                                 ) {
+        ENUM_CHECK  ( GuiRecirculateStates, TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE                               )
         ENUM_CHECK  ( GuiRecirculateStates, TREATMENT_RECIRC_RECIRC_STATE                                           )
         ENUM_CHECK  ( GuiRecirculateStates, TREATMENT_RECIRC_STOPPED_STATE                                          )
+        ENUM_CHECK  ( GuiRecirculateStates, TREATMENT_RECIRC_RECONNECT_PATIENT_STATE                                )
         ENUM_CHECK_C( GuiRecirculateStates, NUM_OF_TREATMENT_RECIRC_STATES                                          ) }
+        ENUM_READ   ( GuiRecirculateStates, TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE       , rcDisconnect          );
         ENUM_READ   ( GuiRecirculateStates, TREATMENT_RECIRC_RECIRC_STATE                   , rcStarted             );
         ENUM_READ   ( GuiRecirculateStates, TREATMENT_RECIRC_STOPPED_STATE                  , rcStopped             );
+        ENUM_READ   ( GuiRecirculateStates, TREATMENT_RECIRC_RECONNECT_PATIENT_STATE        , rcReconnect           );
     }
     txRecirculate ( mRecirculate ); // it's the main recirculate even so moved last to have all the sub-recirculate-states updated prior to.
 
@@ -201,13 +208,17 @@
         ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE                          )
         ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE                              )
         ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_NO_RECIRC_STATE                                      )
+        ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE                           )
         ENUM_CHECK_C( GuiTreatmentStopStates  , NUM_OF_TREATMENT_STOP_STATES                                        ) }
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_STATE               , tsRecirculate           )
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate  )
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE    , tsRecirculateBlood      )
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_NO_RECIRC_STATE            , tsRecirculateNo         )
+        ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect    )
     }
     txStop ( mTreatmentStop );
+
+    txTreatment ( _txDialysis || _txStop );
 }
 
 /*!