diff --git a/native/redux/client-db-utils.js b/native/redux/client-db-utils.js --- a/native/redux/client-db-utils.js +++ b/native/redux/client-db-utils.js @@ -9,8 +9,8 @@ } from 'lib/types/message-types.js'; import type { ClientDBThreadInfo, - LegacyRawThreadInfo, - ThreadStoreThreadInfos, + RawThreadInfo, + RawThreadInfos, } from 'lib/types/thread-types.js'; import { translateClientDBMessageInfoToRawMessageInfo, @@ -30,7 +30,7 @@ function updateClientDBThreadStoreThreadInfos( state: AppState, - migrationFunc: ThreadStoreThreadInfos => ThreadStoreThreadInfos, + migrationFunc: RawThreadInfos => RawThreadInfos, ): AppState { // Get threads from SQLite `threads` table. const clientDBThreadInfos = commCoreModule.getAllThreadsSync(); @@ -62,7 +62,7 @@ function createUpdateDBOpsForThreadStoreThreadInfos( clientDBThreadInfos: $ReadOnlyArray, - migrationFunc: ThreadStoreThreadInfos => ThreadStoreThreadInfos, + migrationFunc: RawThreadInfos => RawThreadInfos, ): $ReadOnlyArray { // Translate `ClientDBThreadInfo`s to `RawThreadInfo`s. const rawThreadInfos = clientDBThreadInfos.map( @@ -71,10 +71,7 @@ // Convert `rawThreadInfo`s to a map of `threadID` => `threadInfo`. const threadIDToThreadInfo = rawThreadInfos.reduce( - ( - acc: { [string]: LegacyRawThreadInfo }, - threadInfo: LegacyRawThreadInfo, - ) => { + (acc: { [string]: RawThreadInfo }, threadInfo: RawThreadInfo) => { acc[threadInfo.id] = threadInfo; return acc; }, @@ -82,11 +79,10 @@ ); // Apply `migrationFunc` to `threadInfo`s. - const updatedThreadIDToThreadInfo: ThreadStoreThreadInfos = - migrationFunc(threadIDToThreadInfo); + const updatedThreadIDToThreadInfo = migrationFunc(threadIDToThreadInfo); // Convert the updated `threadInfo`s back into an array. - const updatedRawThreadInfos: $ReadOnlyArray = values( + const updatedRawThreadInfos: $ReadOnlyArray = values( updatedThreadIDToThreadInfo, );