From 2524f83079d6f06175e527d46eccbff59c1c3d34 Mon Sep 17 00:00:00 2001
From: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
Date: Tue, 26 May 2026 06:45:19 -0700
Subject: [PATCH] Fix type errors and disable typescript incremental mode

---
 .github/workflows/ci.yml          | 14 -------------
 ts/components/Preferences.dom.tsx | 12 ++++++++---
 ts/types/Storage.d.ts             |  8 ++++----
 ts/window.d.ts                    | 33 ++++++++++++++-----------------
 tsconfig.json                     |  2 +-
 5 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cdfc764d..fccd2e183 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,13 +42,6 @@ jobs:
     #     path: ${{ env.SCCACHE_PATH }}
     #     key: sccache-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml', 'patches/**') }}
 
-    - name: Restore cached tsconfig.tsbuildinfo
-      uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
-      id: cache-lint
-      with:
-        path: tsconfig.tsbuildinfo
-        key: lint-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml', 'patches/**', 'tsconfig.json') }}
-
     - name: Install Desktop node_modules
       run: pnpm install
       env:
@@ -84,13 +77,6 @@ jobs:
 
     - run: git diff --exit-code
 
-    - name: Update cached tsconfig.tsbuildinfo
-      uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
-      if: github.ref == 'refs/heads/main'
-      with:
-        path: tsconfig.tsbuildinfo
-        key: ${{ steps.cache-lint.outputs.cache-primary-key }}
-
   macos:
     name: MacOS
     needs: lint
diff --git a/ts/components/Preferences.dom.tsx b/ts/components/Preferences.dom.tsx
index 7fd5fed7d..0aa531e15 100644
--- a/ts/components/Preferences.dom.tsx
+++ b/ts/components/Preferences.dom.tsx
@@ -1108,7 +1108,9 @@ export function Preferences({
             <Select
               id={themeSelectId}
               disabled={themeSetting === undefined}
-              onChange={onThemeChange}
+              onChange={value => {
+                onThemeChange(value as ThemeType);
+              }}
               options={[
                 {
                   text: i18n('icu:themeSystem'),
@@ -1579,7 +1581,9 @@ export function Preferences({
               <Select
                 ariaLabel={i18n('icu:Preferences--notification-content')}
                 disabled={!hasNotifications}
-                onChange={onNotificationContentChange}
+                onChange={value => {
+                  onNotificationContentChange(value as NotificationSettingType);
+                }}
                 options={[
                   {
                     text: i18n('icu:nameAndMessage'),
@@ -2158,7 +2162,9 @@ export function Preferences({
               )}
             >
               <Select
-                onChange={onSentMediaQualityChange}
+                onChange={value => {
+                  onSentMediaQualityChange(value as SentMediaQualityType);
+                }}
                 options={[
                   {
                     text: i18n('icu:sentMediaQualityStandard'),
diff --git a/ts/types/Storage.d.ts b/ts/types/Storage.d.ts
index f0151733d..ceaa22208 100644
--- a/ts/types/Storage.d.ts
+++ b/ts/types/Storage.d.ts
@@ -8,13 +8,13 @@ export type { StorageAccessType } from './StorageKeys.std.ts';
 export type StorageInterface = {
   onready: (callback: () => void) => void;
 
-  get: <K extends keyof StorageAccessType, V extends StorageAccessType[K]>(
+  get<K extends keyof StorageAccessType, V extends StorageAccessType[K]>(
     key: K
-  ) => V | undefined;
-  get: <K extends keyof StorageAccessType, V extends StorageAccessType[K]>(
+  ): V | undefined;
+  get<K extends keyof StorageAccessType, V extends StorageAccessType[K]>(
     key: K,
     defaultValue: V
-  ) => V;
+  ): V;
 
   put: <K extends keyof StorageAccessType>(
     key: K,
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 05e76847e..a219c1c39 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -256,32 +256,29 @@ declare global {
 
   // oxlint-disable-next-line typescript/consistent-type-definitions
   interface String {
-    split: (splitter: string | RegExp) => [string, ...Array<string>];
-    split: (splitter: string | RegExp, limit: 0) => [];
-    split: (splitter: string | RegExp, limit: 1) => [string];
-    split: (splitter: string | RegExp, limit: 2) => [string, string?];
-    split: (splitter: string | RegExp, limit: 3) => [string, string?, string?];
-    split: (
+    split(splitter: string | RegExp): [string, ...Array<string>];
+    split(splitter: string | RegExp, limit: 0): [];
+    split(splitter: string | RegExp, limit: 1): [string];
+    split(splitter: string | RegExp, limit: 2): [string, string?];
+    split(splitter: string | RegExp, limit: 3): [string, string?, string?];
+    split(
       splitter: string | RegExp,
       limit: 4
-    ) => [string, string?, string?, string?];
-    split: (
+    ): [string, string?, string?, string?];
+    split(
       splitter: string | RegExp,
       limit: 5
-    ) => [string, string?, string?, string?, string?];
-    split: (
-      splitter: string | RegExp,
-      limit: number
-    ) => [string, ...Array<string>];
-    split: (
+    ): [string, string?, string?, string?, string?];
+    split(splitter: string | RegExp, limit: number): [string, ...Array<string>];
+    split(
       splitter: string | RegExp,
       limit?: number
-    ) => [string, ...Array<string>];
-    split: <T>(splitter: StringSplitSplitter<T>, limit?: number) => T;
-    split: (
+    ): [string, ...Array<string>];
+    split<T>(splitter: StringSplitSplitter<T>, limit?: number): T;
+    split(
       splitter: string | RegExp | StringSplitSplitter<Array<string>>,
       limit?: number
-    ) => [string, ...Array<string>];
+    ): [string, ...Array<string>];
   }
 }
 
diff --git a/tsconfig.json b/tsconfig.json
index 6363eaa81..a114a7456 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,7 +23,7 @@
      */
 
     /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
-    "incremental": true,
+    "incremental": false,
     /* Enable constraints that allow a TypeScript project to be used with project references. */
     "composite": false,
     /* Specify the path to .tsbuildinfo incremental compilation file. */