Merged in fix/LOY-192-fix-surprises-toasts-webview (pull request #1591)

fix(LOY-192): fix toasts for surprises in webviews

Approved-by: Chuma Mcphoy (We Ahead)

apps/scandic-web/app/[lang]/webview/layout.tsx

@@ -7,6 +7,7 @@ import Script from "next/script"
 
 import TrpcProvider from "@/lib/trpc/Provider"
 
+import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
 import AdobeSDKScript from "@/components/TrackingSDK/AdobeSDKScript"
 import GTMScript from "@/components/TrackingSDK/GTMScript"
 import RouterTracking from "@/components/TrackingSDK/RouterTracking"
@@ -43,6 +44,7 @@ export default async function RootLayout({
           <TrpcProvider>
             <RouterTracking />
             {children}
+            <ToastHandler />
           </TrpcProvider>
         </ServerIntlProvider>
       </body>

apps/scandic-web/components/MyPages/Surprises/Client.tsx

@@ -8,6 +8,10 @@ import { useIntl } from "react-intl"
 
 import { customerService } from "@/constants/currentWebHrefs"
 import { benefits } from "@/constants/routes/myPages"
+import {
+  benefits as webviewBenefits,
+  myPagesWebviews,
+} from "@/constants/routes/webviews"
 import { trpc } from "@/lib/trpc/client"
 
 import Link from "@/components/TempDesignSystem/Link"
@@ -56,7 +60,18 @@ export default function SurprisesNotification({
     onSuccess: () => {
       utils.contentstack.rewards.current.invalidate({ lang })
 
-      if (pathname.indexOf(benefits[lang]) !== 0) {
+      const onBenefitsPage = pathname.indexOf(benefits[lang]) === 0
+      const onWebviewBenefitsPage =
+        pathname.indexOf(webviewBenefits[lang]) === 0
+
+      if (onBenefitsPage || onWebviewBenefitsPage) {
+        return
+      }
+
+      const benefitPageUrl = myPagesWebviews.includes(pathname)
+        ? webviewBenefits[lang]
+        : benefits[lang]
+
       toast.success(
         <>
           {intl.formatMessage(
@@ -66,12 +81,11 @@ export default function SurprisesNotification({
             { amount: surprises.length }
           )}
           <br />
-            <Link href={benefits[lang]} variant="underscored" color="burgundy">
+          <Link href={benefitPageUrl} variant="underscored" color="burgundy">
             {intl.formatMessage({ id: "Go to My Benefits" })}
           </Link>
         </>
       )
-      }
     },
     onError: (error) => {
       console.error("Failed to unwrap surprise", error)