From d528cac7df03906e67d64987e7c0b2ca5cfe6361 Mon Sep 17 00:00:00 2001
From: Maciej-Mudita <maciej.gibowicz@mudita.com>
Date: Tue, 8 Nov 2022 18:55:23 +0100
Subject: [PATCH] [MOS-641] Fix SIM cards window

Creating menus and actions depending on the SIM card
lock status.
---
 image/assets/lang/Deutsch.json                |   5 +-
 image/assets/lang/English.json                |   4 +-
 image/assets/lang/Espanol.json                |   5 +-
 image/assets/lang/Francais.json               |   4 +-
 image/assets/lang/Polski.json                 |   4 +-
 image/assets/lang/Svenska.json                |   4 +-
 .../ApplicationSettings.cpp                   |  53 +++++---
 .../ApplicationSettings.hpp                   |  24 ++--
 .../network/SimPINSettingsPresenter.cpp       |   2 +-
 .../windows/network/SimCardsWindow.cpp        | 117 ++++++++++++++----
 .../windows/network/SimCardsWindow.hpp        |  10 ++
 .../locks/data/SimLockMessages.hpp            |   5 +-
 .../locks/handlers/SimLockHandler.cpp         |  22 ++--
 .../locks/handlers/SimLockHandler.hpp         |   3 +-
 .../locks/handlers/SimLockSubject.cpp         |   7 +-
 .../locks/handlers/SimLockSubject.hpp         |   3 +-
 module-gui/gui/widgets/status-bar/SIM.cpp     |   8 +-
 .../include/service-cellular/api/common.hpp   |   4 +-
 .../service-cellular/api/request/sim.hpp      |  14 +--
 .../src/ServiceCellularPriv.cpp               |   8 +-
 .../service-cellular/src/SimCard.cpp          |  34 +++--
 .../service-cellular/src/SimCard.hpp          |  15 +--
 module-utils/EventStore/EventStore.hpp        |  13 +-
 .../services/appmgr/ApplicationManager.cpp    |   4 +-
 products/PurePhone/sys/SystemManager.cpp      |   3 +-
 pure_changelog.md                             |   1 +
 26 files changed, 266 insertions(+), 110 deletions(-)

diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json
index b0a594645535dc8dcb230a299ed1ff7ef5242fe9..4145c9d6ad67d9e09897a51c90dd6ce6d1fe7ed1 100644
--- a/image/assets/lang/Deutsch.json
+++ b/image/assets/lang/Deutsch.json
@@ -467,7 +467,9 @@
   "app_settings_about": "Über Mudita Pure",
   "app_settings_title_languages": "Sprachauswahl",
   "app_settings_network_sim_cards": "SIM-Karten",
-  "app_settings_network_active_card": "Aktive Karte",
+  "app_settings_network_active_card": "Aktiver Slot",
+  "app_settings_network_unblock_card": "Entsperren Karte",
+  "app_settings_network_not_connected": "keine Karte",
   "app_settings_network_operator_auto_select": "Automatische Auswahl",
   "app_settings_network_all_operators": "Alle Bediener",
   "app_settings_network_pin_settings": "PIN-Einstellungen",
@@ -475,7 +477,6 @@
   "app_settings_network_pin_change_code": "PIN-Code ändern",
   "app_settings_network_import_contacts_from_sim_card": "Kontakte von SIM import.",
   "app_settings_network_import_contacts_duplicates": "Duplikate von SIM",
-  "app_settings_network_import_contacts_from_sim_card": "Kontakte von SIM-Karte importieren",
   "app_settings_network_import_contacts_from_sim_card_reading": "<text>Import läuft...<br></br>Bitte warte einen Moment.</text>",
   "app_settings_network_import_contacts_from_sim_card_no_contacts": "<text>Auf dieser SIM-Karte befinden <br></br> sich keine Kontakte.</text>",
   "app_settings_network_import_contacts_from_sim_card_duplicates": "<text>Wir haben <token>$DUPLICATES</token> Duplikate gefunden. Möchten Sie<br></br>doppelte Kontakte importieren <br></br>und vorhandene ersetzen?</text>",
diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json
index 3439174e4008ce340b68bb1ca62820f5ecc354fd..250f34490a1d157dcc16cfea7fa4ba56b3da7646 100644
--- a/image/assets/lang/English.json
+++ b/image/assets/lang/English.json
@@ -424,7 +424,9 @@
   "app_settings_about": "About Mudita Pure",
   "app_settings_title_languages": "Language selection",
   "app_settings_network_sim_cards": "SIM cards",
-  "app_settings_network_active_card": "Active card",
+  "app_settings_network_active_card": "Active slot",
+  "app_settings_network_unblock_card": "Unblock card",
+  "app_settings_network_not_connected": "no card",
   "app_settings_network_operator_auto_select": "Operator auto-select",
   "app_settings_network_all_operators": "All operators",
   "app_settings_network_pin_settings": "PIN settings",
diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json
index 821b8532a3f6f8d5d0e2838802836f26e31236dc..3ba5ac830bcfe650563ede14bdb2f1b89ca64ccc 100644
--- a/image/assets/lang/Espanol.json
+++ b/image/assets/lang/Espanol.json
@@ -467,7 +467,9 @@
   "app_settings_about": "Sobre Mudita Pure",
   "app_settings_title_languages": "Selección de idioma",
   "app_settings_network_sim_cards": "Tarjetas SIM",
-  "app_settings_network_active_card": "Tarjeta activa",
+  "app_settings_network_active_card": "Toma activa",
+  "app_settings_network_unblock_card": "Desbloquear la tarjeta",
+  "app_settings_network_not_connected": "sin tarjeta",
   "app_settings_network_operator_auto_select": "Selección automática de operador",
   "app_settings_network_all_operators": "Todos los operadores",
   "app_settings_network_pin_settings": "Configuración de PIN",
@@ -476,7 +478,6 @@
   "app_settings_network_import_contacts_from_sim_card": "Importar contactos de la SIM",
   "app_settings_network_import_contacts": "Importar contactos",
   "app_settings_network_import_contacts_duplicates": "Duplicados de SIM",
