diff --git a/src/app/features/settings/cosmetics/ThemeCatalogSettings.test.tsx b/src/app/features/settings/cosmetics/ThemeCatalogSettings.test.tsx index e428bf9bf..9e4d50289 100644 --- a/src/app/features/settings/cosmetics/ThemeCatalogSettings.test.tsx +++ b/src/app/features/settings/cosmetics/ThemeCatalogSettings.test.tsx @@ -37,7 +37,10 @@ const settings = { }; vi.mock('$state/hooks/settings', () => ({ - useSetting: (_atom: unknown, key: keyof typeof settings) => [settings[key], vi.fn()], + useSetting: (_atom: unknown, key: keyof typeof settings) => [ + settings[key], + vi.fn<(value: unknown) => void>(), + ], })); vi.mock('$state/settings', () => ({ settingsAtom: {}, @@ -49,7 +52,9 @@ vi.mock('$state/settings', () => ({ }), })); vi.mock('$hooks/useClientConfig', () => ({ useClientConfig: () => ({}) })); -vi.mock('$utils/share', () => ({ shareText: vi.fn() })); +vi.mock('$utils/share', () => ({ + shareText: vi.fn<(text: string) => Promise>().mockResolvedValue(false), +})); vi.mock('../../../theme/cache', () => ({ getCachedThemeCss, putCachedThemeCss, diff --git a/src/app/hooks/useSettingsSync.test.tsx b/src/app/hooks/useSettingsSync.test.tsx index 1074290a6..1bb69473c 100644 --- a/src/app/hooks/useSettingsSync.test.tsx +++ b/src/app/hooks/useSettingsSync.test.tsx @@ -275,7 +275,7 @@ describe('useSettingsSyncEffect — debounced upload', () => { }); it('cancels a stale deferred backfill when settings change', async () => { - let resolveCache: (css: string | undefined) => void = () => undefined; + let resolveCache: ((css: string | undefined) => void) | undefined; getCachedThemeCss.mockImplementationOnce( () => new Promise((resolve) => (resolveCache = resolve)) ); @@ -292,13 +292,13 @@ describe('useSettingsSyncEffect — debounced upload', () => { renderHook(() => useSettingsSyncEffect(), { wrapper: makeWrapper(store) }); act(() => vi.advanceTimersByTime(2000)); act(() => store.set(settingsAtom, { ...store.get(settingsAtom), twitterEmoji: false })); - resolveCache('body {}'); + resolveCache?.('body {}'); await act(async () => await Promise.resolve()); expect(mockMx.setAccountData).not.toHaveBeenCalled(); }); it('cancels a deferred backfill when settings sync is disabled', async () => { - let resolveCache: (css: string | undefined) => void = () => undefined; + let resolveCache: ((css: string | undefined) => void) | undefined; getCachedThemeCss.mockImplementationOnce( () => new Promise((resolve) => (resolveCache = resolve)) ); @@ -315,7 +315,7 @@ describe('useSettingsSyncEffect — debounced upload', () => { renderHook(() => useSettingsSyncEffect(), { wrapper: makeWrapper(store) }); act(() => vi.advanceTimersByTime(2000)); act(() => store.set(settingsAtom, { ...store.get(settingsAtom), settingsSyncEnabled: false })); - resolveCache('body {}'); + resolveCache?.('body {}'); await act(async () => await Promise.resolve()); expect(mockMx.setAccountData).not.toHaveBeenCalled(); }); @@ -347,7 +347,7 @@ describe('useSettingsSyncEffect — debounced upload', () => { }); it('keeps idle state after disabling sync during an in-flight request and ignores its late failure', async () => { - let rejectUpload: (error: Error) => void = () => undefined; + let rejectUpload: ((error: Error) => void) | undefined; mockMx.setAccountData.mockImplementationOnce( () => new Promise((_resolve, reject) => (rejectUpload = reject)) ); @@ -360,7 +360,7 @@ describe('useSettingsSyncEffect — debounced upload', () => { expect(store.get(settingsSyncStatusAtom)).toBe('syncing'); act(() => store.set(settingsAtom, { ...store.get(settingsAtom), settingsSyncEnabled: false })); expect(store.get(settingsSyncStatusAtom)).toBe('idle'); - rejectUpload(new Error('late failure')); + rejectUpload?.(new Error('late failure')); await act(async () => await Promise.resolve()); expect(store.get(settingsSyncStatusAtom)).toBe('idle'); expect(store.get(settingsAtom).twitterEmoji).toBe(true); diff --git a/src/app/pages/ThemeManager.tsx b/src/app/pages/ThemeManager.tsx index ddd74e7eb..730d35658 100644 --- a/src/app/pages/ThemeManager.tsx +++ b/src/app/pages/ThemeManager.tsx @@ -216,7 +216,7 @@ export function AuthRouteThemeManager({ children }: { children: ReactNode }) { const applyTweakCss = async () => { const texts = await Promise.all( - urls.map((url) => { + urls.map(async (url) => { const trimmedUrl = url.trim(); const embeddedCss = getEmbeddedLocalTweakCss( tweakFavorites?.find((favorite) => favorite.fullUrl === trimmedUrl)