Merge pull request #176 from daithihearn/bugfix-buying-cards-when-goer

Fixing bug where it is possible to lose cards when buying as the goer

package.json

@@ -1,6 +1,6 @@
 {
     "name": "frontend",
-    "version": "7.2.3",
+    "version": "7.2.4",
     "description": "React frontend for the Cards 110",
     "author": "Daithi Hearn",
     "license": "MIT",

public/manifest.json

@@ -1,7 +1,7 @@
 {
   "short_name": "Cards 110",
   "name": "Cards 110",
-  "version": "7.2.3",
+  "version": "7.2.4",
   "icons": [
     {
       "src": "./assets/favicon.png",

src/components/Game/Actions/Buying.tsx

@@ -2,7 +2,6 @@ import { useCallback, useEffect, useState } from "react"
 
 import GameService from "services/GameService"
 import { useAppDispatch, useAppSelector } from "caches/hooks"
-import { useSnackbar } from "notistack"
 import {
     getMyCardsWithoutBlanks,
     getSelectedCards,
@@ -19,7 +18,6 @@ import {
 import { pickBestCards, riskOfMistakeBuyingCards } from "utils/GameUtils"
 import ThrowCardsWarningModal from "./ThrowCardsWarningModal"
 import { SelectableCard } from "model/Cards"
-import parseError from "utils/ErrorUtils"
 import { Button } from "@mui/material"
 import { getSettings } from "caches/SettingsSlice"
 
@@ -31,8 +29,8 @@ const WaitingForRoundToStart = () => (
 
 const Buying = () => {
     const dispatch = useAppDispatch()
-    const { enqueueSnackbar } = useSnackbar()
     const settings = useAppSelector(getSettings)
+    const numPlayers = useAppSelector(getNumPlayers)
     const gameId = useAppSelector(getGameId)
     const suit = useAppSelector(getSuit)
     const myCards = useAppSelector(getMyCardsWithoutBlanks)
@@ -52,9 +50,7 @@ const Buying = () => {
     const buyCards = useCallback(
         (sel: SelectableCard[]) => {
             if (!gameId) return
-            dispatch(GameService.buyCards(gameId, sel)).catch((e: Error) =>
-                enqueueSnackbar(parseError(e), { variant: "error" }),
-            )
+            dispatch(GameService.buyCards(gameId, sel)).catch(console.error)
         },
         [gameId],
     )
@@ -72,15 +68,35 @@ const Buying = () => {
     }, [iamGoer])
 
     useEffect(() => {
+        // 1. If it is not my go then do nothing
         if (!isMyGo || !suit) return
-        if (readyToBuy) {
+        // 2. If I am the goer and it is my go then keep all cards
+        else if (iamGoer) {
+            buyCards(myCards)
+        }
+        // 3. If I am not the goer and it is my go and I have enabled auto buy cards then keep best cards
+        else if (!iamGoer && settings.autoBuyCards) {
+            buyCards(pickBestCards(myCards, suit, numPlayers))
+        }
+        // 4. If I am not the goer and it is my go and I am ready to buy then keep selected cards
+        else if (!iamGoer && readyToBuy) {
             if (riskOfMistakeBuyingCards(suit, selectedCards, myCards)) {
                 updateDeleteCardsDialog(true)
             } else buyCards(selectedCards)
         }
-    }, [iamGoer, suit, selectedCards, myCards, isMyGo, readyToBuy])
+    }, [
+        settings,
+        iamGoer,
+        suit,
+        selectedCards,
+        myCards,
+        isMyGo,
+        numPlayers,
+        readyToBuy,
+    ])
 
-    if (iHavePlayed || settings.autoBuyCards) return <WaitingForRoundToStart />
+    if (iHavePlayed || settings.autoBuyCards || iamGoer)
+        return <WaitingForRoundToStart />
     return (
         <>
             <Button type="button" onClick={toggleReadyToBuy} color="primary">

src/components/Game/AutoActionManager.tsx

@@ -1,38 +1,27 @@
-import { useCallback, useEffect } from "react"
+import { useEffect } from "react"
 import GameService from "services/GameService"
 
 import { useAppDispatch, useAppSelector } from "caches/hooks"
 import {
     getCards,
     getGameId,
-    getIamGoer,
     getIsInBunker,
     getIsMyGo,
-    getNumPlayers,
     getRound,
-    getSuit,
 } from "caches/GameSlice"
 import { RoundStatus } from "model/Round"
 import { getAutoPlayCard } from "caches/AutoPlaySlice"
-import { bestCardLead, getWorstCard, pickBestCards } from "utils/GameUtils"
+import { bestCardLead, getWorstCard } from "utils/GameUtils"
 import { useSnackbar } from "notistack"
 import parseError from "utils/ErrorUtils"
-import { getSettings } from "caches/SettingsSlice"
-import { SelectableCard } from "model/Cards"
-import { getMyCardsWithoutBlanks } from "caches/MyCardsSlice"
 
 const AutoActionManager = () => {
     const dispatch = useAppDispatch()
     const { enqueueSnackbar } = useSnackbar()
 
-    const settings = useAppSelector(getSettings)
-    const numPlayers = useAppSelector(getNumPlayers)
-    const suit = useAppSelector(getSuit)
-    const myCards = useAppSelector(getMyCardsWithoutBlanks)
     const gameId = useAppSelector(getGameId)
     const round = useAppSelector(getRound)
     const cards = useAppSelector(getCards)
-    const iamGoer = useAppSelector(getIamGoer)
 
     const autoPlayCard = useAppSelector(getAutoPlayCard)
 
@@ -46,16 +35,6 @@ const AutoActionManager = () => {
             })
         })
 
-    const buyCards = useCallback(
-        (sel: SelectableCard[]) => {
-            if (!gameId) return
-            dispatch(GameService.buyCards(gameId, sel)).catch((e: Error) =>
-                enqueueSnackbar(parseError(e), { variant: "error" }),
-            )
-        },
-        [gameId],
-    )
-
     const call = (id: string, callAmount: number) =>
         dispatch(GameService.call(id, callAmount)).catch(console.error)
 
@@ -81,19 +60,6 @@ const AutoActionManager = () => {
         }
     }, [gameId, round, isMyGo, cards, autoPlayCard])
 
-    // Auto buy cards
-    useEffect(() => {
-        if (
-            settings.autoBuyCards &&
-            suit &&
-            isMyGo &&
-            round?.status === RoundStatus.BUYING &&
-            !iamGoer
-        ) {
-            buyCards(pickBestCards(myCards, suit, numPlayers))
-        }
-    }, [settings, isMyGo, iamGoer, round, myCards, suit, numPlayers])
-
     return null
 }