diff --git a/amnet-native/app/ServerCardIn.tsx b/amnet-native/app/ServerCardIn.tsx index 6e012bd..d9ba85c 100644 --- a/amnet-native/app/ServerCardIn.tsx +++ b/amnet-native/app/ServerCardIn.tsx @@ -53,8 +53,9 @@ export default function ServerCardIn({route, navigation}) { const [userSelectedCard, setUserSelectedCard] = useState(null); const [cardInCompleted, setCardInCompleted] = useState(null); - const defaultCard = useMemo(() => cards.find(x => x.lastUsedGameId === server.gameId), [cards, server.gameId]); - const selectedCard = useMemo(() => userSelectedCard ?? defaultCard ?? cards.at(1) ?? null, [userSelectedCard, defaultCard]); + const serverDefaultCard = useMemo(() => cards.find(x => x.lastUsedGameId === server.gameId), [cards, server.gameId]); + + const selectedCard = useMemo(() => userSelectedCard ?? serverDefaultCard ?? cards.at(0) ?? null, [userSelectedCard, serverDefaultCard]); const unselectedCards = useMemo(() => cards.filter(x => x._id.toHexString() !== selectedCard?._id.toHexString()), [cards, selectedCard]); useLayoutEffect(() => { @@ -181,7 +182,7 @@ export default function ServerCardIn({route, navigation}) { }> - {defaultCard?.code == selectedCard.code && } + {serverDefaultCard?.code == selectedCard.code && }