From 0ab5dc1c9d787ee8a7be655dc592b0c53e6adc87 Mon Sep 17 00:00:00 2001 From: Anton Gunnarsson Date: Wed, 16 Apr 2025 11:19:07 +0000 Subject: [PATCH] Merged in fix/sw-2132-unlink-error (pull request #1816) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add UnlinkError for when SAS account unlinking fails * Add UnlinkError for when unlinking fails Approved-by: Joakim Jäderberg --- .../sas-x-scandic/components/UnlinkError.tsx | 30 +++++++++++++++++++ .../(protected)/sas-x-scandic/error/page.tsx | 5 ++++ .../(protected)/sas-x-scandic/otp/page.tsx | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/components/UnlinkError.tsx diff --git a/apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/components/UnlinkError.tsx b/apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/components/UnlinkError.tsx new file mode 100644 index 000000000..bdbdcf612 --- /dev/null +++ b/apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/components/UnlinkError.tsx @@ -0,0 +1,30 @@ +"use client" + +import { useIntl } from "react-intl" + +import { Typography } from "@scandic-hotels/design-system/Typography" + +import { GenericError } from "./GenericError" +import { SASModalContactBlock } from "./SASModal" + +export function UnlinkError() { + const intl = useIntl() + + return ( + + +

+ {intl.formatMessage({ + defaultMessage: + "We couldn’t unlink your accounts. Please contact us and we’ll help you resolve this.", + })} +

+
+ +
+ ) +} diff --git a/apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/error/page.tsx b/apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/error/page.tsx index b3d41be9b..56bc38eed 100644 --- a/apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/error/page.tsx +++ b/apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/error/page.tsx @@ -8,6 +8,7 @@ import { GenericError } from "../components/GenericError" import { SASModalContactBlock } from "../components/SASModal" import { TooManyCodesError } from "../components/TooManyCodesError" import { TooManyFailedAttemptsError } from "../components/TooManyFailedAttemptsError" +import { UnlinkError } from "../components/UnlinkError" import type { LangParams, PageArgs, SearchParams } from "@/types/params" @@ -34,6 +35,10 @@ export default async function Page({ return } + if (errorCode === "unlinkError") { + return + } + return (