-  "app_settings_network_import_contacts_from_sim_card": "Importar contactos de la tarjeta SIM",
   "app_settings_network_import_contacts_from_sim_card_reading": "<text>Importación en curso ...<br></br>Espere un momento.</text>",
   "app_settings_network_import_contacts_from_sim_card_no_contacts": "<text>No hay contactos <br></br>en esta tarjeta SIM.</text>",
   "app_settings_network_import_contacts_from_sim_card_duplicates": "<text>Encontramos <token>$DUPLICATES</token> duplicados. ¿Quieres importar <br></br>contactos duplicados y reemplazar los existentes?</text>",
diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json
index a544935d7c3a957aca0beb0cb48455c3e14667ec..394a7397d1e380e3ff413748d70ec145b781d46b 100644
--- a/image/assets/lang/Francais.json
+++ b/image/assets/lang/Francais.json
@@ -435,7 +435,9 @@
   "app_settings_about": "À propos de Mudita Pure",
   "app_settings_title_languages": "Sélection de langue",
   "app_settings_network_sim_cards": "Cartes SIM",
-  "app_settings_network_active_card": "Activer la carte",
+  "app_settings_network_active_card": "Fente active",
+  "app_settings_network_unblock_card": "Débloquer la carte",
+  "app_settings_network_not_connected": "pas de carte",
   "app_settings_network_operator_auto_select": "Operator auto-select",
   "app_settings_network_all_operators": "All operators",
   "app_settings_network_pin_settings": "PIN settings",
diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json
index 49e669344ffbacfb46af05f280a963dca29dd97d..08086afd87f63235cefaac453d7a168c9c2c560f 100644
--- a/image/assets/lang/Polski.json
+++ b/image/assets/lang/Polski.json
@@ -478,7 +478,9 @@
   "app_settings_about": "O Mudita Pure",
   "app_settings_title_languages": "Wybór języka",
   "app_settings_network_sim_cards": "Karty SIM",
-  "app_settings_network_active_card": "Aktywna karta",
+  "app_settings_network_active_card": "Aktywny slot",
+  "app_settings_network_unblock_card": "Odblokuj kartę",
+  "app_settings_network_not_connected": "brak karty",
   "app_settings_network_operator_auto_select": "Automatyczny wybór operatora",
   "app_settings_network_all_operators": "Wszyscy operatorzy",
   "app_settings_network_pin_settings": "Ustawienia PIN",
diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json
index 49720954196934ee6433fbfd7da9cc2a046a8501..27560b10b6120a7f17451403204604ee946092c8 100644
--- a/image/assets/lang/Svenska.json
+++ b/image/assets/lang/Svenska.json
@@ -377,7 +377,9 @@
   "app_settings_about": "Om Mudita Pure",
   "app_settings_title_languages": "Språkval",
   "app_settings_network_sim_cards": "SIM-kort",
-  "app_settings_network_active_card": "Aktivt kort",
+  "app_settings_network_active_card": "Aktivt slot",
+  "app_settings_network_unblock_card": "Avblockera kort",
+  "app_settings_network_not_connected": "inget kort",
   "app_settings_network_operator_auto_select": "Välj operatör automatiskt",
   "app_settings_network_all_operators": "Alla operatörer",
   "app_settings_network_import_contacts_from_sim_card": "Importera kontakter från SIM",
diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp
index abf6d138088b6952b7295d4e5c34e33b92450e6f..d5917ce01107be65c1857f6614d5af5a653a8ee0 100644
--- a/module-apps/application-settings/ApplicationSettings.cpp
+++ b/module-apps/application-settings/ApplicationSettings.cpp
@@ -109,13 +109,14 @@ namespace app
         bus.channels.push_back(sys::BusChannel::ServiceAudioNotifications);
         bus.channels.push_back(sys::BusChannel::BluetoothNotifications);
         bus.channels.push_back(sys::BusChannel::BluetoothModeChanges);
+        bus.channels.push_back(sys::BusChannel::ServiceCellularNotifications);
 
         CellularServiceAPI::SubscribeForOwnNumber(this, [&](const std::string &number) {
             selectedSimNumber = number;
             LOG_DEBUG("Sim number changed");
         });
-        if ((Store::GSM::SIM::SIM1 == selectedSim || Store::GSM::SIM::SIM2 == selectedSim) &&
-            Store::GSM::get()->sim == selectedSim) {
+        if ((Store::GSM::SIM::SIM1 == simState || Store::GSM::SIM::SIM2 == simState) &&
+            Store::GSM::get()->sim == simState) {
             CellularServiceAPI::RequestForOwnNumber(this);
         }
         bluetoothSettingsModel = std::make_shared<BluetoothSettingsModel>(this);
@@ -153,15 +154,19 @@ namespace app
             return ret;
         }
         connect(typeid(cellular::msg::notification::SimReady), [&](sys::Message *) {
-            selectedSim = Store::GSM::get()->selected;
             CellularServiceAPI::RequestForOwnNumber(this);
-            auto currentWindow = getCurrentWindow();
-            if (gui::window::name::sim_cards == currentWindow->getName()) {
-                updateCurrentWindow();
-            }
-            return sys::MessageNone{};
+            return handleSimNotification();
         });
 
+        connect(typeid(cellular::msg::notification::SimBlocked),
+                [&](sys::Message *) { return handleSimNotification(); });
+
+        connect(typeid(cellular::msg::notification::SimNeedPin),
+                [&](sys::Message *) { return handleSimNotification(); });
+
+        connect(typeid(cellular::msg::notification::SimNeedPuk),
+                [&](sys::Message *) { return handleSimNotification(); });
+
         connect(typeid(::sys::bluetooth::BluetoothModeChanged), [&](sys::Message *msg) {
             const auto message   = static_cast<::sys::bluetooth::BluetoothModeChanged *>(msg);
             const auto newState  = message->getBluetoothMode();
@@ -288,11 +293,10 @@ namespace app
             return sys::MessageNone{};
         });
 
