diff --git a/src/screens/Login/components/IranFlag.js b/src/screens/Login/components/IranFlag.js
deleted file mode 100644
index fd3abc6..0000000
--- a/src/screens/Login/components/IranFlag.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import {Image, Dimensions} from 'react-native';
-
-const {width} = Dimensions.get('window');
-
-function IranFlag() {
- return (
-
- );
-}
-
-export default IranFlag;
diff --git a/src/screens/Login/index.js b/src/screens/Login/index.js
index 5adbf41..9f53d22 100644
--- a/src/screens/Login/index.js
+++ b/src/screens/Login/index.js
@@ -9,16 +9,20 @@ import {
TouchableHighlight,
Platform,
KeyboardAvoidingView,
+ ScrollView,
} from "react-native";
import Svg, { Defs, Pattern, Image, Path } from "react-native-svg";
-
-import CustomTextInput from "../../components/CustomTextInput";
import onInput from "../../utils/onInput";
import { asyncAwesomeAlert } from "../../utils/AsyncWrappers";
-import tw from "tailwind-rn";
import { user } from "../../redux/actions";
+
+//components
+import CustomTextInput from "../../components/CustomTextInput";
+
+//style
import Colors from "../../constants/Colors";
import fontSize from "../../constants/fontSize";
+import tw from "tailwind-rn";
const ios = Platform.OS === "ios";
@@ -50,136 +54,137 @@ function Login(props) {
};
return (
-
-
-
- {"سلام"}
-
-
- {"خوش برگشتی!"}
-
-
- onInput.phonenumber(text)}
- />
-
- {!props.mobile && }
- submit()}
- >
- {loading ? (
-
- ) : (
-
- {"تایید شماره"}
-
- )}
-
-
+
- ورود شما در سامانه به منزله قبول و{" "}
-
- شرایط , قوانین استفاده
- {" "}
- میباشد
-
-
+
+
+ {"سلام"}
+
+
+ {"خوش برگشتی!"}
+
+
+ onInput.phonenumber(text)}
+ />
+
+ {!props.mobile && }
+ submit()}
+ >
+ {loading ? (
+
+ ) : (
+
+ {"تایید شماره"}
+
+ )}
+
+
+ ورود شما در سامانه به منزله قبول و{" "}
+
+ شرایط , قوانین استفاده
+ {" "}
+ میباشد
+
+
+
);
}
diff --git a/src/screens/Otp/index.js b/src/screens/Otp/index.js
index 1f55cd6..afd7335 100644
--- a/src/screens/Otp/index.js
+++ b/src/screens/Otp/index.js
@@ -6,6 +6,8 @@ import {
Dimensions,
TouchableOpacity,
ActivityIndicator,
+ KeyboardAvoidingView,
+ ScrollView,
Platform,
} from "react-native";
import tw from "tailwind-rn";
@@ -162,228 +164,231 @@ function Otp(props) {
};
return (
-
-
-
+
- {" "}
- یک کد تائیدیه به شماره
-
- {' ' + (props.route.params?.phone || "") + ' '}
- {" "}
- ارسال شد. آن را در قسمت زیر وارد کنید.
-
-
- (ref1 = ref)}
- onChangeText={(text) => onChangeCode(text, "1")}
- regex={onInput.numberOnly}
- direction="ltr"
- keyboardType="numeric"
- />
- (ref2 = ref)}
- onChangeText={(text) => onChangeCode(text, "2")}
- regex={onInput.numberOnly}
- direction="ltr"
- keyboardType="numeric"
- />
- (ref3 = ref)}
- onChangeText={(text) => onChangeCode(text, "3")}
- regex={onInput.numberOnly}
- direction="ltr"
- keyboardType="numeric"
- />
-
+
+
+
+
+
+
+ (ref4 = ref)}
- onChangeText={(text) => onChangeCode(text, "4")}
- regex={onInput.numberOnly}
- direction="ltr"
- keyboardType="numeric"
- />
-
- submit()}
- >
- {loading ? (
-
- ) : (
+ >
+ {" "}
+ یک کد تائیدیه به شماره
- {"تایید کد"}
-
- )}
-
-
- {!timeEnd ? (
- {" "}
+ ارسال شد. آن را در قسمت زیر وارد کنید.
+
+
+
- {"زمان باقی مانده تا ارسال مجدد: " + duration(time)}
-
- ) : (
-
- (ref1 = ref)}
+ onChangeText={(text) => onChangeCode(text, "1")}
+ regex={onInput.numberOnly}
+ direction="ltr"
+ keyboardType="numeric"
+ />
+ (ref2 = ref)}
+ onChangeText={(text) => onChangeCode(text, "2")}
+ regex={onInput.numberOnly}
+ direction="ltr"
+ keyboardType="numeric"
+ />
+ (ref3 = ref)}
+ onChangeText={(text) => onChangeCode(text, "3")}
+ regex={onInput.numberOnly}
+ direction="ltr"
+ keyboardType="numeric"
+ />
+ (ref4 = ref)}
+ onChangeText={(text) => onChangeCode(text, "4")}
+ regex={onInput.numberOnly}
+ direction="ltr"
+ keyboardType="numeric"
+ />
+
+ submit()}
+ >
+ {loading ? (
+
+ ) : (
+ submitCellphone()}
>
-
+ )}
+
+
+ {!timeEnd ? (
+
+ {"زمان باقی مانده تا ارسال مجدد: " + duration(time)}
+
+ ) : (
+
+ submitCellphone()}
>
- {"ارسال مجدد کد"}
-
-
+
+ {"ارسال مجدد کد"}
+
+
- goBack()}
- >
- goBack()}
>
- {"بازگشت به مرحله قبل و اصلاح شماره"}
-
-
-
- )}
-
-
+
+ {"بازگشت به مرحله قبل و اصلاح شماره"}
+
+
+
+ )}
+
+
+
);
}