diff --git a/amnet-native/app/ServerCardIn.tsx b/amnet-native/app/ServerCardIn.tsx index d9ba85c..38b733c 100644 --- a/amnet-native/app/ServerCardIn.tsx +++ b/amnet-native/app/ServerCardIn.tsx @@ -48,7 +48,7 @@ export default function ServerCardIn({route, navigation}) { // server state const [serverRefreshing, setServerRefreshing] = useState(false); const [serverReloadCounter, setServerReloadCounter] = useState(0); - const [connectionTestResult, setConnectionTestResult] = useState(null); + const [serverConnectionSuccess, setServerConnectionSuccess] = useState(null); const [userSelectedCard, setUserSelectedCard] = useState(null); const [cardInCompleted, setCardInCompleted] = useState(null); @@ -82,7 +82,7 @@ export default function ServerCardIn({route, navigation}) { // auto-refresh useEffect(() => { - if (!connectionTestResult) { + if (!serverConnectionSuccess) { return; } @@ -91,7 +91,7 @@ export default function ServerCardIn({route, navigation}) { const timeout = setTimeout(() => setServerReloadCounter(serverReloadCounter + 1), 5000); return () => clearTimeout(timeout); } - }, [connectionTestResult, server]); + }, [serverConnectionSuccess, server]); // server info update useEffect(() => { @@ -108,18 +108,18 @@ export default function ServerCardIn({route, navigation}) { const abortController = new AbortController(); fetchServerInfo(server.serverAddress, abortController.signal).then(r => { if (!r) { - setConnectionTestResult(false); + setServerConnectionSuccess(false); return; } - setConnectionTestResult(true); + setServerConnectionSuccess(true); realm.write(() => { server.lastUsed = new Date(); Object.keys(r).forEach(x => server[x] = r[x]); }); }).catch(() => { - setConnectionTestResult(false); + setServerConnectionSuccess(false); }).finally(() => { setServerRefreshing(false); }); @@ -160,9 +160,9 @@ export default function ServerCardIn({route, navigation}) { }; const gameName = useMemo(() => getGameName(server.gameId), [server.gameId]); - const disableCardIn = useMemo(() => cardInCompleted !== null || !connectionTestResult, [cardInCompleted, connectionTestResult]); + const disableCardIn = useMemo(() => cardInCompleted !== null || !serverConnectionSuccess, [cardInCompleted, serverConnectionSuccess]); - if (connectionTestResult === null) { + if (serverConnectionSuccess === null) { return ( @@ -173,9 +173,9 @@ export default function ServerCardIn({route, navigation}) { return ( }> - + {gameName ? `Play ${gameName}` : "Selected Card"} {selectedCard ? <> @@ -188,7 +188,7 @@ export default function ServerCardIn({route, navigation}) { onPress={cardInCallback} disabled={disableCardIn} contentStyle={{flexDirection: 'row-reverse'}} - mode={connectionTestResult ? "contained" : "outlined"} + mode={serverConnectionSuccess ? "contained" : "outlined"} buttonColor={cardInCompleted === false ? "red" : "green"} icon={() => }> {cardInCompleted === null ? "Card In" : cardInCompleted ? "Card In Success" : "Failed"}