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

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

@@ -1,10 +1,10 @@
 import React, { useEffect, useMemo, useRef, useState, useCallback } from 'react'
 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 { MOBILE_LAYOUT_WIDTH } from '../../constants/constants'
+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
@@ -60,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>
@@ -73,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/UnitsLayout/UnitTabs.tsx

@@ -61,7 +61,7 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderBottomColor: COLORS.NEUTRAL_3,
     paddingTop: 0,
-    gap: 12,
+    gap: 24,
   },
   keyGroupContainer: {
     gap: 8,

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

@@ -50,6 +50,3 @@ export const getSelectOptions = ({
     ]
   }
 }
-
-export const isKeyboardUnitsGroupType = (k: string): k is KeyboardUnitsGroupType =>
-  (Object.values(KeyboardUnitsGroupType) as string[]).includes(k)

package/src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts

@@ -1,46 +1,32 @@
 import { useText } from '../../../../../shared/translation'
 import { useMemo, useState } from 'react'
-import { KeyboardUnitsGroupType, UnitTab } from '../types'
-import { useWindowDimensions } from 'react-native'
-import { IS_MOBILE, TabOptionProps } from '@magmamath/react-native-ui'
-import { isKeyboardUnitsGroupType } from '../helpers'
+import { TabOptionProps } from '@magmamath/react-native-ui'
+
+import { KeyboardUnitsGroupType } from '../types'
 
 export const useUnitTabs = () => {
   const t = useText()
-  const { width } = useWindowDimensions()
-
-  const allTabs = useMemo<UnitTab[]>(
+  const tabs = useMemo(
     () => [
-      { title: t('keyboard.length'), key: KeyboardUnitsGroupType.LENGTH },
-      { title: t('keyboard.area'), key: KeyboardUnitsGroupType.AREA, minBreakpoint: 1005 },
-      { title: t('keyboard.volume'), key: KeyboardUnitsGroupType.VOLUME, minBreakpoint: 1060 },
-      { title: t('keyboard.weight'), key: KeyboardUnitsGroupType.WEIGHT, minBreakpoint: 1060 },
-      { title: t('keyboard.time'), key: KeyboardUnitsGroupType.TIME, minBreakpoint: 1125 },
+      {
+        title: t('keyboard.length'),
+        key: KeyboardUnitsGroupType.LENGTH,
+      },
+      {
+        title: t('keyboard.area'),
+        key: KeyboardUnitsGroupType.AREA,
+      },
+      {
+        title: t('keyboard.volume'),
+        key: KeyboardUnitsGroupType.VOLUME,
+      },
+      {
+        title: t('keyboard.weight'),
+        key: KeyboardUnitsGroupType.WEIGHT,
+      },
     ],
     [t],
   )
-
-  const tabs = useMemo(
-    () =>
-      allTabs.filter(
-        (tab) => IS_MOBILE || tab.minBreakpoint === undefined || width >= tab.minBreakpoint,
-      ),
-    [allTabs, width],
-  )
-
-  const [activeKey, setActiveKey] = useState<KeyboardUnitsGroupType | undefined>(() => tabs[0]?.key)
-
-  const activeTab = useMemo(() => {
-    return tabs.find((t) => t?.key && t.key === activeKey) ?? tabs[0]
-  }, [tabs, activeKey])
-
-  return {
-    tabs,
-    activeTab,
-    setActiveTab: (tab: TabOptionProps) => {
-      if (isKeyboardUnitsGroupType(tab.key)) {
-        setActiveKey(tab.key)
-      }
-    },
-  }
+  const [activeTab, setActiveTab] = useState<TabOptionProps>(tabs[0])
+  return { tabs, activeTab, setActiveTab }
 }

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

@@ -1,7 +1,6 @@
 import {
   MATH_AREA_UNITS,
   MATH_LENGTH_UNITS,
-  MATH_TIME_UNITS,
   MATH_VOLUME_UNITS,
   MATH_WEIGHT_UNITS,
 } from '../../types/MathKeysGroups/units'
@@ -11,7 +10,6 @@ import { VolumeIcon } from '../../../../shared/icons/VolumeIcon'
 import { WeightIcon } from '../../../../shared/icons/WeightIcon'
 import { KeyboardUnitsGroupType, UnitKeyboardGroups } from './types'
 import { MathEntryKeyboardGroupId } from '../../types/keyboardGroupIds'
-import { TimeIcon } from '../../../../shared/icons/TimeIcon'
 
 export const MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS: UnitKeyboardGroups = {
   id: MathEntryKeyboardGroupId.LENGTH_UNITS_SW,
@@ -173,11 +171,6 @@ export const MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS: UnitKeyboardGroups = {
   ],
 }
 
-export const MATH_ENTRY_TIME_UNITS_SW_KEYBOARD_GROUPS: UnitKeyboardGroups = {
-  id: MathEntryKeyboardGroupId.TIME_SW,
-  keys: [[MATH_TIME_UNITS.S, MATH_TIME_UNITS.M, MATH_TIME_UNITS.H]],
-}
-
 export const MATH_ENTRY_WEIGHT_UNITS_US_KEYBOARD_GROUPS: UnitKeyboardGroups = {
   id: MathEntryKeyboardGroupId.WEIGHT_UNITS_US,
   keys: [
@@ -206,8 +199,4 @@ export const UNITS_KEYBOARD_GROUPS = new Map([
     KeyboardUnitsGroupType.WEIGHT,
     { keys: MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS.keys, icon: WeightIcon },
   ],
-  [
-    KeyboardUnitsGroupType.TIME,
-    { keys: MATH_ENTRY_TIME_UNITS_SW_KEYBOARD_GROUPS.keys, icon: TimeIcon },
-  ],
 ])

package/src/features/keyboard/components/UnitsLayout/types.ts

@@ -1,5 +1,4 @@
 import { KeyboardGroup, KeyboardKey } from '@magmamath/students-features'
-import { TabOptionProps } from '@magmamath/react-native-ui'
 
 export enum SelectedLayout {
   ALGEBRA = 'algebra',
@@ -11,14 +10,8 @@ export enum KeyboardUnitsGroupType {
   AREA = 'area',
   VOLUME = 'volume',
   WEIGHT = 'weight',
-  TIME = 'time',
 }
 
 export type UnitKeyboardGroups = {
   keys: KeyboardKey[][]
 } & Omit<KeyboardGroup, 'keys'>
-
-export type UnitTab = Omit<TabOptionProps, 'key'> & {
-  key: KeyboardUnitsGroupType
-  minBreakpoint?: number
-}

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/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,
@@ -31,7 +30,6 @@ import {
   MATH_ENTRY_AREA_UNITS_US_KEYBOARD_GROUPS,
   MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS,
   MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
-  MATH_ENTRY_TIME_UNITS_SW_KEYBOARD_GROUPS,
   MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS,
   MATH_ENTRY_VOLUME_UNITS_UK_KEYBOARD_GROUPS,
   MATH_ENTRY_VOLUME_UNITS_US_KEYBOARD_GROUPS,
@@ -71,7 +69,6 @@ function createKeyboardUnitsLocale(
     [KeyboardUnitsGroupType.AREA]: MATH_ENTRY_AREA_UNITS_US_KEYBOARD_GROUPS,
     [KeyboardUnitsGroupType.VOLUME]: MATH_ENTRY_VOLUME_UNITS_US_KEYBOARD_GROUPS,
     [KeyboardUnitsGroupType.WEIGHT]: MATH_ENTRY_WEIGHT_UNITS_US_KEYBOARD_GROUPS,
-    [KeyboardUnitsGroupType.TIME]: MATH_ENTRY_TIME_UNITS_SW_KEYBOARD_GROUPS,
   }
   return { ...base, ...overrides }
 }
@@ -101,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,
@@ -136,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

@@ -32,7 +32,6 @@ export const KEYBOARD_LAYOUTS = {
       MyScriptMathCharacterTypes.NUMBERS_AND_MULTIPLICATION,
       MyScriptMathCharacterTypes.OPERATORS,
       MyScriptMathCharacterTypes.PERCENT,
-      MyScriptMathCharacterTypes.NUMBERS_RATIONAL,
     ],
   },
   [KeyboardType.BasicTime]: {
@@ -55,6 +54,7 @@ export const KEYBOARD_LAYOUTS = {
     characterTypes: [
       MyScriptMathCharacterTypes.GEOM_ANGLES,
       MyScriptMathCharacterTypes.GEOM_COORDINATE,
+      MyScriptMathCharacterTypes.NUMBERS_RATIONAL,
     ],
   },
 }
@@ -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/types/MathKeysGroups/basicOperators.tsx

@@ -42,8 +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 { RoundBracketLeftIcon } from '../../../../shared/icons/keyboard/RoundBracketLeftIcon/RoundBracketLeftIcon'
-import { RoundBracketRightIcon } from '../../../../shared/icons/keyboard/RoundBracketRightIcon/RoundBracketRightIcon'
+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: {
@@ -97,7 +98,7 @@ export const MATH_BASIC_OPERATORS = createMathKeysGroup({
   },
   NOT_EQUAL: {
     icon: <NotEqualIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: '≠',
+    mathliveValue: '\\neq',
     katexValue: '≠',
   },
   APPROXIMATELY_EQUAL: {
@@ -121,7 +122,7 @@ export const MATH_BASIC_OPERATORS = createMathKeysGroup({
     katexValue: ':',
   },
   C_DOT: {
-    icon: <CDotIcon {...DEFAULT_KEY_ICON_PROPS} size={6} />,
+    icon: <CDotIcon {...DEFAULT_KEY_ICON_PROPS} />,
     mathliveValue: '\\cdot',
     katexValue: '⋅',
   },
@@ -253,16 +254,6 @@ export const MATH_BASIC_OPERATORS = createMathKeysGroup({
     mathliveValue: '$\\left(#@\\right)$',
     katexValue: '( )',
   },
-  ROUND_BRACKET_RIGHT: {
-    icon: <RoundBracketRightIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: ')',
-    katexValue: ')',
-  },
-  ROUND_BRACKET_LEFT: {
-    icon: <RoundBracketLeftIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: '(',
-    katexValue: '(',
-  },
   ORDERED_PAIR: {
     icon: <OrderedPairIcon {...DEFAULT_KEY_ICON_PROPS} size={20} extraColor={COLORS.NEUTRAL_6} />,
     mathliveValue: '$\\left(\\placeholder{},\\placeholder{}\\right)$',
@@ -275,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/MathKeysGroups/units.tsx

@@ -427,19 +427,16 @@ export const MATH_TIME_UNITS = createMathKeysGroup({
     label: 's',
     mathliveValue: '\\mathrm{s}',
     katexValue: 's',
-    style: STYLE_PRESETS.LARGE,
   },
   M: {
     label: 'min',
     mathliveValue: '$\\mathrm{min}',
     katexValue: 'min',
-    style: STYLE_PRESETS.LARGE,
   },
   H: {
     label: 'h',
     mathliveValue: '\\mathrm{h}',
     katexValue: 'h',
-    style: STYLE_PRESETS.LARGE,
   },
   DAY: {
     label: 'day',

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/icons/keyboard/CDotIcon/CDotIcon.tsx

@@ -4,8 +4,8 @@ import Svg, { Circle } from 'react-native-svg'
 
 export const CDotIcon = ({ size = 20, color }: IconProps) => {
   return (
-    <Svg width={size} height={size} viewBox="0 0 6 6" fill="none">
-      <Circle cx="3.00001" cy="3.00001" r="3.00001" fill={color} />
+    <Svg width={size} height={size} viewBox="0 0 16 16" fill="none">
+      <Circle cx="8.00001" cy="8.00001" r="2.00001" fill={color} />
     </Svg>
   )
 }

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",
@@ -37,7 +37,6 @@
     "length": "Length",
     "area": "Area",
     "volume": "Volume",
-    "weight": "Weight",
-    "time": "Time"
+    "weight": "Weight"
   }
 }

package/src/shared/translation/localization/en.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",
@@ -37,7 +37,6 @@
     "length": "Length",
     "area": "Area",
     "volume": "Volume",
-    "weight": "Weight",
-    "time": "Time"
+    "weight": "Weight"
   }
 }

package/src/shared/translation/localization/gb.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",
@@ -37,7 +37,6 @@
     "length": "Length",
     "area": "Area",
     "volume": "Volume",
-    "weight": "Weight",
-    "time": "Time"
+    "weight": "Weight"
   }
 }

package/src/shared/translation/localization/sct.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",
@@ -37,7 +37,6 @@
     "length": "Length",
     "area": "Area",
     "volume": "Volume",
-    "weight": "Weight",
-    "time": "Time"
+    "weight": "Weight"
   }
 }