diff --git a/src/App.tsx b/src/App.tsx index 26d0780..d592c74 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -5,8 +5,8 @@ import QuizAnswerer from "./QuizAnswerer"; import { QuizIdContext } from "./contexts/QuizIdContext"; import { RootContainerWidthContext } from "./contexts/RootContainerWidthContext"; -// const defaultQuizId = "45ef7f9c-784d-4e58-badb-f6b337f08ba0"; // branching -const defaultQuizId = "9ed8d0e9-d355-4fc1-8b89-4f962e3efc52"; //looooong header + const defaultQuizId = "9ed8d0e9-d355-4fc1-8b89-4f962e3efc52"; // branching +//const defaultQuizId = "9ed8d0e9-d355-4fc1-8b89-4f962e3efc52"; //looooong header // const defaultQuizId = "a9d31460-132a-4479-a3f0-90241498b6f9"; // linear export default function App() { diff --git a/src/api/quizRelase.ts b/src/api/quizRelase.ts index 3c1b795..66d57e5 100644 --- a/src/api/quizRelase.ts +++ b/src/api/quizRelase.ts @@ -47,7 +47,7 @@ export async function getData(quizId: string): Promise<{ } } - SESSIONS = headers["x-sessionkey"]; + SESSIONS = headers["x-sessionkey"] ? headers["x-sessionkey"] : SESSIONS; return { data, isRecentlyCompleted: false }; } catch (nativeError) { diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index 8bd4c03..2895a80 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -106,8 +106,6 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { return enqueueSnackbar("введена некорректная почта"); } - //почта валидна - setFire(true); if (fireOnce.current) { if ( @@ -118,6 +116,8 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { && adress.length === 0 ) return enqueueSnackbar("Пожалуйста, заполните поля"); + //почта валидна, хоть одно поле заполнено + setFire(true); try { await inputHC(); fireOnce.current = false; @@ -276,11 +276,15 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { {quizThemes[settings.cfg.theme].isLight ? ( - + + + ) : ( - + + + + )}