From c29b724317e8cab32b75ecef0ea6e2556a999d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Fri, 28 Nov 2025 13:57:30 +0000 Subject: [PATCH] Merged in refactor/small-cleanup (pull request #3252) fix: some cleanup * fix: some cleanup Approved-by: Emma Zettervall --- .../components/Dialog/dialog.module.css | 1 + apps/scandic-web/components/Dialog/index.tsx | 43 ++++++++++--------- .../components/Forms/Signup/index.tsx | 4 +- .../Profile/ChangeNameDisclaimer/index.tsx | 34 +++++++-------- .../types/components/form/signupForm.ts | 3 -- packages/trpc/lib/routers/types.ts | 1 - 6 files changed, 41 insertions(+), 45 deletions(-) delete mode 100644 apps/scandic-web/types/components/form/signupForm.ts diff --git a/apps/scandic-web/components/Dialog/dialog.module.css b/apps/scandic-web/components/Dialog/dialog.module.css index 76ed0c9e9..e389daca0 100644 --- a/apps/scandic-web/components/Dialog/dialog.module.css +++ b/apps/scandic-web/components/Dialog/dialog.module.css @@ -48,6 +48,7 @@ display: flex; flex-direction: column; gap: var(--Space-x2); + align-items: center; } .footer { diff --git a/apps/scandic-web/components/Dialog/index.tsx b/apps/scandic-web/components/Dialog/index.tsx index 8140d9580..6a7e8cfb4 100644 --- a/apps/scandic-web/components/Dialog/index.tsx +++ b/apps/scandic-web/components/Dialog/index.tsx @@ -6,11 +6,10 @@ import { ModalOverlay, } from "react-aria-components" -import Body from "@scandic-hotels/design-system/Body" +import { Button } from "@scandic-hotels/design-system/Button" +import ButtonLink from "@scandic-hotels/design-system/ButtonLink" import { LoadingSpinner } from "@scandic-hotels/design-system/LoadingSpinner" -import { OldDSButton as Button } from "@scandic-hotels/design-system/OldDSButton" -import Link from "@scandic-hotels/design-system/OldDSLink" -import Subtitle from "@scandic-hotels/design-system/Subtitle" +import { Typography } from "@scandic-hotels/design-system/Typography" import styles from "./dialog.module.css" @@ -35,40 +34,42 @@ export default function Dialog({ {({ close }) => (
- {titleText} - {bodyText} + +

{titleText}

+ + +

{bodyText}

+
{proceedIsPending ? ( ) : (