Index: sources/view/settings/VDuetRoWaterDG.cpp
===================================================================
diff -u -r1da89b0452b8ef9448847618e75c118f3f58bd0c -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4
--- sources/view/settings/VDuetRoWaterDG.cpp	(.../VDuetRoWaterDG.cpp)	(revision 1da89b0452b8ef9448847618e75c118f3f58bd0c)
+++ sources/view/settings/VDuetRoWaterDG.cpp	(.../VDuetRoWaterDG.cpp)	(revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2023-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2023-2025 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    VDuetRoWaterDG.cpp
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      05-Apr-2023
+ * \author  (last)      Dara Navaei
+ * \date    (last)      10-May-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  03-Apr-2023
  *
@@ -28,31 +28,32 @@
     ACTION_VIEW_CONNECTION(DuetRoWaterModeDGrData)
     ACTION_VIEW_CONNECTION(SettingsData)
     ACTION_VIEW_CONNECTION(DuetRoWaterStatDGqData)
+
+    connect(&_GuiController, &GuiController::didPOSTPass, this, [=](bool) {
+        //POST//
+        doAdjustment(_status);
+    });
+
 }
 
 void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterStatDGqData &     ) // 0xC300 : 195
 {
-    _post = true;
     doAdjustment( _status );
 }
 
 void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterModeDGrData &vData) // 0xC400 : 196
 {
     adjustment_Accepted         ( vData.mAccepted      );
     adjustment_Reason           ( vData.mReason        );
+    adjustment_FWValue          ( vData.mFirmwareValue );
 
+    // Accept the value that has been sent
+    status( vData.mFirmwareValue );
+
     if (vData.mAccepted) {
-        status( _data.mStatus );    // apply the request
         notification("");
     }
     else {
-        if ( _post ) {
-            status(     ! _status );    // on post what UI currently has, is rejected, so UI should change to opposite.
-            _post = false;
-        }
-        else {
-            status(       _status );    // use the old value to emit signal for UI
-        }
         notification(tr("The RO Water Mode change request has been rejected [%1]").arg(vData.mReason));
     }
 
@@ -75,9 +76,6 @@
  */
 void View::VDuetRoWaterDG::onActionReceive(const SettingsData &)
 {
-    _post = true;
     QString mCategory = Storage::Settings_Category_SettingsSystem;
     FROMVARIANT( status, "RoWaterMode", "RoWaterMode", UInt );
-    //POST//
-    doAdjustment(_status);
 }