diff --git a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/AdditionalMonthlySpend.tsx b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/AdditionalMonthlySpend.tsx index d78b34b0846..671f9520f5e 100644 --- a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/AdditionalMonthlySpend.tsx +++ b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/AdditionalMonthlySpend.tsx @@ -1,32 +1,10 @@ -import { instanceSizeSpecs } from 'data/projects/new-project.constants' -import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext' - -export const AdditionalMonthlySpend = () => { - const { project } = useProjectContext() - - /** - * New project will have the same compute size and disk size as the original project - */ - function getAdditionalMonthlySpend() { - const currentProjectComputeSize = project?.infra_compute_size - if (!currentProjectComputeSize) { - return null - } - - if (currentProjectComputeSize === 'nano') { - return null - } - - const additionalMonthlySpend = instanceSizeSpecs[currentProjectComputeSize] - - return additionalMonthlySpend - } - - const additionalMonthlySpend = getAdditionalMonthlySpend() - if (!additionalMonthlySpend) { - return null - } +import { NewProjectPrice } from './RestoreToNewProject.utils' +export const AdditionalMonthlySpend = ({ + additionalMonthlySpend, +}: { + additionalMonthlySpend: NewProjectPrice +}) => { return (

@@ -36,9 +14,21 @@ export const AdditionalMonthlySpend = () => { Project Settings > Compute and Disk

-
-

Additional Monthly Compute + Disk Cost

-

${additionalMonthlySpend.priceMonthly}

+
+
+

Additional Monthly Compute

+

${additionalMonthlySpend.computePrice}

+
+
+

Additional Monthly Disk

+

${additionalMonthlySpend.diskPrice}

+
+
+

Total

+

+ ${additionalMonthlySpend.computePrice + additionalMonthlySpend.diskPrice} +

+
) diff --git a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/ConfirmRestoreDialog.tsx b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/ConfirmRestoreDialog.tsx index 3aa8006be67..cc5b5c40dfe 100644 --- a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/ConfirmRestoreDialog.tsx +++ b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/ConfirmRestoreDialog.tsx @@ -11,17 +11,20 @@ import { DialogTitle, } from 'ui' import { AdditionalMonthlySpend } from './AdditionalMonthlySpend' +import { NewProjectPrice } from './RestoreToNewProject.utils' interface ConfirmRestoreDialogProps { open: boolean onOpenChange: (value: boolean) => void onSelectContinue: () => void + additionalMonthlySpend: NewProjectPrice } export const ConfirmRestoreDialog = ({ open, onOpenChange, onSelectContinue, + additionalMonthlySpend, }: ConfirmRestoreDialogProps) => { const { project } = useProjectContext() const organization = useSelectedOrganization() @@ -64,7 +67,7 @@ export const ConfirmRestoreDialog = ({ - +