diff --git a/amnet-native/app/ServerCardIn.tsx b/amnet-native/app/ServerCardIn.tsx index 9906a26..fd0fdd4 100644 --- a/amnet-native/app/ServerCardIn.tsx +++ b/amnet-native/app/ServerCardIn.tsx @@ -132,6 +132,7 @@ export default function ServerCardIn({route, navigation}) { return () => abortController.abort(); }, [server, selectedCard]); + const gameName = useMemo(() => getGameName(server.gameId), [server.gameId]); const disableCardIn = useMemo(() => cardInCompleted !== null || !connectionTestResult, [cardInCompleted, connectionTestResult]); if (connectionTestResult === null) { @@ -169,7 +170,7 @@ export default function ServerCardIn({route, navigation}) { )} - Selected Card + {gameName ? `Play ${gameName}` : "Selected Card"} {selectedCard ? <> {unselectedCards.length - ? unselectedCards.map(card => ( + ? unselectedCards.map((card: AMCard) => ( } diff --git a/amnet-native/app/ServerManager.tsx b/amnet-native/app/ServerManager.tsx index 242a85c..b55aad8 100644 --- a/amnet-native/app/ServerManager.tsx +++ b/amnet-native/app/ServerManager.tsx @@ -1,19 +1,22 @@ import {Button, Paragraph, useTheme} from "react-native-paper"; -import {Globe, History, Plus, ServerOff} from "lucide-react-native"; +import {FlatList, NativeSyntheticEvent, Share, View} from "react-native"; import React, {useCallback, useLayoutEffect, useMemo, useState} from "react"; -import {FlatList, NativeSyntheticEvent, Share, Text, View} from "react-native"; +import {Globe, History, Joystick, Plus, ServerOff} from "lucide-react-native"; import ContextMenu, {ContextMenuOnPressNativeEvent} from "react-native-context-menu-view"; import {EmptyStatePlaceholder} from "../components/EmptyStatePlaceholder"; import {AMUICard, AMUICardDetail} from "../components/AMUICard"; import TimeAgo from "../components/TimeAgo"; import RealmContext from "../models/RealmContext"; +import {getGameName} from "../../amnet-shared"; import {AMServer} from "../models/AMServer"; const {useRealm, useQuery} = RealmContext; function ServerCard(props: { server: AMServer, navigation: any }) { const realm = useRealm(); + const gameName = useMemo(() => getGameName(props.server.gameId), [props.server.gameId]); + const pageCallback = useCallback(() => { props.navigation.navigate('server', { serverId: props.server._id.toHexString() @@ -51,10 +54,16 @@ function ServerCard(props: { server: AMServer, navigation: any }) { - + {props.server.serverAddress} - + + {gameName && ( + + + {gameName} + + )} {props.server.lastUsed