From 8aefb2a1e28fcb9d5de9372e36ac789e0c9f85e6 Mon Sep 17 00:00:00 2001
From: Marius Ileana <marius.ileana@gmail.com>
Date: Sat, 17 Jan 2026 02:30:29 +0200
Subject: [PATCH] fix(cli): showDXToast on reload (#5202)

Basically, guarding the elements against nulls. It uses the most explicit and safe version of a JS implementation.

Closes #5175
---
 packages/cli/assets/web/dev.index.html     | 19 +++++++++++++------
 packages/desktop/src/assets/dev.index.html | 20 ++++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/packages/cli/assets/web/dev.index.html b/packages/cli/assets/web/dev.index.html
index baa2e9357..48d3d4614 100644
--- a/packages/cli/assets/web/dev.index.html
+++ b/packages/cli/assets/web/dev.index.html
@@ -105,13 +105,20 @@
 
             // Show a toast, removing the previous one.
             function showDXToast(headerText, message, progressLevel, durationMs) {
-                document.getElementById("__dx-toast-decor").className = `dx-toast-level-bar ${progressLevel}`;
-                document.getElementById("__dx-toast-text").innerText = headerText;
-                document.getElementById("__dx-toast-msg").innerText = message;
-                document.getElementById("__dx-toast-inner").style.right = "0";
-                document.getElementById("__dx-toast").removeAttribute("aria-hidden");
-                document.getElementById("__dx-toast").addEventListener("click", closeDXToast);
+                const decor = document.getElementById("__dx-toast-decor");
+                const text = document.getElementById("__dx-toast-text");
+                const msg = document.getElementById("__dx-toast-msg");
+                const inner = document.getElementById("__dx-toast-inner");
+                const toast = document.getElementById("__dx-toast");
 
+                if (decor) decor.className = `dx-toast-level-bar ${progressLevel}`;
+                if (text) text.innerText = headerText;
+                if (msg) msg.innerText = message;
+                if (inner) inner.style.right = "0";
+                if (toast) {
+                    toast.removeAttribute("aria-hidden");
+                    toast.addEventListener("click", closeDXToast);
+                }
 
                 // Wait a bit of time so animation plays correctly.
                 setTimeout(
diff --git a/packages/desktop/src/assets/dev.index.html b/packages/desktop/src/assets/dev.index.html
index 8322d7bcd..b51112512 100644
--- a/packages/desktop/src/assets/dev.index.html
+++ b/packages/desktop/src/assets/dev.index.html
@@ -103,12 +103,20 @@
 
             // Show a toast, removing the previous one.
             function showDXToast(headerText, message, progressLevel, durationMs) {
-                document.getElementById("__dx-toast-decor").className = `dx-toast-level-bar ${progressLevel}`;
-                document.getElementById("__dx-toast-text").innerText = headerText;
-                document.getElementById("__dx-toast-msg").innerText = message;
-                document.getElementById("__dx-toast-inner").style.right = "0";
-                document.getElementById("__dx-toast").removeAttribute("aria-hidden");
-                document.getElementById("__dx-toast").addEventListener("click", closeDXToast);
+                const decor = document.getElementById("__dx-toast-decor");
+                const text = document.getElementById("__dx-toast-text");
+                const msg = document.getElementById("__dx-toast-msg");
+                const inner = document.getElementById("__dx-toast-inner");
+                const toast = document.getElementById("__dx-toast");
+
+                if (decor) decor.className = `dx-toast-level-bar ${progressLevel}`;
+                if (text) text.innerText = headerText;
+                if (msg) msg.innerText = message;
+                if (inner) inner.style.right = "0";
+                if (toast) {
+                    toast.removeAttribute("aria-hidden");
+                    toast.addEventListener("click", closeDXToast);
+                }
 
 
                 // Wait a bit of time so animation plays correctly.