diff --git a/web/avatars/avatar-hooks.react.js b/web/avatars/avatar-hooks.react.js new file mode 100644 index 000000000..dbfd73bd8 --- /dev/null +++ b/web/avatars/avatar-hooks.react.js @@ -0,0 +1,32 @@ +// @flow + +import * as React from 'react'; + +import { uploadMultimedia } from 'lib/actions/upload-actions.js'; +import type { UploadMultimediaResult } from 'lib/types/media-types.js'; +import { useServerCall } from 'lib/utils/action-utils.js'; + +import { validateFile } from '../media/media-utils.js'; + +function useUploadAvatarMedia(): File => Promise { + const callUploadMultimedia = useServerCall(uploadMultimedia); + const uploadAvatarMedia = React.useCallback( + async (file: File): Promise => { + const validatedFile = await validateFile(file); + const { result } = validatedFile; + if (!result.success) { + throw new Error('Avatar media validation failed.'); + } + const { file: fixedFile, dimensions } = result; + const uploadExtras = { + ...dimensions, + loop: false, + }; + return await callUploadMultimedia(fixedFile, uploadExtras); + }, + [callUploadMultimedia], + ); + return uploadAvatarMedia; +} + +export { useUploadAvatarMedia }; diff --git a/web/avatars/edit-user-avatar-menu.react.js b/web/avatars/edit-user-avatar-menu.react.js index 5313022f0..ad9275bf4 100644 --- a/web/avatars/edit-user-avatar-menu.react.js +++ b/web/avatars/edit-user-avatar-menu.react.js @@ -1,151 +1,153 @@ // @flow import invariant from 'invariant'; import * as React from 'react'; import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js'; import { useModalContext } from 'lib/components/modal-provider.react.js'; import SWMansionIcon from 'lib/components/SWMansionIcon.react.js'; import { useENSAvatar } from 'lib/hooks/ens-cache.js'; import { getETHAddressForUserInfo } from 'lib/shared/account-utils.js'; +import { useUploadAvatarMedia } from './avatar-hooks.react.js'; import css from './edit-user-avatar-menu.css'; import EmojiAvatarSelectionModal from './emoji-avatar-selection-modal.react.js'; import CommIcon from '../CommIcon.react.js'; import MenuItem from '../components/menu-item.react.js'; import Menu from '../components/menu.react.js'; import { allowedMimeTypeString } from '../media/file-utils.js'; import { useSelector } from '../redux/redux-utils.js'; const editIcon = (
); function EditUserAvatarMenu(): React.Node { const currentUserInfo = useSelector(state => state.currentUserInfo); const ethAddress: ?string = React.useMemo( () => getETHAddressForUserInfo(currentUserInfo), [currentUserInfo], ); const ensAvatarURI: ?string = useENSAvatar(ethAddress); const editUserAvatarContext = React.useContext(EditUserAvatarContext); invariant(editUserAvatarContext, 'editUserAvatarContext should be set'); const { baseSetUserAvatar } = editUserAvatarContext; const removeUserAvatar = React.useCallback( () => baseSetUserAvatar({ type: 'remove' }), [baseSetUserAvatar], ); const { pushModal } = useModalContext(); const openEmojiSelectionModal = React.useCallback( () => pushModal(), [pushModal], ); const emojiMenuItem = React.useMemo( () => ( ), [openEmojiSelectionModal], ); const imageInputRef = React.useRef(); const onImageMenuItemClicked = React.useCallback( () => imageInputRef.current?.click(), [], ); + const uploadAvatarMedia = useUploadAvatarMedia(); const onImageSelected = React.useCallback( - event => console.log(event.target.files), - [], + event => uploadAvatarMedia(event.target.files[0]), + [uploadAvatarMedia], ); const imageMenuItem = React.useMemo( () => ( ), [onImageMenuItemClicked], ); const setENSUserAvatar = React.useCallback( () => baseSetUserAvatar({ type: 'ens' }), [baseSetUserAvatar], ); const ethereumIcon = React.useMemo( () => , [], ); const ensMenuItem = React.useMemo( () => ( ), [ethereumIcon, setENSUserAvatar], ); const removeMenuItem = React.useMemo( () => ( ), [removeUserAvatar], ); const menuItems = React.useMemo(() => { const items = [emojiMenuItem, imageMenuItem]; if (ensAvatarURI) { items.push(ensMenuItem); } if (currentUserInfo?.avatar) { items.push(removeMenuItem); } return items; }, [ currentUserInfo?.avatar, emojiMenuItem, ensAvatarURI, ensMenuItem, imageMenuItem, removeMenuItem, ]); return (
{menuItems}
); } export default EditUserAvatarMenu;