Update files after merge

Author: epeicher

common/lib/cache-function-ttl.ts

@@ -31,7 +31,7 @@ export function cacheFunctionTTL< Args extends unknown[], Return >(
 }
 
 function pruneCache(): void {
-	for ( const [ fn, cachedResults ] of cache ) {
+	for ( const [ _, cachedResults ] of cache ) {
 		for ( const cachedResult of cachedResults ) {
 			if ( Date.now() - cachedResult.timestamp >= cachedResult.ttl ) {
 				cachedResults.delete( cachedResult );

src/modules/sync/lib/ipc-handlers.ts

@@ -5,7 +5,6 @@ import path from 'node:path';
 import * as Sentry from '@sentry/electron/main';
 import { z } from 'zod';
 import { isErrnoException } from 'common/lib/is-errno-exception';
-import { SyncSite } from 'src/hooks/use-fetch-wpcom-sites/types';
 import {
 	PullStateProgressInfo,
 	PushStateProgressInfo,
@@ -19,6 +18,7 @@ import { getAuthenticationToken } from 'src/lib/oauth';
 import { keepSqliteIntegrationUpdated } from 'src/lib/sqlite-versions';
 import wpcomFactory from 'src/lib/wpcom-factory';
 import wpcomXhrRequest from 'src/lib/wpcom-xhr-request-factory';
+import { SyncSite } from 'src/modules/sync/types';
 import { SiteServer } from 'src/site-server';
 import { loadUserData, lockAppdata, saveUserData, unlockAppdata } from 'src/storage/user-data';
 import { SyncOption } from 'src/types';