From 2313f58a88f55972d09be19c391672246436b078 Mon Sep 17 00:00:00 2001
From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com>
Date: Thu, 10 Mar 2022 09:37:54 -0300
Subject: [PATCH] cherry-pick conflicts

---
 app/definitions/rest/v1/users.ts       | 9 +++++++++
 app/lib/rocketchat/services/restApi.ts | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/definitions/rest/v1/users.ts b/app/definitions/rest/v1/users.ts
index 3b92eaef0..17b0e1e8e 100644
--- a/app/definitions/rest/v1/users.ts
+++ b/app/definitions/rest/v1/users.ts
@@ -43,4 +43,13 @@ export type UsersEndpoints = {
 			user: IUser;
 		};
 	};
+	'users.resetAvatar': {
+		POST: (params: { userId: string }) => {};
+	};
+	'users.getPreferences': {
+		GET: (params: { userId: IUser['_id'] }) => {
+			preferences: INotificationPreferences;
+			success: boolean;
+		};
+	};
 };
diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts
index 98ea538f9..92ddd6323 100644
--- a/app/lib/rocketchat/services/restApi.ts
+++ b/app/lib/rocketchat/services/restApi.ts
@@ -572,10 +572,8 @@ export const getAvatarSuggestion = (): Promise<IAvatarSuggestion> =>
 	// RC 0.51.0
 	sdk.methodCallWrapper('getAvatarSuggestion');
 
-export const resetAvatar = (userId: string): any =>
+export const resetAvatar = (userId: string) =>
 	// RC 0.55.0
-	// TODO: missing definitions from server
-	// @ts-ignore
 	sdk.post('users.resetAvatar', { userId });
 
 export const setAvatarFromService = ({