From c4419ed31f5cb681af753ea36854ce47f8f107f6 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Wed, 10 Sep 2025 09:57:39 -0600
Subject: [PATCH] show correct gateway name when adding public domain

---
 .../portal/components/interfaces/public-domains/pd.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/public-domains/pd.service.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/public-domains/pd.service.ts
index a0099c0b8..27ecf679e 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/public-domains/pd.service.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/public-domains/pd.service.ts
@@ -237,14 +237,14 @@ export class PublicDomainService {
         values: data.gateways.reduce<Record<string, string>>(
           (obj, gateway) => ({
             ...obj,
-            [gateway.id]: gateway.ipInfo!.name,
+            [gateway.id]: gateway.name || gateway.ipInfo!.name,
           }),
           {},
         ),
         default: '',
         disabled: data.gateways
           .filter(
-            g => !g.ipInfo?.wanIp || utils.CGNAT.contains(g.ipInfo?.wanIp),
+            g => !g.ipInfo!.wanIp || utils.CGNAT.contains(g.ipInfo!.wanIp),
           )
           .map(g => g.id),
       })),