From 59efb79001d28228ddf1989e4c20598ca8a3339c Mon Sep 17 00:00:00 2001
From: Dawid Wojtas <dawid.wojtas@mudita.com>
Date: Fri, 1 Dec 2023 16:07:39 +0100
Subject: [PATCH] [BH-1731] Factory reset removes user files

Performing the factory reset removes user files
and settings. After powering on the device
will run the onboarding.
---
 harmony_changelog.md                          |   1 +
 image/system_a/data/lang/Deutsch.json         |   4 +-
 image/system_a/data/lang/English.json         |   4 +-
 image/system_a/data/lang/Espanol.json         |   4 +-
 image/system_a/data/lang/Francais.json        |   4 +-
 image/system_a/data/lang/Polski.json          |   4 +-
 .../apps-common/options/OptionsList.cpp       |   5 +-
 .../apps-common/options/OptionsList.hpp       |   5 +-
 .../ApplicationBellMain.cpp                   |   3 +-
 .../ApplicationBellSettings.cpp               |  13 +-
 .../application-bell-settings/CMakeLists.txt  |   1 +
 .../ApplicationBellSettings.hpp               |   1 -
 .../BellSettingsFactoryResetWindow.cpp        |  52 ++++++++
 .../BellSettingsFactoryResetWindow.hpp        |  22 ++++
 .../windows/BellSettingsWindow.cpp            |  25 +---
 .../BellHybrid/apps/common/CMakeLists.txt     |   3 +
 .../common/BellFactoryResetPresenter.hpp      |  20 +++
 .../BellOptionWithDescriptionWindow.hpp       |  28 +++++
 .../common/src/BellFactoryResetPresenter.cpp  |  23 ++++
 .../BellOptionWithDescriptionWindow.cpp       | 114 ++++++++++++++++++
 .../common/src/windows/BellFactoryReset.cpp   |   4 +-
 scripts/lua/factory.lua                       |   6 +
 scripts/lua/share/paths.lua                   |   1 +
 23 files changed, 305 insertions(+), 42 deletions(-)
 create mode 100644 products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.cpp
 create mode 100644 products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.hpp
 create mode 100644 products/BellHybrid/apps/common/include/common/BellFactoryResetPresenter.hpp
 create mode 100644 products/BellHybrid/apps/common/include/common/options/BellOptionWithDescriptionWindow.hpp
 create mode 100644 products/BellHybrid/apps/common/src/BellFactoryResetPresenter.cpp
 create mode 100644 products/BellHybrid/apps/common/src/options/BellOptionWithDescriptionWindow.cpp

diff --git a/harmony_changelog.md b/harmony_changelog.md
index 86a5c181bc8f865b6519fda4e925c5074f7689dc..7fcd781ac9665de728cd35af2896522bf92b0665 100644
--- a/harmony_changelog.md
+++ b/harmony_changelog.md
@@ -17,6 +17,7 @@
 * Disabled Address Sanitizer for the Linux simulator
 * Changed misleading factory reset translations in Polish
 * Time setting updated
+* Factory reset removes user files 
 
 ## [2.2.3 2023-11-30]
 
diff --git a/image/system_a/data/lang/Deutsch.json b/image/system_a/data/lang/Deutsch.json
index f17c5feef89831a591368ce52cb046d4762074c4..37113d95548867d50b89d76aaaa5fd28ef57bdcc 100644
--- a/image/system_a/data/lang/Deutsch.json
+++ b/image/system_a/data/lang/Deutsch.json
@@ -92,7 +92,9 @@
     "app_bell_settings_bedtime_settings_tone": "Klang",
     "app_bell_settings_bedtime_settings_volume": "<text>Lautst\u00e4rke</text>",
     "app_bell_settings_bedtime_tone": "Schlafens-Klang",
-    "app_bell_settings_display_factory_reset_confirmation": "Zur\u00fccksetzen?",
+    "app_bell_settings_display_factory_reset_confirmation": "<text>Factory reset will delete all<br />users files and return<br />Harmony to factory settings</text>",
+    "app_bell_settings_factory_reset_option_reset": "Reset",
+    "app_bell_settings_factory_reset_option_back": "Back",
     "app_bell_settings_factory_reset": "Zur\u00fccksetzen",
     "app_bell_settings_frontlight": "Frontlicht",
     "app_bell_settings_frontlight_mode_auto": "automatisch",
