From 8903c52ddb0bffa71db2b25d1854d522b0145e1d Mon Sep 17 00:00:00 2001
From: Reinaldo Neto <reinaldonetof@hotmail.com>
Date: Tue, 17 Jan 2023 13:02:24 -0300
Subject: [PATCH] minor refactor

---
 app/views/ChangeAvatarView/index.tsx        | 45 ++-------------------
 app/views/ChangeAvatarView/submitHelpers.ts | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+), 42 deletions(-)
 create mode 100644 app/views/ChangeAvatarView/submitHelpers.ts

diff --git a/app/views/ChangeAvatarView/index.tsx b/app/views/ChangeAvatarView/index.tsx
index 4e16039c0..ff486fc6f 100644
--- a/app/views/ChangeAvatarView/index.tsx
+++ b/app/views/ChangeAvatarView/index.tsx
@@ -22,9 +22,9 @@ import Button from '../../containers/Button';
 import I18n from '../../i18n';
 import { ChatsStackParamList } from '../../stacks/types';
 import { IAvatar } from '../../definitions';
-import { Services } from '../../lib/services';
 import AvatarSuggestion from './AvatarSuggestion';
 import log from '../../lib/methods/helpers/log';
+import { changeRoomsAvatar, changeUserAvatar, resetUserAvatar } from './submitHelpers';
 
 enum AvatarStateActions {
 	CHANGE_AVATAR = 'CHANGE_AVATAR',
@@ -110,13 +110,13 @@ const ChangeAvatarView = () => {
 			setSaving(true);
 			if (context === 'room' && room?.rid) {
 				// Change Rooms Avatar
-				await changeRoomsAvatar(room.rid);
+				await changeRoomsAvatar(room.rid, state?.data);
 			} else if (state?.url) {
 				// Change User's Avatar
 				await changeUserAvatar(state);
 			} else if (state.resetUserAvatar) {
 				// Change User's Avatar
-				await resetUserAvatar();
+				await resetUserAvatar(userId);
 			}
 			isDirty.current = false;
 		} catch (e: any) {
@@ -128,44 +128,6 @@ const ChangeAvatarView = () => {
 		return navigation.goBack();
 	};
 
-	const changeRoomsAvatar = async (rid: string) => {
-		try {
-			await Services.saveRoomSettings(rid, { roomAvatar: state?.data });
-		} catch (e) {
-			log(e);
-			return handleError(e, 'changing_avatar');
-		}
-	};
-
-	const changeUserAvatar = async (avatarUpload: IAvatar) => {
-		try {
-			await Services.setAvatarFromService(avatarUpload);
-		} catch (e) {
-			return handleError(e, 'changing_avatar');
-		}
-	};
-
-	const resetUserAvatar = async () => {
-		try {
-			await Services.resetAvatar(userId);
-		} catch (e) {
-			return handleError(e, 'changing_avatar');
-		}
-	};
-
-	const handleError = (e: any, action: string) => {
-		if (e.data && e.data.error.includes('[error-too-many-requests]')) {
-			throw new Error(e.data.error);
-		}
-		if (e.error && e.error === 'error-avatar-invalid-url') {
-			throw new Error(I18n.t(e.error, { url: e.details.url }));
-		}
-		if (I18n.isTranslated(e.error)) {
-			throw new Error(I18n.t(e.error));
-		}
-		throw new Error(I18n.t('There_was_an_error_while_action', { action: I18n.t(action) }));
-	};
-
 	const pickImage = async () => {
 		const options = {
 			cropping: true,
@@ -240,7 +202,6 @@ const ChangeAvatarView = () => {
 							}
 						/>
 					) : null}
-
 					<Button
 						title={I18n.t('Upload_image')}
 						type='secondary'
diff --git a/app/views/ChangeAvatarView/submitHelpers.ts b/app/views/ChangeAvatarView/submitHelpers.ts
new file mode 100644
index 000000000..f85ed71bf
--- /dev/null
+++ b/app/views/ChangeAvatarView/submitHelpers.ts
@@ -0,0 +1,42 @@
+import { Services } from '../../lib/services';
+import log from '../../lib/methods/helpers/log';
+import { IAvatar } from '../../definitions';
+import I18n from '../../i18n';
+
+export const changeRoomsAvatar = async (rid: string, roomAvatar: string | null) => {
+	try {
+		await Services.saveRoomSettings(rid, { roomAvatar });
+	} catch (e) {
+		log(e);
+		return handleError(e, 'changing_avatar');
+	}
+};
+
+export const changeUserAvatar = async (avatarUpload: IAvatar) => {
+	try {
+		await Services.setAvatarFromService(avatarUpload);
+	} catch (e) {
+		return handleError(e, 'changing_avatar');
+	}
+};
+
+export const resetUserAvatar = async (userId: string) => {
+	try {
+		await Services.resetAvatar(userId);
+	} catch (e) {
+		return handleError(e, 'changing_avatar');
+	}
+};
+
+const handleError = (e: any, action: string) => {
+	if (e.data && e.data.error.includes('[error-too-many-requests]')) {
+		throw new Error(e.data.error);
+	}
+	if (e.error && e.error === 'error-avatar-invalid-url') {
+		throw new Error(I18n.t(e.error, { url: e.details.url }));
+	}
+	if (I18n.isTranslated(e.error)) {
+		throw new Error(I18n.t(e.error));
+	}
+	throw new Error(I18n.t('There_was_an_error_while_action', { action: I18n.t(action) }));
+};