Merge branch 'refactoring' of https://github.com/safeqr/SafeQR_Front_End_Mobile into refactoring

screens/QRScannerScreen.tsx

@@ -7,12 +7,16 @@ import { Ionicons } from '@expo/vector-icons'; // For icons
 import { useNavigation } from '@react-navigation/native';
 import * as ImagePicker from 'expo-image-picker';
 import ScannedDataBox from '../components/ScannedDataBox';
+import { useDispatch } from 'react-redux';
+import { addQRCode } from '../actions/qrCodeActions'; // Assuming you have actions defined for Redux
+import { detectQRCodeType, verifyURL, checkRedirects } from '../api/qrCodeAPI'; // Import utility functions
 
 // Main Function
-const QRScannerScreen: React.FC = () => {
+const QRScannerScreen: React.FC<{ clearScanData: () => void }> = ({ clearScanData }) => {
   const navigation = useNavigation(); // call Navigation bar
-  const [showSplash, setShowSplash] = useState<boolean>(true); // call splash screen
+  const dispatch = useDispatch(); // Use dispatch for Redux actions
 
+  const [showSplash, setShowSplash] = useState<boolean>(true); // call splash screen
   const qrCodeContext = useContext(QRCodeContext); // From ./types.ts
   const { qrCodes, setQrCodes } = qrCodeContext || { qrCodes: [], setQrCodes: () => {} };
 
@@ -22,6 +26,11 @@ const QRScannerScreen: React.FC = () => {
   const [dataType, setDataType] = useState<string>(''); // State for data type
   const [enableTorch, setEnableTorch] = useState<boolean>(false); // State for torch
 
+  // Add state variables for scan results
+  const [secureConnection, setSecureConnection] = useState<boolean | null>(null);
+  const [virusTotalCheck, setVirusTotalCheck] = useState<boolean | null>(null);
+  const [redirects, setRedirects] = useState<number | null>(null);
+
   // Request Camera Permission and initialize the app
   useEffect(() => {
     const initializeApp = async () => {
@@ -46,23 +55,31 @@ const QRScannerScreen: React.FC = () => {
   const handlePayload = async (payload: string) => {
     setScanned(true);
     console.log("Scanning Completed. Payload is:", payload);
-    const type = await sendToAPIServer(payload);
+
+    const type = await detectQRCodeType(payload);
+    const secureConnectionResult = await verifyURL(payload);
+    const redirectResult = await checkRedirects(payload);
+
+    setSecureConnection(secureConnectionResult.isSecure);
+    setVirusTotalCheck(!secureConnectionResult.isMalicious); // Assuming you have virusTotalCheck logic integrated here
+    setRedirects(redirectResult.redirects);
 
     const qrCode = {
       data: payload,
       type,
       scanResult: {
-        secureConnection: true, // Placeholder, replace with actual logic
-        virusTotalCheck: true,  // Placeholder, replace with actual logic
-        redirects: 0           // Placeholder, replace with actual logic
-      }
+        secureConnection: secureConnectionResult.isSecure,
+        virusTotalCheck: !secureConnectionResult.isMalicious,
+        redirects: redirectResult.redirects
+      },
+      bookmarked: false // by default
     };
 
     setScannedData(payload);
     console.log("Payload received:", payload);
     console.log("Type received from server:", type);
     setDataType(type);
-    setQrCodes([...qrCodes, qrCode]);
+    dispatch(addQRCode(qrCode)); // Dispatch action to save QR code data
     console.log("QR code data added to history");
   };
 
@@ -181,7 +198,16 @@ const QRScannerScreen: React.FC = () => {
 
       {scannedData !== '' && (
         <View style={styles.scannedDataBox}>
-          <ScannedDataBox data={scannedData} dataType={dataType} clearScanData={clearScanDataInternal} />
+          <ScannedDataBox
+            data={scannedData}
+            dataType={dataType}
+            clearScanData={clearScanDataInternal}
+            scanResult={{
+              secureConnection,
+              virusTotalCheck,
+              redirects
+            }}
+          />
         </View>
       )}
     </View>