Index: sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml
===================================================================
diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml	(.../EndTreatmentEndStack.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml	(.../EndTreatmentEndStack.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    EndTreatmentEndStack.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      16-Feb-2021
+ * \date    (last)      23-Nov-2022
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  16-Feb-2021
+ * \date    (original)  11-Apr-2021
  *
  */
 
@@ -33,12 +33,15 @@
 
     signal rinsebackClicked()
 
+    onRinsebackClicked : vTreatmentAdjustmentEnd.doEnd ()                           //87.0
+
     EndTreatmentBase       { id : _endTreatmentEnd
         title.text              : qsTr("Treatment Complete")
         instructionBased        : true
         footer {
             childrenWidth       : 300
             children: TouchRect {
+                enabled         : _endTreatmentEnd.instructionIsLast
                 text.text       : qsTr("START RINSEBACK")
                 isDefault       : true
                 onClicked       : rinsebackClicked()
@@ -52,15 +55,13 @@
     }
 
     Connections            { target : vHDTreatmentStates
-        onTeWaitRinsebackChanged    : { page( _endTreatmentEnd         , vteWaitRinseback   )}
-        onTePausedChanged           : { page( _endTreatmentEndPaused   , vtePaused          )}
+        function onTeWaitRinsebackChanged       ( vValue ) { page( _endTreatmentEnd         , vValue )}
+        function onTePausedChanged              ( vValue ) { page( _endTreatmentEndPaused   , vValue )}
     }
 
     Connections            { target : vTreatmentAdjustmentEnd
-        onAdjustmentTriggered       : {
+        function onAdjustmentTriggered          ( vValue ) {
             _endTreatmentEnd.reasonText = vTreatmentAdjustmentEnd.text();
         }
     }
-
-    onRinsebackClicked : vTreatmentAdjustmentEnd.doEnd                 () //87.0
 }