Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml	(.../TreatmentUltrafiltrationItem.qml)	(revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml	(.../TreatmentUltrafiltrationItem.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    TreatmentUltrafiltrationItem.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      28-Feb-2021
+ * \date    (last)      27-Apr-2023
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  28-Feb-2021
+ * \date    (original)  01-Mar-2021
  *
  */
 
@@ -27,6 +27,11 @@
 Item { id: _root
     objectName: "_TreatmentUltrafiltration"
     anchors.fill: parent
+
+    // - set visible to false as init state to correctly indicate visible screens
+    // - TreatmentUltrafiltrationItem is not a ScreenItem, thus visible is true automatically
+    visible:false
+
     function open() {
         if ( isUFRunning ) {
             _treatmentAdjustmentUltrafiltrationStart .open()
@@ -35,6 +40,13 @@
         }
     }
 
+    function close() { // this close should be never needed by design, but in tests it can easily happen and will block the screen touch.
+        _treatmentAdjustmentUltrafiltrationStart    .close()
+        _treatmentAdjustmentUltrafiltrationPaused   .close()
+        _treatmentAdjustmentUltrafiltrationEdit     .close()
+        _treatmentAdjustmentUltrafiltrationConfirm  .close()
+    }
+
     TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart
         onCloseClicked          : close()
         onPauseClicked          : {
@@ -87,7 +99,7 @@
     }
 
     Connections { target: vTreatmentAdjustmentUltrafiltrationState
-        onAdjustmentTriggered   : {
+        function onAdjustmentTriggered              ( vValue ) {
             if ( vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted ) {
                 if (vHDTreatmentStates.ufPaused) { // handle screen regarding current accepted
                     _treatmentAdjustmentUltrafiltrationStart .close()
@@ -107,7 +119,7 @@
     }
 
     Connections { target: vTreatmentAdjustmentUltrafiltrationEdit
-        onAdjustmentTriggered   : {
+        function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) {
                 _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume    = vTreatmentAdjustmentUltrafiltrationEdit.volume
                 _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration        = vTreatmentAdjustmentUltrafiltrationEdit.duration
@@ -126,7 +138,7 @@
     }
 
     Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm
-        onAdjustmentTriggered   : {
+        function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) {
                 vTreatmentUltrafiltration.maximum                            = vTreatmentAdjustmentUltrafiltrationConfirm.volume
                 _treatmentAdjustmentUltrafiltrationConfirm.close()