chore: ddp client

app/containers/Avatar/useAvatarETag.ts

@@ -48,8 +48,8 @@
 				}
 
 				if (record) {
-					const observable = record.observe() as Observable<TSubscriptionModel | TUserModel | TLoggedUserModel>;
-					subscription = observable.subscribe(r => {
+					const observable = record.observe() as unknown as Observable<TSubscriptionModel | TUserModel | TLoggedUserModel>;
+					subscription = observable.subscribe((r) => {
 						setAvatarETag(r.avatarETag);
 					});
 				}
@@ -61,7 +61,7 @@
 				}
 			};
 		}
 	}, [text]);
 
 	return { avatarETag };
 };

app/containers/MessageActions/index.tsx

@@ -234,7 +234,7 @@
 				try {
 					const db = database.active;
 					const result = await markAsUnread({ messageId });
-					if (result.success) {
+					if (result) {
 						const subRecord = await getSubscriptionByRoomId(rid);
 						if (!subRecord) {
 							return;
@@ -292,7 +292,7 @@
 			const handleReplyInDM = async (message: TAnyMessageModel) => {
 				if (message?.u?.username) {
 					const result = await createDirectMessage(message.u.username);
-					if (result.success) {
+					if (result) {
 						const { room } = result;
 						const params = {
 							rid: room.rid,
@@ -393,7 +393,7 @@
 				});
 			};
 
 			const getOptions = (message: TAnyMessageModel) => {
 				const options: TActionSheetOptionsItem[] = [];
 				const videoConfBlock = message.t === 'videoconf';
 

app/containers/MessageComposer/components/SendThreadToChannel.tsx

@@ -1,7 +1,7 @@
 import { TouchableWithoutFeedback } from 'react-native-gesture-handler';
 import { StyleSheet, Text } from 'react-native';
 import React, { useEffect, useRef } from 'react';
-import { type Subscription } from 'rxjs';
+import { Subscription } from 'rxjs/internal/Subscription';
 import { Q } from '@nozbe/watermelondb';
 
 import { useRoomContext } from '../../../views/RoomView/context';
@@ -55,6 +55,7 @@
 		if (alsoSendThreadToChannelUserPref === 'default') {
 			const db = database.active;
 			const observable = db.get('threads').query(Q.where('id', tmid)).observe();
+            // @ts-ignore: fix me
 			subscription.current = observable.subscribe(result => {
 				setAlsoSendThreadToChannel(!result.length);
 			});

app/containers/MessageComposer/hooks/useAutocomplete.ts

@@ -159,7 +159,7 @@ export const useAutocomplete = ({
 						return;
 					}
 					const response = await getCommandPreview(text, rid, commandParams);
-					if (response.success) {
+					if (response.preview) {
 						const previewItems = (response.preview?.items || []).map(item => ({
 							id: item.id,
 							preview: item,
@@ -176,7 +176,7 @@ export const useAutocomplete = ({
 				}
 				if (type === '!') {
 					const res = await getListCannedResponse({ text });
-					if (res.success) {
+					if (res.cannedResponses) {
 						if (res.cannedResponses.length === 0) {
 							setItems([
 								{

app/containers/TwoFactor/index.tsx

@@ -93,11 +93,9 @@
 		try {
 			if (params?.user) {
 				clearErrors();
 				const response = await sendEmailCode(params?.user);
 
-				if (response.success) {
-					showToast(I18n.t('Two_Factor_Success_message'));
-				}
+				showToast(I18n.t('Two_Factor_Success_message'));
 			}
 		} catch (e) {
 			log(e);

app/ee/omnichannel/lib/index.ts

@@ -12,8 +12,8 @@ export const changeLivechatStatus = () => sdk.methodCallWrapper('livechat:change
 // @ts-ignore
 export const getInquiriesQueued = (serverVersion: string) => {
 	const url = compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '7.0.0')
-		? 'livechat/inquiries.queuedForUser'
-		: 'livechat/inquiries.queued';
+		? '/v1/livechat/inquiries.queuedForUser'
+		: '/v1/livechat/inquiries.queued';
 	return sdk.get(url);
 };
 

app/lib/methods/getSettings.ts

@@ -143,7 +143,7 @@ export async function setSettings(): Promise<void> {
 	reduxStore.dispatch(addSettings(parseSettings(parsed.slice(0, parsed.length))));
 }
 
-export function subscribeSettings(): void {
+export function subscribeSettings() {
 	return sdk.subscribe('stream-notify-all', 'public-settings-changed');
 }
 
@@ -159,8 +159,8 @@ export async function getSettings(): Promise<void> {
 		let settings: IData[] = [];
 		const serverVersion = reduxStore.getState().server.version;
 		const url = compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '7.0.0')
-			? `${sdk.current.client.host}/api/v1/settings.public?_id=${settingsParams.join(',')}`
-			: `${sdk.current.client.host}/api/v1/settings.public?query={"_id":{"$in":${JSON.stringify(settingsParams)}}}`;
+			? `${sdk.current?.connection.url}/api/v1/settings.public?_id=${settingsParams.join(',')}`
+			: `${sdk.current?.connection.url}/api/v1/settings.public?query={"_id":{"$in":${JSON.stringify(settingsParams)}}}`;
 		// Iterate over paginated results to retrieve all settings
 		do {
 			// TODO: why is no-await-in-loop enforced in the first place?