regression: UserAvatar should always render BaseAvatar

apps/meteor/client/providers/AvatarUrlProvider.tsx

@@ -13,7 +13,7 @@ const AvatarUrlProvider = ({ children }: AvatarUrlProviderProps) => {
 	const contextValue = useMemo(() => {
 		function getUserPathAvatar(username: string, etag?: string): string;
 		function getUserPathAvatar({ userId, etag }: { userId: string; etag?: string }): string;
-		function getUserPathAvatar({ username, etag }: { username: string; etag?: string }): string;
+		function getUserPathAvatar({ username, etag }: { username?: string; etag?: string }): string;
 		function getUserPathAvatar(...args: any): string {
 			if (typeof args[0] === 'string') {
 				const [username, etag] = args;

packages/ui-avatar/src/components/UserAvatar.tsx

@@ -13,6 +13,7 @@ type UserIdProp = {
 	userId: string;
 	username?: never;
 };
+
 type UserAvatarProps = Omit<BaseAvatarProps, 'url' | 'title'> & {
 	etag?: string;
 	url?: string;
@@ -26,12 +27,9 @@ const UserAvatar = ({ username, userId, etag, ...rest }: UserAvatarProps) => {
 		const { url = getUserAvatarPath({ userId, etag }), ...props } = rest;
 		return <BaseAvatar url={url} {...props} />;
 	}
-	if (username) {
-		const { url = getUserAvatarPath({ username, etag }), ...props } = rest;
-		return <BaseAvatar url={url} data-username={username} title={username} {...props} />;
-	}
 
-	throw new Error('ui-avatar(UserAvatar) - Either username or userId must be provided');
+	const { url = getUserAvatarPath({ username, etag }), ...props } = rest;
+	return <BaseAvatar url={url} data-username={username} title={username} {...props} />;
 };
 
 export default memo(UserAvatar);

packages/ui-contexts/src/AvatarUrlContext.ts

@@ -6,7 +6,7 @@ export type AvatarUrlContextValue = {
 	getUserPathAvatar: {
 		(username: string, etag?: string): string;
 		(params: { userId: string; etag?: string }): string;
-		(params: { username: string; etag?: string }): string;
+		(params: { username?: string; etag?: string }): string;
 	};
 	getRoomPathAvatar: (...args: any) => string;
 };

packages/ui-contexts/src/hooks/useUserAvatarPath.ts

@@ -1,5 +1,5 @@
 import { useContext } from 'react';
 
-import { AvatarUrlContext, type AvatarUrlContextValue } from '../AvatarUrlContext';
+import { AvatarUrlContext } from '../AvatarUrlContext';
 
-export const useUserAvatarPath = (): AvatarUrlContextValue['getUserPathAvatar'] => useContext(AvatarUrlContext).getUserPathAvatar;
+export const useUserAvatarPath = () => useContext(AvatarUrlContext).getUserPathAvatar;