Merge branch 'feature-cypress' into dev

2023-12-19 11:06:31 +01:00
parent 80caed1498 ce9e93d68f
commit 9d0fd20446
13 changed files with 2449 additions and 37 deletions
@@ -11,16 +11,17 @@ const Dice = ({ rolledNumber, nowMoving, playerColor, movingPlayer }) => {
    };

    const isCurrentPlayer = movingPlayer === playerColor;
-    const hasRolledNumber = rolledNumber !== null;
+    const hasRolledNumber = rolledNumber !== null && rolledNumber !== undefined;

    return (
        <div className={styles.container}>
-            {isCurrentPlayer &&
-                (hasRolledNumber ? (
+            {isCurrentPlayer ? (
+                hasRolledNumber ? (
                    <img src={images[rolledNumber - 1]} alt={rolledNumber} />
-                ) : (
-                    nowMoving && <img src={images[6]} alt='roll' onClick={handleClick} />
-                ))}
+                ) : nowMoving ? (
+                    <img src={images[6]} className='roll' alt='roll' onClick={handleClick} />
+                ) : null
+            ) : null}
        </div>
    );
 };