From d95335d59b0b3739bc52636ed1a790585973a870 Mon Sep 17 00:00:00 2001
From: James Ketrenos <james_eikona@ketrenos.com>
Date: Mon, 20 Jun 2022 12:20:14 -0700
Subject: [PATCH] Fix #115 - add player color to offerRejected

Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
---
 client/src/Trade.js    | 2 +-
 server/routes/games.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/Trade.js b/client/src/Trade.js
index fafee08..2bd64c9 100644
--- a/client/src/Trade.js
+++ b/client/src/Trade.js
@@ -442,7 +442,7 @@ const Trade = () => {
               You have not made a trade offer.
             </span>}
 
-            { !isTurn && isSameOffer && isOfferValid && _gets !== 'nothing' && _gives !== 'nothing' && <span style={{fontWeight: 'bold'}}>
+            {!isTurn && isSameOffer && !youWereRejected && isOfferValid && _gets !== 'nothing' && _gives !== 'nothing' && <span style={{fontWeight: 'bold'}}>
               Your submitted offer agrees with {turn.name}'s terms.
             </span> }
           </> }
diff --git a/server/routes/games.js b/server/routes/games.js
index 7ffaa01..7bb47e3 100755
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -1962,6 +1962,10 @@ const trade = (game, session, action, offer) => {
       other.offerRejected = {};
     }
     other.offerRejected[session.color] = true;
+    if (!session.player.offerRejected) {
+      session.player.offerRejected = {};
+    }
+    session.player.offerRejected[offer.color] = true;
     addActivity(game, session, `${session.name} rejected ${other.name}'s offer.`);
     return;
   }