move all dialogs to a subfolder

ts/components/dialog/EditProfileDialog.tsx

@@ -2,24 +2,24 @@ import React from 'react';
 import classNames from 'classnames';
 import { QRCode } from 'react-qr-svg';
 
-import { Avatar, AvatarSize } from './Avatar';
+import { Avatar, AvatarSize } from '../Avatar';
 
-import { SessionButton, SessionButtonColor, SessionButtonType } from './session/SessionButton';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../session/SessionButton';
 
-import { SessionIconButton, SessionIconSize, SessionIconType } from './session/icon';
-import { PillDivider } from './session/PillDivider';
-import { SyncUtils, ToastUtils, UserUtils } from '../session/utils';
-import { MAX_USERNAME_LENGTH } from './session/registration/RegistrationTabs';
-import { SessionSpinner } from './session/SessionSpinner';
-import { ConversationModel, ConversationTypeEnum } from '../models/conversation';
+import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
+import { PillDivider } from '../session/PillDivider';
+import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils';
+import { MAX_USERNAME_LENGTH } from '../session/registration/RegistrationTabs';
+import { SessionSpinner } from '../session/SessionSpinner';
+import { ConversationModel, ConversationTypeEnum } from '../../models/conversation';
 
-import { SessionWrapperModal } from './session/SessionWrapperModal';
-import { AttachmentUtil } from '../util';
-import { getConversationController } from '../session/conversations';
-import { SpacerLG, SpacerMD } from './basic/Text';
+import { SessionWrapperModal } from '../session/SessionWrapperModal';
+import { AttachmentUtil } from '../../util';
+import { getConversationController } from '../../session/conversations';
+import { SpacerLG, SpacerMD } from '../basic/Text';
 import autoBind from 'auto-bind';
