Merge branch 'develop' into release and bump version in package.jsonv6.2.5-beta.1

3 files changed, 6 insertions, 3 deletions

diff --git a/src/webview/darkmode.ts b/src/webview/darkmode.ts
index 34f987b51..9944a7afa 100644
--- a/src/webview/darkmode.ts
+++ b/src/webview/darkmode.ts
@@ -19,10 +19,12 @@ export function darkModeStyleExists(recipePath: string) {
 
 export function injectDarkModeStyle(recipePath: string) {
   if (darkModeStyleExists(recipePath)) {
-    const data = readFileSync(darkModeFilePath(recipePath));
+    const darkmodeCss = darkModeFilePath(recipePath);
+    const data = readFileSync(darkmodeCss);
     const styles = document.createElement('style');
     styles.id = ID;
     styles.innerHTML = data.toString();
+    debug('Loaded darkmode.css from: ', darkmodeCss);
 
     document.querySelector('head')?.appendChild(styles);
 
diff --git a/src/webview/notifications.ts b/src/webview/notifications.ts
index 8b2831754..7f6ce01fd 100644
--- a/src/webview/notifications.ts
+++ b/src/webview/notifications.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron';
 
-import { v1 as uuidV1 } from 'uuid';
+import { v4 as uuidV4 } from 'uuid';
 
 const debug = require('../preload-safe-debug')('Ferdium:Notifications');
 
@@ -12,7 +12,7 @@ export class NotificationsHandler {
     return new Promise(resolve => {
       debug('New notification', title, options);
 
-      const notificationId = uuidV1();
+      const notificationId = uuidV4();
 
       ipcRenderer.sendToHost(
         'notification',
diff --git a/src/webview/recipe.ts b/src/webview/recipe.ts
index ed45192d3..36b8b7c98 100644
--- a/src/webview/recipe.ts
+++ b/src/webview/recipe.ts
@@ -265,6 +265,7 @@ class RecipeController {
     if (pathExistsSync(userCss)) {
       const data = readFileSync(userCss);
       styles.innerHTML += data.toString();
+      debug('Loaded user.css from: ', userCss);
     }
     document.querySelector('head')?.append(styles);