Oppdatere appStatus melding logikk

frodehansen2 · frodehansen2 · commit 01cc2a23aef9 · 2024-06-13T09:30:54.000+02:00
diff --git a/apps/dine-pleiepenger/src/pages/_app.page.tsx b/apps/dine-pleiepenger/src/pages/_app.page.tsx
@@ -65,9 +65,9 @@ function MyApp({ Component, pageProps }: AppProps): ReactElement {
                     <UnavailablePage />
                 ) : (
                     <main>
-                        {appStatus?.message && (
+                        {data.appStatus?.message && (
                             <div className="max-w-[1128px] mx-auto p-5 mb-5">
-                                <StatusMessage message={appStatus.message} />
+                                <StatusMessage message={data.appStatus.message} />
                             </div>
                         )}
                         <IntlProvider locale="nb" messages={messages.nb}>
diff --git a/packages/appstatus-react-ds/src/hooks/useAppStatus.ts b/packages/appstatus-react-ds/src/hooks/useAppStatus.ts
@@ -34,7 +34,8 @@ export const getStateForApplication = (
             message: appMessage || teamMessage,
         };
     }
-    return defaultAppStatus;
+
+    return { ...defaultAppStatus, message: appMessage || teamMessage };
 };
 
 function useAppStatus(applicationKey: string, sanityConfig: SanityConfig): State & { isLoading: boolean } {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ export const getStateForApplication = (`
`34`	`34`	`message: appMessage \|\| teamMessage,`
`35`	`35`	`};`
`36`	`36`	`}`
`37`		`- return defaultAppStatus;`
	`37`	`+`
	`38`	`+ return { ...defaultAppStatus, message: appMessage \|\| teamMessage };`
`38`	`39`	`};`
`39`	`40`
`40`	`41`	`function useAppStatus(applicationKey: string, sanityConfig: SanityConfig): State & { isLoading: boolean } {`