Merge branch 'development' into feat/new-conversation-on-refresh-tests

apps/chat/src/components/Chat/ChatMessage/ChatMessageTemplatesModal/ChatMessageTemplatesModal.tsx

@@ -18,7 +18,7 @@ import { useAppDispatch } from '@/src/store/hooks';
 
 import { PROMPT_VARIABLE_REGEX_TEST } from '@/src/constants/folders';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import { TabButton } from '../../../Buttons/TabButton';
 import { TemplateRenderer } from './TemplateRenderer';

apps/chat/src/components/Chat/ChatSettings/AddonsDialog.tsx

@@ -16,7 +16,7 @@ import { useAppSelector } from '@/src/store/hooks';
 
 import { OUTSIDE_PRESS } from '@/src/constants/modal';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import { ModelIcon } from '../../Chatbar/ModelIcon';
 import CollapsibleSection from '../../Common/CollapsibleSection';

apps/chat/src/components/Chat/ChatSettings/ChatSettingsModal.tsx

@@ -18,7 +18,7 @@ import { PromptsSelectors } from '@/src/store/prompts/prompts.reducers';
 
 import { FALLBACK_ASSISTANT_SUBMODEL_ID } from '@/src/constants/default-ui-settings';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import { ModelIcon } from '../../Chatbar/ModelIcon';
 import { ConversationSettings } from './ConversationSettings';

apps/chat/src/components/Chat/MainModalManager.jsx

@@ -1,7 +1,7 @@
 import { ReplaceConfirmationModal } from '../Common/ReplaceConfirmationModal/ReplaceConfirmationModal';
 import { UnshareDialog } from '../Common/UnshareDialog';
 import { RenameConversationModal } from './RenameConversationModal';
