Merge pull request #16405 from vector-im/jryans/electron-type-merge

Fix Electron type merging

src/@types/global.d.ts

@@ -39,18 +39,20 @@ declare global {
         matrixChat: ReturnType<Renderer>;
 
         // electron-only
-        electron: {
+        electron?: Electron;
-            on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
-            send(channel: ElectronChannel, ...args: any[]): void;
-        }
 
         // opera-only
-        opera: any;
+        opera?: any;
 
         // https://developer.mozilla.org/en-US/docs/Web/API/InstallTrigger
         InstallTrigger: any;
     }
 
+    interface Electron {
+        on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
+        send(channel: ElectronChannel, ...args: any[]): void;
+    }
+
     interface Navigator {
         // PWA badging extensions https://w3c.github.io/badging/
         setAppBadge?(count: number): Promise<void>;