From a4e401bc8b54c276f485b362091d6db6cc094aec Mon Sep 17 00:00:00 2001
From: Matt Fiddaman <github@m.fiddaman.uk>
Date: Fri, 17 Apr 2026 21:52:44 +0100
Subject: [PATCH] fix build error with typescript v6 (#7524)

* fix tsconfig error

* note

* fix strict mode violation

* fix another type issue
---
 packages/desktop-client/src/components/accounts/Account.tsx | 1 +
 packages/sync-server/src/app.ts                             | 6 +++---
 tsconfig.json                                               | 1 -
 upcoming-release-notes/7524.md                              | 6 ++++++
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 upcoming-release-notes/7524.md

diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
index fdf19f488d..39615c68d8 100644
--- a/packages/desktop-client/src/components/accounts/Account.tsx
+++ b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -1677,6 +1677,7 @@ class AccountInternal extends PureComponent<
       this.setState(state => ({
         sort: {
           ...state.sort,
+          field: headerClicked,
           ascDesc,
         },
       }));
diff --git a/packages/sync-server/src/app.ts b/packages/sync-server/src/app.ts
index 2d114dbcdf..020c828168 100644
--- a/packages/sync-server/src/app.ts
+++ b/packages/sync-server/src/app.ts
@@ -186,9 +186,9 @@ export async function run() {
   ) {
     console.log('OpenID configuration found. Preparing server to use it');
     try {
-      const { error } = await bootstrap({ openId: openIdConfig }, true);
-      if (error) {
-        console.log(error);
+      const result = await bootstrap({ openId: openIdConfig }, true);
+      if ('error' in result && result.error) {
+        console.log(result.error);
       } else {
         console.log('OpenID configured!');
       }
diff --git a/tsconfig.json b/tsconfig.json
index 6cf84586ed..8247678c09 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,6 @@
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "resolveJsonModule": true,
-    "downlevelIteration": true,
     // TODO: enable once every file is ts
     // "strict": true,
     "strictFunctionTypes": true,
diff --git a/upcoming-release-notes/7524.md b/upcoming-release-notes/7524.md
new file mode 100644
index 0000000000..ccb97303b4
--- /dev/null
+++ b/upcoming-release-notes/7524.md
@@ -0,0 +1,6 @@
+---
+category: Bugfixes
+authors: [matt-fidd]
+---
+
+Fix build error with typescript v6