-import ShareModal from './ShareModal';
+import { ShareModal } from './ShareModal';
 
 export const MainModalManager = () => {
   return (

apps/chat/src/components/Chat/Publish/CompareRulesModal.tsx

@@ -4,7 +4,7 @@ import { ModalState } from '@/src/types/modal';
 import { PublicationRule } from '@/src/types/publication';
 import { Translation } from '@/src/types/translation';
 
-import Modal from '../../Common/Modal';
+import { Modal } from '../../Common/Modal';
 import { RuleListItem } from './RuleListItem';
 
 import isEqual from 'lodash-es/isEqual';

apps/chat/src/components/Chat/Publish/PublishWizard.tsx

@@ -58,7 +58,7 @@ import { PUBLIC_URL_PREFIX } from '@/src/constants/public';
 import { ORGANIZATION_SECTION_NAME } from '@/src/constants/sections';
 
 import { ChangePathDialog } from '@/src/components/Chat/ChangePathDialog';
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 import Tooltip from '@/src/components/Common/Tooltip';
 
 import { Spinner } from '../../Common/Spinner';

apps/chat/src/components/Chat/Publish/ReviewApplicationDialog.tsx

@@ -6,7 +6,7 @@ import { PublicationActions } from '@/src/store/publication/publication.reducers
 
 import { MOUSE_OUTSIDE_PRESS_EVENT } from '@/src/constants/modal';
 
-import Modal from '../../Common/Modal';
+import { Modal } from '../../Common/Modal';
 import { Spinner } from '../../Common/Spinner';
 import { ReviewApplicationDialogView } from './ReviewApplicationDialogView';
 

apps/chat/src/components/Chat/Publish/TargetAudienceFilterComponent.tsx

@@ -18,7 +18,7 @@ import { Translation } from '@/src/types/translation';
 import { useAppSelector } from '@/src/store/hooks';
 import { SettingsSelectors } from '@/src/store/settings/settings.reducers';
 
-import Modal from '../../Common/Modal';
+import { Modal } from '../../Common/Modal';
 import { MultipleComboBox } from '../../Common/MultipleComboBox';
 import { RegexParamInput } from './RegexParamInput';
 import { RulesSelect } from './RulesSelect';

apps/chat/src/components/Chat/RenameConversationModal.tsx

@@ -29,7 +29,7 @@ import { UIActions } from '@/src/store/ui/ui.reducers';
 import { DISALLOW_INTERACTIONS } from '@/src/constants/modal';
 
 import { ConfirmDialog } from '../Common/ConfirmDialog';
-import Modal from '../Common/Modal';
+import { Modal } from '../Common/Modal';
 
 export const RenameConversationModal = () => {
   const renamingConversation = useAppSelector(

apps/chat/src/components/Chat/ReportIssueDialog.tsx

@@ -25,7 +25,7 @@ import {
 } from '@/src/store/service/service.reducer';
 import { UIActions } from '@/src/store/ui/ui.reducers';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import EmptyRequiredInputMessage from '../Common/EmptyRequiredInputMessage';
 

apps/chat/src/components/Chat/RequestApiKeyDialog.tsx

@@ -26,7 +26,7 @@ import {
 } from '@/src/store/service/service.reducer';
 import { UIActions } from '@/src/store/ui/ui.reducers';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import EmptyRequiredInputMessage from '../Common/EmptyRequiredInputMessage';
 

apps/chat/src/components/Chat/ShareModal.tsx

@@ -24,7 +24,7 @@ import { ShareActions, ShareSelectors } from '@/src/store/share/share.reducers';
 
 import { OUTSIDE_PRESS_AND_MOUSE_EVENT } from '@/src/constants/modal';
 
-import Modal from '../Common/Modal';
+import { Modal } from '../Common/Modal';
 import Tooltip from '../Common/Tooltip';
 
 import IconUserUnshare from '@/public/images/icons/unshare-user.svg';

apps/chat/src/components/Chat/TalkTo/TalkToModal.tsx

@@ -37,7 +37,7 @@ import { MarketplaceQueryParams } from '@/src/constants/marketplace';
 import { PublishModal } from '@/src/components/Chat/Publish/PublishWizard';
 import { ApplicationWizard } from '@/src/components/Common/ApplicationWizard/ApplicationWizard';
 import { ConfirmDialog } from '@/src/components/Common/ConfirmDialog';
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import { ApplicationLogs } from '../../Marketplace/ApplicationLogs';
 import { TalkToSlider } from './TalkToSlider';

apps/chat/src/components/Chatbar/ExportModal.tsx

@@ -5,7 +5,7 @@ import { Translation } from '@/src/types/translation';
 
 import { OUTSIDE_PRESS } from '@/src/constants/modal';
 
-import Modal from '../Common/Modal';
+import { Modal } from '../Common/Modal';
 
 interface Props {
   onExport: (args?: { withAttachments?: boolean }) => void;

apps/chat/src/components/Common/ApplicationWizard/ApplicationWizard.tsx

@@ -12,7 +12,7 @@ import { ApplicationWizardHeader } from '@/src/components/Common/ApplicationWiza
 import { CodeAppView } from '@/src/components/Common/ApplicationWizard/CodeAppView/CodeAppView';
 import { CustomAppView } from '@/src/components/Common/ApplicationWizard/CustomAppView';
 import { QuickAppView } from '@/src/components/Common/ApplicationWizard/QuickAppView';
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 import { Spinner } from '@/src/components/Common/Spinner';
 
 import { UploadStatus } from '@epam/ai-dial-shared';

apps/chat/src/components/Common/ApplicationWizard/CodeAppView/CodeAppView.tsx

@@ -428,8 +428,9 @@ export const CodeAppView: FC<ViewProps> = ({
                 );
 
                 handleEdit(confirmSharingRevoke.data);
-                setConfirmSharingRevoke(undefined);
               }
+
+              setConfirmSharingRevoke(undefined);
             }}
           />
         )}

apps/chat/src/components/Common/ConfirmDialog.tsx

@@ -4,7 +4,7 @@ import { ModalState } from '@/src/types/modal';
 
 import { DISALLOW_INTERACTIONS } from '@/src/constants/modal';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 interface Props {
   isOpen: boolean;

apps/chat/src/components/Common/FullPageLoader.tsx

@@ -1,6 +1,6 @@
 import { ModalState } from '@/src/types/modal';
 
-import Modal, { Props as ModalProps } from './Modal';
+import { Modal, Props as ModalProps } from './Modal';
 import { Spinner } from './Spinner';
 
 interface Props {

apps/chat/src/components/Common/FullScreenImages.tsx

@@ -9,7 +9,7 @@ import { useSwipe } from '@/src/hooks/useSwipe';
 
 import { ModalState } from '@/src/types/modal';
 
-import Modal from './Modal';
+import { Modal } from './Modal';
 
 interface Props {
   images: string[];

apps/chat/src/components/Common/Modal.tsx

@@ -159,12 +159,10 @@ function ModalView({
   );
 }
 
-const Modal = (props: Props) => {
+export function Modal(props: Props) {
   if (props.state === ModalState.CLOSED) {
     return null;
   }
 
   return <ModalView {...props} />;
-};
-
-export default Modal;
+}

apps/chat/src/components/Common/MoveToFolderMobileModal.tsx

@@ -7,7 +7,7 @@ import { FolderInterface, MoveToFolderProps } from '@/src/types/folder';
 import { ModalState } from '@/src/types/modal';
 import { Translation } from '@/src/types/translation';
 
-import Modal from './Modal';
+import { Modal } from './Modal';
 
 interface MoveToFolderMobileModalProps {
   folders: FolderInterface[];

apps/chat/src/components/Common/OptionsDialog.tsx

@@ -6,7 +6,7 @@ import { ModalState } from '@/src/types/modal';
 
 import { OUTSIDE_PRESS_AND_MOUSE_EVENT } from '@/src/constants/modal';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 const fakeCloseHandler = () => undefined;
 

apps/chat/src/components/Common/ReplaceConfirmationModal/ReplaceConfirmationModal.tsx

@@ -25,7 +25,7 @@ import {
 
 import { OUTSIDE_PRESS_AND_MOUSE_EVENT } from '@/src/constants/modal';
 
-import Modal from '../Modal';
+import { Modal } from '../Modal';
 import { ReplaceSelector } from './Components';
 import { ConversationsList } from './ConversationsList';
 import { FilesList } from './FilesList';

apps/chat/src/components/Common/SelectFolder/SelectFolder.tsx

@@ -8,7 +8,7 @@ import { Translation } from '@/src/types/translation';
 
 import { OUTSIDE_PRESS_AND_MOUSE_EVENT } from '@/src/constants/modal';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 interface Props {
   isOpen: boolean;

apps/chat/src/components/Files/AttachLinkDialog.tsx

@@ -11,7 +11,7 @@ import { Translation } from '@/src/types/translation';
 
 import { OUTSIDE_PRESS } from '@/src/constants/modal';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import { FieldErrorMessage } from '../Common/Forms/FieldErrorMessage';
 

apps/chat/src/components/Files/FileManagerModal.tsx

@@ -44,7 +44,7 @@ import {
   SHARED_WITH_ME_SECTION_NAME,
 } from '@/src/constants/sections';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import FolderPlus from '../../../public/images/icons/folder-plus.svg';
 import CollapsibleSection from '../Common/CollapsibleSection';

apps/chat/src/components/Files/PreUploadModal.tsx

@@ -38,7 +38,7 @@ import { useAppDispatch, useAppSelector } from '@/src/store/hooks';
 import { OUTSIDE_PRESS_AND_MOUSE_EVENT } from '@/src/constants/modal';
 import { SHARED_WITH_ME_SECTION_NAME } from '@/src/constants/sections';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import { ErrorMessage } from '../Common/ErrorMessage';
 import { SelectFolderModal } from './SelectFolderModal';

apps/chat/src/components/Marketplace/ApplicationDetails/ApplicationDetails.tsx

@@ -11,7 +11,7 @@ import { ModelsSelectors } from '@/src/store/models/models.reducers';
 
 import { MarketplaceQueryParams } from '@/src/constants/marketplace';
 
-import Modal from '../../Common/Modal';
+import { Modal } from '../../Common/Modal';
 import { ApplicationDetailsContent } from './ApplicationContent';
 import { ApplicationDetailsFooter } from './ApplicationFooter';
 import { ApplicationDetailsHeader } from './ApplicationHeader';

apps/chat/src/components/Marketplace/ApplicationLogs.tsx

@@ -15,7 +15,7 @@ import {
 } from '@/src/store/application/application.reducers';
 import { useAppDispatch, useAppSelector } from '@/src/store/hooks';
 
-import Modal from '../Common/Modal';
+import { Modal } from '../Common/Modal';
 import { Spinner } from '../Common/Spinner';
 import Tooltip from '../Common/Tooltip';
 

apps/chat/src/components/Promptbar/components/PreviewPromptModal.tsx

@@ -27,7 +27,7 @@ import Tooltip from '@/src/components/Common/Tooltip';
 import { TemplateRenderer } from '../../Chat/ChatMessage/ChatMessageTemplatesModal/TemplateRenderer';
 import { PublicVersionSelector } from '../../Chat/Publish/PublicVersionSelector';
 import { PublicationControls } from '../../Chat/Publish/PublicationChatControls';
-import Modal from '../../Common/Modal';
+import { Modal } from '../../Common/Modal';
 
 import { PublishActions } from '@epam/ai-dial-shared';
 

apps/chat/src/components/Promptbar/components/PromptModal.tsx

@@ -35,7 +35,7 @@ import { ConfirmDialog } from '@/src/components/Common/ConfirmDialog';
 import { NotFoundEntity } from '@/src/components/Common/NotFoundEntity';
 
 import EmptyRequiredInputMessage from '../../Common/EmptyRequiredInputMessage';
-import Modal from '../../Common/Modal';
+import { Modal } from '../../Common/Modal';
 import Tooltip from '../../Common/Tooltip';
 
 interface Props {

apps/chat/src/components/Settings/SettingDialog.tsx

@@ -16,7 +16,7 @@ import { UIActions, UISelectors } from '@/src/store/ui/ui.reducers';
 
 import { OUTSIDE_PRESS_AND_MOUSE_EVENT } from '@/src/constants/modal';
 
-import Modal from '@/src/components/Common/Modal';
+import { Modal } from '@/src/components/Common/Modal';
 
 import { ToggleSwitchLabeled } from '../Common/ToggleSwitch/ToggleSwitchLabeled';
 import { CustomLogoSelect } from './CustomLogoSelect';

apps/chat/src/pages/404.tsx

@@ -0,0 +1,35 @@
+import { IconPlus } from '@tabler/icons-react';
+
+import { useTranslation } from '../hooks/useTranslation';
+
+import { Translation } from '../types/translation';
+
+import { getLayout } from './_app';
+
+function Custom404() {
+  const { t } = useTranslation(Translation.Common);
+
+  return (
+    <div className="flex h-screen w-screen flex-col items-center justify-center space-y-4 px-4 text-center">
+      <h1 className="text-6xl font-bold md:text-7xl">{t('404')}</h1>
+
+      <div className="space-y-2">
+        <p className="text-xl font-bold md:text-2xl">{t('Page not found')}</p>
+        <p className="text-base text-secondary">
+          {t("It seems like the page you're looking for doesn't exist.")}
+        </p>
+      </div>
+
+      <a
+        className="button button-secondary flex items-center gap-2 rounded"
+        href={`/`}
+      >
+        <IconPlus size={18} />
+        {t('New Conversation')}
+      </a>
+    </div>
+  );
+}
+
+Custom404.getLayout = getLayout;
+export default Custom404;

apps/overlay-sandbox/app/cases/components/chatOverlayManagerWrapper.tsx

@@ -200,7 +200,7 @@ export const ChatOverlayManagerWrapper: React.FC<
 
           <div>
             <button
-              className="button"
+              className="button w-full"
               onClick={() => {
                 const newOptions = {
                   ...overlayManagerOptions,

apps/overlay-sandbox/app/cases/components/chatOverlayWrapper.tsx

@@ -192,7 +192,7 @@ export const ChatOverlayWrapper: React.FC<ChatOverlayWrapperProps> = ({
 
           <div>
             <button
-              className="button"
+              className="button w-full"
               onClick={() => {
                 const newOptions = {
                   ...overlayOptions,