Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
===================================================================
diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml	(.../PreTreatmentDisposablesStack.qml)	(revision 7077e38c74db9cccb5496ffefcf8936c0916de76)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml	(.../PreTreatmentDisposablesStack.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 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    PreTreatmentSampleStack.qml
+ * \file    PreTreatmentDisposablesStack.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      11-Mar-2021
+ * \date    (last)      10-Aug-2023
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  11-Mar-2021
+ * \date    (original)  18-Mar-2021
  *
  */
 
@@ -32,9 +32,10 @@
 
     property int stackStepIndex : 3
 
-    readonly property bool hasHeparin : vTreatmentCreate.heparinBolusVolume || vTreatmentCreate.heparinDispensingRate
+    readonly property bool hasHeparin : ! ( vTreatmentCreate.heparinBolusVolumeOff && vTreatmentCreate.heparinDispensingRateOff )
 
     PreTreatmentBase { id: _preTreatmentDisposablesSelfTest
+        objectName       :"_preTreatmentDisposablesSelfTest"
         title.text              : qsTr("System Self Test")
         hasTimeCircle           : true
         timeCircleMinimum       : 0
@@ -44,6 +45,7 @@
     }
 
     PreTreatmentBase { id: _preTreatmentDisposablesCartridgeInstallation
+        objectName       :"_preTreatmentDisposablesCartridgeInstallation"
         title.text              : qsTr("Cartridge Installation")
         header.confirmVisible   : true
         header.confirmText.text : qsTr("NEXT")
@@ -52,6 +54,7 @@
     }
 
     PreTreatmentBase { id: _preTreatmentDisposablesCartridgeConnetion
+        objectName       :"_preTreatmentDisposablesCartridgeConnetion"
         function page_confirm() {
             if ( _root.hasHeparin ) page( _preTreatmentDisposablesHeparinSyringe        )
             else                    page( _preTreatmentDisposablesSalineBag             )
@@ -67,6 +70,7 @@
     }
 
     PreTreatmentBase { id: _preTreatmentDisposablesHeparinSyringe
+        objectName       :"_preTreatmentDisposablesHeparinSyringe"
         title.text              : qsTr("Heparin Syringe")
         header.backVisible      : true
         header.confirmVisible   : true
@@ -77,6 +81,7 @@
     }
 
     PreTreatmentBase { id: _preTreatmentDisposablesSalineBag
+        objectName       :"_preTreatmentDisposablesSalineBag"
         function page_back() {
             if ( _root.hasHeparin ) page( _preTreatmentDisposablesHeparinSyringe        )
             else                    page( _preTreatmentDisposablesCartridgeConnetion    )
@@ -92,12 +97,24 @@
     }
 
     Connections { target: vPreTreatmentStates
-        onSelfTestNoCartridge_startChanged  : {                                                      /* , vselfTestNoCartridge_start      */  }
-        // FW doesn't go all the time to start so the main state change should be sufficient to update the disposables stack.
-        onSelfTestNoCartridgeChanged        : { page( _preTreatmentDisposablesSelfTest                  , vselfTestNoCartridge               )}
-        onInstallationChanged               : { page( _preTreatmentDisposablesCartridgeInstallation     , vinstallation                      )}
+        // FW does not go all the time to start so the main state change should be sufficient to update the disposables stack.
+        function onSelfTestNoCartridgeChanged       ( vValue ) { page( _preTreatmentDisposablesSelfTest                  , vValue )}
+        function onInstallationChanged              ( vValue ) { page( _preTreatmentDisposablesCartridgeInstallation     , vValue )}
     }
 
+    // FIXME: this is just a BandAid
+    // there should be a final screen after SalineBag to collect HD errors of user disposables installation
+    // the current message response regarding of the error will be displayed on the SalineBag screen which at least currently doesn't related to that screen (It is Heparin Syringe not installed.)
+    Connections { target: vPreTreatmentAdjustmentDisposablesConfirm
+        function onAdjustmentTriggered              ( vValue ) {
+            if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) {
+                _preTreatmentDisposablesSalineBag.reasonText = ""
+            } else {
+                _preTreatmentDisposablesSalineBag.reasonText = vPreTreatmentAdjustmentDisposablesConfirm.text()
+            }
+        }
+    }
+
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true