From 6aa1c9cfb74a5358cabd39b65b1965297c460dd1 Mon Sep 17 00:00:00 2001
From: "Anton@habdevs" <hramickih@yandex.ru>
Date: Thu, 14 Sep 2023 14:51:17 +0500
Subject: [PATCH] upd: context GameField | upd GameResult #190

---
 components/GameField/GameField.tsx   | 18 +++++++++++-------
 components/GameResult/GameResult.tsx |  8 ++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/components/GameField/GameField.tsx b/components/GameField/GameField.tsx
index dee59de..77a910b 100644
--- a/components/GameField/GameField.tsx
+++ b/components/GameField/GameField.tsx
@@ -33,19 +33,23 @@ export const GameField: React.FC<GameFieldPropsI> = ({
   const [isShowDispute, setShowDispute] = useState<boolean>(false);
   const { t } = useTranslation();
   const account = useAccount();
-  const { setFinishResult } = useGameStateContext();
+  const { setFinishResult, finishResult } = useGameStateContext();
   const { data, error, loading } = useQuery(badgesQuery, {
     variables: { id: account.address?.toLowerCase() },
   });
   // TODO added context @habdevs #190
   if (finishGameCheckResult) {
-    setFinishResult({
-      winner: finishGameCheckResult.winner,
-      isDraw: finishGameCheckResult.isDraw,
-      cheatWin: finishGameCheckResult.cheatWin,
-    });
-    console.log('CONTEXT GAMEFIELD', setFinishResult)
+
+    const newFinishResult = {
+      winner: finishGameCheckResult?.winner || false,
+      isDraw: finishGameCheckResult?.isDraw || false,
+      cheatWin: finishGameCheckResult?.cheatWin || false,
+    };
+
+    setFinishResult(newFinishResult);
+    console.log('CONTEXT GAMEFIELD', newFinishResult)
   }
+
   console.log('dispute mode', disputeMode, account.address);
 
   function isOpponentAddress(address: string): boolean {
diff --git a/components/GameResult/GameResult.tsx b/components/GameResult/GameResult.tsx
index 649dc45..a888fe3 100644
--- a/components/GameResult/GameResult.tsx
+++ b/components/GameResult/GameResult.tsx
@@ -32,23 +32,23 @@ export const GameResult = () => {
     <div
       className={classNames(styles.container, {
         [styles.win]: winner,
-        [styles.lose]: !winner,
+        [styles.lose]: !winner && !isDraw,
         [styles.draw]: isDraw,
       })}>
       <h2 className={styles.title}>
         {winner === true && <span>Winner!</span>}
-        {!winner && <span>Better Luck Next Time</span>}
+        {!winner && !isDraw && <span>Better Luck Next Time</span>}
         {isDraw === true && <span>Better Luck Next Time</span>}
       </h2>
       {winner && (
         <img src={imgWin.src} alt='Win' width={640} height={510} className={styles.imageWin} />
       )}
-      {winner === false && (
+      {!!winner && (
         <h1 className={styles.titleResult}>
           You lose <img src={loseImg.src} alt='lose' className={styles.imageSize} />
         </h1>
       )}
-      {isDraw === true && (
+      {isDraw && (
         <h1 className={styles.titleResult}>
           Draw <img src={drawImg.src} alt='draw' className={styles.imageSize} />
         </h1>