-import { editProfileModal } from '../state/ducks/modalDialog';
-import { uploadOurAvatar } from '../interactions/conversationInteractions';
+import { editProfileModal } from '../../state/ducks/modalDialog';
+import { uploadOurAvatar } from '../../interactions/conversationInteractions';
 
 interface State {
   profileName: string;

ts/components/dialog/ModalContainer.tsx

@@ -16,20 +16,20 @@ import {
   getUpdateGroupNameModal,
   getUserDetailsModal,
 } from '../../state/selectors/modal';
-import { AdminLeaveClosedGroupDialog } from '../conversation/AdminLeaveClosedGroupDialog';
-import { InviteContactsDialog } from '../conversation/InviteContactsDialog';
-import { AddModeratorsDialog } from '../conversation/ModeratorsAddDialog';
-import { RemoveModeratorsDialog } from '../conversation/ModeratorsRemoveDialog';
-import { UpdateGroupMembersDialog } from '../conversation/UpdateGroupMembersDialog';
-import { UpdateGroupNameDialog } from '../conversation/UpdateGroupNameDialog';
-import { DeleteAccountModal } from '../dialog/DeleteAccountModal';
-import { EditProfileDialog } from '../EditProfileDialog';
-import { OnionPathModal } from '../OnionStatusPathDialog';
-import { UserDetailsDialog } from '../UserDetailsDialog';
+import { AdminLeaveClosedGroupDialog } from './AdminLeaveClosedGroupDialog';
+import { InviteContactsDialog } from './InviteContactsDialog';
+import { DeleteAccountModal } from './DeleteAccountModal';
+import { EditProfileDialog } from './EditProfileDialog';
+import { OnionPathModal } from './OnionStatusPathDialog';
+import { UserDetailsDialog } from './UserDetailsDialog';
 import { SessionConfirm } from './SessionConfirm';
-import { SessionNicknameDialog } from './SessionNicknameDialog';
-import { SessionPasswordModal } from './SessionPasswordModal';
+import { SessionPasswordDialog } from './SessionPasswordDialog';
 import { SessionSeedModal } from './SessionSeedModal';
+import { AddModeratorsDialog } from './ModeratorsAddDialog';
+import { RemoveModeratorsDialog } from './ModeratorsRemoveDialog';
+import { UpdateGroupMembersDialog } from './UpdateGroupMembersDialog';
+import { UpdateGroupNameDialog } from './UpdateGroupNameDialog';
+import { SessionNicknameDialog } from './SessionNicknameDialog';
 
 export const ModalContainer = () => {
   const confirmModalState = useSelector(getConfirmModal);
@@ -65,7 +65,7 @@ export const ModalContainer = () => {
       {adminLeaveClosedGroupModalState && (
         <AdminLeaveClosedGroupDialog {...adminLeaveClosedGroupModalState} />
       )}
-      {sessionPasswordModalState && <SessionPasswordModal {...sessionPasswordModalState} />}
+      {sessionPasswordModalState && <SessionPasswordDialog {...sessionPasswordModalState} />}
       {deleteAccountModalState && <DeleteAccountModal {...deleteAccountModalState} />}
     </>
   );

ts/components/dialog/OnionStatusPathDialog.tsx

@@ -2,30 +2,27 @@ import React from 'react';
 
 import _ from 'lodash';
 
-import { getTheme } from '../state/selectors/theme';
-
 import Electron from 'electron';
 const { shell } = Electron;
 
 import { useDispatch, useSelector } from 'react-redux';
-import { SessionIcon, SessionIconButton, SessionIconSize, SessionIconType } from './session/icon';
-
-import { SessionWrapperModal } from './session/SessionWrapperModal';
 
 import ip2country from 'ip2country';
 import countryLookup from 'country-code-lookup';
 import { useTheme } from 'styled-components';
-import { Snode } from '../data/data';
-import { onionPathModal } from '../state/ducks/modalDialog';
+import { Snode } from '../../data/data';
+import { onionPathModal } from '../../state/ducks/modalDialog';
 import {
   getFirstOnionPath,
   getFirstOnionPathLength,
   getIsOnline,
   getOnionPathsCount,
-} from '../state/selectors/onions';
-
-import { SessionSpinner } from './session/SessionSpinner';
-import { Flex } from './basic/Flex';
+} from '../../state/selectors/onions';
+import { getTheme } from '../../state/selectors/theme';
+import { Flex } from '../basic/Flex';
+import { SessionIcon, SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
+import { SessionSpinner } from '../session/SessionSpinner';
+import { SessionWrapperModal } from '../session/SessionWrapperModal';
 
 export type StatusLightType = {
   glowStartDelay: number;

ts/components/dialog/SessionConfirm.tsx

@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
-import { SessionButton, SessionButtonColor } from './SessionButton';
-import { SessionHtmlRenderer } from './SessionHTMLRenderer';
-import { SessionIcon, SessionIconSize, SessionIconType } from './icon';
+import { SessionButton, SessionButtonColor } from '../session/SessionButton';
+import { SessionHtmlRenderer } from '../session/SessionHTMLRenderer';
+import { SessionIcon, SessionIconSize, SessionIconType } from '../session/icon';
 import { DefaultTheme, useTheme, withTheme } from 'styled-components';
-import { SessionWrapperModal } from './SessionWrapperModal';
+import { SessionWrapperModal } from '../session/SessionWrapperModal';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
 import { SpacerLG } from '../basic/Text';
-import { SessionSpinner } from './SessionSpinner';
+import { SessionSpinner } from '../session/SessionSpinner';
 
 export interface SessionConfirmDialogProps {
   message?: string;

ts/components/dialog/SessionModal.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import { SessionIconButton, SessionIconSize, SessionIconType } from './icon/';
-import { SessionButtonColor, SessionButtonType } from './SessionButton';
 import { DefaultTheme } from 'styled-components';
+import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
+import { SessionButtonColor, SessionButtonType } from '../session/SessionButton';
 
 interface Props {
   title: string;

ts/components/dialog/SessionNicknameDialog.tsx

@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
 import { getConversationController } from '../../session/conversations';
-import { SessionButton } from './SessionButton';
 
 import _ from 'lodash';
-import { SessionWrapperModal } from './SessionWrapperModal';
 import { SpacerLG } from '../basic/Text';
 import { useDispatch } from 'react-redux';
 import { changeNickNameModal } from '../../state/ducks/modalDialog';
+import { SessionButton } from '../session/SessionButton';
+import { SessionWrapperModal } from '../session/SessionWrapperModal';
 
 type Props = {
   conversationId: string;

ts/components/dialog/SessionPasswordDialog.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
-import { SessionButton, SessionButtonColor } from './SessionButton';
-import { missingCaseError, PasswordUtil } from '../../util/';
+import { SessionButton, SessionButtonColor } from '../session/SessionButton';
+import { missingCaseError, PasswordUtil } from '../../util';
 import { ToastUtils } from '../../session/utils';
-import { SessionIconType } from './icon';
+import { SessionIconType } from '../session/icon';
 import { getPasswordHash } from '../../data/data';
-import { SessionWrapperModal } from './SessionWrapperModal';
+import { SessionWrapperModal } from '../session/SessionWrapperModal';
 import { SpacerLG, SpacerSM } from '../basic/Text';
 import autoBind from 'auto-bind';
 import { sessionPassword } from '../../state/ducks/modalDialog';
@@ -23,7 +23,7 @@ interface State {
   currentPasswordRetypeEntered: string | null;
 }
 
-export class SessionPasswordModal extends React.Component<Props, State> {
+export class SessionPasswordDialog extends React.Component<Props, State> {
   private passportInput: HTMLInputElement | null = null;
 
   constructor(props: any) {

ts/components/dialog/SessionSeedModal.tsx

@@ -1,13 +1,13 @@
 import React from 'react';
 
-import { SessionButton } from './SessionButton';
+import { SessionButton } from '../session/SessionButton';
 import { ToastUtils, UserUtils } from '../../session/utils';
 import { withTheme } from 'styled-components';
 import { PasswordUtil } from '../../util';
 import { getPasswordHash } from '../../data/data';
 import { QRCode } from 'react-qr-svg';
 import { mn_decode } from '../../session/crypto/mnemonic';
-import { SessionWrapperModal } from './SessionWrapperModal';
+import { SessionWrapperModal } from '../session/SessionWrapperModal';
 import { SpacerLG, SpacerSM, SpacerXS } from '../basic/Text';
 import autoBind from 'auto-bind';
 import { recoveryPhraseModal } from '../../state/ducks/modalDialog';

ts/components/dialog/UserDetailsDialog.tsx

@@ -1,17 +1,16 @@
 import React, { useState } from 'react';
-import { Avatar, AvatarSize } from './Avatar';
 
-import { SessionButton, SessionButtonColor, SessionButtonType } from './session/SessionButton';
-import { SessionIdEditable } from './session/SessionIdEditable';
-import { getConversationController } from '../session/conversations';
-import { ConversationTypeEnum } from '../models/conversation';
-import { SessionWrapperModal } from './session/SessionWrapperModal';
-import { SpacerMD } from './basic/Text';
-import { updateUserDetailsModal } from '../state/ducks/modalDialog';
-import { openConversationWithMessages } from '../state/ducks/conversations';
 // tslint:disable-next-line: no-submodule-imports
 import useKey from 'react-use/lib/useKey';
-import { getFirstUnreadMessageIdInConversation } from '../data/data';
+import { ConversationTypeEnum } from '../../models/conversation';
+import { getConversationController } from '../../session/conversations';
+import { openConversationWithMessages } from '../../state/ducks/conversations';
+import { updateUserDetailsModal } from '../../state/ducks/modalDialog';
+import { Avatar, AvatarSize } from '../Avatar';
+import { SpacerMD } from '../basic/Text';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../session/SessionButton';
+import { SessionIdEditable } from '../session/SessionIdEditable';
+import { SessionWrapperModal } from '../session/SessionWrapperModal';
 type Props = {
   conversationId: string;
   authorAvatarPath: string | null;

ts/components/session/ActionsPanel.tsx

@@ -37,20 +37,16 @@ import { getOpenGroupManager } from '../../opengroup/opengroupV2/OpenGroupManage
 import { forceRefreshRandomSnodePool } from '../../session/snode_api/snodePool';
 import { getSwarmPollingInstance } from '../../session/snode_api';
 import { DURATION } from '../../session/constants';
-import {
-  actions as conversationActions,
-  conversationChanged,
-  conversationRemoved,
-} from '../../state/ducks/conversations';
+import { conversationChanged, conversationRemoved } from '../../state/ducks/conversations';
 import { editProfileModal, onionPathModal } from '../../state/ducks/modalDialog';
 import { uploadOurAvatar } from '../../interactions/conversationInteractions';
-import { ModalContainer } from './ModalContainer';
+import { ModalContainer } from '../dialog/ModalContainer';
 import { debounce } from 'underscore';
 import { loadDefaultRooms } from '../../opengroup/opengroupV2/ApiUtil';
-import { ActionPanelOnionStatusLight } from '../OnionStatusPathDialog';
 
 // tslint:disable-next-line: no-import-side-effect no-submodule-imports
 
+import { ActionPanelOnionStatusLight } from '../dialog/OnionStatusPathDialog';
 const Section = (props: { type: SectionType; avatarPath?: string }) => {
   const ourNumber = useSelector(getOurNumber);
   const unreadMessageCount = useSelector(getUnreadMessageCount);

ts/components/session/settings/SessionSettingListItem.tsx

@@ -7,7 +7,7 @@ import { SessionToggle } from '../SessionToggle';
 import { SessionButton } from '../SessionButton';
 import { SessionSettingType } from './SessionSettings';
 import { SessionRadioGroup } from '../SessionRadioGroup';
-import { SessionConfirmDialogProps } from '../SessionConfirm';
+import { SessionConfirmDialogProps } from '../../dialog/SessionConfirm';
 
 type Props = {
   title?: string;

ts/components/session/settings/SessionSettings.tsx

@@ -8,22 +8,20 @@ import { ConversationLookupType } from '../../../state/ducks/conversations';
 import { StateType } from '../../../state/reducer';
 import { getConversationController } from '../../../session/conversations';
 import { getConversationLookup } from '../../../state/selectors/conversations';
-import { connect, useSelector } from 'react-redux';
+import { connect } from 'react-redux';
 import {
   createOrUpdateItem,
   getPasswordHash,
   hasLinkPreviewPopupBeenDisplayed,
 } from '../../../../ts/data/data';
-import { SpacerLG, SpacerXS } from '../../basic/Text';
 import { shell } from 'electron';
-import { SessionConfirmDialogProps } from '../SessionConfirm';
+import { SessionConfirmDialogProps } from '../../dialog/SessionConfirm';
 import { mapDispatchToProps } from '../../../state/actions';
 import { unblockConvoById } from '../../../interactions/conversationInteractions';
 import { toggleAudioAutoplay } from '../../../state/ducks/userConfig';
 import { sessionPassword } from '../../../state/ducks/modalDialog';
-import { PasswordAction } from '../SessionPasswordModal';
+import { PasswordAction } from '../../dialog/SessionPasswordDialog';
 import { SessionIconButton, SessionIconSize, SessionIconType } from '../icon';
-import { withTheme } from 'styled-components';
 
 export enum SessionSettingCategory {
   Appearance = 'appearance',

ts/state/ducks/modalDialog.tsx

@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { SessionConfirmDialogProps } from '../../components/session/SessionConfirm';
-import { PasswordAction } from '../../components/session/SessionPasswordModal';
+import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm';
+import { PasswordAction } from '../../components/dialog/SessionPasswordDialog';
 
 export type ConfirmModalState = SessionConfirmDialogProps | null;
 export type InviteContactModalState = { conversationId: string } | null;