diff --git a/src/app/(BottomTabNavigation)/QRCodeScanner/AddCase/[caseUid].tsx b/src/app/(BottomTabNavigation)/QRCodeScanner/AddCase/[caseUid].tsx index d347e0bd..046da3ff 100644 --- a/src/app/(BottomTabNavigation)/QRCodeScanner/AddCase/[caseUid].tsx +++ b/src/app/(BottomTabNavigation)/QRCodeScanner/AddCase/[caseUid].tsx @@ -17,6 +17,7 @@ export default function AddCase() { const addToCases = async (newCase: Case) => { await joinCase(newCase); + router.back(); router.replace('/AllCases'); }; diff --git a/src/app/(BottomTabNavigation)/QRCodeScanner/index.tsx b/src/app/(BottomTabNavigation)/QRCodeScanner/index.tsx index 72d5a663..31e52e20 100644 --- a/src/app/(BottomTabNavigation)/QRCodeScanner/index.tsx +++ b/src/app/(BottomTabNavigation)/QRCodeScanner/index.tsx @@ -84,9 +84,11 @@ function QRCodeScannerScreen() { useEffect(() => { navigation.addListener('blur', async () => { resetScanner(); + setScannedCase(undefined); }); navigation.addListener('focus', async () => { resetScanner(); + setScannedCase(undefined); setTimeout(() => {}, 1000); }); }, [navigation]); diff --git a/src/app/(BottomTabNavigation)/QRCodeScanner/styles.ts b/src/app/(BottomTabNavigation)/QRCodeScanner/styles.ts index 4f5b0a2d..f03d6cc5 100644 --- a/src/app/(BottomTabNavigation)/QRCodeScanner/styles.ts +++ b/src/app/(BottomTabNavigation)/QRCodeScanner/styles.ts @@ -21,9 +21,10 @@ export default StyleSheet.create({ height: 300, width: 300, border: 'solid', - borderWidth: 3, - borderRadius: 5, + borderWidth: 5, + borderRadius: 10, marginVertical: 20, + overflow: 'hidden', }, validScan: { borderColor: colors.green,