Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
===================================================================
diff -u -r88563177f10f20ced98750b2e40036201728131d -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml	(.../EndTreatmentRinseback.qml)	(revision 88563177f10f20ced98750b2e40036201728131d)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml	(.../EndTreatmentRinseback.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    EndTreatmentRinseback.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      29-Jan-2021
+ * \date    (last)      13-Sep-2023
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  29-Jan-2021
+ * \date    (original)  11-Apr-2021
  *
  */
 
@@ -20,48 +20,28 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/endtreatment"
+import "qrc:/pages/treatment/sections"
 
 /*!
  * \brief   the end treatment rinseback screen
  */
-ScreenItem { id: _root
+EndTreatmentBase { id: _root
     objectName: "_EndTreatmentRinseback"
 
-    property alias  reasonText  : _notification.text
-
     signal pauseClicked  ()
     signal resumeClicked ()
     signal endClicked    ()
 
     signal accelerateClicked  ()
     signal deccelerateClicked ()
 
-    Text { id: _title
-        anchors {
-            top: parent.top
-            topMargin: 65
-            horizontalCenter: parent.horizontalCenter
-        }
-        color: "white"
-        text: qsTr("Rinseback")
-        font.pixelSize: Fonts.fontPixelTitle
-    }
 
-    TimeText { id: timeout
-        visible         : false // has been removed for now // vTreatmentRinseback.timeoutTotal
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            top             : _title.bottom
-            topMargin       : 15
-        }
-        textPixelSize   : 30
-        textWeight      : Font.Normal
-        // the TimeText component works with hour and minute mainly
-        // so changing the seconds to minuts was easier than changing the component
-        secondsVisible  : false
-        seconds         : vTreatmentRinseback.timeoutCountDown * 60
-    }
+    title.text: qsTr("Rinseback")
 
+    hasTimeout          : vTreatmentRinseback   .timeoutTotal
+    timeoutValue        : vTreatmentRinseback   .timeoutCountDown * 60
+
     ImageText { id: _imageEnd
         visible: ! vHDTreatmentStates.rbAdditional
         anchors {
@@ -77,6 +57,21 @@
         onClicked       : endClicked()
     }
 
+    TreatmentPressures          { id: _pressuresTouchArea
+        // maybe now it makes sense for the ranges to be displayed
+        // arterialLowerBound  : 0 // requested to hide the bounds
+        // arterialUpperBound  : 0 // requested to hide the bounds
+        // venousLowerBound    : 0 // requested to hide the bounds
+        // venousUpperBound    : 0 // requested to hide the bounds
+
+        isTouchable         : false
+        x       : Variables.screenGridLeftColumnX
+        y       : Variables.screenGridRow1Y
+        width   : Variables.screenGridAreaWidth
+        height  : Variables.screenGridAreaHeightRow1
+    }
+    Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength }
+
     ProgressCircle { id: _circle
         diameter: 335
         anchors {
@@ -93,11 +88,10 @@
 
         Text { id: _textVolume
             anchors.centerIn: parent
-            color: "white"
+            color: Colors.textMain
             text: vTreatmentRinseback.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid)
             font.pixelSize: 76
             font.weight: Font.ExtraLight
-
         }
 
         Text { id: _labelRate
@@ -106,7 +100,7 @@
                 topMargin: 20
                 horizontalCenter: parent.horizontalCenter
             }
-            color: "white"
+            color: Colors.textMain
             text: vTreatmentRinseback.rate.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate)
             font.pixelSize: 23
         }
@@ -162,15 +156,4 @@
             onClicked       : accelerateClicked()
         }
     }
-
-    NotificationBar { id: _notification
-        iconVisible: false
-    }
-
-    onVisibleChanged: {
-        _notification.text = ""
-        if (visible) {
-            _mainMenu.hidden = true
-        }
-    }
 }