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

App.tsx

@@ -1,11 +1,13 @@
 import React, { useState } from 'react';
 import { NavigationContainer } from '@react-navigation/native';
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
+import { Provider } from 'react-redux';
 import QRScannerScreen from './screens/QRScannerScreen';
 import HistoryScreen from './screens/HistoryScreen';
 import SettingsScreen from './screens/SettingsScreen';
 import { QRCodeContext } from './types';
 import CustomTabBar from './components/CustomTabBar';
+import store from './store';
 
 import { withAuthenticator } from '@aws-amplify/ui-react-native';
 import { Amplify } from 'aws-amplify';
@@ -19,7 +21,6 @@ Amplify.configure(config);
 const Tab = createBottomTabNavigator();
 
 const App: React.FC = () => {
-  const [qrCodes, setQrCodes] = useState<{ data: string, bookmarked: boolean, scanResult: { secureConnection: boolean, virusTotalCheck: boolean, redirects: number } }[]>([]);
   const [scannedData, setScannedData] = useState<string>('');
 
   const clearScanData = () => {
@@ -27,22 +28,22 @@ const App: React.FC = () => {
   };
 
   return (
-    <QRCodeContext.Provider value={{ qrCodes, setQrCodes }}>
-      <NavigationContainer>
-        <Tab.Navigator
-          initialRouteName="QRScanner"
-          tabBar={props => <CustomTabBar {...props} clearScanData={clearScanData} />}
-        >
-          <Tab.Screen name="History" component={HistoryScreen} />
-          <Tab.Screen name="QRScanner">
-            {(props) => <QRScannerScreen clearScanData={function (): void {
-              throw new Error('Function not implemented.');
-            } } {...props} />}
-          </Tab.Screen>
-          <Tab.Screen name="Settings" component={SettingsScreen} />
-        </Tab.Navigator>
-      </NavigationContainer>
-    </QRCodeContext.Provider>
+    <Provider store={store}>
+      <QRCodeContext.Provider value={{ scannedData, setScannedData }}>
+        <NavigationContainer>
+          <Tab.Navigator
+            initialRouteName="QRScanner"
+            tabBar={(props) => <CustomTabBar {...props} clearScanData={clearScanData} />}
+          >
+            <Tab.Screen name="History" component={HistoryScreen} />
+            <Tab.Screen name="QRScanner">
+              {(props) => <QRScannerScreen {...props} clearScanData={clearScanData} />}
+            </Tab.Screen>
+            <Tab.Screen name="Settings" component={SettingsScreen} />
+          </Tab.Navigator>
+        </NavigationContainer>
+      </QRCodeContext.Provider>
+    </Provider>
   );
 };