diff --git a/image/system_a/data/lang/English.json b/image/system_a/data/lang/English.json
index 7fc33c44760ebf1578497aa76e06e20748169748..1c8bec26cd900a973d63006083392c2906adf87b 100644
--- a/image/system_a/data/lang/English.json
+++ b/image/system_a/data/lang/English.json
@@ -126,7 +126,9 @@
     "app_bell_settings_bedtime_settings_tone": "Bedtime tone",
     "app_bell_settings_bedtime_settings_volume": "<text>Bedtime tone<br />volume</text>",
     "app_bell_settings_bedtime_tone": "Bedtime tone",
-    "app_bell_settings_display_factory_reset_confirmation": "<text>Reset to factory<br></br>settings ?</text>",
+    "app_bell_settings_display_factory_reset_confirmation": "<text>Factory reset will delete all<br />users files and return<br />Harmony to factory settings</text>",
+    "app_bell_settings_factory_reset_option_reset": "Reset",
+    "app_bell_settings_factory_reset_option_back": "Back",
     "app_bell_settings_factory_reset": "Factory reset",
     "app_bell_settings_frontlight": "Frontlight",
     "app_bell_settings_frontlight_mode_auto": "auto",
diff --git a/image/system_a/data/lang/Espanol.json b/image/system_a/data/lang/Espanol.json
index a81cb59ef42cf9943fcccdc1b74acf90ccc4ac58..2c8aa34782fa7b565eab61a4c92864549173cb5c 100644
--- a/image/system_a/data/lang/Espanol.json
+++ b/image/system_a/data/lang/Espanol.json
@@ -91,7 +91,9 @@
     "app_bell_settings_bedtime_settings_tone": "Hora de dormir",
     "app_bell_settings_bedtime_settings_volume": "Volumen",
     "app_bell_settings_bedtime_tone": "Hora de dormir",
-    "app_bell_settings_display_factory_reset_confirmation": "<text>\u00bfRestablecer la configuraci\u00f3n?</text>",
+    "app_bell_settings_display_factory_reset_confirmation": "<text>Factory reset will delete all<br />users files and return<br />Harmony to factory settings</text>",
+    "app_bell_settings_factory_reset_option_reset": "Reset",
+    "app_bell_settings_factory_reset_option_back": "Back",
     "app_bell_settings_factory_reset": "Restablecer",
     "app_bell_settings_frontlight": "Luz frontal",
     "app_bell_settings_frontlight_mode_auto": "autom\u00e1tico",
diff --git a/image/system_a/data/lang/Francais.json b/image/system_a/data/lang/Francais.json
index c6547198ab4105df144d81c8860377b52f647e8d..6d09f0738d45bba43b3a1c0ebb28a91a84e27a03 100644
--- a/image/system_a/data/lang/Francais.json
+++ b/image/system_a/data/lang/Francais.json
@@ -93,7 +93,9 @@
     "app_bell_settings_bedtime_settings_tone": "M\u00e9lodie de l'heure du coucher",
     "app_bell_settings_bedtime_settings_volume": "Volume",
     "app_bell_settings_bedtime_tone": "Heure du coucher",
-    "app_bell_settings_display_factory_reset_confirmation": "<text>R\u00e9tablir<br></br>la configuration ?</text>",
+    "app_bell_settings_display_factory_reset_confirmation": "<text>Factory reset will delete all<br />users files and return<br />Harmony to factory settings</text>",
+    "app_bell_settings_factory_reset_option_reset": "Reset",
+    "app_bell_settings_factory_reset_option_back": "Back",
     "app_bell_settings_factory_reset": "R\u00e9initialisation",
     "app_bell_settings_frontlight": "Lumi\u00e8re",
     "app_bell_settings_frontlight_mode_auto": "automatique",
