diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72f8f825553..8987d34cf26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
### Fixed
+- Missing "served from cache" label on long DNS server strings ([#6740]).
- Missing IP addresses in logs when querying for domain names from the ignore
lists.
- Wrong algorithm for caching bootstrapped upstream addresses ([#6723]).
@@ -74,6 +75,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6610]: https://github.com/AdguardTeam/AdGuardHome/issues/6610
[#6679]: https://github.com/AdguardTeam/AdGuardHome/issues/6679
[#6711]: https://github.com/AdguardTeam/AdGuardHome/issues/6711
+[#6740]: https://github.com/AdguardTeam/AdGuardHome/issues/6740
[go-toolchain]: https://go.dev/blog/toolchain
[go-1.21.8]: https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg
diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
index bc3e459cd7c..a25165a7cf5 100644
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -679,6 +679,7 @@
"parental_control": "Parental Control",
"safe_browsing": "Safe Browsing",
"served_from_cache": "{{value}} (served from cache)",
+ "served_from_cache_label": "Served from cache",
"form_error_password_length": "Password must be {{min}} to {{max}} characters long",
"anonymizer_notification": "<0>Note:0> IP anonymization is enabled. You can disable it in <1>General settings1>.",
"confirm_dns_cache_clear": "Are you sure you want to clear DNS cache?",
diff --git a/client/src/components/Logs/Cells/index.js b/client/src/components/Logs/Cells/index.js
index fe32b104cd9..df46a429044 100644
--- a/client/src/components/Logs/Cells/index.js
+++ b/client/src/components/Logs/Cells/index.js
@@ -118,9 +118,6 @@ const Row = memo(({
const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
const clientNameBlockingFor = getBlockingClientName(clients, client);
- const upstreamString = cached
- ? t('served_from_cache', { value: upstream, i: })
- : upstream;
const onBlockingForClientClick = () => {
dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
@@ -192,7 +189,16 @@ const Row = memo(({
className="link--green">{sourceData.name}
,
response_details: 'title',
- install_settings_dns: upstreamString,
+ install_settings_dns: upstream,
+ ...(cached
+ && {
+ served_from_cache_label: (
+
+ ),
+ }
+ ),
elapsed: formattedElapsedMs,
...(rules.length > 0
&& { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index af5ca52c2b0..9db66d38a85 100644
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -245,6 +245,10 @@ const Icons = () => (
+
+
+
+
);