Merge commit '8682b9b22f3aa79568d4a95333b2ca40496001a3' into develop

components/settings.js

@@ -180,7 +180,7 @@ export default function Setting(props) {
           </View>
           <TouchableOpacity
             style={{ flexDirection: "row", padding: 10 }}
-            //onPress={testNFC}
+            onPress={testNFC}
           >
             <Text
               style={{

stateBox/useDeviceOrientationChange.js

@@ -18,7 +18,7 @@ export const DeviceOrientationChangeProvider = ({ children }) => {
     );
   };
   useEffect(() => {
-    data();
+    //data();
     //ScreenOrientation.unlockAsync();
   }, []);
 
@@ -27,7 +27,7 @@ export const DeviceOrientationChangeProvider = ({ children }) => {
       setIsLandscape(false);
     }
     if (height / width < 1.5) {
-      //setIsLandscape(true);
+      setIsLandscape(true);
     }
   }, [height, width]);
   return (