diff --git a/image/system_a/data/lang/Polski.json b/image/system_a/data/lang/Polski.json
index cd8e2410c144ea02db5b999d7337d8240f399ca0..c0eb70bed3923e894c0c5bbbfefc0fc20eabdfc8 100644
--- a/image/system_a/data/lang/Polski.json
+++ b/image/system_a/data/lang/Polski.json
@@ -92,7 +92,9 @@
     "app_bell_settings_bedtime_settings_tone": "D\u017awi\u0119k",
     "app_bell_settings_bedtime_settings_volume": "G\u0142o\u015bno\u015b\u0107",
     "app_bell_settings_bedtime_tone": "Pora snu",
-    "app_bell_settings_display_factory_reset_confirmation": "<text>Przywrócić ustawienia fabryczne?</text>",
+    "app_bell_settings_display_factory_reset_confirmation": "<text>Factory reset will delete all<br />users files and return<br />Harmony to factory settings</text>",
+    "app_bell_settings_factory_reset_option_reset": "Reset",
+    "app_bell_settings_factory_reset_option_back": "Back",
     "app_bell_settings_factory_reset": "Ustaw. fabryczne",
     "app_bell_settings_frontlight": "Pod\u015bwietlenie",
     "app_bell_settings_frontlight_mode_auto": "automatyczny",
diff --git a/module-apps/apps-common/options/OptionsList.cpp b/module-apps/apps-common/options/OptionsList.cpp
index ff0f038e8eff6e9ab6ce7f945f6c682f717e9ad2..e1730a3ed28fae469a25709202d4d271e6a6e068 100644
--- a/module-apps/apps-common/options/OptionsList.cpp
+++ b/module-apps/apps-common/options/OptionsList.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "OptionsList.hpp"
@@ -60,4 +60,7 @@ namespace gui
         optionsModel->clearData();
     }
 
+    template class OptionsList<ListView>;
+    template class OptionsList<ListViewWithArrows>;
+
 } // namespace gui
diff --git a/module-apps/apps-common/options/OptionsList.hpp b/module-apps/apps-common/options/OptionsList.hpp
index 96a99fc9f0a6634d9ca0b2fbac5a782edcabeb7d..174ea7a2f159edc922b5410841915ce0f47c1661 100644
--- a/module-apps/apps-common/options/OptionsList.hpp
+++ b/module-apps/apps-common/options/OptionsList.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -29,7 +29,4 @@ namespace gui
         void refreshOptions(std::list<Option> &&optionList);
         void refreshOptions(std::list<Option> &&optionList, unsigned int pageIndex);
     };
-
-    template class OptionsList<ListView>;
-    template class OptionsList<ListViewWithArrows>;
 } // namespace gui
diff --git a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
index 26f7f2345f9ef3e889d1056e019b725fcc5925a8..f0457efc570c0bb906bc1dc4febb9239d08721de 100644
--- a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
+++ b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
@@ -17,6 +17,7 @@
 #include <common/models/LayoutModel.hpp>
 #include <common/windows/BellWelcomeWindow.hpp>
 #include <common/windows/BellFactoryReset.hpp>
+#include <common/BellFactoryResetPresenter.hpp>
 #include <service-db/DBNotificationMessage.hpp>
 #include <windows/Dialog.hpp>
 #include <appmgr/messages/ChangeHomescreenLayoutMessage.hpp>
@@ -144,7 +145,7 @@ namespace app
                               });
 
         windowsFactory.attach(gui::BellFactoryReset::name, [](ApplicationCommon *app, const std::string &name) {
-            return std::make_unique<gui::BellFactoryReset>(app, std::make_unique<gui::BellPowerOffPresenter>(app));
+            return std::make_unique<gui::BellFactoryReset>(app, std::make_unique<gui::BellFactoryResetPresenter>(app));
         });
 
         windowsFactory.attach(gui::BellBatteryStatusWindow::name, [](ApplicationCommon *app, const std::string &name) {
diff --git a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
index 518d7d7dca1a33d0a175abc0426084bf9744c063..de990a133e86b77a5c37b50795ef348e4d502b8a 100644
--- a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
@@ -21,6 +21,7 @@
 #include "windows/BellSettingsLanguageWindow.hpp"
 #include "windows/BellSettingsLayoutWindow.hpp"
 #include "windows/BellSettingsFrontlightWindow.hpp"
+#include "windows/BellSettingsFactoryResetWindow.hpp"
 #include "windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.hpp"
 #include "windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp"
 #include "windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp"
@@ -29,7 +30,6 @@
 #include "windows/BellSettingsHomeViewWindow.hpp"
 #include "windows/BellSettingsTimeUnitsWindow.hpp"
 #include "windows/BellSettingsWindow.hpp"
-#include "widgets/DialogYesNo.hpp"
 
 #include <Paths.hpp>
 #include <apps-common/windows/Dialog.hpp>
@@ -39,6 +39,7 @@
 #include <common/windows/BellFinishedWindow.hpp>
 #include <common/windows/BellTurnOffWindow.hpp>
 #include <common/windows/ShortcutsWindow.hpp>
+#include <common/windows/BellFactoryReset.hpp>
 #include <common/popups/BellTurnOffOptionWindow.hpp>
 #include <common/models/AudioModel.hpp>
 #include <common/models/TimeModel.hpp>
@@ -153,6 +154,11 @@ namespace app
             return std::make_unique<gui::BellTurnOffWindow>(app, std::make_unique<gui::BellPowerOffPresenter>(app));
         });
 
