fix import

src/components/Collections/CollectionSelector/index.tsx

@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useMemo } from 'react';
 import { Collection, CollectionSummaries } from 'types/collection';
-import DialogTitleWithCloseButton from 'components/DialogBox/titleWithCloseButton';
+import DialogTitleWithCloseButton from 'components/DialogBox/TitleWithCloseButton';
 import { isSystemCollection } from 'utils/collection';
 import { AppContext } from 'pages/_app';
 import { AllCollectionDialog } from 'components/Collections/AllCollections/dialog';

src/components/Collections/CollectionShare/index.tsx

@@ -2,8 +2,9 @@ import EmailShare from './emailShare';
 import React, { useContext } from 'react';
 import constants from 'utils/strings/constants';
 import { Collection } from 'types/collection';
-import { dialogCloseHandler } from 'components/DialogBox/base';
-import DialogTitleWithCloseButton from 'components/DialogBox/titleWithCloseButton';
+import DialogTitleWithCloseButton, {
+    dialogCloseHandler,
+} from 'components/DialogBox/TitleWithCloseButton';
 import DialogContent from '@mui/material/DialogContent';
 import { Divider } from '@mui/material';
 

src/components/MemberSubscriptionManage.tsx

@@ -5,7 +5,7 @@ import React, { useContext } from 'react';
 import billingService from 'services/billingService';
 import { getFamilyPlanAdmin } from 'utils/billing';
 import constants from 'utils/strings/constants';
-import DialogTitleWithCloseButton from './DialogBox/titleWithCloseButton';
+import DialogTitleWithCloseButton from './DialogBox/TitleWithCloseButton';
 export function MemberSubscriptionManage({ open, userDetails, onClose }) {
     const { setDialogMessage, isMobile } = useContext(AppContext);
 

src/components/PhotoSwipe/InfoDialog/index.tsx

@@ -5,7 +5,7 @@ import { RenderFileName } from './RenderFileName';
 import { ExifData } from './ExifData';
 import { RenderCreationTime } from './RenderCreationTime';
 import { RenderInfoItem } from './RenderInfoItem';
-import DialogTitleWithCloseButton from 'components/DialogBox/titleWithCloseButton';
+import DialogTitleWithCloseButton from 'components/DialogBox/TitleWithCloseButton';
 import { Dialog, DialogContent, Link, styled, Typography } from '@mui/material';
 import { AppContext } from 'pages/_app';
 

src/components/RecoveryKey/index.tsx

@@ -13,7 +13,7 @@ import {
 import * as bip39 from 'bip39';
 import { DashedBorderWrapper } from './styledComponents';
 import { AppContext } from 'pages/_app';
-import DialogTitleWithCloseButton from 'components/DialogBox/titleWithCloseButton';
+import DialogTitleWithCloseButton from 'components/DialogBox/TitleWithCloseButton';
 
 // mobile client library only supports english.
 bip39.setDefaultWordlist('english');

src/components/UploadProgress/dialog.tsx

@@ -8,8 +8,8 @@ import { InProgressSection } from './inProgressSection';
 import { ResultSection } from './resultSection';
 import { NotUploadSectionHeader } from './styledComponents';
 import { getOSSpecificDesktopAppDownloadLink } from 'utils/common';
-import { dialogCloseHandler } from 'components/DialogBox/base';
 import UploadProgressContext from 'contexts/uploadProgress';
+import { dialogCloseHandler } from 'components/DialogBox/TitleWithCloseButton';
 
 export function UploadProgressDialog() {
     const { open, onClose, uploadStage, finishedUploads } = useContext(

src/components/pages/gallery/PlanSelector/index.tsx

@@ -24,7 +24,7 @@ import { AppContext } from 'pages/_app';
 import Plans from './plans';
 import { Box, Dialog, DialogContent, styled } from '@mui/material';
 import { CenteredFlex } from 'components/Container';
-import DialogTitleWithCloseButton from 'components/DialogBox/titleWithCloseButton';
+import DialogTitleWithCloseButton from 'components/DialogBox/TitleWithCloseButton';
 
 interface Props {
     modalView: boolean;

src/components/pages/gallery/UploadStrategyChoiceModal.tsx

@@ -1,8 +1,8 @@
-import { Button, Dialog, DialogContent } from '@mui/material';
+import { Button, Dialog, DialogContent, Typography } from '@mui/material';
 import { CenteredFlex, SpaceBetweenFlex } from 'components/Container';
-import { dialogCloseHandler } from 'components/DialogBox/base';
-import MessageText from 'components/DialogBox/messageText';
-import DialogTitleWithCloseButton from 'components/DialogBox/titleWithCloseButton';
+import DialogTitleWithCloseButton, {
+    dialogCloseHandler,
+} from 'components/DialogBox/TitleWithCloseButton';
 import React from 'react';
 import constants from 'utils/strings/constants';
 
@@ -28,9 +28,9 @@ function UploadStrategyChoiceModal({
             </DialogTitleWithCloseButton>
             <DialogContent>
                 <CenteredFlex mb={1}>
-                    <MessageText>
+                    <Typography color="text.secondary">
                         {constants.UPLOAD_STRATEGY_CHOICE}
-                    </MessageText>
+                    </Typography>
                 </CenteredFlex>
                 <SpaceBetweenFlex px={2}>
                     <Button

src/themes/darkThemeOptions.tsx

@@ -233,7 +233,7 @@ const darkThemeOptions = createTheme({
     typography: {
         body1: {
             fontSize: '16px',
-            lineHeight: '20px',
+            lineHeight: '19px',
         },
         body2: {
             fontSize: '14px',