5 files changed, 12 insertions(+), 18 deletions(-)

M image/assets/lang/English.json
M module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp
M module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp
M module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
M module-apps/application-onboarding/windows/UpdateDialogWindow.hpp

@@ 322,7 322,7 @@
   "app_onboarding_skip_confirm": "<text>Sim setup is required for network connection. Skip the setup anyway? </text>",
   "app_onboarding_configuration_successful": "<text>Your Mudita Pure<br></br>is ready to use.</text>",
   "app_onboarding_no_configuration": "<text>Your Mudita Pure has not been<br></br>configured. You can go to<br></br>Settings to set it up.</text>",
-  "app_onboarding_update_info": "<text>New Mudita OS version is available.</text><br></br><text>To update your Pure Phone, please</text><br></br><text>visit: </text><text font='gt_pressura' weight='bold' size='27'>www.mudita.com/updateos</text><br></br><text>and follow the instructions.</text>",
+  "app_onboarding_update_info": "<text>The current version of MuditaOS is <br></br> <token>$VERSION</token>. Updates with new <br></br> features and fixes appear often. <br></br>To update your Phone please <br></br> visit: </text><text font='gt_pressura' weight='bold' size='27'>www.mudita.com/updateos</text><br></br><text>and follow the instructions.</text>",
   "app_settings_title_main": "Advanced",
   "app_settings_title_main_new": "Settings",
   "app_settings_bt": "Bluetooth",

@@ 27,14 27,7 @@ namespace app::onBoarding
     {
         if (inputEvent.isShortRelease()) {
             if (inputEvent.is(gui::KeyCode::KEY_ENTER)) {
-                auto metaData = std::make_unique<gui::DialogMetadataMessage>(
-                    gui::DialogMetadata{utils::translate("app_onboarding_title_update_info"),
-                                        "update_icon_W_G",
-                                        utils::translate("app_onboarding_update_info"),
-                                        "",
-                                        [=]() -> bool { return true; }});
-                application->switchWindow(
-                    gui::window::name::onBoarding_update, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData));
+                application->switchWindow(gui::window::name::onBoarding_update, gui::ShowMode::GUI_SHOW_INIT);
                 return true;
             }
 

@@ 27,14 27,7 @@ namespace app::onBoarding
     {
         if (inputEvent.isShortRelease()) {
             if (inputEvent.is(gui::KeyCode::KEY_ENTER)) {
-                auto metaData = std::make_unique<gui::DialogMetadataMessage>(
-                    gui::DialogMetadata{utils::translate("app_onboarding_title_update_info"),
-                                        "update_icon_W_G",
-                                        utils::translate("app_onboarding_update_info"),
-                                        "",
-                                        [=]() -> bool { return true; }});
-                application->switchWindow(
-                    gui::window::name::onBoarding_update, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData));
+                application->switchWindow(gui::window::name::onBoarding_update, gui::ShowMode::GUI_SHOW_INIT);
                 return true;
             }
 

@@ 8,6 8,7 @@
 
 #include <application-onboarding/ApplicationOnBoarding.hpp>
 #include <service-appmgr/service-appmgr/Controller.hpp>
+#include <source/version.hpp>
 
 namespace app::onBoarding
 {


@@ 20,6 21,13 @@ namespace app::onBoarding
         presenter->attach(this);
     }
 
+    void UpdateDialogWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
+        setTitle(utils::translate("app_onboarding_title_update_info"));
+        icon->image->set("update_icon_W_G");
+        icon->text->setRichText(utils::translate("app_onboarding_update_info"), {{"$VERSION", std::string(VERSION)}});
+    }
+
     bool UpdateDialogWindow::onInput(const gui::InputEvent &inputEvent)
     {
         if (inputEvent.isShortRelease()) {

@@ 18,7 18,7 @@ namespace app::onBoarding
       public:
         UpdateDialogWindow(app::Application *app,
                            std::unique_ptr<OnBoardingFinalizeContract::Presenter> &&windowPresenter);
-
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         bool onInput(const gui::InputEvent &inputEvent) override;
     };
 } // namespace app::onBoarding