From 7b5c1b9672de5feb174f60028fb93df0a0355a15 Mon Sep 17 00:00:00 2001 From: ppc Date: Tue, 3 Sep 2024 18:00:50 +0100 Subject: [PATCH] move connection error message to own component --- amnet-native/app/ServerCardIn.tsx | 57 +++++++++++++-------- amnet-native/components/AMUIStatusAlert.tsx | 22 ++++++++ 2 files changed, 58 insertions(+), 21 deletions(-) create mode 100644 amnet-native/components/AMUIStatusAlert.tsx diff --git a/amnet-native/app/ServerCardIn.tsx b/amnet-native/app/ServerCardIn.tsx index fd0fdd4..e1bb5fa 100644 --- a/amnet-native/app/ServerCardIn.tsx +++ b/amnet-native/app/ServerCardIn.tsx @@ -1,10 +1,21 @@ import {BSON} from "realm"; -import {fetchServerInfo, performCardIn} from "amnet-shared"; +import {fetchServerInfo, getGameName, performCardIn} from "amnet-shared"; import React, {useCallback, useEffect, useLayoutEffect, useMemo, useState} from "react"; -import {ActivityIndicator, Button, Card, Paragraph, Title, useTheme} from "react-native-paper"; +import {ActivityIndicator, Button, Paragraph, Title, useTheme} from "react-native-paper"; import {Alert, RefreshControl, ScrollView, Share, StyleSheet, TouchableOpacity, View} from "react-native"; -import {CircleCheck, CircleDot, CreditCard, Nfc, Plus, SmartphoneNfcIcon, WifiOff, Share as ShareIcon} from "lucide-react-native"; +import { + CircleCheck, + CircleDot, + CreditCard, + Nfc, + Plus, + SmartphoneNfcIcon, + Share as ShareIcon, + WifiOff, +} from "lucide-react-native"; + import {EmptyStatePlaceholder} from "../components/EmptyStatePlaceholder"; +import {AMUIStatusAlert} from "../components/AMUIStatusAlert"; import {AimeCard} from "../components/AimeCard"; import RealmContext from "../models/RealmContext"; @@ -153,22 +164,7 @@ export default function ServerCardIn({route, navigation}) { setServerRefreshing(true); setServerReloadCounter(serverReloadCounter + 1); }}/>}> - {!connectionTestResult && ( - - - - - Connection Failed - - - There was an issue connecting to {server.serverAddress}. - Check the network connection and try again. - - - - )} - + {gameName ? `Play ${gameName}` : "Selected Card"} {selectedCard ? <> @@ -197,7 +193,7 @@ export default function ServerCardIn({route, navigation}) { {cards.length > 0 && ( - Additional Cards + Additional Cards