4 files changed, 11 insertions(+), 5 deletions(-)

M image/assets/lang/English.json
M module-apps/apps-common/ApplicationCommon.cpp
M module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp
M pure_changelog.md

@@ 238,8 238,8 @@
   "sim_setup_wrong_puk": "<text>Wrong PUK code.<br></br>You have <token>$ATTEMPTS</token> attempts left</text>",
   "sim_setup_wrong_puk_last_attempt": "<text>Wrong PUK code.<br></br>You have 1 attempt left</text>",
   "sim_setup_wrong_puk_last_attempt_warning": "<text>If the code is wrong this time, the<br></br>SIM card will be blocked and you'll<br></br>have to contact the operator.</text>",
-  "sim_card_pin_disabled": "SIM card pin disabled",
-  "sim_card_pin_enabled": "SIM card pin enabled",
+  "sim_card_pin_disabled": "SIM card PIN disabled",
+  "sim_card_pin_enabled": "SIM card PIN enabled",
   "sim_card_cant_connect": "<text>Cannot connect to <token>$SIM</token> card.<br></br>Please insert card.</text>",
   "sim_card_not_ready": "<text>Waiting for Modem to start.<br></br>This may take a moment.</text>",
   "app_desktop_press_to_unlock": "<text size='27'>Press <b>Unlock</b> and then <b>#</b></text>",

@@ 824,7 824,8 @@ namespace app
             blueprint = popupBlueprintFallback(id);
         }
         if (data->getDisposition().windowtype != gui::popup::Disposition::WindowType::Popup) {
-            LOG_ERROR("setting popup window type to popup - fallback");
+            LOG_ERROR("setting popup window type from %s to popup - fallback",
+                      magic_enum::enum_name(data->getDisposition().windowtype).data());
             data->setDisposition(gui::popup::Disposition{
                 gui::popup::Disposition::Priority::Normal, gui::popup::Disposition::WindowType::Popup, id});
         }

@@ 106,10 106,14 @@ namespace app
         popupBlueprint.registerBlueprint(ID::PhoneLockChangeInfo, phoneLockBlueprint);
 
         auto simLockBlueprint = [&](gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &params) {
-            auto popupParams = dynamic_cast<const gui::SimUnlockInputRequestParams *>(params.get());
+            auto popupParams = dynamic_cast<gui::SimUnlockInputRequestParams *>(params.get());
             if (popupParams == nullptr) {
                 return false;
             }
+
+            popupParams->setDisposition(gui::popup::Disposition{gui::popup::Disposition::Priority::High,
+                                                                gui::popup::Disposition::WindowType::Popup,
+                                                                params->getPopupId()});
             switchWindowPopup(gui::popup::resolveWindowName(id),
                               popupParams->getDisposition(),
                               std::make_unique<locks::SimLockData>(popupParams->getLock(),

@@ 8,6 8,7 @@
 * Separated system volume from Bluetooth device volume for A2DP
 
 ### Fixed
+* Fixed SIM card pop-ups not showing
 * Fixed lost bytes in logs
 * Fixed passcode lock time discrepancy between lock screen and 'Wrong password' popup
 * Fixed cellular DMA errors


@@ 219,4 220,4 @@
 
 ### Fixed
 * Fixed problem with contacts disappearing after editing them.
-* Fixed problem with MTP on Windows.>
\ No newline at end of file
+* Fixed problem with MTP on Windows.