@magmamath/students-features 0.9.14-rc.16 → 0.9.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magmamath/students-features",
-  "version": "0.9.14-rc.16",
+  "version": "0.9.91",
   "description": "Magmamath features library",
   "source": "src/index.ts",
   "main": "src/index.ts",

package/src/features/celebrations/helpers.ts

@@ -1,41 +1,39 @@
-import { ParticlesBatch } from './components/ParticleBatch'
-import { Spark } from './components/Spark'
-import { CELEBRATION_ICON_CONFIG, CELEBRATION_VARIANTS } from './config'
-import { CelebrationVariant } from './types'
+import { ParticlesBatch } from './components/ParticleBatch';
+import { Spark } from './components/Spark';
+import { CELEBRATION_ICON_CONFIG, CELEBRATION_VARIANTS } from './config';
+import { CelebrationVariant } from './types';
 
-export const randomRange = (min: number, max: number) => Math.random() * (max - min) + min
+export const randomRange = (min: number, max: number) => Math.random() * (max - min) + min;
 
 const isDateInRange = (currentDate: Date, startDateStr: string, endDateStr: string) => {
-  const [startDay, startMonth] = startDateStr.split('-').map(Number)
-  const [endDay, endMonth] = endDateStr.split('-').map(Number)
+  const [startDay, startMonth] = startDateStr.split('-').map(Number);
+  const [endDay, endMonth] = endDateStr.split('-').map(Number);
 
-  const currentYear = currentDate.getFullYear()
-  const startDate = new Date(currentYear, startMonth - 1, startDay)
+  const currentYear = currentDate.getFullYear();
+  const startDate = new Date(currentYear, startMonth - 1, startDay);
+  const endDate = new Date(currentYear, endMonth - 1, endDay + 1);
 
-  // If end month is earlier than start month, it spans to next year
-  const endYear = endMonth < startMonth ? currentYear + 1 : currentYear
-  const endDate = new Date(endYear, endMonth - 1, endDay + 1)
-
-  return currentDate >= startDate && currentDate <= endDate
-}
+  return currentDate >= startDate && currentDate <= endDate;
+};
 
 export const getIconForCurrentDate = () => {
-  const currentDate = new Date()
+  const currentDate = new Date();
 
   for (const celebration of CELEBRATION_ICON_CONFIG) {
     if (celebration.activePeriod) {
-      const { start, end } = celebration.activePeriod
+      const { start, end } = celebration.activePeriod;
       if (isDateInRange(currentDate, start, end)) {
-        return celebration.Icon
+        return celebration.Icon;
       }
     }
   }
 
-  return CELEBRATION_ICON_CONFIG[0].Icon
-}
+  return CELEBRATION_ICON_CONFIG[0].Icon;
+};
 
