From 3c69a8cba0e030b9aa09093a95e99da67d967a53 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 28 Jun 2022 12:51:21 +0530 Subject: [PATCH] refactor download app message --- src/components/Sidebar/HelpSection.tsx | 17 +++-------------- src/components/pages/gallery/Upload.tsx | 15 ++------------- src/utils/ui/index.tsx | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 27 deletions(-) create mode 100644 src/utils/ui/index.tsx diff --git a/src/components/Sidebar/HelpSection.tsx b/src/components/Sidebar/HelpSection.tsx index 0c9478958..b499ae170 100644 --- a/src/components/Sidebar/HelpSection.tsx +++ b/src/components/Sidebar/HelpSection.tsx @@ -7,12 +7,13 @@ import { convertBytesToHumanReadable } from 'utils/billing'; import { getEndpoint } from 'utils/common/apiUtil'; import { getToken } from 'utils/common/key'; import isElectron from 'is-electron'; -import { downloadApp, initiateEmail } from 'utils/common'; +import { initiateEmail } from 'utils/common'; import { AppContext } from 'pages/_app'; import { useLocalState } from 'hooks/useLocalState'; import { LS_KEYS } from 'utils/storage/localStorage'; import { UserDetails } from 'types/user'; import EnteSpinner from 'components/EnteSpinner'; +import { getDownloadAppMessage } from 'utils/ui'; export default function HelpSection() { const [userDetails] = useLocalState(LS_KEYS.USER_DETAILS); @@ -34,19 +35,7 @@ export default function HelpSection() { if (isElectron()) { setExportModalView(true); } else { - setDialogMessage({ - title: constants.DOWNLOAD_APP, - content: constants.DOWNLOAD_APP_MESSAGE, - - proceed: { - text: constants.DOWNLOAD, - action: downloadApp, - variant: 'accent', - }, - close: { - text: constants.CLOSE, - }, - }); + setDialogMessage(getDownloadAppMessage()); } } diff --git a/src/components/pages/gallery/Upload.tsx b/src/components/pages/gallery/Upload.tsx index 188c972fb..886a3cf1d 100644 --- a/src/components/pages/gallery/Upload.tsx +++ b/src/components/pages/gallery/Upload.tsx @@ -33,6 +33,7 @@ import { } from 'types/upload/ui'; import { UPLOAD_STAGES } from 'constants/upload'; import importService from 'services/importService'; +import { getDownloadAppMessage } from 'utils/ui'; const FIRST_ALBUM_NAME = 'My First Album'; @@ -501,19 +502,7 @@ export default function Upload(props: Props) { } else if (type === UPLOAD_TYPE.FOLDERS) { props.showUploadDirsDialog(); } else { - appContext.setDialogMessage({ - title: constants.DOWNLOAD_APP, - content: constants.DOWNLOAD_APP_MESSAGE, - - proceed: { - text: constants.DOWNLOAD, - action: downloadApp, - variant: 'accent', - }, - close: { - text: constants.CLOSE, - }, - }); + appContext.setDialogMessage(getDownloadAppMessage()); } }; diff --git a/src/utils/ui/index.tsx b/src/utils/ui/index.tsx new file mode 100644 index 000000000..774623355 --- /dev/null +++ b/src/utils/ui/index.tsx @@ -0,0 +1,19 @@ +import { DialogBoxAttributes } from 'types/dialogBox'; +import { downloadApp } from 'utils/common'; +import constants from 'utils/strings/constants'; + +export const getDownloadAppMessage = (): DialogBoxAttributes => { + return { + title: constants.DOWNLOAD_APP, + content: constants.DOWNLOAD_APP_MESSAGE, + + proceed: { + text: constants.DOWNLOAD, + action: downloadApp, + variant: 'accent', + }, + close: { + text: constants.CLOSE, + }, + }; +};