diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js --- a/native/avatars/avatar-hooks.js +++ b/native/avatars/avatar-hooks.js @@ -204,7 +204,7 @@ } else if (option.id === 'ens') { return 'Use ENS Avatar'; } else if (option.id === 'remove') { - return 'Remove avatar'; + return 'Clear avatar'; } else { return 'Cancel'; } 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 @@ -62,20 +62,25 @@ [removeThreadAvatar, threadInfo.id], ); - const actionSheetConfig = React.useMemo( - () => [ + const actionSheetConfig = React.useMemo(() => { + const configOptions = [ { id: 'emoji', onPress: navigateToThreadEmojiAvatarCreation }, { id: 'image', onPress: selectFromGallery }, { id: 'camera', onPress: navigateToCamera }, - { id: 'remove', onPress: removeAvatar }, - ], - [ - navigateToCamera, - navigateToThreadEmojiAvatarCreation, - removeAvatar, - selectFromGallery, - ], - ); + ]; + + if (threadInfo.avatar) { + configOptions.push({ id: 'remove', onPress: removeAvatar }); + } + + return configOptions; + }, [ + navigateToCamera, + navigateToThreadEmojiAvatarCreation, + removeAvatar, + selectFromGallery, + threadInfo.avatar, + ]); const showAvatarActionSheet = useShowAvatarActionSheet(actionSheetConfig); 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 @@ -64,10 +64,13 @@ configOptions.push({ id: 'ens', onPress: setENSUserAvatar }); } - configOptions.push({ id: 'remove', onPress: removeUserAvatar }); + if (currentUserInfo?.avatar) { + configOptions.push({ id: 'remove', onPress: removeUserAvatar }); + } return configOptions; }, [ + currentUserInfo?.avatar, ensAvatarURI, navigateToCamera, navigateToUserEmojiAvatarCreation,