chore: update versions (#2724 )

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/apollo@7.1.2 ### Patch Changes - @nhost/nhost-js@3.1.5 ## @nhost/react-apollo@12.0.2 ### Patch Changes - @nhost/apollo@7.1.2 - @nhost/react@3.5.2 ## @nhost/react-urql@9.0.2 ### Patch Changes - @nhost/react@3.5.2 ## @nhost/hasura-auth-js@2.5.2 ### Patch Changes - a03fb2c: fix: deep clone machine context to prevent mutations in nested objects during initial session setup ## @nhost/nextjs@2.1.16 ### Patch Changes - @nhost/react@3.5.2 ## @nhost/nhost-js@3.1.5 ### Patch Changes - Updated dependencies [a03fb2c] - @nhost/hasura-auth-js@2.5.2 ## @nhost/react@3.5.2 ### Patch Changes - @nhost/nhost-js@3.1.5 ## @nhost/vue@2.6.2 ### Patch Changes - @nhost/nhost-js@3.1.5 ## @nhost/docs@2.13.0 ### Minor Changes - 6fb0cc2: fix: minor improvements to compute resources' docs - 66bd450: chore: various improvements ## @nhost/dashboard@1.16.3 ### Patch Changes - 87a37cf: fix: remove unnecessary isPlatform check from verify button disable logic on custom domains - @nhost/react-apollo@12.0.2 - @nhost/nextjs@2.1.16 ## @nhost-examples/cli@0.3.7 ### Patch Changes - @nhost/nhost-js@3.1.5 ## @nhost-examples/codegen-react-apollo@0.4.7 ### Patch Changes - @nhost/react@3.5.2 - @nhost/react-apollo@12.0.2 ## @nhost-examples/codegen-react-query@0.4.7 ### Patch Changes - @nhost/react@3.5.2 ## @nhost-examples/codegen-react-urql@0.3.7 ### Patch Changes - @nhost/react@3.5.2 - @nhost/react-urql@9.0.2 ## @nhost-examples/multi-tenant-one-to-many@2.2.7 ### Patch Changes - @nhost/nhost-js@3.1.5 ## @nhost-examples/nextjs@0.3.7 ### Patch Changes - @nhost/react@3.5.2 - @nhost/react-apollo@12.0.2 - @nhost/nextjs@2.1.16 ## @nhost-examples/node-storage@0.2.7 ### Patch Changes - @nhost/nhost-js@3.1.5 ## @nhost-examples/nextjs-server-components@0.4.7 ### Patch Changes - @nhost/nhost-js@3.1.5 ## @nhost-examples/react-apollo@0.8.7 ### Patch Changes - @nhost/react@3.5.2 - @nhost/react-apollo@12.0.2 ## @nhost-examples/react-gqty@1.2.7 ### Patch Changes - @nhost/react@3.5.2 ## @nhost-examples/vue-apollo@0.6.7 ### Patch Changes - @nhost/nhost-js@3.1.5 - @nhost/apollo@7.1.2 - @nhost/vue@2.6.2 ## @nhost-examples/vue-quickstart@0.2.7 ### Patch Changes - @nhost/apollo@7.1.2 - @nhost/vue@2.6.2 Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
chore (docs): various improvements (#2738 )
2024-05-31 10:25:11 +01:00 · 2024-05-31 11:22:11 +02:00 · 2024-05-31 10:20:18 +01:00 · 2024-05-31 09:54:55 +01:00 · 2024-05-23 16:19:36 +02:00 · 2024-05-21 15:23:32 +01:00
390 changed files with 12221 additions and 5630 deletions
--- a/dashboard/CHANGELOG.md
+++ b/dashboard/CHANGELOG.md
@@ -1,5 +1,137 @@
 # @nhost/dashboard

+## 1.16.3
+
+### Patch Changes
+
+- 87a37cf: fix: remove unnecessary isPlatform check from verify button disable logic on custom domains
+  - @nhost/react-apollo@12.0.2
+  - @nhost/nextjs@2.1.16
+
+## 1.16.2
+
+### Patch Changes
+
+- a9413af: fix: update `GetAllWorkspacesAndProjects` query polling to use exponential backoff
+  - @nhost/react-apollo@12.0.1
+  - @nhost/nextjs@2.1.15
+
+## 1.16.1
+
+### Patch Changes
+
+- @nhost/react-apollo@12.0.0
+- @nhost/nextjs@2.1.14
+
+## 1.16.0
+
+### Minor Changes
+
+- c6d5c5c: feat: add toggle switch to enable/disable public access in the database settings
+
+## 1.15.2
+
+### Patch Changes
+
+- @nhost/react-apollo@11.0.4
+- @nhost/nextjs@2.1.13
+
+## 1.15.1
+
+### Patch Changes
+
+- @nhost/react-apollo@11.0.3
+- @nhost/nextjs@2.1.12
+
+## 1.15.0
+
+### Minor Changes
+
+- a7bde37: feat: send metadata in the edit form
+
+### Patch Changes
+
+- 1bc615b: feat: improve error message handling in `ErrorToast` component
+  - @nhost/react-apollo@11.0.2
+  - @nhost/nextjs@2.1.11
+
+## 1.14.0
+
+### Minor Changes
+
+- a448d7d: feat: allow configuring postmark and delete SMTP settings
+
+## 1.13.3
+
+### Patch Changes
+
+- 5924bc3: fix: include password in `GetSmtpSettings` query
+- c5ad634: fix: resolved an issue where one-click install links were broken on Safari
+- 7278991: fix: update graphql auto-embeddings configuration to use String type for model field
+
+## 1.13.2
+
+### Patch Changes
+
+- 026f84f: fix: use configuration server URL from environment variable
+
+## 1.13.1
+
+### Patch Changes
+
+- 7e9a2ce: fix: resolve issue where run services form fails to open
+
+## 1.13.0
+
+### Minor Changes
+
+- dd5d262: feat: add model field to the auto-embeddings form
+- 09962be: feat: enable settings and run services when running the dashboard locally
+- 9cdecb6: feat: enable users to update their email address from the account settings page
+
+## 1.12.2
+
+### Patch Changes
+
+- c195c51: fix: send email upon signin for unverified users
+
+## 1.12.1
+
+### Patch Changes
+
+- 93ebdf8: fix: use service urls when initilizaing NhostClient running local dashboard
+  - @nhost/react-apollo@11.0.1
+  - @nhost/nextjs@2.1.10
+
+## 1.12.0
+
+### Minor Changes
+
+- f242e4b: feat: add connect with github to the user's account settings
+- 768ca17: chore: update dependencies
+- d62bd0f: fix: "Track this" option within the SQL editor now correctly updates the metadata
+- 91c2bb6: feat: refactor sign-in and sign-up pages to enforce email verification
+
+### Patch Changes
+
+- 943831f: fix: resolve an error toast issue when unpausing a project
+- Updated dependencies [768ca17]
+  - @nhost/react-apollo@11.0.0
+  - @nhost/nextjs@2.1.9
+
+## 1.11.2
+
+### Patch Changes
+
+- @nhost/react-apollo@10.0.2
+- @nhost/nextjs@2.1.8
+
+## 1.11.1
+
+### Patch Changes
+
+- 981404f: fix: set default value for healthCheck field validation
+
 ## 1.11.0

 ### Minor Changes
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -28,6 +28,7 @@ ENV NEXT_PUBLIC_NHOST_STORAGE_URL __NEXT_PUBLIC_NHOST_STORAGE_URL__
 ENV NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL __NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL__
 ENV NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL __NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL__
 ENV NEXT_PUBLIC_NHOST_HASURA_API_URL __NEXT_PUBLIC_NHOST_HASURA_API_URL__
+ENV NEXT_PUBLIC_NHOST_CONFIGSERVER_URL __NEXT_PUBLIC_NHOST_CONFIGSERVER_URL__

 RUN yarn global add pnpm@8.10.5
 COPY .gitignore .gitignore
--- a/dashboard/docker-entrypoint.sh
+++ b/dashboard/docker-entrypoint.sh
@@ -21,5 +21,6 @@ find dashboard -type f -exec sed -i "s~__NEXT_PUBLIC_NHOST_STORAGE_URL__~${NEXT_
 find dashboard -type f -exec sed -i "s~__NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL__~${NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL}~g" {} +
 find dashboard -type f -exec sed -i "s~__NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL__~${NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL}~g" {} +
 find dashboard -type f -exec sed -i "s~__NEXT_PUBLIC_NHOST_HASURA_API_URL__~${NEXT_PUBLIC_NHOST_HASURA_API_URL}~g" {} +
+find dashboard -type f -exec sed -i "s~__NEXT_PUBLIC_NHOST_CONFIGSERVER_URL__~${NEXT_PUBLIC_NHOST_CONFIGSERVER_URL}~g" {} +

 exec "$@"
--- a/dashboard/e2e/e2e-tests-project/.gitignore
+++ b/dashboard/e2e/e2e-tests-project/.gitignore
@@ -0,0 +1,2 @@
+.secrets
+.nhost
--- a/dashboard/e2e/e2e-tests-project/nhost/config.yaml
+++ b/dashboard/e2e/e2e-tests-project/nhost/config.yaml
@@ -0,0 +1 @@
+version: 3
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-confirm-change/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-confirm-change/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Потвърдете смяната на вашия имейл</h2>
+  <p>Използвайте посочения линк, за да повърдите смяната на имейл:</p>
+  <p>
+    <a href="${link}">
+      Смени имейл
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-confirm-change/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-confirm-change/subject.txt
@@ -0,0 +1 @@
+Потвърждение за смяна на имейл
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-verify/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-verify/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Потвърдете вашия имейл</h2>
+  <p>Използвайте посочения линк, за да потвърдите вашия имейл:</p>
+  <p>
+    <a href="${link}">
+      Потвърдете имейл
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-verify/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/email-verify/subject.txt
@@ -0,0 +1 @@
+Потвърждаване на имейл
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/password-reset/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/password-reset/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Смяна на парола</h2>
+  <p>Използвайте посочения линк, за да смените вашата парола:</p>
+  <p>
+    <a href="${link}">
+      Смяна на парола
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/password-reset/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/password-reset/subject.txt
@@ -0,0 +1 @@
+Смяна на парола
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/signin-passwordless-sms/body.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/signin-passwordless-sms/body.txt
@@ -0,0 +1 @@
+Вашият код е ${code}.
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/signin-passwordless/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/signin-passwordless/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Магически линк за вход</h2>
+  <p>Използвайте посочения линк за защитен и бърз вход:</p>
+  <p>
+    <a href="${link}">
+      Вход
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/bg/signin-passwordless/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/bg/signin-passwordless/subject.txt
@@ -0,0 +1 @@
+Магически линк за вход
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-confirm-change/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-confirm-change/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Potvrzení změny emailové adresy</h2>
+  <p>Použijte tento odkaz k potvrzení změny emailové adresy:</p>
+  <p>
+    <a href="${link}">
+      Změnit email
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-confirm-change/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-confirm-change/subject.txt
@@ -0,0 +1 @@
+Změna vaší emailové adresy
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-verify/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-verify/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Ověření emailové adresy</h2>
+  <p>Použijte tento odkaz k ověření vaší emailové adresy:</p>
+  <p>
+    <a href="${link}">
+      Ověřit emailovou adresu
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-verify/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/email-verify/subject.txt
@@ -0,0 +1 @@
+Ověření vaší emailové adresy
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/password-reset/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/password-reset/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Obnova hesla</h2>
+  <p>Použijte tento odkaz k obnovení vašeho hesla:</p>
+  <p>
+    <a href="${link}">
+      Obnova hesla
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/password-reset/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/password-reset/subject.txt
@@ -0,0 +1 @@
+Obnova hesla
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/signin-passwordless-sms/body.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/signin-passwordless-sms/body.txt
@@ -0,0 +1 @@
+Váš kód je ${code}.
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/signin-passwordless/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/signin-passwordless/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Magický odkaz</h2>
+  <p>Použijte tento odkaz k bezpečnému přihlášení:</p>
+  <p>
+    <a href="${link}">
+      Přihlášení
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/cs/signin-passwordless/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/cs/signin-passwordless/subject.txt
@@ -0,0 +1 @@
+Bezpečný odkaz k přihlášení
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-confirm-change/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-confirm-change/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Confirm Email Change</h2>
+  <p>Use this link to confirm changing email:</p>
+  <p>
+    <a href="${link}">
+      Change email
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-confirm-change/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-confirm-change/subject.txt
@@ -0,0 +1 @@
+Change your email address
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-verify/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-verify/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Verify Email</h2>
+  <p>Use this link to verify your email:</p>
+  <p>
+    <a href="${link}">
+      Verify Email
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-verify/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/email-verify/subject.txt
@@ -0,0 +1 @@
+Verify your email
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/password-reset/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/password-reset/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Reset Password</h2>
+  <p>Use this link to reset your password:</p>
+  <p>
+    <a href="${link}">
+      Reset password
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/password-reset/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/password-reset/subject.txt
@@ -0,0 +1 @@
+Reset your password
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/signin-passwordless-sms/body.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/signin-passwordless-sms/body.txt
@@ -0,0 +1 @@
+Your code is ${code}.
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/signin-passwordless/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/signin-passwordless/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Magic Link</h2>
+  <p>Use this link to securely sign in:</p>
+  <p>
+    <a href="${link}">
+      Sign In
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/en/signin-passwordless/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/en/signin-passwordless/subject.txt
@@ -0,0 +1 @@
+Secure sign-in link
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-confirm-change/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-confirm-change/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Confirmar cambio de correo electrónico</h2>
+  <p>Utiliza el siguiente enlace para confirmar el cambio de correo:</p>
+  <p>
+    <a href="${link}">
+      Cambiar correo electrónico
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-confirm-change/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-confirm-change/subject.txt
@@ -0,0 +1 @@
+Cambiar dirección de correo electrónico
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-verify/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-verify/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Verificar correo electrónico</h2>
+  <p>Utilza el siguiente enlace para verificar tu correo:</p>
+  <p>
+    <a href="${link}">
+      Verificar correo electrónico
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-verify/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/email-verify/subject.txt
@@ -0,0 +1 @@
+Verifica tu correo electrónico
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/password-reset/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/password-reset/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Recuperar contraseña</h2>
+  <p>Utiliza el siguiente enlace para recuperar tu contraseña:</p>
+  <p>
+    <a href="${link}">
+      Recuperar contraseña
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/password-reset/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/password-reset/subject.txt
@@ -0,0 +1 @@
+Recuperar contraseña
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/signin-passwordless-sms/body.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/signin-passwordless-sms/body.txt
@@ -0,0 +1 @@
+Tu código es ${code}.
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/signin-passwordless/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/signin-passwordless/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Enlace mágico</h2>
+  <p>Utiliza este enlace para iniciar sesión de forma segura:</p>
+  <p>
+    <a href="${link}">
+      Iniciar sesión
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/es/signin-passwordless/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/es/signin-passwordless/subject.txt
@@ -0,0 +1 @@
+Enlace de acceso seguro
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-confirm-change/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-confirm-change/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Confirmer changement de courriel</h2>
+  <p>Utilisez ce lien pour confirmer le changement de courriel :</p>
+  <p>
+    <a href="${link}">
+      Changer courriel
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-confirm-change/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-confirm-change/subject.txt
@@ -0,0 +1 @@
+Changez votre adresse courriel
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-verify/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-verify/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>V&eacute;rifiez votre courriel</h2>
+  <p>Utilisez ce lien pour v&eacute;rifier votre courriel :</p>
+  <p>
+    <a href="${link}">
+      V&eacute;rifier courriel
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-verify/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/email-verify/subject.txt
@@ -0,0 +1 @@
+Vérifier votre courriel
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/password-reset/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/password-reset/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>R&eacute;initialiser votre mot de passe</h2>
+  <p>Utilisez ce lien pour r&eacute;initialiser votre mot de passe :</p>
+  <p>
+    <a href="${link}">
+      R&eacute;initialiser mot de passe
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/password-reset/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/password-reset/subject.txt
@@ -0,0 +1 @@
+Réinitialiser votre mot de passe
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/signin-passwordless-sms/body.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/signin-passwordless-sms/body.txt
@@ -0,0 +1 @@
+Votre code est ${code}.
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/signin-passwordless/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/signin-passwordless/body.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+</head>
+
+<body>
+  <h2>Lien magique</h2>
+  <p>Utilisez ce lien pour vous connecter de fa&ccedil;on s&eacute;curisée :</p>
+  <p>
+    <a href="${link}">
+      Connexion
+    </a>
+  </p>
+</body>
+
+</html>
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/fr/signin-passwordless/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/fr/signin-passwordless/subject.txt
@@ -0,0 +1 @@
+Lien de connexion sécurisé
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/test/email-verify/body.html
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/test/email-verify/body.html
@@ -0,0 +1,8 @@
+${link},
+${displayName},
+${email},
+${ticket},
+${redirectTo},
+${serverUrl},
+${clientUrl},
+${locale},
--- a/dashboard/e2e/e2e-tests-project/nhost/emails/test/email-verify/subject.txt
+++ b/dashboard/e2e/e2e-tests-project/nhost/emails/test/email-verify/subject.txt
@@ -0,0 +1 @@
+${link}, ${displayName}, ${email}, ${ticket}, ${redirectTo}, ${serverUrl}, ${clientUrl}, ${locale}
--- a/dashboard/e2e/e2e-tests-project/nhost/nhost.toml
+++ b/dashboard/e2e/e2e-tests-project/nhost/nhost.toml
@@ -0,0 +1,151 @@
+[global]
+
+[hasura]
+version = 'v2.33.4-ce'
+adminSecret = '{{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }}'
+webhookSecret = '{{ secrets.NHOST_WEBHOOK_SECRET }}'
+
+[[hasura.jwtSecrets]]
+type = 'HS256'
+key = '{{ secrets.HASURA_GRAPHQL_JWT_SECRET }}'
+
+[hasura.settings]
+corsDomain = ['*']
+devMode = true
+enableAllowList = false
+enableConsole = true
+enableRemoteSchemaPermissions = false
+enabledAPIs = ['metadata', 'graphql', 'pgdump', 'config']
+liveQueriesMultiplexedRefetchInterval = 1000
+stringifyNumericTypes = false
+
+[hasura.logs]
+level = 'warn'
+
+[hasura.events]
+httpPoolSize = 100
+
+[functions]
+[functions.node]
+version = 18
+
+[auth]
+version = '0.24.1'
+
+[auth.elevatedPrivileges]
+mode = 'disabled'
+
+[auth.redirections]
+clientUrl = 'http://localhost:3000'
+
+[auth.signUp]
+enabled = true
+disableNewUsers = false
+
+[auth.user]
+[auth.user.roles]
+default = 'user'
+allowed = ['user', 'me']
+
+[auth.user.locale]
+default = 'en'
+allowed = ['en']
+
+[auth.user.gravatar]
+enabled = true
+default = 'blank'
+rating = 'g'
+
+[auth.user.email]
+
+[auth.user.emailDomains]
+
+[auth.session]
+[auth.session.accessToken]
+expiresIn = 900
+
+[auth.session.refreshToken]
+expiresIn = 2592000
+
+[auth.method]
+[auth.method.anonymous]
+enabled = false
+
+[auth.method.emailPasswordless]
+enabled = false
+
+[auth.method.emailPassword]
+hibpEnabled = false
+emailVerificationRequired = true
+passwordMinLength = 9
+
+[auth.method.smsPasswordless]
+enabled = false
+
+[auth.method.oauth]
+[auth.method.oauth.apple]
+enabled = false
+
+[auth.method.oauth.azuread]
+tenant = 'common'
+enabled = false
+
+[auth.method.oauth.bitbucket]
+enabled = false
+
+[auth.method.oauth.discord]
+enabled = false
+
+[auth.method.oauth.facebook]
+enabled = false
+
+[auth.method.oauth.github]
+enabled = false
+
+[auth.method.oauth.gitlab]
+enabled = false
+
+[auth.method.oauth.google]
+enabled = false
+
+[auth.method.oauth.linkedin]
+enabled = false
+
+[auth.method.oauth.spotify]
+enabled = false
+
+[auth.method.oauth.strava]
+enabled = false
+
+[auth.method.oauth.twitch]
+enabled = false
+
+[auth.method.oauth.twitter]
+enabled = false
+
+[auth.method.oauth.windowslive]
+enabled = false
+
+[auth.method.oauth.workos]
+enabled = false
+
+[auth.method.webauthn]
+enabled = false
+
+[auth.method.webauthn.attestation]
+timeout = 60000
+
+[auth.totp]
+enabled = false
+
+[postgres]
+version = '14.6-20240129-1'
+
+[provider]
+
+[storage]
+version = '0.6.0'
+
+[observability]
+[observability.grafana]
+adminPassword = '{{ secrets.GRAFANA_ADMIN_PASSWORD }}'
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/dashboard",
-  "version": "1.11.0",
+  "version": "1.16.3",
  "private": true,
  "scripts": {
    "preinstall": "npx only-allow pnpm",
@@ -19,34 +19,34 @@
    "e2e": "pnpm install-browsers && pnpm playwright test"
  },
  "dependencies": {
-    "@apollo/client": "^3.9.5",
-    "@codemirror/lang-sql": "^6.6.0",
+    "@apollo/client": "^3.9.9",
+    "@codemirror/lang-sql": "^6.6.2",
    "@emotion/cache": "^11.11.0",
    "@emotion/react": "^11.11.4",
    "@emotion/server": "^11.11.0",
-    "@emotion/styled": "^11.11.0",
-    "@fontsource/inter": "^5.0.16",
-    "@fontsource/roboto-mono": "^5.0.16",
+    "@emotion/styled": "^11.11.5",
+    "@fontsource/inter": "^5.0.17",
+    "@fontsource/roboto-mono": "^5.0.17",
    "@graphiql/react": "^0.20.3",
    "@graphiql/toolkit": "^0.9.1",
    "@headlessui/react": "^1.7.18",
    "@heroicons/react": "^1.0.6",
    "@hookform/resolvers": "^3.3.4",
    "@mui/base": "5.0.0-beta.31",
-    "@mui/material": "^5.15.11",
-    "@mui/system": "^5.15.11",
+    "@mui/material": "^5.15.14",
+    "@mui/system": "^5.15.14",
    "@mui/x-date-pickers": "^5.0.20",
    "@nhost/nextjs": "workspace:*",
    "@nhost/react-apollo": "workspace:*",
    "@segment/snippet": "^4.16.2",
-    "@stripe/react-stripe-js": "^2.5.1",
+    "@stripe/react-stripe-js": "^2.6.2",
    "@stripe/stripe-js": "^1.54.2",
    "@tailwindcss/forms": "^0.5.7",
    "@tanstack/react-query": "^4.36.1",
-    "@tanstack/react-table": "^8.13.2",
-    "@tanstack/react-virtual": "^3.1.3",
-    "@uiw/codemirror-theme-github": "^4.21.24",
-    "@uiw/react-codemirror": "^4.21.24",
+    "@tanstack/react-table": "^8.15.3",
+    "@tanstack/react-virtual": "^3.2.0",
+    "@uiw/codemirror-theme-github": "^4.21.25",
+    "@uiw/react-codemirror": "^4.21.25",
    "analytics-node": "^6.2.0",
    "bcryptjs": "^2.4.3",
    "clsx": "^1.2.1",
@@ -57,10 +57,10 @@
    "graphql": "16.8.1",
    "graphql-request": "^6.1.0",
    "graphql-tag": "^2.12.6",
-    "graphql-ws": "^5.15.0",
+    "graphql-ws": "^5.16.0",
    "just-kebab-case": "^4.2.0",
    "lodash.debounce": "^4.0.8",
-    "next": "^14.1.0",
+    "next": "^14.1.4",
    "next-seo": "^6.5.0",
    "node-pg-format": "^1.3.5",
    "pluralize": "^8.0.0",
@@ -68,7 +68,7 @@
    "react-children-utilities": "^2.10.0",
    "react-dom": "18.2.0",
    "react-error-boundary": "^4.0.13",
-    "react-hook-form": "^7.50.1",
+    "react-hook-form": "^7.51.2",
    "react-hot-toast": "^2.4.1",
    "react-intersection-observer": "^9.8.1",
    "react-is": "18.2.0",
@@ -87,11 +87,11 @@
    "tailwind-merge": "^1.14.0",
    "utility-types": "^3.11.0",
    "validator": "^13.11.0",
-    "yup": "^1.3.3",
+    "yup": "^1.4.0",
    "yup-password": "^0.2.2"
  },
  "devDependencies": {
-    "@babel/core": "^7.24.0",
+    "@babel/core": "^7.24.3",
    "@faker-js/faker": "^7.6.0",
    "@graphql-codegen/cli": "^5.0.2",
    "@graphql-codegen/typescript": "^3.0.4",
@@ -108,20 +108,20 @@
    "@storybook/manager-webpack5": "^6.5.16",
    "@storybook/react": "^7.6.17",
    "@storybook/testing-library": "^0.2.2",
-    "@tailwindcss/typography": "^0.5.10",
+    "@tailwindcss/typography": "^0.5.12",
    "@testing-library/dom": "^9.3.4",
    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^14.2.1",
+    "@testing-library/react": "^14.2.2",
    "@testing-library/user-event": "^14.5.2",
    "@types/ace": "^0.0.48",
    "@types/bcryptjs": "^2.4.6",
    "@types/jest": "^29.5.12",
    "@types/lodash.debounce": "^4.0.9",
-    "@types/node": "^16.18.86",
+    "@types/node": "^16.18.93",
    "@types/pluralize": "^0.0.30",
-    "@types/react": "^18.2.61",
-    "@types/react-dom": "^18.2.19",
-    "@types/react-table": "^7.7.19",
+    "@types/react": "^18.2.73",
+    "@types/react-dom": "^18.2.23",
+    "@types/react-table": "^7.7.20",
    "@types/shell-quote": "^1.7.5",
    "@types/testing-library__jest-dom": "^5.14.9",
    "@types/validator": "^13.11.9",
@@ -129,7 +129,7 @@
    "@typescript-eslint/parser": "^6.21.0",
    "@vitejs/plugin-react": "^4.2.1",
    "@vitest/coverage-v8": "^0.32.4",
-    "autoprefixer": "^10.4.17",
+    "autoprefixer": "^10.4.19",
    "babel-loader": "^8.3.0",
    "babel-plugin-transform-remove-console": "^6.9.4",
    "csstype": "^3.1.3",
@@ -142,14 +142,14 @@
    "eslint-config-prettier": "^8.10.0",
    "eslint-plugin-import": "^2.29.1",
    "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react": "^7.34.1",
    "eslint-plugin-react-hooks": "^4.6.0",
    "jsdom": "^22.1.0",
    "lint-staged": "^15.2.2",
-    "msw": "^1.3.2",
+    "msw": "^1.3.3",
    "msw-storybook-addon": "^1.10.0",
    "node-fetch": "^3.3.2",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.38",
    "prettier": "^2.8.8",
    "prettier-plugin-organize-imports": "^3.2.4",
    "prettier-plugin-tailwindcss": "^0.4.1",
@@ -157,11 +157,11 @@
    "require-from-string": "^2.0.2",
    "snake-case": "^3.0.4",
    "storybook-addon-next-router": "^4.0.2",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.3",
    "ts-node": "^10.9.2",
    "tsconfig-paths-webpack-plugin": "^4.1.0",
-    "vite": "^5.1.4",
-    "vite-tsconfig-paths": "^4.3.1",
+    "vite": "^5.2.7",
+    "vite-tsconfig-paths": "^4.3.2",
    "vitest": "^0.32.4"
  },
  "browserslist": {
--- a/dashboard/src/components/common/ApplyLocalSettingsDialog/ApplyLocalSettingsDialog.tsx
+++ b/dashboard/src/components/common/ApplyLocalSettingsDialog/ApplyLocalSettingsDialog.tsx
@@ -0,0 +1,30 @@
+import { useDialog } from '@/components/common/DialogProvider';
+import { Button } from '@/components/ui/v2/Button';
+import { Text } from '@/components/ui/v2/Text';
+
+export default function ApplyLocalSettingsDialog() {
+  const { closeDialog } = useDialog();
+
+  return (
+    <div className="flex flex-col gap-4 px-6 pb-6">
+      <div className="flex flex-col gap-2">
+        <Text color="secondary">
+          Run{' '}
+          <code className="px-1 py-px mx-1 rounded-md bg-slate-500 text-slate-100">
+            $ nhost up
+          </code>{' '}
+          using the cli to apply your changes
+        </Text>
+      </div>
+
+      <Button
+        className="w-full"
+        color="primary"
+        onClick={() => closeDialog()}
+        autoFocus
+      >
+        OK
+      </Button>
+    </div>
+  );
+}
--- a/dashboard/src/components/common/ApplyLocalSettingsDialog/index.ts
+++ b/dashboard/src/components/common/ApplyLocalSettingsDialog/index.ts
@@ -0,0 +1 @@
+export { default as ApplyLocalSettingsDialog } from './ApplyLocalSettingsDialog';
--- a/dashboard/src/components/layout/ProjectLayout/ProjectLayout.tsx
+++ b/dashboard/src/components/layout/ProjectLayout/ProjectLayout.tsx
@@ -11,7 +11,6 @@ import { useNotFoundRedirect } from '@/features/projects/common/hooks/useNotFoun
 import { useProjectRoutes } from '@/features/projects/common/hooks/useProjectRoutes';
 import { NextSeo } from 'next-seo';
 import { useRouter } from 'next/router';
-import { useEffect } from 'react';
 import { twMerge } from 'tailwind-merge';

 export interface ProjectLayoutProps extends AuthenticatedLayoutProps {
@@ -48,15 +47,16 @@ function ProjectLayoutContent({

  useNotFoundRedirect();

-  useEffect(() => {
-    if (isPlatform || !router.isReady) {
-      return;
-    }
+  // useEffect(() => {
+  //   if (isPlatform || !router.isReady) {
+  //     return;
+  //   }

-    if (isRestrictedPath) {
-      router.push('/local/local');
-    }
-  }, [isPlatform, isRestrictedPath, router]);
+  //   TODO // Double check what restricted path means here
+  //   if (isRestrictedPath) {
+  //     router.push('/local/local');
+  //   }
+  // }, [isPlatform, isRestrictedPath, router]);

  if (isRestrictedPath || loading) {
    return <LoadingScreen />;
--- a/dashboard/src/components/layout/SettingsSidebar/SettingsSidebar.tsx
+++ b/dashboard/src/components/layout/SettingsSidebar/SettingsSidebar.tsx
@@ -7,6 +7,7 @@ import { List } from '@/components/ui/v2/List';
 import type { ListItemButtonProps } from '@/components/ui/v2/ListItem';
 import { ListItem } from '@/components/ui/v2/ListItem';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
@@ -61,6 +62,7 @@ export default function SettingsSidebar({
  className,
  ...props
 }: SettingsSidebarProps) {
+  const isPlatform = useIsPlatform();
  const [expanded, setExpanded] = useState(false);
  const { currentProject } = useCurrentWorkspaceAndProject();

@@ -95,7 +97,7 @@ export default function SettingsSidebar({
    <>
      <Backdrop
        open={expanded}
-        className="absolute top-0 left-0 bottom-0 right-0 z-[34] md:hidden"
+        className="absolute bottom-0 left-0 right-0 top-0 z-[34] md:hidden"
        role="button"
        tabIndex={-1}
        onClick={() => setExpanded(false)}
@@ -112,7 +114,7 @@ export default function SettingsSidebar({
      <Box
        component="aside"
        className={twMerge(
-          'absolute top-0 z-[35] h-full w-full overflow-auto border-r-1 px-2 pt-2 pb-17 motion-safe:transition-transform md:relative md:z-0 md:h-full md:py-2.5 md:transition-none',
+          'absolute top-0 z-[35] h-full w-full overflow-auto border-r-1 px-2 pb-17 pt-2 motion-safe:transition-transform md:relative md:z-0 md:h-full md:py-2.5 md:transition-none',
          expanded ? 'translate-x-0' : '-translate-x-full md:translate-x-0',
          className,
        )}
@@ -181,7 +183,12 @@ export default function SettingsSidebar({
              SMTP
            </SettingsNavLink>

-            <SettingsNavLink href="/git" exact={false} onClick={handleSelect}>
+            <SettingsNavLink
+              href="/git"
+              exact={false}
+              onClick={handleSelect}
+              disabled={!isPlatform}
+            >
              Git
            </SettingsNavLink>

--- a/dashboard/src/components/ui/v2/ErrorToast/ErrorToast.tsx
+++ b/dashboard/src/components/ui/v2/ErrorToast/ErrorToast.tsx
@@ -29,10 +29,10 @@ const getInternalErrorMessage = (

  if (error.name === 'ApolloError') {
    // @ts-ignore
-    const internalError = error.graphQLErrors?.[0]?.extensions?.internal as {
-      error: { message: string };
-    };
-    return internalError?.error?.message || null;
+    const graphqlError = error.graphQLErrors?.[0];
+    const graphqlExtensionsError = graphqlError?.extensions?.internal
+      ?.error as { message: string };
+    return graphqlError.message || graphqlExtensionsError?.message || null;
  }

  if (error instanceof Error) {
--- a/dashboard/src/features/account/settings/components/EmailSetting/EmailSetting.tsx
+++ b/dashboard/src/features/account/settings/components/EmailSetting/EmailSetting.tsx
@@ -0,0 +1,80 @@
+import { Form } from '@/components/form/Form';
+import { SettingsContainer } from '@/components/layout/SettingsContainer';
+import { Input } from '@/components/ui/v2/Input';
+import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useNhostClient, useUserData } from '@nhost/nextjs';
+import { FormProvider, useForm } from 'react-hook-form';
+import * as Yup from 'yup';
+
+const validationSchema = Yup.object({
+  email: Yup.string().label('Email').email().required(),
+});
+
+export type EmailSettingFormValues = Yup.InferType<typeof validationSchema>;
+
+export default function EmailSetting() {
+  const nhost = useNhostClient();
+  const { email } = useUserData();
+
+  const form = useForm<EmailSettingFormValues>({
+    reValidateMode: 'onSubmit',
+    defaultValues: { email },
+    resolver: yupResolver(validationSchema),
+  });
+
+  const { register, formState } = form;
+  const isDirty = Object.keys(formState.dirtyFields).length > 0;
+
+  async function handleSubmit(formValues: EmailSettingFormValues) {
+    await execPromiseWithErrorToast(
+      async () => {
+        await nhost.auth.changeEmail({
+          newEmail: formValues.email,
+          options: {
+            redirectTo: `${window.location.origin}/account`,
+          },
+        });
+        form.reset({ email: formValues.email });
+      },
+      {
+        loadingMessage: 'Updating your email...',
+        successMessage:
+          'Please check your inbox. Follow the link to finalize changing your email.',
+        errorMessage:
+          'An error occurred while trying to update your email. Please try again.',
+      },
+    );
+  }
+
+  return (
+    <FormProvider {...form}>
+      <Form onSubmit={handleSubmit}>
+        <SettingsContainer
+          title="Update your email"
+          slotProps={{
+            submitButton: {
+              disabled: !isDirty,
+              loading: formState.isSubmitting,
+            },
+          }}
+          className="grid grid-flow-row lg:grid-cols-5"
+        >
+          <Input
+            {...register('email')}
+            className="col-span-2"
+            id="email"
+            spellCheck="false"
+            autoCapitalize="none"
+            type="email"
+            label="Email"
+            hideEmptyHelperText
+            fullWidth
+            helperText={formState.errors.email?.message}
+            error={Boolean(formState.errors.email)}
+          />
+        </SettingsContainer>
+      </Form>
+    </FormProvider>
+  );
+}
--- a/dashboard/src/features/account/settings/components/EmailSetting/index.ts
+++ b/dashboard/src/features/account/settings/components/EmailSetting/index.ts
@@ -0,0 +1,2 @@
+export * from './EmailSetting';
+export { default as EmailSetting } from './EmailSetting';
--- a/dashboard/src/features/account/settings/components/SocialProvidersSettings/SocialProvidersSettings.tsx
+++ b/dashboard/src/features/account/settings/components/SocialProvidersSettings/SocialProvidersSettings.tsx
@@ -0,0 +1,76 @@
+import { SettingsContainer } from '@/components/layout/SettingsContainer';
+import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
+import { Box } from '@/components/ui/v2/Box';
+import { Button } from '@/components/ui/v2/Button';
+import { GitHubIcon } from '@/components/ui/v2/icons/GitHubIcon';
+import { Text } from '@/components/ui/v2/Text';
+import { useGetAuthUserProvidersQuery } from '@/utils/__generated__/graphql';
+import { useProviderLink } from '@nhost/nextjs';
+import NavLink from 'next/link';
+
+export default function SocialProvidersSettings() {
+  const { data, loading, error } = useGetAuthUserProvidersQuery();
+  const isGithubConnected = data?.authUserProviders?.some(
+    (item) => item.providerId === 'github',
+  );
+
+  const { github } = useProviderLink({
+    connect: true,
+    redirectTo: `${window.location.origin}/account`,
+  });
+
+  if (!data && loading) {
+    return (
+      <ActivityIndicator
+        delay={1000}
+        label="Loading personal access tokens..."
+      />
+    );
+  }
+
+  if (error) {
+    throw error;
+  }
+
+  return (
+    <SettingsContainer
+      title="Authentication providers"
+      description=""
+      rootClassName="gap-0 flex flex-col items-start"
+      className="my-2"
+      slotProps={{
+        submitButton: { className: 'hidden' },
+        footer: { className: 'hidden' },
+      }}
+    >
+      {isGithubConnected ? (
+        <Box
+          sx={{ backgroundColor: 'grey.200' }}
+          className="flex flex-row items-center justify-start space-x-2 rounded-md p-2"
+        >
+          <GitHubIcon />
+          <Text className="font-medium ">Connected</Text>
+        </Box>
+      ) : (
+        <Box>
+          <NavLink
+            href={github}
+            passHref
+            target="_blank"
+            rel="noreferrer noopener"
+            legacyBehavior
+          >
+            <Button
+              className=""
+              variant="outlined"
+              color="secondary"
+              startIcon={<GitHubIcon />}
+            >
+              Connect with GitHub
+            </Button>
+          </NavLink>
+        </Box>
+      )}
+    </SettingsContainer>
+  );
+}
--- a/dashboard/src/features/account/settings/components/SocialProvidersSettings/index.ts
+++ b/dashboard/src/features/account/settings/components/SocialProvidersSettings/index.ts
@@ -0,0 +1 @@
+export { default as SocialProvidersSettings } from './SocialProvidersSettings';
--- a/dashboard/src/features/account/settings/gql/getAuthUserProviders.gql
+++ b/dashboard/src/features/account/settings/gql/getAuthUserProviders.gql
@@ -0,0 +1,6 @@
+query getAuthUserProviders {
+  authUserProviders {
+    id
+    providerId
+  }
+}
--- a/dashboard/src/features/ai/AutoEmbeddingsForm/AutoEmbeddingsForm.tsx
+++ b/dashboard/src/features/ai/AutoEmbeddingsForm/AutoEmbeddingsForm.tsx
@@ -1,4 +1,5 @@
 import { useDialog } from '@/components/common/DialogProvider';
+import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Form } from '@/components/form/Form';
 import { Box } from '@/components/ui/v2/Box';
 import { Button } from '@/components/ui/v2/Button';
@@ -6,6 +7,7 @@ import { ArrowsClockwise } from '@/components/ui/v2/icons/ArrowsClockwise';
 import { InfoIcon } from '@/components/ui/v2/icons/InfoIcon';
 import { PlusIcon } from '@/components/ui/v2/icons/PlusIcon';
 import { Input } from '@/components/ui/v2/Input';
+import { Option } from '@/components/ui/v2/Option';
 import { Text } from '@/components/ui/v2/Text';
 import { Tooltip } from '@/components/ui/v2/Tooltip';
 import { useAdminApolloClient } from '@/features/projects/common/hooks/useAdminApolloClient';
@@ -20,11 +22,18 @@ import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

+const AUTO_EMBEDDINGS_MODELS = [
+  'text-embedding-ada-002',
+  'text-embedding-3-small',
+  'text-embedding-3-large',
+];
+
 export const validationSchema = Yup.object({
-  name: Yup.string().required('The name is required.'),
-  schemaName: Yup.string().required('The schema is required'),
-  tableName: Yup.string().required('The table is required'),
-  columnName: Yup.string().required('The column is required'),
+  name: Yup.string().required('The name field is required.'),
+  model: Yup.string().oneOf(AUTO_EMBEDDINGS_MODELS),
+  schemaName: Yup.string().required('The schema field is required'),
+  tableName: Yup.string().required('The table field is required'),
+  columnName: Yup.string().required('The column field is required'),
  query: Yup.string(),
  mutation: Yup.string(),
 });
@@ -40,7 +49,7 @@ export interface AutoEmbeddingsFormProps extends DialogFormProps {
  /**
   * if there is initialData then it's an update operation
   */
-  initialData?: AutoEmbeddingsFormValues;
+  initialData?: AutoEmbeddingsFormValues & { model: string };

  /**
   * Function to be called when the operation is cancelled.
@@ -74,7 +83,10 @@ export default function AutoEmbeddingsForm({
    });

  const form = useForm<AutoEmbeddingsFormValues>({
-    defaultValues: initialData,
+    defaultValues: {
+      ...initialData,
+      model: initialData?.model ?? 'text-embedding-ada-002',
+    },
    reValidateMode: 'onSubmit',
    resolver: yupResolver(validationSchema),
  });
@@ -106,7 +118,9 @@ export default function AutoEmbeddingsForm({
    }

    await insertGraphiteAutoEmbeddingsConfiguration({
-      variables: values,
+      variables: {
+        ...values,
+      },
    });
  };

@@ -129,9 +143,9 @@ export default function AutoEmbeddingsForm({
    <FormProvider {...form}>
      <Form
        onSubmit={handleSubmit}
-        className="flex h-full flex-col gap-4 overflow-hidden"
+        className="flex flex-col h-full gap-4 overflow-hidden"
      >
-        <div className="flex flex-1 flex-col space-y-6 overflow-auto px-6">
+        <div className="flex flex-col flex-1 px-6 space-y-6 overflow-auto">
          <Input
            {...register('name')}
            id="name"
@@ -141,7 +155,7 @@ export default function AutoEmbeddingsForm({
                <Tooltip title="Name of the Auto-Embeddings">
                  <InfoIcon
                    aria-label="Info"
-                    className="h-4 w-4"
+                    className="w-4 h-4"
                    color="primary"
                  />
                </Tooltip>
@@ -155,6 +169,36 @@ export default function AutoEmbeddingsForm({
            autoComplete="off"
            autoFocus
          />
+
+          <ControlledSelect
+            slotProps={{
+              popper: { disablePortal: false, className: 'z-[10000]' },
+            }}
+            id="model"
+            name="model"
+            label={
+              <Box className="flex flex-row items-center space-x-2">
+                <Text>Model</Text>
+                <Tooltip title="Auto-Embeddings Model">
+                  <InfoIcon
+                    aria-label="Info"
+                    className="w-4 h-4"
+                    color="primary"
+                  />
+                </Tooltip>
+              </Box>
+            }
+            fullWidth
+            error={!!errors?.model?.message}
+            helperText={errors?.model?.message}
+          >
+            {AUTO_EMBEDDINGS_MODELS.map((model) => (
+              <Option key={model} value={model}>
+                {model}
+              </Option>
+            ))}
+          </ControlledSelect>
+
          <Input
            {...register('schemaName')}
            id="schemaName"
@@ -164,7 +208,7 @@ export default function AutoEmbeddingsForm({
                <Tooltip title={<span>Schema where the table belongs to</span>}>
                  <InfoIcon
                    aria-label="Info"
-                    className="h-4 w-4"
+                    className="w-4 h-4"
                    color="primary"
                  />
                </Tooltip>
@@ -186,7 +230,7 @@ export default function AutoEmbeddingsForm({
                <Tooltip title="Table Name">
                  <InfoIcon
                    aria-label="Info"
-                    className="h-4 w-4"
+                    className="w-4 h-4"
                    color="primary"
                  />
                </Tooltip>
@@ -208,7 +252,7 @@ export default function AutoEmbeddingsForm({
                <Tooltip title="Column name">
                  <InfoIcon
                    aria-label="Info"
-                    className="h-4 w-4"
+                    className="w-4 h-4"
                    color="primary"
                  />
                </Tooltip>
@@ -230,7 +274,7 @@ export default function AutoEmbeddingsForm({
                <Tooltip title="Query">
                  <InfoIcon
                    aria-label="Info"
-                    className="h-4 w-4"
+                    className="w-4 h-4"
                    color="primary"
                  />
                </Tooltip>
@@ -254,7 +298,7 @@ export default function AutoEmbeddingsForm({
                <Tooltip title="Mutation">
                  <InfoIcon
                    aria-label="Info"
-                    className="h-4 w-4"
+                    className="w-4 h-4"
                    color="primary"
                  />
                </Tooltip>
@@ -271,7 +315,7 @@ export default function AutoEmbeddingsForm({
          />
        </div>

-        <Box className="flex w-full flex-row justify-between rounded border-t px-6 py-4">
+        <Box className="flex flex-row justify-between w-full px-6 py-4 border-t rounded">
          <Button variant="outlined" color="secondary" onClick={onCancel}>
            Cancel
          </Button>
--- a/dashboard/src/features/ai/settings/components/AISettings.tsx
+++ b/dashboard/src/features/ai/settings/components/AISettings.tsx
@@ -1,3 +1,4 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
 import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { ControlledAutocomplete } from '@/components/form/ControlledAutocomplete';
@@ -12,6 +13,7 @@ import { Switch } from '@/components/ui/v2/Switch';
 import { Text } from '@/components/ui/v2/Text';
 import { Tooltip } from '@/components/ui/v2/Tooltip';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { COST_PER_VCPU } from '@/features/projects/resources/settings/utils/resourceSettingsValidationSchema';
 import { ComputeFormSection } from '@/features/services/components/ServiceForm/components/ComputeFormSection';
 import {
@@ -20,6 +22,7 @@ import {
  useGetSoftwareVersionsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { RESOURCE_VCPU_MULTIPLIER } from '@/utils/constants/common';
 import { getToastStyleProps } from '@/utils/constants/settings';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
@@ -50,9 +53,13 @@ const validationSchema = Yup.object({
 export type AISettingsFormValues = Yup.InferType<typeof validationSchema>;

 export default function AISettings() {
-  const { maintenanceActive } = useUI();
+  const isPlatform = useIsPlatform();
  const { openDialog } = useDialog();
-  const [updateConfig] = useUpdateConfigMutation();
+  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
+  const [updateConfig] = useUpdateConfigMutation({
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
  const { currentProject } = useCurrentWorkspaceAndProject();

  const [aiServiceEnabled, setAIServiceEnabled] = useState(true);
@@ -67,6 +74,7 @@ export default function AISettings() {
    variables: {
      appId: currentProject.id,
    },
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data: graphiteVersionsData, loading: loadingGraphiteVersionsData } =
@@ -74,6 +82,7 @@ export default function AISettings() {
      variables: {
        software: Software_Type_Enum.Graphite,
      },
+      skip: !isPlatform,
    });

  const graphiteVersions = graphiteVersionsData?.softwareVersions || [];
@@ -98,8 +107,8 @@ export default function AISettings() {
    reValidateMode: 'onSubmit',
    defaultValues: {
      version: {
-        label: ai?.version ?? availableVersions?.at(0)?.label,
-        value: ai?.version ?? availableVersions?.at(0)?.value,
+        label: ai?.version || availableVersions?.at(0)?.label || '',
+        value: ai?.version || availableVersions?.at(0)?.value || '',
      },
      webhookSecret: '',
      organization: '',
@@ -225,6 +234,18 @@ export default function AISettings() {
        });

        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'AI settings are being updated...',
@@ -247,7 +268,7 @@ export default function AISettings() {

  return (
    <Box className="space-y-4" sx={{ backgroundColor: 'background.default' }}>
-      <Box className="flex flex-row items-center justify-between rounded-lg border-1 p-4">
+      <Box className="flex flex-row items-center justify-between p-4 rounded-lg border-1">
        <Text className="text-lg font-semibold">Enable AI service</Text>
        <Switch
          checked={aiServiceEnabled}
@@ -270,54 +291,58 @@ export default function AISettings() {
              className="flex flex-col"
            >
              <Box className="space-y-4">
-                {availableVersions.length > 0 && (
-                  <Box className="space-y-2">
-                    <Box className="flex flex-row items-center space-x-2">
-                      <Text className="text-lg font-semibold">Version</Text>
-                      <Tooltip title="Version of the service to use.">
-                        <InfoIcon
-                          aria-label="Info"
-                          className="h-4 w-4"
-                          color="primary"
-                        />
-                      </Tooltip>
-                    </Box>
-                    <ControlledAutocomplete
-                      id="version"
-                      name="version"
-                      autoHighlight
-                      isOptionEqualToValue={() => false}
-                      filterOptions={(options, { inputValue }) => {
-                        const inputValueLower = inputValue.toLowerCase();
-                        const matched = [];
-                        const otherOptions = [];
-
-                        options.forEach((option) => {
-                          const optionLabelLower = option.label.toLowerCase();
-
-                          if (optionLabelLower.startsWith(inputValueLower)) {
-                            matched.push(option);
-                          } else {
-                            otherOptions.push(option);
-                          }
-                        });
-
-                        const result = [...matched, ...otherOptions];
-
-                        return result;
-                      }}
-                      fullWidth
-                      className="col-span-4"
-                      options={availableVersions}
-                      error={!!formState.errors?.version?.message}
-                      helperText={formState.errors?.version?.message}
-                      showCustomOption="auto"
-                      customOptionLabel={(value) =>
-                        `Use custom value: "${value}"`
-                      }
-                    />
+                <Box className="space-y-2">
+                  <Box className="flex flex-row items-center space-x-2">
+                    <Text className="text-lg font-semibold">Version</Text>
+                    <Tooltip title="Version of the service to use.">
+                      <InfoIcon
+                        aria-label="Info"
+                        className="w-4 h-4"
+                        color="primary"
+                      />
+                    </Tooltip>
                  </Box>
-                )}
+                  <ControlledAutocomplete
+                    id="version"
+                    name="version"
+                    autoHighlight
+                    isOptionEqualToValue={() => false}
+                    filterOptions={(options, { inputValue }) => {
+                      const inputValueLower = inputValue.toLowerCase();
+                      const matched = [];
+                      const otherOptions = [];
+
+                      options.forEach((option) => {
+                        const optionLabelLower = option.label.toLowerCase();
+
+                        if (optionLabelLower.startsWith(inputValueLower)) {
+                          matched.push(option);
+                        } else {
+                          otherOptions.push(option);
+                        }
+                      });
+
+                      const result = [...matched, ...otherOptions];
+
+                      return result;
+                    }}
+                    fullWidth
+                    className="col-span-4"
+                    options={availableVersions}
+                    error={
+                      !!formState.errors?.version?.message ||
+                      !!formState.errors?.version?.value?.message
+                    }
+                    helperText={
+                      formState.errors?.version?.message ||
+                      formState.errors?.version?.value?.message
+                    }
+                    showCustomOption="auto"
+                    customOptionLabel={(value) =>
+                      `Use custom value: "${value}"`
+                    }
+                  />
+                </Box>

                <Box className="space-y-2">
                  <Box className="flex flex-row items-center space-x-2">
@@ -327,7 +352,7 @@ export default function AISettings() {
                    <Tooltip title="Used to validate requests between postgres and the AI service. The AI service will also include the header X-Graphite-Webhook-Secret with this value set when calling external webhooks so the source of the request can be validated.">
                      <InfoIcon
                        aria-label="Info"
-                        className="h-4 w-4"
+                        className="w-4 h-4"
                        color="primary"
                      />
                    </Tooltip>
@@ -351,26 +376,28 @@ export default function AISettings() {
                    <Tooltip title="Dedicated resources allocated for the service.">
                      <InfoIcon
                        aria-label="Info"
-                        className="h-4 w-4"
+                        className="w-4 h-4"
                        color="primary"
                      />
                    </Tooltip>
                  </Box>

-                  <Alert
-                    severity="info"
-                    className="flex items-center justify-between space-x-2"
-                  >
-                    <span>{getAIResourcesCost()}</span>
-                    <b>
-                      $
-                      {parseFloat(
-                        (
-                          aiSettingsFormValues.compute.cpu * COST_PER_VCPU
-                        ).toFixed(2),
-                      )}
-                    </b>
-                  </Alert>
+                  {isPlatform ? (
+                    <Alert
+                      severity="info"
+                      className="flex items-center justify-between space-x-2"
+                    >
+                      <span>{getAIResourcesCost()}</span>
+                      <b>
+                        $
+                        {parseFloat(
+                          (
+                            aiSettingsFormValues.compute.cpu * COST_PER_VCPU
+                          ).toFixed(2),
+                        )}
+                      </b>
+                    </Alert>
+                  ) : null}

                  <ComputeFormSection />
                </Box>
@@ -389,7 +416,7 @@ export default function AISettings() {
                        <Tooltip title="Key to use for authenticating API requests to OpenAI">
                          <InfoIcon
                            aria-label="Info"
-                            className="h-4 w-4"
+                            className="w-4 h-4"
                            color="primary"
                          />
                        </Tooltip>
@@ -412,7 +439,7 @@ export default function AISettings() {
                        <Tooltip title="Optional. OpenAI organization to use.">
                          <InfoIcon
                            aria-label="Info"
-                            className="h-4 w-4"
+                            className="w-4 h-4"
                            color="primary"
                          />
                        </Tooltip>
@@ -440,7 +467,7 @@ export default function AISettings() {
                        <Tooltip title="How often to run the job that keeps embeddings up to date.">
                          <InfoIcon
                            aria-label="Info"
-                            className="h-4 w-4"
+                            className="w-4 h-4"
                            color="primary"
                          />
                        </Tooltip>
--- a/dashboard/src/features/ai/settings/components/DisableAIServiceConfirmationDialog/DisableAIServiceConfirmationDialog.tsx
+++ b/dashboard/src/features/ai/settings/components/DisableAIServiceConfirmationDialog/DisableAIServiceConfirmationDialog.tsx
@@ -1,8 +1,11 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
 import { useDialog } from '@/components/common/DialogProvider';
 import { Box } from '@/components/ui/v2/Box';
 import { Button } from '@/components/ui/v2/Button';
 import { Text } from '@/components/ui/v2/Text';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { useUpdateConfigMutation } from '@/utils/__generated__/graphql';
 import { useState } from 'react';
@@ -23,11 +26,14 @@ export default function DisableAIServiceConfirmationDialog({
  onCancel,
  onServiceDisabled,
 }: DisableAIServiceConfirmationDialogProps) {
-  const { closeDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const { openDialog, closeDialog } = useDialog();
+  const localMimirClient = useLocalMimirClient();
  const [loading, setLoading] = useState(false);
  const { currentProject } = useCurrentWorkspaceAndProject();
-
-  const [updateConfig] = useUpdateConfigMutation();
+  const [updateConfig] = useUpdateConfigMutation({
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });

  async function handleClick() {
    setLoading(true);
@@ -45,6 +51,18 @@ export default function DisableAIServiceConfirmationDialog({

        onServiceDisabled();
        closeDialog();
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Disabling the AI service...',
--- a/dashboard/src/features/authentication/settings/components/AllowedEmailSettings/AllowedEmailSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/AllowedEmailSettings/AllowedEmailSettings.tsx
@@ -1,16 +1,21 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Input } from '@/components/ui/v2/Input';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -26,15 +31,19 @@ export type AllowedEmailSettingsFormValues = Yup.InferType<
 >;

 export default function AllowedEmailDomainsSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { email, emailDomains } = data?.config?.auth?.user || {};
@@ -54,6 +63,17 @@ export default function AllowedEmailDomainsSettings() {

  const isDirty = Object.keys(formState.dirtyFields).length > 0;

+  useEffect(() => {
+    if (!loading && email && emailDomains) {
+      form.reset({
+        enabled:
+          email?.allowed?.length > 0 || emailDomains?.allowed?.length > 0,
+        allowedEmails: email?.allowed?.join(', ') || '',
+        allowedEmailDomains: emailDomains?.allowed?.join(', ') || '',
+      });
+    }
+  }, [loading, form, email, emailDomains]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -105,6 +125,18 @@ export default function AllowedEmailDomainsSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Allowed email settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/AllowedRedirectURLsSettings/AllowedRedirectURLsSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/AllowedRedirectURLsSettings/AllowedRedirectURLsSettings.tsx
@@ -1,16 +1,21 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Input } from '@/components/ui/v2/Input';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -23,15 +28,19 @@ export type AllowedRedirectURLFormValues = Yup.InferType<
 >;

 export default function AllowedRedirectURLsSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const localMimirClient = useLocalMimirClient();
  const { maintenanceActive } = useUI();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { allowedUrls } = data?.config?.auth?.redirections || {};
@@ -44,6 +53,14 @@ export default function AllowedRedirectURLsSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading && allowedUrls) {
+      form.reset({
+        allowedUrls: allowedUrls?.join(', ') || '',
+      });
+    }
+  }, [loading, allowedUrls, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -82,6 +99,18 @@ export default function AllowedRedirectURLsSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Allowed redirect URL settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/AnonymousSignInSettings/AnonymousSignInSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/AnonymousSignInSettings/AnonymousSignInSettings.tsx
@@ -1,15 +1,20 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -20,15 +25,19 @@ const validationSchema = Yup.object({
 export type AnonymousSignInFormValues = Yup.InferType<typeof validationSchema>;

 export default function AnonymousSignInSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { enabled } = data?.config?.auth?.method?.anonymous || {};
@@ -41,6 +50,12 @@ export default function AnonymousSignInSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({ enabled });
+    }
+  }, [loading, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -75,6 +90,18 @@ export default function AnonymousSignInSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Anonymous sign-in settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/AppleProviderSettings/AppleProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/AppleProviderSettings/AppleProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -7,16 +9,19 @@ import { CopyIcon } from '@/components/ui/v2/icons/CopyIcon';
 import { Input } from '@/components/ui/v2/Input';
 import { InputAdornment } from '@/components/ui/v2/InputAdornment';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useTheme } from '@mui/material';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -53,15 +58,19 @@ export type AppleProviderFormValues = Yup.InferType<typeof validationSchema>;

 export default function AppleProviderSettings() {
  const theme = useTheme();
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, enabled, keyId, privateKey, teamId } =
@@ -79,6 +88,18 @@ export default function AppleProviderSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        teamId: teamId || '',
+        keyId: keyId || '',
+        clientId: clientId || '',
+        privateKey: privateKey || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, teamId, keyId, clientId, privateKey, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -119,6 +140,18 @@ export default function AppleProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Apple settings are being updated...',
@@ -236,7 +269,7 @@ export default function AppleProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/AuthServiceVersionSettings/AuthServiceVersionSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/AuthServiceVersionSettings/AuthServiceVersionSettings.tsx
@@ -1,9 +1,12 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { ControlledAutocomplete } from '@/components/form/ControlledAutocomplete';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  Software_Type_Enum,
@@ -11,8 +14,10 @@ import {
  useGetSoftwareVersionsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -28,21 +33,26 @@ export type AuthServiceVersionFormValues = Yup.InferType<
 >;

 export default function AuthServiceVersionSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const localMimirClient = useLocalMimirClient();
  const { maintenanceActive } = useUI();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data: authVersionsData } = useGetSoftwareVersionsQuery({
    variables: {
      software: Software_Type_Enum.Auth,
    },
+    skip: !isPlatform,
  });

  const { version } = data?.config?.auth || {};
@@ -59,10 +69,21 @@ export default function AuthServiceVersionSettings() {

  const form = useForm<AuthServiceVersionFormValues>({
    reValidateMode: 'onSubmit',
-    defaultValues: { version: { label: version, value: version } },
+    defaultValues: { version: { label: '', value: '' } },
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading && version) {
+      form.reset({
+        version: {
+          label: version,
+          value: version,
+        },
+      });
+    }
+  }, [loading, version, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -97,6 +118,18 @@ export default function AuthServiceVersionSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Auth version is being updated...',
@@ -120,12 +153,20 @@ export default function AuthServiceVersionSettings() {
          }}
          docsLink="https://github.com/nhost/hasura-auth/releases"
          docsTitle="the latest releases"
-          className="grid grid-flow-row gap-x-4 gap-y-2 px-4 lg:grid-cols-5"
+          className="grid grid-flow-row px-4 gap-x-4 gap-y-2 lg:grid-cols-5"
        >
          <ControlledAutocomplete
            id="version"
            name="version"
            autoHighlight
+            freeSolo
+            getOptionLabel={(option) => {
+              if (typeof option === 'string') {
+                return option || '';
+              }
+
+              return option.value;
+            }}
            isOptionEqualToValue={() => false}
            filterOptions={(options, { inputValue }) => {
              const inputValueLower = inputValue.toLowerCase();
--- a/dashboard/src/features/authentication/settings/components/AzureADProviderSettings/AzureADProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/AzureADProviderSettings/AzureADProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -8,15 +10,18 @@ import { Input } from '@/components/ui/v2/Input';
 import { InputAdornment } from '@/components/ui/v2/InputAdornment';
 import { BaseProviderSettings } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -46,15 +51,19 @@ const validationSchema = Yup.object({
 export type AzureADProviderFormValues = Yup.InferType<typeof validationSchema>;

 export default function AzureADProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const localMimirClient = useLocalMimirClient();
  const { maintenanceActive } = useUI();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, tenant, enabled } =
@@ -71,6 +80,17 @@ export default function AzureADProviderSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        tenant: tenant || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, tenant, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -108,6 +128,18 @@ export default function AzureADProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Azure AD settings are being updated...',
@@ -182,7 +214,7 @@ export default function AzureADProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/BlockedEmailSettings/BlockedEmailSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/BlockedEmailSettings/BlockedEmailSettings.tsx
@@ -1,16 +1,21 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Input } from '@/components/ui/v2/Input';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -24,15 +29,19 @@ const validationSchema = Yup.object({
 export type BlockedEmailFormValues = Yup.InferType<typeof validationSchema>;

 export default function BlockedEmailSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { email, emailDomains } = data?.config?.auth?.user || {};
@@ -51,6 +60,17 @@ export default function BlockedEmailSettings() {
  const enabled = watch('enabled');
  const isDirty = Object.keys(formState.dirtyFields).length > 0;

+  useEffect(() => {
+    if (!loading && email && emailDomains) {
+      form.reset({
+        enabled:
+          email?.blocked?.length > 0 || emailDomains?.blocked?.length > 0,
+        blockedEmails: email?.blocked?.join(', ') || '',
+        blockedEmailDomains: emailDomains?.blocked?.join(', ') || '',
+      });
+    }
+  }, [loading, email, emailDomains, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -112,6 +132,18 @@ export default function BlockedEmailSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage:
--- a/dashboard/src/features/authentication/settings/components/ClientURLSettings/ClientURLSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/ClientURLSettings/ClientURLSettings.tsx
@@ -1,16 +1,21 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Input } from '@/components/ui/v2/Input';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -21,15 +26,19 @@ const validationSchema = Yup.object({
 export type ClientURLFormValues = Yup.InferType<typeof validationSchema>;

 export default function ClientURLSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientUrl, allowedUrls } = data?.config?.auth?.redirections || {};
@@ -42,6 +51,12 @@ export default function ClientURLSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading && clientUrl) {
+      form.reset({ clientUrl });
+    }
+  }, [loading, clientUrl, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -77,6 +92,18 @@ export default function ClientURLSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Client URL is being updated...',
--- a/dashboard/src/features/authentication/settings/components/DeleteSMTPSettings/DeleteSMTPSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/DeleteSMTPSettings/DeleteSMTPSettings.tsx
@@ -0,0 +1,143 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
+import { useUI } from '@/components/common/UIProvider';
+import { SettingsContainer } from '@/components/layout/SettingsContainer';
+import { Box } from '@/components/ui/v2/Box';
+import { Button } from '@/components/ui/v2/Button';
+import { Text } from '@/components/ui/v2/Text';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
+import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
+import {
+  GetSmtpSettingsDocument,
+  useUpdateConfigMutation,
+} from '@/utils/__generated__/graphql';
+import { useState } from 'react';
+import { twMerge } from 'tailwind-merge';
+
+function ConfirmDeleteSMTPSettingsModal({
+  close,
+  onDelete,
+}: {
+  onDelete?: () => Promise<any>;
+  close: () => void;
+}) {
+  const onClickDelete = async () => {
+    await onDelete();
+    close();
+  };
+
+  return (
+    <Box className={twMerge('w-full rounded-lg p-6 text-left')}>
+      <div className="grid grid-flow-row gap-4">
+        <Text variant="h3" component="h2">
+          Delete SMTP Settings?
+        </Text>
+
+        <Text>This will reset all your SMTP and Postmark settings.</Text>
+
+        <div className="grid grid-flow-row gap-2">
+          <Button color="error" onClick={onClickDelete}>
+            Delete
+          </Button>
+
+          <Button variant="outlined" color="secondary" onClick={close}>
+            Cancel
+          </Button>
+        </div>
+      </div>
+    </Box>
+  );
+}
+
+export default function DeleteSMTPSettings() {
+  const { openDialog, closeDialog } = useDialog();
+
+  const isPlatform = useIsPlatform();
+  const localMimirClient = useLocalMimirClient();
+  const { maintenanceActive } = useUI();
+  const [loading, setLoading] = useState(false);
+  const { currentProject } = useCurrentWorkspaceAndProject();
+
+  const [updateConfig] = useUpdateConfigMutation({
+    refetchQueries: [GetSmtpSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const deleteSMTPSettings = async () => {
+    const updateConfigPromise = updateConfig({
+      variables: {
+        appId: currentProject.id,
+        config: {
+          provider: {
+            smtp: null,
+          },
+        },
+      },
+    });
+
+    setLoading(true);
+
+    await execPromiseWithErrorToast(
+      async () => {
+        await updateConfigPromise;
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
+      },
+      {
+        loadingMessage: 'SMTP settings are being deleted...',
+        successMessage: 'SMTP settings have been deleted successfully.',
+        errorMessage:
+          'An error occurred while trying to delete the SMTP settings.',
+      },
+    );
+
+    setLoading(false);
+  };
+
+  const confirmDeleteSMTPSettings = async () => {
+    openDialog({
+      component: (
+        <ConfirmDeleteSMTPSettingsModal
+          close={closeDialog}
+          onDelete={deleteSMTPSettings}
+        />
+      ),
+    });
+  };
+
+  return (
+    <SettingsContainer
+      title="Delete SMTP Settings"
+      description="Delete SMTP settings and revert to default values"
+      className="px-0"
+      slotProps={{
+        submitButton: { className: 'hidden' },
+        footer: { className: 'hidden' },
+      }}
+    >
+      <Box className="grid grid-flow-row border-t-1">
+        <Button
+          color="error"
+          className="mx-4 mt-4 justify-self-end"
+          onClick={confirmDeleteSMTPSettings}
+          disabled={loading || maintenanceActive}
+          loading={loading}
+        >
+          Delete
+        </Button>
+      </Box>
+    </SettingsContainer>
+  );
+}
--- a/dashboard/src/features/authentication/settings/components/DeleteSMTPSettings/index.ts
+++ b/dashboard/src/features/authentication/settings/components/DeleteSMTPSettings/index.ts
@@ -0,0 +1 @@
+export { default as DeleteSTMPSettings } from './DeleteSMTPSettings';
--- a/dashboard/src/features/authentication/settings/components/DisableNewUsersSettings/DisableNewUsersSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/DisableNewUsersSettings/DisableNewUsersSettings.tsx
@@ -1,14 +1,19 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/utils/__generated__/graphql';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -19,15 +24,19 @@ const validationSchema = Yup.object({
 export type DisableNewUsersFormValues = Yup.InferType<typeof validationSchema>;

 export default function DisableNewUsersSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const form = useForm<DisableNewUsersFormValues>({
@@ -37,6 +46,14 @@ export default function DisableNewUsersSettings() {
    },
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        disabled: !data?.config?.auth?.signUp?.enabled,
+      });
+    }
+  }, [loading, data, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -73,6 +90,18 @@ export default function DisableNewUsersSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Disabling new user sign ups...',
--- a/dashboard/src/features/authentication/settings/components/DiscordProviderSettings/DiscordProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/DiscordProviderSettings/DiscordProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,28 +14,35 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function DiscordProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -49,6 +58,16 @@ export default function DiscordProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -89,6 +108,18 @@ export default function DiscordProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Discord settings are being updated...',
@@ -153,7 +184,7 @@ export default function DiscordProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/EmailAndPasswordSettings/EmailAndPasswordSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/EmailAndPasswordSettings/EmailAndPasswordSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { ControlledCheckbox } from '@/components/form/ControlledCheckbox';
 import { Form } from '@/components/form/Form';
@@ -6,13 +8,16 @@ import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Input } from '@/components/ui/v2/Input';
 import { Text } from '@/components/ui/v2/Text';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -29,15 +34,19 @@ const validationSchema = Yup.object({
 export type EmailAndPasswordFormValues = Yup.InferType<typeof validationSchema>;

 export default function EmailAndPasswordSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, error, loading } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { hibpEnabled, emailVerificationRequired, passwordMinLength } =
@@ -53,6 +62,22 @@ export default function EmailAndPasswordSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        hibpEnabled,
+        emailVerificationRequired,
+        passwordMinLength,
+      });
+    }
+  }, [
+    loading,
+    hibpEnabled,
+    emailVerificationRequired,
+    passwordMinLength,
+    form,
+  ]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -87,6 +112,18 @@ export default function EmailAndPasswordSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: `Email and password sign-in settings are being updated...`,
--- a/dashboard/src/features/authentication/settings/components/FacebookProviderSettings/FacebookProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/FacebookProviderSettings/FacebookProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,28 +14,35 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function FacebookProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -49,6 +58,16 @@ export default function FacebookProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -89,6 +108,18 @@ export default function FacebookProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Facebook settings are being updated...',
@@ -153,7 +184,7 @@ export default function FacebookProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/GitHubProviderSettings/GitHubProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/GitHubProviderSettings/GitHubProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,30 +14,37 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useTheme } from '@mui/material';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function GitHubProviderSettings() {
  const theme = useTheme();
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -51,6 +60,16 @@ export default function GitHubProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -91,6 +110,18 @@ export default function GitHubProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'GitHub settings are being updated...',
@@ -159,7 +190,7 @@ export default function GitHubProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/GoogleProviderSettings/GoogleProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/GoogleProviderSettings/GoogleProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,28 +14,35 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function GoogleProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -49,6 +58,16 @@ export default function GoogleProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -89,6 +108,18 @@ export default function GoogleProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Google settings are being updated...',
@@ -153,7 +184,7 @@ export default function GoogleProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/GravatarSettings/GravatarSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/GravatarSettings/GravatarSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { ControlledSelect } from '@/components/form/ControlledSelect';
 import { Form } from '@/components/form/Form';
@@ -5,17 +7,20 @@ import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Option } from '@/components/ui/v2/Option';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import {
  AUTH_GRAVATAR_DEFAULT,
  AUTH_GRAVATAR_RATING,
 } from '@/utils/constants/settings';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -29,15 +34,19 @@ const validationSchema = Yup.object({
 export type GravatarFormValues = Yup.InferType<typeof validationSchema>;

 export default function GravatarSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const {
@@ -56,6 +65,16 @@ export default function GravatarSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        default: defaultGravatar || '',
+        rating: rating || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, defaultGravatar, rating, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -91,6 +110,18 @@ export default function GravatarSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Gravatar settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/LinkedInProviderSettings/LinkedInProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/LinkedInProviderSettings/LinkedInProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,28 +14,35 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function LinkedInProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -49,6 +58,16 @@ export default function LinkedInProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -89,6 +108,18 @@ export default function LinkedInProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'LinkedIn settings are being updated...',
@@ -153,7 +184,7 @@ export default function LinkedInProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/MFASettings/MFASettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/MFASettings/MFASettings.tsx
@@ -1,16 +1,21 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Input } from '@/components/ui/v2/Input';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -23,15 +28,19 @@ const validationSchema = Yup.object({
 export type MFASettingsFormValues = Yup.InferType<typeof validationSchema>;

 export default function MFASettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { enabled, issuer } = data?.config?.auth?.totp || {};
@@ -45,6 +54,15 @@ export default function MFASettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading && issuer && enabled) {
+      form.reset({
+        issuer,
+        enabled,
+      });
+    }
+  }, [loading, issuer, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -78,6 +96,18 @@ export default function MFASettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage:
--- a/dashboard/src/features/authentication/settings/components/MagicLinkSettings/MagicLinkSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/MagicLinkSettings/MagicLinkSettings.tsx
@@ -1,15 +1,20 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -20,15 +25,19 @@ const validationSchema = Yup.object({
 export type MagicLinkFormValues = Yup.InferType<typeof validationSchema>;

 export default function MagicLinkSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { enabled } = data?.config?.auth?.method?.emailPasswordless || {};
@@ -41,6 +50,12 @@ export default function MagicLinkSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({ enabled });
+    }
+  }, [loading, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -75,6 +90,18 @@ export default function MagicLinkSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Magic Link settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/PostmarkSettings/PostmarkSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/PostmarkSettings/PostmarkSettings.tsx
@@ -0,0 +1,149 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
+import { useUI } from '@/components/common/UIProvider';
+import { Form } from '@/components/form/Form';
+import { SettingsContainer } from '@/components/layout/SettingsContainer';
+import { Input } from '@/components/ui/v2/Input';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
+import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
+import {
+  GetSmtpSettingsDocument,
+  useGetSmtpSettingsQuery,
+  useUpdateConfigMutation,
+} from '@/utils/__generated__/graphql';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { FormProvider, useForm } from 'react-hook-form';
+import * as yup from 'yup';
+
+const validationSchema = yup
+  .object({
+    sender: yup.string().label('SMTP Sender').email().required(),
+    password: yup.string().label('Password').required(),
+  })
+  .required();
+
+export type PostmarkFormValues = yup.InferType<typeof validationSchema>;
+
+export default function PostmarkSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
+  const { currentProject } = useCurrentWorkspaceAndProject();
+
+  const { data } = useGetSmtpSettingsQuery({
+    variables: { appId: currentProject?.id },
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const { sender, password } = data?.config?.provider?.smtp || {};
+
+  const [updateConfig] = useUpdateConfigMutation({
+    refetchQueries: [GetSmtpSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const form = useForm<PostmarkFormValues>({
+    reValidateMode: 'onSubmit',
+    resolver: yupResolver(validationSchema),
+    defaultValues: {
+      password: '',
+      sender: '',
+    },
+    values: {
+      password: password || '',
+      sender: sender || '',
+    },
+    mode: 'onSubmit',
+    criteriaMode: 'all',
+  });
+
+  const {
+    register,
+    formState: { errors, isDirty, isSubmitting },
+  } = form;
+
+  const handleEditPostmarkSettings = async (values: PostmarkFormValues) => {
+    const updateConfigPromise = updateConfig({
+      variables: {
+        appId: currentProject.id,
+        config: {
+          provider: {
+            smtp: { method: 'LOGIN', host: 'postmark', ...values },
+          },
+        },
+      },
+    });
+
+    await execPromiseWithErrorToast(
+      async () => {
+        await updateConfigPromise;
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
+      },
+      {
+        loadingMessage: 'Postmark settings are being updated...',
+        successMessage: 'Postmark settings have been updated successfully.',
+        errorMessage:
+          'An error occurred while trying to update your Postmark settings.',
+      },
+    );
+  };
+
+  return (
+    <FormProvider {...form}>
+      <Form onSubmit={handleEditPostmarkSettings}>
+        <SettingsContainer
+          title="Postmark Settings"
+          description="Configure postmark's native integration to send emails from your email domain."
+          submitButtonText="Save"
+          className="grid grid-cols-9 gap-4"
+          slotProps={{
+            submitButton: {
+              disabled: !isDirty || maintenanceActive,
+              loading: isSubmitting,
+            },
+          }}
+        >
+          <Input
+            {...register('sender')}
+            id="sender"
+            name="sender"
+            label="From Email"
+            placeholder="noreply@nhost.app"
+            className="lg:col-span-4"
+            hideEmptyHelperText
+            fullWidth
+            error={Boolean(errors.sender)}
+            helperText={errors.sender?.message}
+          />
+
+          <Input
+            {...register('password')}
+            id="password"
+            label="Password"
+            type="password"
+            placeholder="Enter password"
+            className="lg:col-span-5"
+            hideEmptyHelperText
+            fullWidth
+            error={Boolean(errors.password)}
+            helperText={errors.password?.message}
+          />
+        </SettingsContainer>
+      </Form>
+    </FormProvider>
+  );
+}
--- a/dashboard/src/features/authentication/settings/components/PostmarkSettings/index.ts
+++ b/dashboard/src/features/authentication/settings/components/PostmarkSettings/index.ts
@@ -0,0 +1,2 @@
+export * from './PostmarkSettings';
+export { default as PostmarkSettings } from './PostmarkSettings';
--- a/dashboard/src/features/authentication/settings/components/SMSSettings/SMSSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/SMSSettings/SMSSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -7,14 +9,17 @@ import { Option } from '@/components/ui/v2/Option';
 import { Select } from '@/components/ui/v2/Select';
 import { Text } from '@/components/ui/v2/Text';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Image from 'next/image';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -44,15 +49,19 @@ const validationSchema = Yup.object({
 export type SMSSettingsFormValues = Yup.InferType<typeof validationSchema>;

 export default function SMSSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, error, loading } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { accountSid, authToken, messagingServiceId } =
@@ -70,6 +79,17 @@ export default function SMSSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        accountSid: accountSid || '',
+        authToken: authToken || '',
+        messagingServiceId: messagingServiceId || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, accountSid, authToken, messagingServiceId, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -114,6 +134,18 @@ export default function SMSSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'SMS settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/SMTPSettings/SMTPSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/SMTPSettings/SMTPSettings.tsx
@@ -0,0 +1,238 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
+import { useUI } from '@/components/common/UIProvider';
+import { ControlledCheckbox } from '@/components/form/ControlledCheckbox';
+import { Form } from '@/components/form/Form';
+import { SettingsContainer } from '@/components/layout/SettingsContainer';
+import { Input } from '@/components/ui/v2/Input';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
+import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
+import {
+  GetSmtpSettingsDocument,
+  useGetSmtpSettingsQuery,
+  useUpdateConfigMutation,
+} from '@/utils/__generated__/graphql';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { FormProvider, useForm } from 'react-hook-form';
+import { type Optional } from 'utility-types';
+import * as yup from 'yup';
+
+const smtpValidationSchema = yup
+  .object({
+    secure: yup.bool().label('SMTP Secure'),
+    host: yup
+      .string()
+      .label('SMTP Host')
+      .matches(
+        /((https?):\/\/)?(www\.)?[a-z0-9]+(\.[a-z]{2,}){1,3}(#[a-zA-Z0-9#]+?)*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/,
+        'SMTP Host must be a valid URL',
+      )
+      .required(),
+    port: yup
+      .number()
+      .typeError('The SMTP port should contain only numbers.')
+      .required(),
+    user: yup.string().label('Username').required(),
+    password: yup.string().label('Password'),
+    method: yup.string().required(),
+    sender: yup.string().label('SMTP Sender').email().required(),
+  })
+  .required();
+
+export type SmtpFormValues = yup.InferType<typeof smtpValidationSchema>;
+
+export default function SMTPSettings() {
+  const { maintenanceActive } = useUI();
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const localMimirClient = useLocalMimirClient();
+  const { currentProject } = useCurrentWorkspaceAndProject();
+
+  const { data } = useGetSmtpSettingsQuery({
+    variables: { appId: currentProject?.id },
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const { secure, host, port, user, method, sender, password } =
+    data?.config?.provider?.smtp || {};
+
+  const form = useForm<Optional<SmtpFormValues, 'password'>>({
+    reValidateMode: 'onSubmit',
+    resolver: yupResolver(smtpValidationSchema),
+    defaultValues: {
+      secure: false,
+      host: '',
+      port: undefined,
+      user: '',
+      password: '',
+      method: '',
+      sender: '',
+    },
+    values: {
+      secure: secure || false,
+      host: host || '',
+      port,
+      user: user || '',
+      password: password || '',
+      method: method || '',
+      sender: sender || '',
+    },
+    mode: 'onSubmit',
+    criteriaMode: 'all',
+  });
+
+  const {
+    register: registerSmtp,
+    formState: { errors, isDirty, isSubmitting },
+  } = form;
+
+  const [updateConfig] = useUpdateConfigMutation({
+    refetchQueries: [GetSmtpSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
+  });
+
+  const handleEditSMTPSettings = async (values: SmtpFormValues) => {
+    const { password: newPassword, ...valuesWithoutPassword } = values;
+
+    const updateConfigPromise = updateConfig({
+      variables: {
+        appId: currentProject.id,
+        config: {
+          provider: {
+            smtp: newPassword ? values : valuesWithoutPassword,
+          },
+        },
+      },
+    });
+
+    await execPromiseWithErrorToast(
+      async () => {
+        await updateConfigPromise;
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
+      },
+      {
+        loadingMessage: 'SMTP settings are being updated...',
+        successMessage: 'SMTP settings have been updated successfully.',
+        errorMessage:
+          'An error occurred while trying to update the SMTP settings.',
+      },
+    );
+  };
+
+  return (
+    <FormProvider {...form}>
+      <Form onSubmit={handleEditSMTPSettings}>
+        <SettingsContainer
+          title="SMTP Settings"
+          description="Configure your SMTP settings to send emails from your email domain."
+          submitButtonText="Save"
+          className="grid grid-cols-9 gap-4"
+          slotProps={{
+            submitButton: {
+              disabled: !isDirty || maintenanceActive,
+              loading: isSubmitting,
+            },
+          }}
+        >
+          <Input
+            {...registerSmtp('sender')}
+            id="sender"
+            name="sender"
+            label="From Email"
+            placeholder="noreply@nhost.app"
+            className="lg:col-span-4"
+            hideEmptyHelperText
+            fullWidth
+            error={Boolean(errors.sender)}
+            helperText={errors.sender?.message}
+          />
+
+          <Input
+            {...registerSmtp('host')}
+            id="host"
+            name="host"
+            label="SMTP Host"
+            className="lg:col-span-4"
+            placeholder="e.g. smtp.sendgrid.net"
+            hideEmptyHelperText
+            fullWidth
+            error={Boolean(errors.host)}
+            helperText={errors.host?.message}
+          />
+
+          <Input
+            {...registerSmtp('port')}
+            id="port"
+            name="port"
+            label="Port"
+            type="number"
+            placeholder="587"
+            className="lg:col-span-1"
+            hideEmptyHelperText
+            fullWidth
+            error={Boolean(errors.port)}
+            helperText={errors.port?.message}
+          />
+
+          <Input
+            {...registerSmtp('user')}
+            id="user"
+            label="SMTP Username"
+            placeholder="SMTP Username"
+            className="lg:col-span-4"
+            hideEmptyHelperText
+            fullWidth
+            error={Boolean(errors.user)}
+            helperText={errors.user?.message}
+          />
+
+          <Input
+            {...registerSmtp('password')}
+            id="password"
+            label="SMTP Password"
+            type="password"
+            placeholder="Enter SMTP password"
+            className="lg:col-span-5"
+            hideEmptyHelperText
+            fullWidth
+            error={Boolean(errors.password)}
+            helperText={errors.password?.message}
+          />
+
+          <Input
+            {...registerSmtp('method')}
+            id="method"
+            name="method"
+            label="SMTP Auth Method"
+            placeholder="LOGIN"
+            hideEmptyHelperText
+            className="lg:col-span-4"
+            fullWidth
+            error={Boolean(errors.method)}
+            helperText={errors.method?.message}
+          />
+
+          <ControlledCheckbox
+            name="secure"
+            id="secure"
+            label="Use SSL"
+            className="lg:col-span-9"
+          />
+        </SettingsContainer>
+      </Form>
+    </FormProvider>
+  );
+}
--- a/dashboard/src/features/authentication/settings/components/SMTPSettings/index.ts
+++ b/dashboard/src/features/authentication/settings/components/SMTPSettings/index.ts
@@ -0,0 +1,2 @@
+export * from './SMTPSettings';
+export { default as SMTPSettings } from './SMTPSettings';
--- a/dashboard/src/features/authentication/settings/components/SessionSettings/SessionSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/SessionSettings/SessionSettings.tsx
@@ -1,16 +1,21 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { Input } from '@/components/ui/v2/Input';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -28,15 +33,19 @@ const validationSchema = Yup.object({
 export type SessionFormValues = Yup.InferType<typeof validationSchema>;

 export default function SessionSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetAuthenticationSettingsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetAuthenticationSettingsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { accessToken, refreshToken } = data?.config?.auth?.session || {};
@@ -50,6 +59,15 @@ export default function SessionSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading && accessToken && refreshToken) {
+      form.reset({
+        accessTokenExpiresIn: accessToken?.expiresIn || 900,
+        refreshTokenExpiresIn: refreshToken?.expiresIn || 43200,
+      });
+    }
+  }, [loading, accessToken, refreshToken, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -86,6 +104,18 @@ export default function SessionSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Session settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/SpotifyProviderSettings/SpotifyProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/SpotifyProviderSettings/SpotifyProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,28 +14,35 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function SpotifyProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -49,6 +58,16 @@ export default function SpotifyProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -89,6 +108,18 @@ export default function SpotifyProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Spotify settings are being updated...',
@@ -153,7 +184,7 @@ export default function SpotifyProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/TwitchProviderSettings/TwitchProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/TwitchProviderSettings/TwitchProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,30 +14,37 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useTheme } from '@mui/material';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function TwitchProviderSettings() {
  const theme = useTheme();
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const localMimirClient = useLocalMimirClient();
  const { maintenanceActive } = useUI();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -51,6 +60,16 @@ export default function TwitchProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -91,6 +110,18 @@ export default function TwitchProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Twitch settings are being updated...',
@@ -159,7 +190,7 @@ export default function TwitchProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/TwitterProviderSettings/TwitterProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/TwitterProviderSettings/TwitterProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -7,15 +9,18 @@ import { CopyIcon } from '@/components/ui/v2/icons/CopyIcon';
 import { Input } from '@/components/ui/v2/Input';
 import { InputAdornment } from '@/components/ui/v2/InputAdornment';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -39,15 +44,19 @@ const validationSchema = Yup.object({
 export type TwitterProviderFormValues = Yup.InferType<typeof validationSchema>;

 export default function TwitterProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { consumerKey, consumerSecret, enabled } =
@@ -63,6 +72,16 @@ export default function TwitterProviderSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        consumerSecret: consumerSecret || '',
+        consumerKey: consumerKey || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, consumerKey, consumerSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -100,6 +119,18 @@ export default function TwitterProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Twitter settings are being updated...',
@@ -185,7 +216,7 @@ export default function TwitterProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/WebAuthnSettings/WebAuthnSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/WebAuthnSettings/WebAuthnSettings.tsx
@@ -1,15 +1,20 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
 import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -20,15 +25,19 @@ const validationSchema = Yup.object({
 export type WebAuthnFormValues = Yup.InferType<typeof validationSchema>;

 export default function WebAuthnSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
+  const localMimirClient = useLocalMimirClient();
  const { maintenanceActive } = useUI();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { enabled } = data?.config?.auth?.method?.webauthn || {};
@@ -41,6 +50,12 @@ export default function WebAuthnSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({ enabled });
+    }
+  }, [loading, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -80,6 +95,18 @@ export default function WebAuthnSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(values);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'WebAuthn settings are being updated...',
--- a/dashboard/src/features/authentication/settings/components/WindowsLiveProviderSettings/WindowsLiveProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/WindowsLiveProviderSettings/WindowsLiveProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -12,28 +14,35 @@ import {
  baseProviderValidationSchema,
 } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';

 export default function WindowsLiveProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, enabled } =
@@ -49,6 +58,16 @@ export default function WindowsLiveProviderSettings() {
    resolver: yupResolver(baseProviderValidationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [loading, clientId, clientSecret, enabled, form]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -89,6 +108,18 @@ export default function WindowsLiveProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'Windows Live settings are being updated...',
@@ -151,7 +182,7 @@ export default function WindowsLiveProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/settings/components/WorkOsProviderSettings/WorkOsProviderSettings.tsx
+++ b/dashboard/src/features/authentication/settings/components/WorkOsProviderSettings/WorkOsProviderSettings.tsx
@@ -1,3 +1,5 @@
+import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
+import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/components/common/UIProvider';
 import { Form } from '@/components/form/Form';
 import { SettingsContainer } from '@/components/layout/SettingsContainer';
@@ -8,15 +10,18 @@ import { Input } from '@/components/ui/v2/Input';
 import { InputAdornment } from '@/components/ui/v2/InputAdornment';
 import { BaseProviderSettings } from '@/features/authentication/settings/components/BaseProviderSettings';
 import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
 import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
+import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
 import { copy } from '@/utils/copy';
 import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
@@ -52,15 +57,19 @@ const validationSchema = Yup.object({
 export type WorkOsProviderFormValues = Yup.InferType<typeof validationSchema>;

 export default function WorkOsProviderSettings() {
+  const { openDialog } = useDialog();
+  const isPlatform = useIsPlatform();
  const { maintenanceActive } = useUI();
+  const localMimirClient = useLocalMimirClient();
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [updateConfig] = useUpdateConfigMutation({
    refetchQueries: [GetSignInMethodsDocument],
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { data, loading, error } = useGetSignInMethodsQuery({
    variables: { appId: currentProject?.id },
-    fetchPolicy: 'cache-only',
+    ...(!isPlatform ? { client: localMimirClient } : {}),
  });

  const { clientId, clientSecret, organization, connection, enabled } =
@@ -78,6 +87,26 @@ export default function WorkOsProviderSettings() {
    resolver: yupResolver(validationSchema),
  });

+  useEffect(() => {
+    if (!loading) {
+      form.reset({
+        clientId: clientId || '',
+        clientSecret: clientSecret || '',
+        organization: organization || '',
+        connection: connection || '',
+        enabled: enabled || false,
+      });
+    }
+  }, [
+    loading,
+    clientId,
+    clientSecret,
+    organization,
+    connection,
+    enabled,
+    form,
+  ]);
+
  if (loading) {
    return (
      <ActivityIndicator
@@ -115,6 +144,18 @@ export default function WorkOsProviderSettings() {
      async () => {
        await updateConfigPromise;
        form.reset(formValues);
+
+        if (!isPlatform) {
+          openDialog({
+            title: 'Apply your changes',
+            component: <ApplyLocalSettingsDialog />,
+            props: {
+              PaperProps: {
+                className: 'max-w-2xl',
+              },
+            },
+          });
+        }
      },
      {
        loadingMessage: 'WorkOS settings are being updated...',
@@ -203,7 +244,7 @@ export default function WorkOsProviderSettings() {
                    );
                  }}
                >
-                  <CopyIcon className="h-4 w-4" />
+                  <CopyIcon className="w-4 h-4" />
                </IconButton>
              </InputAdornment>
            }
--- a/dashboard/src/features/authentication/users/components/EditUserForm/EditUserForm.tsx
+++ b/dashboard/src/features/authentication/users/components/EditUserForm/EditUserForm.tsx
@@ -31,9 +31,10 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useTheme } from '@mui/material';
 import { format } from 'date-fns';
 import kebabCase from 'just-kebab-case';
+import debounce from 'lodash.debounce';
 import Image from 'next/image';
 import type { RemoteAppUser } from 'pages/[workspaceSlug]/[appSlug]/users';
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import * as Yup from 'yup';

@@ -76,6 +77,21 @@ export const EditUserFormValidationSchema = Yup.object({
  locale: Yup.string(),
  defaultRole: Yup.string(),
  roles: Yup.array().of(Yup.boolean()),
+  metadata: Yup.string().test(
+    'is-valid-json',
+    'Metadata must be valid JSON or empty',
+    (value) => {
+      if (value === '') {
+        return true;
+      } // Allow empty string as valid input
+      try {
+        JSON.parse(value);
+        return true;
+      } catch (error) {
+        return false;
+      }
+    },
+  ),
 });

 export type EditUserFormValues = Yup.InferType<
@@ -116,14 +132,55 @@ export default function EditUserForm({
      locale: user.locale,
      defaultRole: user.defaultRole,
      roles: roles.map((role) => Object.values(role)[0]),
+      metadata: user?.metadata ? JSON.stringify(user.metadata, null, 2) : '',
    },
  });

  const {
    register,
+    setError,
+    clearErrors,
    formState: { errors, dirtyFields, isSubmitting, isValidating },
  } = form;

+  const handleMetadataError = useMemo(() => {
+    const debouncedSetError = debounce((value) => {
+      try {
+        JSON.parse(value);
+        // Only set an error if JSON parsing fails
+      } catch (error) {
+        setError('metadata', {
+          type: 'manual',
+          message: 'Invalid JSON format',
+        });
+      }
+    }, 500);
+
+    return {
+      call: debouncedSetError,
+      cancel: debouncedSetError.cancel, // lodash debounce provides a cancel method to stop the delayed function
+    };
+  }, [setError]);
+
+  const handleMetadataChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      const { value } = event.target;
+      if (value === '') {
+        clearErrors('metadata'); // Clear errors when the input is explicitly cleared
+        handleMetadataError.cancel(); // Cancel any debounced error checks
+      } else {
+        try {
+          JSON.parse(value);
+          clearErrors('metadata'); // Clear errors when valid JSON is entered
+          handleMetadataError.cancel(); // Cancel pending debounced error checks
+        } catch (error) {
+          handleMetadataError.call(value); // Call the debounced error setter
+        }
+      }
+    },
+    [clearErrors, handleMetadataError],
+  );
+
  const isDirty = Object.keys(dirtyFields).length > 0;

  useEffect(() => {
@@ -467,6 +524,28 @@ export default function EditUserForm({
              </div>
            </Box>
          )}
+          <Box component="section" className="grid grid-flow-row gap-8 p-6">
+            <Input
+              {...register('metadata', { onChange: handleMetadataChange })}
+              id="metadata"
+              label="Metadata"
+              variant="inline"
+              hideEmptyHelperText
+              error={!!errors.metadata}
+              fullWidth
+              multiline
+              inputProps={{
+                className: 'resize-y min-h-[130px]',
+              }}
+              helperText={
+                errors.metadata
+                  ? errors.metadata.message
+                  : 'Enter valid JSON. This can be a number, boolean, array, or object.'
+              }
+              maxRows={100}
+              autoComplete="off"
+            />
+          </Box>
        </Box>

        <Box className="grid w-full flex-shrink-0 snap-end grid-flow-col justify-between gap-3 place-self-end border-t-1 p-2">
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Потвърждение за смяна на имейл`
				`@@ -0,0 +1 @@`
				`${link}, ${displayName}, ${email}, ${ticket}, ${redirectTo}, ${serverUrl}, ${clientUrl}, ${locale}`
				`@@ -0,0 +1 @@`
				`export { default as ApplyLocalSettingsDialog } from './ApplyLocalSettingsDialog';`
				`@@ -0,0 +1 @@`
				`export { default as SocialProvidersSettings } from './SocialProvidersSettings';`
				`@@ -0,0 +1 @@`
				`export { default as DeleteSTMPSettings } from './DeleteSMTPSettings';`