-        connect(typeid(cellular::msg::request::sim::GetLockState::Response), [&](sys::Message *msg) {
-            auto simCardPinLockState = static_cast<cellular::msg::request::sim::GetLockState::Response *>(msg);
-            auto pinSettingsLockStateData =
-                std::make_unique<gui::PINSettingsLockStateData>(simCardPinLockState->locked);
-            updateCurrentWindow(std::move(pinSettingsLockStateData));
+        connect(typeid(cellular::msg::request::sim::GetPinSettings::Response), [&](sys::Message *msg) {
+            auto simCardPinSettings     = static_cast<cellular::msg::request::sim::GetPinSettings::Response *>(msg);
+            auto simCardPinSettingsData = std::make_unique<gui::PINSettingsLockStateData>(simCardPinSettings->locked);
+            updateCurrentWindow(std::move(simCardPinSettingsData));
             return sys::MessageNone{};
         });
 
@@ -596,22 +600,28 @@ namespace app
         ApplicationCommon::returnToPreviousWindow();
     }
 
-    void ApplicationSettings::setSim(Store::GSM::SIM sim)
+    void ApplicationSettings::setSelectedSim(Store::GSM::SelectedSIM sim)
     {
-        auto arg = (sim == Store::GSM::SIM::SIM2) ? cellular::api::SimSlot::SIM2 : cellular::api::SimSlot::SIM1;
+        auto arg = (sim == Store::GSM::SelectedSIM::SIM2) ? cellular::api::SimSlot::SIM2 : cellular::api::SimSlot::SIM1;
         getSimLockSubject().setSim(arg);
     }
 
-    void ApplicationSettings::updateSim()
+    void ApplicationSettings::updateSimParam()
     {
         selectedSim = Store::GSM::get()->selected;
+        simState    = Store::GSM::get()->sim;
     }
 
-    Store::GSM::SIM ApplicationSettings::getSim()
+    Store::GSM::SelectedSIM ApplicationSettings::getSelectedSim()
     {
         return selectedSim;
     }
 
+    Store::GSM::SIM ApplicationSettings::getSimState()
+    {
+        return simState;
+    }
+
     void ApplicationSettings::operatorOnChanged(const std::string &value)
     {
         LOG_DEBUG("[ApplicationSettings::operatorOnChanged] value=%s", value.c_str());
@@ -786,4 +796,13 @@ namespace app
         soundsPlayer->stop(notification->token);
         return sys::MessageNone{};
     }
+
+    auto ApplicationSettings::handleSimNotification() -> sys::MessagePointer
+    {
+        auto currentWindow = getCurrentWindow();
+        if (gui::window::name::sim_cards == currentWindow->getName()) {
+            updateCurrentWindow();
+        }
+        return sys::MessageNone{};
+    }
 } /* namespace app */
diff --git a/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp b/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp
index 234e951af01e4327c95fe3aec8d71c3e1748c8e3..4304acfad8ea2199c0c02ec537e956436e9451c2 100644
--- a/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp
+++ b/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp
@@ -25,11 +25,12 @@ namespace app
         class SimParams
         {
           public:
-            virtual ~SimParams()                     = default;
-            virtual void setSim(Store::GSM::SIM sim) = 0;
-            virtual void updateSim()                 = 0;
-            virtual Store::GSM::SIM getSim()         = 0;
-            virtual std::string getNumber()          = 0;
+            virtual ~SimParams()                                     = default;
+            virtual void updateSimParam()                            = 0;
+            virtual void setSelectedSim(Store::GSM::SelectedSIM sim) = 0;
+            virtual Store::GSM::SelectedSIM getSelectedSim()         = 0;
+            virtual Store::GSM::SIM getSimState()                    = 0;
+            virtual std::string getNumber()                          = 0;
         };
         class OperatorsSettings
         {
@@ -144,9 +145,10 @@ namespace app
         void destroyUserInterface() override;
         void returnToPreviousWindow() override;
 
-        void setSim(Store::GSM::SIM sim) override;
-        void updateSim() override;
-        Store::GSM::SIM getSim() override;
+        void updateSimParam() override;
+        void setSelectedSim(Store::GSM::SelectedSIM sim) override;
+        Store::GSM::SelectedSIM getSelectedSim() override;
+        Store::GSM::SIM getSimState() override;
         std::string getNumber() override;
 
         void operatorOnChanged(const std::string &value);
@@ -185,11 +187,13 @@ namespace app
         void attachQuotesWindows();
         void switchToAllDevicesViaBtErrorPrompt(std::shared_ptr<sys::DataMessage> msg, const std::string &errorMsg);
 
+        auto handleSimNotification() -> sys::MessagePointer;
         auto handleAudioStop(AudioStopNotification *notification) -> sys::MessagePointer;
 
         std::shared_ptr<SoundsPlayer> soundsPlayer;
-        Store::GSM::SIM selectedSim   = Store::GSM::get()->selected;
-        std::string selectedSimNumber = {};
+        Store::GSM::SelectedSIM selectedSim = Store::GSM::get()->selected;
+        Store::GSM::SIM simState            = Store::GSM::get()->sim;
+        std::string selectedSimNumber       = {};
 
         bool operatorsOn                                               = false;
         bool notificationsWhenLocked                                   = true;
diff --git a/module-apps/application-settings/presenter/network/SimPINSettingsPresenter.cpp b/module-apps/application-settings/presenter/network/SimPINSettingsPresenter.cpp
index 0554d3befdd9b2c0e9606b5f1709f080d2b57c21..a9533ad88e1e40df03a18cf535d85528c282351c 100644
--- a/module-apps/application-settings/presenter/network/SimPINSettingsPresenter.cpp
+++ b/module-apps/application-settings/presenter/network/SimPINSettingsPresenter.cpp
@@ -33,7 +33,7 @@ bool SimPINSettingsPresenter::isPinEnabled() const noexcept
 
 void SimPINSettingsPresenter::requestLockState() const
 {
-    application->bus.sendUnicast<cellular::msg::request::sim::GetLockState>();
+    application->bus.sendUnicast<cellular::msg::request::sim::GetPinSettings>();
 }
 
 void SimPINSettingsPresenter::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
diff --git a/module-apps/application-settings/windows/network/SimCardsWindow.cpp b/module-apps/application-settings/windows/network/SimCardsWindow.cpp
index 2f180b17d8c453794d72b6a2f88580c02263c802..e2eb1e04d13c70c40763bb80b91ebf1a8bdee4cf 100644
--- a/module-apps/application-settings/windows/network/SimCardsWindow.cpp
+++ b/module-apps/application-settings/windows/network/SimCardsWindow.cpp
@@ -3,10 +3,8 @@
 
 #include "SimCardsWindow.hpp"
 
-#include <application-settings/ApplicationSettings.hpp>
 #include <application-settings/data/PINSettingsSimData.hpp>
 #include <application-settings/windows/WindowNames.hpp>
-
 #include <OptionSetting.hpp>
 
 namespace gui
@@ -18,7 +16,7 @@ namespace gui
     void SimCardsWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
         setTitle(utils::translate("app_settings_network_sim_cards"));
-        simParams->updateSim();
+        simParams->updateSimParam();
         BaseSettingsWindow::onBeforeShow(mode, data);
     }
 
