Flip the decorator order

Author: compulim

packages/api/src/decorator/private/createDecoratorComposer.tsx

@@ -43,7 +43,7 @@ export default (): DecoratorComposerComponent =>
 
     const context = useMemo(() => ({ middleware }), [middleware]);
 
-    const borderMiddleware = useMemo(
+    const activityBorderMiddleware = useMemo(
       () => initActivityBorderDecoratorMiddleware(middleware, activityBorderDecoratorTypeName),
       [middleware]
     );
@@ -55,7 +55,7 @@ export default (): DecoratorComposerComponent =>
 
     return (
       <DecoratorComposerContext.Provider value={context}>
-        <ActivityBorderDecoratorMiddlewareProvider middleware={borderMiddleware}>
+        <ActivityBorderDecoratorMiddlewareProvider middleware={activityBorderMiddleware}>
           <ActivityGroupingDecoratorMiddlewareProvider middleware={activityGroupingMiddleware}>
             {children}
           </ActivityGroupingDecoratorMiddlewareProvider>

packages/fluent-theme/src/private/FluentThemeProvider.tsx

@@ -84,9 +84,9 @@ const FluentThemeProvider = ({ children, variant = 'fluent' }: Props) => (
           typingIndicatorMiddleware={typingIndicatorMiddleware}
         >
           <AssetComposer>
-            <WebChatDecorator>
-              <DecoratorComposer middleware={decoratorMiddleware}>{children}</DecoratorComposer>
-            </WebChatDecorator>
+            <DecoratorComposer middleware={decoratorMiddleware}>
+              <WebChatDecorator>{children}</WebChatDecorator>
+            </DecoratorComposer>
           </AssetComposer>
         </ThemeProvider>
       </TelephoneKeypadProvider>