From 0846c2c822eec75eb68fa2a705fef725b25a2153 Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <acoroiu@bitwarden.com>
Date: Tue, 1 Oct 2024 13:39:36 +0200
Subject: [PATCH] [PM-11780] Resolve TypeScript 5.3 compile error

---
 ...rowser-api.register-content-scripts-polyfill.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/platform/browser/browser-api.register-content-scripts-polyfill.ts b/apps/browser/src/platform/browser/browser-api.register-content-scripts-polyfill.ts
index 8a20f3e999..b0dc60ed12 100644
--- a/apps/browser/src/platform/browser/browser-api.register-content-scripts-polyfill.ts
+++ b/apps/browser/src/platform/browser/browser-api.register-content-scripts-polyfill.ts
@@ -43,17 +43,23 @@ function buildRegisterContentScriptsPolyfill() {
   function NestedProxy<T extends object>(target: T): T {
     return new Proxy(target, {
       get(target, prop) {
-        if (!target[prop as keyof T]) {
+        const propertyValue = target[prop as keyof T];
+
+        if (!propertyValue) {
           return;
         }
 
-        if (typeof target[prop as keyof T] !== "function") {
-          return NestedProxy(target[prop as keyof T]);
+        if (typeof propertyValue === "object") {
+          return NestedProxy<typeof propertyValue>(propertyValue);
+        }
+
+        if (typeof propertyValue !== "function") {
+          return propertyValue;
         }
 
         return (...arguments_: any[]) =>
           new Promise((resolve, reject) => {
-            target[prop as keyof T](...arguments_, (result: any) => {
+            propertyValue(...arguments_, (result: any) => {
               if (chrome.runtime.lastError) {
                 reject(new Error(chrome.runtime.lastError.message));
               } else {