reza fixed error before 21

src/components/Search.js

@@ -1,11 +1,6 @@
 import React, { useState } from "react";
-import {
+import { TextInput, View, StyleSheet, Pressable } from "react-native";
-  TextInput,
+import { connect } from "react-redux";
-  View,
-  StyleSheet,
-  Pressable,
-} from "react-native";
-import {connect} from "react-redux";
 import tw from "tailwind-rn";
 import { AntDesign } from "@expo/vector-icons";
 
@@ -13,13 +8,20 @@ import { AntDesign } from "@expo/vector-icons";
 import Colors from "../constants/Colors";
 import fontSize from "../constants/fontSize";
 
-const Search = ({ placeholder, textAlign, direction, onChange, value, theme }) => {
+const Search = ({
+  placeholder,
+  textAlign,
+  direction,
+  onChange,
+  value,
+  theme,
+}) => {
   const styles = StyleSheet.create({
     inputStyle: {
       fontSize: fontSize.tiny,
       color: Colors.theme1[theme].gray2077,
       borderWidth: 0.5,
-      borderColor: Colors.theme1[theme].gray20 + '88',
+      borderColor: Colors.theme1[theme].gray20 + "88",
       paddingVertical: 10,
       paddingHorizontal: 10,
       direction: direction,
@@ -34,7 +36,7 @@ const Search = ({ placeholder, textAlign, direction, onChange, value, theme }) =
         style={[styles.inputStyle, tw("rounded-sm")]}
         onChangeText={(text) => onChange(text)}
         placeholder={placeholder}
-        placeholderTextColor={Colors.theme1[theme].gray20 + '88'}
+        placeholderTextColor={Colors.theme1[theme].gray20}
         value={value}
       />
       <Pressable style={tw("absolute left-3 top-3")}>
@@ -45,8 +47,8 @@ const Search = ({ placeholder, textAlign, direction, onChange, value, theme }) =
 };
 
 const mapStateToProps = (state) => ({
-  theme : state.publicApi.theme,
+  theme: state.publicApi.theme,
-})
+});
 
 export default connect(mapStateToProps)(Search);
 

src/redux/reducers/userProduct.js

@@ -1,4 +1,4 @@
-import {asyncAwesomeAlert} from '../../utils/AsyncWrappers';
+import { asyncAwesomeAlert } from "../../utils/AsyncWrappers";
 
 const initialState = {
   loading: false,
@@ -23,7 +23,6 @@ export default function userFactor(state = initialState, action) {
         data.filter((item) => item.product.productType === 2).length > 0
           ? true
           : false;
-      console.log('list fetched!');
       return {
         ...state,
         loading: false,
@@ -37,7 +36,14 @@ export default function userFactor(state = initialState, action) {
     case "userProduct/update":
       return { ...state, loading: false, error: null };
     case "userProduct/add":
-      return { ...state, loading: false, error: null, sum: data.payPrice };
+      console.log(data);
+      return {
+        ...state,
+        loading: false,
+        error: null,
+        list: data.products,
+        sum: data.payPrice,
+      };
     case "userProduct/delete":
       return { ...state, loading: false, error: null };
     case "userProduct/loading":

src/screens/Address/index.js

@@ -8,6 +8,8 @@ import {
   Platform,
   Dimensions,
   Appearance,
+  KeyboardAvoidingView,
+  TouchableWithoutFeedback,
 } from "react-native";
 import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
@@ -28,7 +30,9 @@ import tw from "tailwind-rn";
 import Colors from "../../constants/Colors";
 import fontSize from "../../constants/fontSize";
 
+//variables
 const ios = Platform.OS === "ios";
+const { height } = Dimensions.get("window");
 
 const Address = ({
   user,
@@ -243,9 +247,14 @@ const Address = ({
     <SafeAreaView
       style={{
         paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
-        position: "relative",
+        // position: "relative",
+        flex: 1,
       }}
     >
+      <ScrollView style={tw("flex-1 px-4")}>
+        <KeyboardAvoidingView behavior={"padding"} style={[{ height }]}>
+          <TouchableWithoutFeedback>
+            <View style={tw("flex-1")}>
               <Navbar
                 headerOptions={{
                   logo: false,
@@ -257,12 +266,6 @@ const Address = ({
                   back: true,
                 }}
               />
-      <ScrollView
-        contentContainerStyle={styles.contentContainerStyle}
-        style={styles.container}
-      >
-        <View style={tw("w-full flex  pb-4")}>
-          {/* <MapSelector /> */}
               <Header
                 title="اطلاعات هویتی"
                 text="( لطفا نام و نام خانوادگی خود را به طور کامل وارد نمایید )"
@@ -274,7 +277,9 @@ const Address = ({
                 name="firstName"
                 maxlength="40"
                 value={
-              profilePage ? profileFields.firstName : addressFields?.firstName
+                  profilePage
+                    ? profileFields.firstName
+                    : addressFields?.firstName
                 }
                 onChange={(name, value) =>
                   profilePage
@@ -303,6 +308,7 @@ const Address = ({
               />
               {profilePage && (
                 <CustomTextInput
+                  keyboardType="numeric"
                   label="کد ملی"
                   placeholder=""
                   textAlign="left"
@@ -313,7 +319,7 @@ const Address = ({
                     setProfileFields({ ...profileFields, nationalId: value })
                   }
                   autoFocus={false}
-              regex={onInput.numberOnly}
+                  regex={(text) => onInput.numberOnly(text)}
                 />
               )}
               <View style={tw("mt-4")}></View>
@@ -323,13 +329,16 @@ const Address = ({
             به همراه پیش شماره وارد کنید )"
               />
               <CustomTextInput
+                keyboardType="numeric"
                 label="شماره موبایل"
                 placeholder=""
                 textAlign="left"
                 name="cellphone"
                 maxlength="11"
                 value={
-              profilePage ? profileFields.cellphone : addressFields?.cellphone
+                  profilePage
+                    ? profileFields.cellphone
+                    : addressFields?.cellphone
                 }
                 onChange={(name, value) =>
                   profilePage
@@ -337,9 +346,10 @@ const Address = ({
                     : onChange(name, value)
                 }
                 autoFocus={false}
-            regex={onInput.phonenumber}
+                regex={(text) => onInput.numberOnly(text)}
               />
               <CustomTextInput
+                keyboardType="numeric"
                 label="شماره تلفن"
                 placeholder=""
                 textAlign="left"
@@ -352,7 +362,7 @@ const Address = ({
                     : onChange(name, value)
                 }
                 autoFocus={false}
-            regex={onInput.phonenumber}
+                regex={(text) => onInput.numberOnly(text)}
               />
               <View style={tw("mt-4")}></View>
               <Header
@@ -396,11 +406,12 @@ const Address = ({
               </View>
               <View style={tw("mb-4")}>
                 <CustomTextInput
+                  keyboardType="numeric"
                   label="کد پستی"
                   placeholder=""
                   textAlign="left"
                   name="postalCode"
-              maxlength="60"
+                  maxlength="10"
                   value={
                     profilePage
                       ? profileFields.postalCode
@@ -408,17 +419,22 @@ const Address = ({
                   }
                   onChange={(name, value) =>
                     profilePage
-                  ? setProfileFields({ ...profileFields, postalCode: value })
+                      ? setProfileFields({
+                          ...profileFields,
+                          postalCode: value,
+                        })
                       : onChange(name, value)
                   }
                   autoFocus={false}
-              regex={(val) => val}
+                  regex={(text) => onInput.numberOnly(text)}
                 />
               </View>
 
               <CustomPressable
                 title={
-              profilePage ? "ذخیره اطلاعات و بازگشت به صفحه قبل" : "ثبت آدرس"
+                  profilePage
+                    ? "ذخیره اطلاعات و بازگشت به صفحه قبل"
+                    : "ثبت آدرس"
                 }
                 backgroundColor={Colors.theme1[colorScheme].greenCF}
                 color={"white"}
@@ -427,6 +443,8 @@ const Address = ({
                 onPress={() => (profilePage ? submitProfile() : submit())}
               />
             </View>
+          </TouchableWithoutFeedback>
+        </KeyboardAvoidingView>
       </ScrollView>
     </SafeAreaView>
   );
@@ -434,13 +452,14 @@ const Address = ({
 
 const styles = StyleSheet.create({
   contentContainerStyle: {
-    paddingBottom: 100,
+    paddingBottom: 0,
   },
   container: {
     backgroundColor: "white",
     flexDirection: "column",
     paddingVertical: 5,
     paddingHorizontal: 16,
+    flex: 1,
   },
 });