From 3b4582b71fec34a59130f5e17ad4d5a4910bebdf Mon Sep 17 00:00:00 2001
From: Pavan Kumar Reddy B <57708013+pavankumar464@users.noreply.github.com>
Date: Thu, 26 Mar 2026 19:59:28 +0530
Subject: [PATCH 1/2] RDKB-63168: WAN Default Gateway Address (IPv4) is blank
 (#111)

Reason for change: WAN Default Gateway Address (IPv4) in Network section is blank - GPON mode

Test Procedure: Test for WAN Default Gateway Address (IPv4) in Network section - GPON mode

Risks:low
Priority: P1
Signed-off-by: pavankumarreddy_balireddy@comcast.com

Signed-off-by: pavankumarreddy_balireddy@comcast.com
Co-authored-by: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com>
---
 source/Styles/xb3/jst/includes/utility.jst | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/Styles/xb3/jst/includes/utility.jst b/source/Styles/xb3/jst/includes/utility.jst
index e1a7a0a..5ccbefe 100644
--- a/source/Styles/xb3/jst/includes/utility.jst
+++ b/source/Styles/xb3/jst/includes/utility.jst
@@ -1262,18 +1262,24 @@ function current_operationalMode()
 */
 function get_dhcp_client_interfaces()
 {
+	$dhcpmgr_enabled = file_exists("/tmp/dhcpmgr_initialized");
 	var $dhcp_client_interfaces = { v4: "", v6: "" };
-	$ids = explode(",", getInstanceIds("Device.X_RDK_WanManager.Interface."));
-	wanInterfaceLoop: for($key in $ids) { $j = $ids[$key];
-		$status = getStr("Device.X_RDK_WanManager.Interface."+$j+".Status");
-		if($status == "true" || $status == "Up" || $status == "Active"){
-			$dhcp_client_interfaces.v4 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv4Interface");
-			$dhcp_client_interfaces.v6 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv6Interface");
-			break wanInterfaceLoop;
+	if($dhcpmgr_enabled) {
+		$ids = explode(",", getInstanceIds("Device.X_RDK_WanManager.Interface."));
+		wanInterfaceLoop: for($key in $ids) { $j = $ids[$key];
+			$status = getStr("Device.X_RDK_WanManager.Interface."+$j+".Status");
+			if($status == "true" || $status == "Up" || $status == "Active"){
+				$dhcp_client_interfaces.v4 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv4Interface");
+				$dhcp_client_interfaces.v6 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv6Interface");
+				break wanInterfaceLoop;
+			}
 		}
+		if($dhcp_client_interfaces.v4 == "") $dhcp_client_interfaces.v4 = "Device.DHCPv4.Client.1";
+		if($dhcp_client_interfaces.v6 == "") $dhcp_client_interfaces.v6 = "Device.DHCPv6.Client.1";
+	} else {
+		$dhcp_client_interfaces.v4 = "Device.DHCPv4.Client.1";
+		$dhcp_client_interfaces.v6 = "Device.DHCPv6.Client.1";
 	}
-	if($dhcp_client_interfaces.v4 == "") $dhcp_client_interfaces.v4 = "Device.DHCPv4.Client.1";
-	if($dhcp_client_interfaces.v6 == "") $dhcp_client_interfaces.v6 = "Device.DHCPv6.Client.1";
 	return $dhcp_client_interfaces;
 }
 

From 567126e53c972be2b3258d93cc00dfc01d19ba1b Mon Sep 17 00:00:00 2001
From: Nithishkumar-T <109725053+Nithishkumar-T@users.noreply.github.com>
Date: Wed, 1 Apr 2026 14:50:27 +0530
Subject: [PATCH 2/2] Add changelog for release 2.3.0

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54cb39e..83bf644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [2.3.0](https://github.com/rdkcentral/webui/compare/2.2.2...2.3.0)
+
+- RDKB-63168: WAN Default Gateway Address (IPv4) is blank [`#111`](https://github.com/rdkcentral/webui/pull/111)
+- Merge tag '2.2.2' into develop [`ee36fc7`](https://github.com/rdkcentral/webui/commit/ee36fc74ccb450aeb1cf42fd0daa21734a0a25b4)
+
 #### [2.2.2](https://github.com/rdkcentral/webui/compare/2.2.1...2.2.2)
 
+> 23 March 2026
+
 - RDKB-63902 : Unable to access MSO login page [`#108`](https://github.com/rdkcentral/webui/pull/108)
+- Add changelog for release 2.2.2 [`e64ab63`](https://github.com/rdkcentral/webui/commit/e64ab63e882f7bbe24194f4c08f87192824e3e72)
 - Merge tag '2.2.1' into develop [`0f3a41f`](https://github.com/rdkcentral/webui/commit/0f3a41f3c74d10ec78eae9b83ef1326f3ed5cf0a)
 
 #### [2.2.1](https://github.com/rdkcentral/webui/compare/2.2.0...2.2.1)