refactor: rename DisplayPictureModal to EditProfilePictureModal

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,

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 (

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 && <SessionConfirm {...confirmModalState} />}
       {reactListModalState && <ReactListModal {...reactListModalState} />}
       {reactClearAllModalState && <ReactClearAllModal {...reactClearAllModalState} />}
-      {DisplayPictureModalState && <DisplayPictureModal {...DisplayPictureModalState} />}
+      {EditProfilePictureModalState && (
+        <EditProfilePictureModal {...EditProfilePictureModalState} />
+      )}
     </>
   );
 };

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<ReactModalsState>) {
       return { ...state, reactClearAllModalState: action.payload };
     },
-    updateDisplayPictureModel(state, action: PayloadAction<DisplayPictureModalState>) {
+    updateEditProfilePictureModel(state, action: PayloadAction<EditProfilePictureModalState>) {
       return { ...state, displayPictureModalState: action.payload };
     },
   },
@@ -159,6 +159,6 @@ export const {
   updateBanOrUnbanUserModal,
   updateReactListModal,
   updateReactClearAllModal,
-  updateDisplayPictureModel,
+  updateEditProfilePictureModel,
 } = actions;
 export const modalReducer = reducer;

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
 );