fix: remove residual merge conflict marker in package.json

fix(contact): import env instead of undefined config
# Conflicts: # package.json
2026-04-11 19:05:05 +02:00 · 2026-04-11 18:08:35 +02:00 · 2026-04-11 18:06:52 +02:00 · 2026-04-11 18:06:49 +02:00
3 changed files with 4 additions and 3 deletions
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -249,8 +249,8 @@ jobs:
      MAIL_PORT:        ${{ secrets.SMTP_PORT || vars.SMTP_PORT || '587' }}
      MAIL_USERNAME:    ${{ secrets.SMTP_USER || vars.SMTP_USER }}
      MAIL_PASSWORD:    ${{ secrets.SMTP_PASS || vars.SMTP_PASS }}
-      MAIL_FROM:        ${{ secrets.SMTP_FROM || vars.SMTP_FROM }}
+      MAIL_FROM:        ${{ secrets.SMTP_FROM || vars.SMTP_FROM || 'noreply@klz-cables.com' }}
-      MAIL_RECIPIENTS:  ${{ secrets.CONTACT_RECIPIENT || vars.CONTACT_RECIPIENT }}
+      MAIL_RECIPIENTS:  ${{ secrets.CONTACT_RECIPIENT || vars.CONTACT_RECIPIENT || 'info@klz-cables.com' }}
      # Monitoring
      SENTRY_DSN:       ${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }}
--- a/app/actions/contact.ts
+++ b/app/actions/contact.ts
@@ -55,6 +55,7 @@ export async function sendContactFormAction(formData: FormData) {
        type: productName ? 'product_quote' : 'contact',
        productName: productName || undefined,
      },
      overrideAccess: true,
    });
    logger.info('Successfully saved form submission to Payload CMS', {
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
    "@payloadcms/next": "^3.77.0",
    "@payloadcms/richtext-lexical": "^3.77.0",
    "@payloadcms/ui": "^3.77.0",
-    "@react-email/components": "^1.0.7",
+    "@react-email/components": "1.0.8",
    "@react-pdf/renderer": "^4.3.2",
    "@sentry/nextjs": "^10.39.0",
    "@types/recharts": "^2.0.1",
Author	SHA1	Message	Date
Marc Mintel	db754a6325	fix: remove residual merge conflict marker in package.json All checks were successful Build & Deploy / 🔍 Prepare (push) Successful in 9s Details Build & Deploy / 🧪 QA (push) Successful in 1m15s Details Build & Deploy / 🏗️ Build (push) Successful in 3m33s Details Build & Deploy / 🚀 Deploy (push) Successful in 15s Details Build & Deploy / 🧪 Post-Deploy Verification (push) Successful in 4m29s Details Build & Deploy / 🔔 Notify (push) Successful in 2s Details	2026-04-11 19:05:05 +02:00
Marc Mintel	9dc553b76c	fix(contact): import env instead of undefined config # Conflicts: # package.json	2026-04-11 18:08:35 +02:00
Marc Mintel	48101cc421	chore: Pin `@react-email/components` to 1.0.8 to fix broken upstream 1.0.9 release	2026-04-11 18:06:52 +02:00
Marc Mintel	615f762d5e	fix(mail): add overrideAccess to form submissions and mail fallbacks for branch deploys	2026-04-11 18:06:49 +02:00