fix: fixed country model update

client/core/controllers/coreSignalHandlers.cpp

@@ -33,7 +33,6 @@
 #include "core/controllers/connectionController.h"
 #include "ui/models/clientManagementModel.h"
 #include "ui/controllers/api/apiNewsUiController.h"
-#include "ui/models/api/apiCountryModel.h"
 #include "ui/models/containersModel.h"
 #include "core/utils/containerEnum.h"
 
@@ -177,16 +176,13 @@ void CoreSignalHandlers::initApiCountryModelUpdateHandler()
             return;
         }
 
-        QJsonArray availableCountries;
-        QString serverCountryCode;
-
         const auto apiV2 = m_coreController->m_serversRepository->apiV2Config(processedServerId);
-        if (apiV2.has_value()) {
+        if (!apiV2.has_value()) {
-            availableCountries = apiV2->apiConfig.availableCountries;
+            return;
-            serverCountryCode = apiV2->apiConfig.serverCountryCode;
         }
 
-        m_coreController->m_apiCountryModel->updateModel(availableCountries, serverCountryCode);
+        m_coreController->m_apiCountryModel->updateModel(apiV2->apiConfig.availableCountries,
+                                                           apiV2->apiConfig.serverCountryCode);
     });
 }
 

client/ui/controllers/serversUiController.cpp

@@ -156,7 +156,17 @@ void ServersUiController::updateModel()
 
     m_serversModel->updateModel(m_orderedServerDescriptions, defaultServerId);
 
-    updateContainersModel();
+    if (!m_processedServerId.isEmpty()) {
+        if (isServerFromApi(m_processedServerId)) {
+            const auto &description = serverDescriptionById(m_processedServerId);
+            if (description.isApiV2 && description.isCountrySelectionAvailable
+                && !description.apiAvailableCountries.isEmpty()) {
+                emit updateApiCountryModel();
+            }
+        } else {
+            updateContainersModel();
+        }
+    }
     updateDefaultServerContainersModel();
 
     if (hadServersFromGatewayBefore != hasServersFromGatewayNow) {
@@ -350,19 +360,14 @@ void ServersUiController::setProcessedServerId(const QString &serverId)
         m_processedServerId = normalizedServerId;
 
         if (newIndex >= 0) {
-            updateContainersModel();
+            if (isServerFromApi(m_processedServerId)) {
-
+                const auto &description = serverDescriptionById(m_processedServerId);
-            for (const auto &description : m_orderedServerDescriptions) {
+                if (description.isApiV2 && description.isCountrySelectionAvailable
-                if (description.serverId != normalizedServerId) {
+                    && !description.apiAvailableCountries.isEmpty()) {
-                    continue;
+                    emit updateApiCountryModel();
                 }
-                if (description.isApiV2) {
+            } else {
-                    if (description.isCountrySelectionAvailable && !description.apiAvailableCountries.isEmpty()) {
+                updateContainersModel();
-                        emit updateApiCountryModel();
-                    }
-                    emit updateApiServicesModel();
-                }
-                break;
             }
         }
 

client/ui/controllers/serversUiController.h

@@ -113,7 +113,6 @@ signals:
     void processedContainerIndexChanged(int index);
     void hasServersFromGatewayApiChanged();
     void updateApiCountryModel();
-    void updateApiServicesModel();
 
 public:
     void updateModel();

client/ui/qml/Pages2/PageSettingsApiAvailableCountries.qml

@@ -83,7 +83,7 @@ PageType {
 
         model: ApiCountryModel
 
-        currentIndex: 0
+        currentIndex: ApiCountryModel.currentIndex
 
         ButtonGroup {
             id: containersRadioButtonGroup