@tima2025/react-native-timalender 1.0.1-glink → 1.0.2

package/src/screens/SignContractGpayTima/ConfirmContact.tsx

@@ -32,7 +32,6 @@ import { verifyGpayOnboarding } from '../../components/Features/Lender/lenderSli
 import Screens from '../../components/Navigation/Screens';
 import { selectLoading } from '../../components/Redux/selector';
 import { AppDispatch } from '../../components/Redux/store';
-import { load } from '../../components/Storage/storage';
 import useGetUser from '../../hooks/useGetUser';
 
 const CELL_COUNT = 4;
@@ -44,28 +43,31 @@ const logoView: ImageStyle = {
   resizeMode: 'cover',
 };
 
-export default function ConfirmContact({ navigation, route }: any) {
+export default function ConfirmContact({navigation, route}: any) {
   const dispatch = useDispatch<AppDispatch>();
+  const reference_id = route?.params?.data;
   const userInfo = useGetUser();
   const isLoading = useSelector(selectLoading);
   const [showSuccess, setShowSuccess] = useState(false);
   const [expire_time, setExpireTime] = useState(180);
   const [value, setValue] = useState('');
-  const ref = useBlurOnFulfill({ value, cellCount: CELL_COUNT });
-  const [ref_id, setRef_id] = useState('');
+  const ref = useBlurOnFulfill({value, cellCount: CELL_COUNT});
+  // const [ref_id, setRef_id] = useState('');
   const [props, getCellOnLayoutHandler] = useClearByFocusCell({
     value,
     setValue,
   });
 
-  useEffect(() => {
-    loadRefID();
-  }, []);
+  // useEffect(() => {
+  //   loadRefID();
+  // }, []);
 
-  const loadRefID = async () => {
-    const data = await load('reference_id');
-    setRef_id(data);
-  };
+  // const loadRefID = async () => {
+  //   const data = await load('reference_id');
+  //   setRef_id(data);
+  // };
+
+  // console.log('refID: ', ref_id);
 
   useEffect(() => {
     let interval = setInterval(() => {
@@ -81,7 +83,7 @@ export default function ConfirmContact({ navigation, route }: any) {
   const onSubmit = async () => {
     const params = {
       otp: value,
-      reference_id: ref_id,
+      reference_id,
     };
     const resp: any = await dispatch(verifyGpayOnboarding(params));
     console.log('resp', resp);
@@ -103,7 +105,7 @@ export default function ConfirmContact({ navigation, route }: any) {
   };
 
   return (
-    <View style={{ flex: 1 }}>
+    <View style={{flex: 1}}>
       <StatusBar barStyle={'light-content'} />
       <Image
         source={require('../../assets/images/Optional/Group1.png')}
@@ -116,8 +118,7 @@ export default function ConfirmContact({ navigation, route }: any) {
             alignItems: 'center',
             justifyContent: 'center',
             marginTop: 5,
-          }}
-        >
+          }}>
           <TouchableOpacity
             onPress={() => navigation.goBack()}
             style={{
@@ -127,8 +128,7 @@ export default function ConfirmContact({ navigation, route }: any) {
               height: 40,
               justifyContent: 'center',
               alignItems: 'center',
-            }}
-          >
+            }}>
             <IoIcon name="chevron-back" size={26} color="white" />
           </TouchableOpacity>
           <RText
@@ -136,16 +136,14 @@ export default function ConfirmContact({ navigation, route }: any) {
               color: 'white',
               fontSize: 16,
               fontWeight: 'bold',
-            }}
-          >
+            }}>
             Xác thực OTP
           </RText>
         </View>
       </SafeAreaView>
       <View
-        style={{ alignItems: 'center', justifyContent: 'center', padding: 24 }}
-      >
-        <RText style={{ textAlign: 'center', color: 'white' }}>
+        style={{alignItems: 'center', justifyContent: 'center', padding: 24}}>
+        <RText style={{textAlign: 'center', color: 'white'}}>
           Mã xác thực OTP của bạn sẽ được gửi vào số điện thoại{' '}
           {userInfo?.phone}, vui lòng nhập mã để hoàn thành ký hợp đồng.
         </RText>
@@ -163,7 +161,7 @@ export default function ConfirmContact({ navigation, route }: any) {
         }}
         keyboardType="numeric"
         textContentType="jobTitle"
-        renderCell={({ index, symbol, isFocused }) => (
+        renderCell={({index, symbol, isFocused}) => (
           <View
             // Make sure that you pass onLayout={getCellOnLayoutHandler(index)} prop to root component of "Cell"
             onLayout={getCellOnLayoutHandler(index)}
@@ -176,22 +174,20 @@ export default function ConfirmContact({ navigation, route }: any) {
               backgroundColor: '#EFEFEF',
               marginHorizontal: 4,
               borderRadius: actuatedNormalize(8),
-            }}
-          >
+            }}>
             <Text
               style={{
                 color: '#000',
                 fontSize: 24,
                 textAlign: 'center',
                 fontWeight: '700',
-              }}
-            >
+              }}>
               {symbol || (isFocused ? <Cursor /> : null)}
             </Text>
           </View>
         )}
       />
