From e1ba2344b7a78e516fa7e7b75a31ea8a530d42fe Mon Sep 17 00:00:00 2001
From: redphx <96280+redphx@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:52:13 +0700
Subject: [PATCH] Declare window.navigator typing

---
 src/modules/ui/dialog/settings-dialog.ts | 2 +-
 src/types/global.d.ts                    | 5 +++++
 src/utils/user-agent.ts                  | 6 +++---
 src/utils/utils.ts                       | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/modules/ui/dialog/settings-dialog.ts b/src/modules/ui/dialog/settings-dialog.ts
index 7d44676..bdf1d8d 100755
--- a/src/modules/ui/dialog/settings-dialog.ts
+++ b/src/modules/ui/dialog/settings-dialog.ts
@@ -318,7 +318,7 @@ export class SettingsDialog extends NavigationDialog {
                 pref: PrefKey.USER_AGENT_PROFILE,
                 multiLines: true,
                 onCreated: (setting, $control) => {
-                    const defaultUserAgent = (window.navigator as any).orgUserAgent || window.navigator.userAgent;
+                    const defaultUserAgent = window.navigator.orgUserAgent || window.navigator.userAgent;
 
                     const $inpCustomUserAgent = CE<HTMLInputElement>('input', {
                         type: 'text',
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 483f1ae..1d36ac2 100755
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -45,4 +45,9 @@ declare global {
         MeControl: any;
         adobe: any;
     }
+
+    interface Navigator {
+        orgUserAgent?: string;
+        orgUserAgentData?: any;
+    }
 }
diff --git a/src/utils/user-agent.ts b/src/utils/user-agent.ts
index 09542b1..49a30a3 100755
--- a/src/utils/user-agent.ts
+++ b/src/utils/user-agent.ts
@@ -59,7 +59,7 @@ export class UserAgent {
     }
 
     static getDefault(): string {
-        return (window.navigator as any).orgUserAgent || window.navigator.userAgent;
+        return window.navigator.orgUserAgent || window.navigator.userAgent;
     }
 
     static get(profile: UserAgentProfile): string {
@@ -123,12 +123,12 @@ export class UserAgent {
 
         // Clear data of navigator.userAgentData, force xCloud to detect browser based on navigator.userAgent
         if ('userAgentData' in window.navigator) {
-            (window.navigator as any).orgUserAgentData = (window.navigator as any).userAgentData;
+            window.navigator.orgUserAgentData = window.navigator.userAgentData;
             Object.defineProperty(window.navigator, 'userAgentData', {});
         }
 
         // Override navigator.userAgent
-        (window.navigator as any).orgUserAgent = window.navigator.userAgent;
+        window.navigator.orgUserAgent = window.navigator.userAgent;
         Object.defineProperty(window.navigator, 'userAgent', {
             value: newUserAgent,
         });
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 43246c6..11584fa 100755
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -44,7 +44,7 @@ export function checkForUpdate() {
  * Disable PWA requirement on Safari
  */
 export function disablePwa() {
-    const userAgent = ((window.navigator as any).orgUserAgent || window.navigator.userAgent || '').toLowerCase();
+    const userAgent = (window.navigator.orgUserAgent || window.navigator.userAgent || '').toLowerCase();
     if (!userAgent) {
         return;
     }