react-native-timacare 3.3.19 → 3.3.21

package/src/screens/home/Store.tsx

@@ -134,6 +134,7 @@ class Store {
   @action
   async getListLoan(onSuccess?, onFailure?) {
     this.isLoading = true;
+    this.listLoan = [];
     const response = await Api.getInstance().listLoan();
     this.isLoading = false;
     myLog(response);
@@ -143,12 +144,14 @@ class Store {
         if (onSuccess) {
           onSuccess(response.data.data);
         }
-      } else if (response.data.meta.errorCode === 404) {
+      } else {
+        this.listLoan = [];
         Alert.alert('Thông báo', response.data.meta.errorMessage, [
           { text: 'Đồng ý' },
         ]);
       }
     } else {
+      this.listLoan = [];
       this.isLoading = false;
       Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau!');
     }

package/src/screens/home/index.tsx

@@ -103,6 +103,7 @@ import AlertLoan from '../../components/AlertLoan';
 import DigitalTopupItem from './DigitalTopupItem';
 import ModalOptionLoanDigital from '../../components/ModalOptionLoanDigital';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import ItemMotoBikeLoan from './ItemMotoBikeLoan';
 
 const listBanners = [
   require('../../assets/img/banner1.png'),
@@ -133,6 +134,7 @@ export const Home = observer(function Home() {
   const insets = useSafeAreaInsets();
 
   const onRefresh = async () => {
+    homeStore.getListLoan();
     setIsLoading(true);
     try {
       const response = await Api.getInstance().listLoanPending();
@@ -184,6 +186,7 @@ export const Home = observer(function Home() {
                   const res = await Api.getInstance().getSuggestProduct(
                     item?.id
                   );
+                  console.log(res);
 
                   if (res.kind === 'ok' && res.data?.meta?.errorCode === 200) {
                     setDataSuggest({
@@ -496,25 +499,16 @@ export const Home = observer(function Home() {
         style={{ flex: 1, marginBottom: 16 }}
       >
         <View style={[commonStyles.fill, { paddingHorizontal: 16 }]}>
-          <MText
-            style={{
-              fontSize: 16,
-              fontWeight: 'bold',
-              marginTop: 10,
-              marginBottom: 8,
-            }}
-          >
-            Đơn chờ hoàn thiện
-          </MText>
-          {listLoan?.length === 0 && (
+          {listLoan?.length > 0 && (
             <MText
               style={{
-                marginTop: 50,
-                marginBottom: 16,
-                textAlign: 'center',
+                fontSize: 16,
+                fontWeight: 'bold',
+                marginTop: 10,
+                marginBottom: 8,
               }}
             >
-              Danh sách đơn mới trống
+              Danh sách đơn mới
             </MText>
           )}
 
@@ -534,6 +528,13 @@ export const Home = observer(function Home() {
                     navigation={navigation}
                     callback={() => onRefresh()}
                   />
+                ) : // vay mua xe máy
+                item?.typeLoan === 8 ? (
+                  <ItemMotoBikeLoan
+                    item={item}
+                    navigation={navigation}
+                    callback={onRefresh}
+                  />
                 ) : (
                   <View>
                     {/* // luồng CIMB */}
@@ -2149,28 +2150,19 @@ export const Home = observer(function Home() {
               </View>
             );
           })}
-
           <Observer>
             {() => (
               <View>
-                <MText
-                  style={{
-                    fontSize: 16,
-                    fontWeight: 'bold',
-                    marginBottom: 8,
-                  }}
-                >
-                  Danh sách đơn đang vay
-                </MText>
-                {homeStore?.listLoan?.length === 0 && (
+                {homeStore?.listLoan?.length > 0 && (
                   <MText
                     style={{
-                      marginTop: 50,
-                      marginBottom: 16,
-                      textAlign: 'center',
+                      fontSize: 16,
+                      fontWeight: 'bold',
+                      marginBottom: 8,
+                      marginTop: 10,
                     }}
                   >
-                    Danh sách đơn trống
+                    Danh sách đơn đang vay
                   </MText>
                 )}
                 {homeStore?.listLoan &&
@@ -2731,7 +2723,7 @@ export const Home = observer(function Home() {
           }}
         />
       </ScrollView>
-      <Loading isLoading={isLoading} />
+      <Loading isLoading={isLoading || homeStore.isLoading} />
     </View>
   );
 });

package/src/screens/liveness-v2/index.tsx

@@ -505,10 +505,10 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
 
       <View style={styles.circularProgress}>
         <CircularProgress
-          dashedStrokeConfig={{
-            count: 100,
-            width: 7,
-          }}
+          // dashedStrokeConfig={{
+          //   count: 100,
+          //   width: 7,
+          // }}
           value={
             livenessStore.listAction.length === 3
               ? 0