Merge branch 'develop' into duplicate-image

Author: Rohit3523

app/lib/methods/getCustomEmojis.ts

@@ -62,7 +62,7 @@ const updateEmojis = async ({ update = [], remove = [], allRecords }: IUpdateEmo
 
 	try {
 		await db.write(async () => {
-			await db.batch(emojisToCreate, ...emojisToUpdate, ...emojisToDelete);
+			await db.batch([...emojisToCreate, ...emojisToUpdate, ...emojisToDelete]);
 		});
 		return true;
 	} catch (e) {

app/lib/methods/loadThreadMessages.ts

@@ -73,7 +73,7 @@ export function loadThreadMessages({ tmid, rid }: { tmid: string; rid: string })
 					});
 
 					await db.write(async () => {
-						await db.batch(threadMessagesToCreate, ...threadMessagesToUpdate);
+						await db.batch([...threadMessagesToCreate, ...threadMessagesToUpdate]);
 					});
 				} catch (e) {
 					log(e);