From fd210c4713f7101ad91a627d516ee70dda7c9917 Mon Sep 17 00:00:00 2001
From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com>
Date: Mon, 10 Apr 2023 11:59:00 -0300
Subject: [PATCH] feat: Change Avatar View (#4746)

* [NEW] Change Avatar View

* change avatar view and avatar suggestion

* avatar Url

* change avatar for profile it's done, missing fix revalidate the avatar in profile and drawer

* pick image

* clean profile view

* Finished the profile and fixed the avatar when change the user profile

* fix the profile update through all the app

* refactor avatar suggestion

* fix the delete from rooms and finished RoomInfoView, missing RoomInfoEditView

* room info edit view

* ipad navigation

* refactor the submit function

* refactor the e2e test

* minor tweak with themes and buttons

* minor tweak in edit button

* minor tweaks

* tweak IAvatarContainer

* fixing pt-br

* removed the avatarETagUser and search by username and text

* created the useHooke useAvatarETag

* fix lint

* refactor image.ts and test

* refactor avatar component

* fix the edit button

* refactor useAvatarETag

* fix the pt-br translation

* minor tweak tests

* back handleError to views and refactor the submit

* avatar suggestion item

* types for change avatar view context

* fix avatar on header for tablets

* minor tweak changeavatarview

* refactor avatar url to use hook form

* tweak on yup validation

* minor tweak with handle error

* minor tweak

* minor tweak

* interface avatar container

* minor tweak

* Refactor all the changeAvatarView and fix how to test the image url

* fixed the layout

* minor refactor

* minor tweaks

* fix the visual bug when the user change the avatar to new then clear cache

* fix the flicker when upload an image

* update package.json

* test the reset, discard alert, cancel and discard

* separate the avatar test from profile and create new tests for change avatar

* mock imagepicker

* minor tweak, adding console and add echo to config.yml

* use RUNNING_E2E_TESTS as env to other files

* exprt env at android build

* change the to way to set the running e2e test env

* update test

* delete the .env and update the e2e/readme and the file review

* minor tweak

* minor tweak

* update the test, fixing how to dismiss the keyboard

---------

Co-authored-by: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
---
 .circleci/config.yml                          |   4 +-
 .env                                          |   2 -
 .../Avatar/{index.tsx => AvatarContainer.tsx} |  54 +---
 app/containers/Avatar/AvatarWithEdit.tsx      |  85 ++++++
 app/containers/Avatar/index.ts                |   5 +
 app/containers/Avatar/useAvatarETag.ts        |  67 +++++
 app/containers/Button/index.tsx               |   2 +-
 app/definitions/IProfile.ts                   |  10 +-
 app/definitions/TChangeAvatarViewContext.ts   |   1 +
 app/i18n/locales/en.json                      |   8 +
 app/i18n/locales/pt-BR.json                   |   8 +
 app/lib/constants/colors.ts                   |   3 +
 app/lib/methods/helpers/image.ts              |  10 +
 app/lib/methods/helpers/index.ts              |   1 +
 app/lib/methods/helpers/review.ts             |   4 +-
 app/lib/methods/subscriptions/rooms.ts        |   8 +-
 app/lib/services/restApi.ts                   |   4 +-
 app/sagas/login.js                            |  16 ++
 app/stacks/InsideStack.tsx                    |   3 +
 app/stacks/MasterDetailStack/index.tsx        |   2 +
 app/stacks/MasterDetailStack/types.ts         |   7 +
 app/stacks/types.ts                           |  13 +
 .../ChangeAvatarView/AvatarSuggestion.tsx     |  56 ++++
 .../ChangeAvatarView/AvatarSuggestionItem.tsx |  40 +++
 app/views/ChangeAvatarView/AvatarUrl.tsx      |  29 ++
 .../ChangeAvatarView/ImagePicker.mock.ts      |  36 +++
 app/views/ChangeAvatarView/ImagePicker.ts     |   4 +
 app/views/ChangeAvatarView/index.tsx          | 250 ++++++++++++++++++
 app/views/ChangeAvatarView/styles.ts          |  27 ++
 app/views/ChangeAvatarView/submitHelpers.ts   |  14 +
 app/views/ChangeAvatarView/submitServices.ts  |  29 ++
 app/views/ProfileView/index.tsx               | 181 ++-----------
 app/views/ProfileView/styles.ts               |   2 +-
 app/views/RoomInfoEditView/index.tsx          |  90 +------
 app/views/RoomInfoEditView/styles.ts          |   3 +-
 app/views/RoomInfoView/index.tsx              |  21 +-
 app/views/RoomInfoView/styles.ts              |   5 +-
 app/views/RoomView/LeftButtons.tsx            |   4 +-
 app/views/RoomView/index.tsx                  |   1 +
 e2e/README.md                                 |   3 +-
 e2e/helpers/data_setup.ts                     |   5 +
 e2e/tests/assorted/03-profile.spec.ts         |  44 +--
 e2e/tests/assorted/15-change-avatar.spec.ts   |  94 +++++++
 e2e/tests/room/08-roominfo.spec.ts            |   5 +-
 e2e/tests/team/01-createteam.spec.ts          |   2 +-
 metro.config.js                               |   5 +-
 package.json                                  |   3 +-
 yarn.lock                                     |   2 +-
 48 files changed, 926 insertions(+), 346 deletions(-)
 delete mode 100644 .env
 rename app/containers/Avatar/{index.tsx => AvatarContainer.tsx} (54%)
 create mode 100644 app/containers/Avatar/AvatarWithEdit.tsx
 create mode 100644 app/containers/Avatar/index.ts
 create mode 100644 app/containers/Avatar/useAvatarETag.ts
 create mode 100644 app/definitions/TChangeAvatarViewContext.ts
 create mode 100644 app/lib/methods/helpers/image.ts
 create mode 100644 app/views/ChangeAvatarView/AvatarSuggestion.tsx
 create mode 100644 app/views/ChangeAvatarView/AvatarSuggestionItem.tsx
 create mode 100644 app/views/ChangeAvatarView/AvatarUrl.tsx
 create mode 100644 app/views/ChangeAvatarView/ImagePicker.mock.ts
 create mode 100644 app/views/ChangeAvatarView/ImagePicker.ts
 create mode 100644 app/views/ChangeAvatarView/index.tsx
 create mode 100644 app/views/ChangeAvatarView/styles.ts
 create mode 100644 app/views/ChangeAvatarView/submitHelpers.ts
 create mode 100644 app/views/ChangeAvatarView/submitServices.ts
 create mode 100644 e2e/tests/assorted/15-change-avatar.spec.ts

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23c414a05..599170715 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -484,7 +484,7 @@ jobs:
       - run:
           name: Build Android
           command: |
-            echo "RUNNING_E2E_TESTS=true" > ./.env
+            export RUNNING_E2E_TESTS=true
             yarn e2e:android-build
       - save_cache: *save-gradle-cache
       - store_artifacts:
@@ -582,7 +582,7 @@ jobs:
             /usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey $BUGSNAG_KEY" ./ios/RocketChatRN/Info.plist
             /usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey $BUGSNAG_KEY" ./ios/ShareRocketChatRN/Info.plist
             yarn detox clean-framework-cache && yarn detox build-framework-cache
-            echo "RUNNING_E2E_TESTS=true" > ./.env
+            export RUNNING_E2E_TESTS=true
             yarn e2e:ios-build
       - persist_to_workspace:
           root: /Users/distiller/project
diff --git a/.env b/.env
deleted file mode 100644
index 2c6f3252a..000000000
--- a/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T COMMIT THIS FILE
-RUNNING_E2E_TESTS=
\ No newline at end of file
diff --git a/app/containers/Avatar/index.tsx b/app/containers/Avatar/AvatarContainer.tsx
similarity index 54%
rename from app/containers/Avatar/index.tsx
rename to app/containers/Avatar/AvatarContainer.tsx
index 9f762308d..d529c7481 100644
--- a/app/containers/Avatar/index.tsx
+++ b/app/containers/Avatar/AvatarContainer.tsx
@@ -1,13 +1,11 @@
-import { Q } from '@nozbe/watermelondb';
-import React, { useEffect, useRef, useState } from 'react';
+import React from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
-import { Observable, Subscription } from 'rxjs';
 
-import { IApplicationState, TSubscriptionModel, TUserModel } from '../../definitions';
-import database from '../../lib/database';
+import { IApplicationState } from '../../definitions';
 import { getUserSelector } from '../../selectors/login';
 import Avatar from './Avatar';
 import { IAvatar } from './interfaces';
+import { useAvatarETag } from './useAvatarETag';
 
 const AvatarContainer = ({
 	style,
@@ -23,17 +21,13 @@ const AvatarContainer = ({
 	isStatic,
 	rid
 }: IAvatar): React.ReactElement => {
-	const subscription = useRef<Subscription>();
-	const [avatarETag, setAvatarETag] = useState<string | undefined>('');
-
-	const isDirect = () => type === 'd';
-
 	const server = useSelector((state: IApplicationState) => state.share.server.server || state.server.server);
 	const serverVersion = useSelector((state: IApplicationState) => state.share.server.version || state.server.version);
-	const { id, token } = useSelector(
+	const { id, token, username } = useSelector(
 		(state: IApplicationState) => ({
 			id: getUserSelector(state).id,
-			token: getUserSelector(state).token
+			token: getUserSelector(state).token,
+			username: getUserSelector(state).username
 		}),
 		shallowEqual
 	);
@@ -48,41 +42,7 @@ const AvatarContainer = ({
 			true
 	);
 
-	const init = async () => {
-		const db = database.active;
-		const usersCollection = db.get('users');
-		const subsCollection = db.get('subscriptions');
-
-		let record;
-		try {
-			if (isDirect()) {
-				const [user] = await usersCollection.query(Q.where('username', text)).fetch();
-				record = user;
-			} else if (rid) {
-				record = await subsCollection.find(rid);
-			}
-		} catch {
-			// Record not found
-		}
-
-		if (record) {
-			const observable = record.observe() as Observable<TSubscriptionModel | TUserModel>;
-			subscription.current = observable.subscribe(r => {
-				setAvatarETag(r.avatarETag);
-			});
-		}
-	};
-
-	useEffect(() => {
-		if (!avatarETag) {
-			init();
-		}
-		return () => {
-			if (subscription?.current?.unsubscribe) {
-				subscription.current.unsubscribe();
-			}
-		};
-	}, [text, type, size, avatarETag, externalProviderUrl]);
+	const { avatarETag } = useAvatarETag({ username, text, type, rid, id });
 
 	return (
 		<Avatar
diff --git a/app/containers/Avatar/AvatarWithEdit.tsx b/app/containers/Avatar/AvatarWithEdit.tsx
new file mode 100644
index 000000000..5e0a335ba
--- /dev/null
+++ b/app/containers/Avatar/AvatarWithEdit.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { StyleSheet } from 'react-native';
+
+import Button from '../Button';
+import AvatarContainer from './AvatarContainer';
+import { IAvatar } from './interfaces';
+import I18n from '../../i18n';
+import { useTheme } from '../../theme';
+import { BUTTON_HIT_SLOP } from '../message/utils';
+import { useAppSelector } from '../../lib/hooks';
+import { compareServerVersion } from '../../lib/methods/helpers';
+import sharedStyles from '../../views/Styles';
+
+const styles = StyleSheet.create({
+	editAvatarButton: {
+		marginTop: 8,
+		paddingVertical: 8,
+		paddingHorizontal: 12,
+		marginBottom: 0,
+		height: undefined
+	},
+	textButton: {
+		fontSize: 12,
+		...sharedStyles.textSemibold
+	}
+});
+
+interface IAvatarContainer extends Omit<IAvatar, 'size'> {
+	handleEdit?: () => void;
+}
+
+const AvatarWithEdit = ({
+	style,
+	text = '',
+	avatar,
+	emoji,
+	borderRadius,
+	type,
+	children,
+	onPress,
+	getCustomEmoji,
+	isStatic,
+	rid,
+	handleEdit
+}: IAvatarContainer): React.ReactElement => {
+	const { colors } = useTheme();
+
+	const { serverVersion } = useAppSelector(state => ({
+		serverVersion: state.server.version
+	}));
+
+	return (
+		<>
+			<AvatarContainer
+				style={style}
+				text={text}
+				avatar={avatar}
+				emoji={emoji}
+				size={120}
+				borderRadius={borderRadius}
+				type={type}
+				children={children}
+				onPress={onPress}
+				getCustomEmoji={getCustomEmoji}
+				isStatic={isStatic}
+				rid={rid}
+			/>
+			{handleEdit && serverVersion && compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '3.6.0') ? (
+				<Button
+					title={I18n.t('Edit')}
+					type='secondary'
+					backgroundColor={colors.editAndUploadButtonAvatar}
+					onPress={handleEdit}
+					testID='avatar-edit-button'
+					style={styles.editAvatarButton}
+					styleText={styles.textButton}
+					color={colors.titleText}
+					hitSlop={BUTTON_HIT_SLOP}
+				/>
+			) : null}
+		</>
+	);
+};
+
+export default AvatarWithEdit;
diff --git a/app/containers/Avatar/index.ts b/app/containers/Avatar/index.ts
new file mode 100644
index 000000000..79e76c146
--- /dev/null
+++ b/app/containers/Avatar/index.ts
@@ -0,0 +1,5 @@
+import Avatar from './AvatarContainer';
+
+export { default as AvatarWithEdit } from './AvatarWithEdit';
+
+export default Avatar;
diff --git a/app/containers/Avatar/useAvatarETag.ts b/app/containers/Avatar/useAvatarETag.ts
new file mode 100644
index 000000000..c2ed9d206
--- /dev/null
+++ b/app/containers/Avatar/useAvatarETag.ts
@@ -0,0 +1,67 @@
+import { Q } from '@nozbe/watermelondb';
+import { useEffect, useState } from 'react';
+import { Observable, Subscription } from 'rxjs';
+
+import { TLoggedUserModel, TSubscriptionModel, TUserModel } from '../../definitions';
+import database from '../../lib/database';
+
+export const useAvatarETag = ({
+	username,
+	text,
+	type = '',
+	rid,
+	id
+}: {
+	type?: string;
+	username: string;
+	text: string;
+	rid?: string;
+	id: string;
+}) => {
+	const [avatarETag, setAvatarETag] = useState<string | undefined>('');
+
+	const isDirect = () => type === 'd';
+
+	useEffect(() => {
+		let subscription: Subscription;
+		if (!avatarETag) {
+			const observeAvatarETag = async () => {
+				const db = database.active;
+				const usersCollection = db.get('users');
+				const subsCollection = db.get('subscriptions');
+
+				let record;
+				try {
+					if (username === text) {
+						const serversDB = database.servers;
+						const userCollections = serversDB.get('users');
+						const user = await userCollections.find(id);
+						record = user;
+					} else if (isDirect()) {
+						const [user] = await usersCollection.query(Q.where('username', text)).fetch();
+						record = user;
+					} else if (rid) {
+						record = await subsCollection.find(rid);
+					}
+				} catch {
+					// Record not found
+				}
+
+				if (record) {
+					const observable = record.observe() as Observable<TSubscriptionModel | TUserModel | TLoggedUserModel>;
+					subscription = observable.subscribe(r => {
+						setAvatarETag(r.avatarETag);
+					});
+				}
+			};
+			observeAvatarETag();
+			return () => {
+				if (subscription?.unsubscribe) {
+					subscription.unsubscribe();
+				}
+			};
+		}
+	}, [text]);
+
+	return { avatarETag };
+};
diff --git a/app/containers/Button/index.tsx b/app/containers/Button/index.tsx
index eb3c06c02..91f379c3f 100644
--- a/app/containers/Button/index.tsx
+++ b/app/containers/Button/index.tsx
@@ -14,7 +14,7 @@ interface IButtonProps extends PlatformTouchableProps {
 	loading?: boolean;
 	color?: string;
 	fontSize?: number;
-	styleText?: StyleProp<TextStyle>[];
+	styleText?: StyleProp<TextStyle> | StyleProp<TextStyle>[];
 }
 
 const styles = StyleSheet.create({
diff --git a/app/definitions/IProfile.ts b/app/definitions/IProfile.ts
index d232672cb..0e4889736 100644
--- a/app/definitions/IProfile.ts
+++ b/app/definitions/IProfile.ts
@@ -17,16 +17,14 @@ export interface IAvatarButton {
 }
 
 export interface IAvatar {
-	data: {} | string | null;
+	data: string | null;
 	url?: string;
 	contentType?: string;
 	service?: any;
 }
 
 export interface IAvatarSuggestion {
-	[service: string]: {
-		url: string;
-		blob: string;
-		contentType: string;
-	};
+	url: string;
+	blob: string;
+	contentType: string;
 }
diff --git a/app/definitions/TChangeAvatarViewContext.ts b/app/definitions/TChangeAvatarViewContext.ts
new file mode 100644
index 000000000..00c9ac831
--- /dev/null
+++ b/app/definitions/TChangeAvatarViewContext.ts
@@ -0,0 +1 @@
+export type TChangeAvatarViewContext = 'profile' | 'room';
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index c695d3c63..84862128c 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -877,6 +877,14 @@
   "Reply_in_direct_message": "Reply in Direct Message",
   "room_archived": "archived room",
   "room_unarchived": "unarchived room",
+  "Upload_image": "Upload image",
+  "Delete_image": "Delete image",
+  "Images_uploaded": "Images uploaded",
+  "Avatar": "Avatar",
+  "insert_Avatar_URL": "insert image URL here",
+  "Discard_changes":"Discard changes?",
+  "Discard":"Discard",
+  "Discard_changes_description":"All changes will be lost if you go back without saving.",
   "no-videoconf-provider-app-header": "Conference call not available",
   "no-videoconf-provider-app-body": "Conference call apps can be installed in the Rocket.Chat marketplace by a workspace admin.",
   "admin-no-videoconf-provider-app-header": "Conference call not enabled",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index 01d9c85df..998ad9d61 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -876,6 +876,14 @@
   "Reply_in_direct_message": "Responder por mensagem direta",
   "room_archived": "{{username}} arquivou a sala",
   "room_unarchived": "{{username}} desarquivou a sala",
+  "Upload_image": "Carregar imagem",
+  "Delete_image": "Deletar imagem",
+  "Images_uploaded": "Imagens carregadas",
+  "Avatar": "Avatar",
+  "insert_Avatar_URL": "insira o URL da imagem aqui",
+  "Discard_changes":"Descartar alterações?",
+  "Discard":"Descartar",
+  "Discard_changes_description":"Todas as alterações serão perdidas, se você sair sem salvar.",
   "Presence_Cap_Warning_Title": "Status do usuário desabilitado temporariamente",
   "Presence_Cap_Warning_Description": "O limite de conexões ativas para a workspace foi atingido, por isso o serviço responsável pela presença dos usuários está temporariamente desabilitado. Ele pode ser reabilitado manualmente nas configurações da workspace."
 }
\ No newline at end of file
diff --git a/app/lib/constants/colors.ts b/app/lib/constants/colors.ts
index c9a667601..b9db875f9 100644
--- a/app/lib/constants/colors.ts
+++ b/app/lib/constants/colors.ts
@@ -59,6 +59,7 @@ export const colors = {
 		buttonText: '#ffffff',
 		passcodeBackground: '#EEEFF1',
 		passcodeButtonActive: '#E4E7EA',
+		editAndUploadButtonAvatar: '#E4E7EA',
 		passcodeLockIcon: '#6C727A',
 		passcodePrimary: '#2F343D',
 		passcodeSecondary: '#6C727A',
@@ -128,6 +129,7 @@ export const colors = {
 		buttonText: '#ffffff',
 		passcodeBackground: '#030C1B',
 		passcodeButtonActive: '#0B182C',
+		editAndUploadButtonAvatar: '#0B182C',
 		passcodeLockIcon: '#6C727A',
 		passcodePrimary: '#FFFFFF',
 		passcodeSecondary: '#CBCED1',
@@ -197,6 +199,7 @@ export const colors = {
 		buttonText: '#ffffff',
 		passcodeBackground: '#000000',
 		passcodeButtonActive: '#0E0D0D',
+		editAndUploadButtonAvatar: '#0E0D0D',
 		passcodeLockIcon: '#6C727A',
 		passcodePrimary: '#FFFFFF',
 		passcodeSecondary: '#CBCED1',
diff --git a/app/lib/methods/helpers/image.ts b/app/lib/methods/helpers/image.ts
new file mode 100644
index 000000000..d5f874902
--- /dev/null
+++ b/app/lib/methods/helpers/image.ts
@@ -0,0 +1,10 @@
+import { Image } from 'react-native';
+
+export const isImageURL = async (url: string): Promise<boolean> => {
+	try {
+		const result = await Image.prefetch(url);
+		return result;
+	} catch {
+		return false;
+	}
+};
diff --git a/app/lib/methods/helpers/index.ts b/app/lib/methods/helpers/index.ts
index 0c9414e9c..4098203a0 100644
--- a/app/lib/methods/helpers/index.ts
+++ b/app/lib/methods/helpers/index.ts
@@ -14,3 +14,4 @@ export * from './server';
 export * from './url';
 export * from './isValidEmail';
 export * from './random';
+export * from './image';
diff --git a/app/lib/methods/helpers/review.ts b/app/lib/methods/helpers/review.ts
index 0a007c9de..748eacb88 100644
--- a/app/lib/methods/helpers/review.ts
+++ b/app/lib/methods/helpers/review.ts
@@ -1,7 +1,5 @@
 import { Alert, Linking } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-// eslint-disable-next-line import/no-unresolved
-import { RUNNING_E2E_TESTS } from '@env';
 
 import I18n from '../../../i18n';
 import { isFDroidBuild, STORE_REVIEW_LINK } from '../../constants';
@@ -88,7 +86,7 @@ class ReviewApp {
 	positiveEventCount = 0;
 
 	pushPositiveEvent = () => {
-		if (isFDroidBuild || RUNNING_E2E_TESTS === 'true') {
+		if (isFDroidBuild || process.env.RUNNING_E2E_TESTS === 'true') {
 			return;
 		}
 		if (this.positiveEventCount >= numberOfPositiveEvent) {
diff --git a/app/lib/methods/subscriptions/rooms.ts b/app/lib/methods/subscriptions/rooms.ts
index 443b681f4..9c0fe267f 100644
--- a/app/lib/methods/subscriptions/rooms.ts
+++ b/app/lib/methods/subscriptions/rooms.ts
@@ -291,7 +291,7 @@ export default function subscribeRooms() {
 		const [type, data] = ddpMessage.fields.args;
 		const [, ev] = ddpMessage.fields.eventName.split('/');
 		if (/userData/.test(ev)) {
-			const [{ diff }] = ddpMessage.fields.args;
+			const [{ diff, unset }] = ddpMessage.fields.args;
 			if (diff?.statusLivechat) {
 				store.dispatch(setUser({ statusLivechat: diff.statusLivechat }));
 			}
@@ -301,6 +301,12 @@ export default function subscribeRooms() {
 			if ((['settings.preferences.alsoSendThreadToChannel'] as any) in diff) {
 				store.dispatch(setUser({ alsoSendThreadToChannel: diff['settings.preferences.alsoSendThreadToChannel'] }));
 			}
+			if (diff?.avatarETag) {
+				store.dispatch(setUser({ avatarETag: diff.avatarETag }));
+			}
+			if (unset?.avatarETag) {
+				store.dispatch(setUser({ avatarETag: '' }));
+			}
 		}
 		if (/subscriptions/.test(ev)) {
 			if (type === 'removed') {
diff --git a/app/lib/services/restApi.ts b/app/lib/services/restApi.ts
index d73c1d9df..55a50b841 100644
--- a/app/lib/services/restApi.ts
+++ b/app/lib/services/restApi.ts
@@ -561,7 +561,7 @@ export const saveRoomSettings = (
 	rid: string,
 	params: {
 		roomName?: string;
-		roomAvatar?: string;
+		roomAvatar?: string | null;
 		roomDescription?: string;
 		roomTopic?: string;
 		roomAnnouncement?: string;
@@ -602,7 +602,7 @@ export const getRoomRoles = (
 	// RC 0.65.0
 	sdk.get(`${roomTypeToApiType(type)}.roles`, { roomId });
 
-export const getAvatarSuggestion = (): Promise<IAvatarSuggestion> =>
+export const getAvatarSuggestion = (): Promise<{ [service: string]: IAvatarSuggestion }> =>
 	// RC 0.51.0
 	sdk.methodCallWrapper('getAvatarSuggestion');
 
diff --git a/app/sagas/login.js b/app/sagas/login.js
index af2ad9b03..6e5b2a437 100644
--- a/app/sagas/login.js
+++ b/app/sagas/login.js
@@ -247,6 +247,22 @@ const handleLogout = function* handleLogout({ forcedByServer, message }) {
 };
 
 const handleSetUser = function* handleSetUser({ user }) {
+	if ('avatarETag' in user) {
+		const userId = yield select(state => state.login.user.id);
+		const serversDB = database.servers;
+		const userCollections = serversDB.get('users');
+		yield serversDB.write(async () => {
+			try {
+				const userRecord = await userCollections.find(userId);
+				await userRecord.update(record => {
+					record.avatarETag = user.avatarETag;
+				});
+			} catch {
+				//
+			}
+		});
+	}
+
 	setLanguage(user?.language);
 
 	if (user?.statusLivechat && isOmnichannelModuleAvailable()) {
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
index 2d8b2c6ae..c1ed5fbcf 100644
--- a/app/stacks/InsideStack.tsx
+++ b/app/stacks/InsideStack.tsx
@@ -68,6 +68,7 @@ import AddChannelTeamView from '../views/AddChannelTeamView';
 import AddExistingChannelView from '../views/AddExistingChannelView';
 import SelectListView from '../views/SelectListView';
 import DiscussionsView from '../views/DiscussionsView';
+import ChangeAvatarView from '../views/ChangeAvatarView';
 import {
 	AdminPanelStackParamList,
 	ChatsStackParamList,
@@ -96,6 +97,7 @@ const ChatsStackNavigator = () => {
 			<ChatsStack.Screen name='SelectListView' component={SelectListView} options={SelectListView.navigationOptions} />
 			<ChatsStack.Screen name='RoomInfoView' component={RoomInfoView} options={RoomInfoView.navigationOptions} />
 			<ChatsStack.Screen name='RoomInfoEditView' component={RoomInfoEditView} options={RoomInfoEditView.navigationOptions} />
+			<ChatsStack.Screen name='ChangeAvatarView' component={ChangeAvatarView} />
 			<ChatsStack.Screen name='RoomMembersView' component={RoomMembersView} />
 			<ChatsStack.Screen name='DiscussionsView' component={DiscussionsView} />
 			<ChatsStack.Screen
@@ -151,6 +153,7 @@ const ProfileStackNavigator = () => {
 		>
 			<ProfileStack.Screen name='ProfileView' component={ProfileView} options={ProfileView.navigationOptions} />
 			<ProfileStack.Screen name='UserPreferencesView' component={UserPreferencesView} />
+			<ProfileStack.Screen name='ChangeAvatarView' component={ChangeAvatarView} />
 			<ProfileStack.Screen name='UserNotificationPrefView' component={UserNotificationPrefView} />
 			<ProfileStack.Screen name='PickerView' component={PickerView} options={PickerView.navigationOptions} />
 		</ProfileStack.Navigator>
diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx
index dd7cc4d1a..79d8cdd97 100644
--- a/app/stacks/MasterDetailStack/index.tsx
+++ b/app/stacks/MasterDetailStack/index.tsx
@@ -17,6 +17,7 @@ import RoomsListView from '../../views/RoomsListView';
 import RoomActionsView from '../../views/RoomActionsView';
 import RoomInfoView from '../../views/RoomInfoView';
 import RoomInfoEditView from '../../views/RoomInfoEditView';
+import ChangeAvatarView from '../../views/ChangeAvatarView';
 import RoomMembersView from '../../views/RoomMembersView';
 import SearchMessagesView from '../../views/SearchMessagesView';
 import SelectedUsersView from '../../views/SelectedUsersView';
@@ -128,6 +129,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 				<ModalStack.Screen name='RoomInfoView' component={RoomInfoView} options={RoomInfoView.navigationOptions} />
 				<ModalStack.Screen name='SelectListView' component={SelectListView} />
 				<ModalStack.Screen name='RoomInfoEditView' component={RoomInfoEditView} options={RoomInfoEditView.navigationOptions} />
+				<ModalStack.Screen name='ChangeAvatarView' component={ChangeAvatarView} />
 				<ModalStack.Screen name='RoomMembersView' component={RoomMembersView} />
 				<ModalStack.Screen
 					name='SearchMessagesView'
diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts
index f06cfd5b9..42215d5ff 100644
--- a/app/stacks/MasterDetailStack/types.ts
+++ b/app/stacks/MasterDetailStack/types.ts
@@ -6,6 +6,7 @@ import { IMessage } from '../../definitions/IMessage';
 import { ISubscription, SubscriptionType, TSubscriptionModel } from '../../definitions/ISubscription';
 import { ILivechatDepartment } from '../../definitions/ILivechatDepartment';
 import { ILivechatTag } from '../../definitions/ILivechatTag';
+import { TChangeAvatarViewContext } from '../../definitions/TChangeAvatarViewContext';
 
 export type MasterDetailChatsStackParamList = {
 	RoomView: {
@@ -58,6 +59,12 @@ export type ModalStackParamList = {
 		onSearch?: Function;
 		isRadio?: boolean;
 	};
+	ChangeAvatarView: {
+		context: TChangeAvatarViewContext;
+		titleHeader?: string;
+		room?: ISubscription;
+		t?: SubscriptionType;
+	};
 	RoomInfoEditView: {
 		rid: string;
 	};
diff --git a/app/stacks/types.ts b/app/stacks/types.ts
index d7848058d..38c75e6f0 100644
--- a/app/stacks/types.ts
+++ b/app/stacks/types.ts
@@ -13,6 +13,7 @@ import { ModalStackParamList } from './MasterDetailStack/types';
 import { TThreadModel } from '../definitions';
 import { ILivechatDepartment } from '../definitions/ILivechatDepartment';
 import { ILivechatTag } from '../definitions/ILivechatTag';
+import { TChangeAvatarViewContext } from '../definitions/TChangeAvatarViewContext';
 
 export type ChatsStackParamList = {
 	ModalStackNavigator: NavigatorScreenParams<ModalStackParamList>;
@@ -181,6 +182,12 @@ export type ChatsStackParamList = {
 		onlyAudio?: boolean;
 		videoConf?: boolean;
 	};
+	ChangeAvatarView: {
+		context: TChangeAvatarViewContext;
+		titleHeader?: string;
+		room?: ISubscription;
+		t?: SubscriptionType;
+	};
 };
 
 export type ProfileStackParamList = {
@@ -195,6 +202,12 @@ export type ProfileStackParamList = {
 		goBack?: Function;
 		onChangeValue: Function;
 	};
+	ChangeAvatarView: {
+		context: TChangeAvatarViewContext;
+		titleHeader?: string;
+		room?: ISubscription;
+		t?: SubscriptionType;
+	};
 };
 
 export type SettingsStackParamList = {
diff --git a/app/views/ChangeAvatarView/AvatarSuggestion.tsx b/app/views/ChangeAvatarView/AvatarSuggestion.tsx
new file mode 100644
index 000000000..e68c3d2e0
--- /dev/null
+++ b/app/views/ChangeAvatarView/AvatarSuggestion.tsx
@@ -0,0 +1,56 @@
+import React, { useState, useEffect } from 'react';
+import { Text, View } from 'react-native';
+
+import { IAvatar } from '../../definitions';
+import { Services } from '../../lib/services';
+import I18n from '../../i18n';
+import styles from './styles';
+import { useTheme } from '../../theme';
+import AvatarSuggestionItem from './AvatarSuggestionItem';
+
+const AvatarSuggestion = ({
+	onPress,
+	username,
+	resetAvatar
+}: {
+	onPress: (value: IAvatar) => void;
+	username?: string;
+	resetAvatar?: () => void;
+}) => {
+	const [avatarSuggestions, setAvatarSuggestions] = useState<IAvatar[]>([]);
+
+	const { colors } = useTheme();
+
+	useEffect(() => {
+		const getAvatarSuggestion = async () => {
+			const result = await Services.getAvatarSuggestion();
+			const suggestions = Object.keys(result).map(service => {
+				const { url, blob, contentType } = result[service];
+				return {
+					url,
+					data: blob,
+					service,
+					contentType
+				};
+			});
+			setAvatarSuggestions(suggestions);
+		};
+		getAvatarSuggestion();
+	}, []);
+
+	return (
+		<View style={styles.containerImagesUploaded}>
+			<Text style={[styles.itemLabel, { color: colors.titleText }]}>{I18n.t('Images_uploaded')}</Text>
+			<View style={styles.containerAvatarSuggestion}>
+				{username && resetAvatar ? (
+					<AvatarSuggestionItem text={`@${username}`} testID={`reset-avatar-suggestion`} onPress={resetAvatar} />
+				) : null}
+				{avatarSuggestions.slice(0, 7).map(item => (
+					<AvatarSuggestionItem item={item} testID={`${item?.service}-avatar-suggestion`} onPress={onPress} />
+				))}
+			</View>
+		</View>
+	);
+};
+
+export default AvatarSuggestion;
diff --git a/app/views/ChangeAvatarView/AvatarSuggestionItem.tsx b/app/views/ChangeAvatarView/AvatarSuggestionItem.tsx
new file mode 100644
index 000000000..2e0d02bb8
--- /dev/null
+++ b/app/views/ChangeAvatarView/AvatarSuggestionItem.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+
+import { IAvatar } from '../../definitions';
+import Avatar from '../../containers/Avatar';
+import { useTheme } from '../../theme';
+
+const styles = StyleSheet.create({
+	container: {
+		width: 64,
+		height: 64,
+		alignItems: 'center',
+		justifyContent: 'center',
+		marginRight: 20,
+		marginBottom: 12,
+		borderRadius: 4
+	}
+});
+
+const AvatarSuggestionItem = ({
+	item,
+	onPress,
+	text,
+	testID
+}: {
+	item?: IAvatar;
+	testID?: string;
+	onPress: Function;
+	text?: string;
+}) => {
+	const { colors } = useTheme();
+
+	return (
+		<View key={item?.service} testID={testID} style={[styles.container, { backgroundColor: colors.borderColor }]}>
+			<Avatar avatar={item?.url} text={text} size={64} onPress={() => onPress(item)} />
+		</View>
+	);
+};
+
+export default AvatarSuggestionItem;
diff --git a/app/views/ChangeAvatarView/AvatarUrl.tsx b/app/views/ChangeAvatarView/AvatarUrl.tsx
new file mode 100644
index 000000000..dae1d34a6
--- /dev/null
+++ b/app/views/ChangeAvatarView/AvatarUrl.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import I18n from '../../i18n';
+import { FormTextInput } from '../../containers/TextInput';
+import { useDebounce, isImageURL } from '../../lib/methods/helpers';
+
+const AvatarUrl = ({ submit }: { submit: (value: string) => void }) => {
+	const handleChangeText = useDebounce(async (value: string) => {
+		if (value) {
+			const result = await isImageURL(value);
+			if (result) {
+				return submit(value);
+			}
+			return submit('');
+		}
+	}, 500);
+
+	return (
+		<FormTextInput
+			label={I18n.t('Avatar_Url')}
+			placeholder={I18n.t('insert_Avatar_URL')}
+			onChangeText={handleChangeText}
+			testID='change-avatar-view-avatar-url'
+			containerStyle={{ marginBottom: 0 }}
+		/>
+	);
+};
+
+export default AvatarUrl;
diff --git a/app/views/ChangeAvatarView/ImagePicker.mock.ts b/app/views/ChangeAvatarView/ImagePicker.mock.ts
new file mode 100644
index 000000000..e03679862
--- /dev/null
+++ b/app/views/ChangeAvatarView/ImagePicker.mock.ts
@@ -0,0 +1,36 @@
+import { Image as ImageInterface } from 'react-native-image-crop-picker';
+
+import { random } from '../../lib/methods/helpers';
+
+export type Image = ImageInterface;
+
+const mockImageRocketBase64 =
+	'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';
+
+export function openPicker(_options: any): Promise<any> {
+	return Promise.resolve({
+		exif: null,
+		filename: 'IMG_0007.PNG',
+		path: `/tmp/react-native-image-crop-picker/${random(20)}.jpg`,
+		height: 152,
+		width: 152,
+		data: mockImageRocketBase64,
+		modificationDate: null,
+		localIdentifier: 'CEEE9916-81FD-4544-9D86-7044DB6C4374/L0/001',
+		size: 5006,
+		sourceURL: `/tmp/react-native-image-crop-picker/${random(20)}.jpg`,
+		mime: 'image/jpeg',
+		cropRect: {
+			width: 152,
+			height: 152,
+			x: 134,
+			y: 0
+		},
+		duration: null,
+		creationDate: '1679327100'
+	});
+}
+
+export default {
+	openPicker
+};
diff --git a/app/views/ChangeAvatarView/ImagePicker.ts b/app/views/ChangeAvatarView/ImagePicker.ts
new file mode 100644
index 000000000..4c25f6c3e
--- /dev/null
+++ b/app/views/ChangeAvatarView/ImagePicker.ts
@@ -0,0 +1,4 @@
+import ImagePicker, { Image as ImageInterface } from 'react-native-image-crop-picker';
+
+export type Image = ImageInterface;
+export default ImagePicker;
diff --git a/app/views/ChangeAvatarView/index.tsx b/app/views/ChangeAvatarView/index.tsx
new file mode 100644
index 000000000..856f66a22
--- /dev/null
+++ b/app/views/ChangeAvatarView/index.tsx
@@ -0,0 +1,250 @@
+import React, { useEffect, useLayoutEffect, useReducer, useRef, useState } from 'react';
+import { ScrollView, View } from 'react-native';
+import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
+import { shallowEqual } from 'react-redux';
+
+import KeyboardView from '../../containers/KeyboardView';
+import sharedStyles from '../Styles';
+import scrollPersistTaps from '../../lib/methods/helpers/scrollPersistTaps';
+import { showConfirmationAlert, showErrorAlert } from '../../lib/methods/helpers/info';
+import StatusBar from '../../containers/StatusBar';
+import { useTheme } from '../../theme';
+import SafeAreaView from '../../containers/SafeAreaView';
+import * as List from '../../containers/List';
+import styles from './styles';
+import { useAppSelector } from '../../lib/hooks';
+import { getUserSelector } from '../../selectors/login';
+import Avatar from '../../containers/Avatar';
+import AvatarPresentational from '../../containers/Avatar/Avatar';
+import AvatarUrl from './AvatarUrl';
+import Button from '../../containers/Button';
+import I18n from '../../i18n';
+import { ChatsStackParamList } from '../../stacks/types';
+import { IAvatar } from '../../definitions';
+import AvatarSuggestion from './AvatarSuggestion';
+import log from '../../lib/methods/helpers/log';
+import { changeRoomsAvatar, changeUserAvatar, resetUserAvatar } from './submitServices';
+import ImagePicker, { Image } from './ImagePicker';
+
+enum AvatarStateActions {
+	CHANGE_AVATAR = 'CHANGE_AVATAR',
+	RESET_USER_AVATAR = 'RESET_USER_AVATAR',
+	RESET_ROOM_AVATAR = 'RESET_ROOM_AVATAR'
+}
+
+interface IReducerAction {
+	type: AvatarStateActions;
+	payload?: Partial<IState>;
+}
+
+interface IState extends IAvatar {
+	resetUserAvatar: string;
+}
+
+const initialState = {
+	data: '',
+	url: '',
+	contentType: '',
+	service: '',
+	resetUserAvatar: ''
+};
+
+function reducer(state: IState, action: IReducerAction) {
+	const { type, payload } = action;
+	if (type in AvatarStateActions) {
+		return {
+			...initialState,
+			...payload
+		};
+	}
+	return state;
+}
+
+const ChangeAvatarView = () => {
+	const [state, dispatch] = useReducer(reducer, initialState);
+	const [saving, setSaving] = useState(false);
+	const { colors } = useTheme();
+	const { userId, username, server } = useAppSelector(
+		state => ({
+			userId: getUserSelector(state).id,
+			username: getUserSelector(state).username,
+			server: state.server.server
+		}),
+		shallowEqual
+	);
+	const isDirty = useRef<boolean>(false);
+	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'ChangeAvatarView'>>();
+	const { context, titleHeader, room, t } = useRoute<RouteProp<ChatsStackParamList, 'ChangeAvatarView'>>().params;
+
+	useLayoutEffect(() => {
+		navigation.setOptions({
+			title: titleHeader || I18n.t('Avatar')
+		});
+	}, [titleHeader, navigation]);
+
+	useEffect(() => {
+		navigation.addListener('beforeRemove', e => {
+			if (!isDirty.current) {
+				return;
+			}
+
+			e.preventDefault();
+
+			showConfirmationAlert({
+				title: I18n.t('Discard_changes'),
+				message: I18n.t('Discard_changes_description'),
+				confirmationText: I18n.t('Discard'),
+				onPress: () => {
+					navigation.dispatch(e.data.action);
+				}
+			});
+		});
+	}, [navigation]);
+
+	const dispatchAvatar = (action: IReducerAction) => {
+		isDirty.current = true;
+		dispatch(action);
+	};
+
+	const submit = async () => {
+		try {
+			setSaving(true);
+			if (context === 'room' && room?.rid) {
+				// Change Rooms Avatar
+				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(userId);
+			}
+			isDirty.current = false;
+		} catch (e: any) {
+			log(e);
+			return showErrorAlert(e.message, I18n.t('Oops'));
+		} finally {
+			setSaving(false);
+		}
+		return navigation.goBack();
+	};
+
+	const pickImage = async () => {
+		const options = {
+			cropping: true,
+			compressImageQuality: 0.8,
+			freeStyleCropEnabled: true,
+			cropperAvoidEmptySpaceAroundImage: false,
+			cropperChooseText: I18n.t('Choose'),
+			cropperCancelText: I18n.t('Cancel'),
+			includeBase64: true
+		};
+		try {
+			const response: Image = await ImagePicker.openPicker(options);
+			dispatchAvatar({
+				type: AvatarStateActions.CHANGE_AVATAR,
+				payload: { url: response.path, data: `data:image/jpeg;base64,${response.data}`, service: 'upload' }
+			});
+		} catch (error) {
+			log(error);
+		}
+	};
+
+	const deletingRoomAvatar = context === 'room' && state.data === null;
+
+	return (
+		<KeyboardView
+			style={{ backgroundColor: colors.auxiliaryBackground }}
+			contentContainerStyle={sharedStyles.container}
+			keyboardVerticalOffset={128}
+		>
+			<StatusBar />
+			<SafeAreaView testID='change-avatar-view'>
+				<ScrollView
+					contentContainerStyle={sharedStyles.containerScrollView}
+					testID='change-avatar-view-list'
+					{...scrollPersistTaps}
+				>
+					<View style={styles.avatarContainer} testID='change-avatar-view-avatar'>
+						{deletingRoomAvatar ? (
+							<AvatarPresentational
+								text={room?.name || state.resetUserAvatar || username}
+								avatar={state?.url}
+								isStatic={state?.url}
+								size={120}
+								type={t}
+								server={server}
+							/>
+						) : (
+							<Avatar
+								text={room?.name || state.resetUserAvatar || username}
+								avatar={state?.url}
+								isStatic={state?.url}
+								size={120}
+								type={t}
+								rid={room?.rid}
+							/>
+						)}
+					</View>
+					{context === 'profile' ? (
+						<AvatarUrl
+							submit={value =>
+								dispatchAvatar({
+									type: AvatarStateActions.CHANGE_AVATAR,
+									payload: { url: value, data: value, service: 'url' }
+								})
+							}
+						/>
+					) : null}
+					<List.Separator style={styles.separator} />
+					{context === 'profile' ? (
+						<AvatarSuggestion
+							resetAvatar={() =>
+								dispatchAvatar({
+									type: AvatarStateActions.RESET_USER_AVATAR,
+									payload: { resetUserAvatar: `@${username}` }
+								})
+							}
+							username={username}
+							onPress={value =>
+								dispatchAvatar({
+									type: AvatarStateActions.CHANGE_AVATAR,
+									payload: value
+								})
+							}
+						/>
+					) : null}
+					<Button
+						title={I18n.t('Upload_image')}
+						type='secondary'
+						disabled={saving}
+						backgroundColor={colors.editAndUploadButtonAvatar}
+						onPress={pickImage}
+						testID='change-avatar-view-upload-image'
+					/>
+					{context === 'room' ? (
+						<Button
+							title={I18n.t('Delete_image')}
+							type='primary'
+							disabled={saving}
+							backgroundColor={colors.dangerColor}
+							onPress={() => dispatchAvatar({ type: AvatarStateActions.RESET_ROOM_AVATAR, payload: { data: null } })}
+							testID='change-avatar-view-delete-my-account'
+						/>
+					) : null}
+					<Button
+						title={I18n.t('Save')}
+						disabled={!isDirty.current || saving}
+						type='primary'
+						loading={saving}
+						onPress={submit}
+						testID='change-avatar-view-submit'
+					/>
+				</ScrollView>
+			</SafeAreaView>
+		</KeyboardView>
+	);
+};
+
+export default ChangeAvatarView;
diff --git a/app/views/ChangeAvatarView/styles.ts b/app/views/ChangeAvatarView/styles.ts
new file mode 100644
index 000000000..80b7b324e
--- /dev/null
+++ b/app/views/ChangeAvatarView/styles.ts
@@ -0,0 +1,27 @@
+import { StyleSheet } from 'react-native';
+
+import sharedStyles from '../Styles';
+
+export default StyleSheet.create({
+	avatarContainer: {
+		alignItems: 'center',
+		justifyContent: 'center',
+		marginBottom: 24
+	},
+	separator: {
+		marginVertical: 16
+	},
+	itemLabel: {
+		marginBottom: 12,
+		fontSize: 14,
+		...sharedStyles.textSemibold
+	},
+	containerImagesUploaded: {
+		flex: 1
+	},
+	containerAvatarSuggestion: {
+		flex: 1,
+		flexWrap: 'wrap',
+		flexDirection: 'row'
+	}
+});
diff --git a/app/views/ChangeAvatarView/submitHelpers.ts b/app/views/ChangeAvatarView/submitHelpers.ts
new file mode 100644
index 000000000..1bc139198
--- /dev/null
+++ b/app/views/ChangeAvatarView/submitHelpers.ts
@@ -0,0 +1,14 @@
+import I18n from '../../i18n';
+
+export 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) }));
+};
diff --git a/app/views/ChangeAvatarView/submitServices.ts b/app/views/ChangeAvatarView/submitServices.ts
new file mode 100644
index 000000000..f0b3a565b
--- /dev/null
+++ b/app/views/ChangeAvatarView/submitServices.ts
@@ -0,0 +1,29 @@
+import { Services } from '../../lib/services';
+import log from '../../lib/methods/helpers/log';
+import { IAvatar } from '../../definitions';
+import { handleError } from './submitHelpers';
+
+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');
+	}
+};
diff --git a/app/views/ProfileView/index.tsx b/app/views/ProfileView/index.tsx
index f07e97ab2..8e6bd32dd 100644
--- a/app/views/ProfileView/index.tsx
+++ b/app/views/ProfileView/index.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { Keyboard, ScrollView, TextInput, View } from 'react-native';
 import { connect } from 'react-redux';
 import { sha256 } from 'js-sha256';
-import ImagePicker, { Image } from 'react-native-image-crop-picker';
 import RNPickerSelect from 'react-native-picker-select';
 import { dequal } from 'dequal';
 import omit from 'lodash/omit';
@@ -12,16 +11,15 @@ import Touch from '../../containers/Touch';
 import KeyboardView from '../../containers/KeyboardView';
 import sharedStyles from '../Styles';
 import scrollPersistTaps from '../../lib/methods/helpers/scrollPersistTaps';
-import { showConfirmationAlert, showErrorAlert } from '../../lib/methods/helpers';
+import { showErrorAlert, showConfirmationAlert } from '../../lib/methods/helpers';
 import { LISTENER } from '../../containers/Toast';
 import EventEmitter from '../../lib/methods/helpers/events';
 import { FormTextInput } from '../../containers/TextInput';
-import log, { events, logEvent } from '../../lib/methods/helpers/log';
+import { events, logEvent } from '../../lib/methods/helpers/log';
 import I18n from '../../i18n';
 import Button from '../../containers/Button';
-import Avatar from '../../containers/Avatar';
+import { AvatarWithEdit } from '../../containers/Avatar';
 import { setUser } from '../../actions/login';
-import { CustomIcon } from '../../containers/CustomIcon';
 import * as HeaderButton from '../../containers/HeaderButton';
 import StatusBar from '../../containers/StatusBar';
 import { themes } from '../../lib/constants';
@@ -31,15 +29,7 @@ import SafeAreaView from '../../containers/SafeAreaView';
 import styles from './styles';
 import { ProfileStackParamList } from '../../stacks/types';
 import { Services } from '../../lib/services';
-import {
-	IApplicationState,
-	IAvatar,
-	IAvatarButton,
-	IAvatarSuggestion,
-	IBaseScreen,
-	IProfileParams,
-	IUser
-} from '../../definitions';
+import { IApplicationState, IAvatarButton, IBaseScreen, IProfileParams, IUser } from '../../definitions';
 import { twoFactor } from '../../lib/services/twoFactor';
 import { TwoFactorMethods } from '../../definitions/ITotp';
 import { withActionSheet, IActionSheetProvider } from '../../containers/ActionSheet';
@@ -67,9 +57,6 @@ interface IProfileViewState {
 	email: string | null;
 	newPassword: string | null;
 	currentPassword: string | null;
-	avatarUrl: string | null;
-	avatar: IAvatar;
-	avatarSuggestions: IAvatarSuggestion;
 	customFields: {
 		[key: string | number]: string;
 	};
@@ -113,25 +100,12 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 		email: '',
 		newPassword: '',
 		currentPassword: '',
-		avatarUrl: '',
-		avatar: {
-			data: {},
-			url: ''
-		},
-		avatarSuggestions: {},
 		customFields: {},
 		twoFactorCode: null
 	};
 
-	async componentDidMount() {
+	componentDidMount() {
 		this.init();
-
-		try {
-			const result = await Services.getAvatarSuggestion();
-			this.setState({ avatarSuggestions: result });
-		} catch (e) {
-			log(e);
-		}
 	}
 
 	UNSAFE_componentWillReceiveProps(nextProps: IProfileViewProps) {
@@ -147,16 +121,6 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 		}
 	}
 
-	setAvatar = (avatar: IAvatar) => {
-		const { Accounts_AllowUserAvatarChange } = this.props;
-
-		if (!Accounts_AllowUserAvatarChange) {
-			return;
-		}
-
-		this.setState({ avatar });
-	};
-
 	init = (user?: IUser) => {
 		const { user: userProps } = this.props;
 		const { name, username, emails, customFields } = user || userProps;
@@ -167,17 +131,12 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 			email: emails ? emails[0].address : null,
 			newPassword: null,
 			currentPassword: null,
-			avatarUrl: null,
-			avatar: {
-				data: {},
-				url: ''
-			},
 			customFields: customFields || {}
 		});
 	};
 
 	formIsChanged = () => {
-		const { name, username, email, newPassword, avatar, customFields } = this.state;
+		const { name, username, email, newPassword, customFields } = this.state;
 		const { user } = this.props;
 		let customFieldsChanged = false;
 
@@ -196,21 +155,10 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 			!newPassword &&
 			user.emails &&
 			user.emails[0].address === email &&
-			!avatar.data &&
 			!customFieldsChanged
 		);
 	};
 
-	handleError = (e: any, _func: string, action: string) => {
-		if (e.data && e.data.error.includes('[error-too-many-requests]')) {
-			return showErrorAlert(e.data.error);
-		}
-		if (I18n.isTranslated(e.error)) {
-			return showErrorAlert(I18n.t(e.error));
-		}
-		showErrorAlert(I18n.t('There_was_an_error_while_action', { action: I18n.t(action) }));
-	};
-
 	submit = async (): Promise<void> => {
 		Keyboard.dismiss();
 
@@ -220,7 +168,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 
 		this.setState({ saving: true });
 
-		const { name, username, email, newPassword, currentPassword, avatar, customFields, twoFactorCode } = this.state;
+		const { name, username, email, newPassword, currentPassword, customFields, twoFactorCode } = this.state;
 		const { user, dispatch } = this.props;
 		const params = {} as IProfileParams;
 
@@ -273,17 +221,6 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 		}
 
 		try {
-			if (avatar.url) {
-				try {
-					logEvent(events.PROFILE_SAVE_AVATAR);
-					await Services.setAvatarFromService(avatar);
-				} catch (e) {
-					logEvent(events.PROFILE_SAVE_AVATAR_F);
-					this.setState({ saving: false, currentPassword: null });
-					return this.handleError(e, 'setAvatarFromService', 'changing_avatar');
-				}
-			}
-
 			const twoFactorOptions = params.currentPassword
 				? {
 						twoFactorCode: params.currentPassword,
@@ -317,7 +254,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 			}
 			logEvent(events.PROFILE_SAVE_CHANGES_F);
 			this.setState({ saving: false, currentPassword: null, twoFactorCode: null });
-			this.handleError(e, 'saveUserProfile', 'saving_profile');
+			this.handleError(e, 'saving_profile');
 		}
 	};
 
@@ -334,39 +271,23 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 			EventEmitter.emit(LISTENER, { message: I18n.t('Avatar_changed_successfully') });
 			this.init();
 		} catch (e) {
-			this.handleError(e, 'resetAvatar', 'changing_avatar');
+			this.handleError(e, 'changing_avatar');
 		}
 	};
 
-	pickImage = async () => {
-		const { Accounts_AllowUserAvatarChange } = this.props;
-
-		if (!Accounts_AllowUserAvatarChange) {
-			return;
+	handleError = (e: any, action: string) => {
+		if (e.data && e.data.error.includes('[error-too-many-requests]')) {
+			return showErrorAlert(e.data.error);
 		}
-
-		const options = {
-			cropping: true,
-			compressImageQuality: 0.8,
-			freeStyleCropEnabled: true,
-			cropperAvoidEmptySpaceAroundImage: false,
-			cropperChooseText: I18n.t('Choose'),
-			cropperCancelText: I18n.t('Cancel'),
-			includeBase64: true
-		};
-		try {
-			logEvent(events.PROFILE_PICK_AVATAR);
-			const response: Image = await ImagePicker.openPicker(options);
-			this.setAvatar({ url: response.path, data: `data:image/jpeg;base64,${response.data}`, service: 'upload' });
-		} catch (error) {
-			logEvent(events.PROFILE_PICK_AVATAR_F);
-			console.warn(error);
+		if (I18n.isTranslated(e.error)) {
+			return showErrorAlert(I18n.t(e.error));
 		}
+		showErrorAlert(I18n.t('There_was_an_error_while_action', { action: I18n.t(action) }));
 	};
 
-	pickImageWithURL = (avatarUrl: string) => {
-		logEvent(events.PROFILE_PICK_AVATAR_WITH_URL);
-		this.setAvatar({ url: avatarUrl, data: avatarUrl, service: 'url' });
+	handleEditAvatar = () => {
+		const { navigation } = this.props;
+		navigation.navigate('ChangeAvatarView', { context: 'profile' });
 	};
 
 	renderAvatarButton = ({ key, child, onPress, disabled = false }: IAvatarButton) => {
@@ -384,49 +305,6 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 		);
 	};
 
-	renderAvatarButtons = () => {
-		const { avatarUrl, avatarSuggestions } = this.state;
-		const { user, theme, Accounts_AllowUserAvatarChange } = this.props;
-
-		return (
-			<View style={styles.avatarButtons}>
-				{this.renderAvatarButton({
-					child: <Avatar text={`@${user.username}`} size={50} />,
-					onPress: () => this.resetAvatar(),
-					disabled: !Accounts_AllowUserAvatarChange,
-					key: 'profile-view-reset-avatar'
-				})}
-				{this.renderAvatarButton({
-					child: <CustomIcon name='upload' size={30} color={themes[theme].bodyText} />,
-					onPress: () => this.pickImage(),
-					disabled: !Accounts_AllowUserAvatarChange,
-					key: 'profile-view-upload-avatar'
-				})}
-				{this.renderAvatarButton({
-					child: <CustomIcon name='link' size={30} color={themes[theme].bodyText} />,
-					onPress: () => (avatarUrl ? this.pickImageWithURL(avatarUrl) : null),
-					disabled: !avatarUrl,
-					key: 'profile-view-avatar-url-button'
-				})}
-				{Object.keys(avatarSuggestions).map(service => {
-					const { url, blob, contentType } = avatarSuggestions[service];
-					return this.renderAvatarButton({
-						disabled: !Accounts_AllowUserAvatarChange,
-						key: `profile-view-avatar-${service}`,
-						child: <Avatar avatar={url} size={50} />,
-						onPress: () =>
-							this.setAvatar({
-								url,
-								data: blob,
-								service,
-								contentType
-							})
-					});
-				})}
-			</View>
-		);
-	};
-
 	renderCustomFields = () => {
 		const { customFields } = this.state;
 		const { Accounts_CustomFields } = this.props;
@@ -520,7 +398,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 	};
 
 	render() {
-		const { name, username, email, newPassword, avatarUrl, customFields, avatar, saving } = this.state;
+		const { name, username, email, newPassword, customFields, saving } = this.state;
 		const {
 			user,
 			theme,
@@ -543,7 +421,10 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 				<SafeAreaView testID='profile-view'>
 					<ScrollView contentContainerStyle={sharedStyles.containerScrollView} testID='profile-view-list' {...scrollPersistTaps}>
 						<View style={styles.avatarContainer} testID='profile-view-avatar'>
-							<Avatar text={user.username} avatar={avatar?.url} isStatic={avatar?.url} size={100} />
+							<AvatarWithEdit
+								text={user.username}
+								handleEdit={Accounts_AllowUserAvatarChange ? this.handleEditAvatar : undefined}
+							/>
 						</View>
 						<FormTextInput
 							editable={Accounts_AllowRealNameChange}
@@ -615,22 +496,6 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 							testID='profile-view-new-password'
 						/>
 						{this.renderCustomFields()}
-						<FormTextInput
-							editable={Accounts_AllowUserAvatarChange}
-							inputStyle={[!Accounts_AllowUserAvatarChange && styles.disabled]}
-							inputRef={e => {
-								if (e) {
-									this.avatarUrl = e;
-								}
-							}}
-							label={I18n.t('Avatar_Url')}
-							placeholder={I18n.t('Avatar_Url')}
-							value={avatarUrl || undefined}
-							onChangeText={value => this.setState({ avatarUrl: value })}
-							onSubmitEditing={this.submit}
-							testID='profile-view-avatar-url'
-						/>
-						{this.renderAvatarButtons()}
 						<Button
 							title={I18n.t('Save_Changes')}
 							type='primary'
diff --git a/app/views/ProfileView/styles.ts b/app/views/ProfileView/styles.ts
index 874f6fbbe..f9db43c85 100644
--- a/app/views/ProfileView/styles.ts
+++ b/app/views/ProfileView/styles.ts
@@ -7,7 +7,7 @@ export default StyleSheet.create({
 	avatarContainer: {
 		alignItems: 'center',
 		justifyContent: 'center',
-		marginBottom: 10
+		marginBottom: 24
 	},
 	avatarButtons: {
 		flexWrap: 'wrap',
diff --git a/app/views/RoomInfoEditView/index.tsx b/app/views/RoomInfoEditView/index.tsx
index b4b07f70e..31c97b041 100644
--- a/app/views/RoomInfoEditView/index.tsx
+++ b/app/views/RoomInfoEditView/index.tsx
@@ -2,15 +2,13 @@ import React from 'react';
 import { Q } from '@nozbe/watermelondb';
 import { BlockContext } from '@rocket.chat/ui-kit';
 import { dequal } from 'dequal';
-import isEmpty from 'lodash/isEmpty';
 import { Alert, Keyboard, ScrollView, Text, TextInput, TouchableOpacity, View, StyleSheet } from 'react-native';
-import ImagePicker, { Image } from 'react-native-image-crop-picker';
 import { connect } from 'react-redux';
 import { Subscription } from 'rxjs';
 
 import { deleteRoom } from '../../actions/room';
 import { themes } from '../../lib/constants';
-import Avatar from '../../containers/Avatar';
+import { AvatarWithEdit } from '../../containers/Avatar';
 import { sendLoadingEvent } from '../../containers/Loading';
 import SafeAreaView from '../../containers/SafeAreaView';
 import StatusBar from '../../containers/StatusBar';
@@ -23,13 +21,11 @@ import {
 	IRoomSettings,
 	ISubscription,
 	SubscriptionType,
-	TSubscriptionModel,
-	IAvatar
+	TSubscriptionModel
 } from '../../definitions';
 import { ERoomType } from '../../definitions/ERoomType';
 import I18n from '../../i18n';
 import database from '../../lib/database';
-import { CustomIcon } from '../../containers/CustomIcon';
 import KeyboardView from '../../containers/KeyboardView';
 import { TSupportedPermissions } from '../../reducers/permissions';
 import { ModalStackParamList } from '../../stacks/MasterDetailStack/types';
@@ -54,7 +50,6 @@ import { Services } from '../../lib/services';
 
 interface IRoomInfoEditViewState {
 	room: ISubscription;
-	avatar: IAvatar;
 	permissions: { [key in TSupportedPermissions]?: boolean };
 	name: string;
 	description?: string;
@@ -102,7 +97,6 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 		this.room = {} as TSubscriptionModel;
 		this.state = {
 			room: {} as ISubscription,
-			avatar: {} as IAvatar,
 			permissions: {},
 			name: '',
 			description: '',
@@ -192,7 +186,6 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 			topic,
 			announcement,
 			t: t === 'p',
-			avatar: {} as IAvatar,
 			ro,
 			reactWhenReadOnly,
 			joinCode: joinCodeRequired ? this.randomValue : '',
@@ -228,8 +221,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 			joinCode,
 			systemMessages,
 			enableSysMes,
-			encrypted,
-			avatar
+			encrypted
 		} = this.state;
 		const { joinCodeRequired } = room;
 		const sysMes = room.sysMes as string[];
@@ -244,28 +236,15 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 			room.reactWhenReadOnly === reactWhenReadOnly &&
 			dequal(sysMes, systemMessages) &&
 			enableSysMes === (sysMes && sysMes.length > 0) &&
-			room.encrypted === encrypted &&
-			isEmpty(avatar)
+			room.encrypted === encrypted
 		);
 	};
 
 	submit = async () => {
 		logEvent(events.RI_EDIT_SAVE);
 		Keyboard.dismiss();
-		const {
-			room,
-			name,
-			description,
-			topic,
-			announcement,
-			t,
-			ro,
-			reactWhenReadOnly,
-			joinCode,
-			systemMessages,
-			encrypted,
-			avatar
-		} = this.state;
+		const { room, name, description, topic, announcement, t, ro, reactWhenReadOnly, joinCode, systemMessages, encrypted } =
+			this.state;
 
 		sendLoadingEvent({ visible: true });
 		let error = false;
@@ -284,10 +263,6 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 		if (getRoomTitle(room) !== name) {
 			params.roomName = name;
 		}
-		// Avatar
-		if (!isEmpty(avatar)) {
-			params.roomAvatar = avatar.data as string;
-		}
 		// Description
 		if (room.description !== description) {
 			params.roomDescription = description;
@@ -487,26 +462,10 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 		);
 	};
 
-	changeAvatar = async () => {
-		const options = {
-			cropping: true,
-			compressImageQuality: 0.8,
-			cropperAvoidEmptySpaceAroundImage: false,
-			cropperChooseText: I18n.t('Choose'),
-			cropperCancelText: I18n.t('Cancel'),
-			includeBase64: true
-		};
-
-		try {
-			const response: Image = await ImagePicker.openPicker(options);
-			this.setState({ avatar: { url: response.path, data: `data:image/jpeg;base64,${response.data}`, service: 'upload' } });
-		} catch (e) {
-			console.log(e);
-		}
-	};
-
-	resetAvatar = () => {
-		this.setState({ avatar: { data: null } });
+	handleEditAvatar = () => {
+		const { navigation } = this.props;
+		const { room } = this.state;
+		navigation.navigate('ChangeAvatarView', { titleHeader: I18n.t('Room_Info'), room, t: room.t, context: 'room' });
 	};
 
 	toggleRoomType = (value: boolean) => {
@@ -549,8 +508,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 			permissions,
 			archived,
 			enableSysMes,
-			encrypted,
-			avatar
+			encrypted
 		} = this.state;
 		const { serverVersion, encryptionEnabled, theme } = this.props;
 		const { dangerColor } = themes[theme];
@@ -568,29 +526,9 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 						testID='room-info-edit-view-list'
 						{...scrollPersistTaps}
 					>
-						<TouchableOpacity
-							style={styles.avatarContainer}
-							onPress={this.changeAvatar}
-							disabled={compareServerVersion(serverVersion || '', 'lowerThan', '3.6.0')}
-						>
-							<Avatar
-								type={room.t}
-								text={room.name}
-								avatar={avatar?.url}
-								isStatic={avatar?.url}
-								rid={isEmpty(avatar) ? room.rid : undefined}
-								size={100}
-							>
-								{serverVersion && compareServerVersion(serverVersion, 'lowerThan', '3.6.0') ? undefined : (
-									<TouchableOpacity
-										style={[styles.resetButton, { backgroundColor: themes[theme].dangerColor }]}
-										onPress={this.resetAvatar}
-									>
-										<CustomIcon name='delete' color={themes[theme].backgroundColor} size={24} />
-									</TouchableOpacity>
-								)}
-							</Avatar>
-						</TouchableOpacity>
+						<View style={styles.avatarContainer}>
+							<AvatarWithEdit type={room.t} text={room.name} rid={room.rid} handleEdit={this.handleEditAvatar} />
+						</View>
 						<FormTextInput
 							inputRef={e => {
 								this.name = e;
diff --git a/app/views/RoomInfoEditView/styles.ts b/app/views/RoomInfoEditView/styles.ts
index a35fa1dfc..1e643b7b6 100644
--- a/app/views/RoomInfoEditView/styles.ts
+++ b/app/views/RoomInfoEditView/styles.ts
@@ -76,7 +76,8 @@ export default StyleSheet.create({
 	avatarContainer: {
 		alignItems: 'center',
 		justifyContent: 'center',
-		marginBottom: 10
+		marginBottom: 32,
+		marginTop: 16
 	},
 	resetButton: {
 		padding: 4,
diff --git a/app/views/RoomInfoView/index.tsx b/app/views/RoomInfoView/index.tsx
index d57a23bae..d3c839517 100644
--- a/app/views/RoomInfoView/index.tsx
+++ b/app/views/RoomInfoView/index.tsx
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
 import { Observable, Subscription } from 'rxjs';
 import UAParser from 'ua-parser-js';
 
-import Avatar from '../../containers/Avatar';
+import { AvatarWithEdit } from '../../containers/Avatar';
 import { CustomIcon, TIconsName } from '../../containers/CustomIcon';
 import * as HeaderButton from '../../containers/HeaderButton';
 import { MarkdownPreview } from '../../containers/markdown';
@@ -394,17 +394,32 @@ class RoomInfoView extends React.Component<IRoomInfoViewProps, IRoomInfoViewStat
 			log(e);
 		}
 	};
+
+	handleEditAvatar = () => {
+		const { navigation } = this.props;
+		const { room } = this.state;
+		navigation.navigate('ChangeAvatarView', { titleHeader: I18n.t('Room_Info'), room, t: this.t, context: 'room' });
+	};
+
 	renderAvatar = (room: ISubscription, roomUser: IUserParsed) => {
 		const { theme } = this.props;
+		const { showEdit } = this.state;
+		const showAvatarEdit = showEdit && this.t !== SubscriptionType.OMNICHANNEL;
 
 		return (
-			<Avatar text={room.name || roomUser.username} style={styles.avatar} type={this.t} size={100} rid={room?.rid}>
+			<AvatarWithEdit
+				text={room.name || roomUser.username}
+				style={styles.avatar}
+				type={this.t}
+				rid={room?.rid}
+				handleEdit={showAvatarEdit ? this.handleEditAvatar : undefined}
+			>
 				{this.t === SubscriptionType.DIRECT && roomUser._id ? (
 					<View style={[sharedStyles.status, { backgroundColor: themes[theme].auxiliaryBackground }]}>
 						<Status size={20} id={roomUser._id} />
 					</View>
 				) : null}
-			</Avatar>
+			</AvatarWithEdit>
 		);
 	};
 
diff --git a/app/views/RoomInfoView/styles.ts b/app/views/RoomInfoView/styles.ts
index fcee26058..1d405a968 100644
--- a/app/views/RoomInfoView/styles.ts
+++ b/app/views/RoomInfoView/styles.ts
@@ -21,13 +21,14 @@ export default StyleSheet.create({
 		alignItems: 'center',
 		justifyContent: 'center',
 		marginBottom: 20,
-		paddingVertical: 8
+		paddingBottom: 8,
+		paddingTop: 32
 	},
 	avatar: {
 		marginHorizontal: 10
 	},
 	roomTitleContainer: {
-		paddingTop: 20,
+		paddingTop: 32,
 		marginHorizontal: 16,
 		alignItems: 'center'
 	},
diff --git a/app/views/RoomView/LeftButtons.tsx b/app/views/RoomView/LeftButtons.tsx
index e05975551..e0ab07194 100644
--- a/app/views/RoomView/LeftButtons.tsx
+++ b/app/views/RoomView/LeftButtons.tsx
@@ -24,6 +24,7 @@ const styles = StyleSheet.create({
 });
 
 interface ILeftButtonsProps {
+	rid?: string;
 	tmid?: string;
 	unreadsCount: number | null;
 	navigation: StackNavigationProp<ChatsStackParamList, 'RoomView'>;
@@ -38,6 +39,7 @@ interface ILeftButtonsProps {
 }
 
 const LeftButtons = ({
+	rid,
 	tmid,
 	unreadsCount,
 	navigation,
@@ -78,7 +80,7 @@ const LeftButtons = ({
 	}
 
 	if (baseUrl && userId && token) {
-		return <Avatar text={title} size={30} type={t} style={styles.avatar} onPress={onPress} />;
+		return <Avatar rid={rid} text={title} size={30} type={t} style={styles.avatar} onPress={onPress} />;
 	}
 	return null;
 };
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index a3ad8b025..8ed4b40da 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -589,6 +589,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			headerRightContainerStyle: { flexGrow: undefined, flexBasis: undefined },
 			headerLeft: () => (
 				<LeftButtons
+					rid={rid}
 					tmid={tmid}
 					unreadsCount={unreadsCount}
 					navigation={navigation}
diff --git a/e2e/README.md b/e2e/README.md
index a9fbe68bc..114aee841 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -33,8 +33,7 @@ WIP: End-to-end tests are a work in progress and they're going to change.
     - Ask Diego Mello for credentials
 
 ## Shared config
-- Change `.env` to `RUNNING_E2E_TESTS=true`
-  - You can also `RUNNING_E2E_TESTS=true yarn start reset-cache`, but it's easier to change the file as long as you don't commit it
+- To start the Metro bundler in the mocked mode, you should run `yarn e2e:start`
 
 ## Setup and run iOS
 
diff --git a/e2e/helpers/data_setup.ts b/e2e/helpers/data_setup.ts
index b805ee4f7..9537115b8 100644
--- a/e2e/helpers/data_setup.ts
+++ b/e2e/helpers/data_setup.ts
@@ -136,3 +136,8 @@ export const post = async (endpoint: string, body: any, user: ITestUser) => {
 	console.log(`POST /${endpoint} ${JSON.stringify(body)}`);
 	return rocketchat.post(endpoint, body);
 };
+
+export const getProfileInfo = async (userId: string) => {
+	const result = await get(`users.info?userId=${userId}`);
+	return result.data.user;
+};
diff --git a/e2e/tests/assorted/03-profile.spec.ts b/e2e/tests/assorted/03-profile.spec.ts
index df4c8ef3b..221ebf020 100644
--- a/e2e/tests/assorted/03-profile.spec.ts
+++ b/e2e/tests/assorted/03-profile.spec.ts
@@ -11,14 +11,13 @@ async function waitForToast() {
 }
 
 describe('Profile screen', () => {
-	let scrollViewType: string;
 	let textMatcher: TTextMatcher;
 	let user: ITestUser;
 
 	beforeAll(async () => {
 		user = await createRandomUser();
 		await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
-		({ scrollViewType, textMatcher } = platformTypes[device.getPlatform()]);
+		({ textMatcher } = platformTypes[device.getPlatform()]);
 		await navigateToLogin();
 		await login(user.username, user.password);
 		await element(by.id('rooms-list-view-sidebar')).tap();
@@ -43,6 +42,10 @@ describe('Profile screen', () => {
 			await expect(element(by.id('profile-view-avatar')).atIndex(0)).toExist();
 		});
 
+		it('should have avatar edit button', async () => {
+			await expect(element(by.id('avatar-edit-button'))).toExist();
+		});
+
 		it('should have name', async () => {
 			await expect(element(by.id('profile-view-name'))).toExist();
 		});
@@ -59,31 +62,6 @@ describe('Profile screen', () => {
 			await expect(element(by.id('profile-view-new-password'))).toExist();
 		});
 
-		it('should have avatar url', async () => {
-			await expect(element(by.id('profile-view-avatar-url'))).toExist();
-		});
-
-		it('should have reset avatar button', async () => {
-			await waitFor(element(by.id('profile-view-reset-avatar')))
-				.toExist()
-				.whileElement(by.id('profile-view-list'))
-				.scroll(scrollDown, 'down');
-		});
-
-		it('should have upload avatar button', async () => {
-			await waitFor(element(by.id('profile-view-upload-avatar')))
-				.toExist()
-				.whileElement(by.id('profile-view-list'))
-				.scroll(scrollDown, 'down');
-		});
-
-		it('should have avatar url button', async () => {
-			await waitFor(element(by.id('profile-view-avatar-url-button')))
-				.toExist()
-				.whileElement(by.id('profile-view-list'))
-				.scroll(scrollDown, 'down');
-		});
-
 		it('should have submit button', async () => {
 			await waitFor(element(by.id('profile-view-submit')))
 				.toExist()
@@ -96,17 +74,23 @@ describe('Profile screen', () => {
 		it('should change name and username', async () => {
 			await element(by.id('profile-view-name')).replaceText(`${user.username}new`);
 			await element(by.id('profile-view-username')).replaceText(`${user.username}new`);
+			// dismiss keyboard
 			await element(by.id('profile-view-list')).swipe('down');
 			await element(by.id('profile-view-submit')).tap();
 			await waitForToast();
 		});
 
 		it('should change email and password', async () => {
+			await element(by.id('profile-view-list')).swipe('up');
 			await waitFor(element(by.id('profile-view-email')))
 				.toBeVisible()
 				.withTimeout(2000);
 			await element(by.id('profile-view-email')).replaceText(`mobile+profileChangesNew${random()}@rocket.chat`);
+			// dismiss keyboard
+			await element(by.id('profile-view-list')).swipe('down');
 			await element(by.id('profile-view-new-password')).replaceText(`${user.password}new`);
+			// dismiss keyboard
+			await element(by.id('profile-view-list')).swipe('down');
 			await waitFor(element(by.id('profile-view-submit')))
 				.toExist()
 				.withTimeout(2000);
@@ -120,11 +104,5 @@ describe('Profile screen', () => {
 				.tap();
 			await waitForToast();
 		});
-
-		it('should reset avatar', async () => {
-			await element(by.type(scrollViewType)).atIndex(1).swipe('up');
-			await element(by.id('profile-view-reset-avatar')).tap();
-			await waitForToast();
-		});
 	});
 });
diff --git a/e2e/tests/assorted/15-change-avatar.spec.ts b/e2e/tests/assorted/15-change-avatar.spec.ts
new file mode 100644
index 000000000..a3ca766a6
--- /dev/null
+++ b/e2e/tests/assorted/15-change-avatar.spec.ts
@@ -0,0 +1,94 @@
+import { device, waitFor, element, by } from 'detox';
+
+import { navigateToLogin, login, sleep, platformTypes, TTextMatcher, tapBack } from '../../helpers/app';
+import { createRandomUser, getProfileInfo, ITestUser, login as loginSetup } from '../../helpers/data_setup';
+
+describe('Profile screen', () => {
+	let scrollViewType: string;
+	let textMatcher: TTextMatcher;
+	let user: ITestUser;
+	let userId: string;
+
+	beforeAll(async () => {
+		user = await createRandomUser();
+		const result = await loginSetup(user.username, user.password);
+		userId = result.userId;
+		await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
+		({ scrollViewType, textMatcher } = platformTypes[device.getPlatform()]);
+		await navigateToLogin();
+		await login(user.username, user.password);
+		await element(by.id('rooms-list-view-sidebar')).tap();
+		await waitFor(element(by.id('sidebar-view')))
+			.toBeVisible()
+			.withTimeout(2000);
+		await waitFor(element(by.id('sidebar-profile')))
+			.toBeVisible()
+			.withTimeout(2000);
+		await element(by.id('sidebar-profile')).tap();
+		await waitFor(element(by.id('profile-view')))
+			.toBeVisible()
+			.withTimeout(2000);
+	});
+
+	describe('Usage', () => {
+		it('should click on the reset avatar button', async () => {
+			await element(by.type(scrollViewType)).atIndex(1).swipe('down');
+			await element(by.id('avatar-edit-button')).tap();
+			await waitFor(element(by.id('change-avatar-view-avatar')))
+				.toBeVisible()
+				.withTimeout(2000);
+			await waitFor(element(by.id('reset-avatar-suggestion')))
+				.toBeVisible()
+				.withTimeout(2000);
+			await element(by.id('reset-avatar-suggestion')).tap();
+			await sleep(300);
+		});
+
+		it('should appear the discard alert when click the back icon ', async () => {
+			await tapBack();
+			await waitFor(element(by[textMatcher]('Discard changes?')).atIndex(0))
+				.toBeVisible()
+				.withTimeout(2000);
+			await waitFor(element(by[textMatcher]('Cancel')).atIndex(0))
+				.toBeVisible()
+				.withTimeout(2000);
+			await element(by[textMatcher]('Cancel')).atIndex(0).tap();
+			await sleep(200);
+			await tapBack();
+			await waitFor(element(by[textMatcher]('Discard changes?')).atIndex(0))
+				.toBeVisible()
+				.withTimeout(2000);
+			await waitFor(element(by[textMatcher]('Discard')).atIndex(0))
+				.toBeVisible()
+				.withTimeout(2000);
+			await element(by[textMatcher]('Discard')).atIndex(0).tap();
+			await sleep(200);
+		});
+
+		it('should change the avatar through a base64 image mocked', async () => {
+			await element(by.type(scrollViewType)).atIndex(1).swipe('down');
+			await element(by.id('avatar-edit-button')).tap();
+			const previousUserInfo = await getProfileInfo(userId);
+			const previousAvatarEtag = previousUserInfo.avatarETag;
+			await sleep(500);
+			await waitFor(element(by.id('change-avatar-view-upload-image')))
+				.toBeVisible()
+				.withTimeout(2000);
+			await element(by.id('change-avatar-view-upload-image')).tap();
+			await waitFor(element(by.id('change-avatar-view-submit')))
+				.toBeVisible()
+				.withTimeout(2000);
+			await element(by.id('change-avatar-view-submit')).tap();
+			await waitFor(element(by.id('profile-view')))
+				.toBeVisible()
+				.withTimeout(2000);
+			await sleep(300);
+			const newUserInfo = await getProfileInfo(userId);
+			const newAvatarEtag = newUserInfo.avatarETag;
+			await sleep(500);
+			if (previousAvatarEtag === newAvatarEtag) {
+				throw new Error('Failed to update the avatar');
+			}
+		});
+	});
+});
diff --git a/e2e/tests/room/08-roominfo.spec.ts b/e2e/tests/room/08-roominfo.spec.ts
index 67b839712..b5df534eb 100644
--- a/e2e/tests/room/08-roominfo.spec.ts
+++ b/e2e/tests/room/08-roominfo.spec.ts
@@ -16,7 +16,7 @@ async function navigateToRoomInfo(room: string) {
 }
 
 async function swipe(direction: Detox.Direction) {
-	await element(by.id('room-info-edit-view-list')).swipe(direction, 'fast', 0.8, 0.2);
+	await element(by.id('room-info-edit-view-list')).swipe(direction);
 }
 
 async function waitForToast() {
@@ -185,6 +185,8 @@ describe('Room info screen', () => {
 				await sleep(5000); // wait for changes to be applied from socket
 				await element(by.id('room-info-edit-view-description')).replaceText('new description');
 				await element(by.id('room-info-edit-view-topic')).replaceText('new topic');
+				await swipe('down'); // dismiss keyboard
+				// announcement is hide by the keyboard
 				await element(by.id('room-info-edit-view-announcement')).replaceText('new announcement');
 				await element(by.id('room-info-edit-view-announcement')).tapReturnKey();
 				await element(by.id('room-info-edit-view-password')).tapReturnKey();
@@ -243,6 +245,7 @@ describe('Room info screen', () => {
 			});
 
 			it('should delete room', async () => {
+				await element(by.id('room-info-edit-view-list')).swipe('up');
 				await element(by.id('room-info-edit-view-delete')).tap();
 				await waitFor(element(by[textMatcher]('Yes, delete it!')))
 					.toExist()
diff --git a/e2e/tests/team/01-createteam.spec.ts b/e2e/tests/team/01-createteam.spec.ts
index 12588f8a2..a155ac0cf 100644
--- a/e2e/tests/team/01-createteam.spec.ts
+++ b/e2e/tests/team/01-createteam.spec.ts
@@ -85,7 +85,7 @@ describe('Create team screen', () => {
 			await waitFor(element(by.id('room-info-edit-view-list')))
 				.toBeVisible()
 				.withTimeout(2000);
-			await element(by.id('room-info-edit-view-list')).swipe('up', 'fast', 0.5);
+			await element(by.id('room-info-edit-view-list')).swipe('up');
 			await waitFor(element(by.id('room-info-edit-view-delete')))
 				.toBeVisible()
 				.withTimeout(2000);
diff --git a/metro.config.js b/metro.config.js
index 8c7ba14bc..ffdaf6bcd 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -8,6 +8,8 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 const blocklist = require('metro-config/src/defaults/exclusionList');
 
+const defaultSourceExts = require('metro-config/src/defaults/defaults').sourceExts;
+
 module.exports = {
 	transformer: {
 		getTransformOptions: () => ({
@@ -20,6 +22,7 @@ module.exports = {
 	maxWorkers: 2,
 	resolver: {
 		blocklistRE: blocklist([/ios\/Pods\/JitsiMeetSDK\/Frameworks\/JitsiMeet.framework\/assets\/node_modules\/react-native\/.*/]),
-		resolverMainFields: ['sbmodern', 'react-native', 'browser', 'main']
+		resolverMainFields: ['sbmodern', 'react-native', 'browser', 'main'],
+		sourceExts: process.env.RUNNING_E2E_TESTS ? ['mock.ts', ...defaultSourceExts] : defaultSourceExts
 	}
 };
diff --git a/package.json b/package.json
index 112fd706e..fde06214f 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
 		"e2e:ios-build-debug": "yarn detox build -c ios.sim.debug",
 		"e2e:ios-test-debug": "yarn detox test -c ios.sim.debug",
 		"e2e:ios-build": "yarn detox build -c ios.sim.release",
-		"e2e:ios-test": "yarn detox test -c ios.sim.release"
+		"e2e:ios-test": "yarn detox test -c ios.sim.release",
+		"e2e:start": "RUNNING_E2E_TESTS=true npx react-native start"
 	},
 	"lint-staged": {
 		"*.{js,ts,tsx}": [
diff --git a/yarn.lock b/yarn.lock
index 054a9b2ea..5c777ce75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17413,7 +17413,7 @@ react-native-gradle-plugin@^0.0.6:
 
 react-native-image-crop-picker@RocketChat/react-native-image-crop-picker:
   version "0.36.3"
-  resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/f347776247afb5cbd1400dde215689d7ca8fd6f2"
+  resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/35f5c90576cadcdd4c0eb5cef83a9f1b7b7e26e3"
 
 react-native-image-progress@^1.1.1:
   version "1.1.1"