app-tutor-ai-consumer 1.21.0 → 1.21.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.21.2](https://github.com/Hotmart-Org/app-tutor-ai-consumer/compare/v1.21.1...v1.21.2) (2025-08-01)
+
+## [1.21.1](https://github.com/Hotmart-Org/app-tutor-ai-consumer/compare/v1.21.0...v1.21.1) (2025-07-31)
+
 # [1.21.0](https://github.com/Hotmart-Org/app-tutor-ai-consumer/compare/v1.20.0...v1.21.0) (2025-07-29)
 
 ### Features

package/config/rspack/utils/envs.js

@@ -20,7 +20,8 @@ const envs = [
   'VLC_PASSWORD',
   'SECURITY_BASE_URL',
   'AUTH_CLIENT_SECRET',
-  'BUNDLE_PATH'
+  'BUNDLE_PATH',
+  'STATIC_URL'
 ]
 
 const localEnvs = ['MEMBERSHIP_SLUG']

package/environments/.env.development

@@ -40,3 +40,5 @@ AUTH_CLIENT_SECRET=Basic OWRiYThiNTYtMWE5OC0xMWU5LWFiMTQtZDY2M2JkODczZDkzOmFiZmR
 # BUNDLE
 BUNDLE_PATH=https://local.buildstaging.com:4223
 
+# STATIC
+STATIC_URL=https://static.hotmart.com

package/environments/.env.production

@@ -39,3 +39,5 @@ AUTH_CLIENT_SECRET=
 # BUNDLE
 BUNDLE_PATH=https://app-club-microfrontends-prod.cp.hotmart.com
 
+# STATIC
+STATIC_URL=https://static.hotmart.com

package/environments/.env.staging

@@ -38,3 +38,6 @@ AUTH_CLIENT_SECRET=
 
 # BUNDLE
 BUNDLE_PATH=https://app-club-microfrontends.buildstaging.com
+
+# STATIC
+STATIC_URL=https://static.hotmart.com

package/environments/.env.test

@@ -40,4 +40,7 @@ AUTH_CLIENT_SECRET=
 # BUNDLE
 BUNDLE_PATH=
 
-VITE_REACT_QUERY_EXPERIMENTAL_PREFETCH_IN_RENDER=true
+VITE_REACT_QUERY_EXPERIMENTAL_PREFETCH_IN_RENDER=true
+
+# STATIC
+STATIC_URL=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-tutor-ai-consumer",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "main": "index.js",
   "scripts": {
     "dev": "rspack serve --env=development --config config/rspack/rspack.config.js",
@@ -106,6 +106,7 @@
     "@hot-observability-js/react": "~1.1.0",
     "@hotmart/event-agent-js": "~1.1.2",
     "@hotmart/sparkie": "~5.1.0",
+    "@lottiefiles/dotlottie-react": "~0.14.4",
     "@optimizely/react-sdk": "~3.2.4",
     "@tanstack/query-sync-storage-persister": "~5.80.7",
     "@tanstack/react-query": "~5.80.6",

package/src/config/datahub/schemas/tutor/constants.ts

@@ -1,4 +1,4 @@
 export const ButtonReactions = {
   LIKE: 'LIKE',
   DISLIKE: 'DISLIKE'
-}
+} as const

package/src/lib/components/button/button.tsx

@@ -5,6 +5,26 @@ import { Spinner } from '../spinner'
 
 import styles from './styles.module.css'
 
+function ButtonContent({
+  children,
+  loading
+}: PropsWithChildren<{
+  loading?: boolean
+}>) {
+  if (loading)
+    return (
+      <div className='col-start-1 row-start-1'>
+        <Spinner className='col-start-1 row-start-1 mx-auto my-auto h-[1em] w-[1em] text-current' />
+      </div>
+    )
+
+  return (
+    <span data-label='text-content' className='col-start-1 row-start-1 flex flex-nowrap gap-2'>
+      {children}
+    </span>
+  )
+}
+
 export type ButtonProps = PropsWithChildren<
   ButtonHTMLAttributes<HTMLButtonElement> & {
     variant?: 'brand' | 'secondary' | 'primary' | 'tertiary' | 'gradient-outline'
@@ -22,7 +42,7 @@ function Button({
   ...props
 }: ButtonProps) {
   const defaultClasses =
-    'rounded focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 text-base font-medium'
+    'rounded outline-none focus-visible:ring-2 focus-visible:ring-blue-500 text-base font-medium'
   const defaultBorder = 'border border-transparent'
   const defaultPadding = 'px-4 py-2'
   const disabledClasses = 'cursor-not-allowed'
@@ -77,20 +97,7 @@ function Button({
           {...props}
           disabled={props.disabled || loading}
           aria-busy={loading}>
-          <span
-            data-label='text-content'
-            className={clsx('flex flex-nowrap gap-2 [grid-area:stack]', {
-              visible: !loading,
-              invisible: loading
-            })}>
-            {children}
-          </span>
-          <Spinner
-            className={clsx('mx-auto my-auto h-[1em] w-[1em] text-current', '[grid-area:stack]', {
-              visible: loading,
-              invisible: !loading
-            })}
-          />
+          <ButtonContent loading={loading}>{children}</ButtonContent>
         </button>
       )
     case 'secondary':
@@ -107,20 +114,7 @@ function Button({
           {...props}
           disabled={props.disabled || loading}
           aria-busy={loading}>
-          <span
-            data-label='text-content'
-            className={clsx('flex flex-nowrap gap-2 [grid-area:stack]', {
-              visible: !loading,
-              invisible: loading
-            })}>
-            {children}
-          </span>
-          <Spinner
-            className={clsx('mx-auto my-auto h-[1em] w-[1em] text-current', '[grid-area:stack]', {
-              visible: loading,
-              invisible: !loading
-            })}
-          />
+          <ButtonContent loading={loading}>{children}</ButtonContent>
         </button>
       )
     case 'tertiary':
@@ -134,28 +128,7 @@ function Button({
           {...props}
           disabled={props.disabled || loading}
           aria-busy={loading}>
-          <span
-            data-label='text-content'
-            className={clsx(`col-start-1 row-start-1 flex flex-nowrap gap-2`, {
-              invisible: loading,
-              visible: !loading
-            })}>
-            {children}
-          </span>
-
-          {loading && (
-            <div className='col-start-1 row-start-1'>
-              <Spinner
-                className={clsx(
-                  'col-start-1 row-start-1 mx-auto my-auto h-[1em] w-[1em] text-current',
-                  {
-                    visible: loading,
-                    invisible: !loading
-                  }
-                )}
-              />
-            </div>
-          )}
+          <ButtonContent loading={loading}>{children}</ButtonContent>
         </button>
       )
     case 'brand':
@@ -172,20 +145,7 @@ function Button({
           {...props}
           disabled={props.disabled || loading}
           aria-busy={loading}>
-          <span
-            data-label='text-content'
-            className={clsx('flex flex-nowrap gap-2 [grid-area:stack]', {
-              visible: !loading,
-              invisible: loading
-            })}>
-            {children}
-          </span>
-          <Spinner
-            className={clsx('mx-auto my-auto h-[1em] w-[1em] text-current', '[grid-area:stack]', {
-              visible: loading,
-              invisible: !loading
-            })}
-          />
+          <ButtonContent loading={loading}>{children}</ButtonContent>
         </button>
       )
     default:
@@ -205,20 +165,7 @@ function Button({
           {...props}
           disabled={props.disabled || loading}
           aria-busy={loading}>
-          <span
-            data-label='text-content'
-            className={clsx('flex flex-nowrap gap-2 [grid-area:stack]', {
-              visible: !loading,
-              invisible: loading
-            })}>
-            {children}
-          </span>
-          <Spinner
-            className={clsx('mx-auto my-auto h-[1em] w-[1em] text-current', '[grid-area:stack]', {
-              visible: loading,
-              invisible: !loading
-            })}
-          />
+          <ButtonContent loading={loading}>{children}</ButtonContent>
         </button>
       )
   }

package/src/lib/components/horizontal-draggable-scroll/horizontal-draggable-scroll.tsx

@@ -0,0 +1,62 @@
+import { useRef, useState } from 'react'
+import clsx from 'clsx'
+import type { MouseEventHandler, PropsWithChildren, WheelEvent } from 'react'
+
+export type HorizontalDraggableScrollProps = PropsWithChildren<{ className?: string }>
+
+function HorizontalDraggableScroll({ children, className }: HorizontalDraggableScrollProps) {
+  const containerRef = useRef<HTMLDivElement>(null)
+  const [isDragging, setIsDragging] = useState(false)
+  const [startX, setStartX] = useState(0)
+  const [scrollLeft, setScrollLeft] = useState(0)
+
+  const handleMouseDown: MouseEventHandler<HTMLDivElement> = (e) => {
+    const container = containerRef.current
+
+    if (!container) return
+
+    setIsDragging(true)
+    setStartX(e.clientX)
+    setScrollLeft(container.scrollLeft)
+  }
+
+  const handleMouseMove: MouseEventHandler<HTMLDivElement> = (e) => {
+    const container = containerRef.current
+
+    if (!container || !isDragging) return
+
+    e.preventDefault()
+
+    const walk = e.clientX - startX
+
+    container.scrollLeft = scrollLeft - walk
+  }
+
+  const handleMouseUp = () => {
+    setIsDragging(false)
+  }
+
+  const handleWheel = (e: WheelEvent<HTMLDivElement>) => {
+    e.currentTarget.scrollLeft += e.deltaY
+  }
+
+  return (
+    <div
+      ref={containerRef}
+      onMouseDown={handleMouseDown}
+      onMouseMove={handleMouseMove}
+      onMouseUp={handleMouseUp}
+      onMouseLeave={handleMouseUp}
+      onWheel={handleWheel}
+      className={clsx(
+        {
+          'cursor-grabbing select-none': isDragging
+        },
+        className
+      )}>
+      {children}
+    </div>
+  )
+}
+
+export default HorizontalDraggableScroll

package/src/lib/components/horizontal-draggable-scroll/index.ts

@@ -0,0 +1,2 @@
+export * from './horizontal-draggable-scroll'
+export { default as HorizontalDraggableScroll } from './horizontal-draggable-scroll'

package/src/lib/components/icons/clone.svg

@@ -0,0 +1,5 @@
+<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 512 512">
+  <path fill="currentColor"
+    d="M64 480H288c17.7 0 32-14.3 32-32V384h32v64c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V224c0-35.3 28.7-64 64-64h64v32H64c-17.7 0-32 14.3-32 32V448c0 17.7 14.3 32 32 32zM224 320H448c17.7 0 32-14.3 32-32V64c0-17.7-14.3-32-32-32H224c-17.7 0-32 14.3-32 32V288c0 17.7 14.3 32 32 32zm-64-32V64c0-35.3 28.7-64 64-64H448c35.3 0 64 28.7 64 64V288c0 35.3-28.7 64-64 64H224c-35.3 0-64-28.7-64-64z"></path>
+</svg>

package/src/lib/components/icons/double-check.svg

@@ -0,0 +1,5 @@
+<svg aria-hidden="true" focusable="false" role="img"
+  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+  <path fill="currentColor"
+    d="M331.3 75.3c6.2-6.2 6.2-16.4 0-22.6s-16.4-6.2-22.6 0L160 201.4 91.3 132.7c-6.2-6.2-16.4-6.2-22.6 0s-6.2 16.4 0 22.6l80 80c6.2 6.2 16.4 6.2 22.6 0l160-160zm112 112c6.2-6.2 6.2-16.4 0-22.6s-16.4-6.2-22.6 0L160 425.4 27.3 292.7c-6.2-6.2-16.4-6.2-22.6 0s-6.2 16.4 0 22.6l144 144c6.2 6.2 16.4 6.2 22.6 0l272-272z"></path>
+</svg>

package/src/lib/components/icons/icon-names.d.ts

@@ -5,13 +5,17 @@ export type ValidIconNames =
   | 'arrow-down'
   | 'arrow-left'
   | 'arrow-up'
+  | 'book'
   | 'chevron-down'
-  | 'copy'
+  | 'clone'
   | 'close'
+  | 'copy'
+  | 'double-check'
+  | 'gallery'
   | 'info'
+  | 'interrogation'
   | 'like'
+  | 'paste'
   | 'send'
   | 'stop'
   | 'warning'
-  | 'interrogation'
-  | 'gallery'

package/src/lib/components/icons/info.svg

@@ -1,5 +1,5 @@
-<svg viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path fill-rule="evenodd" clip-rule="evenodd"
-    d="M0 8.5C0 4.08172 3.58172 0.5 8 0.5C12.4183 0.5 16 4.08172 16 8.5C16 12.9183 12.4183 16.5 8 16.5C3.58172 16.5 0 12.9183 0 8.5ZM8 1.5C4.13401 1.5 1 4.63401 1 8.5C1 12.366 4.13401 15.5 8 15.5C11.866 15.5 15 12.366 15 8.5C15 4.63401 11.866 1.5 8 1.5ZM7 5.5C7 4.94772 7.44772 4.5 8 4.5C8.55229 4.5 9 4.94772 9 5.5C9 6.05228 8.55229 6.5 8 6.5C7.44772 6.5 7 6.05228 7 5.5ZM7 7.5H7.5C8.32843 7.5 9 8.17157 9 9V12.5H8V9C8 8.72386 7.77614 8.5 7.5 8.5H7V7.5Z"
-    fill="currentColor" />
+    d="M0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8ZM8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1ZM7 5C7 4.44772 7.44772 4 8 4C8.55229 4 9 4.44772 9 5C9 5.55228 8.55229 6 8 6C7.44772 6 7 5.55228 7 5ZM7 7H7.5C8.32843 7 9 7.67157 9 8.5V12H8V8.5C8 8.22386 7.77614 8 7.5 8H7V7Z"
+    fill="currentColor" shape-rendering="geometricPrecision" />
 </svg>

package/src/lib/components/icons/paste.svg

@@ -0,0 +1,5 @@
+<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 512 512">
+  <path fill="currentColor"
+    d="M160 32c11.6 0 21.3 8.2 23.5 19.2C185 58.6 191.6 64 199.2 64H208c8.8 0 16 7.2 16 16V96H96V80c0-8.8 7.2-16 16-16h8.8c7.6 0 14.2-5.4 15.7-12.8C138.7 40.2 148.4 32 160 32zM64 64h2.7C65 69 64 74.4 64 80V96c0 17.7 14.3 32 32 32H224c17.7 0 32-14.3 32-32V80c0-5.6-1-11-2.7-16H256c17.7 0 32 14.3 32 32h32c0-35.3-28.7-64-64-64H210.6c-9-18.9-28.3-32-50.6-32s-41.6 13.1-50.6 32H64C28.7 32 0 60.7 0 96V384c0 35.3 28.7 64 64 64H192V416H64c-17.7 0-32-14.3-32-32V96c0-17.7 14.3-32 32-32zM288 480c-17.7 0-32-14.3-32-32V192c0-17.7 14.3-32 32-32h96v56c0 22.1 17.9 40 40 40h56V448c0 17.7-14.3 32-32 32H288zM416 165.3L474.7 224H424c-4.4 0-8-3.6-8-8V165.3zM448 512c35.3 0 64-28.7 64-64V235.9c0-12.7-5.1-24.9-14.1-33.9l-59.9-59.9c-9-9-21.2-14.1-33.9-14.1H288c-35.3 0-64 28.7-64 64V448c0 35.3 28.7 64 64 64H448z"></path>
+</svg>

package/src/lib/components/index.ts

@@ -1,5 +1,6 @@
 export * from './button'
 export * from './errors'
+export * from './horizontal-draggable-scroll'
 export * from './icons'
 export * from './markdownrenderer'
 export * from './spinner'

package/src/modules/messages/components/chat-input/chat-input.tsx

@@ -71,7 +71,7 @@ const ChatInput = forwardRef<HTMLTextAreaElement, ChatInputProps>(
           ref={ref}
           className={clsx(
             clsx(
-              'max-h-12 w-full resize-none border-none bg-transparent text-neutral-900 outline-none outline-0 placeholder:text-neutral-600',
+              'max-h-12 w-full resize-none border-none bg-transparent text-sm/normal text-neutral-900 outline-none outline-0 placeholder:text-neutral-600',
               styles.textArea
             ),
             { 'cursor-not-allowed opacity-40': inputDisabled }

package/src/modules/messages/components/message-actions/message-actions.tsx

@@ -1,6 +1,6 @@
+import { type CSSProperties, useState } from 'react'
 import clsx from 'clsx'
 import dayjs from 'dayjs'
-import type { CSSProperties } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { DataHubService } from '@/src/config/datahub'
@@ -17,18 +17,31 @@ export type MessageActionsProps = {
 
 function MessageActions({ message, className, showActions = false }: MessageActionsProps) {
   const { t } = useTranslation()
+  const [copying, setCopying] = useState(false)
+  const [copied, setCopied] = useState(false)
+  const [reaction, setReaction] = useState<ButtonReactionsType | null>(null)
 
   const copyToClipboard = (): void => {
     if (!message.text) return
 
-    navigator.clipboard.writeText(message.text).catch((err) => {
-      console.error('Failed to copy text: ', err)
-    })
+    setCopying(true)
+
+    navigator.clipboard
+      .writeText(message.text)
+      .then(() => setCopied(true))
+      .catch((err) => {
+        console.error('Failed to copy text: ', err)
+      })
+      .finally(() => {
+        setTimeout(() => setCopying(false), 1000)
+        setTimeout(() => setCopied(false), 3000)
+      })
   }
 
   const handleReaction = (reactionType: ButtonReactionsType = ButtonReactions.LIKE): void => {
     const schema = new ClickHotmartTutor({ messageId: message.id, reactionType })
-    return DataHubService.sendEvent({ schema })
+    DataHubService.sendEvent({ schema })
+    setReaction(reactionType)
   }
 
   return (
@@ -42,16 +55,31 @@ function MessageActions({ message, className, showActions = false }: MessageActi
           hidden: !showActions
         })}>
         <Button onClick={() => handleReaction()} aria-label={t('general.buttons.like')}>
-          <Icon name='like' className='h-3 w-3.5' />
+          <Icon
+            name='like'
+            className={clsx('h-3 w-3.5', {
+              'text-info-500': reaction === ButtonReactions.LIKE
+            })}
+          />
         </Button>
         <Button
           className='rotate-180 scale-x-[-1]'
           onClick={() => handleReaction(ButtonReactions.DISLIKE)}
           aria-label={t('general.buttons.dislike')}>
-          <Icon name='like' className='h-3 w-3.5' />
+          <Icon
+            name='like'
+            className={clsx('h-3 w-3.5', {
+              'text-danger-500': reaction === ButtonReactions.DISLIKE
+            })}
+          />
         </Button>
-        <Button onClick={copyToClipboard} aria-label={t('general.buttons.copy')}>
-          <Icon name='copy' className='h-3 w-3.5' />
+        <Button onClick={copyToClipboard} aria-label={t('general.buttons.copy')} disabled={copying}>
+          <Icon
+            name={copied ? 'paste' : 'copy'}
+            className={clsx('h-3 w-3.5', {
+              'text-info-500': copied
+            })}
+          />
         </Button>
       </div>
     </div>

package/src/modules/messages/components/message-item/message-item.tsx

@@ -25,10 +25,14 @@ function MessageItem({ message }: { message: ParsedMessage }) {
       <div
         data-test='messages-item'
         className={clsx('w-full overflow-x-hidden rounded-lg px-3', {
-          'bg-neutral-200': messageFromUser,
-          'border border-neutral-300 bg-neutral-100': messageFromAi
+          'max-w-max bg-[rgb(from_var(--hc-color-neutral-300)_r_g_b_/_0.8)]': messageFromUser,
+          'bg-neutral-200': messageFromAi
         })}>
-        <MarkdownRenderer content={message?.text ?? message?.name} imgComponent={imgComponent} />
+        <MarkdownRenderer
+          content={message?.text ?? message?.name}
+          imgComponent={imgComponent}
+          className='w-full'
+        />
       </div>
       <MessageActions
         className={clsx('flex items-center justify-between gap-2', {

package/src/modules/messages/components/message-item-error/message-item-error.tsx

@@ -20,7 +20,7 @@ function MessageItemError({ message, retry, show = true }: MessageItemErrorProps
   if (!show) return null
 
   return (
-    <div className='mt-2 flex justify-start gap-2 rounded border border-danger-500 bg-neutral-200 p-4 text-neutral-800'>
+    <div className='absolute bottom-4 flex justify-start gap-2 rounded border border-danger-500 bg-neutral-200 p-4 text-neutral-800 max-md:inset-x-[1.125rem] md:inset-x-5'>
       <span>{t('chat_page.error.loading.content')}</span>
       <Button variant='tertiary' className='px-4 text-sm/relaxed text-danger-400' onClick={retry}>
         {t('chat_page.error.loading.action')}

package/src/modules/messages/components/message-skeleton/message-skeleton.tsx

@@ -1,15 +1,18 @@
 import { forwardRef } from 'react'
+import clsx from 'clsx'
 
-import { AIAvatarIcon } from '@/src/modules/widget'
+import { AvatarAnimation } from '@/src/modules/widget'
+
+import styles from './styles.module.css'
 
 const MessageSkeleton = forwardRef<HTMLDivElement>((_, ref) => {
   return (
     <div ref={ref} className='flex flex-col items-start gap-2' aria-label='Loading Component'>
-      <AIAvatarIcon className='rounded-lg bg-ai-chat-response' />
+      <AvatarAnimation />
       <div className='flex w-full flex-col items-start gap-2'>
-        <div className='h-3 w-full animate-pulse rounded-full bg-neutral-200 transition-colors delay-0' />
-        <div className='h-3 w-[83%] animate-pulse rounded-full bg-neutral-200 transition-colors delay-75' />
-        <div className='h-3 w-[56%] animate-pulse rounded-full bg-neutral-200 transition-colors delay-100' />
+        <div className={clsx('h-3 w-full rounded-full', styles.shine)} />
+        <div className={clsx('h-3 w-[83%] rounded-full', styles.shine)} />
+        <div className={clsx('h-3 w-[56%] rounded-full', styles.shine)} />
       </div>
     </div>
   )

package/src/modules/messages/components/message-skeleton/styles.module.css

@@ -0,0 +1,19 @@
+.shine {
+  background: linear-gradient(
+    90deg,
+    var(--hc-color-neutral-200) 33%,
+    rgb(from var(--hc-color-neutral-900) r g b / 0.3) 53%,
+    var(--hc-color-neutral-200) 76%
+  );
+  background-size: 295% 100%;
+  animation: shine 1500ms infinite alternate;
+}
+
+@keyframes shine {
+  0% {
+    background-position: right;
+  }
+  100% {
+    background-position: left;
+  }
+}

package/src/modules/messages/components/messages-container/messages-container.tsx

@@ -1,4 +1,4 @@
-import { forwardRef, useEffect } from 'react'
+import { forwardRef, lazy, Suspense, useEffect } from 'react'
 import clsx from 'clsx'
 import type { MouseEventHandler, PropsWithChildren } from 'react'
 import { createPortal } from 'react-dom'
@@ -14,77 +14,102 @@ import {
 } from '@/src/modules/widget'
 import { useScroller } from '../../hooks'
 
-const MessagesContainer = forwardRef<
-  HTMLDivElement,
-  PropsWithChildren<{
-    showButton?: boolean
-    loading?: boolean
-    handleShowMore?: () => Promise<void>
-  }>
->(({ children, handleShowMore, showButton = false, loading = false }, forwardedRef) => {
-  const { t } = useTranslation()
-  const skeletonRef = useSkeletonRef()
-  const [isLoadingNewMsg] = useWidgetLoadingAtom()
-  const mainLayoutRef = usePageLayoutMainRefContext()
-  const { scrollerRef, scrollToButtonRef, scrollToBottom, showScrollButton } =
-    useScroller(forwardedRef)
+const MessageItemError = lazy(
+  () => import('@/src/modules/messages/components/message-item-error/message-item-error')
+)
 
-  useEffect(() => {
-    scrollToBottom()
-  }, [scrollToBottom])
+export type MessagesContainerProps = PropsWithChildren<{
+  showButton?: boolean
+  loading?: boolean
+  handleShowMore?: () => Promise<void>
+  error?: {
+    show: boolean
+    message: string
+    retry: () => void
+  }
+}>
 
-  const handleClickShowMore: MouseEventHandler<HTMLButtonElement> = (e) => {
-    const scroller = scrollerRef?.current
-    const heightBeforeRender = Number(e?.currentTarget?.scrollHeight)
+const MessagesContainer = forwardRef<HTMLDivElement, MessagesContainerProps>(
+  ({ children, handleShowMore, error, showButton = false, loading = false }, forwardedRef) => {
+    const { t } = useTranslation()
+    const skeletonRef = useSkeletonRef()
+    const [isLoadingNewMsg] = useWidgetLoadingAtom()
+    const mainLayoutRef = usePageLayoutMainRefContext()
+    const { scrollerRef, scrollToButtonRef, scrollToBottom, showScrollButton } =
+      useScroller(forwardedRef)
 
-    void handleShowMore?.().then(() => {
-      if (scroller && !isNaN(heightBeforeRender)) {
-        setTimeout(
-          () =>
-            scroller.scrollTo({
-              top: heightBeforeRender + 10,
-              behavior: 'smooth'
-            }),
-          180
-        )
-      }
-    })
-  }
+    useEffect(() => {
+      scrollToBottom()
+    }, [scrollToBottom])
 
-  return (
-    <div ref={scrollerRef} className='mx-2 my-4 flex h-full flex-col gap-2 overflow-auto px-4'>
-      <div className='mb-auto flex-1 self-center'>
-        <Button
-          className='max-w-max rounded-full border border-neutral-300 bg-neutral-200 px-2 py-1 text-xs/normal tracking-wide text-neutral-900'
-          onClick={handleClickShowMore}
-          loading={loading}
-          show={showButton}>
-          <Icon name='arrow-up' className='h-4 w-3' aria-hidden />
-          <span className='text-nowrap'>{t('general.buttons.show_more')}</span>
-        </Button>
-      </div>
-      {children}
+    const handleClickShowMore: MouseEventHandler<HTMLButtonElement> = (e) => {
+      const scroller = scrollerRef?.current
+      const heightBeforeRender = Number(e?.currentTarget?.scrollHeight)
+
+      void handleShowMore?.().then(() => {
+        if (scroller && !isNaN(heightBeforeRender)) {
+          setTimeout(
+            () =>
+              scroller.scrollTo({
+                top: heightBeforeRender + 10,
+                behavior: 'smooth'
+              }),
+            180
+          )
+        }
+      })
+    }
 
-      {mainLayoutRef.current &&
-        createPortal(
-          <ScrollToBottomButton
-            ref={scrollToButtonRef}
-            show={showScrollButton}
-            onClick={scrollToBottom}
-          />,
-          mainLayoutRef.current
-        )}
+    return (
       <div
-        className={clsx({
-          'pointer-events-none h-0 overflow-hidden opacity-0': !isLoadingNewMsg,
-          'mt-2 pb-4': isLoadingNewMsg
-        })}
-        ref={skeletonRef}>
-        <MessageSkeleton />
+        ref={scrollerRef}
+        className='flex h-full flex-col gap-2 overflow-auto max-md:p-[1.125rem] md:p-5'>
+        <div className='mb-auto flex-1 self-center'>
+          <Button
+            className='max-w-max rounded-full border border-neutral-300 bg-neutral-200 px-2 py-1 text-xs/normal tracking-wide text-neutral-900'
+            onClick={handleClickShowMore}
+            loading={loading}
+            show={showButton}>
+            <Icon name='arrow-up' className='h-4 w-3' aria-hidden />
+            <span className='text-nowrap'>{t('general.buttons.show_more')}</span>
+          </Button>
+        </div>
+        {children}
+
+        {error?.show &&
+          mainLayoutRef.current &&
+          createPortal(
+            <Suspense fallback={<div aria-live='polite' />}>
+              <MessageItemError
+                message={`❌ Error loading messages: ${error?.message}`}
+                show={error?.show}
+                retry={error?.retry}
+              />
+            </Suspense>,
+            mainLayoutRef.current
+          )}
+
+        {mainLayoutRef.current &&
+          createPortal(
+            <ScrollToBottomButton
+              ref={scrollToButtonRef}
+              show={showScrollButton}
+              onClick={scrollToBottom}
+            />,
+            mainLayoutRef.current
+          )}
+        <div
+          className={clsx({
+            'pointer-events-none h-0 overflow-hidden opacity-0': !isLoadingNewMsg,
+            'mt-2 pb-4': isLoadingNewMsg
+          })}
+          ref={skeletonRef}>
+          <MessageSkeleton />
+        </div>
       </div>
-    </div>
-  )
-})
+    )
+  }
+)
 
 MessagesContainer.displayName = 'MessagesContainer'
 

package/src/modules/messages/hooks/use-scroller/use-scroller.tsx

@@ -34,7 +34,7 @@ function useScroller(forwardedRef: ForwardedRef<HTMLDivElement>) {
     if (!scroller) return
 
     scroller.scrollTo({
-      top: scroller.scrollHeight,
+      top: scroller.scrollHeight + 10,
       behavior: 'smooth'
     })
   }, [])

package/src/modules/widget/components/ai-avatar/ai-avatar.tsx

@@ -11,8 +11,8 @@ function AIAvatar({
 }: AIAvatarProps) {
   return (
     <figure
-      className={clsx('flex h-12 w-12 items-center justify-center rounded-full', styles.avatar)}>
-      <div className={clsx('flex h-11 w-11 items-center justify-center', className)}>
+      className={clsx('flex h-9 w-9 items-center justify-center rounded-full', styles.avatar)}>
+      <div className={clsx('flex h-8 w-8 items-center justify-center', className)}>
         <Icon name='ai-color' className='h-6 w-6' aria-label='AI avatar Icon' />
       </div>
     </figure>

package/src/modules/widget/components/avatar-animation/avatar-animation.tsx

@@ -0,0 +1,13 @@
+import { DotLottieReact } from '@lottiefiles/dotlottie-react'
+
+const AVATAR_ANIMATION_URL = `${process.env.STATIC_URL}/tutor/tutor_sparkle.lottie`
+
+const AvatarAnimation = () => {
+  return (
+    <div className='flex h-11 w-11 items-center justify-center rounded-lg bg-ai-chat-response'>
+      <DotLottieReact src={AVATAR_ANIMATION_URL} loop autoplay className='h-auto w-full' />
+    </div>
+  )
+}
+
+export default AvatarAnimation

package/src/modules/widget/components/avatar-animation/index.ts

@@ -0,0 +1,2 @@
+export * from './avatar-animation'
+export { default as AvatarAnimation } from './avatar-animation'

package/src/modules/widget/components/chat-page/chat-page.tsx

@@ -1,4 +1,4 @@
-import { lazy, useEffect, useMemo, useRef } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import { useInfiniteQuery } from '@tanstack/react-query'
 
 import { isTextEmpty } from '@/src/lib/utils/is-text-empty'
@@ -15,17 +15,6 @@ import {
 import { WidgetHeader } from '../header'
 import { PageLayout } from '../page-layout'
 
-const MessageItemError = lazy(
-  () => import('@/src/modules/messages/components/message-item-error/message-item-error')
-)
-
-const MessageItemEndOfScroll = lazy(
-  () =>
-    import(
-      '@/src/modules/messages/components/message-item-end-of-scroll/message-item-end-of-scroll'
-    )
-)
-
 function ChatPage() {
   const chatInputRef = useRef<HTMLTextAreaElement>(null)
   const scrollerRef = useRef<HTMLDivElement>(null)
@@ -82,7 +71,7 @@ function ChatPage() {
           buttonDisabled={messagesQuery?.isLoading || !value.trim()}
         />
       }>
-      <div className='mt-4 px-6 py-4'>
+      <div className='max-md:px-[1.125rem] max-md:pt-[1.125rem] md:px-5 md:pt-5'>
         <WidgetHeader enabledButtons={['info', 'close']} tutorName={settings?.tutorName} />
       </div>
       <MessagesContainer
@@ -91,20 +80,13 @@ function ChatPage() {
           await messagesQuery.fetchNextPage()
         }}
         showButton={messagesQuery.hasNextPage}
-        loading={messagesQuery.isFetchingNextPage}>
-        <MessageItemEndOfScroll
-          show={
-            !messagesQuery.isFetching &&
-            !messagesQuery.hasNextPage &&
-            Number(messagesQuery.data?.size) > 0
-          }
-        />
+        loading={messagesQuery.isFetchingNextPage}
+        error={{
+          show: messagesQuery.isError,
+          message: messagesQuery.error?.message ?? '',
+          retry: () => void messagesQuery.refetch()
+        }}>
         {messagesQuery.data && <MessagesList messagesMap={messagesQuery.data} />}
-        <MessageItemError
-          show={messagesQuery.isError}
-          message={`❌ Error loading messages: ${messagesQuery.error?.message ?? ''}`}
-          retry={() => void messagesQuery.refetch()}
-        />
       </MessagesContainer>
     </PageLayout>
   )

package/src/modules/widget/components/header/header.tsx

@@ -1,31 +1,42 @@
+import clsx from 'clsx'
 import { useTranslation } from 'react-i18next'
 
 import { Button, Icon } from '@/src/lib/components'
 import { TutorWidgetEvents } from '../../events'
-import { useWidgetTabsAtom } from '../../store'
+import { useWidgetGoBackTabAtom, useWidgetTabsAtom } from '../../store'
 import { AIAvatar } from '../ai-avatar'
 
 import type { WidgetHeaderContentProps, WidgetHeaderProps } from './types'
 
+import styles from './styles.module.css'
+
 export function WidgetHeaderContent({ tutorName }: WidgetHeaderContentProps) {
   return (
     <div className='flex w-full gap-2'>
       <AIAvatar />
       <div className='flex flex-col justify-center'>
-        {tutorName && <h4 className='text-base font-bold'>{tutorName}</h4>}
+        {tutorName && <h4 className='text-sm/loose font-bold'>{tutorName}</h4>}
       </div>
     </div>
   )
 }
 
 export function WidgetHeaderContentWithoutMeta({ name }: { name?: string }) {
+  const [, goBack] = useWidgetGoBackTabAtom()
+
   return (
-    <div className='grid-areas-[a_b] grid grid-cols-[auto_1fr] items-center gap-1'>
-      <Button className='grid-area-[a]' aria-label='Arrow Left Icon'>
-        <Icon name='arrow-left' width={15} height={15} aria-hidden />
+    <div
+      className={clsx(
+        'grid-areas-[a_b] grid grid-cols-[auto_1fr] items-center gap-1',
+        styles.withoutMetaContainer
+      )}>
+      <Button className='grid-area-[a]' aria-label='Arrow Left Icon' onClick={goBack}>
+        <Icon name='arrow-left' className='h-3.5 w-3.5' aria-hidden />
       </Button>
-      <div className='grid-area-[b] flex justify-center'>
-        <span>{name}</span>
+      <div className='grid-area-[b] flex min-h-6 justify-center text-center'>
+        <span className='absolute bottom-0 left-1/2 -translate-x-1/2 text-base font-bold'>
+          {name}
+        </span>
       </div>
     </div>
   )
@@ -50,33 +61,44 @@ function WidgetHeader({
   }
 
   return (
-    <div className='grid-areas-[a_b] mt-0.5 grid grid-cols-[1fr_auto] items-center text-neutral-1000'>
-      <div className='grid-area-[a]'>
-        {showContent && !showContentWithoutMeta && <WidgetHeaderContent tutorName={name} />}
-        {showContentWithoutMeta && !showContent && <WidgetHeaderContentWithoutMeta name={name} />}
-      </div>
-      <div className='shrink-0'>
-        <div className='grid-area-[b] ml-auto flex max-w-max gap-3 text-neutral-700'>
-          <Button
-            show={enabledButtons.includes('archive')}
-            onClick={handleClickArchive}
-            aria-label='Archive Icon'>
-            <Icon name='archive' className='h-4 w-4' aria-hidden />
-          </Button>
-          <Button
-            show={enabledButtons.includes('info')}
-            aria-label='Info Icon'
-            onClick={handleClickInfo}>
-            <Icon name='info' className='h-4 w-4' aria-hidden />
-          </Button>
+    <div className='mt-0.5 flex flex-col gap-2 text-neutral-900'>
+      <div className='flex justify-end'>
+        <div className={styles.closeContainer}>
           <Button
+            className='text-neutral-500'
             show={enabledButtons.includes('close')}
             onClick={() => TutorWidgetEvents['c3po-app-widget-hide'].dispatch()}
             aria-label='Close Icon'>
-            <Icon name='close' className='h-4 w-4' aria-hidden />
+            <Icon name='close' className='h-3 w-3' aria-hidden />
           </Button>
         </div>
       </div>
+      <div className='grid-areas-[a_b] grid grid-cols-[1fr_auto] items-center'>
+        <div className='grid-area-[a] relative'>
+          {showContent && !showContentWithoutMeta && <WidgetHeaderContent tutorName={name} />}
+          {showContentWithoutMeta && !showContent && <WidgetHeaderContentWithoutMeta name={name} />}
+        </div>
+        <div className='shrink-0'>
+          <div
+            className={clsx(
+              'grid-area-[b] ml-auto flex max-w-max gap-3 text-neutral-700',
+              styles.btnContainer
+            )}>
+            <Button
+              show={enabledButtons.includes('archive')}
+              onClick={handleClickArchive}
+              aria-label='Archive Icon'>
+              <Icon name='archive' className='h-4 w-4' aria-hidden />
+            </Button>
+            <Button
+              show={enabledButtons.includes('info')}
+              aria-label='Info Icon'
+              onClick={handleClickInfo}>
+              <Icon name='info' className='h-4 w-4' aria-hidden />
+            </Button>
+          </div>
+        </div>
+      </div>
     </div>
   )
 }

package/src/modules/widget/components/header/styles.module.css

@@ -0,0 +1,11 @@
+.closeContainer {
+  --custom-btn-padding: 0.375rem;
+}
+
+.btnContainer {
+  --custom-btn-padding: 0.25rem;
+}
+
+.withoutMetaContainer {
+  --custom-btn-padding: 0.25rem;
+}

package/src/modules/widget/components/index.ts

@@ -1,4 +1,5 @@
 export * from './ai-avatar'
+export * from './avatar-animation'
 export * from './chat-page'
 export * from './container'
 export * from './greetings-card'

package/src/modules/widget/components/information-page/information-page.tsx

@@ -1,9 +1,9 @@
 import clsx from 'clsx'
 import { useTranslation } from 'react-i18next'
 
-import { Icon } from '@/src/lib/components'
-import { useWidgetSettingsAtom, useWidgetTabsAtom } from '../../store'
+import { useWidgetSettingsAtom } from '../../store'
 import { AIAvatar } from '../ai-avatar'
+import { WidgetHeader } from '../header'
 import { PageLayout } from '../page-layout'
 
 import { infoItems } from './constants'
@@ -11,27 +11,21 @@ import { InformationCard } from './information-card'
 
 function WidgetInformationPage() {
   const { t } = useTranslation()
-  const [, setWidgetTabs] = useWidgetTabsAtom()
   const [settings] = useWidgetSettingsAtom()
   const isDarkMode = settings?.config?.theme === 'dark'
 
   return (
-    <PageLayout className='p-5 text-white'>
-      <div
-        className={clsx('relative mb-8 flex h-12 items-center justify-center', {
-          'text-white': isDarkMode,
-          'text-neutral-700': !isDarkMode
-        })}>
-        <button
-          className='absolute left-0'
-          aria-label='Return Button'
-          onClick={() => setWidgetTabs('chat')}>
-          <Icon name='arrow-left' width={16} height={16} />
-        </button>
-        <h1 className='mx-auto font-bold'>{t('info.title')}</h1>
+    <PageLayout className='flex min-h-0 flex-col text-neutral-900 max-md:p-[1.125rem] md:p-5'>
+      <div className='mb-4'>
+        <WidgetHeader
+          enabledButtons={['close']}
+          showContent={false}
+          showContentWithoutMeta
+          tutorName={t('info.title')}
+        />
       </div>
 
-      <div className='mb-10 flex justify-center'>
+      <div className='my-8 flex justify-center'>
         <div className='flex flex-col items-center gap-2'>
           <AIAvatar />
 

package/src/modules/widget/components/loading-page/loading-page.tsx

@@ -32,7 +32,7 @@ function WidgetLoadingPage() {
   return (
     <PageLayout
       asideChild={<ChatInput name='new-chat-msg-input' ref={chatInputRef} loading={true} />}>
-      <div className='mt-4 flex h-full flex-col justify-start px-6 py-4'>
+      <div className='flex h-full flex-col justify-start max-md:p-[1.125rem] md:p-5'>
         <WidgetHeader enabledButtons={['close']} showContent={false} />
         <div className='mt-auto'>
           <MessageSkeleton />

package/src/modules/widget/components/starter-page/starter-page.tsx

@@ -4,7 +4,7 @@ import clsx from 'clsx'
 import type { MouseEventHandler } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/src/lib/components'
+import { Button, HorizontalDraggableScroll } from '@/src/lib/components'
 import { useRefEventListener } from '@/src/lib/hooks'
 import { ChatInput, useChatInputValueAtom } from '@/src/modules/messages/components'
 import { getAllMessagesQuery, useSendTextMessage } from '@/src/modules/messages/hooks'
@@ -90,14 +90,10 @@ function WidgetStarterPage() {
       }>
       <div className='grid-areas-[a_b] grid h-full grid-cols-1 grid-rows-[1fr_auto]'>
         <div
-          className={clsx('grid-area-[a] flex min-h-0 flex-col px-5 py-4', {
+          className={clsx('grid-area-[a] flex min-h-0 flex-col max-md:p-[1.125rem] md:p-5', {
             [styles.bg]: settings?.config?.theme === 'dark'
           })}>
-          <WidgetHeader
-            enabledButtons={['archive', 'info', 'close']}
-            tutorName={name}
-            showContent={false}
-          />
+          <WidgetHeader enabledButtons={['archive', 'info', 'close']} tutorName={name} />
 
           <div className='my-auto'>
             <GreetingsCard
@@ -107,7 +103,7 @@ function WidgetStarterPage() {
             />
           </div>
         </div>
-        <div className='grid-area-[b] mx-5 my-6 flex flex-shrink-0 snap-x snap-mandatory gap-2 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden'>
+        <HorizontalDraggableScroll className='grid-area-[b] mx-5 my-6 flex flex-shrink-0 snap-x snap-mandatory gap-2 overflow-x-auto whitespace-nowrap [scrollbar-width:none] [&::-webkit-scrollbar]:hidden'>
           <Button
             variant='gradient-outline'
             className='shrink-0 snap-end text-sm'
@@ -122,7 +118,7 @@ function WidgetStarterPage() {
             <span>📝 </span>
             {t('starter_page.wanna_summary')}
           </Button>
-        </div>
+        </HorizontalDraggableScroll>
       </div>
     </PageLayout>
   )

package/src/modules/widget/store/widget-tabs.atom.ts

@@ -51,4 +51,4 @@ export const goBackTabAtom = atom(null, (get, set) => {
 export const useGetWidgetTabsAtom = () => useAtom(widgetTabsAtom)
 export const useWidgetTabsAtom = () => useAtom(setWidgetTabsAtom)
 export const useWidgetTabsValueAtom = () => useAtomValue(setWidgetTabsAtom)
-export const useWidgetGoBackTabAton = () => useAtom(goBackTabAtom)
+export const useWidgetGoBackTabAtom = () => useAtom(goBackTabAtom)

package/tailwind.config.js

@@ -90,14 +90,12 @@ module.exports = {
           900: 'var(--hc-color-neutral-900)',
           1000: 'var(--hc-color-neutral-1000)'
         },
-        ai: {
-          primary: 'var(--ai-color-primary)',
-          secondary: 'var(--ai-color-secondary)',
-          dark: 'var(--ai-color-dark)',
-          'chat-response': 'var(--ai-color-chat-response)',
-          'gradient-primary': 'var(--ai-color-gradient-primary)',
-          'gradient-accent': 'var(--ai-color-gradient-accent)'
-        }
+        'ai-primary': 'var(--ai-color-primary)',
+        'ai-secondary': 'var(--ai-color-secondary)',
+        'ai-dark': 'var(--ai-color-dark)',
+        'ai-chat-response': 'var(--ai-color-chat-response)',
+        'ai-gradient-primary': 'var(--ai-color-gradient-primary)',
+        'ai-gradient-accent': 'var(--ai-color-gradient-accent)'
       }
     }
   },