@@ -27,43 +25,98 @@ namespace gui
         std::list<gui::Option> optList;
         std::string simStr;
         auto phoneNumber = simParams->getNumber();
-        auto sim         = simParams->getSim();
-        switch (sim) {
-        case Store::GSM::SIM::SIM1:
+        auto selectedSim = simParams->getSelectedSim();
+        auto simState    = simParams->getSimState();
+
+        switch (selectedSim) {
+        case Store::GSM::SelectedSIM::SIM1:
             simStr = utils::translate("app_settings_network_sim1");
             break;
-        case Store::GSM::SIM::SIM2:
+        case Store::GSM::SelectedSIM::SIM2:
             simStr = utils::translate("app_settings_network_sim2");
             break;
+        case Store::GSM::SelectedSIM::NONE:
+            simStr      = utils::translate("app_settings_network_sim_none");
+            phoneNumber = {};
+            break;
+        }
+
+        switch (simState) {
+        case Store::GSM::SIM::SIM1:
+        case Store::GSM::SIM::SIM2:
+            optList = createListWithActiveSim(selectedSim, simStr, phoneNumber);
+            break;
+        case Store::GSM::SIM::SIM_NEED_PIN:
+        case Store::GSM::SIM::SIM_NEED_PUK:
+        case Store::GSM::SIM::SIM_LOCKED:
+            optList = createListWithBlockedSim(selectedSim, simStr);
+            break;
         case Store::GSM::SIM::NONE:
         case Store::GSM::SIM::SIM_FAIL:
         case Store::GSM::SIM::SIM_UNKNOWN:
-            simStr      = utils::translate("app_settings_network_sim_none");
-            phoneNumber = {};
+            optList = createListWithNoConnectedSim(selectedSim, simStr);
             break;
         }
 
+        navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::select));
+
+        return optList;
+    }
+
+    std::list<gui::Option> SimCardsWindow::createListWithNoConnectedSim(const Store::GSM::SelectedSIM sim,
+                                                                        const std::string &simStr)
+    {
+        std::list<gui::Option> optList;
+        optList.emplace_back(std::make_unique<gui::option::OptionSettings>(
+            utils::translate("app_settings_network_active_card") + " (" +
+                utils::translate("app_settings_network_not_connected") + ")",
+            [=](gui::Item &item) { return createSwitchSimAction(sim); },
+            [=](gui::Item &item) { return createNavBarText(item); },
+            this,
+            gui::option::SettingRightItem::Text,
+            false,
+            simStr,
+            true));
+
+        return optList;
+    }
+
+    std::list<gui::Option> SimCardsWindow::createListWithBlockedSim(const Store::GSM::SelectedSIM sim,
+                                                                    const std::string &simStr)
+    {
+        std::list<gui::Option> optList;
         optList.emplace_back(std::make_unique<gui::option::OptionSettings>(
             utils::translate("app_settings_network_active_card"),
-            [=](gui::Item &item) {
-                if (Store::GSM::SIM::SIM1 == sim) {
-                    simParams->setSim(Store::GSM::SIM::SIM2);
-                }
-                else {
-                    simParams->setSim(Store::GSM::SIM::SIM1);
-                }
+            [=](gui::Item &item) { return createSwitchSimAction(sim); },
+            [=](gui::Item &item) { return createNavBarText(item); },
+            this,
+            gui::option::SettingRightItem::Text,
+            false,
+            simStr,
+            true));
 
-                return true;
-            },
+        optList.emplace_back(std::make_unique<gui::option::OptionSettings>(
+            utils::translate("app_settings_network_unblock_card"),
             [=](gui::Item &item) {
-                if (item.focus) {
-                    this->setNavBarText(utils::translate(style::strings::common::Switch), nav_bar::Side::Center);
-                }
-                else {
-                    this->setNavBarText(utils::translate(style::strings::common::select), nav_bar::Side::Center);
-                }
+                application->getSimLockSubject().unblockSim();
                 return true;
             },
+            nullptr,
+            nullptr,
+            gui::option::SettingRightItem::ArrowWhite));
+
+        return optList;
+    }
+
+    std::list<gui::Option> SimCardsWindow::createListWithActiveSim(const Store::GSM::SelectedSIM sim,
+                                                                   const std::string &simStr,
+                                                                   const std::string &phoneNumber)
+    {
+        std::list<gui::Option> optList;
+        optList.emplace_back(std::make_unique<gui::option::OptionSettings>(
+            utils::translate("app_settings_network_active_card"),
+            [=](gui::Item &item) { return createSwitchSimAction(sim); },
+            [=](gui::Item &item) { return createNavBarText(item); },
             this,
             gui::option::SettingRightItem::Text,
             false,
@@ -92,8 +145,20 @@ namespace gui
             nullptr,
             gui::option::SettingRightItem::ArrowWhite));
 
-        navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::select));
-
         return optList;
     }
+
+    bool SimCardsWindow::createSwitchSimAction(const Store::GSM::SelectedSIM selectedSim) const
+    {
+        selectedSim == Store::GSM::SelectedSIM::SIM1 ? simParams->setSelectedSim(Store::GSM::SelectedSIM::SIM2)
+                                                     : simParams->setSelectedSim(Store::GSM::SelectedSIM::SIM1);
+        return true;
+    }
+
+    bool SimCardsWindow::createNavBarText(const gui::Item &item)
+    {
+        item.focus ? this->setNavBarText(utils::translate(style::strings::common::Switch), nav_bar::Side::Center)
+                   : this->setNavBarText(utils::translate(style::strings::common::select), nav_bar::Side::Center);
+        return true;
+    }
 } // namespace gui
