@magmamath/students-features 1.3.12-rc.2 → 1.3.13

package/src/features/chatbot/helpers.ts

@@ -66,6 +66,7 @@ export function prepareChatRequestPayload(
     answerOptions,
     answer,
     chatHistory,
+    assignmentGrade,
   } = payload
 
   if (freeTextMessage) {
@@ -106,6 +107,7 @@ export function prepareChatRequestPayload(
       ...(imageAltText && { altText: imageAltText }),
       ...(!!problemStandards?.length && { problemStandards }),
       ...(!!answerOptions?.length && { answerOptions }),
+      ...(assignmentGrade !== undefined && { assignmentGrade }),
     },
   }
 }

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

@@ -245,6 +245,7 @@ export class ChatbotModel {
             imageAltText: context.imageDescription,
             imageCdnId: context.imageCdnId,
             conversationId: cache[key].conversationId,
+            assignmentGrade: context.assignmentGrade,
             ...(isFreeText && { freeTextMessage: message }),
             ...(context.assignmentId && {
               chatHistory: {

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

@@ -64,6 +64,7 @@ export type PostMessagePayload = {
   freeTextMessage?: string
   conversationId?: string | null
   chatHistory?: ChatHistory
+  assignmentGrade?: number
 }
 
 export type PostMessageResponse = {
@@ -128,6 +129,7 @@ export type ChatHintPayload = {
   hintNumber: number
   studentInput: string
   answerOptions?: string[]
+  assignmentGrade?: number
 }
 
 export type ChatHintResponse = {

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

@@ -152,6 +152,7 @@ export type ChatbotContext = {
   problemStandards?: ProblemStandard[]
   assignmentId?: string
   problemId?: string
+  assignmentGrade?: number
 }
 
 export type ReinitConversationProps = {

package/src/features/pmProgress/components/chart/components/SlicesPaths.tsx

@@ -20,7 +20,7 @@ export const SlicesPaths = ({ slices, pieChartManager, config }: SlicesPathsProp
   const [hoveredId, expandedId, domains] = useUnit([
     model.highlight.$hoveredId,
     model.highlight.$expandedId,
-    model.tree.$domainsInGrade,
+    model.tree.$domains,
   ])
 
   const highlightedId = hoveredId ?? expandedId

package/src/features/pmProgress/components/header/NextUp.tsx

@@ -4,26 +4,33 @@ import { COLORS, HeadingVariants, SPACING, Typography } from '@magmamath/react-n
 import { SketchArrowRight } from '../../../../shared/icons/SketchArrowRight'
 import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
 import { useText } from '../../../../shared/translation'
-import { useUnit } from 'effector-react'
+import { useUnit, useStoreMap } from 'effector-react'
 import { usePmProgress } from '../../context/PmProgressContext'
+import { isFluencyDomain } from '../../shared/pmProgress.helpers'
 import { OpeningLoaderId, SolvingFlow } from '../../shared/pmProgress.constants'
 import { StartButton } from './StartButton'
-import { useNextUpDomain } from '../../hooks/useNextUpDomain'
 
 export const NextUp = () => {
   const t = useText()
   const { model, onStartPress } = usePmProgress()
-  const nextUp = useNextUpDomain()
 
   const status = useUnit(model.tree.$status)
   const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)
 
+  const nextUp = useStoreMap(model.tree.$domains, (domains) =>
+    domains.find((domain) => {
+      const isFluency = isFluencyDomain(domain.title)
+      const isDomainCompleted = domain.standards.every((standard) => standard.isCompleted)
+      return !isFluency && !isDomainCompleted
+    }),
+  )
+
   const isLoading = loaderOpeningId === OpeningLoaderId.START_BUTTON
   const isSkillOpeningActionPending = !!(loaderOpeningId !== null || status)
 
   return (
     <View style={styles.container}>
-      {nextUp.domain && !status && (
+      {nextUp && !status && (
         <>
           <View style={styles.content}>
             <View style={styles.subtitle}>
@@ -33,10 +40,10 @@ export const NextUp = () => {
             </View>
             <View style={[styles.row, styles.tilted]}>
               <Typography variant={HeadingVariants.H7} style={styles.muted}>
-                {nextUp.domain.title}
+                {nextUp?.title}
               </Typography>
               <View style={styles.diamond}>
-                <SliceDiamondIcon color={nextUp.domain.color} />
+                <SliceDiamondIcon color={nextUp?.color} />
               </View>
             </View>
           </View>

package/src/features/pmProgress/components/insights/PmInsights.tsx

@@ -15,7 +15,7 @@ import {
 export const PmInsights = () => {
   const { model } = usePmProgress()
   const [chartSize, setChartSize] = useState(MAX_PIE_CHART_SIZE)
-  const chartData = useStoreMap(model.tree.$domainsInGrade, (domains) =>
+  const chartData = useStoreMap(model.tree.$domains, (domains) =>
     domains.map((domain) => ({
       value: 1,
       fillPercent: Math.round(domain.scorePercentage),

package/src/features/pmProgress/components/list/PmDomainList.tsx

@@ -11,7 +11,7 @@ import { SolvingFlow } from '../../shared/pmProgress.constants'
 
 export const PmDomainList = () => {
   const { model, onStandardPress } = usePmProgress()
-  const domains = useUnit(model.tree.$domainsInGrade)
+  const domains = useUnit(model.tree.$domains)
   const expandedId = useUnit(model.highlight.$expandedId)
   const hoveredId = useUnit(model.highlight.$hoveredId)
   const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)

package/src/features/pmProgress/components/standard/StandardTag.tsx

@@ -118,7 +118,7 @@ type StandardTagProps = {
 
 export const StandardTag = ({ skillId, model }: StandardTagProps) => {
   const standardInfo = useStoreMap({
-    store: model.tree.$domainsInGrade,
+    store: model.tree.$domains,
     keys: [skillId],
     fn: (domains, [skillId]) => {
       const domain = domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))

package/src/features/pmProgress/model/PmTreeModel.ts

@@ -1,4 +1,4 @@
-import { attach, combine, createEffect, createEvent, createStore, restore, sample } from 'effector'
+import { attach, createEffect, createEvent, createStore, restore, sample } from 'effector'
 import { createAction } from 'effector-action'
 import {
   Domain,
@@ -18,7 +18,6 @@ import {
   getInitialPmGrade,
   getTreeGrades,
   isTreeDataReady,
-  isTreeDataWithoutGradeReady,
 } from '../shared/pmProgress.helpers'
 import { TreeNormalizer } from '../shared/TreeNormalizer'
 import { persist } from 'effector-storage/session'
@@ -31,14 +30,12 @@ export class PmTreeModel {
   private readonly $user = createStore<User | null>(null)
 
   private readonly setupInitialGrade = createEvent<SetupInitialGradeProps>()
+  private readonly setDomains = createEvent<Domain[]>()
   public readonly setGrade = createEvent<number | null>()
 
   public readonly $isInitialized = createStore(false)
   public readonly $grade = restore(this.setGrade, null)
-  public readonly $domains = createStore<Record<number, Domain[]>>({})
-  public readonly $domainsInGrade = combine(this.$domains, this.$grade, (domains, grade) =>
-    grade !== null ? (domains[grade] ?? []) : [],
-  )
+  public readonly $domains = restore(this.setDomains, [])
   public readonly $grades = createStore<Grade[]>([])
   public readonly $status = createStore<PmProgressStatus | null>(null)
 
@@ -51,7 +48,7 @@ export class PmTreeModel {
     this.setupFailedAndLockedStatus()
     this.setupTreeInit()
     this.setupGradeInit()
-    this.setupDomainsInTree()
+    this.setupDomainStructure()
   }
 
   public readonly initTreeFx = createEffect(async ({ user }: PmProgressGateProps) => {
@@ -153,28 +150,22 @@ export class PmTreeModel {
     })
   }
 
-  private setupDomainsInTree() {
+  private setupDomainStructure() {
     sample({
-      clock: this.initTreeFx.doneData,
-      source: { tree: this.$tree, stats: this.$stats, user: this.$user },
-      filter: isTreeDataWithoutGradeReady,
-      fn: ({ tree, stats, user }) => {
-        const treeNodes = Object.values(tree.treeMapping)
-        const grades = getTreeGrades(tree, user).filter((g) => !g.isLocked)
-
-        return Object.fromEntries(
-          grades.map((grade) => {
-            const [treeWithStats] = enhanceProgressMatrixData(
-              treeNodes,
-              stats,
-              [{ entityId: user._id, name: user.fullName }],
-              grade.value,
-            )
-            return [grade.value, getDomainStructure(treeWithStats, tree.treeMapping)]
-          }),
+      clock: [this.$grade, this.initTreeFx.doneData],
+      source: { tree: this.$tree, stats: this.$stats, user: this.$user, grade: this.$grade },
+      filter: isTreeDataReady,
+      fn: ({ tree, stats, user, grade }) => {
+        const [treeWithUserStats] = enhanceProgressMatrixData(
+          Object.values(tree.treeMapping),
+          stats,
+          [{ entityId: user._id, name: user.fullName }],
+          grade as number,
         )
+
+        return getDomainStructure(treeWithUserStats, tree.treeMapping)
       },
-      target: this.$domains,
+      target: this.setDomains,
     })
   }
 }

package/src/features/pmProgress/shared/pmProgress.constants.ts

@@ -35,7 +35,7 @@ export enum PmProgressStatus {
 export enum SessionStorageKeys {
   SOLVING_QUEUE = 'PM_SOLVING_QUEUE',
   GRADE = 'PM_GRADE',
-  DOMAINS = 'PM_DOMAINS_IN_TREE',
+  DOMAINS = 'PM_DOMAINS',
 }
 
 /**

package/src/features/pmProgress/shared/pmProgress.helpers.ts

@@ -171,14 +171,6 @@ type TreeDataReady = {
 export const isTreeDataReady = (source: TreeDataSource): source is TreeDataReady =>
   source.tree !== null && source.stats !== null && source.user !== null && source.grade !== null
 
-type TreeDataWithoutGrade = Omit<TreeDataSource, 'grade'>
-type TreeDataWithoutGradeReady = Omit<TreeDataReady, 'grade'>
-
-export const isTreeDataWithoutGradeReady = (
-  source: TreeDataWithoutGrade,
-): source is TreeDataWithoutGradeReady =>
-  source.tree !== null && source.stats !== null && source.user !== null
-
 export const createChartConfig = (size: number): PieChartManagerConfig => {
   const OUTER_MARGIN = 5
   return {
@@ -269,9 +261,6 @@ export const withoutDuplicates = (skills: (Skill | undefined)[]): Skill[] => {
   })
 }
 
-export const findDomainBySkillId = (skillId: string, domains: Domain[]): Domain | undefined =>
-  domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))
-
 // Reorders grades starting from the given grade, wrapping around. [1,2,3] with start=2 → [2,3,1]
 export const startGradesFrom = (grades: Grade[], startGrade: number): Grade[] => {
   const index = grades.findIndex(({ value }) => value === startGrade)

package/src/features/voice/recording/components/VoiceRecordButton.tsx

@@ -4,6 +4,7 @@ import {
   Button,
   ButtonColor,
   ButtonSize,
+  ButtonStates,
   ButtonStyle,
   ButtonVariant,
   CheckIcon,
@@ -95,16 +96,29 @@ const AdvancedButton = ({ isRecording, isIdle, disabled, onPressIn }: AdvancedBu
     onPressIn={onPressIn}
     disabled={disabled}
   >
-    <View style={[styles.advancedIconContainer, !isIdle && styles.advancedIconContainerActive]}>
-      {isRecording ? (
-        <CheckIcon size={18} color={COLORS.NEUTRAL_1} />
-      ) : (
-        <MicrophoneIcon
-          style={styles.advancedMicrophoneIcon}
-          color={disabled ? COLORS.NEUTRAL_5 : isIdle ? COLORS.NEUTRAL_9 : COLORS.NEUTRAL_1}
-        />
-      )}
-    </View>
+    <Button
+      customColorScheme={{
+        [ButtonStates.ACTIVE]: {
+          backgroundColor: COLORS.PRIMARY_BLUE,
+          borderColor: COLORS.PRIMARY_BLUE,
+          raiseColor: COLORS.PRIMARY_BLUE,
+          color: COLORS.PRIMARY_BLUE,
+        },
+      }}
+      isActive={isRecording}
+      variant={ButtonVariant.TERTIARY}
+      onPressIn={onPressIn}
+      icon={
+        isRecording ? (
+          <CheckIcon size={25} color={COLORS.NEUTRAL_1} />
+        ) : (
+          <MicrophoneIcon
+            style={styles.advancedMicrophoneIcon}
+            color={disabled ? COLORS.NEUTRAL_5 : isIdle ? COLORS.NEUTRAL_9 : COLORS.NEUTRAL_1}
+          />
+        )
+      }
+    />
   </Pressable>
 )
 

package/dist/commonjs/features/pmProgress/hooks/useNextUpDomain.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useNextUpDomain = void 0;
-var _effectorReact = require("effector-react");
-var _PmProgressContext = require("../context/PmProgressContext.js");
-var _pmProgressHelpers = require("../shared/pmProgress.helpers.js");
-const useNextUpDomain = () => {
-  const {
-    model
-  } = (0, _PmProgressContext.usePmProgress)();
-  const magmaRecs = (0, _effectorReact.useUnit)(model.recommendations.$magma);
-  const domainsInTree = (0, _effectorReact.useUnit)(model.tree.$domains);
-  return (0, _effectorReact.useStoreMap)({
-    store: model.tree.$domainsInGrade,
-    keys: [magmaRecs, domainsInTree],
-    fn: domainsInGrade => {
-      const firstRec = magmaRecs.items[0];
-      if (firstRec) {
-        const allDomains = Object.values(domainsInTree).flat();
-        const domain = (0, _pmProgressHelpers.findDomainBySkillId)(firstRec._id, allDomains) ?? null;
-        return {
-          domain,
-          isFromRecommendation: true
-        };
-      }
-      const domain = domainsInGrade.find(domain => {
-        const isFluency = (0, _pmProgressHelpers.isFluencyDomain)(domain.title);
-        const isDomainCompleted = domain.standards.every(standard => standard.isCompleted);
-        return !isFluency && !isDomainCompleted;
-      }) ?? null;
-      return {
-        domain,
-        isFromRecommendation: false
-      };
-    }
-  });
-};
-exports.useNextUpDomain = useNextUpDomain;
-//# sourceMappingURL=useNextUpDomain.js.map

package/dist/commonjs/features/pmProgress/hooks/useNextUpDomain.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_effectorReact","require","_PmProgressContext","_pmProgressHelpers","useNextUpDomain","model","usePmProgress","magmaRecs","useUnit","recommendations","$magma","domainsInTree","tree","$domains","useStoreMap","store","$domainsInGrade","keys","fn","domainsInGrade","firstRec","items","allDomains","Object","values","flat","domain","findDomainBySkillId","_id","isFromRecommendation","find","isFluency","isFluencyDomain","title","isDomainCompleted","standards","every","standard","isCompleted","exports"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/hooks/useNextUpDomain.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AAEO,MAAMG,eAAe,GAAGA,CAAA,KAAM;EACnC,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,gCAAa,EAAC,CAAC;EACjC,MAAMC,SAAS,GAAG,IAAAC,sBAAO,EAACH,KAAK,CAACI,eAAe,CAACC,MAAM,CAAC;EACvD,MAAMC,aAAa,GAAG,IAAAH,sBAAO,EAACH,KAAK,CAACO,IAAI,CAACC,QAAQ,CAAC;EAElD,OAAO,IAAAC,0BAAW,EAAC;IACjBC,KAAK,EAAEV,KAAK,CAACO,IAAI,CAACI,eAAe;IACjCC,IAAI,EAAE,CAACV,SAAS,EAAEI,aAAa,CAAC;IAChCO,EAAE,EAAGC,cAAc,IAAK;MACtB,MAAMC,QAAQ,GAAGb,SAAS,CAACc,KAAK,CAAC,CAAC,CAAC;MACnC,IAAID,QAAQ,EAAE;QACZ,MAAME,UAAU,GAAGC,MAAM,CAACC,MAAM,CAACb,aAAa,CAAC,CAACc,IAAI,CAAC,CAAC;QACtD,MAAMC,MAAM,GAAG,IAAAC,sCAAmB,EAACP,QAAQ,CAACQ,GAAG,EAAEN,UAAU,CAAC,IAAI,IAAI;QACpE,OAAO;UAAEI,MAAM;UAAEG,oBAAoB,EAAE;QAAK,CAAC;MAC/C;MAEA,MAAMH,MAAM,GACVP,cAAc,CAACW,IAAI,CAAEJ,MAAM,IAAK;QAC9B,MAAMK,SAAS,GAAG,IAAAC,kCAAe,EAACN,MAAM,CAACO,KAAK,CAAC;QAC/C,MAAMC,iBAAiB,GAAGR,MAAM,CAACS,SAAS,CAACC,KAAK,CAAEC,QAAQ,IAAKA,QAAQ,CAACC,WAAW,CAAC;QACpF,OAAO,CAACP,SAAS,IAAI,CAACG,iBAAiB;MACzC,CAAC,CAAC,IAAI,IAAI;MAEZ,OAAO;QAAER,MAAM;QAAEG,oBAAoB,EAAE;MAAM,CAAC;IAChD;EACF,CAAC,CAAC;AACJ,CAAC;AAAAU,OAAA,CAAAnC,eAAA,GAAAA,eAAA","ignoreList":[]}

package/dist/module/features/pmProgress/hooks/useNextUpDomain.js

@@ -1,37 +0,0 @@
-"use strict";
-
-import { useUnit, useStoreMap } from 'effector-react';
-import { usePmProgress } from "../context/PmProgressContext.js";
-import { findDomainBySkillId, isFluencyDomain } from "../shared/pmProgress.helpers.js";
-export const useNextUpDomain = () => {
-  const {
-    model
-  } = usePmProgress();
-  const magmaRecs = useUnit(model.recommendations.$magma);
-  const domainsInTree = useUnit(model.tree.$domains);
-  return useStoreMap({
-    store: model.tree.$domainsInGrade,
-    keys: [magmaRecs, domainsInTree],
-    fn: domainsInGrade => {
-      const firstRec = magmaRecs.items[0];
-      if (firstRec) {
-        const allDomains = Object.values(domainsInTree).flat();
-        const domain = findDomainBySkillId(firstRec._id, allDomains) ?? null;
-        return {
-          domain,
-          isFromRecommendation: true
-        };
-      }
-      const domain = domainsInGrade.find(domain => {
-        const isFluency = isFluencyDomain(domain.title);
-        const isDomainCompleted = domain.standards.every(standard => standard.isCompleted);
-        return !isFluency && !isDomainCompleted;
-      }) ?? null;
-      return {
-        domain,
-        isFromRecommendation: false
-      };
-    }
-  });
-};
-//# sourceMappingURL=useNextUpDomain.js.map

package/dist/module/features/pmProgress/hooks/useNextUpDomain.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["useUnit","useStoreMap","usePmProgress","findDomainBySkillId","isFluencyDomain","useNextUpDomain","model","magmaRecs","recommendations","$magma","domainsInTree","tree","$domains","store","$domainsInGrade","keys","fn","domainsInGrade","firstRec","items","allDomains","Object","values","flat","domain","_id","isFromRecommendation","find","isFluency","title","isDomainCompleted","standards","every","standard","isCompleted"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/hooks/useNextUpDomain.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,WAAW,QAAQ,gBAAgB;AACrD,SAASC,aAAa,QAAQ,iCAA8B;AAC5D,SAASC,mBAAmB,EAAEC,eAAe,QAAQ,iCAA8B;AAEnF,OAAO,MAAMC,eAAe,GAAGA,CAAA,KAAM;EACnC,MAAM;IAAEC;EAAM,CAAC,GAAGJ,aAAa,CAAC,CAAC;EACjC,MAAMK,SAAS,GAAGP,OAAO,CAACM,KAAK,CAACE,eAAe,CAACC,MAAM,CAAC;EACvD,MAAMC,aAAa,GAAGV,OAAO,CAACM,KAAK,CAACK,IAAI,CAACC,QAAQ,CAAC;EAElD,OAAOX,WAAW,CAAC;IACjBY,KAAK,EAAEP,KAAK,CAACK,IAAI,CAACG,eAAe;IACjCC,IAAI,EAAE,CAACR,SAAS,EAAEG,aAAa,CAAC;IAChCM,EAAE,EAAGC,cAAc,IAAK;MACtB,MAAMC,QAAQ,GAAGX,SAAS,CAACY,KAAK,CAAC,CAAC,CAAC;MACnC,IAAID,QAAQ,EAAE;QACZ,MAAME,UAAU,GAAGC,MAAM,CAACC,MAAM,CAACZ,aAAa,CAAC,CAACa,IAAI,CAAC,CAAC;QACtD,MAAMC,MAAM,GAAGrB,mBAAmB,CAACe,QAAQ,CAACO,GAAG,EAAEL,UAAU,CAAC,IAAI,IAAI;QACpE,OAAO;UAAEI,MAAM;UAAEE,oBAAoB,EAAE;QAAK,CAAC;MAC/C;MAEA,MAAMF,MAAM,GACVP,cAAc,CAACU,IAAI,CAAEH,MAAM,IAAK;QAC9B,MAAMI,SAAS,GAAGxB,eAAe,CAACoB,MAAM,CAACK,KAAK,CAAC;QAC/C,MAAMC,iBAAiB,GAAGN,MAAM,CAACO,SAAS,CAACC,KAAK,CAAEC,QAAQ,IAAKA,QAAQ,CAACC,WAAW,CAAC;QACpF,OAAO,CAACN,SAAS,IAAI,CAACE,iBAAiB;MACzC,CAAC,CAAC,IAAI,IAAI;MAEZ,OAAO;QAAEN,MAAM;QAAEE,oBAAoB,EAAE;MAAM,CAAC;IAChD;EACF,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/dist/typescript/commonjs/features/pmProgress/hooks/useNextUpDomain.d.ts

@@ -1,5 +0,0 @@
-export declare const useNextUpDomain: () => {
-    domain: import("..").Domain | null;
-    isFromRecommendation: boolean;
-};
-//# sourceMappingURL=useNextUpDomain.d.ts.map

package/dist/typescript/commonjs/features/pmProgress/hooks/useNextUpDomain.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useNextUpDomain.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/hooks/useNextUpDomain.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe;;;CA0B3B,CAAA"}

package/dist/typescript/module/features/pmProgress/hooks/useNextUpDomain.d.ts

@@ -1,5 +0,0 @@
-export declare const useNextUpDomain: () => {
-    domain: import("..").Domain | null;
-    isFromRecommendation: boolean;
-};
-//# sourceMappingURL=useNextUpDomain.d.ts.map

package/dist/typescript/module/features/pmProgress/hooks/useNextUpDomain.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useNextUpDomain.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/hooks/useNextUpDomain.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe;;;CA0B3B,CAAA"}

package/src/features/pmProgress/hooks/useNextUpDomain.ts

@@ -1,31 +0,0 @@
-import { useUnit, useStoreMap } from 'effector-react'
-import { usePmProgress } from '../context/PmProgressContext'
-import { findDomainBySkillId, isFluencyDomain } from '../shared/pmProgress.helpers'
-
-export const useNextUpDomain = () => {
-  const { model } = usePmProgress()
-  const magmaRecs = useUnit(model.recommendations.$magma)
-  const domainsInTree = useUnit(model.tree.$domains)
-
-  return useStoreMap({
-    store: model.tree.$domainsInGrade,
-    keys: [magmaRecs, domainsInTree],
-    fn: (domainsInGrade) => {
-      const firstRec = magmaRecs.items[0]
-      if (firstRec) {
-        const allDomains = Object.values(domainsInTree).flat()
-        const domain = findDomainBySkillId(firstRec._id, allDomains) ?? null
-        return { domain, isFromRecommendation: true }
-      }
-
-      const domain =
-        domainsInGrade.find((domain) => {
-          const isFluency = isFluencyDomain(domain.title)
-          const isDomainCompleted = domain.standards.every((standard) => standard.isCompleted)
-          return !isFluency && !isDomainCompleted
-        }) ?? null
-
-      return { domain, isFromRecommendation: false }
-    },
-  })
-}