@magmamath/students-features 0.9.1-rc.4 → 0.9.1-rc2

package/dist/typescript/module/features/keyboard/types/MathKeysGroups/basicOperators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basicOperators.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/types/MathKeysGroups/basicOperators.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAgDzB,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiP/B,CAAA"}
+{"version":3,"file":"basicOperators.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/types/MathKeysGroups/basicOperators.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AA6CzB,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+N/B,CAAA"}

package/dist/typescript/module/features/keyboard/types/keyboardGroupIds.d.ts

@@ -26,7 +26,6 @@ export declare enum MathEntryKeyboardGroupId {
     TIME_US = "math-entry-time-us",
     CURRENCY_SW = "math-entry-currency-sw",
     CURRENCY_UK = "math-entry-currency-uk",
-    CURRENCY_US = "math-entry-currency-us",
-    UNDERLINED = "math-entry-underlined"
+    CURRENCY_US = "math-entry-currency-us"
 }
 //# sourceMappingURL=keyboardGroupIds.d.ts.map

package/dist/typescript/module/features/keyboard/types/keyboardGroupIds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keyboardGroupIds.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/keyboardGroupIds.ts"],"names":[],"mappings":"AAAA,oBAAY,wBAAwB;IAClC,eAAe,+BAA+B;IAC9C,sBAAsB,sCAAsC;IAC5D,kBAAkB,kCAAkC;IACpD,yBAAyB,yCAAyC;IAClE,aAAa,6BAA6B;IAC1C,oBAAoB,oCAAoC;IACxD,aAAa,6BAA6B;IAC1C,iBAAiB,iCAAiC;IAClD,OAAO,uBAAuB;IAC9B,UAAU,0BAA0B;IACpC,UAAU,0BAA0B;IACpC,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,KAAK,qBAAqB;IAC1B,QAAQ,wBAAwB;IAChC,OAAO,uBAAuB;IAC9B,OAAO,uBAAuB;IAC9B,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;IACtC,UAAU,0BAA0B;CACrC"}
+{"version":3,"file":"keyboardGroupIds.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/keyboardGroupIds.ts"],"names":[],"mappings":"AAAA,oBAAY,wBAAwB;IAClC,eAAe,+BAA+B;IAC9C,sBAAsB,sCAAsC;IAC5D,kBAAkB,kCAAkC;IACpD,yBAAyB,yCAAyC;IAClE,aAAa,6BAA6B;IAC1C,oBAAoB,oCAAoC;IACxD,aAAa,6BAA6B;IAC1C,iBAAiB,iCAAiC;IAClD,OAAO,uBAAuB;IAC9B,UAAU,0BAA0B;IACpC,UAAU,0BAA0B;IACpC,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,KAAK,qBAAqB;IAC1B,QAAQ,wBAAwB;IAChC,OAAO,uBAAuB;IAC9B,OAAO,uBAAuB;IAC9B,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;CACvC"}

package/dist/typescript/module/features/keyboard/types/types.d.ts

