fix: adapt to new api

Author: isekovanic

package/src/__tests__/offline-support/optimistic-update.js

@@ -100,6 +100,7 @@ export const OptimisticUpdates = () => {
       const channelResponse = createChannel();
       useMockedApis(chatClient, [getOrCreateChannelApi(channelResponse)]);
       channel = chatClient.channel('messaging', channelResponse.id);
+      console.log('BEFORE HERE');
       await channel.watch();
 
       channel.cid = channelResponse.channel.cid;
@@ -364,14 +365,14 @@ export const OptimisticUpdates = () => {
         expect(pendingTasksRows.length).toBe(2);
       });
 
-      jest.spyOn(chatClient, 'deleteMessage').mockImplementation();
-      jest.spyOn(channel, 'sendReaction').mockImplementation();
+      const deleteMessageSpy = jest.spyOn(chatClient, 'deleteMessage').mockImplementation();
+      const sendReactionSpy = jest.spyOn(channel, '_sendReaction').mockImplementation();
 
       act(() => dispatchConnectionChangedEvent(chatClient, true));
 
       await waitFor(() => {
-        expect(chatClient.deleteMessage).toHaveBeenCalled();
-        expect(channel.sendReaction).toHaveBeenCalled();
+        expect(deleteMessageSpy).toHaveBeenCalled();
+        expect(sendReactionSpy).toHaveBeenCalled();
       });
     });
   });

package/src/components/Channel/Channel.tsx

@@ -1063,7 +1063,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
     };
     let connectionChangedSubscription: ReturnType<ChannelType['on']>;
 
-    if (enableOfflineSupport) {
+    if (enableOfflineSupport && client.offlineDb) {
       connectionChangedSubscription = client.offlineDb.syncManager.onSyncStatusChange(
         (statusChanged) => {
           if (statusChanged) {
@@ -1512,7 +1512,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
     }
 
     if (message.status === MessageStatusTypes.FAILED) {
-      await client.offlineDb.syncManager.dropPendingTasks({ messageId: message.id });
+      await client.offlineDb?.syncManager.dropPendingTasks({ messageId: message.id });
       await removeMessage(message);
     } else {
       const updatedMessage = {
@@ -1525,7 +1525,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
 
       threadInstance?.upsertReplyLocally({ message: updatedMessage });
 
-      const data = await client.offlineDb.syncManager.queueTask({
+      const data = await client.offlineDb?.syncManager.queueTask({
         task: {
           channelId: channel.id,
           channelType: channel.type,

package/src/components/Chat/Chat.tsx

@@ -214,7 +214,7 @@ const ChatWithContext = (props: PropsWithChildren<ChatProps>) => {
 
     const initializeDatabase = () => {
       // TODO: Rethink this, it looks ugly
-      if (!client.offlineDb.initialized) {
+      if (!client.offlineDb) {
         client.setOfflineDBApi(new OfflineDB({ client }));
       }
       // This acts as a lock for some very rare occurrences of concurrency
@@ -224,7 +224,7 @@ const ChatWithContext = (props: PropsWithChildren<ChatProps>) => {
       SqliteClient.initializeDatabase()
         .then(async () => {
           setInitialisedDatabaseConfig({ initialised: true, userID });
-          await client.offlineDb.syncManager.init();
+          await client.offlineDb?.syncManager.init();
         })
         .catch((error) => {
           console.log('Error Initializing DB:', error);
@@ -255,7 +255,7 @@ const ChatWithContext = (props: PropsWithChildren<ChatProps>) => {
       // In case something went wrong, make sure to also unsubscribe the listener
       // on unmount if it exists to prevent a memory leak.
       // FIXME: Should be wrapped in its own unregistration mechanism
-      client.offlineDb.syncManager?.connectionChangedListener?.unsubscribe();
+      client.offlineDb?.syncManager.connectionChangedListener?.unsubscribe();
     };
   }, [client]);
 

package/src/store/OfflineDB.ts

@@ -11,12 +11,8 @@ import * as api from './apis';
 import { SqliteClient } from './SqliteClient';
 
 export class OfflineDB extends AbstractOfflineDB {
-  public initialized = false;
-
   constructor({ client }: { client: StreamChat }) {
     super({ client });
-
-    this.initialized = true;
   }
 
   upsertCidsForQuery = api.upsertCidsForQuery;

package/src/store/apis/addPendingTask.ts

@@ -22,7 +22,8 @@ export const addPendingTask = async (task: PendingTask) => {
     type,
   });
 
-  await SqliteClient.executeSql.apply(null, query);
+  const r = await SqliteClient.executeSql.apply(null, query);
+  console.log('[OFFLINE]: QUERY: ', r);
 
   return async () => {
     SqliteClient.logger?.('info', 'deletePendingTaskAfterAddition', {