-const MainIcon = getIconForCurrentDate()
-export const generateParticle = (variant: CelebrationVariant) => {
+const MainIcon = getIconForCurrentDate();
+export const generateParticle = (variant: CelebrationVariant
+) => {
   const {
     elementsCount,
     angle,
@@ -46,20 +44,20 @@ export const generateParticle = (variant: CelebrationVariant) => {
     friction,
     life,
     angularAcceleration,
-    speedRange,
-  } = CELEBRATION_VARIANTS[variant]
+    speedRange
+  } = CELEBRATION_VARIANTS[variant];
 
   const sparkSpeedMin = speedRange?.spark?.[0]
   const sparkSpeedMax = speedRange?.spark?.[1]
   const mainSpeedMin = speedRange?.main?.[0]
   const mainSpeedMax = speedRange?.main?.[1]
 
-  const particles: ParticlesBatch[] = []
+  const particles: ParticlesBatch[] = [];
 
   for (let i = 0; i < elementsCount.spark; i++) {
-    const randomAngle = randomRange((angle.from * Math.PI) / 180, (angle.to * Math.PI) / 180)
-    const randomSpeed = randomRange(sparkSpeedMin, sparkSpeedMax)
-    const randomAngularAcceleration = randomRange(angularAcceleration.from, angularAcceleration.to)
+    const randomAngle = randomRange((angle.from * Math.PI) / 180, (angle.to * Math.PI) / 180);
+    const randomSpeed = randomRange(sparkSpeedMin, sparkSpeedMax);
+    const randomAngularAcceleration = randomRange(angularAcceleration.from, angularAcceleration.to);
 
     particles.push({
       id: Math.random(),
@@ -76,12 +74,12 @@ export const generateParticle = (variant: CelebrationVariant) => {
       friction,
       Component: Spark,
       life,
-    })
+    });
   }
   for (let i = 0; i < elementsCount.star; i++) {
-    const randomAngle = randomRange((angle.from * Math.PI) / 180, (angle.to * Math.PI) / 180)
-    const randomSpeed = randomRange(mainSpeedMin, mainSpeedMax)
-    const randomAngularAcceleration = randomRange(angularAcceleration.from, angularAcceleration.to)
+    const randomAngle = randomRange((angle.from * Math.PI) / 180, (angle.to * Math.PI) / 180);
+    const randomSpeed = randomRange(mainSpeedMin, mainSpeedMax);
+    const randomAngularAcceleration = randomRange(angularAcceleration.from, angularAcceleration.to);
 
     particles.push({
       id: Math.random(),
@@ -98,8 +96,8 @@ export const generateParticle = (variant: CelebrationVariant) => {
       friction,
       Component: MainIcon,
       life,
-    })
+    });
   }
 
-  return particles
-}
+  return particles;
+};

package/src/features/chatbot/components/Chatbot.tsx

