From a88edb650dbf1f844a078858d13d8ac6828cd0cb Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 3 Jul 2025 16:42:26 +0200
Subject: [PATCH 1/3] chore(versions): bump coolify and nightly versions to
 4.0.0-beta.420.3 and 4.0.0-beta.420.4 respectively

---
 config/constants.php | 2 +-
 versions.json        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/constants.php b/config/constants.php
index 946c41f60..67e24d80d 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.420.2',
+        'version' => '4.0.0-beta.420.3',
         'helper_version' => '1.0.8',
         'realtime_version' => '1.0.9',
         'self_hosted' => env('SELF_HOSTED', true),
diff --git a/versions.json b/versions.json
index 8d362115e..d4959cdfd 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.420.2"
+            "version": "4.0.0-beta.420.3"
         },
         "nightly": {
-            "version": "4.0.0-beta.420.3"
+            "version": "4.0.0-beta.420.4"
         },
         "helper": {
             "version": "1.0.8"

From 2b8488a84d778769502bac34c71dc74e89abdcaa Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 3 Jul 2025 21:29:45 +0200
Subject: [PATCH 2/3] refactor(popup): improve styling and structure of the
 small popup component

---
 resources/views/components/popup-small.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/popup-small.blade.php b/resources/views/components/popup-small.blade.php
index eb55468f7..29a5f4d7e 100644
--- a/resources/views/components/popup-small.blade.php
+++ b/resources/views/components/popup-small.blade.php
@@ -6,9 +6,9 @@
     x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0"
     x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0"
     x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
-    class="fixed bottom-0 right-0  h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-999" x-cloak>
+    class="fixed bottom-0 right-0 h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-999" x-cloak>
     <div
-        class="flex flex-row items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 dark:hover:bg-coolgray-100 lg:p-8 sm:rounded-sm">
+        class="flex flex-row items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 border-neutral-200 dark:hover:bg-coolgray-100 lg:p-8 sm:rounded-sm">
         <div
             class="flex flex-col items-start h-full pb-0 text-xs lg:items-center lg:flex-row lg:pr-6 lg:space-x-5 dark:text-neutral-300 ">
             @if (isset($icon))

From 2f68f965a7ed0b4bac32055c37b894bccac19da0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 3 Jul 2025 21:29:57 +0200
Subject: [PATCH 3/3] refactor(shared): enhance FQDN generation logic for
 services in newParser function

---
 bootstrap/helpers/shared.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index ab8d6d7bb..9e1aa0a43 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -3066,13 +3066,14 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                         $fqdn = generateFqdn($server, "$uuid");
                     }
                 } elseif ($isService) {
-                    $fqdn = $savedService->fqdn;
                     if (blank($savedService->fqdn)) {
                         if ($fqdnFor) {
                             $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
                         } else {
                             $fqdn = generateFqdn($server, "{$savedService->name}-$uuid");
                         }
+                    } else {
+                        $fqdn = str($savedService->fqdn)->after('://')->before(':')->prepend(str($savedService->fqdn)->before('://')->append('://'))->value();
                     }
                 }