refactor useAvatarETag

app/containers/Avatar/useAvatarETag.ts

@@ -1,5 +1,5 @@
 import { Q } from '@nozbe/watermelondb';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Observable, Subscription } from 'rxjs';
 
 import { TSubscriptionModel, TUserModel } from '../../definitions';
@@ -16,19 +16,14 @@ export const useAvatarETag = ({
 	text: string;
 	rid?: string;
 }) => {
-	const subscription = useRef<Subscription>();
 	const [avatarETag, setAvatarETag] = useState<string | undefined>('');
 
 	const isDirect = () => type === 'd';
 
-	const unsubscribeQuery = () => {
+	useEffect(() => {
-		if (subscription?.current?.unsubscribe) {
+		let subscription: Subscription;
-			subscription.current.unsubscribe();
+		if (!avatarETag) {
-		}
+			(async () => {
-	};
-
-	const init = async () => {
-		unsubscribeQuery();
 				const db = database.active;
 				const usersCollection = db.get('users');
 				const subsCollection = db.get('subscriptions');
@@ -47,19 +42,19 @@ export const useAvatarETag = ({
 
 				if (record) {
 					const observable = record.observe() as Observable<TSubscriptionModel | TUserModel>;
-			subscription.current = observable.subscribe(r => {
+					subscription = observable.subscribe(r => {
 						setAvatarETag(r.avatarETag);
 					});
 				}
-	};
+			})();
 
-	useEffect(() => {
+			return () => {
-		if (!avatarETag) {
+				if (subscription?.unsubscribe) {
-			init();
+					subscription.unsubscribe();
+				}
+			};
 		}
 	}, [text]);
 
-	useEffect(() => () => unsubscribeQuery(), []);
-
 	return { avatarETag };
 };