From aad59e00f502d7e6a0c22d972e79ee90e34bdfd0 Mon Sep 17 00:00:00 2001
From: Reza_ashrafi <ashrafimiireza98@gmail.com>
Date: Tue, 19 Apr 2022 10:49:06 +0430
Subject: [PATCH] reza fixed login

---
 src/components/Drawer.js             |  5 ++++-
 src/screens/Activation/index.js      |  3 +--
 src/screens/Home/index.js            |  6 +++++-
 src/screens/Login/index.js           |  2 +-
 src/screens/Otp/index.js             | 10 +++++-----
 src/screens/QR/layouts/Scan/index.js | 10 +---------
 src/screens/Rules/index.js           |  2 +-
 7 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/components/Drawer.js b/src/components/Drawer.js
index 3e96bf3..fc65f34 100644
--- a/src/components/Drawer.js
+++ b/src/components/Drawer.js
@@ -232,7 +232,10 @@ const Drawer = ({ position, setBoxPosition, user, mobile, theme }) => {
             ),
             {},
           ]}
-          onPress={() => navigation.navigate(route.route)}
+          onPress={() => {
+            navigation.push(route.route);
+            setBoxPosition();
+          }}
         >
           {route.icon}
           <Text
diff --git a/src/screens/Activation/index.js b/src/screens/Activation/index.js
index f2912ae..6c921e6 100644
--- a/src/screens/Activation/index.js
+++ b/src/screens/Activation/index.js
@@ -34,7 +34,6 @@ const ios = Platform.OS === "ios";
 const { height } = Dimensions.get("window");
 
 function Activation({ add, mobile, theme, route }) {
-  const {data} = route.params;
   const [value, setValue] = useState(null);
   const navigation = useNavigation();
 
@@ -103,7 +102,7 @@ function Activation({ add, mobile, theme, route }) {
                       fontFamily: "light",
                     },
                   ]}
-                  value={value || data}
+                  value={value || route?.params?.data}
                   onChange={(name, value) => setValue(value)}
                 />
                 <CustomPressable
diff --git a/src/screens/Home/index.js b/src/screens/Home/index.js
index 30575ac..efec4fd 100644
--- a/src/screens/Home/index.js
+++ b/src/screens/Home/index.js
@@ -27,7 +27,7 @@ import Header from "./components/Header";
 import tw from "tailwind-rn";
 
 // Within your render function
-const Home = ({ blogs, books, userProducts, mobile }) => {
+const Home = ({ route, blogs, books, userProducts, mobile }) => {
   const [position, setPosition] = useState("100%");
   const navigation = useNavigation();
 
@@ -36,6 +36,10 @@ const Home = ({ blogs, books, userProducts, mobile }) => {
     setPosition(position === "100%" ? "0%" : "100%");
   };
 
+  useEffect(() => {
+    console.log('route has been changed');
+  },[route]);
+
   return (
     <SafeAreaView
       style={{
diff --git a/src/screens/Login/index.js b/src/screens/Login/index.js
index 5b32968..b68d40e 100644
--- a/src/screens/Login/index.js
+++ b/src/screens/Login/index.js
@@ -69,7 +69,7 @@ function Login(props) {
           xmlnsXlink="http://www.w3.org/1999/xlink"
           width={58.644}
           height={86.908}
-          style={{ transform: [{ translateY: -height / 10 }] }}
+          style={{ transform: [{ translateY: -height / 20 }] }}
         >
           <Defs>
             <Pattern
diff --git a/src/screens/Otp/index.js b/src/screens/Otp/index.js
index f04b282..23b4906 100644
--- a/src/screens/Otp/index.js
+++ b/src/screens/Otp/index.js
@@ -131,15 +131,15 @@ function Otp(props) {
       const minute = value % 60;
       const hour = Math.floor(value / 60);
       return (
-        (hour > 0
+        (minute > 0
           ? (minute.toString().length === 1
               ? "0" + minute.toString()
               : minute) + ""
-          : "") +
+          : "00") +
         " " +
         ":" +
         " " +
-        (hour.toString().length === 1 ? "0" + hour.toString() : hour)
+        (hour > 0 ? hour.toString().length === 1 ? "0" + hour.toString() : hour : "00")
       );
     },
     [props.route]
@@ -147,7 +147,7 @@ function Otp(props) {
 
   const submitCellphone = React.useCallback(() => {
     setTimeEnd(false);
-    setTime(120);
+    setTime(60);
     setFirstCode("");
     setSecondCode("");
     setThirdCode("");
@@ -181,7 +181,7 @@ function Otp(props) {
           xmlnsXlink="http://www.w3.org/1999/xlink"
           width={58.644}
           height={86.908}
-          style={{ transform: [{ translateY: -height / 10 }] }}
+          style={{ transform: [{ translateY: -height / 20 }] }}
         >
           <Defs>
             <Pattern
diff --git a/src/screens/QR/layouts/Scan/index.js b/src/screens/QR/layouts/Scan/index.js
index d06b353..3bf7936 100644
--- a/src/screens/QR/layouts/Scan/index.js
+++ b/src/screens/QR/layouts/Scan/index.js
@@ -21,7 +21,6 @@ const { width, height } = Dimensions.get("screen");
 import laptopImage from "../../assets/laptop.png";
 
 function Scan({ theme, route }) {
-  const { page } = route.params;
   const navigation = useNavigation();
   const [hasPermission, setHasPermission] = React.useState(null);
   const [scanned, setScanned] = React.useState(false);
@@ -36,7 +35,7 @@ function Scan({ theme, route }) {
   const handleBarCodeScanned = React.useCallback(
     ({ type, data }) => {
       setScanned(true);
-      if (page === "activation") {
+      if (route?.params?.page === "activation") {
         navigation.push("QRContent", { data });
       }else{
         navigation.push("Activation", { data });
@@ -45,13 +44,6 @@ function Scan({ theme, route }) {
     [route, scanned]
   );
 
-  if (hasPermission === null) {
-    return <Text>Requesting for camera permission</Text>;
-  }
-  if (hasPermission === false) {
-    return <Text>No access to camera</Text>;
-  }
-
   return (
     <ImageBackground
       source={laptopImage}
diff --git a/src/screens/Rules/index.js b/src/screens/Rules/index.js
index d4a0787..aee3352 100644
--- a/src/screens/Rules/index.js
+++ b/src/screens/Rules/index.js
@@ -124,7 +124,7 @@ const Switch = ({ theme, active, setActive }) => {
           tw("flex-1 py-3 flex flex-row justify-center"),
           {
             backgroundColor: active
-              ? Colors.theme1[theme].blueFF1
+              ? Colors.theme1[theme].green79 + '11'
               : "transparent",
           },
         ]}