@tima2025/react-native-timalender 1.0.1 → 1.0.2

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 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/Transfer/Components/PopoverChooseShop.tsx

@@ -91,7 +91,7 @@ const PopoverChooseShop = (props: any) => {
           borderRadius: 16,
           marginBottom: actuatedNormalize(16),
           backgroundColor: checked ? '#FF8E4F' : 'white',
-          paddingHorizontal: actuatedNormalize(8),
+          // paddingHorizontal: actuatedNormalize(8),
         }}
       >
         <RText textStyle={{ color: checked ? Colors.WHITE : Colors.BLACK }}>
@@ -118,7 +118,7 @@ const PopoverChooseShop = (props: any) => {
         }}
       >
         <FlatList
-          style={{ height: HEIGHT * 0.3, padding: actuatedNormalize(8) }}
+          style={{ maxHeight: HEIGHT * 0.3, padding: actuatedNormalize(8) }}
           data={shops}
           keyExtractor={(item, index) => index.toString()}
           renderItem={_renderShop}

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) {