From 92b84d524c693de7cb03e6fca78eb44077ad2e46 Mon Sep 17 00:00:00 2001
From: Mustafa Bharmal <mjbharmal2002@gmail.com>
Date: Wed, 4 Mar 2026 01:32:09 +0530
Subject: [PATCH] Fix: show correct 'Sort by date' in settings panel on Created
 Templates tab

---
 .../src/components/page-templates/index.js         | 14 ++++----------
 routes/template-list/stage-activation.tsx          |  9 +++++++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index 439d6c78d15c78..4bfdf355459492 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -18,6 +18,7 @@ import { useEvent } from '@wordpress/compose';
 import { useView } from '@wordpress/views';
 import { Modal } from '@wordpress/components';
 import { store as noticesStore } from '@wordpress/notices';
+import { dateField } from '@wordpress/fields';
 
 /**
  * Internal dependencies
@@ -43,8 +44,7 @@ import {
 	getActiveViewOverridesForTab,
 } from './view-utils';
 
-const { usePostActions, usePostFields, templateTitleField } =
-	unlock( editorPrivateApis );
+const { usePostActions, templateTitleField } = unlock( editorPrivateApis );
 const { useHistory, useLocation } = unlock( routerPrivateApis );
 const { useEntityRecordsWithPermissions } = unlock( corePrivateApis );
 
@@ -218,10 +218,6 @@ export default function PageTemplates() {
 		[ history, path, view?.type ]
 	);
 
-	const postTypeFields = usePostFields( {
-		postType: TEMPLATE_POST_TYPE,
-	} );
-	const dateField = postTypeFields.find( ( field ) => field.id === 'date' );
 	const themeField = useThemeField();
 	const fields = useMemo( () => {
 		const _fields = [
@@ -233,9 +229,7 @@ export default function PageTemplates() {
 		];
 		if ( activeView === 'user' ) {
 			_fields.push( themeField );
-			if ( dateField ) {
-				_fields.push( dateField );
-			}
+			_fields.push( dateField );
 		}
 		const elements = [];
 		for ( const author in users ) {
@@ -249,7 +243,7 @@ export default function PageTemplates() {
 			elements,
 		} );
 		return _fields;
-	}, [ users, activeView, themeField, dateField ] );
+	}, [ users, activeView, themeField ] );
 
 	const { data, paginationInfo } = useMemo( () => {
 		return filterSortAndPaginate( records, view, fields );
diff --git a/routes/template-list/stage-activation.tsx b/routes/template-list/stage-activation.tsx
index 7785131d5ff252..a02b204ea7f77d 100644
--- a/routes/template-list/stage-activation.tsx
+++ b/routes/template-list/stage-activation.tsx
@@ -21,6 +21,7 @@ import { useMemo, useCallback, useState } from '@wordpress/element';
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { __ } from '@wordpress/i18n';
 import { published, commentAuthorAvatar } from '@wordpress/icons';
+import { dateField } from '@wordpress/fields';
 
 /**
  * Internal dependencies
@@ -143,7 +144,7 @@ function TemplateListActivation() {
 				label: users[ author ]?.name ?? author,
 			} );
 		}
-		return [
+		const _fields = [
 			previewField,
 			templateTitleField,
 			descriptionField,
@@ -154,7 +155,11 @@ function TemplateListActivation() {
 				elements,
 			},
 		];
-	}, [ users ] );
+		if ( activeView === 'user' ) {
+			_fields.push( dateField );
+		}
+		return _fields;
+	}, [ users, activeView ] );
 
 	// Apply filtering, sorting, and pagination on the client side
 	const { data: posts, paginationInfo } = useMemo( () => {