+        windowsFactory.attach(gui::BellSettingsFactoryResetWindow::defaultName,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::BellSettingsFactoryResetWindow>(app);
+                              });
+
         windowsFactory.attach(
             gui::BellSettingsPrewakeUpWindow::name, [this](ApplicationCommon *app, const std::string &name) {
                 auto prewakeUpChimeDurationModel = std::make_unique<bell_settings::PrewakeUpChimeDurationModel>(this);
@@ -237,11 +243,6 @@ namespace app
                 return std::make_unique<gui::AboutYourBellWindow>(app, std::move(aboutYourBellPresenter));
             });
 
-        windowsFactory.attach(gui::window::name::bellSettingsFactoryReset,
-                              [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::BellDialogYesNo>(app, name);
-                              });
-
         windowsFactory.attach(gui::window::name::bellSettingsShortcuts,
                               [&](ApplicationCommon *app, const std::string &name) {
                                   auto presenter = std::make_unique<bell_settings::ShortcutsWindowPresenter>(this);
diff --git a/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt b/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
index c609c13c928919e9f8e8c9f94fe7eb741ee579ac..bdfec58d7f04ed21f69632f6d04caa72eb6478b3 100644
--- a/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
+++ b/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
@@ -64,6 +64,7 @@ target_sources(application-bell-settings
         windows/BellSettingsLanguageWindow.cpp
         windows/BellSettingsLayoutWindow.cpp
         windows/BellSettingsFrontlightWindow.cpp
+        windows/BellSettingsFactoryResetWindow.cpp
         windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
         windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.cpp
         windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp
diff --git a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp
index 69cec46af301cd9d0e6046cad7300dc24fdcc6d4..45c218f5eb23ffee153368285b6610b611858a5c 100644
--- a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp
@@ -19,7 +19,6 @@ namespace gui::window::name
     inline constexpr auto bellSettingsLanguage     = "BellSettingsLanguage";
     inline constexpr auto bellSettingsLayout       = "BellSettingsLayout";
     inline constexpr auto bellSettingsBedtimeTone  = "BellSettingsBedtimeTone";
-    inline constexpr auto bellSettingsFactoryReset = "BellSettingsFactoryReset";
     inline constexpr auto bellSettingsShortcuts    = "BellSettingsShortcuts";
 } // namespace gui::window::name
 
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..28bc9f9e24fe85744a5b7cdb3a493d28f71b8d7f
--- /dev/null
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.cpp
@@ -0,0 +1,52 @@
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "BellSettingsFactoryResetWindow.hpp"
+
+#include <application-bell-main/ApplicationBellMain.hpp>
+#include <apps-common/widgets/BellBaseLayout.hpp>
+#include <apps-common/ApplicationCommon.hpp>
+#include <common/data/StyleCommon.hpp>
+#include <common/windows/BellFactoryReset.hpp>
+#include <i18n/i18n.hpp>
+#include <common/options/OptionBellMenu.hpp>
+#include <service-appmgr/ServiceApplicationManagerName.hpp>
+#include <service-appmgr/messages/SwitchRequest.hpp>
+
+namespace gui
+{
+    BellSettingsFactoryResetWindow::BellSettingsFactoryResetWindow(app::ApplicationCommon *app, const std::string &name)
+        : BellOptionWithDescriptionWindow(app, name), resetStr{utils::translate(
+                                                          "app_bell_settings_factory_reset_option_reset")},
+          backStr{utils::translate("app_bell_settings_factory_reset_option_back")}
+    {
+        addOptions(settingsOptionsList());
+        setListTitle(utils::translate("app_bell_settings_factory_reset"));
+        setListDescription(utils::translate("app_bell_settings_display_factory_reset_confirmation"));
+    }
+
+    std::list<Option> BellSettingsFactoryResetWindow::settingsOptionsList()
+    {
+        std::list<gui::Option> settingsOptionList;
+        auto addWinSettings = [&](const UTF8 &name, std::function<bool(Item &)> activatedCallback) {
+            settingsOptionList.emplace_back(std::make_unique<gui::option::OptionBellMenu>(
+                name, activatedCallback, [=](gui::Item &) { return true; }, this));
+        };
+
+        addWinSettings(backStr, [this](auto &) {
+            application->returnToPreviousWindow();
+            return true;
+        });
+        addWinSettings(resetStr, [this](auto &) {
+            auto switchRequest = std::make_unique<app::manager::SwitchRequest>(
+                service::name::appmgr, app::applicationBellName, gui::BellFactoryReset::name, nullptr);
+            application->bus.sendUnicast(std::move(switchRequest), service::name::appmgr);
+            return true;
+        });
+
+        return settingsOptionList;
+    }
+
+    void BellSettingsFactoryResetWindow::onBeforeShow(ShowMode mode, SwitchData *data)
+    {}
+} /* namespace gui */
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..1d08288cb58f370d7120cb0a53aa49cb5045f824
--- /dev/null
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFactoryResetWindow.hpp
@@ -0,0 +1,22 @@
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <common/options/BellOptionWithDescriptionWindow.hpp>
+
+namespace gui
+{
+    class BellSettingsFactoryResetWindow : public BellOptionWithDescriptionWindow
+    {
+      public:
+        static constexpr auto defaultName = "BellSettingsFactoryResetWindow";
+        explicit BellSettingsFactoryResetWindow(app::ApplicationCommon *app, const std::string &name = defaultName);
+        void onBeforeShow(ShowMode mode, SwitchData *data) override;
+
+      private:
+        std::list<Option> settingsOptionsList();
+        const UTF8 resetStr;
+        const UTF8 backStr;
+    };
+} /* namespace gui */
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp
index cc00147667badc14f0f8667055053a99a41a8b77..b902ee824b60ce5452c5017c89879afadf33c544 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp
@@ -3,6 +3,7 @@
 
 #include "AboutYourBellWindow.hpp"
 #include "BellSettingsFrontlightWindow.hpp"
+#include "BellSettingsFactoryResetWindow.hpp"
 #include "BellSettingsWindow.hpp"
 #include "alarm_settings/BellSettingsAlarmSettingsMenuWindow.hpp"
 
@@ -43,26 +44,6 @@ namespace gui
             };
         };
 
