From 9423168aaf836b376783692941e6e9bcf5b2f042 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Mon, 30 Oct 2023 15:17:01 +0100
Subject: [PATCH] configpanels: fix app `is_default` + dns alert style

---
 src/app.py | 6 ++++--
 src/dns.py | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app.py b/src/app.py
index 21219b2ce..52e1ebede 100644
--- a/src/app.py
+++ b/src/app.py
@@ -26,7 +26,6 @@ import re
 import subprocess
 import tempfile
 import copy
-from collections import OrderedDict
 from typing import TYPE_CHECKING, List, Tuple, Dict, Any, Iterator, Optional, Union
 from packaging import version
 from logging import getLogger
@@ -129,6 +128,7 @@ def app_info(app, full=False, upgradable=False):
     """
     Get info for a specific app
     """
+    from yunohost.domain import domain_config_get
     from yunohost.permission import user_permission_list
 
     _assert_is_installed(app)
@@ -228,7 +228,9 @@ def app_info(app, full=False, upgradable=False):
     ret["is_webapp"] = "domain" in settings and "path" in settings
 
     if ret["is_webapp"]:
-        ret["is_default"] = settings.get("default_app", "_none")
+        ret["is_default"] = (
+            domain_config_get(settings["domain"], "feature.app.default_app") == app
+        )
 
     ret["supports_change_url"] = os.path.exists(
         os.path.join(setting_path, "scripts", "change_url")
diff --git a/src/dns.py b/src/dns.py
index fc4b26a75..126f81dbf 100644
--- a/src/dns.py
+++ b/src/dns.py
@@ -558,6 +558,7 @@ def _get_registrar_config_section(domain):
     except ValueError:
         registrar_infos["registrar"]["default"] = None
         registrar_infos["infos"]["ask"] = m18n.n("domain_dns_registrar_not_supported")
+        registrar_infos["infos"]["style"] = "warning"
     else:
         registrar_infos["registrar"]["default"] = registrar
         registrar_infos["infos"]["ask"] = m18n.n(