diff --git a/native/avatars/avatar.react.js b/native/avatars/avatar.react.js
--- a/native/avatars/avatar.react.js
+++ b/native/avatars/avatar.react.js
@@ -7,9 +7,16 @@
import Multimedia from '../media/multimedia.react.js';
+export type AvatarSize =
+ | 'micro'
+ | 'small'
+ | 'large'
+ | 'profile'
+ | 'profileLarge';
+
type Props = {
+avatarInfo: ResolvedClientAvatar,
- +size: 'micro' | 'small' | 'large' | 'profile',
+ +size: AvatarSize,
};
function Avatar(props: Props): React.Node {
@@ -22,8 +29,10 @@
return styles.small;
} else if (size === 'large') {
return styles.large;
+ } else if (size === 'profile') {
+ return styles.profile;
}
- return styles.profile;
+ return styles.profileLarge;
}, [size]);
const emojiContainerStyle = React.useMemo(() => {
@@ -43,8 +52,10 @@
return styles.emojiSmall;
} else if (size === 'large') {
return styles.emojiLarge;
+ } else if (size === 'profile') {
+ return styles.emojiProfile;
}
- return styles.emojiProfile;
+ return styles.emojiProfileLarge;
}, [size]);
const avatar = React.useMemo(() => {
@@ -92,6 +103,10 @@
textAlign: 'center',
},
emojiProfile: {
+ fontSize: 64,
+ textAlign: 'center',
+ },
+ emojiProfileLarge: {
fontSize: 80,
textAlign: 'center',
},
@@ -113,6 +128,11 @@
width: 16,
},
profile: {
+ borderRadius: 45,
+ height: 90,
+ width: 90,
+ },
+ profileLarge: {
borderRadius: 56,
height: 112,
width: 112,
diff --git a/native/avatars/edit-thread-avatar.react.js b/native/avatars/edit-thread-avatar.react.js
--- a/native/avatars/edit-thread-avatar.react.js
+++ b/native/avatars/edit-thread-avatar.react.js
@@ -99,7 +99,7 @@
return (
-
+
{spinner}
{!disabled ? : null}
diff --git a/native/avatars/edit-user-avatar.react.js b/native/avatars/edit-user-avatar.react.js
--- a/native/avatars/edit-user-avatar.react.js
+++ b/native/avatars/edit-user-avatar.react.js
@@ -127,9 +127,9 @@
const { userID } = props;
const userAvatar = userID ? (
-
+
) : (
-
+
);
const { disabled } = props;
diff --git a/native/avatars/emoji-avatar-creation.react.js b/native/avatars/emoji-avatar-creation.react.js
--- a/native/avatars/emoji-avatar-creation.react.js
+++ b/native/avatars/emoji-avatar-creation.react.js
@@ -102,7 +102,7 @@
-
+
{loadingContainer}
Edit Emoji
diff --git a/native/avatars/thread-avatar.react.js b/native/avatars/thread-avatar.react.js
--- a/native/avatars/thread-avatar.react.js
+++ b/native/avatars/thread-avatar.react.js
@@ -10,12 +10,12 @@
import { threadTypes } from 'lib/types/thread-types-enum.js';
import { type RawThreadInfo, type ThreadInfo } from 'lib/types/thread-types.js';
-import Avatar from './avatar.react.js';
+import Avatar, { type AvatarSize } from './avatar.react.js';
import { useSelector } from '../redux/redux-utils.js';
type Props = {
+threadInfo: RawThreadInfo | ThreadInfo,
- +size: 'micro' | 'small' | 'large' | 'profile',
+ +size: AvatarSize,
};
function ThreadAvatar(props: Props): React.Node {
diff --git a/native/avatars/user-avatar.react.js b/native/avatars/user-avatar.react.js
--- a/native/avatars/user-avatar.react.js
+++ b/native/avatars/user-avatar.react.js
@@ -8,13 +8,12 @@
} from 'lib/shared/avatar-utils.js';
import type { GenericUserInfoWithAvatar } from 'lib/types/avatar-types.js';
-import Avatar from './avatar.react.js';
+import Avatar, { type AvatarSize } from './avatar.react.js';
import { useSelector } from '../redux/redux-utils.js';
-type Size = 'micro' | 'small' | 'large' | 'profile';
type Props =
- | { +userID: ?string, +size: Size }
- | { +userInfo: ?GenericUserInfoWithAvatar, +size: Size };
+ | { +userID: ?string, +size: AvatarSize }
+ | { +userInfo: ?GenericUserInfoWithAvatar, +size: AvatarSize };
function UserAvatar(props: Props): React.Node {
const { userID, userInfo: userInfoProp, size } = props;
diff --git a/native/roles/change-roles-screen.react.js b/native/roles/change-roles-screen.react.js
--- a/native/roles/change-roles-screen.react.js
+++ b/native/roles/change-roles-screen.react.js
@@ -212,7 +212,7 @@
-
+
{memberInfo.username}
{roleSelector}