-        auto factoryResetCallback = [this](const std::string &window) {
-            auto actionCallback = [this]() {
-                auto switchRequest = std::make_unique<app::manager::SwitchRequest>(
-                    service::name::appmgr, app::applicationBellName, gui::BellFactoryReset::name, nullptr);
-                application->bus.sendUnicast(std::move(switchRequest), service::name::appmgr);
-                return true;
-            };
-
-            return [this, actionCallback, window](gui::Item &) {
-                auto metaData = std::make_unique<gui::DialogMetadataMessage>(
-                    gui::DialogMetadata{utils::translate("app_bell_settings_factory_reset"),
-                                        "",
-                                        utils::translate("app_bell_settings_display_factory_reset_confirmation"),
-                                        "",
-                                        actionCallback});
-                application->switchWindow(window, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData));
-                return true;
-            };
-        };
-
         std::list<gui::Option> settingsOptionList;
         auto addWinSettings = [&](const UTF8 &name, const std::string &window, Callback &&callback) {
             settingsOptionList.emplace_back(std::make_unique<gui::option::OptionBellMenu>(
@@ -95,8 +76,8 @@ namespace gui
         addWinSettings(
             utils::translate("app_bell_settings_turn_off"), BellTurnOffOptionWindow::defaultName, defaultCallback);
         addWinSettings(utils::translate("app_bell_settings_factory_reset"),
-                       gui::window::name::bellSettingsFactoryReset,
-                       factoryResetCallback);
+                       gui::BellSettingsFactoryResetWindow::defaultName,
+                       defaultCallback);
 
         return settingsOptionList;
     }
diff --git a/products/BellHybrid/apps/common/CMakeLists.txt b/products/BellHybrid/apps/common/CMakeLists.txt
index 8bbc0c8f6b544d2edfd622e2fddf1d3b1071f0a5..6a23a63677951989c74be8e4cc4e964b7164a3ac 100644
--- a/products/BellHybrid/apps/common/CMakeLists.txt
+++ b/products/BellHybrid/apps/common/CMakeLists.txt
@@ -13,6 +13,7 @@ target_include_directories(application-bell-common
 target_sources(application-bell-common
     PRIVATE
         src/BellPowerOffPresenter.cpp
+        src/BellFactoryResetPresenter.cpp
         src/AlarmModel.cpp
         src/AudioModel.cpp
         src/LanguageUtils.cpp
@@ -53,6 +54,7 @@ target_sources(application-bell-common
 
         src/options/BellOptionWindow.cpp
         src/options/BellShortOptionWindow.cpp
+        src/options/BellOptionWithDescriptionWindow.cpp
         src/options/OptionBellMenu.cpp
         src/options/BellOptionsNavigation.cpp
 
@@ -74,6 +76,7 @@ target_sources(application-bell-common
         include/common/LanguageUtils.hpp
         include/common/SoundsRepository.hpp
         include/common/BellPowerOffPresenter.hpp
+        include/common/BellFactoryResetPresenter.hpp
         include/common/windows/BellFactoryReset.hpp
         include/common/windows/BellFinishedWindow.hpp
         include/common/windows/BellTurnOffWindow.hpp
diff --git a/products/BellHybrid/apps/common/include/common/BellFactoryResetPresenter.hpp b/products/BellHybrid/apps/common/include/common/BellFactoryResetPresenter.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..03458254a9d7dbb32f5c56906609193fedecc6de
--- /dev/null
+++ b/products/BellHybrid/apps/common/include/common/BellFactoryResetPresenter.hpp
@@ -0,0 +1,20 @@
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <apps-common/popups/presenter/PowerOffPresenter.hpp>
+
+namespace gui
+{
+    class BellFactoryResetPresenter : public gui::AbstractPowerOffPresenter
+    {
+      public:
+        explicit BellFactoryResetPresenter(app::ApplicationCommon *app);
+        void powerOff(sys::CloseReason reason) override;
+        void reboot() override;
+
+      private:
+        app::ApplicationCommon *application;
+    };
+} // namespace gui
diff --git a/products/BellHybrid/apps/common/include/common/options/BellOptionWithDescriptionWindow.hpp b/products/BellHybrid/apps/common/include/common/options/BellOptionWithDescriptionWindow.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..05ad6667d0e0909c1ad7eb82d495c8099b71fc8e
--- /dev/null
+++ b/products/BellHybrid/apps/common/include/common/options/BellOptionWithDescriptionWindow.hpp
@@ -0,0 +1,28 @@
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <ApplicationCommon.hpp>
+#include <AppWindow.hpp>
+#include <OptionsList.hpp>
+#include <apps-common/widgets/BellBaseLayout.hpp>
+
+namespace gui
+{
+    class BellOptionWithDescriptionWindow : public AppWindow, protected OptionsList<ListView>
+    {
+      protected:
+        BellBaseLayout *body{};
+
+      public:
+        BellOptionWithDescriptionWindow(app::ApplicationCommon *app, const std::string &name);
+        void setListTitle(const std::string &title);
+        void setListDescription(const std::string &title);
+
+        void onBeforeShow(ShowMode mode, SwitchData *data) override;
+        void onClose(CloseReason reason) override;
+        void rebuild() override;
+        void buildInterface() override;
+    };
+}; // namespace gui
diff --git a/products/BellHybrid/apps/common/src/BellFactoryResetPresenter.cpp b/products/BellHybrid/apps/common/src/BellFactoryResetPresenter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1810fe9a892c2f46233bd81f33a889aad364245c
--- /dev/null
+++ b/products/BellHybrid/apps/common/src/BellFactoryResetPresenter.cpp
@@ -0,0 +1,23 @@
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "BellFactoryResetPresenter.hpp"
+
+#include <service-appmgr/messages/OnboardingPowerDownRequest.hpp>
+#include <SystemManager/SystemManagerCommon.hpp>
+
+namespace gui
+{
+    BellFactoryResetPresenter::BellFactoryResetPresenter(app::ApplicationCommon *app) : application(app)
+    {}
+
+    void BellFactoryResetPresenter::powerOff([[maybe_unused]] sys::CloseReason reason)
+    {
+        sys::SystemManagerCommon::FactoryReset(application);
+    }
+    void BellFactoryResetPresenter::reboot()
+    {
+        sys::SystemManagerCommon::Reboot(application);
+    }
+
+} // namespace gui
diff --git a/products/BellHybrid/apps/common/src/options/BellOptionWithDescriptionWindow.cpp b/products/BellHybrid/apps/common/src/options/BellOptionWithDescriptionWindow.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..36d67712263a8327daedcc787cc2fb39079402f9
--- /dev/null
+++ b/products/BellHybrid/apps/common/src/options/BellOptionWithDescriptionWindow.cpp
@@ -0,0 +1,114 @@
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "common/options/BellOptionWithDescriptionWindow.hpp"
+#include "common/options/OptionBellMenu.hpp"
+#include "common/options/BellOptionsNavigation.hpp"
+
+#include <messages/OptionsWindow.hpp>
+#include <TextFixedSize.hpp>
+
+namespace gui
+{
+    namespace
+    {
+        constexpr auto one_option_height      = style::bell_options::h + 2U * style::bell_options::option_margin;
+        constexpr auto option_layout_height   = 2U * one_option_height;
+        constexpr auto description_height     = 175U;
+        constexpr auto max_description_height = description_height + 16U;
+        constexpr auto top_center_margin      = -8;
+    } // namespace
+
+    BellOptionWithDescriptionWindow::BellOptionWithDescriptionWindow(app::ApplicationCommon *app,
+                                                                     const std::string &name)
+        : AppWindow(app, name), OptionsList(std::make_shared<OptionsModel>(app, one_option_height))
+    {
+        buildInterface();
+
+        auto storedCallback        = optionsList->inputCallback;
+        optionsList->inputCallback = [&, storedCallback](Item &item, const InputEvent &event) {
+            return storedCallback(item, invertNavigationDirection(event));
+        };
+    }
+
+    void BellOptionWithDescriptionWindow::rebuild()
+    {
+        recreateOptions();
+    }
+
+    void BellOptionWithDescriptionWindow::buildInterface()
+    {
+        AppWindow::buildInterface();
+
+        statusBar->setVisible(false);
+        header->setTitleVisibility(false);
+        navBar->setVisible(false);
+
+        body = new BellBaseLayout(this, 0, 0, style::window_width, style::window_height, false);
+        body->setEdges(RectangleEdge::None);
+
+        optionsList = new gui::ListView(body->lastBox, 0, 0, 0, 0, optionsModel, listview::ScrollBarType::None);
+        optionsList->setAlignment(Alignment(Alignment::Vertical::Bottom));
+        optionsList->setMinimumSize(style::bell_options::default_text_width, option_layout_height);
+        optionsList->setEdges(RectangleEdge::None);
+
+        body->lastBox->setMaximumHeight(option_layout_height);
+        body->resize();
+
+        optionsList->prepareRebuildCallback = [this]() { recreateOptions(); };
+        optionsModel->createData(options);
+
+        setFocusItem(optionsList);
+    }
+
+    void BellOptionWithDescriptionWindow::setListTitle(const std::string &title)
+    {
+        auto titleBody = new TextFixedSize(body->firstBox);
+        titleBody->drawUnderline(false);
+        titleBody->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
+        titleBody->setFont(style::window::font::largelight);
+        titleBody->setMinimumSize(style::bell_base_layout::outer_layouts_w, style::bell_base_layout::outer_layouts_h);
+        titleBody->setEdges(RectangleEdge::None);
+        titleBody->setEditMode(EditMode::Browse);
+        titleBody->setRichText(title);
+
+        body->firstBox->resizeItems();
+    }
+
+    void BellOptionWithDescriptionWindow::setListDescription(const std::string &title)
+    {
+        auto titleBody = new TextFixedSize(body->centerBox);
+
+        titleBody->drawUnderline(false);
+        titleBody->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
+        titleBody->setFont(style::window::font::verybiglight);
+        titleBody->setMinimumSize(style::window_width, description_height);
+        titleBody->setEdges(RectangleEdge::None);
+        titleBody->setEditMode(EditMode::Browse);
+        titleBody->setRichText(title);
+
+        body->centerBox->setMargins(gui::Margins{0, top_center_margin, 0, 0});
+        body->centerBox->setMaximumHeight(max_description_height);
+        body->centerBox->setMinimumHeight(description_height);
+        body->centerBox->resizeItems();
+        body->resizeItems();
+    }
+
+    void BellOptionWithDescriptionWindow::onClose([[maybe_unused]] CloseReason reason)
+    {
+        if (reason != CloseReason::Popup) {
+            optionsList->onClose();
+        }
+    }
+
+    void BellOptionWithDescriptionWindow::onBeforeShow(ShowMode mode, SwitchData *data)
+    {
+        if (auto message = dynamic_cast<gui::OptionsWindowOptions *>(data)) {
+            LOG_DEBUG("Options load!");
+            options = message->takeOptions();
+        }
+
+        optionsList->rebuildList(listview::RebuildType::InPlace);
+    }
+
+} /* namespace gui */
diff --git a/products/BellHybrid/apps/common/src/windows/BellFactoryReset.cpp b/products/BellHybrid/apps/common/src/windows/BellFactoryReset.cpp
index 3be9df4e9f2f04c8638cf57457f5f2bc1a90cf1d..22b157944fe9b34d01bbe0159b1c71b93344195f 100644
--- a/products/BellHybrid/apps/common/src/windows/BellFactoryReset.cpp
+++ b/products/BellHybrid/apps/common/src/windows/BellFactoryReset.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "windows/BellFactoryReset.hpp"
@@ -17,7 +17,7 @@ namespace gui
         buildInterface();
 
         timerCallback = [this](Item &, sys::Timer &) {
-            this->presenter->powerOff(sys::CloseReason::FactoryReset);
+            this->presenter->powerOff();
             return true;
         };
     }
diff --git a/scripts/lua/factory.lua b/scripts/lua/factory.lua
index f4fa73bddf8f71bea7252fae1b0fa0882ecae1a1..90cab6ea05f2620177b91d00710413118d929f66 100644
--- a/scripts/lua/factory.lua
+++ b/scripts/lua/factory.lua
@@ -25,9 +25,15 @@ local function remove_cache()
     end
 end
 
+local function remove_user_relaxation_files()
+    print(string.format("Removing user relaxation files from '%s'", paths.user_relaxation_file))
+    helpers.rm_files_from_dir(paths.user_relaxation_file)
+end
+
 function factory.execute()
     remove_old_databases()
     copy_clean_databases()
+    remove_user_relaxation_files()
     remove_cache()
 end
 
diff --git a/scripts/lua/share/paths.lua b/scripts/lua/share/paths.lua
index f8eef09f873e46aa14697f51a9502977e55a9b04..a11b0e2501beb264d19fd1c26e8e95434ae7ff7c 100644
--- a/scripts/lua/share/paths.lua
+++ b/scripts/lua/share/paths.lua
@@ -14,6 +14,7 @@ paths.db_factory_dir = paths.db_dir .. "/factory"
 paths.temp_dir = user_dir .. "/temp"
 paths.update_dir = user_dir .. "/temp/update"
 paths.migration_scripts_dir = paths.db_dir .. "/migration"
+paths.user_relaxation_file = user_dir .. "/media/app/relaxation"
 
 local target = {}
 target.var_dir = target_dir .. "/var"