-      <View style={{ flexDirection: 'row', justifyContent: 'center' }}>
+      <View style={{flexDirection: 'row', justifyContent: 'center'}}>
         <TouchableOpacity
           onPress={() => onSubmit()}
           style={{
@@ -201,12 +197,11 @@ export default function ConfirmContact({ navigation, route }: any) {
             backgroundColor: 'white',
             paddingHorizontal: 46,
             borderRadius: 6,
-          }}
-        >
-          <Text style={{ color: '#333333' }}>Xác nhận</Text>
+          }}>
+          <Text style={{color: '#333333'}}>Xác nhận</Text>
         </TouchableOpacity>
       </View>
-      <Text style={{ textAlign: 'center', marginTop: 10, color: 'white' }}>
+      <Text style={{textAlign: 'center', marginTop: 10, color: 'white'}}>
         Gửi lại mã OTP sau ({moment.utc(expire_time * 1000).format('mm:ss')})
       </Text>
       {isLoading ? <Loading /> : <View />}
@@ -229,8 +224,7 @@ export default function ConfirmContact({ navigation, route }: any) {
                 fontWeight: 'bold',
                 fontSize: 16,
                 marginTop: 16,
-              }}
-            >
+              }}>
               Ký hợp đồng thành công !
             </RText>
           </View>

package/src/screens/SignContractGpayTima/SignContract.tsx

@@ -7,7 +7,6 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import { showMessage } from 'react-native-flash-message';
 import LinearGradient from 'react-native-linear-gradient';
 import Pdf from 'react-native-pdf';
 import Icon from 'react-native-vector-icons/Ionicons';
@@ -16,13 +15,11 @@ import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import RText from '../../common/RText';
-import { confirmGpayOnboarding } from '../../components/Features/Lender/lenderSlice';
 import Screens from '../../components/Navigation/Screens';
 import { selectLoading } from '../../components/Redux/selector';
 import { AppDispatch } from '../../components/Redux/store';
-import { save } from '../../components/Storage/storage';
 
