From 977dbea9dca8071fcd808fe245556dcd52ccfcac Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 23 May 2023 17:01:56 +1000 Subject: [PATCH] refactor: rename DisplayPictureModal to EditProfilePictureModal --- ts/components/dialog/EditProfileDialog.tsx | 4 ++-- ...yPictureModal.tsx => EditProfilePictureModal.tsx} | 12 ++++++------ ts/components/dialog/ModalContainer.tsx | 10 ++++++---- ts/state/ducks/modalDialog.tsx | 10 +++++----- ts/state/selectors/modal.ts | 6 +++--- 5 files changed, 22 insertions(+), 20 deletions(-) rename ts/components/dialog/{DisplayPictureModal.tsx => EditProfilePictureModal.tsx} (92%) diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx index bf5f80343..3b5b4e848 100644 --- a/ts/components/dialog/EditProfileDialog.tsx +++ b/ts/components/dialog/EditProfileDialog.tsx @@ -7,7 +7,7 @@ import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils'; import { YourSessionIDPill, YourSessionIDSelectable } from '../basic/YourSessionIDPill'; import { getConversationController } from '../../session/conversations'; -import { editProfileModal, updateDisplayPictureModel } from '../../state/ducks/modalDialog'; +import { editProfileModal, updateEditProfilePictureModel } from '../../state/ducks/modalDialog'; import { saveQRCode } from '../../util/saveQRCode'; import { setLastProfileUpdateTimestamp } from '../../util/storage'; import { SessionWrapperModal } from '../SessionWrapperModal'; @@ -191,7 +191,7 @@ export const EditProfileDialog = (): ReactElement => { const handleProfileHeaderClick = () => { closeDialog(); dispatch( - updateDisplayPictureModel({ + updateEditProfilePictureModel({ avatarPath, profileName, ourId, diff --git a/ts/components/dialog/DisplayPictureModal.tsx b/ts/components/dialog/EditProfilePictureModal.tsx similarity index 92% rename from ts/components/dialog/DisplayPictureModal.tsx rename to ts/components/dialog/EditProfilePictureModal.tsx index 47a124bbf..187ddb604 100644 --- a/ts/components/dialog/DisplayPictureModal.tsx +++ b/ts/components/dialog/EditProfilePictureModal.tsx @@ -3,7 +3,7 @@ import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SpacerLG } from '../basic/Text'; import { useDispatch } from 'react-redux'; -import { editProfileModal, updateDisplayPictureModel } from '../../state/ducks/modalDialog'; +import { editProfileModal, updateEditProfilePictureModel } from '../../state/ducks/modalDialog'; import { ProfileAvatar } from './EditProfileDialog'; import styled from 'styled-components'; import { clearOurAvatar, uploadOurAvatar } from '../../interactions/conversationInteractions'; @@ -60,13 +60,13 @@ const uploadProfileAvatar = async (scaledAvatarUrl: string | null) => { } }; -export type DisplayPictureModalProps = { +export type EditProfilePictureModalProps = { avatarPath: string | null; profileName: string | undefined; ourId: string; }; -export const DisplayPictureModal = (props: DisplayPictureModalProps) => { +export const EditProfilePictureModal = (props: EditProfilePictureModalProps) => { const dispatch = useDispatch(); if (!props) { @@ -79,7 +79,7 @@ export const DisplayPictureModal = (props: DisplayPictureModalProps) => { const [loading, setLoading] = useState(false); const closeDialog = () => { - dispatch(updateDisplayPictureModel(null)); + dispatch(updateEditProfilePictureModel(null)); dispatch(editProfileModal({})); }; @@ -99,7 +99,7 @@ export const DisplayPictureModal = (props: DisplayPictureModalProps) => { await uploadProfileAvatar(newAvatarObjectUrl); setLoading(false); - dispatch(updateDisplayPictureModel(null)); + dispatch(updateEditProfilePictureModel(null)); }; const handleRemove = async () => { @@ -107,7 +107,7 @@ export const DisplayPictureModal = (props: DisplayPictureModalProps) => { await clearOurAvatar(); setNewAvatarObjectUrl(null); setLoading(false); - dispatch(updateDisplayPictureModel(null)); + dispatch(updateEditProfilePictureModel(null)); }; return ( diff --git a/ts/components/dialog/ModalContainer.tsx b/ts/components/dialog/ModalContainer.tsx index 131f81495..b7f5f32a3 100644 --- a/ts/components/dialog/ModalContainer.tsx +++ b/ts/components/dialog/ModalContainer.tsx @@ -7,7 +7,7 @@ import { getChangeNickNameDialog, getConfirmModal, getDeleteAccountModalState, - getDisplayPictureModalState, + getEditProfilePictureModalState, getEditProfileDialog, getInviteContactModal, getOnionPathDialog, @@ -37,7 +37,7 @@ import { SessionNicknameDialog } from './SessionNicknameDialog'; import { BanOrUnBanUserDialog } from './BanOrUnbanUserDialog'; import { ReactListModal } from './ReactListModal'; import { ReactClearAllModal } from './ReactClearAllModal'; -import { DisplayPictureModal } from './DisplayPictureModal'; +import { EditProfilePictureModal } from './EditProfilePictureModal'; export const ModalContainer = () => { const confirmModalState = useSelector(getConfirmModal); @@ -57,7 +57,7 @@ export const ModalContainer = () => { const banOrUnbanUserModalState = useSelector(getBanOrUnbanUserModalState); const reactListModalState = useSelector(getReactListDialog); const reactClearAllModalState = useSelector(getReactClearAllDialog); - const DisplayPictureModalState = useSelector(getDisplayPictureModalState); + const EditProfilePictureModalState = useSelector(getEditProfilePictureModalState); return ( <> @@ -82,7 +82,9 @@ export const ModalContainer = () => { {confirmModalState && } {reactListModalState && } {reactClearAllModalState && } - {DisplayPictureModalState && } + {EditProfilePictureModalState && ( + + )} ); }; diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx index 238bf54ac..8cd86097a 100644 --- a/ts/state/ducks/modalDialog.tsx +++ b/ts/state/ducks/modalDialog.tsx @@ -1,7 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm'; import { PasswordAction } from '../../components/dialog/SessionPasswordDialog'; -import { DisplayPictureModalProps } from '../../components/dialog/DisplayPictureModal'; +import { EditProfilePictureModalProps } from '../../components/dialog/EditProfilePictureModal'; export type BanType = 'ban' | 'unban'; export type ConfirmModalState = SessionConfirmDialogProps | null; @@ -35,7 +35,7 @@ export type ReactModalsState = { messageId: string; } | null; -export type DisplayPictureModalState = DisplayPictureModalProps | null; +export type EditProfilePictureModalState = EditProfilePictureModalProps | null; export type ModalState = { confirmModal: ConfirmModalState; @@ -55,7 +55,7 @@ export type ModalState = { deleteAccountModal: DeleteAccountModalState; reactListModalState: ReactModalsState; reactClearAllModalState: ReactModalsState; - displayPictureModalState: DisplayPictureModalState; + displayPictureModalState: EditProfilePictureModalState; }; export const initialModalState: ModalState = { @@ -134,7 +134,7 @@ const ModalSlice = createSlice({ updateReactClearAllModal(state, action: PayloadAction) { return { ...state, reactClearAllModalState: action.payload }; }, - updateDisplayPictureModel(state, action: PayloadAction) { + updateEditProfilePictureModel(state, action: PayloadAction) { return { ...state, displayPictureModalState: action.payload }; }, }, @@ -159,6 +159,6 @@ export const { updateBanOrUnbanUserModal, updateReactListModal, updateReactClearAllModal, - updateDisplayPictureModel, + updateEditProfilePictureModel, } = actions; export const modalReducer = reducer; diff --git a/ts/state/selectors/modal.ts b/ts/state/selectors/modal.ts index efb38e1a5..8b12869c5 100644 --- a/ts/state/selectors/modal.ts +++ b/ts/state/selectors/modal.ts @@ -8,7 +8,7 @@ import { ChangeNickNameModalState, ConfirmModalState, DeleteAccountModalState, - DisplayPictureModalState, + EditProfilePictureModalState, EditProfileModalState, InviteContactModalState, ModalState, @@ -111,7 +111,7 @@ export const getReactClearAllDialog = createSelector( (state: ModalState): ReactModalsState => state.reactClearAllModalState ); -export const getDisplayPictureModalState = createSelector( +export const getEditProfilePictureModalState = createSelector( getModal, - (state: ModalState): DisplayPictureModalState => state.displayPictureModalState + (state: ModalState): EditProfilePictureModalState => state.displayPictureModalState );