merge func_smart_otp

src/Screens/Action/Wallet/Tab/Item.js

@@ -16,7 +16,7 @@ const Item = (props) => {
   const {item} = props;
   const navigate = useNavigation();
   return (
-    <View style={styles.container}>
+    <View style={[styles.container, props.isEnd ? {marginBottom: 60} : {}]}>
       <Block flex={1} row>
         {/* <View style={[styles.wrapLeft, {backgroundColor: item.color}]} />
           <View style={styles.wrapDate}>
@@ -82,9 +82,8 @@ const styles = StyleSheet.create({
     elevation: 5,
     marginHorizontal: 10,
     backgroundColor: R.colors.white,
-    marginTop: 10,
     borderRadius: HEIGHTXD(30),
-    marginBottom: 10,
+    marginTop: 10,
   },
   wrapRight: {
     borderLeftColor: R.colors.borderGray,

src/Screens/Action/Wallet/Tab/Success.js

@@ -80,6 +80,7 @@ const Success = (props) => {
       ) : (
         <FlatList
           keyExtractor={(item) => item.transection_id + 'a'}
+          showsVerticalScrollIndicator={false}
           refreshing={isRefresh}
           onRefresh={onRefresh}
           onEndReachedThreshold={0.01}
@@ -87,7 +88,9 @@ const Success = (props) => {
             onLoadMore();
           }}
           data={data}
-          renderItem={({item}) => <Item item={item} />}
+          renderItem={({item, index}) => (
+            <Item item={item} isEnd={index + 1 == data.length} />
+          )}
         />
       )}
     </View>

src/Screens/Action/Wallet/Tab/Watting.js

@@ -87,6 +87,7 @@ const Watting = (props) => {
       ) : (
         <FlatList
           keyExtractor={(item) => item.transection_id + 'a'}
+          showsVerticalScrollIndicator={false}
           refreshing={isRefresh}
           onRefresh={onRefresh}
           onEndReachedThreshold={0.01}
@@ -94,7 +95,9 @@ const Watting = (props) => {
             onLoadMore();
           }}
           data={data}
-          renderItem={({item}) => <Item item={item} />}
+          renderItem={({item, index}) => (
+            <Item item={item} isEnd={index + 1 == data.length} />
+          )}
         />
       )}
     </View>

src/Screens/Action/Wallet/Wallet.js

@@ -62,13 +62,13 @@ const styles = StyleSheet.create({
   },
   btnRight: {
     width: WIDTHXD(400),
-    height: HEIGHTXD(100),
+    height: HEIGHTXD(120),
     backgroundColor: R.colors.main,
     borderRadius: 10,
     justifyContent: 'center',
     alignItems: 'center',
     position: 'absolute',
-    bottom: 10,
+    bottom: 20,
     right: 30,
     shadowColor: '#AFA9A9',
     shadowOffset: {
@@ -81,13 +81,13 @@ const styles = StyleSheet.create({
   },
   btnLeft: {
     width: WIDTHXD(400),
-    height: HEIGHTXD(100),
+    height: HEIGHTXD(120),
     backgroundColor: R.colors.main,
     borderRadius: 10,
     justifyContent: 'center',
     alignItems: 'center',
     position: 'absolute',
-    bottom: 10,
+    bottom: 20,
     left: 30,
     shadowColor: '#AFA9A9',
     shadowOffset: {

src/Screens/SmartOTP/SmartOTPConfig.js

@@ -9,6 +9,8 @@ import {
   UPDATEOTP,
   ENTER_PASSWORD_SMART_OTP,
   SETTINGOTP,
+  FAQSSMARTOTP,
+  RULESSMARTOTP,
 } from '../../routers/ScreenNames';
 import R from '../../assets/R';
 import Icon from 'react-native-vector-icons/AntDesign';
@@ -48,14 +50,18 @@ const SmartOTPConfig = (props) => {
           </TouchableOpacity>
         )}
 
-        <TouchableOpacity style={styles.container}>
+        <TouchableOpacity
+          onPress={() => navigation.navigate(RULESSMARTOTP)}
+          style={styles.container}>
           <Image style={styles.imgIcon} source={R.images.rules} />
           <View style={{flex: 1, justifyContent: 'center'}}>
             <AppText i18nKey={'Rules'} />
           </View>
           <Icon name={'right'} size={20} color={R.colors.color777} />
         </TouchableOpacity>
-        <TouchableOpacity style={styles.container}>
+        <TouchableOpacity
+          onPress={() => navigation.navigate(FAQSSMARTOTP)}
+          style={styles.container}>
           <Image style={styles.imgIcon} source={R.images.faq} />
           <View style={{flex: 1, justifyContent: 'center'}}>
             <AppText i18nKey={'FAQs'} />

src/Screens/SmartOTP/WebView/FAQs.js

+import React from 'react';
+import {View, Text} from 'react-native';
+import HeaderBack from '../../../components/Header/HeaderBack';
+import {WebView} from 'react-native-webview';
+const FAQs = (props) => {
+  return (
+    <View style={{flex: 1}}>
+      <HeaderBack isWhite={true} title={'FAQs'} />
+      <WebView
+        androidHardwareAccelerationDisabled={true}
+        source={{
+          uri: 'http://api.dcvinvest.com/webview/smart-otp/faqs',
+        }}
+      />
+    </View>
+  );
+};
+
+export default FAQs;

src/Screens/SmartOTP/WebView/RulesSmartOTP.js

+import React from 'react';
+import {View, Text} from 'react-native';
+import {getFontXD} from '../../../Config/Functions';
+import HeaderBack from '../../../components/Header/HeaderBack';
+import {WebView} from 'react-native-webview';
+const RulesSmartOTP = (props) => {
+  return (
+    <View style={{flex: 1}}>
+      <HeaderBack isWhite={true} title={'Rules'} />
+      <WebView
+        androidHardwareAccelerationDisabled={true}
+        source={{
+          uri: 'http://api.dcvinvest.com/webview/smart-otp/term-and-condition',
+        }}
+      />
+    </View>
+  );
+};
+
+export default RulesSmartOTP;

src/routers/ScreenNames.js

@@ -89,3 +89,7 @@ export const RESET_SMART_OTP = 'RESET_SMART_OTP';
 export const CHANGESMARTOTP = 'CHANGESMARTOTP';
 
 export const CONFIRMCHANGESMARTOTP = 'CONFIRMCHANGESMARTOTP';
+
+export const RULESSMARTOTP = 'RULESSMARTOTP';
+
+export const FAQSSMARTOTP = 'FAQSSMARTOTP';

src/routers/StackNavigation.js

@@ -65,6 +65,9 @@ import ConfirmOTPSmart from '../Screens/SmartOTP/ConfirmOTPSmart';
 import ChangeSmartOTP from '../Screens/SmartOTP/ChangeSmartOTP/ChangeSmartOTP';
 import ConfirmChangeSmartOTP from '../Screens/SmartOTP/ChangeSmartOTP/ConfirmChangeSmartOTP';
 
+import FAQs from '../Screens/SmartOTP/WebView/FAQs';
+import RulesSmartOTP from '../Screens/SmartOTP/WebView/RulesSmartOTP';
+
 import * as ScreenName from './ScreenNames';
 
 const Stack = createStackNavigator();
@@ -172,6 +175,9 @@ function MyStack(props) {
       <Stack.Screen name={ScreenName.ENTER_PASSWORD_SMART_OTP} component={EnterPasswordSmartOTP} />
       <Stack.Screen name={ScreenName.RESET_SMART_OTP} component={ResetSmartOTP} />
 
+      <Stack.Screen name={ScreenName.FAQSSMARTOTP} component={FAQs} />
+      <Stack.Screen name={ScreenName.RULESSMARTOTP} component={RulesSmartOTP} />
+
       <Stack.Screen
         name={ScreenName.FORGOTPASSWORD}
         component={ForgotPassWord}