Index: sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml
===================================================================
diff -u -r88563177f10f20ced98750b2e40036201728131d -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml	(.../EndTreatmentEndStack.qml)	(revision 88563177f10f20ced98750b2e40036201728131d)
+++ 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
  *
  */
 
@@ -20,7 +20,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/pages/endtreatment/end"
+
 /*!
  * \brief   the post treatment end stack screen
  */
@@ -29,19 +29,38 @@
 
     stackView.initialItem   : null
 
-    // Treatment Complete
-    EndTreatmentEnd                 { id: _endTreatmentEnd
-        onRinsebackClicked          : vTreatmentAdjustmentEnd.doEnd                 () //87.0
+    property int stackStepIndex : 0
+
+    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()
+            }
+        }
     }
-    EndTreatmentEndPaused           { id: _endTreatmentEndPaused            }
 
-    Connections { target: vHDTreatmentStates
-        onTeWaitRinsebackChanged    : { page( _endTreatmentEnd         , vteWaitRinseback   )}
-        onTePausedChanged           : { page( _endTreatmentEndPaused   , vtePaused          )}
+    EndTreatmentBase       { id : _endTreatmentEndPaused
+        title.text              : qsTr("Treatment Complete Paused")
+        instructionBased        : true
     }
 
-    Connections { target: vTreatmentAdjustmentEnd
-        onAdjustmentTriggered: {
+    Connections            { target : vHDTreatmentStates
+        function onTeWaitRinsebackChanged       ( vValue ) { page( _endTreatmentEnd         , vValue )}
+        function onTePausedChanged              ( vValue ) { page( _endTreatmentEndPaused   , vValue )}
+    }
+
+    Connections            { target : vTreatmentAdjustmentEnd
+        function onAdjustmentTriggered          ( vValue ) {
             _endTreatmentEnd.reasonText = vTreatmentAdjustmentEnd.text();
         }
     }