react-native-timacare 0.0.40 → 0.0.42

package/src/screens/home/index.tsx

@@ -67,6 +67,7 @@ import Modal from 'react-native-modal';
 import { Api } from '../../services/api';
 import { load, save } from '../../utils/storage';
 import Loading from '../../components/Loading';
+import MButton from '../../components/MButton';
 
 const listBanners = [
   require('../../assets/img/banner1.png'),
@@ -236,7 +237,6 @@ export const Home = observer(function Home() {
         appStore.long = position.coords.longitude;
       },
       (error) => {
-        // See error code charts below.
         console.log(error.code, error.message);
         requestPermissions();
       },
@@ -265,7 +265,7 @@ export const Home = observer(function Home() {
               height: 60,
             }}
           >
-            <TouchableOpacity
+            <MButton
               style={{
                 height: 32,
                 width: 32,
@@ -280,7 +280,7 @@ export const Home = observer(function Home() {
               }}
             >
               <IconBackWhite />
-            </TouchableOpacity>
+            </MButton>
             <MText
               style={{
                 fontWeight: 'bold',
@@ -290,7 +290,7 @@ export const Home = observer(function Home() {
             >
               Vay nhanh 24/7
             </MText>
-            <TouchableOpacity
+            <MButton
               style={{
                 height: 32,
                 width: 32,
@@ -307,7 +307,7 @@ export const Home = observer(function Home() {
               }}
             >
               <Call />
-            </TouchableOpacity>
+            </MButton>
           </View>
         </SafeAreaView>
       </LinearGradient>
@@ -403,7 +403,7 @@ export const Home = observer(function Home() {
                             <View style={{ flexDirection: 'row' }}>
                               {loan?.loanStatus === null ||
                               loan?.loanStatus === '' ? (
-                                <TouchableOpacity
+                                <MButton
                                   style={{ alignItems: 'center' }}
                                   onPress={() => {
                                     navigation.dispatch(
@@ -427,7 +427,7 @@ export const Home = observer(function Home() {
                                   >
                                     Hoàn thiện{'\n'}cung cấp thông tin
                                   </MText>
-                                </TouchableOpacity>
+                                </MButton>
                               ) : (
                                 <View>
                                   {loan?.isUpdateLoan ||
@@ -493,7 +493,7 @@ export const Home = observer(function Home() {
                               )}
 
                               {loan?.isSignContract && (
-                                <TouchableOpacity
+                                <MButton
                                   style={{
                                     alignItems: 'center',
                                     marginLeft: 20,
@@ -529,10 +529,10 @@ export const Home = observer(function Home() {
                                   >
                                     Ký hợp đồng
                                   </MText>
-                                </TouchableOpacity>
+                                </MButton>
                               )}
                               {loan?.isSignContractTima && (
-                                <TouchableOpacity
+                                <MButton
                                   style={{
                                     alignItems: 'center',
                                     marginLeft: 20,
@@ -562,10 +562,10 @@ export const Home = observer(function Home() {
                                   >
                                     Hợp đồng{'\n'}dịch vụ
                                   </MText>
-                                </TouchableOpacity>
+                                </MButton>
                               )}
                               {loan?.paymentEvidenceUrl && (
-                                <TouchableOpacity
+                                <MButton
                                   style={{
                                     alignItems: 'center',
                                     marginLeft: 20,
@@ -595,10 +595,10 @@ export const Home = observer(function Home() {
                                   >
                                     Mục đích {'\n'}sử dụng
                                   </MText>
-                                </TouchableOpacity>
+                                </MButton>
                               )}
                               {loan?.showPaymentPlan && (
-                                <TouchableOpacity
+                                <MButton
                                   style={{
                                     alignItems: 'center',
                                     marginLeft: 20,
@@ -627,7 +627,7 @@ export const Home = observer(function Home() {
                                   >
                                     Lịch dự kiến
                                   </MText>
-                                </TouchableOpacity>
+                                </MButton>
                               )}
                             </View>
 

package/src/screens/schedule-payment/index.tsx

@@ -1,7 +1,7 @@
 //@ts-nocheck
 import { useNavigation } from '@react-navigation/native';
 import { observer } from 'mobx-react-lite';
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   ActivityIndicator,
   Image,
@@ -30,8 +30,20 @@ const logoView: ImageStyle = {
 
 export const SchedulePayment = observer(function SchedulePayment(props: any) {
   const navigation = useNavigation();
+  const [isLoading, setIsLoading] = useState(false);
+  const [data, setData] = useState<any[]>();
   const getData = () => {
-    SchedulePaymentStore.getSchedulePayment(props.route?.params?.loan?.id);
+    setIsLoading(true);
+    SchedulePaymentStore.getSchedulePayment(
+      props.route?.params?.loan?.id,
+      (res) => {
+        setIsLoading(false);
+        setData(res);
+      },
+      () => {
+        setIsLoading(false);
+      }
+    );
   };
 
   useEffect(() => {
@@ -79,7 +91,7 @@ export const SchedulePayment = observer(function SchedulePayment(props: any) {
               <RefreshControl refreshing={false} onRefresh={getData} />
             }
           >
-            {SchedulePaymentStore.data.map((item, index) => (
+            {data.map((item, index) => (
               <View
                 key={index}
                 style={{
@@ -199,7 +211,7 @@ export const SchedulePayment = observer(function SchedulePayment(props: any) {
             <CIMBBank />
           </View>
         </View>
-        <Loading isLoading={SchedulePaymentStore.isLoading} />
+        <Loading isLoading={isLoading} />
       </SafeAreaView>
     </View>
   );

package/src/screens/schedule-payment/store.tsx

@@ -8,20 +8,23 @@ class Store {
   @observable data = [];
 
   @action
-  async getSchedulePayment(id) {
+  async getSchedulePayment(id, onSuccess?, onError?) {
     this.isLoading = true;
     const response = await Api.getInstance().getPaymentSchedule(id);
     this.isLoading = false;
     if (response.kind === 'ok') {
       if (response.data.meta.errorCode === 200) {
+        if (onSuccess) onSuccess(response.data.data);
         this.data = response.data.data;
       } else {
         Alert.alert('Thông báo', response.data.meta.errorMessage, [
           { text: 'Đồng ý' },
         ]);
+        if (onError) onError();
       }
     } else {
       this.isLoading = false;
+      if (onError) onError();
       Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau!');
     }
   }