From 9e67bae334634ef6edc23ea474ad2aa7d0d2d30b Mon Sep 17 00:00:00 2001
From: Reza_ashrafi <ashrafimiireza98@gmail.com>
Date: Tue, 24 May 2022 00:08:13 +0430
Subject: [PATCH] update 10 files

---
 src/components/CustomTextInput.js             |  2 ++
 src/redux/reducers/blog.js                    |  2 +-
 src/screens/Blogs/index.js                    |  2 +-
 src/screens/Blogs/layouts/Hashtags.js         | 21 +++++++++++++++----
 src/screens/Home/components/Header.js         | 18 ++++++++++------
 src/screens/Home/index.js                     |  6 ++++--
 src/screens/Login/index.js                    |  1 +
 src/screens/Otp/index.js                      |  1 +
 .../Videos/components/MostViewedVideo.js      |  2 +-
 9 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/components/CustomTextInput.js b/src/components/CustomTextInput.js
index 1b87b3e..c4c39f4 100644
--- a/src/components/CustomTextInput.js
+++ b/src/components/CustomTextInput.js
@@ -25,6 +25,7 @@ const FloatingLabelInput = ({
   theme,
   defaultValue,
   editable = true,
+  onSubmitEditing = () => {},
   ...props
 }) => {
   const [isFocused, setIsFocused] = React.useState(false);
@@ -96,6 +97,7 @@ const FloatingLabelInput = ({
         multiline={multiline}
         editable={editable}
         placeholderTextColor={theme === 'light' ? Colors.theme1.gray20 + 'aa' : Colors.theme1.white + '55'}
+        onSubmitEditing={() => onSubmitEditing()}
       />
     </View>
   );
diff --git a/src/redux/reducers/blog.js b/src/redux/reducers/blog.js
index b8e0eb9..560f55d 100644
--- a/src/redux/reducers/blog.js
+++ b/src/redux/reducers/blog.js
@@ -4,7 +4,7 @@ const initialState = {
   list: null,
   info: null,
   hashtags : [],
-  hashtag : null,
+  hashtag : "همه",
 };
 export default function blog(state = initialState, action) {
   let { type, data } = action;
diff --git a/src/screens/Blogs/index.js b/src/screens/Blogs/index.js
index 18186df..65ec77f 100644
--- a/src/screens/Blogs/index.js
+++ b/src/screens/Blogs/index.js
@@ -75,7 +75,7 @@ function Blogs({ getList, blogs, hashtag, setHashtag, theme }) {
       />
       <Drawer setBoxPosition={setBoxPosition} position={position} />
       <Hashtags />
-      {hashtag ? (
+      {hashtag !== 'همه' ? (
         <FlatList
           contentContainerStyle={styles.contentContainerStyle}
           style={tw("px-4")}
diff --git a/src/screens/Blogs/layouts/Hashtags.js b/src/screens/Blogs/layouts/Hashtags.js
index deebb09..845ea54 100644
--- a/src/screens/Blogs/layouts/Hashtags.js
+++ b/src/screens/Blogs/layouts/Hashtags.js
@@ -13,7 +13,9 @@ export const Hashtags = ({ hashtags, theme, setHashtag, hashtag }) => {
   return (
     <View
       style={[
-        tw("flex flex-row-reverse pl-3 rounded-full items-center w-full mb-7 mt-3"),
+        tw(
+          "flex flex-row-reverse pl-3 rounded-full items-center w-full mb-7 mt-3"
+        ),
         {
           borderWidth: 2,
           borderColor: Colors.theme1.greenFF1 + (theme === "light" ? "" : "55"),
@@ -35,13 +37,13 @@ export const Hashtags = ({ hashtags, theme, setHashtag, hashtag }) => {
         horizontal={true}
         inverted={true}
         style={[tw("flex flex-row mt-3 pb-3 mr-2")]}
-        data={hashtags}
+        data={["همه", ...hashtags]}
         renderItem={({ item }) => (
           <Hashtag
             hashtag={item}
             theme={theme}
             setHashtag={setHashtag}
-            activeTag={hashtag}
+            activeTag={hashtag || "همه"}
           />
         )}
         keyExtractor={(item, index) => {
@@ -56,9 +58,20 @@ const Hashtag = ({ hashtag, theme, setHashtag, activeTag }) => {
   const active = React.useMemo(() => {
     return activeTag === hashtag;
   }, [hashtag, activeTag]);
+
   return (
     <Pressable
-      onPress={() => (active ? setHashtag(null) : setHashtag(hashtag))}
+      onPress={() => {
+        if (hashtag === "همه") {
+          return setHashtag("همه");
+        } else {
+          if (active) {
+            setHashtag("همه");
+          } else {
+            setHashtag(hashtag);
+          }
+        }
+      }}
     >
       <Text
         style={[
diff --git a/src/screens/Home/components/Header.js b/src/screens/Home/components/Header.js
index 4e6b99f..ba5fe73 100644
--- a/src/screens/Home/components/Header.js
+++ b/src/screens/Home/components/Header.js
@@ -21,7 +21,8 @@ const Header = ({ title, route, mobile, theme, state = null }) => {
       <Text
         style={[
           {
-            color: theme === 'light' ? Colors.theme1.green79 : Colors.theme1.white,
+            color:
+              theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
             fontFamily: "demi",
             fontSize: fontSize.lg,
           },
@@ -34,11 +35,16 @@ const Header = ({ title, route, mobile, theme, state = null }) => {
           onPress={() => navigation.navigate(route, state)}
           style={{ transform: [{ translateX: -fontSize.xl6 / 3 }] }}
         >
-          <Entypo
-            name="chevron-small-left"
-            size={fontSize.xl6}
-            color={theme === 'light' ? Colors.theme1.green79 : Colors.theme1.white}
-          />
+          <Text
+            style={{
+              color:
+                theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
+              fontSize: fontSize.sm,
+              fontFamily: "light",
+            }}
+          >
+            مشاهده همه
+          </Text>
         </Pressable>
       ) : null}
     </View>
diff --git a/src/screens/Home/index.js b/src/screens/Home/index.js
index 91b9174..d1fbac5 100644
--- a/src/screens/Home/index.js
+++ b/src/screens/Home/index.js
@@ -50,9 +50,11 @@ const Home = ({
   React.useEffect(() => {
     if (!blogs) {
       getBlogs();
-    } else if (!books) {
+    }
+    if (!books) {
       getBooks({ vod: true });
-    } else if (!userProducts) {
+    }
+    if (!userProducts) {
       getUserProducts();
     }
   }, []);
diff --git a/src/screens/Login/index.js b/src/screens/Login/index.js
index e3a8a6c..dcf6961 100644
--- a/src/screens/Login/index.js
+++ b/src/screens/Login/index.js
@@ -155,6 +155,7 @@ function Login(props) {
             autoFocus={true}
             direction="ltr"
             regex={(text) => onInput.phonenumber(text)}
+            onSubmitEditing={() => submit()}
           />
         </View>
         {!props.mobile ? <View style={tw("mt-10")}></View> : null}
diff --git a/src/screens/Otp/index.js b/src/screens/Otp/index.js
index 51229e2..7dfe28d 100644
--- a/src/screens/Otp/index.js
+++ b/src/screens/Otp/index.js
@@ -350,6 +350,7 @@ function Otp(props) {
             regex={onInput.numberOnly}
             direction="ltr"
             keyboardType="numeric"
+            onSubmitEditing={() => submit()}
           />
         </View>
         <TouchableOpacity
diff --git a/src/screens/Videos/components/MostViewedVideo.js b/src/screens/Videos/components/MostViewedVideo.js
index 579bff5..a23274e 100644
--- a/src/screens/Videos/components/MostViewedVideo.js
+++ b/src/screens/Videos/components/MostViewedVideo.js
@@ -110,7 +110,7 @@ function MostViewedVideo({ videos, grades, mobile, theme }) {
                   },
                 ]}
               >
-                {separate(video?.product[2]?.price)}
+                {console.log(video?.product?.filter((product) => product?.productType === 4)[0]?.price)}
               </Text>
             </View>