Apply PR suggestions

Author: compulim

CHANGELOG.md

@@ -40,7 +40,7 @@ Breaking changes in this release:
 - 💥 Root-level (unconnected) `Claim` entity is being deprecated, in PR [#5564](https://github.com/microsoft/BotFramework-WebChat/pull/5564), by [@compulim](https://github.com/compulim). It will be removed on or after 2027-08-29
    - Use `entities[@id=""][@type="Message"].citation[@type="Claim"]` instead
 - 💥 `activityStatusMiddleware.nextVisibleActivity` and `activityStatusMiddleware.sameTimestampGroup` is removed after deprecation, in PR [#5565](https://github.com/microsoft/BotFramework-WebChat/issues/5565), by [@compulim](https://github.com/compulim)
-- 💥 `avatarMiddleware` is being deprecated in favor of [`polymiddleware`](./docs/MIDDLEWARE.md). It will be removed on or after 2028-03-18, related to PR [#5779](https://github.com/microsoft/BotFramework-WebChat/pull/5779)
+- 💥 `avatarMiddleware` is being deprecated in favor of [`polymiddleware`](./docs/MIDDLEWARE.md). It will be removed on or after 2028-03-16, related to PR [#5779](https://github.com/microsoft/BotFramework-WebChat/pull/5779)
 
 ### Added
 
@@ -357,7 +357,7 @@ Breaking changes in this release:
 - Removed legacy test harness, in PR [#5655](https://github.com/microsoft/BotFramework-WebChat/issues/5655), by [@compulim](https://github.com/compulim)
    - All tests are now either using `html2` test harness or simple unit tests
    - Legacy and `html` (html1) test harness are all migrated to `html2`
-- `avatarMiddleware` is being deprecated in favor of [`polymiddleware`](./docs/MIDDLEWARE.md). It will be removed on or after 2028-03-18, related to PR [#5779](https://github.com/microsoft/BotFramework-WebChat/pull/5779)
+- `avatarMiddleware` is being deprecated in favor of [`polymiddleware`](./docs/MIDDLEWARE.md). It will be removed on or after 2028-03-16, related to PR [#5779](https://github.com/microsoft/BotFramework-WebChat/pull/5779)
 
 ### Fixed
 

__tests__/html2/middleware/avatar/useBuildRenderAvatarCallback.html

@@ -132,7 +132,7 @@
                   from: { role: 'bot' },
                   id: 'a-00001',
                   text: 'Hello, World!',
-                  type: 'messagenp'
+                  type: 'message'
                 }
               })
             )

docs/MIDDLEWARE.md

@@ -330,7 +330,7 @@ We introduced polymiddleware in 2025-08-16. Based on our 2-year deprecation rule
 | Activity status              |                                                                         | (TBD)              |
 | Attachment                   |                                                                         | (TBD)              |
 | Attachment for screen reader |                                                                         | (TBD)              |
-| Avatar                       | PR [#5779](https://github.com/microsoft/BotFramework-WebChat/pull/5779) | 2028-03-18         |
+| Avatar                       | PR [#5779](https://github.com/microsoft/BotFramework-WebChat/pull/5779) | 2028-03-16         |
 | Card action                  |                                                                         | (TBD)              |
 | Group activities             |                                                                         | (TBD)              |
 | Scroll to end button         |                                                                         | (TBD)              |

packages/api-middleware/src/legacy/avatarMiddleware.ts

@@ -4,7 +4,7 @@ import { type ReactNode } from 'react';
 import type { AvatarPolymiddlewareRequest } from '../avatarPolymiddleware';
 
 // Polymiddleware requires immutable request object.
-// When bridging between legacy and polymiddlware, this symbol helps keeping the original object.
+// When bridging between legacy and polymiddleware, this symbol helps keeping the original object.
 const __INTERNAL_DO_NOT_USE__legacyAvatarMiddlewareOriginalRequestSymbol = Symbol();
 
 type LegacyAvatarComponentFactoryArguments = {

packages/api/src/legacy/createAvatarPolymiddlewareFromLegacy.tsx

@@ -39,7 +39,7 @@ const MemoizedLegacyAvatarBridge = memo(LegacyAvatarBridge);
 /**
  * Polyfill legacy avatar middleware into a polymiddleware.
  *
- * @deprecated Use `polymiddleware` instead. Legacy avatar middleware is being deprecated and will be removed on or after 2027-08-16.
+ * @deprecated Use `polymiddleware` instead. Legacy avatar middleware is being deprecated and will be removed on or after 2028-03-16.
  * @param middleware An array of legacy avatar middleware.
  * @returns A polymiddleware composed by legacy avatar middleware.
  */

packages/api/src/types/AvatarMiddleware.ts

@@ -1,8 +1,8 @@
 import { type WebChatActivity } from 'botframework-webchat-core';
 
-import type {
+import {
   __INTERNAL_DO_NOT_USE__legacyAvatarMiddlewareOriginalRequestSymbol,
-  AvatarPolymiddlewareRequest
+  type AvatarPolymiddlewareRequest
 } from '@msinternal/botframework-webchat-api-middleware';
 import { StrictStyleOptions } from '../StyleOptions';
 import ComponentMiddleware, { ComponentFactory } from './ComponentMiddleware';

packages/base/src/utils/singleToArray.ts

@@ -1,9 +1,9 @@
-/** @deprecated Will be removed on or after 2028-03-18. */
+/** @deprecated Will be removed on or after 2028-03-16. */
 export default function singleToArray<T>(singleOrArray: T | T[]): T[];
-/** @deprecated Will be removed on or after 2028-03-18. */
+/** @deprecated Will be removed on or after 2028-03-16. */
 export default function singleToArray<T>(singleOrArray: T | readonly T[]): readonly T[];
 
-/** @deprecated Will be removed on or after 2028-03-18. */
+/** @deprecated Will be removed on or after 2028-03-16. */
 export default function singleToArray<T>(singleOrArray: T | T[]): T[] {
   return singleOrArray ? (Array.isArray(singleOrArray) ? [...singleOrArray] : [singleOrArray]) : [];
 }

packages/component/src/Middleware/Activity/defaultActivityPolymiddleware.tsx

@@ -37,7 +37,7 @@ function shouldFilterActivity(activity, messageThing) {
 }
 
 /**
- * @deprecated Use `defaultActivityPolymiddleware` instead. The `createCoreActivityMiddleware` will be removed on or after 2028-03-18.
+ * @deprecated Use `defaultActivityPolymiddleware` instead. The `createCoreActivityMiddleware` will be removed on or after 2028-03-16.
  */
 function createCoreActivityMiddleware(): readonly ActivityMiddleware[] {
   return Object.freeze([

packages/test/page-object/src/globals/testHelpers/createDirectLineWithTranscript.js

@@ -39,10 +39,9 @@ export default function createDirectLineWithTranscript(
   { overridePostActivity, patchActivity: patchActivityFromOptions, ponyfill: { Date } = { Date: window.Date } } = {}
 ) {
   const now = Date.now();
+  const updateRelativeTimestamp = createUpdateRelativeTimestamp(now, { Date });
   const patchActivity = activity =>
-    createUpdateRelativeTimestamp(now, { Date })(
-      patchActivityFromOptions ? patchActivityFromOptions(activity) : activity
-    );
+    updateRelativeTimestamp(patchActivityFromOptions ? patchActivityFromOptions(activity) : activity);
   const connectionStatusDeferredObservable = createDeferredObservable(() => {
     connectionStatusDeferredObservable.next(0);
   });