diff --git a/module-apps/application-settings/windows/network/SimCardsWindow.hpp b/module-apps/application-settings/windows/network/SimCardsWindow.hpp
index 3ef94b23efb389503529e8efd529937dd90dab8a..20a22913e5bb7136209656edd919b0b98b4ea1b2 100644
--- a/module-apps/application-settings/windows/network/SimCardsWindow.hpp
+++ b/module-apps/application-settings/windows/network/SimCardsWindow.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <application-settings/windows/BaseSettingsWindow.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 
 namespace app::settingsInterface
 {
@@ -18,6 +19,15 @@ namespace gui
         auto buildOptionsList() -> std::list<Option> override;
         app::settingsInterface::SimParams *simParams;
 
+        std::list<gui::Option> createListWithNoConnectedSim(const Store::GSM::SelectedSIM sim,
+                                                            const std::string &simStr);
+        std::list<gui::Option> createListWithBlockedSim(const Store::GSM::SelectedSIM sim, const std::string &simStr);
+        std::list<gui::Option> createListWithActiveSim(const Store::GSM::SelectedSIM sim,
+                                                       const std::string &simStr,
+                                                       const std::string &phoneNumber);
+        bool createSwitchSimAction(const Store::GSM::SelectedSIM selectedSim) const;
+        bool createNavBarText(const gui::Item &item);
+
       public:
         SimCardsWindow(app::ApplicationCommon *app, app::settingsInterface::SimParams *simParams);
 
diff --git a/module-apps/apps-common/locks/data/SimLockMessages.hpp b/module-apps/apps-common/locks/data/SimLockMessages.hpp
index 1e995eb2459a42b42c6d7f1998787cff7d2615a6..22d00ca633488b1b9cb027d98dbaaa68c84d6fc0 100644
--- a/module-apps/apps-common/locks/data/SimLockMessages.hpp
+++ b/module-apps/apps-common/locks/data/SimLockMessages.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -50,4 +50,7 @@ namespace locks
     class ResetSimLockState : public sys::DataMessage
     {};
 
+    class UnblockSim : public sys::DataMessage
+    {};
+
 } // namespace locks
