Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc -r13e65c3d271d503c2e2e2f1f20736652c470f8cc
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2022 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 VAlarmStatus.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 31-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 26-Aug-2020
+ * \file    VAlarmStatus.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2022
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
  *
  */
 #include "VAlarmStatus.h"
@@ -23,9 +23,9 @@
     ACTION_VIEW_CONNECTION(AlarmStatusData                  );
     ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData          );
     ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData       );
-    /* // coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
+    /* // disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_VIEW_CONNECTION(AlarmClearedConditionRequestData );
-    // coco end */
+    // disabled coco end */
 }
 
 /*!
@@ -92,12 +92,12 @@
  */
 void View::VAlarmStatus::doClearCondition()
 {
-    // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
+    // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
     AlarmClearedConditionRequestData data;
     data.alarmID = GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT;
     emit didAdjustment(data);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   VAlarmStatus::onActionReceive
@@ -107,13 +107,13 @@
 void VAlarmStatus::onActionReceive(const AlarmStatusData &vData)
 {
     GuiAlarmID alarmID = static_cast<GuiAlarmID>(vData.mTop);
-    // coco begin validated: the gDisableTimeout has meant to only being used for debugging purposes.
+    // disabled coco begin validated: the gDisableTimeout has meant to only being used for debugging purposes.
     // has been manually tested during debugging which works fine as expected.
     if (alarmID == GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT && gDisableTimeout) {
         LOG_DEBUG(tr("Suppressing HD communication timeout."));
         return;
     }
-    // coco end
+    // disabled coco end
 
     // Look for this tag: #First_Time_Message_Sent_With_Silenced
     // this has to be first to make sure in the Notification dialog when we decided to show the dialog,
@@ -133,8 +133,8 @@
     alarm_Flag_noResume         (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RESUME          ));
     alarm_Flag_noRinseback      (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK       ));
     alarm_Flag_noEndTreatment   (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT   ));
-    alarm_Flag_noNewTreatment   (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT   ));
-    alarm_Flag_UserMustAck      (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK      ));
+    // alarm_Flag_noNewTreatment   (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT   )); // TODO : recently removed. 3/7/22
+    alarm_Flag_UserMustAck      (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY     ));
     alarm_Flag_alarmsToEscalate (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE ));
     alarm_Flag_alarmsLampOn     (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_LAMP_ON            ));
     // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1           ));
@@ -149,6 +149,7 @@
     alarm_Flag_alarmsCondition  (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION      ));
 
     if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) {
+        hasAlarm(false);
         emit didAlarmEmpty();
     }
     else {