Index: sources/gui/qml/pages/settings/SettingsManufacturingSetup.qml
===================================================================
diff -u -r0e122c98700951af539d9f47c5578e26d640fcc7 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/settings/SettingsManufacturingSetup.qml	(.../SettingsManufacturingSetup.qml)	(revision 0e122c98700951af539d9f47c5578e26d640fcc7)
+++ sources/gui/qml/pages/settings/SettingsManufacturingSetup.qml	(.../SettingsManufacturingSetup.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2023-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    SettingsManufacturingSetup.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      11-May-2023
+ * \date    (last)      18-Jul-2023
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  11-May-2023
+ * \date    (original)  18-Jul-2023
  *
  */
 
@@ -18,17 +18,21 @@
 
 //  Qml imports
 import "qrc:/globals"
+import "qrc:/pages"
 import "qrc:/compounds"
 
-
 /*!
  * \brief   SettingsManufacturingSetup is the screen
  *          which helps the manufacturing during the device setup
  */
-SettingsBase    { id: _root
+UserConfirmation { id: _root
+    message         : vDevice.cryptSetupEnabled ? qsTr("Do you want to perform the %1?").arg(title.toLowerCase())
+                                                : qsTr("Please wait ...")
+
     itemIndex       : SettingsStack.DeviceConfiguration
+    notificationText: vDevice.status
+
     confirmVisible  : true
     confirmEnabled  : vDevice.cryptSetupEnabled
-    onConfirmClicked: vDevice.cryptSetup = "setup";
-    notificationText: vDevice.status
+    onConfirmClicked: vDevice.cryptSetup = "setup"
 }