-export default function SignContract({ navigation, route }: any) {
+export default function SignContract({navigation, route}: any) {
   const dispatch = useDispatch<AppDispatch>();
   const isLoading = useSelector(selectLoading);
   const [check, setCheck] = useState(false);
@@ -36,34 +33,36 @@ export default function SignContract({ navigation, route }: any) {
   };
 
   const InitSignContract = async () => {
-    navigation.navigate(Screens.EkycLiveness);
-    const params = {
+    navigation.navigate(Screens.EkycLiveness, {
       reference_id: data?.reference_id,
-    };
-    const response: any = await dispatch(confirmGpayOnboarding(params));
-    console.log('response', response);
-    if (response?.payload.meta.errCode === 200) {
-      save('reference_id', response?.payload.data);
-      navigation.navigate(Screens.EkycLiveness, {
-        reference_id: response?.payload.data,
-      });
-    } else {
-      // WToastShowError(response?.payload.meta.errMessage);
-      showMessage({
-        message: 'Thông báo',
-        description: response?.payload.meta.errMessage,
-        type: 'danger',
-        icon: 'warning',
-        backgroundColor: Colors.DANGER,
-      });
-    }
+    });
+    // const params = {
+    //   reference_id: data?.reference_id,
+    // };
+    // const response: any = await dispatch(confirmGpayOnboarding(params));
+    // console.log('response', response);
+    // if (response?.payload.meta.errCode === 200) {
+    //   save('reference_id', response?.payload.data);
+    //   navigation.navigate(Screens.EkycLiveness, {
+    //     reference_id: response?.payload.data,
+    //   });
+    // } else {
+    //   // WToastShowError(response?.payload.meta.errMessage);
+    //   showMessage({
+    //     message: 'Thông báo',
+    //     description: response?.payload.meta.errMessage,
+    //     type: 'danger',
+    //     icon: 'warning',
+    //     backgroundColor: Colors.DANGER,
+    //   });
+    // }
   };
 
   return (
     <Container>
-      <AppHeader title="Hợp đồng Glink - Gpay - Lender" />
+      <AppHeader title="Hợp đồng Tima - Gpay - Lender" />
 
-      <View style={{ flex: 1 }}>
+      <View style={{flex: 1}}>
         <Pdf
           source={source}
           onLoadComplete={(numberOfPages, filePath) => {
@@ -72,10 +71,10 @@ export default function SignContract({ navigation, route }: any) {
           onPageChanged={(page, numberOfPages) => {
             console.log(`Current page: ${page}`);
           }}
-          onError={(error) => {
+          onError={error => {
             console.log(error);
           }}
-          onPressLink={(uri) => {
+          onPressLink={uri => {
             console.log(`Link pressed: ${uri}`);
             Linking.openURL(uri);
           }}
@@ -92,20 +91,18 @@ export default function SignContract({ navigation, route }: any) {
             backgroundColor: 'white',
             marginVertical: 16,
             paddingHorizontal: 16,
-          }}
-        >
-          <View style={{ flexDirection: 'row' }}>
+          }}>
+          <View style={{flexDirection: 'row'}}>
             <TouchableOpacity
-              style={{ marginLeft: 8 }}
-              onPress={() => setCheck(!check)}
-            >
+              style={{marginLeft: 8}}
+              onPress={() => setCheck(!check)}>
               {check ? (
                 <Icon name="checkbox" size={24} color={Colors.ORANGE} />
               ) : (
                 <Icon name="square-outline" size={24} color="#BDBDBD" />
               )}
             </TouchableOpacity>
-            <RText style={{ color: '#333333', paddingLeft: 10 }}>
+            <RText style={{color: '#333333', paddingLeft: 10}}>
               Tôi đồng ý với tất cả những điều kiện trong{'\n'} hợp đồng.
             </RText>
           </View>
@@ -120,12 +117,11 @@ export default function SignContract({ navigation, route }: any) {
                 marginBottom: 16,
                 alignItems: 'center',
                 marginTop: 40,
-              }}
-            >
+              }}>
               {isLoading ? (
                 <ActivityIndicator color={'white'} />
               ) : (
-                <RText style={{ color: 'white', fontSize: 16 }}>
+                <RText style={{color: 'white', fontSize: 16}}>
                   Ký hợp đồng
                 </RText>
               )}

package/src/screens/SignContractGpayTima/index.tsx

@@ -46,7 +46,7 @@ export const SignContractGpayTima = ({ navigation }: any) => {
   return (
     <Container>
       <AppHeader
-        title="HỢP ĐỒNG GLINK - GPAY - LENDER"
+        title="HỢP ĐỒNG TIMA - GPAY - LENDER"
         goBack={() => navigation.navigate(Screens.Gpay)}
       />
       <View style={{ padding: actuatedNormalize(16) }}>
@@ -78,7 +78,7 @@ export const SignContractGpayTima = ({ navigation }: any) => {
                   padding: actuatedNormalize(12),
                 }}
               >
-                Hợp đồng điện tử Glink - Gpay - Lender
+                Hợp đồng điện tử Tima - Gpay - Lender
               </RText>
             </FlexRow>
             <SpaceBetween

package/src/screens/Support/index.tsx

@@ -40,7 +40,7 @@ export const Support = () => {
             marginLeft: 8,
           }}
         >
-          Glink
+          vip@tima.vn
         </RText>
       </FlexRow>
     </Container>

package/src/screens/Transfer/Components/PopoverChooseShop.tsx

@@ -89,9 +89,9 @@ const PopoverChooseShop = (props: any) => {
           alignItems: 'center',
           justifyContent: 'center',
           borderRadius: 16,
-          // marginBottom: actuatedNormalize(16),
+          marginBottom: actuatedNormalize(16),
           backgroundColor: checked ? '#FF8E4F' : 'white',
-          paddingHorizontal: actuatedNormalize(8),
+          // paddingHorizontal: actuatedNormalize(8),
         }}
       >
         <RText textStyle={{ color: checked ? Colors.WHITE : Colors.BLACK }}>

package/src/utils/notification.ts

@@ -56,20 +56,18 @@ export const showNotification = (notification: any) => {
 };
 
 export const notificationListener = async (show?: any) => {
-  messaging().onNotificationOpenedApp((remoteMessage) => {
+  messaging().onNotificationOpenedApp(remoteMessage => {
     showNotification(remoteMessage);
   });
 
-  messaging().onMessage(async (remoteMessage) => {
+  messaging().onMessage(async remoteMessage => {
     console.log('APP OPENED', remoteMessage);
-    if (show) {
-      show(remoteMessage);
-    }
+    if (show) show(remoteMessage);
   });
 
   messaging()
     .getInitialNotification()
-    .then((remoteMessage) => {
+    .then(remoteMessage => {
       if (remoteMessage) {
         showNotification(remoteMessage);
       }
@@ -84,7 +82,7 @@ export const subscribeTopicFCM = async (topic: any) => {
       .then(() => {
         console.log('subscribed to topic', topic);
       })
-      .catch((err) => {
+      .catch(err => {
         console.log('err subscribing to topic', err);
       });
     await messaging().subscribeToTopic('all');
@@ -99,9 +97,9 @@ export const subscribeTopicNotification = async (topic: any) => {
     messaging()
       .subscribeToTopic(topic)
       .then(() => {
-        console.log('subscribed to topic', topic);
+        console.log('subscribed to topic notification', topic);
       })
-      .catch((err) => {
+      .catch(err => {
         console.log('err subscribing to topic', err);
       });
     await messaging().subscribeToTopic('push_new_loan');
@@ -117,7 +115,7 @@ export const unSubscribeTopicFCM = async (topic: any) => {
       .then(() => {
         console.log('unsubscribed to topic', topic);
       })
-      .catch((err) => {
+      .catch(err => {
         console.log('err unsubscribing to topic', err);
       });
   } catch (error) {