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. } - { !isTurn && isSameOffer && isOfferValid && _gets !== 'nothing' && _gives !== 'nothing' && + {!isTurn && isSameOffer && !youWereRejected && isOfferValid && _gets !== 'nothing' && _gives !== 'nothing' && Your submitted offer agrees with {turn.name}'s terms. } } 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; }