diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 57c6b19600..cf3ff53b30 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -326,6 +326,7 @@ module.exports = {
     '@typescript-eslint/no-unnecessary-type-arguments': [0],
     '@typescript-eslint/no-unnecessary-type-assertion': [2],
     '@typescript-eslint/no-unnecessary-type-constraint': [2],
+    '@typescript-eslint/no-unnecessary-type-conversion': [2],
     '@typescript-eslint/no-unsafe-argument': [0],
     '@typescript-eslint/no-unsafe-assignment': [0],
     '@typescript-eslint/no-unsafe-call': [0],
@@ -645,7 +646,7 @@ module.exports = {
     'no-multi-str': [2],
     'no-negated-condition': [0],
     'no-nested-ternary': [0],
-    'no-new-func': [2],
+    'no-new-func': [0], // handled by @typescript-eslint/no-implied-eval
     'no-new-native-nonconstructor': [2],
     'no-new-object': [2],
     'no-new-symbol': [2],
diff --git a/web_src/js/modules/toast.ts b/web_src/js/modules/toast.ts
index ed807a4977..087103cbd8 100644
--- a/web_src/js/modules/toast.ts
+++ b/web_src/js/modules/toast.ts
@@ -44,7 +44,7 @@ type ToastifyElement = HTMLElement & {_giteaToastifyInstance?: Toast };
 
 // See https://github.com/apvarun/toastify-js#api for options
 function showToast(message: string, level: Intent, {gravity, position, duration, useHtmlBody, preventDuplicates = true, ...other}: ToastOpts = {}): Toast {
-  const body = useHtmlBody ? String(message) : htmlEscape(message);
+  const body = useHtmlBody ? message : htmlEscape(message);
   const parent = document.querySelector('.ui.dimmer.active') ?? document.body;
   const duplicateKey = preventDuplicates ? (preventDuplicates === true ? `${level}-${body}` : preventDuplicates) : '';
 
diff --git a/web_src/js/utils/dom.ts b/web_src/js/utils/dom.ts
index 9cdf6f5005..6d6a3735da 100644
--- a/web_src/js/utils/dom.ts
+++ b/web_src/js/utils/dom.ts
@@ -283,7 +283,7 @@ export function isElemVisible(el: HTMLElement): boolean {
   // This function DOESN'T account for all possible visibility scenarios, its behavior is covered by the tests of "querySingleVisibleElem"
   if (!el) return false;
   // checking el.style.display is not necessary for browsers, but it is required by some tests with happy-dom because happy-dom doesn't really do layout
-  return !el.classList.contains('tw-hidden') && Boolean((el.offsetWidth || el.offsetHeight || el.getClientRects().length) && el.style.display !== 'none');
+  return !el.classList.contains('tw-hidden') && (el.offsetWidth || el.offsetHeight || el.getClientRects().length) && el.style.display !== 'none';
 }
 
 // replace selected text in a textarea while preserving editor history, e.g. CTRL-Z works after this