diff --git a/module-apps/apps-common/locks/handlers/SimLockHandler.cpp b/module-apps/apps-common/locks/handlers/SimLockHandler.cpp
index e2fcbc1304d87f960b35d397c29943d6f6405ce0..bf14526ba7e035b98225707c7d77b139c1fb498f 100644
--- a/module-apps/apps-common/locks/handlers/SimLockHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/SimLockHandler.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SimLockHandler.hpp"
@@ -85,21 +85,21 @@ namespace locks
 
     void SimLockHandler::getSettingsSimSelect(const std::string &settingsSim)
     {
-        auto selectedSim = magic_enum::enum_cast<Store::GSM::SIM>(settingsSim);
+        auto selectedSim = magic_enum::enum_cast<Store::GSM::SelectedSIM>(settingsSim);
 
-        if (selectedSim.has_value() &&
-            (selectedSim.value() == Store::GSM::SIM::SIM1 || selectedSim.value() == Store::GSM::SIM::SIM2)) {
+        if (selectedSim.has_value() && (selectedSim.value() == Store::GSM::SelectedSIM::SIM1 ||
+                                        selectedSim.value() == Store::GSM::SelectedSIM::SIM2)) {
             setSim(static_cast<cellular::api::SimSlot>(selectedSim.value()));
         }
         else {
-            Store::GSM::get()->selected = Store::GSM::SIM::NONE;
+            Store::GSM::get()->selected = Store::GSM::SelectedSIM::NONE;
         }
     }
 
     void SimLockHandler::setSim(cellular::api::SimSlot simSlot)
     {
         if (simReady) {
-            Store::GSM::get()->selected = static_cast<Store::GSM::SIM>(simSlot);
+            Store::GSM::get()->selected = static_cast<Store::GSM::SelectedSIM>(simSlot);
             owner->bus.sendUnicast<cellular::msg::request::sim::SetActiveSim>(simSlot);
         }
         else {
@@ -348,8 +348,12 @@ namespace locks
         if (!simUnlockingNeeded_) {
             return sys::msgNotHandled();
         }
-
         simUnlockingNeeded_ = false;
+        return handleSimUnlockRequest();
+    }
+
+    sys::MessagePointer SimLockHandler::handleSimUnlockRequest()
+    {
         switch (simInputTypeAction) {
         case SimInputTypeAction::UnlockWithPin:
             return handleSimPinRequest(lock.getAttemptsLeft());
@@ -396,14 +400,14 @@ namespace locks
 
     sys::MessagePointer SimLockHandler::enableSimPin(LockInput pinInputData)
     {
-        owner->bus.sendUnicast<cellular::msg::request::sim::SetPinLock>(cellular::api::SimLockState::Enabled,
+        owner->bus.sendUnicast<cellular::msg::request::sim::SetPinLock>(cellular::api::SimPinState::Enabled,
                                                                         pinInputData);
         return sys::msgHandled();
     }
 
     sys::MessagePointer SimLockHandler::disableSimPin(LockInput pinInputData)
     {
-        owner->bus.sendUnicast<cellular::msg::request::sim::SetPinLock>(cellular::api::SimLockState::Disabled,
+        owner->bus.sendUnicast<cellular::msg::request::sim::SetPinLock>(cellular::api::SimPinState::Disabled,
                                                                         pinInputData);
         return sys::msgHandled();
     }
diff --git a/module-apps/apps-common/locks/handlers/SimLockHandler.hpp b/module-apps/apps-common/locks/handlers/SimLockHandler.hpp
index 7a7324afe5d14ce6da20fad44f2f0c6845353c75..f1dc7acf074781749618b39cef9506f15df749d0 100644
--- a/module-apps/apps-common/locks/handlers/SimLockHandler.hpp
+++ b/module-apps/apps-common/locks/handlers/SimLockHandler.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -70,6 +70,7 @@ namespace locks
         sys::MessagePointer handleSimReadyMessage();
         sys::MessagePointer handleSimNotInsertedMessage();
         sys::MessagePointer handleSimNotRespondingMessage();
+        sys::MessagePointer handleSimUnlockRequest();
 
         void getSettingsSimSelect(const std::string &settingsSim);
         void setSim(cellular::api::SimSlot simSlot);
diff --git a/module-apps/apps-common/locks/handlers/SimLockSubject.cpp b/module-apps/apps-common/locks/handlers/SimLockSubject.cpp
index 69f4e88e05fd9f54e7c5efe1cd07558edd4bbdcc..18b248ff285b526a02096a7be72b97112f31aa5e 100644
--- a/module-apps/apps-common/locks/handlers/SimLockSubject.cpp
+++ b/module-apps/apps-common/locks/handlers/SimLockSubject.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SimLockSubject.hpp"
@@ -45,4 +45,9 @@ namespace locks
     {
         owner->bus.sendUnicast(std::make_shared<UnLockSimInput>(inputData), service::name::appmgr);
     }
+
+    void SimLockSubject::unblockSim()
+    {
+        owner->bus.sendUnicast(std::make_shared<UnblockSim>(), service::name::appmgr);
+    }
 } // namespace locks
diff --git a/module-apps/apps-common/locks/handlers/SimLockSubject.hpp b/module-apps/apps-common/locks/handlers/SimLockSubject.hpp
index d91cc55fdb5ee22108eb1d328aee82ffc5211753..0e8eecbec1f8da4b8419ad0c476d46d677fe854d 100644
--- a/module-apps/apps-common/locks/handlers/SimLockSubject.hpp
+++ b/module-apps/apps-common/locks/handlers/SimLockSubject.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -24,6 +24,7 @@ namespace locks
         void enableSimPin();
         void disableSimPin();
         void verifyInput(LockInput inputData);
+        void unblockSim();
     };
 
 } // namespace locks
diff --git a/module-gui/gui/widgets/status-bar/SIM.cpp b/module-gui/gui/widgets/status-bar/SIM.cpp
index 4ef43346e0759becd8a280746f108c6ed3c3a600..5f6f16baffc0b8aa5a83c103e01815cf0e4ef660 100644
--- a/module-gui/gui/widgets/status-bar/SIM.cpp
+++ b/module-gui/gui/widgets/status-bar/SIM.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SIM.hpp"
@@ -31,6 +31,12 @@ namespace gui::status_bar
             [[fallthrough]];
         case GSM::SIM::NONE:
             [[fallthrough]];
+        case GSM::SIM::SIM_NEED_PIN:
+            [[fallthrough]];
+        case GSM::SIM::SIM_NEED_PUK:
+            [[fallthrough]];
+        case GSM::SIM::SIM_LOCKED:
+            [[fallthrough]];
         case GSM::SIM::SIM_UNKNOWN:
             set(no_sim, style::status_bar::imageTypeSpecifier);
             break;
diff --git a/module-services/service-cellular/include/service-cellular/api/common.hpp b/module-services/service-cellular/include/service-cellular/api/common.hpp
index 7ce48d6650879c8eddacbc94cf0f2cc05c650320..c3a5ba25e248d9797d621c06147924b0a6f724e2 100644
--- a/module-services/service-cellular/include/service-cellular/api/common.hpp
+++ b/module-services/service-cellular/include/service-cellular/api/common.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -22,7 +22,7 @@ namespace cellular
             Emergency
         };
 
-        enum class SimLockState
+        enum class SimPinState
         {
             Enabled,
             Disabled
diff --git a/module-services/service-cellular/include/service-cellular/api/request/sim.hpp b/module-services/service-cellular/include/service-cellular/api/request/sim.hpp
index 51f25d43b78cea06b286f00db2fa34ca32807a7b..71d7c64c67e889b6bf3f95405176412d415de78d 100644
--- a/module-services/service-cellular/include/service-cellular/api/request/sim.hpp
+++ b/module-services/service-cellular/include/service-cellular/api/request/sim.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -23,9 +23,9 @@ namespace cellular::msg::request::sim
         };
     };
 
-    /** Get current state of PIN lock
+    /** Get current state of settings PIN lock
      */
-    struct GetLockState : public msg::Request
+    struct GetPinSettings : public msg::Request
     {
         struct Response : public msg::Response
         {
@@ -86,16 +86,16 @@ namespace cellular::msg::request::sim
      */
     struct SetPinLock : msg::Request
     {
-        explicit SetPinLock(api::SimLockState lock, const api::SimCode &pin) : lock(lock), pin(pin)
+        explicit SetPinLock(api::SimPinState pinLock, const api::SimCode &pin) : pinLock(pinLock), pin(pin)
         {}
-        const api::SimLockState lock;
+        const api::SimPinState pinLock;
         const api::SimCode pin;
 
         struct Response : msg::Response
         {
-            explicit Response(bool retCode, api::SimLockState lock) : msg::Response(retCode), lock(lock)
+            explicit Response(bool retCode, api::SimPinState pinLock) : msg::Response(retCode), pinLock(pinLock)
             {}
-            const api::SimLockState lock;
+            const api::SimPinState pinLock;
         };
     };
 } // namespace cellular::msg::request::sim
diff --git a/module-services/service-cellular/src/ServiceCellularPriv.cpp b/module-services/service-cellular/src/ServiceCellularPriv.cpp
index 07863550caf5b54894bdc597ba5fb77b80e2f3db..ba18301c45e61097cea71ddc049c692a8dc6d532 100644
--- a/module-services/service-cellular/src/ServiceCellularPriv.cpp
+++ b/module-services/service-cellular/src/ServiceCellularPriv.cpp
@@ -86,12 +86,12 @@ namespace cellular::internal
             simCard->handleSimCardSelected();
             return std::make_shared<request::sim::SetActiveSim::Response>(result);
         });
