From e47e33e21c3bfbd0516170ef53f23cd0c2eead47 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 6 Jul 2022 15:54:30 -0500
Subject: [PATCH] FIX ROOT STATE TYPE!!!!!

---
 app/soapbox/reducers/index.ts    | 1 -
 types/redux-immutable/index.d.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/soapbox/reducers/index.ts b/app/soapbox/reducers/index.ts
index 7f33dad1c..72b33f785 100644
--- a/app/soapbox/reducers/index.ts
+++ b/app/soapbox/reducers/index.ts
@@ -134,7 +134,6 @@ export const StateRecord = ImmutableRecord(
   }, {}),
 );
 
-// @ts-ignore: This type is fine but TS thinks it's wrong
 const appReducer = combineReducers(reducers, StateRecord);
 
 // Clear the state (mostly) when the user logs out
diff --git a/types/redux-immutable/index.d.ts b/types/redux-immutable/index.d.ts
index 80d00209a..fbaecd198 100644
--- a/types/redux-immutable/index.d.ts
+++ b/types/redux-immutable/index.d.ts
@@ -13,5 +13,5 @@ declare module 'redux-immutable' {
   export function combineReducers<S, A extends Action, T>(reducers: ReducersMapObject<S, A>, getDefaultState?: () => Collection.Keyed<T, S>): Reducer<S, A>;
   export function combineReducers<S, A extends Action>(reducers: ReducersMapObject<S, A>, getDefaultState?: () => Collection.Indexed<S>): Reducer<S, A>;
   export function combineReducers<S>(reducers: ReducersMapObject<S, any>, getDefaultState?: () => Collection.Indexed<S>): Reducer<S>;
-  export function combineReducers<S, T extends object>(reducers: ReducersMapObject<S, any>, getDefaultState?: Record.Factory<T>): Reducer<S>;
+  export function combineReducers<S extends object, T extends object>(reducers: ReducersMapObject<S, any>, getDefaultState?: Record.Factory<T>): Reducer<ReturnType<Record.Factory<S>>>;
 }