Merge branch 'develop' of https://bitbucket.org/ecropdev/ielts-ui into feature/level-file-upload

src/components/Solutions/FillBlanks.tsx

@@ -28,6 +28,7 @@ export default function FillBlanksSolutions({
 		const total = text.match(/({{\d+}})/g)?.length || 0;
 		const correct = correctUserSolutions!.filter((x) => {
 			const solution = solutions.find((y) => x.id.toString() === y.id.toString())?.solution;
+			console.log(solution);
 			if (!solution) return false;
 
 			const option = words.find((w) => {
@@ -36,7 +37,7 @@ export default function FillBlanksSolutions({
 				} else if ('letter' in w) {
 					return w.word.toLowerCase() === x.solution.toLowerCase();
 				} else {
-					return w.id === x.id;
+					return w.id.toString() === x.id.toString();
 				}
 			});
 			if (!option) return false;

src/components/Solutions/WriteBlanks.tsx

@@ -49,15 +49,11 @@ function Blank({
 			{userSolution && !isUserSolutionCorrect() && (
 				<div
 					className="py-2 px-3 rounded-2xl w-fit focus:outline-none my-2 bg-mti-rose-ultralight text-mti-rose-light"
-					placeholder={id}
 					contentEditable={disabled}>
 					{userSolution}
 				</div>
 			)}
-			<div
-				className={clsx("py-2 px-3 rounded-2xl w-fit focus:outline-none my-2", getSolutionStyling())}
-				placeholder={id}
-				contentEditable={disabled}>
+			<div className={clsx("py-2 px-3 rounded-2xl w-fit focus:outline-none my-2", getSolutionStyling())} contentEditable={disabled}>
 				{!solutions ? userInput : solutions.join(" / ")}
 			</div>
 		</span>