Solved merge conflicts
This commit is contained in:
@@ -18,10 +18,7 @@ import {
|
||||
BsHeadphones,
|
||||
BsMegaphone,
|
||||
BsPen,
|
||||
BsShareFill,
|
||||
} from "react-icons/bs";
|
||||
import { LevelScore } from "@/constants/ielts";
|
||||
import { getLevelScore } from "@/utils/score";
|
||||
import { capitalize } from "lodash";
|
||||
import Modal from "@/components/Modal";
|
||||
import { UserSolution } from "@/interfaces/exam";
|
||||
@@ -67,6 +64,7 @@ export default function Finish({ user, practiceScores, scores, modules, informat
|
||||
const router = useRouter()
|
||||
|
||||
useEffect(() => setSelectedScore(scores.find((x) => x.module === selectedModule)!), [scores, selectedModule]);
|
||||
useEffect(() => setSelectedPracticeScore(practiceScores.find((x) => x.module === selectedModule)!), [practiceScores, selectedModule]);
|
||||
|
||||
const moduleColors: { [key in Module]: { progress: string; inner: string } } = {
|
||||
reading: {
|
||||
@@ -289,7 +287,7 @@ export default function Finish({ user, practiceScores, scores, modules, informat
|
||||
<div className="bg-mti-green mt-1 h-3 min-h-[0.75rem] w-3 min-w-[0.75rem] rounded-full" />
|
||||
<div className="flex flex-col">
|
||||
<span className="text-mti-green">
|
||||
{selectedPracticeScore.correct} / {selectedScore.total}
|
||||
{selectedPracticeScore.correct} / {selectedPracticeScore.total}
|
||||
</span>
|
||||
<span className="text-lg whitespace-nowrap">Practice Questions</span>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user