From 41b2a6c154497dee131d2dbba71eaaa38736a07a Mon Sep 17 00:00:00 2001
From: Reza_ashrafi <ashrafimiireza98@gmail.com>
Date: Sat, 23 Apr 2022 22:33:17 +0430
Subject: [PATCH] reza fixed 1

---
 src/components/CustomTextInput.js      |  1 -
 src/components/MapSelector.js          | 46 ++++++++------------------
 src/screens/Address/index.js           | 36 +++++++++++---------
 src/screens/Blog/index.js              |  1 -
 src/screens/Product/components/Book.js |  6 ++--
 src/screens/Video/index.js             |  2 +-
 6 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/src/components/CustomTextInput.js b/src/components/CustomTextInput.js
index e612e7d..283ca41 100644
--- a/src/components/CustomTextInput.js
+++ b/src/components/CustomTextInput.js
@@ -65,7 +65,6 @@ const FloatingLabelInput = ({
     }
   }, [value]);
 
-  console.log(theme);
   return (
     <View style={tw("mt-4 pb-1")}>
       <Text
diff --git a/src/components/MapSelector.js b/src/components/MapSelector.js
index 0c93c88..a89b85d 100644
--- a/src/components/MapSelector.js
+++ b/src/components/MapSelector.js
@@ -1,40 +1,22 @@
-import React, { Component } from "react";
-import { SafeAreaView, StyleSheet, View } from "react-native";
+import React from "react";
 // import Mapir from "mapir-react-native-sdk";
 
-const X_API_KEY =
-  "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIn0.eyJhdWQiOiIxNjk2MSIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIiwiaWF0IjoxNjQ0MzE3MDA5LCJuYmYiOjE2NDQzMTcwMDksImV4cCI6MTY0NjgyMjYwOSwic3ViIjoiIiwic2NvcGVzIjpbImJhc2ljIl19.Gckmd77Vw-wmsaztsmVmjYmfp4zXRSy2f0tXS-1p7IY8VJmvCCrk64y7WvCLbH0YfGZI9rG9ZUi5hRJDDGXu70l1ZafCYq2-EkMzcbx-PGTTq2bHGNZujF4ur1xtGoXd2kwGuldiR_6SJdqYLHcupbscFI7hHaQnkN1xWJ-L8476ZOKzUgiBvwH9uElGZXwD6SwfXoGW_R38_isrnfTXKfW9PPixyLaN3404tcjOU1r02HIurrplXlIKRKG9CVXxKsESfJJ8trwtZw6O4erxrnisxfL0VwAR7l69P6KcFb57vvM4j4hKFqxUDr4YvSq1qOTt3urYbAKehhvoiLhZxw";
+// const X_API_KEY =
+  // "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIn0.eyJhdWQiOiIxNjk2MSIsImp0aSI6IjkyODE4ODI0N2FhMjdlYTMyMzVlYzRiOWUxZDI3NTQyZTNjYmI3ZjQzY2Q2NGQzYjdkYjU1NmY3NDM5YzU2NzUyNzMxMjAzYzMwOTliYTFiIiwiaWF0IjoxNjQ0MzE3MDA5LCJuYmYiOjE2NDQzMTcwMDksImV4cCI6MTY0NjgyMjYwOSwic3ViIjoiIiwic2NvcGVzIjpbImJhc2ljIl19.Gckmd77Vw-wmsaztsmVmjYmfp4zXRSy2f0tXS-1p7IY8VJmvCCrk64y7WvCLbH0YfGZI9rG9ZUi5hRJDDGXu70l1ZafCYq2-EkMzcbx-PGTTq2bHGNZujF4ur1xtGoXd2kwGuldiR_6SJdqYLHcupbscFI7hHaQnkN1xWJ-L8476ZOKzUgiBvwH9uElGZXwD6SwfXoGW_R38_isrnfTXKfW9PPixyLaN3404tcjOU1r02HIurrplXlIKRKG9CVXxKsESfJJ8trwtZw6O4erxrnisxfL0VwAR7l69P6KcFb57vvM4j4hKFqxUDr4YvSq1qOTt3urYbAKehhvoiLhZxw";
 
 export default function MapSelector() {
   onRegionDidChange = (e) => {};
   return (
-    <View
-      style={{
-        width: 300,
-        height: 300,
-      }}
-    >
-      {/* <Mapir
-        apiKey={X_API_KEY}
-        onRegionDidChange={(e) => onRegionDidChange(e)}
-        style={{
-          flex: 1,
-        }}
-        styleURL={Mapir?.StyleURL?.Street}
-      >
-        <Mapir.Camera
-          zoomLevel={13}
-          followUserLocation
-          centerCoordinate={[51.422548, 35.732573]}
-        />
-      </Mapir> */}
-    </View>
+    <></>
+    // <Mapir
+    //   apiKey={X_API_KEY}
+    //   onRegionDidChange={(e) => onRegionDidChange(e)}
+    //   style={{
+    //     width : '100%',
+    //     height : 250
+    //   }}
+    // >
+    //   <Mapir.Camera zoomLevel={13} centerCoordinate={[51.422548, 35.732573]} />
+    // </Mapir>
   );
 }
-
-const styles = StyleSheet.create({
-  container: {
-    width: "100%",
-    height: 300,
-  },
-});
diff --git a/src/screens/Address/index.js b/src/screens/Address/index.js
index b95a5b3..ebe836a 100644
--- a/src/screens/Address/index.js
+++ b/src/screens/Address/index.js
@@ -51,7 +51,7 @@ const Address = ({
   setPhase,
   cityLoading,
   mobile,
-  theme
+  theme,
 }) => {
   const [addressFields, setAddressFields] = useState({});
   const [mapAddress, setMapAddress] = useState(null);
@@ -227,7 +227,8 @@ const Address = ({
           style={{
             fontFamily: "bold",
             fontSize: mobile ? fontSize.lg : fontSize.xl2,
-            color: theme === 'light' ? Colors.theme1.gray20 : Colors.theme1.white,
+            color:
+              theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white,
             textAlign: ios ? "right" : "auto",
           }}
         >
@@ -237,7 +238,10 @@ const Address = ({
           style={{
             fontFamily: "regular",
             fontSize: mobile ? fontSize.sm : fontSize.base,
-            color: theme === 'light' ? Colors.theme1.gray20 + 'aa' : Colors.theme1.white + "aa",
+            color:
+              theme === "light"
+                ? Colors.theme1.gray20 + "aa"
+                : Colors.theme1.white + "aa",
             textAlign: ios ? "right" : "auto",
           }}
         >
@@ -255,26 +259,26 @@ const Address = ({
         flex: 1,
       }}
     >
+      <Navbar
+        headerOptions={{
+          logo: false,
+          menu: profilePage ? false : false,
+          hamburgerMenu: false,
+          title: profilePage ? "اطلاعات کاربری" : "",
+          bookmark: profilePage ? false : false,
+          qr: false,
+          back: true,
+        }}
+      />
       <ScrollView style={tw("flex-1 px-4")}>
         <KeyboardAvoidingView behavior={"padding"}>
           <TouchableWithoutFeedback>
             <View style={tw("flex-1")}>
-              <Navbar
-                headerOptions={{
-                  logo: false,
-                  menu: profilePage ? false : false,
-                  hamburgerMenu: false,
-                  title: profilePage ? "اطلاعات کاربری" : "",
-                  bookmark: profilePage ? false : false,
-                  qr: false,
-                  back: true,
-                }}
-              />
               <Header
                 title="اطلاعات هویتی"
                 text="( لطفا نام و نام خانوادگی خود را به طور کامل وارد نمایید )"
               />
-              {!profilePage ? <MapSelector /> : null}
+              <MapSelector /> 
               <CustomTextInput
                 label="نام"
                 placeholder=""
@@ -477,7 +481,7 @@ const mapStateToProps = (state) => ({
   user: state.user.status,
   profileFields: state.user.profileFields,
   mobile: state.publicApi.mobile,
-  theme : state.publicApi.theme
+  theme: state.publicApi.theme,
 });
 
 const mapDispatchToProps = {
diff --git a/src/screens/Blog/index.js b/src/screens/Blog/index.js
index f4b29a6..e6b5ca4 100644
--- a/src/screens/Blog/index.js
+++ b/src/screens/Blog/index.js
@@ -249,7 +249,6 @@ const mapDispatchToProps = {
 };
 
 const Tag = ({ tag }) => {
-  console.log(tag);
   return;
 };
 
diff --git a/src/screens/Product/components/Book.js b/src/screens/Product/components/Book.js
index 438aa61..32558aa 100644
--- a/src/screens/Product/components/Book.js
+++ b/src/screens/Product/components/Book.js
@@ -89,21 +89,21 @@ function Book({
             showCancelButton: true,
             onConfirm: () => navigation.push("ShoppingCart"),
             confirmText: "مشاهده سبد خرید",
-            cancelText: "باشه",
+            cancelText: "ادامه خرید",
           });
         } else if (whichTypeAdded === "physical" && physicalAvailabileInCart) {
           asyncAwesomeAlert("", "به سبد خرید اضافه شد", {
             showCancelButton: true,
             onConfirm: () => navigation.push("ShoppingCart"),
             confirmText: "مشاهده سبد خرید",
-            cancelText: "باشه",
+            cancelText: "ادامه خرید",
           });
         } else if (whichTypeAdded === "digital" && digitalAvailabileInCart) {
           asyncAwesomeAlert("", "به سبد خرید اضافه شد", {
             showCancelButton: true,
             onConfirm: () => navigation.push("ShoppingCart"),
             confirmText: "مشاهده سبد خرید",
-            cancelText: "باشه",
+            cancelText: "ادامه خرید",
           });
         }
         setWhichTypeAdded(null);
diff --git a/src/screens/Video/index.js b/src/screens/Video/index.js
index d82453b..581e518 100644
--- a/src/screens/Video/index.js
+++ b/src/screens/Video/index.js
@@ -184,7 +184,7 @@ function Product({
                       showCancelButton: true,
                       onConfirm: () => navigation.push("ShoppingCart"),
                       confirmText: "مشاهده سبد خرید",
-                      cancelText: "باشه",
+                      cancelText: "ادامه خرید",
                     }
                   )
                 : addToCart(