-        owner->connect(typeid(request::sim::GetLockState), [&](sys::Message *) -> sys::MessagePointer {
+        owner->connect(typeid(request::sim::GetPinSettings), [&](sys::Message *) -> sys::MessagePointer {
             if (!simCard->isSimCardInserted()) {
                 owner->bus.sendMulticast<notification::SimNotInserted>();
                 return sys::MessageNone{};
             }
-            return std::make_shared<request::sim::GetLockState::Response>(simCard->handleIsPinLocked());
+            return std::make_shared<request::sim::GetPinSettings::Response>(simCard->handleIsPinNeeded());
         });
         owner->connect(typeid(request::sim::ChangePin), [&](sys::Message *request) -> sys::MessagePointer {
             auto msg = static_cast<request::sim::ChangePin *>(request);
@@ -116,8 +116,8 @@ namespace cellular::internal
                 owner->bus.sendMulticast<notification::SimNotInserted>();
                 return sys::MessageNone{};
             }
-            return std::make_shared<request::sim::SetPinLock::Response>(simCard->handleSetPinLock(msg->pin, msg->lock),
-                                                                        msg->lock);
+            return std::make_shared<request::sim::SetPinLock::Response>(
+                simCard->handleSetPinLock(msg->pin, msg->pinLock), msg->pinLock);
         });
         owner->connect(typeid(request::sim::PinUnlock), [&](sys::Message *request) -> sys::MessagePointer {
             auto msg = static_cast<request::sim::PinUnlock *>(request);
diff --git a/module-services/service-cellular/src/SimCard.cpp b/module-services/service-cellular/src/SimCard.cpp
index 7c5152ae31ac3d85c1e0e3c815f55278c702523d..d0cacd27fc17142ea14d53e6a821467ff3e13ec6 100644
--- a/module-services/service-cellular/src/SimCard.cpp
+++ b/module-services/service-cellular/src/SimCard.cpp
@@ -49,9 +49,9 @@ namespace cellular
         bool SimCard::initialized() const
         {
             return (Store::GSM::get()->sim == Store::GSM::SIM::SIM1 &&
-                    Store::GSM::get()->selected == Store::GSM::SIM::SIM1) ||
+                    Store::GSM::get()->selected == Store::GSM::SelectedSIM::SIM1) ||
                    (Store::GSM::get()->sim == Store::GSM::SIM::SIM2 &&
-                    Store::GSM::get()->selected == Store::GSM::SIM::SIM2);
+                    Store::GSM::get()->selected == Store::GSM::SelectedSIM::SIM2);
         }
 
         void SimCard::setChannel(at::BaseChannel *channel)
@@ -61,7 +61,8 @@ namespace cellular
 
         bool SimCard::handleSetActiveSim(api::SimSlot sim)
         {
-            Store::GSM::get()->selected = static_cast<Store::GSM::SIM>(sim);
+            Store::GSM::get()->selected =
+                sim == api::SimSlot::SIM1 ? Store::GSM::SelectedSIM::SIM1 : Store::GSM::SelectedSIM::SIM2;
             bsp::cellular::sim::simSelect();
             bsp::cellular::sim::hotSwapTrigger();
             clearSimInsertedStatus();
@@ -69,9 +70,9 @@ namespace cellular
             return true;
         }
 
-        bool SimCard::handleIsPinLocked() const
+        bool SimCard::handleIsPinNeeded() const
         {
-            return isPinLocked();
+            return isPinNeeded();
         }
 
         bool SimCard::handleChangePin(const api::SimCode &oldPin, const api::SimCode &pin)
@@ -88,10 +89,10 @@ namespace cellular
             return processPinResult(supplyPuk(_puk, _pin));
         }
 
-        bool SimCard::handleSetPinLock(const api::SimCode &pin, api::SimLockState lock)
+        bool SimCard::handleSetPinLock(const api::SimCode &pin, api::SimPinState pinLock)
         {
             const auto _pin = internal::simCodeToString(pin);
-            return processPinResult(setPinLock(_pin, lock == cellular::api::SimLockState::Enabled));
+            return processPinResult(setPinLock(_pin, pinLock == cellular::api::SimPinState::Enabled));
         }
 
         bool SimCard::handlePinUnlock(const api::SimCode &pin)
