@magmamath/students-features 0.9.14-rc.6 → 0.9.92

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/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

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,
@@ -52,7 +52,6 @@ export type ChatbotModelProps = {
     requestHint: (props: ChatHintPayload) => Promise<ChatHintResponse>
   }
   threadMessagesLimit?: number
-  chatAccess: StoreWritable<boolean>
   settings?: ChatbotSettings
 }
 
@@ -83,7 +82,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/AlgebraLayout/AlgebraLayout.tsx

@@ -4,12 +4,11 @@ import { StyleSheet, useWindowDimensions, View } from 'react-native'
 import { COLORS, SelectGroup, SelectOptionSize, IS_MOBILE } from '@magmamath/react-native-ui'
 import { Locale, useText } from '../../../../shared/translation'
 import { KeyboardLayoutProps, KeyboardType } from '../../types/types'
+import { MOBILE_LAYOUT_WIDTH } from '../../constants/constants'
 import { SelectedLayout } from './types'
 import { getKeyboardGroup } from '../../helpers'
 import { getSelectOptions } from './helpers'
 
-const MOBILE_LAYOUT_WIDTH = 1300
-
 export const AlgebraLayout = ({ onLayoutChange, ...props }: KeyboardLayoutProps) => {
   const [selectedLayout, setSelectedLayout] = useState<SelectedLayout>(SelectedLayout.BASIC)
   const t = useText()

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

@@ -2,17 +2,17 @@ import React, { PropsWithChildren } from 'react'
 import { KeysList } from '../KeysList/KeysList'
 import { StyleSheet, useWindowDimensions, View } from 'react-native'
 import { KeyboardLayoutProps, KeyboardType } from '../../types/types'
+import { MOBILE_LAYOUT_WIDTH } from '../../constants/constants'
 import { Locale, useText } from '../../../../shared/translation'
 import { KEYBOARD_GROUPS_BY_LOCALE } from '../../constants/keyboardGroupsByLocale'
 import { IS_MOBILE } from '@magmamath/react-native-ui'
-import { BASIC_MOBILE_LAYOUT_WIDTH } from '../../constants/constants'
 
 export const BasicLayout = (props: KeyboardLayoutProps & PropsWithChildren) => {
   const t = useText()
   const keysByLocale = KEYBOARD_GROUPS_BY_LOCALE[t('locale') as Locale][KeyboardType.Basic]
   const keys = props.children ? keysByLocale.keys : keysByLocale.keys.slice(0, -1)
   const { width } = useWindowDimensions()
-  const isMobile = width <= BASIC_MOBILE_LAYOUT_WIDTH || IS_MOBILE
+  const isMobile = width <= MOBILE_LAYOUT_WIDTH || IS_MOBILE
 
   if (isMobile && !props.children) {
     return null

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/BasicPlusPlusLayout/BasicPlusPlusLayout.tsx

@@ -3,11 +3,10 @@ import { StyleSheet, useWindowDimensions, View } from 'react-native'
 import { KeysList } from '../KeysList/KeysList'
 import { KeyboardLayoutProps, KeyboardType } from '../../types/types'
 import { Locale, useText } from '../../../../shared/translation'
+import { MOBILE_LAYOUT_WIDTH } from '../../constants/constants'
 import { getKeyboardGroup } from '../../helpers'
 import { IS_MOBILE } from '@magmamath/react-native-ui'
 
-const MOBILE_LAYOUT_WIDTH = 1220
-
 export const BasicPlusPlusLayout = (props: KeyboardLayoutProps) => {
   const t = useText()
   const { width } = useWindowDimensions()

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

@@ -1,17 +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, KeyboardType } 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'
-import { KEYBOARD_LAYOUTS } from '../constants/keyboardLayouts'
-import { isBasicLayout, isMobileWidth } from '../helpers'
+} from './constants'
+import { MainLayout } from './MainLayout'
 
 type KeyboardProps = {
   onKeyPress: (key: KeyboardKeyValue) => void
@@ -19,21 +17,15 @@ 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()
-  const isMobile = IS_MOBILE || isMobileWidth(width, characterType)
+  const isMobile = width <= MOBILE_LAYOUT_WIDTH || IS_MOBILE
   const mobileStyles = useMemo(
     () => getLayoutConfigStyles(characterType, isMobile),
     [characterType, isMobile],
@@ -62,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,

package/src/features/keyboard/components/{MainLayout/MainLayout.tsx → MainLayout.tsx}

@@ -1,9 +1,10 @@
 import React, { useEffect, useMemo, useRef, useState, useCallback } from 'react'
-import { Animated, StyleSheet, View } from 'react-native'
+import { Animated, StyleSheet, useWindowDimensions, View } from 'react-native'
 import { SelectOptionColor, IS_MOBILE, IS_WEB } from '@magmamath/react-native-ui'
-import { getLayoutByCharType, isBasicPlusPlusLayout } from '../../constants/keyboardLayouts'
-import { KeyboardKey, KeyboardKeyValue } from '../../types/types'
-import { UnderlinedLayout } from '../UnderlinedLayout/UnderlinedLayout'
+import { getLayoutByCharType } from '../constants/keyboardLayouts'
+import { KeyboardKey, KeyboardKeyValue } from '../types/types'
+import { UnderlinedLayout } from './UnderlinedLayout/UnderlinedLayout'
+import { MOBILE_LAYOUT_WIDTH } from '../constants/constants'
 
 type LayoutProps = {
   onKeyPress: (key: KeyboardKeyValue) => void
@@ -26,8 +27,11 @@ export const MainLayout = ({
   const fadeAnim = useRef(new Animated.Value(showUnderlinedKeys ? 1 : 0)).current
   const fadeRef = useRef<Animated.CompositeAnimation | null>(null)
 
+  const { width } = useWindowDimensions()
+  const isMobile = width <= MOBILE_LAYOUT_WIDTH || IS_MOBILE
+
   const Layout = useMemo(() => getLayoutByCharType(characterType), [characterType])
-  const isUnderlinedLayoutVisible = isUnderlinedVisible && !isSecondaryLayoutSelected && !IS_MOBILE
+  const isUnderlinedLayoutVisible = isUnderlinedVisible && !isSecondaryLayoutSelected && !isMobile
 
   const animateFade = useCallback(
     (toValue: number, onComplete?: () => void) => {
@@ -56,11 +60,11 @@ export const MainLayout = ({
   }, [showUnderlinedKeys, animateFade])
 
   return (
-    <View style={[styles.container, IS_MOBILE && { flex: 1 }]}>
+    <View style={styles.container}>
       <Layout {...props} onLayoutChange={setIsSecondaryLayoutSelected} />
       {isUnderlinedLayoutVisible && (
         <Animated.View style={{ opacity: fadeAnim }}>
-          <UnderlinedLayout {...props} showSlashKey={!isBasicPlusPlusLayout(characterType)} />
+          <UnderlinedLayout {...props} />
         </Animated.View>
       )}
     </View>
@@ -69,6 +73,6 @@ export const MainLayout = ({
 
 const styles = StyleSheet.create({
   container: {
-    flexDirection: 'row',
+    flex: 1,
   },
 })

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

@@ -4,14 +4,9 @@ import { KeyboardLayoutProps, KeyboardType } from '../../types/types'
 import { Locale, useText } from '../../../../shared/translation'
 import { getKeyboardGroup } from '../../helpers'
 
-type UnderlinedLayoutProps = {
-  showSlashKey?: boolean
-} & KeyboardLayoutProps
-
-export const UnderlinedLayout = (props: UnderlinedLayoutProps) => {
+export const UnderlinedLayout = (props: KeyboardLayoutProps) => {
   const t = useText()
   const keysGroup = getKeyboardGroup(t('locale') as Locale, KeyboardType.Underlined)
-  const keys = props.showSlashKey ? keysGroup.keys : keysGroup.keys.slice(0, -1)
 
-  return <KeysList keys={keys} numOfRows={props.showSlashKey ? 2 : keys.length} {...props} />
+  return <KeysList keys={keysGroup.keys} numOfRows={keysGroup.keys.length} {...props} />
 }

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

@@ -1,14 +1,12 @@
 import { KeyboardGroup } from '../../types/types'
 import { MathEntryKeyboardGroupId } from '../../types/keyboardGroupIds'
 import { MATH_BASIC_OPERATORS } from '../../types/MathKeysGroups/basicOperators'
-import { MATH_SPECIAL_OPERATORS } from '../../types/MathKeysGroups/specialOperators'
 
 export const MATH_ENTRY_UNDERLINED_KEYBOARD_GROUP: KeyboardGroup = {
   id: MathEntryKeyboardGroupId.UNDERLINED,
   keys: [
-    MATH_SPECIAL_OPERATORS.UNDERLINED_TEN,
-    MATH_SPECIAL_OPERATORS.UNDERLINED_U,
-    MATH_SPECIAL_OPERATORS.UNDERLINED_ONE,
-    MATH_BASIC_OPERATORS.SLASH,
+    MATH_BASIC_OPERATORS.UNDERLINED_TEN,
+    MATH_BASIC_OPERATORS.UNDERLINED_ONE,
+    MATH_BASIC_OPERATORS.UNDERLINED_U,
   ],
 }

package/src/features/keyboard/components/{MainLayout/constants.ts → constants.ts}

@@ -1,5 +1,5 @@
 import { COLORS, SPACING } from '@magmamath/react-native-ui'
-import { KEYBOARD_LAYOUTS } from '../../constants/keyboardLayouts'
+import { KEYBOARD_LAYOUTS } from '../constants/keyboardLayouts'
 
 export const KEYBOARD_SLIDE_DISTANCE = 600
 

package/src/features/keyboard/constants/constants.ts

@@ -5,6 +5,4 @@ export const DEFAULT_KEY_ICON_PROPS = {
   color: COLORS.NEUTRAL_9,
 } as const
 
-export const MOBILE_LAYOUT_WIDTH = 1200
-
-export const BASIC_MOBILE_LAYOUT_WIDTH = 990
+export const MOBILE_LAYOUT_WIDTH = 1280

package/src/features/keyboard/constants/keyboardGroupsByLocale.ts

@@ -1,6 +1,5 @@
 import { KeyboardGroup, KeyboardType } from '../types/types'
 import {
-  MATH_CURRENCY_DE_KEYBOARD_GROUP,
   MATH_CURRENCY_SW_KEYBOARD_GROUP,
   MATH_CURRENCY_UK_KEYBOARD_GROUP,
   MATH_CURRENCY_US_KEYBOARD_GROUP,
@@ -99,20 +98,6 @@ export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, Keyb
     [KeyboardType.BasicTime]: MATH_TIME_SW_KEYBOARD_GROUP,
     [KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP,
   }),
-  [Locale.DE]: createKeyboardLocale({
-    [KeyboardType.Basic]: MATH_ENTRY_BASIC_SW_KEYBOARD_GROUP,
-    [KeyboardType.BasicPlus]: MATH_ENTRY_BASIC_SW_PLUS,
-    [KeyboardType.BasicPlusMobile]: MATH_ENTRY_BASIC_PLUS_MOBILE_SW,
-    [KeyboardType.BasicPlusPlus]: MATH_ENTRY_BASIC_PLUS_PLUS_SW,
-    [KeyboardType.BasicPlusPlusMobile]: MATH_ENTRY_BASIC_PLUS_PLUS_MOBILE_SW,
-    [KeyboardType.BasicUnits]: {
-      ...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
-      keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
-    },
-    [KeyboardType.BasicCurrency]: MATH_CURRENCY_DE_KEYBOARD_GROUP,
-    [KeyboardType.BasicTime]: MATH_TIME_SW_KEYBOARD_GROUP,
-    [KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP,
-  }),
 }
 export const KEYBOARD_UNITS_GROUPS_BY_LOCALE: Record<
   Locale,
@@ -134,10 +119,4 @@ export const KEYBOARD_UNITS_GROUPS_BY_LOCALE: Record<
     [KeyboardUnitsGroupType.VOLUME]: MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS,
     [KeyboardUnitsGroupType.WEIGHT]: MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS,
   }),
-  [Locale.DE]: createKeyboardUnitsLocale({
-    [KeyboardUnitsGroupType.LENGTH]: MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS,
-    [KeyboardUnitsGroupType.AREA]: MATH_ENTRY_AREA_UNITS_SW_KEYBOARD_GROUPS,
-    [KeyboardUnitsGroupType.VOLUME]: MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS,
-    [KeyboardUnitsGroupType.WEIGHT]: MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS,
-  }),
 }

package/src/features/keyboard/constants/keyboardLayouts.ts

@@ -71,14 +71,3 @@ export function getLayoutByCharType(charType?: number) {
   }
   return AlgebraLayout
 }
-
-export function isBasicPlusPlusLayout(charType?: number) {
-  if (!charType) {
-    return true
-  }
-
-  return (
-    KEYBOARD_LAYOUTS[KeyboardType.BasicPlusPlus].characterTypes.includes(charType) ||
-    KEYBOARD_LAYOUTS[KeyboardType.AlgebraAdvanced].characterTypes.includes(charType)
-  )
-}

package/src/features/keyboard/helpers.ts

@@ -3,8 +3,6 @@ import { KeyboardGroup, KeyboardType } from './types/types'
 import { Locale } from '../../shared/translation/types'
 import { MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP } from './components/AlgebraLayout/keyboardGroups'
 import { IS_WEB } from '@magmamath/react-native-ui'
-import { KEYBOARD_LAYOUTS } from './constants/keyboardLayouts'
-import { BASIC_MOBILE_LAYOUT_WIDTH, MOBILE_LAYOUT_WIDTH } from './constants/constants'
 
 export function getKeyboardGroup(locale: Locale, type: KeyboardType): KeyboardGroup {
   return KEYBOARD_GROUPS_BY_LOCALE[locale]?.[type] ?? MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP
@@ -18,17 +16,3 @@ export const getIsIpadOrIphoneDevice = () => {
   const isIpadOS = navigator?.maxTouchPoints > 2 && /MacIntel/.test(navigator.platform)
   return isIOS || isIpadOS
 }
-
-export const isBasicLayout = (characterType?: number) => {
-  return !!(
-    characterType && KEYBOARD_LAYOUTS[KeyboardType.Basic].characterTypes.includes(characterType)
-  )
-}
-
-export const isMobileWidth = (width: number, characterType?: number) => {
-  const isBasic = isBasicLayout(characterType)
-  if (isBasic) {
-    return width <= BASIC_MOBILE_LAYOUT_WIDTH
-  }
-  return width <= MOBILE_LAYOUT_WIDTH
-}

package/src/features/keyboard/types/MathKeysGroups/basicOperators.tsx

@@ -42,6 +42,9 @@ import { EqualsIcon } from '../../../../shared/icons/keyboard/EqualsIcon/EqualsI
 import { AbsoluteValueIcon } from '../../../../shared/icons/keyboard/AbsoluteValueIcon/AbsoluteValueIcon'
 import { IntervalIcon } from '../../../../shared/icons/keyboard/IntervalIcon/IntervalIcon'
 import { createMathKeysGroup } from './helpers'
+import { UnderlinedTenIcon } from '../../../../shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon'
+import { UnderlinedOneIcon } from '../../../../shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon'
+import { UnderlinedUIcon } from '../../../../shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon'
 
 export const MATH_BASIC_OPERATORS = createMathKeysGroup({
   ADDITION: {
@@ -95,7 +98,7 @@ export const MATH_BASIC_OPERATORS = createMathKeysGroup({
   },
   NOT_EQUAL: {
     icon: <NotEqualIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: '≠',
+    mathliveValue: '\\neq',
     katexValue: '≠',
   },
   APPROXIMATELY_EQUAL: {
@@ -263,7 +266,25 @@ export const MATH_BASIC_OPERATORS = createMathKeysGroup({
   },
   INTERVAL: {
     icon: <IntervalIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: '$\\left[\\placeholder{},\\placeholder{}\\right]$',
+    mathliveValue: '$\\left[, \\right]$',
     katexValue: '[ , ]',
   },
+  UNDERLINED_TEN: {
+    icon: <UnderlinedTenIcon {...DEFAULT_KEY_ICON_PROPS} />,
+    mathliveValue: '\\underline{10}',
+    katexValue: '10̲',
+    spreadsheetValue: 'TEN',
+  },
+  UNDERLINED_ONE: {
+    icon: <UnderlinedOneIcon {...DEFAULT_KEY_ICON_PROPS} />,
+    mathliveValue: '\\underline{1}',
+    katexValue: '1̲',
+    spreadsheetValue: 'ONE_FOOT_NOTE',
+  },
+  UNDERLINED_U: {
+    icon: <UnderlinedUIcon {...DEFAULT_KEY_ICON_PROPS} />,
+    mathliveValue: '\\underline{u}',
+    katexValue: 'U̲',
+    spreadsheetValue: 'FRACTION',
+  },
 })

package/src/features/keyboard/types/MathKeysGroups/specialOperators.tsx

@@ -2,9 +2,6 @@ import React from 'react'
 import { DEFAULT_KEY_ICON_PROPS } from '../../constants/constants'
 import { BackspaceIcon } from '../../../../shared/icons/keyboard/BackspaceIcon/BackspaceIcon'
 import { createMathKeysGroup } from './helpers'
-import { UnderlinedTenIcon } from '../../../../shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon'
-import { UnderlinedOneIcon } from '../../../../shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon'
-import { UnderlinedUIcon } from '../../../../shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon'
 
 export const MATH_SPECIAL_OPERATORS = createMathKeysGroup({
   LIM: {
@@ -52,22 +49,4 @@ export const MATH_SPECIAL_OPERATORS = createMathKeysGroup({
     mathliveValue: 'backspace',
     katexValue: 'backspace',
   },
-  UNDERLINED_TEN: {
-    icon: <UnderlinedTenIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: '\\underline{10}',
-    katexValue: '10̲',
-    spreadsheetValue: 'TEN',
-  },
-  UNDERLINED_ONE: {
-    icon: <UnderlinedOneIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: '\\underline{1}',
-    katexValue: '1̲',
-    spreadsheetValue: 'ONE_FOOT_NOTE',
-  },
-  UNDERLINED_U: {
-    icon: <UnderlinedUIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: '\\underline{u}',
-    katexValue: 'U̲',
-    spreadsheetValue: 'FRACTION',
-  },
 })

package/src/features/keyboard/types/keyboardGroupIds.ts

@@ -27,6 +27,5 @@ export enum MathEntryKeyboardGroupId {
   CURRENCY_SW = 'math-entry-currency-sw',
   CURRENCY_UK = 'math-entry-currency-uk',
   CURRENCY_US = 'math-entry-currency-us',
-  CURRENCY_DE = 'math-entry-currency-de',
   UNDERLINED = 'math-entry-underlined',
 }

package/src/lib/helpers/helpers.ts

@@ -27,27 +27,12 @@ export const getRelativeTimeText = (date: Date) => {
   const years = getYears(days)
 
   if (seconds < 60) return getText('time.justNow')
-
-  if (minutes < 60) {
-    if (minutes === 1) return `1 ${getText('time.minuteAgo')}`
-    return getText('time.minutesAgo', { count: minutes.toString() })
-  }
-
-  if (hours < 24) {
-    if (hours === 1) return `1 ${getText('time.hourAgo')}`
-    return getText('time.hoursAgo', { count: hours.toString() })
-  }
-
-  if (days < 30) {
-    if (days === 1) return `1 ${getText('time.dayAgo')}`
-    return getText('time.daysAgo', { count: days.toString() })
-  }
-
-  if (months < 12) {
-    if (months === 1) return `1 ${getText('time.monthAgo')}`
-    return getText('time.monthsAgo', { count: months.toString() })
-  }
-
-  if (years === 1) return `1 ${getText('time.yearAgo')}`
-  return getText('time.yearsAgo', { count: years.toString() })
+  if (minutes < 60)
+    return `${minutes} ${minutes === 1 ? getText('time.minuteAgo') : getText('time.minutesAgo')}`
+  if (hours < 24)
+    return `${hours} ${hours === 1 ? getText('time.hourAgo') : getText('time.hoursAgo')}`
+  if (days < 30) return `${days} ${days === 1 ? getText('time.dayAgo') : getText('time.daysAgo')}`
+  if (months < 12)
+    return `${months} ${months === 1 ? getText('time.monthAgo') : getText('time.monthsAgo')}`
+  return `${years} ${years === 1 ? getText('time.yearAgo') : getText('time.yearsAgo')}`
 }

package/src/shared/translation/constants.ts

@@ -4,7 +4,6 @@ import GB from './localization/gb.json'
 import SW from './localization/sw.json'
 import CA from './localization/ca.json'
 import SCT from './localization/sct.json'
-import DE from './localization/de.json'
 
 export const LOCALIZATION_CONFIGS = {
   [Locale.EN]: EN,
@@ -12,5 +11,4 @@ export const LOCALIZATION_CONFIGS = {
   [Locale.SW]: SW,
   [Locale.CA]: CA,
   [Locale.SCT]: SCT,
-  [Locale.DE]: DE,
 }

package/src/shared/translation/localization/ca.json

@@ -3,15 +3,15 @@
   "teacherFeedback.noComments": "No comments yet",
   "time.justNow": "just now",
   "time.minuteAgo": "minute ago",
-  "time.minutesAgo": "{{count}} minutes ago",
+  "time.minutesAgo": "minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "{{count}} hours ago",
+  "time.hoursAgo": "hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "{{count}} days ago",
+  "time.daysAgo": "days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "{{count}} months ago",
+  "time.monthsAgo": "months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "{{count}} years ago",
+  "time.yearsAgo": "years ago",
   "chat": {
     "anotherHint": "Give me another hint",
     "giveHint": "I need a hint",