@@ -30,14 +30,14 @@ export const Chatbot = ({
   iconSize,
   colorScheme = ColorScheme.Blue,
 }: ChatbotProps) => {
-  const isChatAllowed = useUnit(model.$chatAccess)
+  const alternatives = useUnit(model.$alternatives)
   const isAvailable = useStoreMap(model.$currentChatData, ({ isAvailable }) => isAvailable)
   model.t2s.setAudioConfig(textToSpeechConfig ?? null)
 
   const openChat = () => model.setIsOpen(true)
   const closeChat = () => model.setIsOpen(false)
 
-  if (!isAvailable || !isChatAllowed) {
+  if (!isAvailable || alternatives?.chatAccess === false) {
     return null
   }
 

package/src/features/chatbot/model/ChatBotModel.ts

@@ -7,7 +7,6 @@ import {
   restore,
   sample,
   type Store,
-  StoreWritable
 } from 'effector'
 import {
   ChatbotContext,
@@ -75,18 +74,14 @@ export class ChatbotModel {
 
   private readonly cache = new ChatsCacheModel()
 
-  public readonly $chatAccess: StoreWritable<boolean>
-
   public readonly $currentChatData = combine(
     { data: this.cache.$data, key: this.$currentKey },
     ({ data, key }) => (data[key] ? { ...data[key], key } : { ...defaultChatData(), key }),
   )
 
-  constructor({ api, $key, threadMessagesLimit, settings = {}, chatAccess }: ChatbotModelProps) {
+  constructor({ api, $key, threadMessagesLimit, settings = {} }: ChatbotModelProps) {
     this.api = new ChatbotAPI({ ...api, postMessage: this.threadManager.postMessage })
 
-    this.$chatAccess = chatAccess
-
     this.threadManager.setApi({ getHint: api.requestHint, sendMessage: api.sendMessage })
     if (threadMessagesLimit) {
       this.threadManager.setMessagesLimit(threadMessagesLimit)
@@ -150,16 +145,16 @@ export class ChatbotModel {
     }
 
     this.startConversation = attach({
-      source: { currentChatData: this.$currentChatData, chatAccess: this.$chatAccess },
+      source: { currentChatData: this.$currentChatData, alternatives: this.$alternatives },
       mapParams: (props: StartConversationProps | void, source) => ({
         ...props,
         ...source,
       }),
       effect: createEffect(
-        ({ currentChatData, initOnly, chatAccess }: StartConversationFxData) => {
+        ({ currentChatData, alternatives, initOnly }: StartConversationFxData) => {
           const { key, messages } = currentChatData
 
-          if (!chatAccess) return
+          if (!alternatives?.chatAccess) return
 
           if (messages.length) {
             if (initOnly) return
@@ -176,7 +171,7 @@ export class ChatbotModel {
 
     this.api.getAlternativesFx.doneData.watch((alternatives) => {
       // Use short text for another hint option if openChatEnabled
-      if (alternatives?.isOpenChatEnabled && IS_WEB) {
+      if (alternatives?.chatAccess && alternatives?.isOpenChatEnabled && IS_WEB) {
         this.textManager.update((creator) => ({
           anotherHintOption: creator.createOption('chat.giveHintOpenChat'),
         }))

package/src/features/chatbot/model/t2s.ts

@@ -86,12 +86,11 @@ export class ChatTextToSpeechModel {
           input: { text },
           voice: config?.voice ?? DEFAULT_VOICE,
           audioConfig: config?.audioConfig ?? AUDIO_CONFIG,
-          enableTimePointing: [],
         })
 
         // Response might be different type based on provided AUDIO_CONFIG
-        if (typeof response.audioContent === 'string') {
-          audioPath = `data:audio/mpeg;base64,${response.audioContent}`
+        if (typeof response === 'string') {
+          audioPath = `data:audio/mpeg;base64,${response}`
         } else {
           audioPath = response?.audioContent ?? ''
         }

package/src/features/chatbot/types/api.types.ts

@@ -11,9 +11,6 @@ export type AlternativesOptions = {
 }
 
 export type GetAlternativesResponse = {
-  /**
-   * @deprecated chatAccess depends on assignment.lavaChat or class grade
-   */
   chatAccess?: boolean
   isOpenChatEnabled?: boolean
   version: string
@@ -59,7 +56,6 @@ export type PostMessageResponse = {
 export type GoogleTranslatePayload = {
   text: string[]
   targetLanguage: string
-  sourceLanguage?: string
 }
 
 export type GoogleTranslateResponse = {
@@ -81,18 +77,9 @@ export type GoogleText2SpeechPayload = {
     pitch: number
     speakingRate: number
   }
-  enableTimePointing?: string[]
 }
 
-export type Timepoint = {
-  markName: string
-  timeSeconds: number
-}
-
-export type GoogleText2SpeechResponse = {
-  audioContent?: string
-  timepoints?: Timepoint[]
-}
+export type GoogleText2SpeechResponse = string | undefined | { audioContent?: string }
 
 export type ChatHintPayload = {
   problemDescription: string

package/src/features/chatbot/types/model.types.ts

@@ -1,4 +1,4 @@
-import type { Store, StoreWritable } from 'effector'
+import type { Store } from 'effector'
 import {
   ChatHintPayload,
   ChatHintResponse,
@@ -17,7 +17,6 @@ import {
 } from './api.types'
 import { ExtendWithOptional } from '../../../lib/helpers/types'
 import { ChatAnswer, ChatItem, ConversationMessage, FullStrokeData } from './units.types'
-import { WithAbortSignal } from '../../../lib/types/requests'
 
 export type ChatbotMessages = {
   error: ConversationMessage
@@ -28,14 +27,10 @@ export type ChatbotMessages = {
 
 export type ChatbotApiRequests = {
   getAlternatives: (props: GetAlternativesPayload) => Promise<GetAlternativesResponse>
-  sendMessage: (props: WithAbortSignal<SendMessagePayload>) => Promise<SendMessageResponse>
-  postMessage: (props: WithAbortSignal<PostMessagePayload>) => Promise<PostMessageResponse>
-  postTranslateText: (
-    props: WithAbortSignal<GoogleTranslatePayload>,
-  ) => Promise<GoogleTranslateResponse>
-  postTextToSpeech: (
-    props: WithAbortSignal<GoogleText2SpeechPayload>,
-  ) => Promise<GoogleText2SpeechResponse>
+  sendMessage: (props: SendMessagePayload) => Promise<SendMessageResponse>
+  postMessage: (props: PostMessagePayload) => Promise<PostMessageResponse>
+  postTranslateText: (props: GoogleTranslatePayload) => Promise<GoogleTranslateResponse>
+  postTextToSpeech: (props: GoogleText2SpeechPayload) => Promise<GoogleText2SpeechResponse>
   /**
    * @deprecated merged with hint
    */
@@ -52,7 +47,6 @@ export type ChatbotModelProps = {
     requestHint: (props: ChatHintPayload) => Promise<ChatHintResponse>
   }
   threadMessagesLimit?: number
-  chatAccess: StoreWritable<boolean>
   settings?: ChatbotSettings
 }
 
@@ -83,7 +77,6 @@ export type StartConversationFxData = {
     messages: ConversationMessage[]
   }
   alternatives?: GetAlternativesResponse | null
-  chatAccess: boolean
 } & StartConversationProps
 
 export enum MessageVariant {

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

@@ -11,6 +11,7 @@ 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 }
@@ -20,8 +21,6 @@ type PracticeButtonGroupProps = {
   buttonColor?: ButtonColor
 }
 
-const APPEARANCE_DELAY = 1600
-
 export const PracticeButtonGroup = ({
   textContent,
   isPracticeButtonVisible,
@@ -32,7 +31,7 @@ export const PracticeButtonGroup = ({
   const buttonsContainerOpacity = useSharedValue(0)
 
   useEffect(() => {
-    buttonsContainerOpacity.value = withDelay(APPEARANCE_DELAY, withTiming(1, { duration: 500 }))
+    buttonsContainerOpacity.value = withDelay(1000, withTiming(1, { duration: 500 }))
   }, [])
 
   return (
@@ -40,7 +39,7 @@ export const PracticeButtonGroup = ({
       <Animated.View
         entering={
           isPracticeButtonVisible
-            ? FadeInRight.delay(APPEARANCE_DELAY).duration(500).easing(Easing.ease)
+            ? FadeInRight.delay(1000).duration(500).easing(Easing.ease)
             : FadeInUp.duration(500)
         }
       >

package/src/features/feedback/model/model.ts

@@ -11,10 +11,7 @@ export type TeacherFeedbackModelProps = {
     getComments: (props: GetCommentsPayload) => Promise<GetCommentsResponse>
     updateCommentStatusSeen: (props: UpdateCommentStatusSeenPayload) => Promise<void>
   }
-  /**
-   * @deprecated - use socket and events directly in the client
-   */
-  socket?: any
+  socket: any
   credits: {
     $assignmentId: Store<string>
     $problemId: Store<string>

package/src/features/feedback/model/sockets.ts

@@ -2,23 +2,21 @@ import { createEvent } from 'effector'
 import { TeacherComment, FeedbackSocketEvents } from '../types'
 
 export class TeacherFeedbackSockets {
-  private readonly socket: any = null
+  private readonly socket: any
   public readonly commentAdded = createEvent<TeacherComment>()
   public readonly commentDeleted = createEvent<TeacherComment>()
 
   constructor(socket: any) {
-    if (socket) {
-      this.socket = socket
-    }
+    this.socket = socket
   }
 
   connect() {
-    this.socket?.on(FeedbackSocketEvents.COMMENT_ADDED, this.commentAdded)
-    this.socket?.on(FeedbackSocketEvents.COMMENT_DELETED, this.commentDeleted)
+    this.socket.on(FeedbackSocketEvents.COMMENT_ADDED, this.commentAdded)
+    this.socket.on(FeedbackSocketEvents.COMMENT_DELETED, this.commentDeleted)
   }
 
   off() {
-    this.socket?.off(FeedbackSocketEvents.COMMENT_ADDED, this.commentAdded)
-    this.socket?.off(FeedbackSocketEvents.COMMENT_DELETED, this.commentDeleted)
+    this.socket.off(FeedbackSocketEvents.COMMENT_ADDED, this.commentAdded)
+    this.socket.off(FeedbackSocketEvents.COMMENT_DELETED, this.commentDeleted)
   }
 }

package/src/features/keyboard/components/BasicLayout/keyboardGroups.ts

@@ -58,7 +58,3 @@ export const MATH_CURRENCY_US_KEYBOARD_GROUP: KeyboardGroup = {
   id: MathEntryKeyboardGroupId.CURRENCY_US,
   keys: [MATH_CURRENCY_UNITS.DOLLAR, MATH_CURRENCY_UNITS.CENT],
 }
-export const MATH_CURRENCY_DE_KEYBOARD_GROUP: KeyboardGroup = {
-  id: MathEntryKeyboardGroupId.CURRENCY_DE,
-  keys: [MATH_CURRENCY_UNITS.EURO, MATH_CURRENCY_UNITS.DOLLAR, MATH_CURRENCY_UNITS.POUND],
-}

package/src/features/keyboard/components/BasicPlusLayout/keyboardGroups.ts

@@ -9,21 +9,19 @@ export const MATH_ENTRY_BASIC_SW_PLUS: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-    MATH_BASIC_OPERATORS.FRACTION,
+    MATH_BASIC_OPERATORS.PARENTHESES,
+    MATH_BASIC_OPERATORS.SQUARE_POWER,
+    MATH_BASIC_OPERATORS.SQUARE_ROOT,
     MATH_BASIC_OPERATORS.C_DOT,
     MATH_BASIC_OPERATORS.DIVISION,
     MATH_BASIC_OPERATORS.DOT,
     MATH_BASIC_OPERATORS.PERCENT,
-    MATH_BASIC_OPERATORS.SQUARE_POWER,
-    MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.NTH_POWER,
+    MATH_BASIC_OPERATORS.NTH_ROOT,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
     MATH_BASIC_OPERATORS.PERMILLE,
-    MATH_BASIC_OPERATORS.NTH_POWER,
-    MATH_BASIC_OPERATORS.NTH_ROOT,
   ],
 }
 
@@ -33,20 +31,17 @@ export const MATH_ENTRY_BASIC_PLUS_MOBILE_SW: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-    MATH_BASIC_OPERATORS.FRACTION,
-    MATH_BASIC_OPERATORS.C_DOT,
+    MATH_BASIC_OPERATORS.SQUARE_POWER,
+    MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.MULTIPLICATION,
     MATH_BASIC_OPERATORS.DIVISION,
     MATH_BASIC_OPERATORS.DOT,
     MATH_BASIC_OPERATORS.PERCENT,
-    MATH_BASIC_OPERATORS.SQUARE_POWER,
-    MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.NTH_POWER,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
     MATH_BASIC_OPERATORS.PERMILLE,
-    MATH_BASIC_OPERATORS.NTH_POWER,
   ],
 }
 
@@ -56,21 +51,19 @@ export const MATH_ENTRY_BASIC_US_PLUS: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-    MATH_BASIC_OPERATORS.FRACTION,
+    MATH_BASIC_OPERATORS.PARENTHESES,
+    MATH_BASIC_OPERATORS.SQUARE_POWER,
+    MATH_BASIC_OPERATORS.SQUARE_ROOT,
     MATH_BASIC_OPERATORS.MULTIPLICATION,
     MATH_BASIC_OPERATORS.DIVISION,
     MATH_BASIC_OPERATORS.COMMA,
     MATH_BASIC_OPERATORS.PERCENT,
-    MATH_BASIC_OPERATORS.SQUARE_POWER,
-    MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.NTH_POWER,
+    MATH_BASIC_OPERATORS.NTH_ROOT,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
     MATH_BASIC_OPERATORS.PERMILLE,
-    MATH_BASIC_OPERATORS.NTH_POWER,
-    MATH_BASIC_OPERATORS.NTH_ROOT,
   ],
 }
 
@@ -80,19 +73,16 @@ export const MATH_ENTRY_BASIC_PLUS_MOBILE: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-    MATH_BASIC_OPERATORS.FRACTION,
+    MATH_BASIC_OPERATORS.SQUARE_POWER,
+    MATH_BASIC_OPERATORS.SQUARE_ROOT,
     MATH_BASIC_OPERATORS.MULTIPLICATION,
     MATH_BASIC_OPERATORS.DIVISION,
     MATH_BASIC_OPERATORS.COMMA,
     MATH_BASIC_OPERATORS.PERCENT,
-    MATH_BASIC_OPERATORS.SQUARE_POWER,
-    MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.NTH_POWER,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
     MATH_BASIC_OPERATORS.PERMILLE,
-    MATH_BASIC_OPERATORS.NTH_POWER,
   ],
 }

package/src/features/keyboard/components/BasicPlusPlusLayout/keyboardGroups.ts

@@ -11,22 +11,21 @@ export const MATH_ENTRY_BASIC_PLUS_PLUS: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
+    MATH_BASIC_OPERATORS.PARENTHESES,
     MATH_BASIC_OPERATORS.SQUARE_POWER,
     MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.PLUS_MINUS,
     MATH_SYMBOLS.PI,
     MATH_GEOMETRY_SYMBOLS.RADIAN,
     MATH_BASIC_OPERATORS.MULTIPLICATION,
     MATH_BASIC_OPERATORS.FRACTION,
     MATH_BASIC_OPERATORS.SLASH,
-    MATH_BASIC_OPERATORS.PLUS_MINUS,
+    MATH_BASIC_OPERATORS.COMMA,
     MATH_BASIC_OPERATORS.PERCENT,
     MATH_BASIC_OPERATORS.NTH_POWER,
     MATH_BASIC_OPERATORS.NTH_ROOT,
     MATH_SYMBOLS.THETA,
     MATH_GEOMETRY_SYMBOLS.DEGREE,
-    MATH_BASIC_OPERATORS.COMMA,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
@@ -44,23 +43,21 @@ export const MATH_ENTRY_BASIC_PLUS_PLUS_MOBILE: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-    MATH_SYMBOLS.PI,
-    MATH_GEOMETRY_SYMBOLS.RADIAN,
+    MATH_BASIC_OPERATORS.SQUARE_POWER,
+    MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.GREATER_THAN,
     MATH_BASIC_OPERATORS.MULTIPLICATION,
     MATH_BASIC_OPERATORS.FRACTION,
     MATH_BASIC_OPERATORS.COMMA,
-    MATH_BASIC_OPERATORS.SQUARE_POWER,
-    MATH_BASIC_OPERATORS.SQUARE_ROOT,
-    MATH_SYMBOLS.THETA,
-    MATH_GEOMETRY_SYMBOLS.DEGREE,
+    MATH_BASIC_OPERATORS.NTH_POWER,
+    MATH_SYMBOLS.PI,
+    MATH_BASIC_OPERATORS.LESS_THAN,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
-    MATH_BASIC_OPERATORS.NTH_POWER,
-    MATH_BASIC_OPERATORS.LESS_THAN,
-    MATH_BASIC_OPERATORS.GREATER_THAN,
+    MATH_SYMBOLS.THETA,
+    MATH_GEOMETRY_SYMBOLS.DEGREE,
+    MATH_GEOMETRY_SYMBOLS.RADIAN,
   ],
 }
 
@@ -70,22 +67,21 @@ export const MATH_ENTRY_BASIC_PLUS_PLUS_SW: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
+    MATH_BASIC_OPERATORS.PARENTHESES,
     MATH_BASIC_OPERATORS.SQUARE_POWER,
     MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.PLUS_MINUS,
     MATH_SYMBOLS.PI,
     MATH_GEOMETRY_SYMBOLS.RADIAN,
     MATH_BASIC_OPERATORS.C_DOT,
     MATH_BASIC_OPERATORS.FRACTION,
     MATH_BASIC_OPERATORS.SLASH,
-    MATH_BASIC_OPERATORS.PLUS_MINUS,
+    MATH_BASIC_OPERATORS.DOT,
     MATH_BASIC_OPERATORS.PERCENT,
     MATH_BASIC_OPERATORS.NTH_POWER,
     MATH_BASIC_OPERATORS.NTH_ROOT,
     MATH_SYMBOLS.THETA,
     MATH_GEOMETRY_SYMBOLS.DEGREE,
-    MATH_BASIC_OPERATORS.DOT,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
@@ -103,22 +99,20 @@ export const MATH_ENTRY_BASIC_PLUS_PLUS_MOBILE_SW: KeyboardGroup = {
     MATH_BASIC_OPERATORS.ADDITION,
     MATH_BASIC_OPERATORS.SUBTRACTION,
     MATH_BASIC_OPERATORS.EQUALS,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-    MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-    MATH_SYMBOLS.PI,
-    MATH_GEOMETRY_SYMBOLS.RADIAN,
+    MATH_BASIC_OPERATORS.SQUARE_POWER,
+    MATH_BASIC_OPERATORS.SQUARE_ROOT,
+    MATH_BASIC_OPERATORS.GREATER_THAN,
     MATH_BASIC_OPERATORS.C_DOT,
     MATH_BASIC_OPERATORS.FRACTION,
     MATH_BASIC_OPERATORS.DOT,
-    MATH_BASIC_OPERATORS.SQUARE_POWER,
-    MATH_BASIC_OPERATORS.SQUARE_ROOT,
-    MATH_SYMBOLS.THETA,
-    MATH_GEOMETRY_SYMBOLS.DEGREE,
+    MATH_BASIC_OPERATORS.NTH_POWER,
+    MATH_SYMBOLS.PI,
+    MATH_BASIC_OPERATORS.LESS_THAN,
     MATH_TEXT_SYMBOLS.X,
     MATH_TEXT_SYMBOLS.Y,
     MATH_TEXT_SYMBOLS.Z,
-    MATH_BASIC_OPERATORS.NTH_POWER,
-    MATH_BASIC_OPERATORS.LESS_THAN,
-    MATH_BASIC_OPERATORS.GREATER_THAN,
+    MATH_SYMBOLS.THETA,
+    MATH_GEOMETRY_SYMBOLS.DEGREE,
+    MATH_GEOMETRY_SYMBOLS.RADIAN,
   ],
 }

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

@@ -1,15 +1,15 @@
 import React, { useEffect, useMemo, useRef } from 'react'
 import { Animated, StyleProp, StyleSheet, useWindowDimensions, ViewStyle } from 'react-native'
 import { COLORS, IS_MOBILE, IS_WEB, SelectOptionColor, SHADOWS } from '@magmamath/react-native-ui'
-import { KeyboardKey, KeyboardKeyValue } from '../types'
+import { KeyboardKey, KeyboardKeyValue } from '../types/types'
 import { Numpad } from './Numpad/Numpad'
-import { MainLayout } from './MainLayout/MainLayout'
+import { MOBILE_LAYOUT_WIDTH } from '../constants/constants'
 import {
   getLayoutConfigStyles,
   KEYBOARD_SLIDE_DISTANCE,
   slideInAnimationSettings,
-} from './MainLayout/constants'
-import { MOBILE_LAYOUT_WIDTH } from '../constants/constants'
+} from './constants'
+import { MainLayout } from './MainLayout'
 
 type KeyboardProps = {
   onKeyPress: (key: KeyboardKeyValue) => void
@@ -17,17 +17,11 @@ type KeyboardProps = {
   style?: StyleProp<ViewStyle>
   color?: SelectOptionColor
   isDisabled?: boolean
-  isMainLayoutDisabled?: boolean
   showUnderlinedKeys?: boolean
   disabledKeys?: KeyboardKey[]
 }
 
-export const Keyboard = ({
-  style,
-  characterType,
-  isMainLayoutDisabled,
-  ...props
-}: KeyboardProps) => {
+export const Keyboard = ({ style, characterType, ...props }: KeyboardProps) => {
   const slideAnim = useRef(new Animated.Value(KEYBOARD_SLIDE_DISTANCE)).current
 
   const { width } = useWindowDimensions()
@@ -60,11 +54,7 @@ export const Keyboard = ({
         },
       ]}
     >
-      <MainLayout
-        {...props}
-        isDisabled={isMainLayoutDisabled || props.isDisabled}
-        characterType={characterType}
-      />
+      <MainLayout {...props} characterType={characterType} />
       <Numpad {...props} style={mobileStyles} />
     </Animated.View>
   )

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

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react'
-import { StyleSheet } from 'react-native'
+import { StyleProp, StyleSheet, ViewStyle } from 'react-native'
 import {
   ButtonStyle,
   SelectGroup,