chore: update versions (#2794 )

This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @nhost/dashboard@1.24.0 ### Minor Changes - abb24af: chore: add redirect to support page when project is locked - 18a6455: feat: show contact us info and locked reason when project is locked ### Patch Changes - e31eefa: fix: include ingresses field when updating run services Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
fix(dashboard): include ingresses field when updating a run service (#2798 )
2024-07-15 15:51:18 +01:00 · 2024-07-15 15:38:04 +01:00 · 2024-07-09 20:25:16 +02:00 · 2024-07-09 15:11:58 +02:00 · 2024-07-09 10:08:51 +01:00 · 2024-07-09 09:56:58 +01:00
108 changed files with 2082 additions and 823 deletions
--- a/.github/actions/install-dependencies/action.yaml
+++ b/.github/actions/install-dependencies/action.yaml
@@ -12,7 +12,7 @@ inputs:
 runs:
  using: 'composite'
  steps:
-    - uses: pnpm/action-setup@v2.2.4
+    - uses: pnpm/action-setup@v4
      with:
        version: 8.10.5
        run_install: false
--- a/dashboard/.env.example
+++ b/dashboard/.env.example
@@ -17,5 +17,10 @@ NEXT_PUBLIC_GITHUB_APP_INSTALL_URL=<github_app_install_url>
 NEXT_PUBLIC_ANALYTICS_WRITE_KEY=<analytics_write_key>
 NEXT_PUBLIC_NHOST_BRAGI_WEBSOCKET=<nhost_bragi_websocket>

+NEXT_PUBLIC_ZENDESK_URL=
+NEXT_PUBLIC_ZENDESK_API_KEY=
+NEXT_PUBLIC_ZENDESK_USER_EMAIL=
+
+
 CODEGEN_GRAPHQL_URL=https://local.graphql.nhost.run/v1
 CODEGEN_HASURA_ADMIN_SECRET=nhost-admin-secret
--- a/dashboard/CHANGELOG.md
+++ b/dashboard/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @nhost/dashboard

+## 1.24.0
+
+### Minor Changes
+
+- abb24af: chore: add redirect to support page when project is locked
+- 18a6455: feat: show contact us info and locked reason when project is locked
+
+### Patch Changes
+
+- e31eefa: fix: include ingresses field when updating run services
+
+## 1.23.0
+
+### Minor Changes
+
+- 33284d3: fix: don't show double scrollbar in configuration editor
+
+### Patch Changes
+
+- @nhost/react-apollo@12.0.3
+- @nhost/nextjs@2.1.17
+
+## 1.22.0
+
+### Minor Changes
+
+- 998c037: fix: align drop-down list in select component
+- 807b8c0: fix: show city name in region selection for project creation
+
+## 1.21.0
+
+### Minor Changes
+
+- a2efeed: fix: improve project health error handling, add unknown state and polling interval for health state
+
 ## 1.20.0

 ### Minor Changes
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/dashboard",
-  "version": "1.20.0",
+  "version": "1.24.0",
  "private": true,
  "scripts": {
    "preinstall": "npx only-allow pnpm",
@@ -48,6 +48,7 @@
    "@tanstack/react-query": "^4.36.1",
    "@tanstack/react-table": "^8.15.3",
    "@tanstack/react-virtual": "^3.2.0",
+    "@uidotdev/usehooks": "^2.4.1",
    "@uiw/codemirror-theme-bbedit": "^4.22.2",
    "@uiw/codemirror-theme-github": "^4.21.25",
    "@uiw/react-codemirror": "^4.21.25",
--- a/dashboard/public/assets/LockedApp.svg
+++ b/dashboard/public/assets/LockedApp.svg
@@ -0,0 +1,12 @@
+<svg width="72" height="73" viewBox="0 0 72 73" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_10501_253)">
+<path d="M0 8.5C0 4.08172 3.58172 0.5 8 0.5H64C68.4183 0.5 72 4.08172 72 8.5V64.5C72 68.9183 68.4183 72.5 64 72.5H8C3.58172 72.5 0 68.9183 0 64.5V8.5Z" fill="#9C73DF" fill-opacity="0.2"/>
+<path d="M43.1203 35.5H29.7687C28.7153 35.5 27.8613 36.3954 27.8613 37.5V44.5C27.8613 45.6046 28.7153 46.5 29.7687 46.5H43.1203C44.1737 46.5 45.0276 45.6046 45.0276 44.5V37.5C45.0276 36.3954 44.1737 35.5 43.1203 35.5Z" stroke="#9C73DF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.6758 35.5V31.5C31.6758 30.1739 32.1782 28.9021 33.0724 27.9645C33.9667 27.0268 35.1795 26.5 36.4442 26.5C37.7089 26.5 38.9217 27.0268 39.816 27.9645C40.7102 28.9021 41.2126 30.1739 41.2126 31.5V35.5" stroke="#9C73DF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_10501_253">
+<rect width="72" height="72" fill="white" transform="translate(0 0.5)"/>
+</clipPath>
+</defs>
+</svg>
--- a/dashboard/src/components/form/CountrySelector/CountrySelector.tsx
+++ b/dashboard/src/components/form/CountrySelector/CountrySelector.tsx
@@ -29,7 +29,7 @@ export default function CountrySelector({
        listbox: { className: 'min-w-0 w-full' },
        popper: {
          disablePortal: false,
-          className: 'z-[10000] w-[270px] w-full',
+          className: 'z-[10000] w-[270px]',
        },
      }}
    >
--- a/dashboard/src/components/layout/Header/Header.tsx
+++ b/dashboard/src/components/layout/Header/Header.tsx
@@ -1,4 +1,3 @@
-import { ContactUs } from '@/components/common/ContactUs';
 import { useDialog } from '@/components/common/DialogProvider';
 import { NavLink } from '@/components/common/NavLink';
 import { AccountMenu } from '@/components/layout/AccountMenu';
@@ -9,11 +8,9 @@ import { Logo } from '@/components/presentational/Logo';
 import { Box } from '@/components/ui/v2/Box';
 import { Button } from '@/components/ui/v2/Button';
 import { Chip } from '@/components/ui/v2/Chip';
-import { Dropdown } from '@/components/ui/v2/Dropdown';
 import { GraphiteIcon } from '@/components/ui/v2/icons/GraphiteIcon';
 import { DevAssistant } from '@/features/ai/DevAssistant';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
-import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
 import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { ApplicationStatus } from '@/types/application';
 import { getToastStyleProps } from '@/utils/constants/settings';
@@ -38,8 +35,6 @@ export default function Header({ className, ...props }: HeaderProps) {
  const { currentProject, refetch: refetchProject } =
    useCurrentWorkspaceAndProject();

-  const isOwner = useIsCurrentUserOwner();
-
  const isProjectUpdating =
    currentProject?.appStates[0]?.stateId === ApplicationStatus.Updating;

@@ -105,25 +100,19 @@ export default function Header({ className, ...props }: HeaderProps) {
        </Button>

        {isPlatform && (
-          <Dropdown.Root>
-            <Dropdown.Trigger
-              hideChevron
-              className="rounded-md px-2.5 py-1.5 text-sm motion-safe:transition-colors"
-            >
-              Contact us
-            </Dropdown.Trigger>
-
-            <Dropdown.Content
-              transformOrigin={{ vertical: 'top', horizontal: 'right' }}
-              anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
-            >
-              <ContactUs
-                className="max-w-md"
-                isTeam={currentProject?.plan?.name === 'Team'}
-                isOwner={isOwner}
-              />
-            </Dropdown.Content>
-          </Dropdown.Root>
+          <NavLink
+            underline="none"
+            href="/support"
+            className="mr-2 rounded-md px-2.5 py-1.5 text-sm motion-safe:transition-colors"
+            sx={{
+              color: 'text.primary',
+              '&:hover': { backgroundColor: 'grey.200' },
+            }}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Support
+          </NavLink>
        )}

        <NavLink
--- a/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx
+++ b/dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx
@@ -47,46 +47,51 @@ export default function SettingsLayout({
        sx={{ backgroundColor: 'background.default' }}
        className="flex w-full flex-auto flex-col overflow-y-auto overflow-x-hidden"
      >
-        <RetryableErrorBoundary>
-          <div className="flex flex-col space-y-2">
-            {hasGitRepo && (
-              <Alert
-                severity="warning"
-                className="grid grid-flow-row place-content-center gap-2"
-              >
-                <Text color="warning" className="text-sm ">
-                  As you have a connected repository, make sure to synchronize
-                  your changes with{' '}
-                  <code
-                    className={twMerge(
-                      'rounded-md px-2 py-px',
-                      theme.palette.mode === 'dark'
-                        ? 'bg-brown text-copper'
-                        : 'bg-slate-200 text-slate-700',
-                    )}
-                  >
-                    nhost config pull
-                  </code>{' '}
-                  or they may be reverted with the next push.
-                  <br />
-                  If there are multiple projects linked to the same repository
-                  and you only want these changes to apply to a subset of them,
-                  please check out{' '}
-                  <a
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="underline"
-                    href="https://docs.nhost.io/cli/overlays"
-                  >
-                    docs.nhost.io/cli/overlays
-                  </a>{' '}
-                  for guidance.
-                </Text>
-              </Alert>
-            )}
-          </div>
-          {children}
-        </RetryableErrorBoundary>
+        <Box
+          sx={{ backgroundColor: 'background.default' }}
+          className="flex h-full flex-col"
+        >
+          <RetryableErrorBoundary>
+            <div className="flex flex-col space-y-2">
+              {hasGitRepo && (
+                <Alert
+                  severity="warning"
+                  className="grid grid-flow-row place-content-center gap-2"
+                >
+                  <Text color="warning" className="text-sm ">
+                    As you have a connected repository, make sure to synchronize
+                    your changes with{' '}
+                    <code
+                      className={twMerge(
+                        'rounded-md px-2 py-px',
+                        theme.palette.mode === 'dark'
+                          ? 'bg-brown text-copper'
+                          : 'bg-slate-200 text-slate-700',
+                      )}
+                    >
+                      nhost config pull
+                    </code>{' '}
+                    or they may be reverted with the next push.
+                    <br />
+                    If there are multiple projects linked to the same repository
+                    and you only want these changes to apply to a subset of
+                    them, please check out{' '}
+                    <a
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="underline"
+                      href="https://docs.nhost.io/cli/overlays"
+                    >
+                      docs.nhost.io/cli/overlays
+                    </a>{' '}
+                    for guidance.
+                  </Text>
+                </Alert>
+              )}
+            </div>
+            {children}
+          </RetryableErrorBoundary>
+        </Box>
      </Box>
    </ProjectLayout>
  );
--- a/dashboard/src/components/ui/v2/Badge/Badge.tsx
+++ b/dashboard/src/components/ui/v2/Badge/Badge.tsx
@@ -37,6 +37,9 @@ const Badge = styled(MaterialBadge)<BadgeProps>(({ theme }) => ({
  '& .MuiBadge-colorSuccess': {
    backgroundColor: theme.palette.success.dark,
  },
+  '& .MuiBadge-colorSecondary': {
+    backgroundColor: theme.palette.grey[500],
+  },
 }));

 Badge.displayName = 'NhostBadge';
--- a/dashboard/src/components/ui/v2/createTheme/createTheme.ts
+++ b/dashboard/src/components/ui/v2/createTheme/createTheme.ts
@@ -8,6 +8,17 @@ import { createTheme as createMuiTheme } from '@mui/material/styles';
 * @param mode - Color mode
 * @returns Material UI theme
 */
+
+declare module '@mui/material/styles' {
+  interface Palette {
+    beige: Palette['primary'];
+  }
+
+  interface PaletteOptions {
+    beige?: PaletteOptions['primary'];
+  }
+}
+
 export default function createTheme(mode: PaletteMode) {
  return createMuiTheme({
    shape: {
--- a/dashboard/src/components/ui/v2/icons/CommunityIcon/CommunityIcon.tsx
+++ b/dashboard/src/components/ui/v2/icons/CommunityIcon/CommunityIcon.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+
+export default function CommunityIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      width={16}
+      height={16}
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M5.5 10C7.29493 10 8.75 8.54493 8.75 6.75C8.75 4.95507 7.29493 3.5 5.5 3.5C3.70507 3.5 2.25 4.95507 2.25 6.75C2.25 8.54493 3.70507 10 5.5 10Z"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M9.71338 3.62107C10.1604 3.49513 10.6292 3.46644 11.0882 3.53693C11.5473 3.60743 11.9859 3.77547 12.3745 4.02975C12.7631 4.28403 13.0927 4.61863 13.3411 5.01102C13.5896 5.40342 13.751 5.84449 13.8146 6.30453C13.8782 6.76457 13.8425 7.2329 13.7098 7.67797C13.5772 8.12304 13.3507 8.53452 13.0457 8.8847C12.7406 9.23487 12.364 9.51561 11.9413 9.70799C11.5187 9.90038 11.0596 9.99996 10.5952 10"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M1 12.3373C1.50758 11.6153 2.18143 11.026 2.96466 10.6192C3.74788 10.2124 4.61748 10 5.50005 10C6.38262 9.99997 7.25224 10.2123 8.0355 10.619C8.81875 11.0258 9.49264 11.615 10.0003 12.337"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M10.5952 10C11.4779 9.99936 12.3477 10.2114 13.131 10.6182C13.9143 11.025 14.5881 11.6146 15.0952 12.337"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
--- a/dashboard/src/components/ui/v2/icons/CommunityIcon/index.ts
+++ b/dashboard/src/components/ui/v2/icons/CommunityIcon/index.ts
@@ -0,0 +1 @@
+export { default as CommunityIcon } from './CommunityIcon';
--- a/dashboard/src/components/ui/v2/icons/DiscordIcon/DiscordIcon.tsx
+++ b/dashboard/src/components/ui/v2/icons/DiscordIcon/DiscordIcon.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+
+export default function DiscordIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      width={14}
+      height={14}
+      viewBox="0 0 14 14"
+      fill="currentColor"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <svg
+        width="16"
+        height="16"
+        viewBox="0 0 16 16"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M3.40571 1.5H12.5943C13.3691 1.5 14 2.13086 14 2.91257V15.2143L12.5257 13.9114L11.696 13.1434L10.8183 12.3274L11.1817 13.596H3.40571C2.63086 13.596 2 12.9651 2 12.1834V2.91257C2 2.13086 2.63086 1.5 3.40571 1.5ZM9.49486 9.9C9.70057 10.1606 9.94743 10.4554 9.94743 10.4554C11.4629 10.4074 12.0457 9.41314 12.0457 9.41314C12.0457 7.20514 11.0583 5.41543 11.0583 5.41543C10.0709 4.67486 9.13143 4.69543 9.13143 4.69543L9.03543 4.80514C10.2011 5.16171 10.7429 5.676 10.7429 5.676C10.0297 5.28514 9.33029 5.09314 8.67886 5.01771C8.18514 4.96286 7.712 4.97657 7.29371 5.03143C7.2578 5.03143 7.2271 5.03665 7.19251 5.04254C7.18748 5.0434 7.18237 5.04427 7.17714 5.04514C6.93714 5.06571 6.35429 5.15486 5.62057 5.47714C5.36686 5.59371 5.216 5.676 5.216 5.676C5.216 5.676 5.78514 5.13429 7.01943 4.77771L6.95086 4.69543C6.95086 4.69543 6.01143 4.67486 5.024 5.41543C5.024 5.41543 4.03657 7.20514 4.03657 9.41314C4.03657 9.41314 4.61257 10.4074 6.128 10.4554C6.128 10.4554 6.38171 10.1469 6.58743 9.88628C5.71657 9.62571 5.38743 9.07714 5.38743 9.07714C5.38743 9.07714 5.456 9.12514 5.57943 9.19371C5.58629 9.20057 5.59314 9.20743 5.60686 9.21428C5.61714 9.22114 5.62743 9.22628 5.63771 9.23143C5.648 9.23657 5.65829 9.24171 5.66857 9.24857C5.84 9.34457 6.01143 9.42 6.16914 9.48171C6.45029 9.59143 6.78629 9.70114 7.17714 9.77657C7.69143 9.87257 8.29486 9.90686 8.95314 9.78343C9.27543 9.72857 9.60457 9.63257 9.94743 9.48857C10.1874 9.39943 10.4549 9.26914 10.736 9.084C10.736 9.084 10.3931 9.64628 9.49486 9.9ZM6.05942 8.01421C6.05942 7.59593 6.36799 7.25307 6.75885 7.25307C7.1497 7.25307 7.46513 7.59593 7.45827 8.01421C7.45827 8.4325 7.1497 8.77536 6.75885 8.77536C6.37485 8.77536 6.05942 8.4325 6.05942 8.01421ZM8.56227 8.01421C8.56227 7.59593 8.87084 7.25307 9.2617 7.25307C9.65256 7.25307 9.96113 7.59593 9.96113 8.01421C9.96113 8.4325 9.65256 8.77536 9.2617 8.77536C8.8777 8.77536 8.56227 8.4325 8.56227 8.01421Z"
+          fill="currentColor"
+        />
+      </svg>
+    </svg>
+  );
+}
--- a/dashboard/src/components/ui/v2/icons/DiscordIcon/index.ts
+++ b/dashboard/src/components/ui/v2/icons/DiscordIcon/index.ts
@@ -0,0 +1 @@
+export { default as DiscordIcon } from './DiscordIcon';
--- a/dashboard/src/components/ui/v2/icons/EnvelopeIcon/EnvelopeIcon.tsx
+++ b/dashboard/src/components/ui/v2/icons/EnvelopeIcon/EnvelopeIcon.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react';
+
+export default function EnvelopeIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      width={14}
+      height={14}
+      viewBox="0 0 14 14"
+      fill="currentColor"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <svg
+        width="16"
+        height="16"
+        viewBox="0 0 16 16"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M2 3.5H14V12C14 12.1326 13.9473 12.2598 13.8536 12.3536C13.7598 12.4473 13.6326 12.5 13.5 12.5H2.5C2.36739 12.5 2.24021 12.4473 2.14645 12.3536C2.05268 12.2598 2 12.1326 2 12V3.5Z"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M14 3.5L8 9L2 3.5"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </svg>
+    </svg>
+  );
+}
--- a/dashboard/src/components/ui/v2/icons/EnvelopeIcon/index.ts
+++ b/dashboard/src/components/ui/v2/icons/EnvelopeIcon/index.ts
@@ -0,0 +1 @@
+export { default as EnvelopeIcon } from './EnvelopeIcon';
--- a/dashboard/src/components/ui/v2/icons/PowerOffIcon/PowerOffIcon.tsx
+++ b/dashboard/src/components/ui/v2/icons/PowerOffIcon/PowerOffIcon.tsx
@@ -0,0 +1,27 @@
+import type { IconProps } from '@/components/ui/v2/icons';
+import { SvgIcon } from '@/components/ui/v2/icons/SvgIcon';
+
+function PowerOffIcon(props: IconProps) {
+  return (
+    <SvgIcon
+      xmlns="http://www.w3.org/2000/svg"
+      width={24}
+      height={24}
+      fill="none"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth={2}
+      {...props}
+    >
+      <path
+        fill="none"
+        d="M18.36 6.64A9 9 0 0 1 20.77 15M6.16 6.16a9 9 0 1 0 12.68 12.68M12 2v4M2 2l20 20"
+      />
+    </SvgIcon>
+  );
+}
+
+PowerOffIcon.displayName = 'NhostPowerOffIcon';
+
+export default PowerOffIcon;
--- a/dashboard/src/components/ui/v2/icons/PowerOffIcon/index.ts
+++ b/dashboard/src/components/ui/v2/icons/PowerOffIcon/index.ts
@@ -0,0 +1 @@
+export { default as PowerOffIcon } from './PowerOffIcon';
--- a/dashboard/src/components/ui/v2/icons/QuestionMarkIcon/QuestionMarkIcon.tsx
+++ b/dashboard/src/components/ui/v2/icons/QuestionMarkIcon/QuestionMarkIcon.tsx
@@ -0,0 +1,21 @@
+import type { IconProps } from '@/components/ui/v2/icons';
+import { SvgIcon } from '@/components/ui/v2/icons/SvgIcon';
+
+function QuestionMarkIcon(props: IconProps) {
+  return (
+    <SvgIcon
+      width="320"
+      height="512"
+      aria-label="Question mark"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 320 512"
+      {...props}
+    >
+      <path d="M80 160c0-35.3 28.7-64 64-64h32c35.3 0 64 28.7 64 64v3.6c0 21.8-11.1 42.1-29.4 53.8l-42.2 27.1c-25.2 16.2-40.4 44.1-40.4 74V320c0 17.7 14.3 32 32 32s32-14.3 32-32v-1.4c0-8.2 4.2-15.8 11-20.2l42.2-27.1c36.6-23.6 58.8-64.1 58.8-107.7V160c0-70.7-57.3-128-128-128H144C73.3 32 16 89.3 16 160c0 17.7 14.3 32 32 32s32-14.3 32-32zm80 320a40 40 0 1 0 0-80 40 40 0 1 0 0 80z" />
+    </SvgIcon>
+  );
+}
+
+QuestionMarkIcon.displayName = 'NhostQuestionMarkIcon';
+
+export default QuestionMarkIcon;
--- a/dashboard/src/components/ui/v2/icons/QuestionMarkIcon/index.ts
+++ b/dashboard/src/components/ui/v2/icons/QuestionMarkIcon/index.ts
@@ -0,0 +1 @@
+export { default as QuestionMarkIcon } from './QuestionMarkIcon';
--- a/dashboard/src/components/ui/v2/theme/getDesignTokens/getDesignTokens.ts
+++ b/dashboard/src/components/ui/v2/theme/getDesignTokens/getDesignTokens.ts
@@ -63,6 +63,9 @@ export default function getDesignTokens(mode: PaletteMode): PaletteOptions {
        paper: '#171d26',
      },
      divider: '#2f363d',
+      beige: {
+        main: '#362c22',
+      },
    };
  }

@@ -125,5 +128,8 @@ export default function getDesignTokens(mode: PaletteMode): PaletteOptions {
      paper: '#ffffff',
    },
    divider: '#eaedf0',
+    beige: {
+      main: '#e5d1bf',
+    },
  };
 }
--- a/dashboard/src/features/ai/AssistantForm/components/ArgumentsFormSection/ArgumentsFormSection.tsx
+++ b/dashboard/src/features/ai/AssistantForm/components/ArgumentsFormSection/ArgumentsFormSection.tsx
@@ -117,7 +117,7 @@ export default function ArgumentsFormSection({
                      listbox: { className: 'min-w-0 w-full' },
                      popper: {
                        disablePortal: false,
-                        className: 'z-[10000] w-[270px] w-full',
+                        className: 'z-[10000] w-[270px]',
                      },
                    }}
                  >
--- a/dashboard/src/features/projects/common/components/ApplicationLockedReason/ApplicationLockedReason.tsx
+++ b/dashboard/src/features/projects/common/components/ApplicationLockedReason/ApplicationLockedReason.tsx
@@ -0,0 +1,40 @@
+import { Alert } from '@/components/ui/v2/Alert';
+import { Box } from '@/components/ui/v2/Box';
+import { Text } from '@/components/ui/v2/Text';
+import Link from 'next/link';
+
+interface ApplicationLockedReasonProps {
+  reason?: string;
+}
+
+export default function ApplicationLockedReason({
+  reason,
+}: ApplicationLockedReasonProps) {
+  return (
+    <Alert severity="warning" className="mx-auto max-w-xs gap-2 p-6 ">
+      <Text className="pb-4 text-left">
+        Your project has been temporarily locked due to the following reason:
+      </Text>
+      <Box
+        className="rounded-md p-2"
+        sx={{
+          backgroundColor: 'beige.main',
+        }}
+      >
+        <Text className="px-2 py-1 font-semibold">{reason}</Text>
+      </Box>
+      <Text className="pt-4 text-left">
+        Please{' '}
+        <Link
+          className="font-semibold underline underline-offset-2"
+          href="/support"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          contact our support
+        </Link>{' '}
+        team for assistance.
+      </Text>
+    </Alert>
+  );
+}
--- a/dashboard/src/features/projects/common/components/ApplicationLockedReason/index.ts
+++ b/dashboard/src/features/projects/common/components/ApplicationLockedReason/index.ts
@@ -0,0 +1 @@
+export { default as ApplicationLockedReason } from './ApplicationLockedReason';
--- a/dashboard/src/features/projects/common/components/ApplicationPaused/ApplicationPaused.tsx
+++ b/dashboard/src/features/projects/common/components/ApplicationPaused/ApplicationPaused.tsx
@@ -2,25 +2,24 @@ import { useDialog } from '@/components/common/DialogProvider';
 import { Container } from '@/components/layout/Container';
 import { Modal } from '@/components/ui/v1/Modal';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
-import { Alert } from '@/components/ui/v2/Alert';
 import { Box } from '@/components/ui/v2/Box';
 import { Button } from '@/components/ui/v2/Button';
 import { Text } from '@/components/ui/v2/Text';
 import { ApplicationInfo } from '@/features/projects/common/components/ApplicationInfo';
+import { ApplicationLockedReason } from '@/features/projects/common/components/ApplicationLockedReason';
+import { ApplicationPausedReason } from '@/features/projects/common/components/ApplicationPausedReason';
+import { ApplicationPausedSymbol } from '@/features/projects/common/components/ApplicationPausedSymbol';
 import { ChangePlanModal } from '@/features/projects/common/components/ChangePlanModal';
 import { RemoveApplicationModal } from '@/features/projects/common/components/RemoveApplicationModal';
 import { StagingMetadata } from '@/features/projects/common/components/StagingMetadata';
+import { useAppPausedReason } from '@/features/projects/common/hooks/useAppPausedReason';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
 import {
  GetAllWorkspacesAndProjectsDocument,
-  useGetFreeAndActiveProjectsQuery,
  useUnpauseApplicationMutation,
 } from '@/generated/graphql';
-import { MAX_FREE_PROJECTS } from '@/utils/constants/common';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
-import { useUserData } from '@nhost/nextjs';
-import Image from 'next/image';
 import { useState } from 'react';

 export default function ApplicationPaused() {
@@ -28,7 +27,6 @@ export default function ApplicationPaused() {
  const { currentProject, refetch: refetchWorkspaceAndProject } =
    useCurrentWorkspaceAndProject();
  const isOwner = useIsCurrentUserOwner();
-  const user = useUserData();

  const [showDeletingModal, setShowDeletingModal] = useState(false);
  const [unpauseApplication, { loading: changingApplicationStateLoading }] =
@@ -36,13 +34,8 @@ export default function ApplicationPaused() {
      refetchQueries: [{ query: GetAllWorkspacesAndProjectsDocument }],
    });

-  const { data, loading } = useGetFreeAndActiveProjectsQuery({
-    variables: { userId: user?.id },
-    skip: !user,
-  });
-
-  const numberOfFreeAndLiveProjects = data?.freeAndActiveProjects.length || 0;
-  const wakeUpDisabled = numberOfFreeAndLiveProjects >= MAX_FREE_PROJECTS;
+  const { isLocked, lockedReason, freeAndLiveProjectsNumberExceeded, loading } =
+    useAppPausedReason();

  async function handleTriggerUnpausing() {
    await execPromiseWithErrorToast(
@@ -77,75 +70,67 @@ export default function ApplicationPaused() {
        />
      </Modal>

-      <Container className="mx-auto mt-20 grid max-w-lg grid-flow-row gap-4 text-center">
+      <Container className="mx-auto mt-20 grid max-w-lg grid-flow-row gap-6 text-center">
        <div className="mx-auto flex w-centImage flex-col text-center">
-          <Image
-            src="/assets/PausedApp.svg"
-            alt="Closed Eye"
-            width={72}
-            height={72}
-          />
+          <ApplicationPausedSymbol isLocked={isLocked} />
        </div>

-        <Box className="grid grid-flow-row gap-1">
+        <Box className="grid grid-flow-row gap-6">
          <Text variant="h3" component="h1">
-            {currentProject.name} is sleeping
+            {currentProject.name} is {isLocked ? 'locked' : 'paused'}
          </Text>
+          {isLocked ? (
+            <ApplicationLockedReason reason={lockedReason} />
+          ) : (
+            <>
+              <ApplicationPausedReason
+                freeAndLiveProjectsNumberExceeded={
+                  freeAndLiveProjectsNumberExceeded
+                }
+              />
+              <div className="grid grid-flow-row gap-4">
+                {isOwner && (
+                  <Button
+                    className="mx-auto w-full max-w-xs"
+                    onClick={() => {
+                      openDialog({
+                        component: <ChangePlanModal />,
+                        props: {
+                          PaperProps: { className: 'p-0' },
+                          maxWidth: 'lg',
+                        },
+                      });
+                    }}
+                  >
+                    Upgrade to Pro
+                  </Button>
+                )}
+                <Button
+                  variant="borderless"
+                  className="mx-auto w-full max-w-xs"
+                  loading={changingApplicationStateLoading}
+                  disabled={
+                    changingApplicationStateLoading ||
+                    freeAndLiveProjectsNumberExceeded
+                  }
+                  onClick={handleTriggerUnpausing}
+                >
+                  Wake Up
+                </Button>

-          <Text>
-            Starter projects stop responding to API calls after 7 days of
-            inactivity. Upgrade to Pro to avoid autosleep.
-          </Text>
-        </Box>
-
-        <Box className="grid grid-flow-row gap-2">
-          {isOwner && (
-            <Button
-              className="mx-auto w-full max-w-[280px]"
-              onClick={() => {
-                openDialog({
-                  component: <ChangePlanModal />,
-                  props: {
-                    PaperProps: { className: 'p-0' },
-                    maxWidth: 'lg',
-                  },
-                });
-              }}
-            >
-              Upgrade to Pro
-            </Button>
+                {isOwner && (
+                  <Button
+                    color="error"
+                    variant="outlined"
+                    className="mx-auto w-full max-w-xs"
+                    onClick={() => setShowDeletingModal(true)}
+                  >
+                    Delete Project
+                  </Button>
+                )}
+              </div>
+            </>
          )}
-
-          <div className="grid grid-flow-row gap-2">
-            <Button
-              variant="borderless"
-              className="mx-auto w-full max-w-[280px]"
-              loading={changingApplicationStateLoading}
-              disabled={changingApplicationStateLoading || wakeUpDisabled}
-              onClick={handleTriggerUnpausing}
-            >
-              Wake Up
-            </Button>
-
-            {wakeUpDisabled && (
-              <Alert severity="warning" className="mx-auto max-w-xs text-left">
-                Note: Only one free project can be active at any given time.
-                Please pause your active free project before unpausing{' '}
-                {currentProject.name}.
-              </Alert>
-            )}
-
-            {isOwner && (
-              <Button
-                color="error"
-                variant="borderless"
-                className="mx-auto w-full max-w-[280px]"
-                onClick={() => setShowDeletingModal(true)}
-              >
-                Delete Project
-              </Button>
-            )}
-          </div>
        </Box>

        <StagingMetadata>
--- a/dashboard/src/features/projects/common/components/ApplicationPausedReason/ApplicationPausedReason.tsx
+++ b/dashboard/src/features/projects/common/components/ApplicationPausedReason/ApplicationPausedReason.tsx
@@ -0,0 +1,31 @@
+import { Alert } from '@/components/ui/v2/Alert';
+import { Text } from '@/components/ui/v2/Text';
+
+interface ApplicationPausedReasonProps {
+  freeAndLiveProjectsNumberExceeded?: boolean;
+}
+
+export default function ApplicationPausedReason({
+  freeAndLiveProjectsNumberExceeded,
+}: ApplicationPausedReasonProps) {
+  return (
+    <Alert
+      severity="warning"
+      className="mx-auto flex max-w-xs flex-col gap-4 p-6 text-left"
+    >
+      <Text>
+        Starter projects will stop responding to API calls after 7 days of
+        inactivity, so consider
+        <span className="font-semibold"> upgrading to Pro </span>to avoid
+        auto-sleep.
+      </Text>
+      {freeAndLiveProjectsNumberExceeded && (
+        <Text>
+          Additionally, only 1 free project can be active at any given time, so
+          please pause your current active free project before unpausing
+          another.
+        </Text>
+      )}
+    </Alert>
+  );
+}
--- a/dashboard/src/features/projects/common/components/ApplicationPausedReason/index.ts
+++ b/dashboard/src/features/projects/common/components/ApplicationPausedReason/index.ts
@@ -0,0 +1 @@
+export { default as ApplicationPausedReason } from './ApplicationPausedReason';
--- a/dashboard/src/features/projects/common/components/ApplicationPausedSymbol/ApplicationPausedSymbol.tsx
+++ b/dashboard/src/features/projects/common/components/ApplicationPausedSymbol/ApplicationPausedSymbol.tsx
@@ -0,0 +1,23 @@
+import Image from 'next/image';
+
+export default function ApplicationPausedSymbol({
+  isLocked,
+}: {
+  isLocked?: boolean;
+}) {
+  if (isLocked) {
+    return (
+      <Image src="/assets/LockedApp.svg" alt="Lock" width={72} height={72} />
+    );
+  }
+
+  // paused
+  return (
+    <Image
+      src="/assets/PausedApp.svg"
+      alt="Closed Eye"
+      width={72}
+      height={72}
+    />
+  );
+}
--- a/dashboard/src/features/projects/common/components/ApplicationPausedSymbol/index.ts
+++ b/dashboard/src/features/projects/common/components/ApplicationPausedSymbol/index.ts
@@ -0,0 +1 @@
+export { default as ApplicationPausedSymbol } from './ApplicationPausedSymbol';
--- a/dashboard/src/features/projects/common/components/settings/TOMLEditor/TOMLEditor.tsx
+++ b/dashboard/src/features/projects/common/components/settings/TOMLEditor/TOMLEditor.tsx
@@ -143,7 +143,7 @@ export default function TOMLEditor() {
  };

  return (
-    <Box className="flex h-full flex-col">
+    <>
      <Box className="flex w-full flex-col space-y-2 border-b p-4">
        <Text className="font-semibold">Configuration Editor</Text>
      </Box>
@@ -187,6 +187,6 @@ export default function TOMLEditor() {
          Save
        </Button>
      </Box>
-    </Box>
+    </>
  );
 }
--- a/dashboard/src/features/projects/common/hooks/useAppPausedReason/index.ts
+++ b/dashboard/src/features/projects/common/hooks/useAppPausedReason/index.ts
@@ -0,0 +1 @@
+export { default as useAppPausedReason } from './useAppPausedReason';
--- a/dashboard/src/features/projects/common/hooks/useAppPausedReason/useAppPausedReason.ts
+++ b/dashboard/src/features/projects/common/hooks/useAppPausedReason/useAppPausedReason.ts
@@ -0,0 +1,45 @@
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { MAX_FREE_PROJECTS } from '@/utils/constants/common';
+import {
+  useGetFreeAndActiveProjectsQuery,
+  useGetProjectIsLockedQuery,
+} from '@/utils/__generated__/graphql';
+import { useUserData } from '@nhost/nextjs';
+
+/**
+ * This hook returns the reason why the application is paused.
+ * It returns the locked reason and if the user has exceeded the number of free and live projects.
+ */
+
+export default function useAppPausedReason(): {
+  isLocked: boolean;
+  lockedReason: string | undefined;
+  freeAndLiveProjectsNumberExceeded: boolean;
+  loading: boolean;
+} {
+  const { currentProject } = useCurrentWorkspaceAndProject();
+  const user = useUserData();
+  const { data, loading } = useGetFreeAndActiveProjectsQuery({
+    variables: { userId: user?.id },
+    skip: !user,
+  });
+
+  const { data: isLockedData } = useGetProjectIsLockedQuery({
+    variables: { appId: currentProject.id },
+    skip: !currentProject,
+  });
+
+  const isLocked = isLockedData?.app?.isLocked;
+  const lockedReason = isLockedData?.app?.isLockedReason;
+
+  const numberOfFreeAndLiveProjects = data?.freeAndActiveProjects.length || 0;
+  const freeAndLiveProjectsNumberExceeded =
+    numberOfFreeAndLiveProjects >= MAX_FREE_PROJECTS;
+
+  return {
+    isLocked,
+    lockedReason,
+    freeAndLiveProjectsNumberExceeded,
+    loading,
+  };
+}
--- a/dashboard/src/features/projects/common/hooks/useServiceStatus/index.ts
+++ b/dashboard/src/features/projects/common/hooks/useServiceStatus/index.ts
@@ -0,0 +1 @@
+export { default as useServiceStatus } from './useServiceStatus';
--- a/dashboard/src/features/projects/common/hooks/useServiceStatus/useServiceStatus.ts
+++ b/dashboard/src/features/projects/common/hooks/useServiceStatus/useServiceStatus.ts
@@ -0,0 +1,72 @@
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import type { ServiceHealthInfo } from '@/features/projects/overview/health';
+import {
+  useGetProjectServicesHealthQuery,
+  type GetProjectServicesHealthQuery,
+  type GetProjectServicesHealthQueryVariables,
+} from '@/utils/__generated__/graphql';
+import type { QueryHookOptions } from '@apollo/client';
+import { useVisibilityChange } from '@uidotdev/usehooks';
+import { useEffect } from 'react';
+
+export interface UseServiceStatusOptions
+  extends QueryHookOptions<
+    GetProjectServicesHealthQuery,
+    GetProjectServicesHealthQueryVariables
+  > {
+  shouldPoll?: boolean;
+}
+
+export default function useServiceStatus(
+  options: UseServiceStatusOptions = {},
+) {
+  const isPlatform = useIsPlatform();
+  const { currentProject } = useCurrentWorkspaceAndProject();
+
+  const isVisible = useVisibilityChange();
+
+  const { data, loading, refetch, startPolling, stopPolling } =
+    useGetProjectServicesHealthQuery({
+      ...options,
+      variables: { ...options.variables, appId: currentProject?.id },
+      skip: !isPlatform || !currentProject,
+      skipPollAttempt: () => !isVisible,
+    });
+
+  // Fetch when mounted
+  useEffect(() => {
+    refetch();
+  }, [refetch]);
+
+  useEffect(() => {
+    if (options.shouldPoll) {
+      startPolling(options.pollInterval || 10000);
+    }
+
+    return () => stopPolling();
+  }, [stopPolling, startPolling, options.shouldPoll, options.pollInterval]);
+
+  const serviceMap: { [key: string]: ServiceHealthInfo | undefined } = {};
+  data?.getProjectStatus?.services.forEach((service) => {
+    serviceMap[service.name] = service;
+  });
+  const {
+    'hasura-auth': auth,
+    'hasura-storage': storage,
+    postgres,
+    hasura,
+    ai,
+    ...run
+  } = serviceMap;
+
+  return {
+    loading,
+    auth,
+    storage,
+    postgres,
+    hasura,
+    ai,
+    run,
+  };
+}
--- a/dashboard/src/features/projects/common/hooks/useSoftwareVersionsInfo/index.ts
+++ b/dashboard/src/features/projects/common/hooks/useSoftwareVersionsInfo/index.ts
@@ -0,0 +1 @@
+export { default as useSoftwareVersionsInfo } from './useSoftwareVersionsInfo';
--- a/dashboard/src/features/projects/common/hooks/useSoftwareVersionsInfo/useSoftwareVersionsInfo.ts
+++ b/dashboard/src/features/projects/common/hooks/useSoftwareVersionsInfo/useSoftwareVersionsInfo.ts
@@ -0,0 +1,156 @@
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import {
+  Software_Type_Enum,
+  useGetConfiguredVersionsQuery,
+  useGetRecommendedSoftwareVersionsQuery,
+  type GetConfiguredVersionsQuery,
+  type GetConfiguredVersionsQueryVariables,
+} from '@/utils/__generated__/graphql';
+import type { QueryHookOptions } from '@apollo/client';
+import { useVisibilityChange } from '@uidotdev/usehooks';
+import { useEffect } from 'react';
+
+export interface UseSoftwareVersionsInfoOptions
+  extends QueryHookOptions<
+    GetConfiguredVersionsQuery,
+    GetConfiguredVersionsQueryVariables
+  > {}
+
+type ServiceVersionInfo = {
+  configuredVersion: string | undefined;
+  recommendedVersions: string[];
+  isVersionMismatch: boolean;
+};
+
+export default function useSoftwareVersionsInfo(
+  options: UseSoftwareVersionsInfoOptions = {},
+): {
+  loading: boolean;
+  auth: ServiceVersionInfo;
+  storage: ServiceVersionInfo;
+  postgres: ServiceVersionInfo;
+  hasura: ServiceVersionInfo;
+  ai: ServiceVersionInfo;
+  isAIEnabled: boolean;
+} {
+  const isPlatform = useIsPlatform();
+  const { currentProject } = useCurrentWorkspaceAndProject();
+
+  const isVisible = useVisibilityChange();
+
+  // Recommended software versions are not polled by default
+  const { data: recommendedVersionsData, loading: loadingRecommendedVersions } =
+    useGetRecommendedSoftwareVersionsQuery({
+      skip: !isPlatform || !currentProject,
+    });
+
+  const {
+    data: configuredVersionsData,
+    loading: loadingConfiguredVersions,
+    refetch: refetchConfiguredVersions,
+    stopPolling,
+  } = useGetConfiguredVersionsQuery({
+    ...options,
+    variables: { ...options.variables, appId: currentProject?.id },
+    skip: !isPlatform || !currentProject,
+    skipPollAttempt: () => !isVisible,
+    pollInterval: options.pollInterval || 10000,
+  });
+
+  // fetch when mounted
+  useEffect(() => {
+    refetchConfiguredVersions();
+    return () => stopPolling();
+  }, [refetchConfiguredVersions, stopPolling]);
+
+  const recommendedVersions = {
+    'hasura-auth': [],
+    'hasura-storage': [],
+    postgres: [],
+    hasura: [],
+    ai: [],
+  };
+
+  recommendedVersionsData?.softwareVersions.forEach(({ software, version }) => {
+    switch (software) {
+      case Software_Type_Enum.Auth:
+        recommendedVersions['hasura-auth'].push(version);
+        break;
+      case Software_Type_Enum.Storage:
+        recommendedVersions['hasura-storage'].push(version);
+        break;
+      case Software_Type_Enum.PostgreSql:
+        recommendedVersions.postgres.push(version);
+        break;
+      case Software_Type_Enum.Hasura:
+        recommendedVersions.hasura.push(version);
+        break;
+      case Software_Type_Enum.Graphite:
+        recommendedVersions.ai.push(version);
+        break;
+      default:
+        break;
+    }
+  });
+
+  const isVersionMismatch = (
+    service: string,
+    configuredVersion: string | undefined,
+  ) =>
+    !recommendedVersions[service].some(
+      (version) => version === configuredVersion,
+    );
+
+  // Check if configured version can't be found in recommended versions
+  const isAuthVersionMismatch = isVersionMismatch(
+    'hasura-auth',
+    configuredVersionsData?.config?.auth?.version,
+  );
+  const isStorageVersionMismatch = isVersionMismatch(
+    'hasura-storage',
+    configuredVersionsData?.config?.storage?.version,
+  );
+  const isPostgresVersionMismatch = isVersionMismatch(
+    'postgres',
+    configuredVersionsData?.config?.postgres?.version,
+  );
+  const isHasuraVersionMismatch = isVersionMismatch(
+    'hasura',
+    configuredVersionsData?.config?.hasura?.version,
+  );
+  const isAIVersionMismatch = isVersionMismatch(
+    'ai',
+    configuredVersionsData?.config?.ai?.version,
+  );
+
+  return {
+    loading: loadingConfiguredVersions || loadingRecommendedVersions,
+    auth: {
+      configuredVersion: configuredVersionsData?.config?.auth?.version,
+      recommendedVersions: recommendedVersions['hasura-auth'],
+      isVersionMismatch: isAuthVersionMismatch,
+    },
+    storage: {
+      configuredVersion: configuredVersionsData?.config?.storage?.version,
+      recommendedVersions: recommendedVersions['hasura-storage'],
+      isVersionMismatch: isStorageVersionMismatch,
+    },
+    postgres: {
+      configuredVersion: configuredVersionsData?.config?.postgres?.version,
+      recommendedVersions: recommendedVersions.postgres,
+      isVersionMismatch: isPostgresVersionMismatch,
+    },
+    hasura: {
+      configuredVersion: configuredVersionsData?.config?.hasura?.version,
+      recommendedVersions: recommendedVersions.hasura,
+      isVersionMismatch: isHasuraVersionMismatch,
+    },
+    ai: {
+      configuredVersion: configuredVersionsData?.config?.ai?.version,
+      recommendedVersions: recommendedVersions.ai,
+      isVersionMismatch: isAIVersionMismatch,
+    },
+    isAIEnabled: Boolean(configuredVersionsData?.config?.ai),
+  };
+}
--- a/dashboard/src/features/projects/overview/components/AccordionHealthBadge/AccordionHealthBadge.tsx
+++ b/dashboard/src/features/projects/overview/components/AccordionHealthBadge/AccordionHealthBadge.tsx
@@ -0,0 +1,67 @@
+import { Box } from '@/components/ui/v2/Box';
+import { CheckIcon } from '@/components/ui/v2/icons/CheckIcon';
+import { QuestionMarkIcon } from '@/components/ui/v2/icons/QuestionMarkIcon';
+import { serviceStateToThemeColor } from '@/features/projects/overview/health';
+import { ServiceState } from '@/utils/__generated__/graphql';
+
+interface AccordionHealthBadgeProps {
+  serviceState?: ServiceState;
+  unknownState?: boolean;
+  /*
+   * Blinking animation to indicate that the service is updating.
+   */
+  blink?: boolean;
+}
+
+export default function AccordionHealthBadge({
+  serviceState,
+  unknownState,
+  blink,
+}: AccordionHealthBadgeProps) {
+  if (unknownState) {
+    return (
+      <Box
+        sx={{
+          backgroundColor: serviceStateToThemeColor.get(serviceState),
+        }}
+        className="flex h-2.5 w-2.5 items-center justify-center rounded-full"
+      >
+        <QuestionMarkIcon
+          sx={{
+            color: (theme) =>
+              theme.palette.mode === 'dark' ? 'grey.200' : 'grey.100',
+          }}
+          className="h-3/4 w-3/4 stroke-2"
+        />
+      </Box>
+    );
+  }
+
+  if (serviceState === ServiceState.Running) {
+    return (
+      <Box
+        sx={{
+          backgroundColor: serviceStateToThemeColor.get(serviceState),
+        }}
+        className="flex h-2.5 w-2.5 items-center justify-center rounded-full"
+      >
+        <CheckIcon
+          sx={{
+            color: (theme) =>
+              theme.palette.mode === 'dark' ? 'grey.200' : 'grey.100',
+          }}
+          className="h-3/4 w-3/4 stroke-2"
+        />
+      </Box>
+    );
+  }
+
+  return (
+    <Box
+      sx={{
+        backgroundColor: serviceStateToThemeColor.get(serviceState),
+      }}
+      className={`h-2.5 w-2.5 rounded-full ${blink ? 'animate-pulse' : ''}`}
+    />
+  );
+}
--- a/dashboard/src/features/projects/overview/components/AccordionHealthBadge/index.ts
+++ b/dashboard/src/features/projects/overview/components/AccordionHealthBadge/index.ts
@@ -0,0 +1 @@
+export { default as AccordionHealthBadge } from './AccordionHealthBadge';
--- a/dashboard/src/features/projects/overview/components/OverviewProjectHealth/OverviewProjectHealth.tsx
+++ b/dashboard/src/features/projects/overview/components/OverviewProjectHealth/OverviewProjectHealth.tsx
@@ -1,6 +1,4 @@
 import { useDialog } from '@/components/common/DialogProvider';
-import { Box } from '@/components/ui/v2/Box';
-import { Button } from '@/components/ui/v2/Button';
 import { AIIcon } from '@/components/ui/v2/icons/AIIcon';
 import { DatabaseIcon } from '@/components/ui/v2/icons/DatabaseIcon';
 import { HasuraIcon } from '@/components/ui/v2/icons/HasuraIcon';
@@ -9,105 +7,45 @@ import { StorageIcon } from '@/components/ui/v2/icons/StorageIcon';
 import { UserIcon } from '@/components/ui/v2/icons/UserIcon';
 import { Text } from '@/components/ui/v2/Text';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
-import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import { useServiceStatus } from '@/features/projects/common/hooks/useServiceStatus';
+import { useSoftwareVersionsInfo } from '@/features/projects/common/hooks/useSoftwareVersionsInfo';
 import { OverviewProjectHealthModal } from '@/features/projects/overview/components/OverviewProjectHealthModal';
 import { ProjectHealthCard } from '@/features/projects/overview/components/ProjectHealthCard';
+import { RunStatusTooltip } from '@/features/projects/overview/components/RunStatusTooltip';
 import { ServiceVersionTooltip } from '@/features/projects/overview/components/ServiceVersionTooltip';
 import {
  baseServices,
  findHighestImportanceState,
-  serviceStateToThemeColor,
-  type ServiceHealthInfo,
 } from '@/features/projects/overview/health';
-import {
-  ServiceState,
-  useGetConfiguredVersionsQuery,
-  useGetProjectServicesHealthQuery,
-  useGetRecommendedSoftwareVersionsQuery,
-} from '@/generated/graphql';
-
-interface RunStatusTooltipProps {
-  servicesStatusInfo?: Array<ServiceHealthInfo>;
-  openHealthModal?: (
-    defaultExpanded?: keyof typeof baseServices | 'run',
-  ) => void;
-}
-
-function RunStatusTooltip({
-  servicesStatusInfo,
-  openHealthModal,
-}: RunStatusTooltipProps) {
-  return (
-    <div className="flex w-full flex-col gap-3 px-2 py-3">
-      <ol className="m-0 flex flex-col gap-3">
-        {servicesStatusInfo.map((service) => (
-          <li
-            key={service.name}
-            className="flex flex-row items-center gap-4 text-ellipsis text-nowrap leading-5"
-          >
-            <Box
-              sx={{
-                backgroundColor: serviceStateToThemeColor.get(service.state),
-              }}
-              className={`h-3 w-3 flex-shrink-0 rounded-full ${
-                service.state === ServiceState.Updating ? 'animate-pulse' : ''
-              }`}
-            />
-            <Text
-              sx={{
-                color: (theme) =>
-                  theme.palette.mode === 'dark'
-                    ? 'text.primary'
-                    : 'text.primary',
-              }}
-              className="font-semibold"
-            >
-              {service.name}
-            </Text>
-          </li>
-        ))}
-      </ol>
-      <Button variant="outlined" onClick={() => openHealthModal('run')}>
-        View state
-      </Button>
-    </div>
-  );
-}

 export default function OverviewProjectHealth() {
-  const isPlatform = useIsPlatform();
  const { currentProject } = useCurrentWorkspaceAndProject();

-  const { data: recommendedVersionsData, loading: loadingRecommendedVersions } =
-    useGetRecommendedSoftwareVersionsQuery({
-      skip: !isPlatform || !currentProject,
-    });
-
  const { openDialog, closeDialog } = useDialog();

-  const { data: configuredVersionsData, loading: loadingConfiguredVersions } =
-    useGetConfiguredVersionsQuery({
-      variables: {
-        appId: currentProject?.id,
-      },
-      skip: !isPlatform || !currentProject,
-    });
+  const {
+    loading: loadingVersions,
+    auth: authVersionInfo,
+    storage: storageVersionInfo,
+    postgres: postgresVersionInfo,
+    hasura: hasuraVersionInfo,
+    ai: aiVersionInfo,
+    isAIEnabled,
+  } = useSoftwareVersionsInfo();

  const {
-    data: projectServicesHealthData,
    loading: loadingProjectServicesHealth,
-  } = useGetProjectServicesHealthQuery({
-    variables: {
-      appId: currentProject?.id,
-    },
-    skip: !isPlatform || !currentProject,
+    auth: authStatus,
+    storage: storageStatus,
+    postgres: postgresStatus,
+    hasura: hasuraStatus,
+    ai: aiStatus,
+    run: runStatus,
+  } = useServiceStatus({
+    shouldPoll: true,
  });

-  if (
-    loadingRecommendedVersions ||
-    loadingConfiguredVersions ||
-    loadingProjectServicesHealth
-  ) {
+  if (loadingVersions || loadingProjectServicesHealth) {
    return (
      <div className="grid grid-flow-row content-start gap-6">
        <Text variant="h3">Project Health</Text>
@@ -133,78 +71,12 @@ export default function OverviewProjectHealth() {
    );
  }

-  const isAIServiceEnabled = !!configuredVersionsData?.config?.ai;
-
-  const getRecommendedVersions = (softwareName: string): string[] =>
-    recommendedVersionsData?.softwareVersions.reduce(
-      (recommendedVersions, service) => {
-        if (service.software === softwareName) {
-          recommendedVersions.push(service.version);
-        }
-        return recommendedVersions;
-      },
-      [],
-    ) ?? [];
-
-  const authRecommendedVersions = getRecommendedVersions(
-    baseServices['hasura-auth'].softwareVersionsName,
-  );
-  const hasuraRecommendedVersions = getRecommendedVersions(
-    baseServices.hasura.softwareVersionsName,
-  );
-  const postgresRecommendedVersions = getRecommendedVersions(
-    baseServices.postgres.softwareVersionsName,
-  );
-  const storageRecommendedVersions = getRecommendedVersions(
-    baseServices['hasura-storage'].softwareVersionsName,
-  );
-  const aiRecommendedVersions = getRecommendedVersions(
-    baseServices.ai.softwareVersionsName,
-  );
-
-  // Check if configured version can't be found in recommended versions
-  const isAuthVersionMismatch = !authRecommendedVersions.find(
-    (version) => configuredVersionsData?.config?.auth?.version === version,
-  );
-
-  const isHasuraVersionMismatch = !hasuraRecommendedVersions.find(
-    (version) => configuredVersionsData?.config?.hasura?.version === version,
-  );
-
-  const isPostgresVersionMismatch = !postgresRecommendedVersions.find(
-    (version) => configuredVersionsData?.config?.postgres?.version === version,
-  );
-
-  const isStorageVersionMismatch = !storageRecommendedVersions.find(
-    (version) => configuredVersionsData?.config?.storage?.version === version,
-  );
-
-  const isAIVersionMismatch = !aiRecommendedVersions.find(
-    (version) => configuredVersionsData?.config?.ai?.version === version,
-  );
-
-  const serviceMap: { [key: string]: ServiceHealthInfo | undefined } = {};
-  projectServicesHealthData?.getProjectStatus?.services.forEach((service) => {
-    serviceMap[service.name] = service;
-  });
-  const {
-    'hasura-auth': authStatus,
-    'hasura-storage': storageStatus,
-    postgres: postgresStatus,
-    hasura: hasuraStatus,
-    ai: aiStatus,
-    ...otherServicesStatus
-  } = serviceMap;
-
  const openHealthModal = async (
    defaultExpanded: keyof typeof baseServices | 'run',
  ) => {
    openDialog({
      component: (
-        <OverviewProjectHealthModal
-          servicesHealth={projectServicesHealthData}
-          defaultExpanded={defaultExpanded}
-        />
+        <OverviewProjectHealthModal defaultExpanded={defaultExpanded} />
      ),
      props: {
        PaperProps: { className: 'p-0 max-w-2xl w-full' },
@@ -220,9 +92,9 @@ export default function OverviewProjectHealth() {
    <ServiceVersionTooltip
      serviceName={baseServices['hasura-auth'].displayName}
      serviceKey="hasura-auth"
-      usedVersion={configuredVersionsData?.config?.auth?.version ?? ''}
-      recommendedVersionMismatch={isAuthVersionMismatch}
-      recommendedVersions={authRecommendedVersions}
+      usedVersion={authVersionInfo?.configuredVersion ?? ''}
+      recommendedVersionMismatch={authVersionInfo?.isVersionMismatch}
+      recommendedVersions={authVersionInfo?.recommendedVersions}
      openHealthModal={openHealthModal}
      state={authStatus?.state}
    />
@@ -232,9 +104,9 @@ export default function OverviewProjectHealth() {
    <ServiceVersionTooltip
      serviceName={baseServices.hasura.displayName}
      serviceKey="hasura"
-      usedVersion={configuredVersionsData?.config?.hasura?.version ?? ''}
-      recommendedVersionMismatch={isHasuraVersionMismatch}
-      recommendedVersions={hasuraRecommendedVersions}
+      usedVersion={hasuraVersionInfo?.configuredVersion ?? ''}
+      recommendedVersionMismatch={hasuraVersionInfo?.isVersionMismatch}
+      recommendedVersions={hasuraVersionInfo?.recommendedVersions}
      openHealthModal={openHealthModal}
      state={hasuraStatus?.state}
    />
@@ -244,9 +116,9 @@ export default function OverviewProjectHealth() {
    <ServiceVersionTooltip
      serviceName={baseServices.postgres.displayName}
      serviceKey="postgres"
-      usedVersion={configuredVersionsData?.config?.postgres?.version ?? ''}
-      recommendedVersionMismatch={isPostgresVersionMismatch}
-      recommendedVersions={postgresRecommendedVersions}
+      usedVersion={postgresVersionInfo?.configuredVersion ?? ''}
+      recommendedVersionMismatch={postgresVersionInfo?.isVersionMismatch}
+      recommendedVersions={postgresVersionInfo?.recommendedVersions}
      openHealthModal={openHealthModal}
      state={postgresStatus?.state}
    />
@@ -256,9 +128,9 @@ export default function OverviewProjectHealth() {
    <ServiceVersionTooltip
      serviceName={baseServices['hasura-storage'].displayName}
      serviceKey="hasura-storage"
-      usedVersion={configuredVersionsData?.config?.storage?.version ?? ''}
-      recommendedVersionMismatch={isStorageVersionMismatch}
-      recommendedVersions={storageRecommendedVersions}
+      usedVersion={storageVersionInfo?.configuredVersion ?? ''}
+      recommendedVersionMismatch={storageVersionInfo?.isVersionMismatch}
+      recommendedVersions={storageVersionInfo?.recommendedVersions}
      openHealthModal={openHealthModal}
      state={storageStatus?.state}
    />
@@ -268,16 +140,16 @@ export default function OverviewProjectHealth() {
    <ServiceVersionTooltip
      serviceName={baseServices.ai.displayName}
      serviceKey="ai"
-      usedVersion={configuredVersionsData?.config?.ai?.version ?? ''}
-      recommendedVersionMismatch={isAIVersionMismatch}
-      recommendedVersions={aiRecommendedVersions}
+      usedVersion={aiVersionInfo?.configuredVersion ?? ''}
+      recommendedVersionMismatch={aiVersionInfo?.isVersionMismatch}
+      recommendedVersions={aiVersionInfo?.recommendedVersions}
      openHealthModal={openHealthModal}
      state={aiStatus?.state}
    />
  );

-  const runServices = Object.values(otherServicesStatus).filter((service) =>
-    service.name.startsWith('run-'),
+  const runServices = Object.values(runStatus).filter((service) =>
+    service?.name?.startsWith('run-'),
  );

  const runServicesStates = runServices.map((service) => service.state);
@@ -293,32 +165,32 @@ export default function OverviewProjectHealth() {
          <ProjectHealthCard
            icon={<UserIcon className="m-1 h-6 w-6" />}
            tooltip={authTooltipElem}
-            isVersionMismatch={isAuthVersionMismatch}
+            isVersionMismatch={authVersionInfo?.isVersionMismatch}
            state={authStatus?.state}
          />
          <ProjectHealthCard
            icon={<DatabaseIcon className="m-1 h-6 w-6" />}
            tooltip={postgresTooltipElem}
-            isVersionMismatch={isPostgresVersionMismatch}
+            isVersionMismatch={postgresVersionInfo?.isVersionMismatch}
            state={postgresStatus?.state}
          />
          <ProjectHealthCard
            icon={<StorageIcon className="m-1 h-6 w-6" />}
            tooltip={storageTooltipElem}
-            isVersionMismatch={isStorageVersionMismatch}
+            isVersionMismatch={storageVersionInfo?.isVersionMismatch}
            state={storageStatus?.state}
          />
          <ProjectHealthCard
            icon={<HasuraIcon className="m-1 h-6 w-6" />}
            tooltip={hasuraTooltipElem}
-            isVersionMismatch={isHasuraVersionMismatch}
+            isVersionMismatch={hasuraVersionInfo?.isVersionMismatch}
            state={hasuraStatus?.state}
          />
-          {isAIServiceEnabled && (
+          {isAIEnabled && (
            <ProjectHealthCard
              icon={<AIIcon className="m-1 h-6 w-6" />}
              tooltip={aiTooltipElem}
-              isVersionMismatch={isAIVersionMismatch}
+              isVersionMismatch={aiVersionInfo?.isVersionMismatch}
              state={aiStatus?.state}
            />
          )}
--- a/dashboard/src/features/projects/overview/components/OverviewProjectHealthModal/OverviewProjectHealthModal.tsx
+++ b/dashboard/src/features/projects/overview/components/OverviewProjectHealthModal/OverviewProjectHealthModal.tsx
@@ -1,225 +1,33 @@
-import { CodeBlock } from '@/components/presentational/CodeBlock';
-import { Accordion } from '@/components/ui/v2/Accordion';
 import { Box } from '@/components/ui/v2/Box';
 import { Divider } from '@/components/ui/v2/Divider';
 import { AIIcon } from '@/components/ui/v2/icons/AIIcon';
-import { CheckIcon } from '@/components/ui/v2/icons/CheckIcon';
-import { ChevronDownIcon } from '@/components/ui/v2/icons/ChevronDownIcon';
 import { DatabaseIcon } from '@/components/ui/v2/icons/DatabaseIcon';
 import { HasuraIcon } from '@/components/ui/v2/icons/HasuraIcon';
 import { ServicesOutlinedIcon } from '@/components/ui/v2/icons/ServicesOutlinedIcon';
 import { StorageIcon } from '@/components/ui/v2/icons/StorageIcon';
 import { UserIcon } from '@/components/ui/v2/icons/UserIcon';
-import { Text } from '@/components/ui/v2/Text';
+import { useServiceStatus } from '@/features/projects/common/hooks/useServiceStatus';
+import { ServiceAccordion } from '@/features/projects/overview/components/ServiceAccordion';
 import {
  findHighestImportanceState,
-  serviceStateToThemeColor,
  type baseServices,
-  type ServiceHealthInfo,
 } from '@/features/projects/overview/health';
 import { removeTypename } from '@/utils/helpers';
-import {
-  ServiceState,
-  type GetProjectServicesHealthQuery,
-} from '@/utils/__generated__/graphql';
-import Image from 'next/image';
-import { type ReactElement } from 'react';
 import { twMerge } from 'tailwind-merge';

-interface ServiceAccordionProps {
-  serviceName: string;
-  serviceHealth: ServiceHealthInfo;
-  replicas: ServiceHealthInfo['replicas'];
-  serviceState: ServiceState;
-  /**
-   * Icon to display on the accordion.
-   */
-  icon?: string | ReactElement;
-  /**
-   * Label of the icon.
-   */
-  alt?: string;
-  iconIsComponent?: boolean;
-  defaultExpanded?: boolean;
-}
-
-function ServiceAccordion({
-  serviceName,
-  serviceHealth,
-  replicas,
-  serviceState,
-  icon,
-  iconIsComponent = true,
-  alt,
-  defaultExpanded = false,
-}: ServiceAccordionProps) {
-  const replicasLabel = replicas.length === 1 ? 'replica' : 'replicas';
-
-  const serviceInfo = removeTypename(serviceHealth);
-  const blink = serviceState === ServiceState.Updating;
-
-  return (
-    <Accordion.Root defaultExpanded={defaultExpanded}>
-      <Accordion.Summary
-        expandIcon={
-          <ChevronDownIcon
-            sx={{
-              color: 'text.primary',
-            }}
-          />
-        }
-        aria-controls="panel1-content"
-        id="panel1-header"
-        className="px-6"
-      >
-        <div className="flex flex-row justify-between gap-2 py-2">
-          <div className="flex items-center gap-3">
-            {iconIsComponent
-              ? icon
-              : typeof icon === 'string' && <Image src={icon} alt={alt} />}
-            <Text
-              sx={{ color: 'text.primary' }}
-              variant="h4"
-              className="font-semibold"
-            >
-              {serviceName}{' '}
-              <Text
-                sx={{
-                  color: 'text.secondary',
-                }}
-                component="span"
-                className="font-semibold"
-              >
-                ({replicas.length} {replicasLabel})
-              </Text>
-            </Text>
-            {serviceState === ServiceState.Running ? (
-              <Box
-                sx={{
-                  backgroundColor: serviceStateToThemeColor.get(serviceState),
-                }}
-                className="flex h-2 w-2 items-center justify-center rounded-full"
-              >
-                <CheckIcon className="h-3/4 w-3/4 stroke-2 text-white" />
-              </Box>
-            ) : (
-              <Box
-                sx={{
-                  backgroundColor: serviceStateToThemeColor.get(serviceState),
-                }}
-                className={`h-2 w-2 rounded-full ${
-                  blink ? 'animate-pulse' : ''
-                }`}
-              />
-            )}
-          </div>
-        </div>
-      </Accordion.Summary>
-      <Accordion.Details>
-        <CodeBlock copyToClipboardToastTitle={`${serviceName} status`}>
-          {JSON.stringify(serviceInfo, null, 2)}
-        </CodeBlock>
-      </Accordion.Details>
-    </Accordion.Root>
-  );
-}
-
-interface RunServicesAccordionProps {
-  servicesHealth: Array<ServiceHealthInfo>;
-  serviceStates: ServiceState[];
-  /**
-   * Icon to display on the accordion.
-   */
-  icon?: string | ReactElement;
-  /**
-   * Label of the icon.
-   */
-  alt?: string;
-  iconIsComponent?: boolean;
-  defaultExpanded?: boolean;
-}
-
-function RunServicesAccordion({
-  serviceStates,
-  servicesHealth,
-  icon,
-  iconIsComponent = true,
-  defaultExpanded = false,
-  alt,
-}: RunServicesAccordionProps) {
-  const globalState = findHighestImportanceState(serviceStates);
-
-  const serviceInfo = removeTypename(servicesHealth);
-
-  const blink = globalState === ServiceState.Updating;
-
-  return (
-    <Accordion.Root defaultExpanded={defaultExpanded}>
-      <Accordion.Summary
-        expandIcon={
-          <ChevronDownIcon
-            sx={{
-              color: 'text.primary',
-            }}
-          />
-        }
-        aria-controls="panel1-content"
-        id="panel1-header"
-        className="px-6"
-      >
-        <div className="flex flex-row justify-between gap-2 py-2">
-          <div className="flex items-center gap-3">
-            {iconIsComponent
-              ? icon
-              : typeof icon === 'string' && <Image src={icon} alt={alt} />}
-            <Text
-              sx={{ color: 'text.primary' }}
-              variant="h4"
-              className="font-semibold"
-            >
-              Run
-            </Text>
-            <Box
-              sx={{
-                backgroundColor: serviceStateToThemeColor.get(globalState),
-              }}
-              className={`h-2 w-2 rounded-full ${blink ? 'animate-pulse' : ''}`}
-            />
-          </div>
-        </div>
-      </Accordion.Summary>
-      <Accordion.Details>
-        <CodeBlock copyToClipboardToastTitle="Run services status">
-          {JSON.stringify(serviceInfo, null, 2)}
-        </CodeBlock>
-      </Accordion.Details>
-    </Accordion.Root>
-  );
-}
-
 export interface OverviewProjectHealthModalProps {
-  servicesHealth?: GetProjectServicesHealthQuery;
  defaultExpanded?: keyof typeof baseServices | 'run';
 }

 export default function OverviewProjectHealthModal({
-  servicesHealth,
  defaultExpanded,
 }: OverviewProjectHealthModalProps) {
-  const serviceMap: { [key: string]: ServiceHealthInfo | undefined } = {};
-  servicesHealth.getProjectStatus.services.forEach((service) => {
-    serviceMap[service.name] = service;
+  const { auth, storage, postgres, hasura, ai, run } = useServiceStatus({
+    fetchPolicy: 'cache-only',
+    shouldPoll: false,
  });
-  const {
-    'hasura-auth': auth,
-    'hasura-storage': storage,
-    postgres,
-    hasura,
-    ai,
-    ...otherServices
-  } = serviceMap;

-  const runServices = Object.values(otherServices).filter((service) =>
+  const runServices = Object.values(run).filter((service) =>
    service.name.startsWith('run-'),
  );

@@ -230,6 +38,24 @@ export default function OverviewProjectHealthModal({
  const isAIExpandedByDefault = defaultExpanded === 'ai';
  const isRunExpandedByDefault = defaultExpanded === 'run';

+  const getServiceInfo = (service) => {
+    const info = removeTypename(service);
+    return JSON.stringify(info, null, 2);
+  };
+
+  const serviceInfo = {
+    auth: getServiceInfo(auth),
+    storage: getServiceInfo(storage),
+    postgres: getServiceInfo(postgres),
+    hasura: getServiceInfo(hasura),
+    ai: getServiceInfo(ai),
+    run: getServiceInfo(Object.values(runServices)),
+  };
+
+  const runServicesState = findHighestImportanceState(
+    Object.values(runServices).map((service) => service.state),
+  );
+
  return (
    <Box className={twMerge('w-full rounded-lg pt-2 text-left')}>
      <Box
@@ -242,8 +68,8 @@ export default function OverviewProjectHealthModal({
        <ServiceAccordion
          icon={<UserIcon className="h-4 w-4" />}
          serviceName="Auth"
-          serviceHealth={auth}
-          replicas={auth?.replicas}
+          serviceInfo={serviceInfo.auth}
+          replicaCount={auth?.replicas?.length}
          serviceState={auth?.state}
          defaultExpanded={isAuthExpandedByDefault}
        />
@@ -251,8 +77,8 @@ export default function OverviewProjectHealthModal({
        <ServiceAccordion
          icon={<DatabaseIcon className="h-4 w-4" />}
          serviceName="Postgres"
-          serviceHealth={postgres}
-          replicas={postgres?.replicas}
+          serviceInfo={serviceInfo.postgres}
+          replicaCount={postgres?.replicas?.length}
          serviceState={postgres?.state}
          defaultExpanded={isPostgresExpandedByDefault}
        />
@@ -260,8 +86,8 @@ export default function OverviewProjectHealthModal({
        <ServiceAccordion
          icon={<StorageIcon className="h-4 w-4" />}
          serviceName="Storage"
-          serviceHealth={storage}
-          replicas={storage?.replicas}
+          serviceInfo={serviceInfo.storage}
+          replicaCount={storage?.replicas?.length}
          serviceState={storage?.state}
          defaultExpanded={isStorageExpandedByDefault}
        />
@@ -269,8 +95,8 @@ export default function OverviewProjectHealthModal({
        <ServiceAccordion
          icon={<HasuraIcon className="h-4 w-4" />}
          serviceName="Hasura"
-          serviceHealth={hasura}
-          replicas={hasura?.replicas}
+          serviceInfo={serviceInfo.hasura}
+          replicaCount={hasura?.replicas?.length}
          serviceState={hasura?.state}
          defaultExpanded={isHasuraExpandedByDefault}
        />
@@ -280,22 +106,22 @@ export default function OverviewProjectHealthModal({
            <ServiceAccordion
              icon={<AIIcon className="h-4 w-4" />}
              serviceName="AI"
-              serviceHealth={ai}
-              replicas={ai.replicas}
-              serviceState={ai.state}
+              serviceInfo={serviceInfo.ai}
+              replicaCount={ai?.replicas?.length}
+              serviceState={ai?.state}
              defaultExpanded={isAIExpandedByDefault}
            />
          </>
        ) : null}
-        {Object.values(runServices).length > 0 ? (
+        {runServices && Object.values(runServices).length > 0 ? (
          <>
            <Divider />
-            <RunServicesAccordion
-              servicesHealth={Object.values(runServices)}
+            <ServiceAccordion
              icon={<ServicesOutlinedIcon className="h-4 w-4" />}
-              serviceStates={Object.values(runServices).map(
-                (service) => service.state,
-              )}
+              serviceName="Run"
+              serviceInfo={serviceInfo.run}
+              replicaCount={0}
+              serviceState={runServicesState}
              defaultExpanded={isRunExpandedByDefault}
            />
          </>
--- a/dashboard/src/features/projects/overview/components/ProjectHealthBadge/ProjectHealthBadge.tsx
+++ b/dashboard/src/features/projects/overview/components/ProjectHealthBadge/ProjectHealthBadge.tsx
@@ -0,0 +1,107 @@
+import { Badge, type BadgeProps } from '@/components/ui/v2/Badge';
+import { CheckIcon } from '@/components/ui/v2/icons/CheckIcon';
+import { ExclamationFilledIcon } from '@/components/ui/v2/icons/ExclamationFilledIcon';
+import { QuestionMarkIcon } from '@/components/ui/v2/icons/QuestionMarkIcon';
+
+export interface ProjectHealthBadgeProps extends BadgeProps {
+  badgeVariant?: 'standard' | 'dot';
+  badgeColor?: 'success' | 'error' | 'warning' | 'secondary';
+  unknownState?: boolean;
+  showExclamation?: boolean;
+  showCheckIcon?: boolean;
+  isLoading?: boolean;
+  blink?: boolean;
+}
+
+export default function ProjectHealthBadge({
+  badgeColor,
+  badgeVariant,
+  showExclamation,
+  showCheckIcon,
+  unknownState,
+  blink,
+  children,
+  ...props
+}: ProjectHealthBadgeProps) {
+  let innerBadgeContent = null;
+  if (unknownState) {
+    innerBadgeContent = (
+      <QuestionMarkIcon
+        sx={{
+          color: (theme) =>
+            theme.palette.mode === 'dark' ? 'grey.200' : 'grey.100',
+        }}
+        className="h-2 w-2 stroke-2"
+      />
+    );
+  } else if (showCheckIcon) {
+    innerBadgeContent = (
+      <CheckIcon
+        sx={{
+          color: (theme) =>
+            theme.palette.mode === 'dark' ? 'grey.200' : 'grey.100',
+        }}
+        className="h-2 w-2 stroke-2"
+      />
+    );
+  }
+
+  if (!badgeColor) {
+    return <div>{children}</div>;
+  }
+
+  if (showExclamation) {
+    return (
+      <Badge
+        variant="standard"
+        anchorOrigin={{
+          vertical: 'bottom',
+          horizontal: 'right',
+        }}
+        badgeContent={
+          <ExclamationFilledIcon
+            sx={{
+              color: (theme) =>
+                theme.palette.mode === 'dark' ? 'grey.900' : 'grey.600',
+            }}
+            className="h-2.5 w-2.5"
+          />
+        }
+      >
+        <Badge
+          color={badgeColor}
+          variant={badgeVariant}
+          badgeContent={innerBadgeContent}
+          sx={{
+            color: (theme) =>
+              theme.palette.mode === 'dark' ? 'grey.900' : 'text.primary',
+          }}
+          componentsProps={{
+            badge: {
+              className: blink ? 'animate-pulse' : '',
+            },
+          }}
+          {...props}
+        >
+          {children}
+        </Badge>
+      </Badge>
+    );
+  }
+
+  return (
+    <Badge
+      color={badgeColor}
+      variant={badgeVariant}
+      badgeContent={innerBadgeContent}
+      componentsProps={{
+        badge: {
+          className: blink ? 'animate-pulse' : '',
+        },
+      }}
+      {...props}
+    >
+      {children}
+    </Badge>
+  );
+}
--- a/dashboard/src/features/projects/overview/components/ProjectHealthBadge/index.ts
+++ b/dashboard/src/features/projects/overview/components/ProjectHealthBadge/index.ts
@@ -0,0 +1 @@
+export { default as ProjectHealthBadge } from './ProjectHealthBadge';
--- a/dashboard/src/features/projects/overview/components/ProjectHealthCard/ProjectHealthCard.tsx
+++ b/dashboard/src/features/projects/overview/components/ProjectHealthCard/ProjectHealthCard.tsx
@@ -1,9 +1,7 @@
-import { Badge, type BadgeProps } from '@/components/ui/v2/Badge';
 import type { BoxProps } from '@/components/ui/v2/Box';
 import { Box } from '@/components/ui/v2/Box';
-import { CheckIcon } from '@/components/ui/v2/icons/CheckIcon';
-import { ExclamationFilledIcon } from '@/components/ui/v2/icons/ExclamationFilledIcon';
 import { Tooltip, tooltipClasses } from '@/components/ui/v2/Tooltip';
+import { ProjectHealthBadge } from '@/features/projects/overview/components/ProjectHealthBadge';
 import { serviceStateToBadgeColor } from '@/features/projects/overview/health';
 import { ServiceState } from '@/utils/__generated__/graphql';
 import type { ImageProps } from 'next/image';
@@ -11,104 +9,6 @@ import Image from 'next/image';
 import type { ReactElement } from 'react';
 import { twMerge } from 'tailwind-merge';

-interface HealthBadgeProps extends BadgeProps {
-  badgeVariant?: 'standard' | 'dot';
-  badgeColor?: 'success' | 'error' | 'warning';
-  showExclamation?: boolean;
-  showCheckIcon?: boolean;
-  isLoading?: boolean;
-  blink?: boolean;
-}
-
-function HealthBadge({
-  badgeColor,
-  badgeVariant,
-  showExclamation,
-  showCheckIcon,
-  blink,
-  children,
-  ...props
-}: HealthBadgeProps) {
-  if (!badgeColor) {
-    return <div>{children}</div>;
-  }
-
-  if (showExclamation) {
-    return (
-      <Badge
-        variant="standard"
-        anchorOrigin={{
-          vertical: 'bottom',
-          horizontal: 'right',
-        }}
-        badgeContent={
-          <ExclamationFilledIcon
-            sx={{
-              color: (theme) =>
-                theme.palette.mode === 'dark' ? 'grey.900' : 'grey.600',
-            }}
-            className="h-2.5 w-2.5"
-          />
-        }
-      >
-        <Badge
-          color={badgeColor}
-          variant={badgeVariant}
-          badgeContent={
-            showCheckIcon ? (
-              <CheckIcon
-                sx={{
-                  color: (theme) =>
-                    theme.palette.mode === 'dark' ? 'grey.200' : 'grey.100',
-                }}
-                className="h-2 w-2 stroke-2"
-              />
-            ) : null
-          }
-          sx={{
-            color: (theme) =>
-              theme.palette.mode === 'dark' ? 'grey.900' : 'text.primary',
-          }}
-          componentsProps={{
-            badge: {
-              className: blink ? 'animate-pulse' : '',
-            },
-          }}
-          {...props}
-        >
-          {children}
-        </Badge>
-      </Badge>
-    );
-  }
-
-  return (
-    <Badge
-      color={badgeColor}
-      variant={badgeVariant}
-      badgeContent={
-        showCheckIcon ? (
-          <CheckIcon
-            sx={{
-              color: (theme) =>
-                theme.palette.mode === 'dark' ? 'grey.200' : 'grey.100',
-            }}
-            className="h-2 w-2 stroke-2"
-          />
-        ) : null
-      }
-      componentsProps={{
-        badge: {
-          className: blink ? 'animate-pulse' : '',
-        },
-      }}
-      {...props}
-    >
-      {children}
-    </Badge>
-  );
-}
-
 export interface ProjectHealthCardProps extends BoxProps {
  /**
   * Label of the card icon.
@@ -171,7 +71,11 @@ export default function ProjectHealthCard({
  ...props
 }: ProjectHealthCardProps) {
  const badgeColor = serviceStateToBadgeColor.get(state);
-  const badgeVariant = state === ServiceState.Running ? 'standard' : 'dot';
+  const unknownState = state === undefined;
+  let badgeVariant: 'dot' | 'standard' = 'dot';
+  if (state === ServiceState.Running || unknownState) {
+    badgeVariant = 'standard';
+  }
  const showCheckIcon = state === ServiceState.Running;
  const shouldBlink = state === ServiceState.Updating;

@@ -199,11 +103,12 @@ export default function ProjectHealthCard({
        {...props}
      >
        <div className="grid grid-flow-col items-center justify-center">
-          <HealthBadge
+          <ProjectHealthBadge
            badgeColor={!isLoading ? badgeColor : undefined}
            badgeVariant={badgeVariant}
            showCheckIcon={showCheckIcon}
            showExclamation={isVersionMismatch}
+            unknownState={unknownState}
            blink={shouldBlink}
          >
            {iconIsComponent
@@ -217,7 +122,7 @@ export default function ProjectHealthCard({
                    {...slotProps.imgIcon}
                  />
                )}
-          </HealthBadge>
+          </ProjectHealthBadge>
        </div>
      </Box>
    </Tooltip>
--- a/dashboard/src/features/projects/overview/components/RunStatusTooltip/RunStatusTooltip.tsx
+++ b/dashboard/src/features/projects/overview/components/RunStatusTooltip/RunStatusTooltip.tsx
@@ -0,0 +1,57 @@
+import { Box } from '@/components/ui/v2/Box';
+import { Button } from '@/components/ui/v2/Button';
+import { Text } from '@/components/ui/v2/Text';
+import {
+  serviceStateToThemeColor,
+  type baseServices,
+  type ServiceHealthInfo,
+} from '@/features/projects/overview/health';
+import { ServiceState } from '@/generated/graphql';
+
+export interface RunStatusTooltipProps {
+  servicesStatusInfo?: Array<ServiceHealthInfo>;
+  openHealthModal?: (
+    defaultExpanded?: keyof typeof baseServices | 'run',
+  ) => void;
+}
+
+export default function RunStatusTooltip({
+  servicesStatusInfo,
+  openHealthModal,
+}: RunStatusTooltipProps) {
+  return (
+    <div className="flex w-full flex-col gap-3 px-2 py-3">
+      <ol className="m-0 flex flex-col gap-3">
+        {servicesStatusInfo.map((service) => (
+          <li
+            key={service.name}
+            className="flex flex-row items-center gap-4 text-ellipsis text-nowrap leading-5"
+          >
+            <Box
+              sx={{
+                backgroundColor: serviceStateToThemeColor.get(service.state),
+              }}
+              className={`h-3 w-3 flex-shrink-0 rounded-full ${
+                service.state === ServiceState.Updating ? 'animate-pulse' : ''
+              }`}
+            />
+            <Text
+              sx={{
+                color: (theme) =>
+                  theme.palette.mode === 'dark'
+                    ? 'text.primary'
+                    : 'text.primary',
+              }}
+              className="font-semibold"
+            >
+              {service.name}
+            </Text>
+          </li>
+        ))}
+      </ol>
+      <Button variant="outlined" onClick={() => openHealthModal('run')}>
+        View state
+      </Button>
+    </div>
+  );
+}
--- a/dashboard/src/features/projects/overview/components/RunStatusTooltip/index.ts
+++ b/dashboard/src/features/projects/overview/components/RunStatusTooltip/index.ts
@@ -0,0 +1 @@
+export { default as RunStatusTooltip } from './RunStatusTooltip';
--- a/dashboard/src/features/projects/overview/components/ServiceAccordion/ServiceAccordion.tsx
+++ b/dashboard/src/features/projects/overview/components/ServiceAccordion/ServiceAccordion.tsx
@@ -0,0 +1,95 @@
+import { CodeBlock } from '@/components/presentational/CodeBlock';
+import { Accordion } from '@/components/ui/v2/Accordion';
+import { ChevronDownIcon } from '@/components/ui/v2/icons/ChevronDownIcon';
+import { Text } from '@/components/ui/v2/Text';
+import { AccordionHealthBadge } from '@/features/projects/overview/components/AccordionHealthBadge';
+import { ServiceState } from '@/utils/__generated__/graphql';
+import Image from 'next/image';
+import { type ReactElement } from 'react';
+
+export interface ServiceAccordionProps {
+  serviceName: string;
+  serviceInfo: string;
+  replicaCount: number;
+  serviceState: ServiceState;
+  /**
+   * Icon to display on the accordion.
+   */
+  icon?: string | ReactElement;
+  /**
+   * Label of the icon.
+   */
+  alt?: string;
+  iconIsComponent?: boolean;
+  defaultExpanded?: boolean;
+}
+
+export default function ServiceAccordion({
+  serviceName,
+  serviceInfo,
+  replicaCount,
+  serviceState,
+  icon,
+  iconIsComponent = true,
+  alt,
+  defaultExpanded = false,
+}: ServiceAccordionProps) {
+  const unknownState = serviceState === undefined;
+
+  const replicasLabel = replicaCount === 1 ? 'replica' : 'replicas';
+
+  const blink = serviceState === ServiceState.Updating;
+
+  return (
+    <Accordion.Root defaultExpanded={defaultExpanded}>
+      <Accordion.Summary
+        expandIcon={
+          <ChevronDownIcon
+            sx={{
+              color: 'text.primary',
+            }}
+          />
+        }
+        aria-controls="panel1-content"
+        id="panel1-header"
+        className="px-6"
+      >
+        <div className="flex flex-row justify-between gap-2 py-2">
+          <div className="flex items-center gap-3">
+            {iconIsComponent
+              ? icon
+              : typeof icon === 'string' && <Image src={icon} alt={alt} />}
+            <Text
+              sx={{ color: 'text.primary' }}
+              variant="h4"
+              className="font-semibold"
+            >
+              {serviceName}{' '}
+              {!unknownState && replicaCount && replicasLabel ? (
+                <Text
+                  sx={{
+                    color: 'text.secondary',
+                  }}
+                  component="span"
+                  className="font-semibold"
+                >
+                  ({replicaCount} {replicasLabel})
+                </Text>
+              ) : null}
+            </Text>
+            <AccordionHealthBadge
+              serviceState={serviceState}
+              unknownState={unknownState}
+              blink={blink}
+            />
+          </div>
+        </div>
+      </Accordion.Summary>
+      <Accordion.Details>
+        <CodeBlock copyToClipboardToastTitle={`${serviceName} status`}>
+          {serviceInfo}
+        </CodeBlock>
+      </Accordion.Details>
+    </Accordion.Root>
+  );
+}
--- a/dashboard/src/features/projects/overview/components/ServiceAccordion/index.ts
+++ b/dashboard/src/features/projects/overview/components/ServiceAccordion/index.ts
@@ -0,0 +1 @@
+export { default as ServiceAccordion } from './ServiceAccordion';
--- a/dashboard/src/features/projects/overview/health/health.ts
+++ b/dashboard/src/features/projects/overview/health/health.ts
@@ -35,19 +35,19 @@ export const serviceStateToThemeColor = new Map<ServiceState, string>([
  [ServiceState.UpdateError, 'error.main'],
  [ServiceState.Updating, 'warning.dark'],
  [ServiceState.None, 'error.main'],
-  [undefined, 'error.main'],
+  [undefined, 'grey.500'],
 ]);

 export const serviceStateToBadgeColor = new Map<
  ServiceState,
-  'success' | 'error' | 'warning'
+  'success' | 'error' | 'warning' | 'secondary'
 >([
  [ServiceState.Running, 'success'],
  [ServiceState.Error, 'error'],
  [ServiceState.UpdateError, 'error'],
  [ServiceState.Updating, 'warning'],
  [ServiceState.None, 'error'],
-  [undefined, 'error'],
+  [undefined, 'secondary'], // secondary is used for unknown states
 ]);

 /**
--- a/dashboard/src/features/services/components/ServiceForm/ServiceForm.tsx
+++ b/dashboard/src/features/services/components/ServiceForm/ServiceForm.tsx
@@ -31,6 +31,7 @@ import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { RESOURCE_VCPU_MULTIPLIER } from '@/utils/constants/common';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
+import { removeTypename } from '@/utils/helpers';
 import {
  useInsertRunServiceConfigMutation,
  useInsertRunServiceMutation,
@@ -99,38 +100,43 @@ export default function ServiceForm({
  }, [isDirty, location, onDirtyStateChange]);

  const getFormattedConfig = (values: ServiceFormValues) => {
+    // Remove any __typename property from the values
+    const sanitizedValues = removeTypename(values) as ServiceFormValues;
+
    const config: ConfigRunServiceConfigInsertInput = {
-      name: values.name,
+      name: sanitizedValues.name,
      image: {
-        image: values.image,
+        image: sanitizedValues.image,
      },
-      command: parse(values.command).map((item) => item.toString()),
+      command: parse(sanitizedValues.command).map((item) => item.toString()),
      resources: {
        compute: {
-          cpu: values.compute.cpu,
-          memory: values.compute.memory,
+          cpu: sanitizedValues.compute.cpu,
+          memory: sanitizedValues.compute.memory,
        },
-        storage: values.storage.map((item) => ({
+        storage: sanitizedValues.storage.map((item) => ({
          name: item.name,
          path: item.path,
          capacity: item.capacity,
        })),
-        replicas: values.replicas,
+        replicas: sanitizedValues.replicas,
      },
-      environment: values.environment.map((item) => ({
+      environment: sanitizedValues.environment.map((item) => ({
        name: item.name,
        value: item.value,
      })),
-      ports: values.ports.map((item) => ({
+      ports: sanitizedValues.ports.map((item) => ({
        port: item.port,
        type: item.type,
        publish: item.publish,
+        ingresses: item.ingresses,
      })),
-      healthCheck: values.healthCheck
+      healthCheck: sanitizedValues.healthCheck
        ? {
-            port: values.healthCheck?.port,
-            initialDelaySeconds: values.healthCheck?.initialDelaySeconds,
-            probePeriodSeconds: values.healthCheck?.probePeriodSeconds,
+            port: sanitizedValues.healthCheck?.port,
+            initialDelaySeconds:
+              sanitizedValues.healthCheck?.initialDelaySeconds,
+            probePeriodSeconds: sanitizedValues.healthCheck?.probePeriodSeconds,
          }
        : null,
    };
--- a/dashboard/src/features/services/components/ServiceForm/ServiceFormTypes.ts
+++ b/dashboard/src/features/services/components/ServiceForm/ServiceFormTypes.ts
@@ -30,6 +30,13 @@ export const validationSchema = Yup.object({
      port: Yup.number().required(),
      type: Yup.mixed<PortTypes>().oneOf(Object.values(PortTypes)).required(),
      publish: Yup.boolean().default(false),
+      ingresses: Yup.array()
+        .of(
+          Yup.object().shape({
+            fqdn: Yup.array().of(Yup.string()),
+          }),
+        )
+        .nullable(),
    }),
  ),
  storage: Yup.array().of(
--- a/dashboard/src/features/services/components/ServiceForm/components/PortsFormSection/PortsFormSection.tsx
+++ b/dashboard/src/features/services/components/ServiceForm/components/PortsFormSection/PortsFormSection.tsx
@@ -13,6 +13,7 @@ import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/
 import { InfoCard } from '@/features/projects/overview/components/InfoCard';
 import { PortTypes } from '@/features/services/components/ServiceForm/components/PortsFormSection/PortsFormSectionTypes';
 import { type ServiceFormValues } from '@/features/services/components/ServiceForm/ServiceFormTypes';
+import { getRunServicePortURL } from '@/utils/helpers';
 import { useFieldArray, useFormContext, useWatch } from 'react-hook-form';

 export default function PortsFormSection() {
@@ -40,14 +41,8 @@ export default function PortsFormSection() {
    formValues.ports[index]?.type === PortTypes.HTTP &&
    formValues.ports[index]?.publish;

-  const getPortURL = (_port: string | number, subdomain: string) => {
-    const port = Number(_port) > 0 ? Number(_port) : '[port]';
-
-    return `https://${subdomain}-${port}.svc.${currentProject?.region.name}.${currentProject?.region.domain}`;
-  };
-
  return (
-    <Box className="space-y-4 rounded border-1 p-4">
+    <Box className="p-4 space-y-4 rounded border-1">
      <Box className="flex flex-row items-center justify-between ">
        <Box className="flex flex-row items-center space-x-2">
          <Text variant="h4" className="font-semibold">
@@ -69,14 +64,14 @@ export default function PortsFormSection() {
              </span>
            }
          >
-            <InfoIcon aria-label="Info" className="h-4 w-4" color="primary" />
+            <InfoIcon aria-label="Info" className="w-4 h-4" color="primary" />
          </Tooltip>
        </Box>
        <Button
          variant="borderless"
          onClick={() => append({ port: null, type: null, publish: false })}
        >
-          <PlusIcon className="h-5 w-5" />
+          <PlusIcon className="w-5 h-5" />
        </Button>
      </Box>

@@ -107,7 +102,7 @@ export default function PortsFormSection() {
                  listbox: { className: 'min-w-0 w-full' },
                  popper: {
                    disablePortal: false,
-                    className: 'z-[10000] w-[270px] w-full',
+                    className: 'z-[10000] w-[270px]',
                  },
                }}
              >
@@ -133,16 +128,18 @@ export default function PortsFormSection() {
                color="error"
                onClick={() => remove(index)}
              >
-                <TrashIcon className="h-4 w-4" />
+                <TrashIcon className="w-4 h-4" />
              </Button>
            </Box>

            {showURL(index) && (
              <InfoCard
                title="URL"
-                value={getPortURL(
-                  formValues.ports[index]?.port,
-                  formValues.subdomain,
+                value={getRunServicePortURL(
+                  currentProject?.subdomain,
+                  currentProject?.region.name,
+                  currentProject?.region.domain,
+                  formValues.ports[index],
                )}
              />
            )}
--- a/dashboard/src/features/services/components/ServiceForm/components/ServiceDetailsDialog/ServiceDetailsDialog.tsx
+++ b/dashboard/src/features/services/components/ServiceForm/components/ServiceDetailsDialog/ServiceDetailsDialog.tsx
@@ -3,6 +3,7 @@ import { Button } from '@/components/ui/v2/Button';
 import { Text } from '@/components/ui/v2/Text';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { InfoCard } from '@/features/projects/overview/components/InfoCard';
+import { getRunServicePortURL } from '@/utils/helpers';
 import type { ConfigRunServicePort } from '@/utils/__generated__/graphql';

 export interface ServiceDetailsDialogProps {
@@ -32,11 +33,7 @@ export default function ServiceDetailsDialog({

  const { closeDialog } = useDialog();

-  const getPortURL = (_port: string | number) => {
-    const port = Number(_port) > 0 ? Number(_port) : '[port]';
-
-    return `https://${subdomain}-${port}.svc.${currentProject?.region.name}.${currentProject?.region.domain}`;
-  };
+  const publishedPorts = ports.filter((port) => port.publish);

  return (
    <div className="flex flex-col gap-4 px-6 pb-6">
@@ -48,18 +45,21 @@ export default function ServiceDetailsDialog({
        />
      </div>

-      {ports?.length > 0 && (
+      {publishedPorts?.length > 0 && (
        <div className="flex flex-col gap-2">
          <Text color="secondary">Ports</Text>
-          {ports
-            .filter((port) => port.publish)
-            .map((port) => (
-              <InfoCard
-                key={String(port.port)}
-                title={`${port.type} <--> ${port.port}`}
-                value={getPortURL(port.port)}
-              />
-            ))}
+          {publishedPorts.map((port) => (
+            <InfoCard
+              key={String(port.port)}
+              title={`${port.type} <--> ${port.port}`}
+              value={getRunServicePortURL(
+                subdomain,
+                currentProject?.region.name,
+                currentProject?.region.domain,
+                port,
+              )}
+            />
+          ))}
        </div>
      )}

--- a/dashboard/src/features/services/components/ServicesList/ServicesList.tsx
+++ b/dashboard/src/features/services/components/ServicesList/ServicesList.tsx
@@ -66,6 +66,7 @@ export default function ServicesList({
              port: item.port,
              type: item.type as PortTypes,
              publish: item.publish,
+              ingresses: item.ingresses,
            })),
            compute: service.config?.resources?.compute ?? {
              cpu: 62,
--- a/dashboard/src/gql/app/getProjectIsLocked.graphql
+++ b/dashboard/src/gql/app/getProjectIsLocked.graphql
@@ -0,0 +1,6 @@
+query getProjectIsLocked($appId: uuid!) {
+  app(id: $appId) {
+    isLocked
+    isLockedReason
+  }
+}
--- a/dashboard/src/pages/new.tsx
+++ b/dashboard/src/pages/new.tsx
@@ -301,7 +301,7 @@ export function NewProjectPageContent({
                const regionInList = regions.find(({ id }) => id === value);
                setSelectedRegion({
                  id: regionInList.id,
-                  name: regionInList.country.name,
+                  name: regionInList.city,
                  disabled: false,
                  code: regionInList.country.code,
                });
--- a/dashboard/src/pages/support/index.tsx
+++ b/dashboard/src/pages/support/index.tsx
@@ -0,0 +1,128 @@
+import { Logo } from '@/components/presentational/Logo';
+import { Box } from '@/components/ui/v2/Box';
+import { Button } from '@/components/ui/v2/Button';
+import { ArrowRightIcon } from '@/components/ui/v2/icons/ArrowRightIcon';
+import { CommunityIcon } from '@/components/ui/v2/icons/CommunityIcon';
+import { FileTextIcon } from '@/components/ui/v2/icons/FileTextIcon';
+import { GitHubIcon } from '@/components/ui/v2/icons/GitHubIcon';
+import { Link } from '@/components/ui/v2/Link';
+import { Text } from '@/components/ui/v2/Text';
+
+function SupportPage() {
+  return (
+    <Box className="h-screen pb-4 overflow-auto">
+      <Box className="flex justify-start w-full px-4 py-3 border-b-1">
+        <Logo className="cursor-pointer" />
+      </Box>
+
+      <div className="flex flex-col items-center justify-center">
+        <Box
+          sx={{ backgroundColor: 'background.default' }}
+          className="flex flex-col items-center justify-center w-full h-64 gap-10 px-4 mb-10 border-b-1"
+        >
+          <div>
+            <Text variant="h4">Nhost Support</Text>
+            <Text variant="h2">How can we help?</Text>
+          </div>
+          <Button
+            onClick={() => window.open('https://docs.nhost.io')}
+            className="h-10 w-full xs+:w-98"
+            startIcon={<FileTextIcon className="self-center w-4 h-4" />}
+          >
+            Read our docs
+          </Button>
+        </Box>
+
+        <Box className="flex flex-row items-center justify-center w-full gap-10">
+          <div className="flex w-[900px] flex-col gap-10 p-4">
+            <div className="flex flex-col w-full gap-10 md:flex-row">
+              <Box
+                className="flex flex-col w-full h-full gap-12 px-4 py-3 rounded-lg shadow-sm place-content-between"
+                sx={{ backgroundColor: 'grey.200' }}
+              >
+                <div className="flex flex-col gap-4">
+                  <GitHubIcon className="w-8 h-8" />
+                  <div className="grid grid-flow-row gap-1">
+                    <Text variant="h3" className="!font-bold">
+                      Issues & feature requests
+                    </Text>
+                    <Text className="!font-medium" color="secondary">
+                      Found a bug? We&apos;d love to hear about it in our GitHub
+                      issues.
+                    </Text>
+                  </div>
+                </div>
+                <Link
+                  variant="body2"
+                  underline="hover"
+                  href="https://github.com/nhost/nhost/issues/new/choose"
+                  target="_blank"
+                  rel="dofollow"
+                  className="grid items-center justify-start grid-flow-col gap-1 font-medium"
+                >
+                  Open new Issue / Feature request
+                  <ArrowRightIcon className="w-4 h-4" />
+                </Link>
+              </Box>
+              <Box
+                className="flex flex-col w-full h-full gap-12 px-4 py-3 rounded-lg shadow-sm place-content-between"
+                sx={{ backgroundColor: 'grey.200' }}
+              >
+                <div className="flex flex-col gap-4">
+                  <CommunityIcon className="w-8 h-8" />
+                  <div className="grid grid-flow-row gap-1">
+                    <Text variant="h3" className="!font-bold">
+                      Ask the Community
+                    </Text>
+                    <Text className="!font-medium" color="secondary">
+                      Join our Discord server to browse for help and best
+                      practices.
+                    </Text>
+                  </div>
+                </div>
+                <Link
+                  variant="body2"
+                  underline="hover"
+                  href="https://discord.com/invite/9V7Qb2U"
+                  target="_blank"
+                  rel="dofollow"
+                  className="grid items-center justify-start grid-flow-col gap-1 font-medium"
+                >
+                  Join our Discord
+                  <ArrowRightIcon className="w-4 h-4" />
+                </Link>
+              </Box>
+            </div>
+            <Box className="flex h-full w-full flex-col place-content-between gap-4 rounded-lg border p-4 shadow-sm xs+:flex-row">
+              <div className="flex flex-1">
+                <Text variant="h3" className="w-full">
+                  Can&apos;t find what you&apos;re looking for?
+                </Text>
+              </div>
+              <div className="flex flex-col flex-1 gap-4">
+                <Text variant="h4">Our Support Team is ready to help.</Text>
+                <Text>
+                  Response time for support tickets will vary depending on plan
+                  type and severity of the issue.
+                </Text>
+                <Link
+                  variant="body2"
+                  underline="hover"
+                  href="/support/ticket"
+                  target="_blank"
+                  rel="dofollow"
+                  className="grid items-center justify-start grid-flow-col gap-1 font-medium"
+                >
+                  Create ticket
+                  <ArrowRightIcon className="w-4 h-4" />
+                </Link>
+              </div>
+            </Box>
+          </div>
+        </Box>
+      </div>
+    </Box>
+  );
+}
+
+export default SupportPage;
--- a/dashboard/src/pages/support/ticket.tsx
+++ b/dashboard/src/pages/support/ticket.tsx
@@ -0,0 +1,378 @@
+import { ControlledAutocomplete } from '@/components/form/ControlledAutocomplete';
+import { ControlledSelect } from '@/components/form/ControlledSelect';
+import { Form } from '@/components/form/Form';
+import { AuthenticatedLayout } from '@/components/layout/AuthenticatedLayout';
+import { Box } from '@/components/ui/v2/Box';
+import { Button } from '@/components/ui/v2/Button';
+import { Divider } from '@/components/ui/v2/Divider';
+import { EnvelopeIcon } from '@/components/ui/v2/icons/EnvelopeIcon';
+import { Input, inputClasses } from '@/components/ui/v2/Input';
+import { Option } from '@/components/ui/v2/Option';
+import { Text } from '@/components/ui/v2/Text';
+import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
+import {
+  useGetAllWorkspacesAndProjectsQuery,
+  type GetAllWorkspacesAndProjectsQuery,
+} from '@/utils/__generated__/graphql';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { styled } from '@mui/material';
+import { useUserData } from '@nhost/nextjs';
+import { type ReactElement } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import * as Yup from 'yup';
+
+type Workspace = Omit<
+  GetAllWorkspacesAndProjectsQuery['workspaces'][0],
+  '__typename'
+>;
+
+const validationSchema = Yup.object({
+  workspace: Yup.string().label('Project').required(),
+  project: Yup.string().label('Project').required(),
+  services: Yup.array()
+    .of(Yup.object({ label: Yup.string(), value: Yup.string() }))
+    .label('Services')
+    .required(),
+  priority: Yup.string().label('Priority').required(),
+  subject: Yup.string().label('Subject').required(),
+  description: Yup.string().label('Description').required(),
+  ccs: Yup.string().label('CCs').optional(),
+});
+
+export type CreateTicketFormValues = Yup.InferType<typeof validationSchema>;
+
+const StyledInput = styled(Input)({
+  backgroundColor: 'transparent',
+  [`& .${inputClasses.input}`]: {
+    backgroundColor: 'transparent !important',
+  },
+});
+
+function TicketPage() {
+  const form = useForm<CreateTicketFormValues>({
+    reValidateMode: 'onSubmit',
+    defaultValues: {
+      workspace: '',
+      project: '',
+      services: [],
+      priority: '',
+      subject: '',
+      description: '',
+      ccs: '',
+    },
+    resolver: yupResolver(validationSchema),
+  });
+
+  const {
+    register,
+    watch,
+    formState: { errors, isSubmitting },
+  } = form;
+
+  const selectedWorkspace = watch('workspace');
+  const user = useUserData();
+
+  const { data } = useGetAllWorkspacesAndProjectsQuery({
+    skip: !user,
+  });
+
+  const workspaces: Workspace[] = data?.workspaces || [];
+
+  const handleSubmit = async (formValues: CreateTicketFormValues) => {
+    const { project, services, priority, subject, description, ccs } =
+      formValues;
+
+    const auth = btoa(
+      `${process.env.NEXT_PUBLIC_ZENDESK_USER_EMAIL}/token:${process.env.NEXT_PUBLIC_ZENDESK_API_KEY}`,
+    );
+    const emails = ccs
+      .replace(/ /g, '')
+      .split(',')
+      .map((email) => ({ user_email: email }));
+
+    await execPromiseWithErrorToast(
+      async () => {
+        await fetch(
+          `${process.env.NEXT_PUBLIC_ZENDESK_URL}/api/v2/requests.json`,
+          {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+              Authorization: `Basic ${auth}`,
+            },
+            body: JSON.stringify({
+              request: {
+                subject,
+                comment: {
+                  body: description,
+                },
+                priority,
+                requester: {
+                  name: user?.displayName,
+                  email: user?.email,
+                },
+                email_ccs: emails,
+                custom_fields: [
+                  // these custom field IDs come from zendesk
+                  {
+                    id: 19502784542098,
+                    value: project,
+                  },
+                  {
+                    id: 19922709880978,
+                    value: services.map((service) =>
+                      service.value.toLowerCase(),
+                    ),
+                  },
+                ],
+              },
+            }),
+          },
+        );
+        form.reset();
+      },
+      {
+        loadingMessage: 'Creating Ticket...',
+        successMessage: 'Ticket created successfully',
+        errorMessage: 'Failed to create ticket',
+      },
+    );
+  };
+
+  return (
+    <Box
+      className="flex flex-col items-center justify-center py-10"
+      sx={{ backgroundColor: 'background.default' }}
+    >
+      <div className="flex w-full max-w-3xl flex-col">
+        <div className="mb-4 flex flex-col items-center">
+          <Text variant="h4" className="font-bold">
+            Nhost Support
+          </Text>
+          <Text variant="h4">How can we help you?</Text>
+        </div>
+        <Box className="w-full rounded-md border p-10">
+          <Box className="grid grid-flow-row gap-4">
+            <Box className="flex flex-col gap-4">
+              <FormProvider {...form}>
+                <Form
+                  onSubmit={handleSubmit}
+                  className="grid grid-flow-row gap-4"
+                >
+                  <Text className="font-bold">Which project is affected ?</Text>
+
+                  <ControlledSelect
+                    id="workspace"
+                    name="workspace"
+                    label="Workspace"
+                    placeholder="Workspace"
+                    slotProps={{
+                      root: { className: 'grid grid-flow-col gap-1' },
+                    }}
+                    error={!!errors.workspace}
+                    helperText={errors.workspace?.message}
+                    renderValue={(option) => (
+                      <span className="inline-grid grid-flow-col items-center gap-2">
+                        {option?.label}
+                      </span>
+                    )}
+                  >
+                    {workspaces.map((workspace) => (
+                      <Option
+                        key={workspace.name}
+                        value={workspace.id}
+                        label={workspace.name}
+                      >
+                        {workspace.name}
+                      </Option>
+                    ))}
+                  </ControlledSelect>
+
+                  <ControlledSelect
+                    id="project"
+                    name="project"
+                    label="Project"
+                    placeholder="Project"
+                    slotProps={{
+                      root: { className: 'grid grid-flow-col gap-1 mb-4' },
+                    }}
+                    error={!!errors.project}
+                    helperText={errors.project?.message}
+                    renderValue={(option) => (
+                      <span className="inline-grid grid-flow-col items-center gap-2">
+                        {option?.label}
+                      </span>
+                    )}
+                  >
+                    {(
+                      workspaces.find((w) => w.id === selectedWorkspace)
+                        ?.projects || []
+                    ).map((proj) => (
+                      <Option
+                        key={proj.subdomain}
+                        value={proj.subdomain}
+                        label={proj.name}
+                      >
+                        <div className="flex flex-col">{proj.name}</div>
+                      </Option>
+                    ))}
+                  </ControlledSelect>
+
+                  <Divider />
+
+                  <Text className="mt-4 font-bold">Impact</Text>
+
+                  <ControlledAutocomplete
+                    id="services"
+                    name="services"
+                    label="services"
+                    fullWidth
+                    multiple
+                    aria-label="Enabled APIs"
+                    options={[
+                      'Dashboard',
+                      'Database',
+                      'Authentication',
+                      'Storage',
+                      'Hasura/APIs',
+                      'Functions',
+                      'Run',
+                      'Graphite',
+                      'Other',
+                    ].map((s) => ({ label: s, value: s }))}
+                    error={!!errors?.services?.message}
+                    helperText={errors?.services?.message}
+                  />
+
+                  <ControlledSelect
+                    id="priority"
+                    name="priority"
+                    label="Priority"
+                    placeholder="Priority"
+                    slotProps={{
+                      root: { className: 'grid grid-flow-col gap-1 mb-4' },
+                    }}
+                    renderValue={(option) => (
+                      <span className="inline-grid grid-flow-col items-center gap-2">
+                        {option?.label}
+                      </span>
+                    )}
+                  >
+                    {[
+                      {
+                        title: 'Low',
+                        description: 'General guidance',
+                      },
+                      {
+                        title: 'Normal',
+                        description: 'Non-production system impaired',
+                      },
+                      {
+                        title: 'High',
+                        description: 'Production System impaired',
+                      },
+                      {
+                        title: 'Urgent',
+                        description: 'Production system offline',
+                      },
+                    ].map((priority) => (
+                      <Option
+                        key={priority.title}
+                        label={priority.title}
+                        value={priority.title.toLowerCase()}
+                      >
+                        <div className="flex flex-col">
+                          <span>{priority.title}</span>
+                          <span className="font-mono text-xs opacity-50">
+                            {priority.description}
+                          </span>
+                        </div>
+                      </Option>
+                    ))}
+                  </ControlledSelect>
+
+                  <Divider />
+
+                  <Text className="mt-4 font-bold">Issue</Text>
+
+                  <StyledInput
+                    {...register('subject')}
+                    id="subject"
+                    label="Subject"
+                    placeholder="Summary of the problem you are experiencing"
+                    fullWidth
+                    autoFocus
+                    inputProps={{ min: 2, max: 128 }}
+                    error={!!errors.subject}
+                    helperText={errors.subject?.message}
+                  />
+
+                  <StyledInput
+                    {...register('description')}
+                    id="description"
+                    label="Description"
+                    placeholder="Describe the issue you are experiencing in detail, along with any relevant information. Please be as detailed as possible."
+                    fullWidth
+                    multiline
+                    inputProps={{
+                      className: 'resize-y min-h-[120px]',
+                    }}
+                    error={!!errors.description}
+                    helperText={errors.description?.message}
+                  />
+
+                  <Divider />
+
+                  <Text className="mt-4 font-bold">Notifications</Text>
+
+                  <StyledInput
+                    {...register('ccs')}
+                    id="ccs"
+                    label="CCs"
+                    placeholder="Comma separated list of emails you want to share this ticket with."
+                    fullWidth
+                    inputProps={{ min: 2, max: 128 }}
+                    error={!!errors.ccs}
+                    helperText={errors.ccs?.message}
+                  />
+
+                  <Box className="ml-auto flex w-80 flex-col gap-4">
+                    <Text color="secondary" className="text-right text-sm">
+                      We will contact you at <strong>{user?.email}</strong>
+                    </Text>
+                    <Button
+                      variant="outlined"
+                      className=" hover:!bg-white hover:!bg-opacity-10 focus:ring-0"
+                      size="large"
+                      type="submit"
+                      startIcon={<EnvelopeIcon />}
+                      disabled={isSubmitting}
+                      loading={isSubmitting}
+                    >
+                      Create Support Ticket
+                    </Button>
+                  </Box>
+                </Form>
+              </FormProvider>
+            </Box>
+          </Box>
+        </Box>
+      </div>
+    </Box>
+  );
+}
+
+TicketPage.getLayout = function getLayout(page: ReactElement) {
+  return (
+    <AuthenticatedLayout
+      title="Help & Support | Nhost"
+      contentContainerProps={{
+        className: 'flex w-full flex-col h-screen overflow-auto',
+      }}
+    >
+      {page}
+    </AuthenticatedLayout>
+  );
+};
+
+export default TicketPage;
--- a/dashboard/src/utils/generated/graphql.ts
+++ b/dashboard/src/utils/generated/graphql.ts
@@ -12522,12 +12522,6 @@ export type Mutation_Root = {
 };


-/** mutation root */
-export type Mutation_RootBackupAllApplicationsDatabaseArgs = {
-  expireInDays?: InputMaybe<Scalars['Int']>;
-};
-
-
 /** mutation root */
 export type Mutation_RootBackupApplicationDatabaseArgs = {
  appID: Scalars['String'];
@@ -22922,6 +22916,13 @@ export type GetConfiguredVersionsQueryVariables = Exact<{

 export type GetConfiguredVersionsQuery = { __typename?: 'query_root', config?: { __typename?: 'ConfigConfig', auth?: { __typename?: 'ConfigAuth', version?: string | null } | null, postgres?: { __typename?: 'ConfigPostgres', version?: string | null } | null, hasura: { __typename?: 'ConfigHasura', version?: string | null }, ai?: { __typename?: 'ConfigAI', version?: string | null } | null, storage?: { __typename?: 'ConfigStorage', version?: string | null } | null } | null };

+export type GetProjectIsLockedQueryVariables = Exact<{
+  appId: Scalars['uuid'];
+}>;
+
+
+export type GetProjectIsLockedQuery = { __typename?: 'query_root', app?: { __typename?: 'apps', isLocked?: boolean | null, isLockedReason?: string | null } | null };
+
 export type GetProjectLocalesQueryVariables = Exact<{
  appId: Scalars['uuid'];
 }>;
@@ -24826,6 +24827,45 @@ export type GetConfiguredVersionsQueryResult = Apollo.QueryResult<GetConfiguredV
 export function refetchGetConfiguredVersionsQuery(variables: GetConfiguredVersionsQueryVariables) {
      return { query: GetConfiguredVersionsDocument, variables: variables }
    }
+export const GetProjectIsLockedDocument = gql`
+    query getProjectIsLocked($appId: uuid!) {
+  app(id: $appId) {
+    isLocked
+    isLockedReason
+  }
+}
+    `;
+
+/**
+ * __useGetProjectIsLockedQuery__
+ *
+ * To run a query within a React component, call `useGetProjectIsLockedQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetProjectIsLockedQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetProjectIsLockedQuery({
+ *   variables: {
+ *      appId: // value for 'appId'
+ *   },
+ * });
+ */
+export function useGetProjectIsLockedQuery(baseOptions: Apollo.QueryHookOptions<GetProjectIsLockedQuery, GetProjectIsLockedQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GetProjectIsLockedQuery, GetProjectIsLockedQueryVariables>(GetProjectIsLockedDocument, options);
+      }
+export function useGetProjectIsLockedLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProjectIsLockedQuery, GetProjectIsLockedQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GetProjectIsLockedQuery, GetProjectIsLockedQueryVariables>(GetProjectIsLockedDocument, options);
+        }
+export type GetProjectIsLockedQueryHookResult = ReturnType<typeof useGetProjectIsLockedQuery>;
+export type GetProjectIsLockedLazyQueryHookResult = ReturnType<typeof useGetProjectIsLockedLazyQuery>;
+export type GetProjectIsLockedQueryResult = Apollo.QueryResult<GetProjectIsLockedQuery, GetProjectIsLockedQueryVariables>;
+export function refetchGetProjectIsLockedQuery(variables: GetProjectIsLockedQueryVariables) {
+      return { query: GetProjectIsLockedDocument, variables: variables }
+    }
 export const GetProjectLocalesDocument = gql`
    query getProjectLocales($appId: uuid!) {
  config(appID: $appId, resolve: false) {
--- a/dashboard/src/utils/helpers/helpers.ts
+++ b/dashboard/src/utils/helpers/helpers.ts
@@ -1,5 +1,8 @@
 import { ApplicationStatus } from '@/types/application';
-import type { DeploymentRowFragment } from '@/utils/__generated__/graphql';
+import type {
+  ConfigRunServicePort,
+  DeploymentRowFragment,
+} from '@/utils/__generated__/graphql';
 import slugify from 'slugify';

 export function getLastLiveDeployment(deployments?: DeploymentRowFragment[]) {
@@ -108,3 +111,22 @@ export const removeTypename = (obj: any) => {
  });
  return newObj;
 };
+
+export const getRunServicePortURL = (
+  subdomain: string,
+  regionName: string,
+  regionDomain: string,
+  port: Partial<ConfigRunServicePort>,
+) => {
+  const { port: servicePort, ingresses } = port;
+
+  const customDomain = ingresses?.[0]?.fqdn?.[0];
+
+  if (customDomain) {
+    return `https://${customDomain}`;
+  }
+
+  const servicePortNumber =
+    Number(servicePort) > 0 ? Number(servicePort) : '[port]';
+  return `https://${subdomain}-${servicePortNumber}.svc.${regionName}.${regionDomain}`;
+};
--- a/examples/cli/CHANGELOG.md
+++ b/examples/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost-examples/cli

+## 0.3.8
+
+### Patch Changes
+
+- @nhost/nhost-js@3.1.6
+
 ## 0.3.7

 ### Patch Changes
--- a/examples/cli/package.json
+++ b/examples/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/cli",
-  "version": "0.3.7",
+  "version": "0.3.8",
  "main": "src/index.mjs",
  "private": true,
  "scripts": {
--- a/examples/codegen-react-apollo/CHANGELOG.md
+++ b/examples/codegen-react-apollo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @nhost-examples/codegen-react-apollo

+## 0.4.8
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+- @nhost/react-apollo@12.0.3
+
 ## 0.4.7

 ### Patch Changes
--- a/examples/codegen-react-apollo/package.json
+++ b/examples/codegen-react-apollo/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/codegen-react-apollo",
-  "version": "0.4.7",
+  "version": "0.4.8",
  "private": true,
  "scripts": {
    "codegen": "graphql-codegen",
--- a/examples/codegen-react-query/CHANGELOG.md
+++ b/examples/codegen-react-query/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost-examples/codegen-react-query

+## 0.4.8
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+
 ## 0.4.7

 ### Patch Changes
--- a/examples/codegen-react-query/package.json
+++ b/examples/codegen-react-query/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/codegen-react-query",
-  "version": "0.4.7",
+  "version": "0.4.8",
  "private": true,
  "scripts": {
    "codegen": "graphql-codegen",
--- a/examples/codegen-react-urql/CHANGELOG.md
+++ b/examples/codegen-react-urql/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @nhost-examples/react-urql

+## 0.3.8
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+- @nhost/react-urql@9.0.3
+
 ## 0.3.7

 ### Patch Changes
--- a/examples/codegen-react-urql/package.json
+++ b/examples/codegen-react-urql/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@nhost-examples/codegen-react-urql",
  "private": true,
-  "version": "0.3.7",
+  "version": "0.3.8",
  "scripts": {
    "dev": "vite",
    "build": "tsc && vite build",
--- a/examples/multi-tenant-one-to-many/CHANGELOG.md
+++ b/examples/multi-tenant-one-to-many/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost-examples/multi-tenant-one-to-many

+## 2.2.8
+
+### Patch Changes
+
+- @nhost/nhost-js@3.1.6
+
 ## 2.2.7

 ### Patch Changes
--- a/examples/multi-tenant-one-to-many/package.json
+++ b/examples/multi-tenant-one-to-many/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@nhost-examples/multi-tenant-one-to-many",
  "private": true,
-  "version": "2.2.7",
+  "version": "2.2.8",
  "description": "",
  "main": "index.js",
  "scripts": {},
--- a/examples/nextjs/CHANGELOG.md
+++ b/examples/nextjs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @nhost-examples/nextjs

+## 0.3.8
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+- @nhost/react-apollo@12.0.3
+- @nhost/nextjs@2.1.17
+
 ## 0.3.7

 ### Patch Changes
--- a/examples/nextjs/package.json
+++ b/examples/nextjs/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/nextjs",
-  "version": "0.3.7",
+  "version": "0.3.8",
  "private": true,
  "scripts": {
    "dev": "next dev",
--- a/examples/node-storage/CHANGELOG.md
+++ b/examples/node-storage/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost-examples/node-storage

+## 0.2.8
+
+### Patch Changes
+
+- @nhost/nhost-js@3.1.6
+
 ## 0.2.7

 ### Patch Changes
--- a/examples/node-storage/package.json
+++ b/examples/node-storage/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/node-storage",
-  "version": "0.2.7",
+  "version": "0.2.8",
  "private": true,
  "description": "This is an example of how to use the Storage with Node.js",
  "main": "src/index.mjs",
--- a/examples/quickstarts/nextjs-server-components/CHANGELOG.md
+++ b/examples/quickstarts/nextjs-server-components/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost-examples/nextjs-server-components

+## 0.4.9
+
+### Patch Changes
+
+- @nhost/nhost-js@3.1.6
+
 ## 0.4.8

 ### Patch Changes
--- a/examples/quickstarts/nextjs-server-components/package.json
+++ b/examples/quickstarts/nextjs-server-components/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/nextjs-server-components",
-  "version": "0.4.8",
+  "version": "0.4.9",
  "private": true,
  "scripts": {
    "dev": "next dev",
--- a/examples/react-apollo/CHANGELOG.md
+++ b/examples/react-apollo/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @nhost-examples/react-apollo

+## 0.8.9
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+- @nhost/react-apollo@12.0.3
+
+## 0.8.8
+
+### Patch Changes
+
+- e3f0732: fix: add verify email button instead of doing an auto-redirect
+
 ## 0.8.7

 ### Patch Changes
--- a/examples/react-apollo/e2e/authenticated/change-email.test.ts
+++ b/examples/react-apollo/e2e/authenticated/change-email.test.ts
@@ -31,7 +31,8 @@ test('should be able to change email', async ({ page, browser }) => {
    page: mailhogPage,
    email: newEmail,
    context: mailhogPage.context(),
-    linkText: /change email/i
+    linkText: /change email/i,
+    requestType: 'email-confirm-change'
  })

  await expect(updatedEmailPage.getByText(/profile page/i)).toBeVisible()
--- a/examples/react-apollo/e2e/utils.ts
+++ b/examples/react-apollo/e2e/utils.ts
@@ -158,8 +158,8 @@ export async function resetPassword({
    .click()

  const authenticatedPage = await authenticatedPagePromise
+  await authenticatedPage.getByRole('button', { name: /Verify/i }).click()
  await authenticatedPage.waitForLoadState()
-
  return authenticatedPage
 }

@@ -177,25 +177,31 @@ export async function verifyEmail({
  email,
  page,
  context,
-  linkText = /verify email/i
+  linkText = /verify email/i,
+  requestType
 }: {
  email: string
  page: Page
  context: BrowserContext
  linkText?: string | RegExp
+  requestType?: 'email-confirm-change' | 'email-verify' | 'password-reset' | 'signin-passwordless'
 }) {
  await page.goto(mailhogURL)
  await page.locator('.messages > .msglist-message', { hasText: email }).nth(0).click()

  // Based on: https://playwright.dev/docs/pages#handling-new-pages
-  const authenticatedPagePromise = context.waitForEvent('page')
-
+  const verifyEmailPagePromise = context.waitForEvent('page')
  await page.frameLocator('#preview-html').getByRole('link', { name: linkText }).click()
+  const verifyEmailPage = await verifyEmailPagePromise
+  await verifyEmailPage.waitForLoadState()

-  const authenticatedPage = await authenticatedPagePromise
-  await authenticatedPage.waitForLoadState()
+  if (requestType === 'email-confirm-change') {
+    return verifyEmailPage
+  }

-  return authenticatedPage
+  await verifyEmailPage.getByRole('button', { name: /Verify/i }).click()
+  await verifyEmailPage.waitForLoadState()
+  return verifyEmailPage
 }

 /**
--- a/examples/react-apollo/nhost/nhost.toml
+++ b/examples/react-apollo/nhost/nhost.toml
@@ -1,7 +1,7 @@
 [global]

 [hasura]
-version = 'v2.33.4-ce'
+version = 'v2.38.0-ce'
 adminSecret = '{{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }}'
 webhookSecret = '{{ secrets.NHOST_WEBHOOK_SECRET }}'

@@ -29,7 +29,7 @@ httpPoolSize = 100
 version = 18

 [auth]
-version = '0.28.0-beta002'
+version = '0.32.0'

 [auth.elevatedPrivileges]
 mode = 'required'
@@ -154,7 +154,7 @@ enabled = true
 issuer = 'nhost'

 [postgres]
-version = '14.6-20240129-1'
+version = '14.11-20240515-1'

 [provider]

--- a/examples/react-apollo/package.json
+++ b/examples/react-apollo/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/react-apollo",
-  "version": "0.8.7",
+  "version": "0.8.9",
  "private": true,
  "dependencies": {
    "@apollo/client": "^3.9.9",
--- a/examples/react-apollo/src/Verify.tsx
+++ b/examples/react-apollo/src/Verify.tsx
@@ -1,32 +1,39 @@
-import { useSearchParams } from 'react-router-dom'
-import { useEffect, useState } from 'react'
+import { Button, Card, Container, Stack, Text } from '@mantine/core'
+import { showNotification } from '@mantine/notifications'
 import { useNhostClient } from '@nhost/react'
-import { Container } from '@mantine/core'
+import { FaEnvelope } from 'react-icons/fa'
+import { useSearchParams } from 'react-router-dom'

 const VerifyPage: React.FC = () => {
  const nhost = useNhostClient()
-  const [loading, setLoading] = useState(false)
  const [searchParams] = useSearchParams()

-  useEffect(() => {
+  const redirectToVerificationLink = () => {
    const ticket = searchParams.get('ticket')
-    const redirectTo = searchParams.get('redirectTo')
    const type = searchParams.get('type')
+    const redirectTo = searchParams.get('redirectTo')

-    if (ticket && redirectTo && type) {
+    if (ticket && type && redirectTo) {
      window.location.href = `${nhost.auth.url}/verify?ticket=${ticket}&type=${type}&redirectTo=${redirectTo}`
+    } else {
+      showNotification({
+        color: 'red',
+        title: 'Error',
+        message: 'An error occured while verifying your account'
+      })
    }
-
-    setLoading(false)
-  }, [searchParams, nhost?.auth?.url])
-
-  if (loading) {
-    return null
  }

  return (
    <Container>
-      <span>Failed to authenticate with magick link</span>
+      <Card shadow="sm" p="lg" radius="md" withBorder>
+        <Stack align="center">
+          <Text>Please verify your account by clicking the link below.</Text>
+          <Button leftIcon={<FaEnvelope size={14} />} onClick={redirectToVerificationLink}>
+            Verify
+          </Button>
+        </Stack>
+      </Card>
    </Container>
  )
 }
--- a/examples/react-gqty/CHANGELOG.md
+++ b/examples/react-gqty/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost-examples/react-gqty

+## 1.2.8
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+
 ## 1.2.7

 ### Patch Changes
--- a/examples/react-gqty/package.json
+++ b/examples/react-gqty/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@nhost-examples/react-gqty",
  "private": true,
-  "version": "1.2.7",
+  "version": "1.2.8",
  "type": "module",
  "scripts": {
    "dev": "vite",
--- a/examples/react_native/CHANGELOG.md
+++ b/examples/react_native/CHANGELOG.md
@@ -0,0 +1,8 @@
+# @nhost-examples/react-native
+
+## 0.0.2
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+- @nhost/react-apollo@12.0.3
--- a/examples/react_native/package.json
+++ b/examples/react_native/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/react-native",
-  "version": "0.0.1",
+  "version": "0.0.2",
  "private": true,
  "scripts": {
    "android": "react-native run-android",
--- a/examples/vue-apollo/CHANGELOG.md
+++ b/examples/vue-apollo/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @nhost-examples/vue-apollo

+## 0.6.8
+
+### Patch Changes
+
+- @nhost/nhost-js@3.1.6
+- @nhost/apollo@7.1.3
+- @nhost/vue@2.6.3
+
 ## 0.6.7

 ### Patch Changes
--- a/examples/vue-apollo/package.json
+++ b/examples/vue-apollo/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@nhost-examples/vue-apollo",
  "private": true,
-  "version": "0.6.7",
+  "version": "0.6.8",
  "scripts": {
    "dev": "vite",
    "build": "vite build",
--- a/examples/vue-quickstart/CHANGELOG.md
+++ b/examples/vue-quickstart/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @nhost-examples/vue-quickstart

+## 0.2.8
+
+### Patch Changes
+
+- @nhost/apollo@7.1.3
+- @nhost/vue@2.6.3
+
 ## 0.2.7

 ### Patch Changes
--- a/examples/vue-quickstart/package.json
+++ b/examples/vue-quickstart/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost-examples/vue-quickstart",
-  "version": "0.2.7",
+  "version": "0.2.8",
  "private": true,
  "scripts": {
    "build": "vite build",
--- a/integrations/apollo/CHANGELOG.md
+++ b/integrations/apollo/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost/apollo

+## 7.1.3
+
+### Patch Changes
+
+- @nhost/nhost-js@3.1.6
+
 ## 7.1.2

 ### Patch Changes
--- a/integrations/apollo/package.json
+++ b/integrations/apollo/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/apollo",
-  "version": "7.1.2",
+  "version": "7.1.3",
  "description": "Nhost Apollo Client library",
  "license": "MIT",
  "keywords": [
--- a/integrations/react-apollo/CHANGELOG.md
+++ b/integrations/react-apollo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @nhost/react-apollo

+## 12.0.3
+
+### Patch Changes
+
+- @nhost/apollo@7.1.3
+- @nhost/react@3.5.3
+
 ## 12.0.2

 ### Patch Changes
--- a/integrations/react-apollo/package.json
+++ b/integrations/react-apollo/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/react-apollo",
-  "version": "12.0.2",
+  "version": "12.0.3",
  "description": "Nhost React Apollo client",
  "license": "MIT",
  "keywords": [
--- a/integrations/react-urql/CHANGELOG.md
+++ b/integrations/react-urql/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost/react-urql

+## 9.0.3
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+
 ## 9.0.2

 ### Patch Changes
--- a/integrations/react-urql/package.json
+++ b/integrations/react-urql/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/react-urql",
-  "version": "9.0.2",
+  "version": "9.0.3",
  "description": "Nhost React URQL client",
  "license": "MIT",
  "keywords": [
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
  "resolutions": {
    "graphql": "16.8.1"
  },
-  "packageManager": "pnpm@8.6.2",
+  "packageManager": "pnpm@8.10.5",
  "engines": {
    "node": ">=18 <19",
    "pnpm": ">=8.0.0"
--- a/packages/hasura-auth-js/CHANGELOG.md
+++ b/packages/hasura-auth-js/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost/hasura-auth-js

+## 2.5.3
+
+### Patch Changes
+
+- e28975d: fix: refactor refreshTimer logic to avoid an infinite loop when refreshToken has expired
+
 ## 2.5.2

 ### Patch Changes
--- a/packages/hasura-auth-js/package.json
+++ b/packages/hasura-auth-js/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/hasura-auth-js",
-  "version": "2.5.2",
+  "version": "2.5.3",
  "description": "Hasura-auth client",
  "license": "MIT",
  "keywords": [
--- a/packages/hasura-auth-js/src/machines/authentication/machine.ts
+++ b/packages/hasura-auth-js/src/machines/authentication/machine.ts
@@ -697,11 +697,6 @@ export const createAuthMachine = ({
            return false
          }

-          // This happens when either the computer goes to sleep or when Chrome descides to suspend the tab
-          if (expiresAt.getTime() < Date.now()) {
-            return true
-          }
-
          if (ctx.refreshTimer.lastAttempt) {
            // * If the refresh timer reached the maximum number of attempts, we should not try again
            if (ctx.refreshTimer.attempts > REFRESH_TOKEN_MAX_ATTEMPTS) {
@@ -711,6 +706,12 @@ export const createAuthMachine = ({
            // * Exponential backoff
            return elapsed > Math.pow(2, ctx.refreshTimer.attempts - 1) * 5_000
          }
+
+          // This happens when either the computer goes to sleep or when Chrome descides to suspend the tab
+          if (expiresAt.getTime() < Date.now()) {
+            return true
+          }
+
          if (refreshIntervalTime) {
            // * If a refreshIntervalTime has been passed on as an option, it will notify
            // * the token should be refershed when this interval is overdue
--- a/packages/nextjs/CHANGELOG.md
+++ b/packages/nextjs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost/nextjs

+## 2.1.17
+
+### Patch Changes
+
+- @nhost/react@3.5.3
+
 ## 2.1.16

 ### Patch Changes
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`export { default as CommunityIcon } from './CommunityIcon';`
				`@@ -0,0 +1 @@`
				`export { default as DiscordIcon } from './DiscordIcon';`
				`@@ -0,0 +1 @@`
				`export { default as EnvelopeIcon } from './EnvelopeIcon';`
				`@@ -0,0 +1 @@`
				`export { default as PowerOffIcon } from './PowerOffIcon';`
				`@@ -0,0 +1 @@`
				`export { default as QuestionMarkIcon } from './QuestionMarkIcon';`
				`@@ -0,0 +1 @@`
				`export { default as ApplicationLockedReason } from './ApplicationLockedReason';`
				`@@ -0,0 +1 @@`
				`export { default as ApplicationPausedReason } from './ApplicationPausedReason';`
				`@@ -0,0 +1 @@`
				`export { default as ApplicationPausedSymbol } from './ApplicationPausedSymbol';`
				`@@ -0,0 +1 @@`
				`export { default as useAppPausedReason } from './useAppPausedReason';`
				`@@ -0,0 +1 @@`
				`export { default as useServiceStatus } from './useServiceStatus';`