diff --git a/amnet-native/app/CardAddModal.tsx b/amnet-native/app/CardAddModal.tsx index 87b3130..0711cd4 100644 --- a/amnet-native/app/CardAddModal.tsx +++ b/amnet-native/app/CardAddModal.tsx @@ -1,11 +1,11 @@ +import {generateCardNumber} from "amnet-shared"; +import {useModalStyles} from "../utils/ModalStyles"; import {useCallback, useLayoutEffect, useState} from "react"; import {TextInput, TouchableOpacity, View} from "react-native"; import {Button, Card, Divider, Paragraph, useTheme} from "react-native-paper"; -import {useModalStyles} from "../utils/ModalStyles"; import {AMCard} from "../models/AMCard"; import RealmContext from "../models/RealmContext"; -import {generateCardNumber} from "../models/AM-API"; const {useRealm} = RealmContext; @@ -48,7 +48,8 @@ export default function CardAddModal({navigation}) { const themeOptions = canSave ? modalStyles.headerText : {color: theme.colors.outline}; navigation.setOptions({ - headerRight: () => cardAddCallback(cardNumber, cardName)}> + headerRight: () => cardAddCallback(cardNumber, cardName)}> Save }) diff --git a/amnet-native/app/CardManager.tsx b/amnet-native/app/CardManager.tsx index 3d77d16..e7fac50 100644 --- a/amnet-native/app/CardManager.tsx +++ b/amnet-native/app/CardManager.tsx @@ -1,14 +1,14 @@ -import * as Clipboard from 'expo-clipboard'; +import * as Clipboard from "expo-clipboard"; import {FlatList, View} from "react-native"; import React, {useCallback, useMemo} from "react"; +import {Button, useTheme} from "react-native-paper"; +import {CreditCard, Plus} from "lucide-react-native"; +import ContextMenu from "react-native-context-menu-view"; import {AMCard} from "../models/AMCard"; import {AimeCard} from "../components/AimeCard"; import RealmContext from "../models/RealmContext"; -import ContextMenu from "react-native-context-menu-view"; import {EmptyStatePlaceholder} from "../components/EmptyStatePlaceholder"; -import {CreditCard, Plus} from "lucide-react-native"; -import {Button, useTheme} from "react-native-paper"; const {useQuery, useRealm} = RealmContext; diff --git a/amnet-native/app/CardManagerStack.tsx b/amnet-native/app/CardManagerStack.tsx index 7f1b11c..bc97953 100644 --- a/amnet-native/app/CardManagerStack.tsx +++ b/amnet-native/app/CardManagerStack.tsx @@ -1,9 +1,9 @@ import {Plus} from "lucide-react-native"; +import {TouchableOpacity} from "react-native"; import {useTheme} from "@react-navigation/native"; import {createNativeStackNavigator} from "@react-navigation/native-stack"; import CardManager from "./CardManager"; -import {TouchableOpacity} from "react-native"; const Stack = createNativeStackNavigator(); diff --git a/amnet-native/app/ServerAddModal.tsx b/amnet-native/app/ServerAddModal.tsx index 58d70b8..c4f99a0 100644 --- a/amnet-native/app/ServerAddModal.tsx +++ b/amnet-native/app/ServerAddModal.tsx @@ -1,7 +1,7 @@ +import {useModalStyles} from "../utils/ModalStyles"; import {Card, Paragraph, useTheme} from "react-native-paper"; import {TextInput, TouchableOpacity, View} from "react-native"; import {useCallback, useEffect, useLayoutEffect, useState} from "react"; -import {useModalStyles} from "../utils/ModalStyles"; import RealmContext from "../models/RealmContext"; import {AMServer} from "../models/AMServer"; diff --git a/amnet-native/app/ServerCardIn.tsx b/amnet-native/app/ServerCardIn.tsx index a7dd8a8..1412e58 100644 --- a/amnet-native/app/ServerCardIn.tsx +++ b/amnet-native/app/ServerCardIn.tsx @@ -1,7 +1,7 @@ import {BSON} from "realm"; import React, {useCallback, useEffect, useLayoutEffect, useMemo, useState} from "react"; -import {Alert, RefreshControl, ScrollView, Share, StyleSheet, TouchableOpacity, View} from "react-native"; import {ActivityIndicator, Button, Card, 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 {EmptyStatePlaceholder} from "../components/EmptyStatePlaceholder"; import {AimeCard} from "../components/AimeCard"; @@ -10,6 +10,7 @@ import RealmContext from "../models/RealmContext"; import {AMServer} from "../models/AMServer"; import {AMCard} from "../models/AMCard"; import ObjectId = BSON.ObjectId; +import {fetchServerInfo, performCardIn} from "../../amnet-shared/src"; const {useRealm, useQuery, useObject} = RealmContext; @@ -86,7 +87,7 @@ export default function ServerCardIn({route, navigation}) { } const abortController = new AbortController(); - server.getInfo(abortController.signal).then(r => { + fetchServerInfo(server.serverAddress, abortController.signal).then(r => { if (r) { setConnectionTestResult(true); realm.write(() => { @@ -107,11 +108,11 @@ export default function ServerCardIn({route, navigation}) { }, [serverId, serverReloadCounter, realm]); // card in callback - const performCardIn = useCallback(() => { + const cardInCallback = useCallback(() => { setCardInCompleted(false); const abortController = new AbortController(); - server.submitCard(selectedCard.code, abortController.signal).then(async r => { + performCardIn(server.serverAddress, {cardId: selectedCard.code}, abortController.signal).then(async r => { const now = new Date(); setCardInCompleted(r); @@ -174,7 +175,7 @@ export default function ServerCardIn({route, navigation}) { card={selectedCard} actionIcon={}/>