From abb0bb9cb5477537eae274796129c24b1c569930 Mon Sep 17 00:00:00 2001
From: Ananth916 <74174916+Ananth916@users.noreply.github.com>
Date: Tue, 27 Jan 2026 12:12:36 +0530
Subject: [PATCH 1/3] XER10-2533 : Observed duplicates of login message in
 admin page (#96)

Reason for change: Removed the duplicate variable
Test Procedure: Verify the webui login
Risks: Medium

Signed-off-by: AnanthaC <anantha_chelladurai@comcast.com>
Co-authored-by: AnanthaC <anantha_chelladurai@comcast.com>
---
 source/Styles/xb3/jst/index.jst | 2 +-
 source/Styles/xb6/jst/index.jst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/Styles/xb3/jst/index.jst b/source/Styles/xb3/jst/index.jst
index f0bea6c..56c967c 100644
--- a/source/Styles/xb3/jst/index.jst
+++ b/source/Styles/xb3/jst/index.jst
@@ -390,7 +390,7 @@ if($webuiIsEnabled == "false"){
                 <input type="submit" class="btn" value="Login" />
         </div>
         <?% if((!$isMSO) && (strpos($partnerId, "sky-") === false)){ ?>
-                <p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
+                <p id="index_helptext_tip">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
         <?% } ?>
 <input type="hidden" name="locale" id="locale" value="<?% echo($locale); ?>">
 </form>
diff --git a/source/Styles/xb6/jst/index.jst b/source/Styles/xb6/jst/index.jst
index a356139..6da2a16 100644
--- a/source/Styles/xb6/jst/index.jst
+++ b/source/Styles/xb6/jst/index.jst
@@ -347,7 +347,7 @@ if($webuiIsEnabled == "false"){
 		<input type="submit" class="btn" value="Login" />
 	</div>
         <?% if((!$isMSO) && (strpos($partnerId, "sky-") === false)){ ?>
-                <p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
+                <p id="index_helptext_tip">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
         <?% } ?>
 <input type="hidden" name="locale" id="locale" value="<?% echo($locale); ?>">
 </form>

From bd8a184417592a7e8a9bf5f63772a2a9728f1e09 Mon Sep 17 00:00:00 2001
From: Pavan Kumar Reddy B <57708013+pavankumar464@users.noreply.github.com>
Date: Thu, 29 Jan 2026 07:32:26 +0530
Subject: [PATCH 2/3] RDKB-62953: Primary channel ID is incorrect in GUI for
 OFDM (#97)

Reason for change: Primary channel ID is incorrect in GUI when the
locked primary channel is OFDM

Test Procedure: Test for Primary channel ID

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

Signed-off-by: pavankumarreddy_balireddy@comcast.com
---
 source/Styles/xb6/jst/network_setup.jst | 92 ++++++++++++++-----------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/source/Styles/xb6/jst/network_setup.jst b/source/Styles/xb6/jst/network_setup.jst
index 6663ea2..364a226 100644
--- a/source/Styles/xb6/jst/network_setup.jst
+++ b/source/Styles/xb6/jst/network_setup.jst
@@ -894,30 +894,30 @@ $ds_ofdm_tab = []/*p2j-array*/;
 for ($i=1, $j=1; $i<count($ds_ofdm_ids); $i++)
 {
 	$ds_ofdm_tab[$i]={};
-        $ds_ofdm_tab[$i]['ChannelID']                    = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['ChanIndicator']                = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['SubcarrierZeroFreq']           = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['FirstActiveSubcarrierNum']     = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['LastActiveSubcarrierNum']      = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['NumActiveSubcarriers']         = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['SubcarrierSpacing']            = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['CyclicPrefix']                 = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['RollOffPeriod']                = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['PlcFreq']                      = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['NumPilots']                    = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['TimeInterleaverDepth']         = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['SNRLevel']                     = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['PowerLevel']                   = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['PlcTotalCodewords']            = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['PlcUnreliableCodewords']       = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['NcpTotalFields']               = $ds_ofdm_val[$j++][1];
-        $ds_ofdm_tab[$i]['NcpFieldCrcFailures']          = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['ChannelID']                    = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['ChanIndicator']                = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['SubcarrierZeroFreq']           = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['FirstActiveSubcarrierNum']     = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['LastActiveSubcarrierNum']      = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['NumActiveSubcarriers']         = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['SubcarrierSpacing']            = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['CyclicPrefix']                 = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['RollOffPeriod']                = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['PlcFreq']                      = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['NumPilots']                    = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['TimeInterleaverDepth']         = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['SNRLevel']                     = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['PowerLevel']                   = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['PlcTotalCodewords']            = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['PlcUnreliableCodewords']       = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['NcpTotalFields']               = $ds_ofdm_val[$j++][1];
+	$ds_ofdm_tab[$i]['NcpFieldCrcFailures']          = $ds_ofdm_val[$j++][1];
 
-        if($ds_ofdm_tab[$i]['SubcarrierZeroFreq']) {
-            $ds_ofdm_tab[$i]['LockStatus'] = 'Locked';
-        } else {
-            $ds_ofdm_tab[$i]['LockStatus'] = 'Not Locked';
-        }
+	if($ds_ofdm_tab[$i]['SubcarrierZeroFreq']) {
+		$ds_ofdm_tab[$i]['LockStatus'] = 'Locked';
+	} else {
+		$ds_ofdm_tab[$i]['LockStatus'] = 'Not Locked';
+	}
 }
 
 $channel_id=[];
@@ -926,22 +926,36 @@ for ($i=1; $i< $ds_ofdm_tab.length; $i++){
 }
 
 for($i=1;$i<$ds_tab.length;$i++){
-    if($ds_tab[$i]['Modulation']=='OFDM'){
-                $ds_tab.splice($i,1);
-        	$ds_ids.splice($i,1);
-   		$i--;
-            	
-    }else{
-    
-              for ($j=0; $j<$channel_id.length; $j++){
-                if($channel_id[$j]==$ds_tab[$i]['ChannelID']){
-	        $ds_tab.splice($i,1);
-        	$ds_ids.splice($i,1);
-		$i--;            	
-		break;
+	if($ds_tab[$i]['Modulation']=='OFDM'){
+		$ds_tab.splice($i,1);
+		$ds_ids.splice($i,1);
+		$i--;
+	}else{
+		for ($j=0; $j<$channel_id.length; $j++){
+			if($channel_id[$j]==$ds_tab[$i]['ChannelID']){
+				$ds_tab.splice($i,1);
+				$ds_ids.splice($i,1);
+				$i--;
+				break;
         	}
-    	    }
-    }
+		}
+	}
+}
+
+// Find the primary ChannelID from $ds_ofdm_tab
+for ($i=1; $i< $ds_ofdm_tab.length; $i++){
+	var $chanIndicator = $ds_ofdm_tab[$i]['ChanIndicator'].toLowerCase();
+	if ($chanIndicator == 'primary') {
+		// Move Primary $ds_ofdm_tab entry to the front of $ds_tab
+		const $tabItem = $ds_ofdm_tab.splice($i, 1)[0];
+		$ds_ofdm_ids.splice($i, 1);
+		$ds_tab.splice(1, 0, $tabItem);
+		$ds_ids.push($ds_ids.length);
+		//Add Frequency & Modulation
+		$ds_tab[1]['Frequency'] = $tabItem['PlcFreq'];
+		$ds_tab[1]['Modulation'] = ($tabItem['LockStatus']=='Locked')?'OFDM':'UNSUPPORTED';
+		break; // only one primary
+	}
 }
 
 ?>
@@ -951,7 +965,7 @@ for($i=1;$i<$ds_tab.length;$i++){
 	<thead>
 		<tr>
 			<td class="row-label acs-th"><div class="netWidth">Downstream</div></td>
-			<td class="row-label acs-th" colspan="<?% echo( count($ds_ids));?>">Channel Bonding Value</td>
+			<td class="row-label acs-th" colspan="<?% echo(count($ds_ids)+count($ds_ofdm_ids));?>">Channel Bonding Value</td>
 		</tr>
 	</thead>
 	<tbody>

From 7b6e5fcd285b28112deb3480f26209fbd2ae90bf Mon Sep 17 00:00:00 2001
From: Nithishkumar-T <109725053+Nithishkumar-T@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:28:28 +0530
Subject: [PATCH 3/3] Add changelog for release 2.1.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a80db06..13ee5af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,19 @@ 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.1.0](https://github.com/rdkcentral/webui/compare/2.0.1...2.1.0)
+
+- RDKB-62953: Primary channel ID is incorrect in GUI for OFDM [`#97`](https://github.com/rdkcentral/webui/pull/97)
+- XER10-2533 : Observed duplicates of login message in admin page [`#96`](https://github.com/rdkcentral/webui/pull/96)
+- Merge tag '2.0.1' into develop [`05ddeee`](https://github.com/rdkcentral/webui/commit/05ddeee491c1657175ebcba152bf4ab8734dd9ea)
+
 #### [2.0.1](https://github.com/rdkcentral/webui/compare/2.0.0...2.0.1)
 
+> 21 January 2026
+
 - RDKBACCL-1223,RDKBACCL-1224: "Local IP Network" and "Port forwarding add" from WebUI results in "500 Internal Server Error" [`#82`](https://github.com/rdkcentral/webui/pull/82)
 - RDKB-62741-Observed Guard Interval is not updating from 400ns when switch from a/n or a/n/c mode to be mode [`#90`](https://github.com/rdkcentral/webui/pull/90)
+- Add changelog for release 2.0.1 [`47b33e5`](https://github.com/rdkcentral/webui/commit/47b33e573f7e0d910585e7bfb200b3c61b18e850)
 - Merge tag '2.0.0' into develop [`d534467`](https://github.com/rdkcentral/webui/commit/d5344676790294bf2955e2ca2aaeb71f37db7b22)
 
 ### [2.0.0](https://github.com/rdkcentral/webui/compare/1.4.1...2.0.0)