@@ -11,8 +11,7 @@ export declare const enum KeyboardType {
     BasicUnits = "BasicUnits",
     BasicPlusPlus = "BasicPlusPlus",
     BasicPlusPlusMobile = "BasicPlusPlusMobile",
-    Numpad = "Numpad",
-    Underlined = "Underlined"
+    Numpad = "Numpad"
 }
 export type KeyboardKey = {
     katexValue: string;
@@ -40,7 +39,6 @@ export type KeyboardGroup = {
 };
 export type KeyboardLayoutProps = {
     onKeyPress: (key: KeyboardKeyValue) => void;
-    onLayoutChange?: (isSecondaryLayout: boolean) => void;
     color?: SelectOptionColor;
     isDisabled?: boolean;
     disabledKeys?: KeyboardKey[];

package/dist/typescript/module/features/keyboard/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,0BAAkB,YAAY;IAC5B,eAAe,oBAAoB;IACnC,KAAK,UAAU;IACf,SAAS,cAAc;IACvB,eAAe,oBAAoB;IACnC,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,mBAAmB,wBAAwB;IAC3C,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAC3C,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,KAAK,IAAI,CAAA;IACrD,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;KAC3D,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW;CACpC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,0BAAkB,YAAY;IAC5B,eAAe,oBAAoB;IACnC,KAAK,UAAU;IACf,SAAS,cAAc;IACvB,eAAe,oBAAoB;IACnC,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,mBAAmB,wBAAwB;IAC3C,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAC3C,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;KAC3D,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW;CACpC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magmamath/students-features",
-  "version": "0.9.1-rc.4",
+  "version": "0.9.1-rc2",
   "description": "Magmamath features library",
   "source": "src/index.ts",
   "main": "src/index.ts",
@@ -29,7 +29,7 @@
     "react-native-svg": "^15.10.0"
   },
   "devDependencies": {
-    "@magmamath/react-native-ui": "0.4.60-rc.2",
+    "@magmamath/react-native-ui": "0.4.44",
     "@react-native/eslint-config": "^0.73.1",
     "@release-it/conventional-changelog": "^9.0.2",
     "@types/jest": "^29.5.5",

package/src/features/chatbot/components/ChatInput/RequestHintButton.tsx

@@ -151,6 +151,6 @@ const styles = StyleSheet.create({
     borderColor: COLORS.PRIMARY_BLUE,
   },
   iconWrapper: {
-    top: 0,
+    top: IS_MOBILE ? 3 : 0,
   },
 })

package/src/features/endOfAssignment/components/CorrectAnswer/CorrectAnswer.tsx

@@ -1,5 +1,6 @@
 import React, { useCallback, useState } from 'react'
 import { View, StyleSheet } from 'react-native'
+
 import { useUnit } from 'effector-react'
 import { SPACING, Typography, COLORS, FONT_FAMILY } from '@magmamath/react-native-ui'
 
@@ -10,8 +11,6 @@ import { GOOD_DRAWING_CARD_APPEARENCE_DELAY } from '../../constants'
 import { AnimatedCardVariant, EOAModalContentProps, EOAModalVariant } from '../../types'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
-import { getEoaButtonColor } from '../../helpers'
-import { AssessmentScoreCard } from '../AssessmentScoreCard/AssessmentScoreCard'
 
 export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalContentProps) => {
   const popUpData = useUnit(model.$popUpData)
@@ -23,7 +22,6 @@ export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalC
     stats,
     hasRecommendations,
     isExam = false,
-    isAssessment = false,
     newerAssignmentAvailable,
   } = popUpData ?? {}
 
@@ -74,22 +72,14 @@ export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalC
       </View>
 
       <View style={styles.animationContainer}>