@@ -131,7 +132,18 @@ namespace cellular
             switch (state) {
             case at::SimState::Ready:
                 if (initSimCard()) {
-                    Store::GSM::get()->sim = Store::GSM::get()->selected;
+                    switch (Store::GSM::get()->selected) {
+                    case Store::GSM::SelectedSIM::SIM1:
+                        Store::GSM::get()->sim = Store::GSM::SIM::SIM1;
+                        break;
+                    case Store::GSM::SelectedSIM::SIM2:
+                        Store::GSM::get()->sim = Store::GSM::SIM::SIM2;
+                        break;
+                    case Store::GSM::SelectedSIM::NONE:
+                        Store::GSM::get()->sim = Store::GSM::SIM::NONE;
+                        break;
+                    }
+
                     if (onSimReady)
                         onSimReady();
                 }
@@ -146,6 +158,7 @@ namespace cellular
             case at::SimState::SimPin:
                 [[fallthrough]];
             case at::SimState::SimPin2: {
+                Store::GSM::get()->sim = Store::GSM::SIM::SIM_NEED_PIN;
                 if (auto pc = getAttemptsCounters(state == at::SimState::SimPin ? sim::Pin::PIN1 : sim::Pin::PIN2);
                     pc) {
                     if (pc.value().PukCounter != 0) {
@@ -161,6 +174,7 @@ namespace cellular
             case at::SimState::SimPuk:
                 [[fallthrough]];
             case at::SimState::SimPuk2: {
+                Store::GSM::get()->sim = Store::GSM::SIM::SIM_NEED_PUK;
                 if (auto pc = getAttemptsCounters(state == at::SimState::SimPuk ? sim::Pin::PIN1 : sim::Pin::PIN2);
                     pc) {
                     if (pc.value().PukCounter != 0) {
@@ -174,7 +188,7 @@ namespace cellular
                 break;
             }
             case at::SimState::Locked:
-                Store::GSM::get()->sim = Store::GSM::SIM::SIM_FAIL;
+                Store::GSM::get()->sim = Store::GSM::SIM::SIM_LOCKED;
                 if (onSimBlocked)
                     onSimBlocked();
                 break;
@@ -262,7 +276,7 @@ namespace cellular
                                at::factory(at::AT::CLCK) + "\"SC\"," + (lock ? "1" : "0") + ",\"" + pin + "\"");
         }
 
-        bool SimCard::isPinLocked() const
+        bool SimCard::isPinNeeded() const
         {
             auto resp = channel->cmd(at::factory(at::AT::CLCK) + "\"SC\",2\r");
             int val   = 0;
diff --git a/module-services/service-cellular/src/SimCard.hpp b/module-services/service-cellular/src/SimCard.hpp
index 5d2d62afc2e17cae9c2efde8a3bb1875ae3fd282..0af558ef36de6d22b170eff5c85148c5c62adbac 100644
--- a/module-services/service-cellular/src/SimCard.hpp
+++ b/module-services/service-cellular/src/SimCard.hpp
@@ -84,10 +84,10 @@ namespace cellular::service
          * Request message handlers
          */
         bool handleSetActiveSim(api::SimSlot sim);
-        bool handleIsPinLocked() const;
+        bool handleIsPinNeeded() const;
         bool handleChangePin(const api::SimCode &old_pin, const api::SimCode &pin);
         bool handleUnblockWithPuk(const api::SimCode &puk, const api::SimCode &pin);
-        bool handleSetPinLock(const api::SimCode &pin, api::SimLockState lock);
+        bool handleSetPinLock(const api::SimCode &pin, api::SimPinState pinLock);
         bool handlePinUnlock(const api::SimCode &pin);
 
         /**
@@ -173,6 +173,11 @@ namespace cellular::service
         {
             return isSimSelected;
         }
+
+        /** Read internal SIM state using CPIN AT commands
+         */
+        std::optional<at::SimState> simState() const;
+
         /**
          * Notification events
          */
@@ -229,11 +234,7 @@ namespace cellular::service
         /** Check whether the pin needs to be provided, only for standard pin.
          * \return true if need pin to unlock SIM card functionality
          */
-        bool isPinLocked() const;
-
-        /** Read internal SIM state using CPIN AT commands
-         */
-        std::optional<at::SimState> simState() const;
+        bool isPinNeeded() const;
 
         /** Process sim::Result from PIN lock/unlock operations
          * \param result result from operation (`sendCommand()`)
diff --git a/module-utils/EventStore/EventStore.hpp b/module-utils/EventStore/EventStore.hpp
index 19cdb822b7662c48d8c804e6f9e70a1b0d32b62a..9eed2a8036bd60e0352c8ffdae72e99c78dd4274 100644
--- a/module-utils/EventStore/EventStore.hpp
+++ b/module-utils/EventStore/EventStore.hpp
@@ -141,11 +141,20 @@ namespace Store
         {
             SIM1 = static_cast<int>(hal::cellular::SimSlot::SIM1),
             SIM2 = static_cast<int>(hal::cellular::SimSlot::SIM2),
+            SIM_NEED_PIN,
+            SIM_NEED_PUK,
+            SIM_LOCKED,
             SIM_FAIL,
             SIM_UNKNOWN,
             NONE,
-        } sim      = SIM::SIM_UNKNOWN,
-          selected = SIM::SIM1;
+        } sim = SIM::SIM_UNKNOWN;
+
+        enum class SelectedSIM
+        {
+            SIM1 = static_cast<int>(SIM::SIM1),
+            SIM2 = static_cast<int>(SIM::SIM2),
+            NONE,
+        } selected = SelectedSIM::SIM1;
 
         bool simCardInserted();
 
diff --git a/products/PurePhone/services/appmgr/ApplicationManager.cpp b/products/PurePhone/services/appmgr/ApplicationManager.cpp
index 3219ede267aff55097594a1bd04fefde45396221..661a024442e56b75969fba19d8b19c4994968311 100644
--- a/products/PurePhone/services/appmgr/ApplicationManager.cpp
+++ b/products/PurePhone/services/appmgr/ApplicationManager.cpp
@@ -248,6 +248,8 @@ namespace app::manager
         connect(typeid(locks::ResetSimLockState), [&](sys::Message *request) -> sys::MessagePointer {
             return simLockHandler.handleResetSimLockStateRequest();
         });
+        connect(typeid(locks::UnblockSim),
+                [&](sys::Message *request) -> sys::MessagePointer { return simLockHandler.handleSimUnlockRequest(); });
         connect(typeid(cellular::msg::notification::SimNeedPuk), [&](sys::Message *request) -> sys::MessagePointer {
             auto data = static_cast<cellular::msg::notification::SimNeedPuk *>(request);
             if (phoneLockHandler.isPhoneLocked()) {
@@ -289,7 +291,7 @@ namespace app::manager
                         return simLockHandler.handleSimPinLockStateMessage();
                     }
                     else {
-                        if (data->lock == cellular::api::SimLockState::Enabled) {
+                        if (data->pinLock == cellular::api::SimPinState::Enabled) {
                             return simLockHandler.handleSimPinLockEnableRequest();
                         }
                         else {
diff --git a/products/PurePhone/sys/SystemManager.cpp b/products/PurePhone/sys/SystemManager.cpp
index 904773e0e5ba0cc3255c3d66e289dddb1335e230..fcac42928f89ea5a682d3cefa671714e6017c5a4 100644
--- a/products/PurePhone/sys/SystemManager.cpp
+++ b/products/PurePhone/sys/SystemManager.cpp
@@ -32,7 +32,8 @@ namespace sys
     {
         auto activeSimSelected = []() {
             const auto storeGsm = Store::GSM::get();
-            return ((storeGsm->selected == Store::GSM::SIM::SIM1 || storeGsm->selected == Store::GSM::SIM::SIM2) &&
+            return ((storeGsm->selected == Store::GSM::SelectedSIM::SIM1 ||
+                     storeGsm->selected == Store::GSM::SelectedSIM::SIM2) &&
                     storeGsm->simCardInserted());
         };
         auto isCallOngoing = [this]() {
diff --git a/pure_changelog.md b/pure_changelog.md
index c81fb7907df40c90aae98a98d5fe3dddbd370a71..c7495883cdd0a7aa6d46eea7e709415e5dba57e7 100644
--- a/pure_changelog.md
+++ b/pure_changelog.md
@@ -10,6 +10,7 @@
 * Improve refreshing of the display.
 * Fixed music files extension case sensitivity
 * Fixed MTP issues
+* Rebuilt SIM cards window
 
 ### Fixed
 * Fixed incorrect total CPU usage in logs