-        {isAssessment ? (
-          <AssessmentScoreCard
-            textContent={textContent}
-            solvedAmount={stats?.solvedAmount}
-            problemsAmount={stats?.problemsAmount}
-          />
-        ) : (
-          <AnimatedCard
-            variant={AnimatedCardVariant.CORRECT_ANSWER}
-            textContent={textContent}
-            solvedAmount={stats?.solvedAmount}
-            problemsAmount={stats?.problemsAmount}
-            shouldTriggerSparkles={cardsAnimationCompleted}
-            onAnimationEnd={onCorrectAnswerAnimationEnd}
-          />
-        )}
+        <AnimatedCard
+          variant={AnimatedCardVariant.CORRECT_ANSWER}
+          textContent={textContent}
+          solvedAmount={stats?.solvedAmount}
+          problemsAmount={stats?.problemsAmount}
+          shouldTriggerSparkles={cardsAnimationCompleted}
+          onAnimationEnd={onCorrectAnswerAnimationEnd}
+        />
 
         {modalVariant === EOAModalVariant.HAS_GOOD_DRAWING && (
           <AnimatedCard
@@ -106,9 +96,9 @@ export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalC
       <PracticeButtonGroup
         textContent={textContent}
         isPracticeButtonVisible={isPracticeButtonVisible}
+        isExam={isExam}
         onLeftButtonPress={model.hidePopUpAndLeave}
         onRightButtonPress={handlePracticeButtonPress}
-        buttonColor={getEoaButtonColor(popUpData)}
       />
     </View>
   )

package/src/features/endOfAssignment/components/EOAModal.tsx

@@ -14,6 +14,7 @@ import { ExamPaused } from './ExamPaused/ExamPaused'
 import { ExamSubmit } from './ExamSubmit/ExamSubmit'
 
 import { getModalContainerSize, shouldDisplayModalBackground } from '../helpers'
+import { ButtonColor } from '@magmamath/react-native-ui'
 
 const MODAL_CONTENT_VARIANTS_MAP = new Map([
   [EOAModalVariant.NO_CORRECT_ANSWERS, NoAnswer],
@@ -32,6 +33,7 @@ type EOAModalProps = {
   model: EOAModel
   textContent: EOAModalText
   onPracticePress: () => void
+  buttonColor?: ButtonColor
 }
 
 /**
@@ -40,7 +42,7 @@ type EOAModalProps = {
  * Dynamically renders a modal UI after an assignment ends, using the current `modalVariant`
  * to determine which specific view to display (e.g., `NoAnswer`, `CorrectAnswer`, `CheatDetected`).
  */
-export const EOAModal = ({ model, textContent, onPracticePress }: EOAModalProps) => {
+export const EOAModal = ({ model, textContent, onPracticePress, buttonColor }: EOAModalProps) => {
   const popUpData = useUnit(model.$popUpData)
   const modalVariant = useUnit(model.$modalVariant)
 
@@ -62,7 +64,12 @@ export const EOAModal = ({ model, textContent, onPracticePress }: EOAModalProps)
       style={getModalContainerSize(modalVariant)}
       onClose={model.hidePopUp}
       content={
-        <ModalContent model={model} textContent={textContent} onPracticePress={onPracticePress} />
+        <ModalContent
+          model={model}
+          textContent={textContent}
+          onPracticePress={onPracticePress}
+          buttonColor={buttonColor}
+        />
       }
       withBackground={withBackground}
     />

package/src/features/endOfAssignment/components/ExamPaused/ExamPaused.tsx

@@ -13,12 +13,12 @@ import {
 import { EOAModalContentProps } from '../../types'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
-import { getEoaButtonColor } from '../../helpers'
-import { useUnit } from 'effector-react'
-
-export const ExamPaused = ({ textContent, model }: EOAModalContentProps) => {
-  const popUpData = useUnit(model.$popUpData)
 
+export const ExamPaused = ({
+  textContent,
+  model,
+  buttonColor = ButtonColor.PURPLE,
+}: EOAModalContentProps) => {
   useKeyBoard({
     callback: (event) => {
       if (event.key === KeyboardKeys.ENTER) {
@@ -39,7 +39,7 @@ export const ExamPaused = ({ textContent, model }: EOAModalContentProps) => {
 
       <Button
         variant={ButtonVariant.PRIMARY}
-        colorScheme={getEoaButtonColor(popUpData)}
+        colorScheme={buttonColor}
         size={ButtonSize.LARGE}
         style={{ text: styles.buttonText }}
         onPress={model.hidePopUpAndLeave}

package/src/features/endOfAssignment/components/ExamSubmit/ExamSubmit.tsx

@@ -4,6 +4,7 @@ import { View, StyleSheet, Platform, Image } from 'react-native'
 import { useUnit } from 'effector-react'
 import {
   Button,
+  ButtonColor,
   ButtonSize,
   ButtonVariant,
   COLORS,
@@ -17,7 +18,6 @@ import { EOAModalContentProps } from '../../types'
 import { PracticeButton } from '../../ui/PracticeButton'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
-import { getEoaButtonColor } from '../../helpers'
 
 export const ExamSubmit = ({ textContent, model, onPracticePress }: EOAModalContentProps) => {
   const popUpData = useUnit(model.$popUpData)
@@ -60,7 +60,7 @@ export const ExamSubmit = ({ textContent, model, onPracticePress }: EOAModalCont
         <Button
           variant={isPracticeButtonVisible ? ButtonVariant.TERTIARY : ButtonVariant.PRIMARY}
           size={ButtonSize.LARGE}
-          colorScheme={getEoaButtonColor(popUpData)}
+          colorScheme={popUpData?.isExam ? ButtonColor.PURPLE : ButtonColor.BLUE}
           style={{ text: { textTransform: 'uppercase' } }}
           onPress={model.hidePopUpAndLeave}
         >

package/src/features/endOfAssignment/components/NoAnswer/NoAnswer.tsx

@@ -16,19 +16,17 @@ import { EOAModalContentProps } from '../../types'
 import { NoAnswerContent } from './NoAnswerContent'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
-import { getEoaButtonColor } from '../../helpers'
-import { AssessmentScoreCard } from '../AssessmentScoreCard/AssessmentScoreCard'
 
 export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalContentProps) => {
   const popUpData = useUnit(model.$popUpData)
 
-  const { stats, isExam, isAssessment, user } = popUpData ?? {}
+  const { stats, isExam, user } = popUpData ?? {}
 
   function getButtons() {
     const buttons = [
       {
         text: textContent.leftButtonText ?? '',
-        colorScheme: getEoaButtonColor(popUpData),
+        colorScheme: isExam ? ButtonColor.PURPLE : ButtonColor.BLUE,
         onPress: () => model.hidePopUpAndLeave(),
       },
     ]
@@ -86,19 +84,10 @@ export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalConten
           </Typography>
         )}
       </View>
-      {isAssessment ? (
-        <AssessmentScoreCard
-          textContent={textContent}
-          solvedAmount={stats?.solvedAmount}
-          problemsAmount={stats?.problemsAmount}
-        />
-      ) : (
-        <NoAnswerContent
-          solvedAmount={stats?.solvedAmount ?? 0}
-          problemsAmount={stats?.problemsAmount ?? 0}
-        />
-      )}
-
+      <NoAnswerContent
+        solvedAmount={stats?.solvedAmount ?? 0}
+        problemsAmount={stats?.problemsAmount ?? 0}
+      />
       <View style={styles.buttonsContainer}>
         {buttons.map((button, index) => (
           <Button

package/src/features/endOfAssignment/helpers.ts

@@ -1,17 +1,16 @@
 import { MODALS_WITH_BACKGROUND } from './constants'
-import { EOAModalData, EOAModalVariant } from './types'
-import { ButtonColor } from '@magmamath/react-native-ui'
+import { EOAModalVariant } from './types'
 
 export const getModalContainerSize = (modalVariant: EOAModalVariant) => {
   switch (modalVariant) {
     case EOAModalVariant.EXAM_SUBMIT:
     case EOAModalVariant.EXAM_SAFE_MODE_SUBMIT:
-      return { container: { width: 620, height: 384 } }
+      return { container: { width: 600, height: 384 } }
     case EOAModalVariant.EXAM_PAUSED:
     case EOAModalVariant.EXAM_SAFE_MODE_CHEAT_DETECTED:
       return { container: { width: 560, height: 338 } }
     case EOAModalVariant.EXAM_SAFE_MODE_LEAVE:
-      return { container: { width: 550, height: 325 } }
+      return { container: { width: 550, height: 280 } }
     case EOAModalVariant.HAS_GOOD_DRAWING:
       return { container: { width: 957, height: 550 } }
     case EOAModalVariant.HAS_CORRECT_ANSWERS:
@@ -27,9 +26,3 @@ export const shouldDisplayModalBackground = (modalVariant: EOAModalVariant | nul
 
   return MODALS_WITH_BACKGROUND.includes(modalVariant)
 }
-
-export const getEoaButtonColor = (popupData: EOAModalData | null): ButtonColor => {
-  if (popupData?.isAssessment) return ButtonColor.SUNSET
-  if (popupData?.isExam) return ButtonColor.PURPLE
-  return ButtonColor.BLUE
-}

package/src/features/endOfAssignment/model/model.ts

@@ -9,7 +9,6 @@ export class EOAModel {
   public readonly leavePressed = createEvent()
   public readonly goToFirstProblemPressed = createEvent()
   public readonly recommendationsUpdated = createEvent<boolean>()
-  public readonly popUpStatsUpdated = createEvent<Partial<EOAModalData['stats']>>()
   public readonly popUpTriggered = createEvent<EOAEventType>()
 
   public readonly $popUpData = createStore<EOAModalData | null>(null)
@@ -17,9 +16,6 @@ export class EOAModel {
     .on(this.recommendationsUpdated, (state, hasRecommendations) =>
       state ? { ...state, hasRecommendations } : state,
     )
-    .on(this.popUpStatsUpdated, (state, payload) =>
-      state ? { ...state, stats: { ...state.stats, ...payload } } : state,
-    )
     .reset(this.hidePopUp)
 
   public readonly $modalVariant = createStore<EOAModalVariant | null>(null)
@@ -37,7 +33,7 @@ export class EOAModel {
       }
 
       if (eventType === EOAEventType.EXAM_PAUSED) return EOAModalVariant.EXAM_PAUSED
-
+      
       if (eventType === EOAEventType.CHEAT_DETECTED) {
         return EOAModalVariant.EXAM_SAFE_MODE_CHEAT_DETECTED
       }

package/src/features/endOfAssignment/types.ts

@@ -34,11 +34,11 @@ export type EOAModalContentProps = {
   textContent: EOAModalText
   model: EOAModel
   onPracticePress?: () => void
+  buttonColor?: ButtonColor
 }
 
 export type EOAModalData = {
   isExam: boolean
-  isAssessment: boolean
   newerAssignmentAvailable?: boolean
   examFinished?: boolean
   cheatDetection?: boolean
@@ -63,6 +63,5 @@ export type EOAModalText = {
     correctAnswersPlural?: string
     goodCalculations?: string
     goodCalculationsPlural?: string
-    score?: string
   }
 }

package/src/features/endOfAssignment/ui/PracticeButtonGroup.tsx

@@ -11,14 +11,13 @@ import Animated, {
 import { ButtonVariant, SPACING, Button, ButtonSize, ButtonColor } from '@magmamath/react-native-ui'
 
 import { PracticeButton } from './PracticeButton'
-import { getEoaButtonColor } from '../helpers'
 
 type PracticeButtonGroupProps = {
   textContent: { leftButtonText?: string; rightButtonText?: string }
   isPracticeButtonVisible: boolean
   onLeftButtonPress: () => void
   onRightButtonPress: () => void
-  buttonColor?: ButtonColor
+  isExam: boolean
 }
 
 export const PracticeButtonGroup = ({
@@ -26,7 +25,7 @@ export const PracticeButtonGroup = ({
   isPracticeButtonVisible,
   onLeftButtonPress,
   onRightButtonPress,
-  buttonColor = ButtonColor.BLUE,
+  isExam,
 }: PracticeButtonGroupProps) => {
   const buttonsContainerOpacity = useSharedValue(0)
 
@@ -46,7 +45,7 @@ export const PracticeButtonGroup = ({
         <Button
           variant={isPracticeButtonVisible ? ButtonVariant.TERTIARY : ButtonVariant.PRIMARY}
           size={ButtonSize.LARGE}
-          colorScheme={buttonColor}
+          colorScheme={isExam ? ButtonColor.PURPLE : ButtonColor.BLUE}
           style={{ text: { textTransform: 'uppercase' } }}
           onPress={onLeftButtonPress}
         >

package/src/features/formulaSheet/components/FormulaSheetModal.tsx

@@ -3,7 +3,6 @@ import { View, Modal, StyleSheet, TouchableWithoutFeedback } from 'react-native'
 import {
   BORDER_RADIUS,
   COLORS,
-  IS_MOBILE,
   Loader,
   LoaderColor,
   LoaderSize,
@@ -19,23 +18,12 @@ type FormulaSheetModalProps = {
 
 export const FormulaSheetModal = ({
   children,
-  loaderColor = LoaderColor.BLUE,
+  loaderColor,
   isLoading,
   onClose,
 }: PropsWithChildren<FormulaSheetModalProps>) => {
   return (
-    <Modal
-      transparent
-      //it is needed for the new RN architecture. Should be rewriten on modalfy
-      supportedOrientations={
-        IS_MOBILE
-          ? ['portrait', 'portrait-upside-down', 'landscape', 'landscape-left', 'landscape-right']
-          : undefined
-      }
-      visible
-      animationType="none"
-      onRequestClose={onClose}
-    >
+    <Modal visible transparent animationType="none" onRequestClose={onClose}>
       <TouchableWithoutFeedback onPress={onClose}>
         <View style={styles.container}>
           <TouchableWithoutFeedback onPress={(event) => event.stopPropagation()}>

package/src/features/gifCelebrations/components/Gif.tsx

@@ -82,7 +82,7 @@ const styles = StyleSheet.create({
   },
   textContainer: {
     position: 'absolute',
-    bottom: IS_WEB ? 74 : 98,
+    bottom: 74,
     alignSelf: 'center',
   },
 })

package/src/features/keyboard/components/AlgebraLayout/AlgebraLayout.tsx

@@ -9,11 +9,11 @@ import { SelectedLayout } from './types'
 import { getKeyboardGroup } from '../../helpers'
 import { getSelectOptions } from './helpers'
 
-export const AlgebraLayout = ({ onLayoutChange, ...props }: KeyboardLayoutProps) => {
+export const AlgebraLayout = (props: KeyboardLayoutProps) => {
   const [selectedLayout, setSelectedLayout] = useState<SelectedLayout>(SelectedLayout.BASIC)
   const t = useText()
   const { width } = useWindowDimensions()
-  const selectOptions = getSelectOptions({ selectedLayout, setSelectedLayout, onLayoutChange })
+  const selectOptions = getSelectOptions(selectedLayout, setSelectedLayout)
   const isDesktop = width > MOBILE_LAYOUT_WIDTH && !IS_MOBILE
   const locale = t('locale') as Locale
 

package/src/features/keyboard/components/AlgebraLayout/helpers.tsx

@@ -10,17 +10,10 @@ type LayoutOption = {
   onPressIn: () => void
 }
 
-type GetSelectOptionsProps = {
-  selectedLayout: SelectedLayout
-  setSelectedLayout: (layout: SelectedLayout) => void
-  onLayoutChange?: (isSecondaryLayout: boolean) => void
-}
-
-export function getSelectOptions({
-  selectedLayout,
-  setSelectedLayout,
-  onLayoutChange,
-}: GetSelectOptionsProps): LayoutOption[] {
+export function getSelectOptions(
+  selectedLayout: SelectedLayout,
+  setSelectedLayout: (layout: SelectedLayout) => void,
+): LayoutOption[] {
   return [
     {
       key: SelectedLayout.BASIC,
@@ -30,10 +23,7 @@ export function getSelectOptions({
           size={22}
         />
       ),
-      onPressIn: () => {
-        setSelectedLayout(SelectedLayout.BASIC)
-        onLayoutChange?.(false)
-      },
+      onPressIn: () => setSelectedLayout(SelectedLayout.BASIC),
     },
     {
       key: SelectedLayout.ALGEBRA,
@@ -43,10 +33,7 @@ export function getSelectOptions({
           size={25}
         />
       ),
-      onPressIn: () => {
-        setSelectedLayout(SelectedLayout.ALGEBRA)
-        onLayoutChange?.(true)
-      },
+      onPressIn: () => setSelectedLayout(SelectedLayout.ALGEBRA),
     },
   ]
 }

package/src/features/keyboard/components/Keyboard.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useMemo, useRef } from 'react'
 import { Animated, StyleProp, StyleSheet, useWindowDimensions, ViewStyle } from 'react-native'
 import { COLORS, IS_MOBILE, SelectOptionColor, SHADOWS } from '@magmamath/react-native-ui'
+import { getLayoutByCharType } from '../constants/keyboardLayouts'
 import { KeyboardKey, KeyboardKeyValue } from '../types/types'
 import { Numpad } from './Numpad/Numpad'
 import { MOBILE_LAYOUT_WIDTH } from '../constants/constants'
@@ -10,7 +11,6 @@ import {
   slideInAnimationSettings,
   slideOutAnimationSettings,
 } from './constants'
-import { MainLayout } from './MainLayout'
 
 type KeyboardProps = {
   onKeyPress: (key: KeyboardKeyValue) => void
@@ -19,15 +19,15 @@ type KeyboardProps = {
   color?: SelectOptionColor
   isVisible?: boolean
   isDisabled?: boolean
-  showUnderlinedKeys?: boolean
   disabledKeys?: KeyboardKey[]
 }
 
 export const Keyboard = ({ style, characterType, isVisible = true, ...props }: KeyboardProps) => {
   const slideAnim = useRef(new Animated.Value(isVisible ? 0 : KEYBOARD_SLIDE_DISTANCE)).current
-
   const { width } = useWindowDimensions()
   const isMobile = width <= MOBILE_LAYOUT_WIDTH || IS_MOBILE
+
+  const Layout = useMemo(() => getLayoutByCharType(characterType), [characterType])
   const mobileStyles = useMemo(
     () => getLayoutConfigStyles(characterType, isMobile),
     [characterType, isMobile],
@@ -57,7 +57,7 @@ export const Keyboard = ({ style, characterType, isVisible = true, ...props }: K
         },
       ]}
     >
-      <MainLayout {...props} characterType={characterType} />
+      <Layout {...props} />
       <Numpad {...props} style={mobileStyles} />
     </Animated.View>
   )
@@ -76,6 +76,7 @@ const styles = StyleSheet.create({
     borderColor: COLORS.NEUTRAL_5,
     borderWidth: 1,
     width: 'auto',
+    overflow: 'hidden',
     height: 155,
     ...SHADOWS[2],
   },

package/src/features/keyboard/components/KeysList/KeysList.tsx

@@ -37,10 +37,9 @@ export const KeysList = ({
           onKeyPress,
           disabledKeys,
           optionStyle: style?.option,
-          isDisabled,
         }),
       ),
-    [keys, onKeyPress, disabledKeys, style?.option, isDisabled],
+    [keys, onKeyPress, disabledKeys, style?.option],
   )
 
   return (

package/src/features/keyboard/components/KeysList/helpers.ts

@@ -9,7 +9,6 @@ type MapKeyToOptionProps = {
   onKeyPress?: (key: KeyboardKeyValue) => void
   disabledKeys?: KeyboardKey[]
   optionStyle?: ButtonStyle
-  isDisabled?: boolean
 }
 
 export const IS_IOS_WEB = getIsIpadOrIphoneDevice()
@@ -28,7 +27,6 @@ export const mapKeyToOption = ({
   onKeyPress,
   disabledKeys,
   optionStyle,
-  isDisabled,
 }: MapKeyToOptionProps) => {
   const pressHandler = (e: GestureResponderEvent) => {
     onKeyPress?.({
@@ -47,6 +45,6 @@ export const mapKeyToOption = ({
     delayPressIn: 0,
     style: mergeOptionStyles(optionStyle, key.style),
     ...(IS_IOS_WEB ? { onPress: pressHandler } : { onPressIn: pressHandler }),
-    disabled: isDisabled || isKeyDisabled(key, disabledKeys),
+    disabled: isKeyDisabled(key, disabledKeys),
   }
 }

package/src/features/keyboard/components/UnitsLayout/UnitsLayout.tsx

@@ -12,7 +12,7 @@ import { KeyboardUnitsGroupType, SelectedLayout } from './types'
 import { getSelectOptions } from './helpers'
 import { IS_MOBILE } from '@magmamath/react-native-ui'
 
-export const UnitsLayout = ({ onLayoutChange, ...props }: KeyboardLayoutProps) => {
+export const UnitsLayout = (props: KeyboardLayoutProps) => {
   const { width } = useWindowDimensions()
   const t = useText()
   const locale = t('locale') as Locale
@@ -26,7 +26,6 @@ export const UnitsLayout = ({ onLayoutChange, ...props }: KeyboardLayoutProps) =
     activeTabKey: activeTab.key as KeyboardUnitsGroupType,
     selectedLayout,
     setSelectedLayout,
-    onLayoutChange,
   })
 
   return (

package/src/features/keyboard/components/UnitsLayout/helpers.tsx

@@ -8,14 +8,12 @@ type UseLayoutSelectOptionsProps = {
   activeTabKey: KeyboardUnitsGroupType
   selectedLayout: SelectedLayout
   setSelectedLayout: (layout: SelectedLayout) => void
-  onLayoutChange?: (isSecondaryLayout: boolean) => void
 }
 
 export const getSelectOptions = ({
   activeTabKey,
   selectedLayout,
   setSelectedLayout,
-  onLayoutChange,
 }: UseLayoutSelectOptionsProps) => {
   {
     const SelectedIcon = UNITS_KEYBOARD_GROUPS.get(activeTabKey)?.icon || RulerIcon
@@ -29,10 +27,7 @@ export const getSelectOptions = ({
             size={22}
           />
         ),
-        onPressIn: () => {
-          setSelectedLayout(SelectedLayout.ALGEBRA)
-          onLayoutChange?.(false)
-        },
+        onPressIn: () => setSelectedLayout(SelectedLayout.ALGEBRA),
       },
       {
         key: SelectedLayout.UNITS,
@@ -42,10 +37,7 @@ export const getSelectOptions = ({
             size={16}
           />
         ),
-        onPressIn: () => {
-          setSelectedLayout(SelectedLayout.UNITS)
-          onLayoutChange?.(true)
-        },
+        onPressIn: () => setSelectedLayout(SelectedLayout.UNITS),
       },
     ]
   }