react-native-timacare 3.3.19 → 3.3.20

package/src/screens/guide-transfer-bank/TransferDetail.tsx

@@ -1,7 +1,14 @@
 //@ts-nocheck
 import { useNavigation } from '@react-navigation/native';
 import React from 'react';
-import { Image, SafeAreaView, ScrollView, View } from 'react-native';
+import {
+  Image,
+  SafeAreaView,
+  ScrollView,
+  TouchableOpacity,
+  View,
+  ViewStyle,
+} from 'react-native';
 import { CIMBBank, IconBack } from '../../assets/icons';
 import MButton from '../../components/MButton';
 import { MText } from '../../components/MText';
@@ -9,6 +16,18 @@ import { color } from '../../theme';
 import { commonStyles } from '../CommonStyles';
 import MHeader from '../../components/MHeader';
 
+const $backButton: ViewStyle = {
+  position: 'absolute',
+  left: 16,
+};
+
+const $header: ViewStyle = {
+  flexDirection: 'row',
+  alignItems: 'center',
+  paddingVertical: 16,
+  justifyContent: 'center',
+};
+
 export default function TransferDetail(props: any) {
   const navigation = useNavigation();
 
@@ -126,17 +145,27 @@ export default function TransferDetail(props: any) {
   };
   return (
     <View style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
-      <MHeader
-        title={`BƯỚC ${props.route.params.step}`}
-        onBack={() => {
-          navigation.goBack();
-        }}
-      />
-      <SafeAreaView style={{ flex: 1 }}>
-        <ScrollView style={{ flex: 1 }}>
-          {renderStep(props.route.params.step)}
-        </ScrollView>
-      </SafeAreaView>
+      <MHeader title={'Vay trực tuyến 24/7'} />
+      <View style={{ flex: 1 }}>
+        <View style={$header}>
+          <TouchableOpacity
+            style={$backButton}
+            onPress={() => navigation.goBack()}
+          >
+            <IconBack />
+          </TouchableOpacity>
+          <MText
+            style={{
+              fontSize: 16,
+              fontWeight: '600',
+              fontFamily: 'BeVietnamPro-SemiBold',
+            }}
+          >
+            {`BƯỚC ${props.route.params.step}`}
+          </MText>
+        </View>
+        <ScrollView>{renderStep(props.route.params.step)}</ScrollView>
+      </View>
     </View>
   );
 }

package/src/screens/guide-transfer-bank/index.tsx

@@ -8,6 +8,7 @@ import {
   StyleSheet,
   TouchableOpacity,
   View,
+  ViewStyle,
 } from 'react-native';
 import {
   CIMBBank,
@@ -26,6 +27,18 @@ import { color } from '../../theme';
 import { commonStyles } from '../CommonStyles';
 import MHeader from '../../components/MHeader';
 
+const $backButton: ViewStyle = {
+  position: 'absolute',
+  left: 16,
+};
+
+const $header: ViewStyle = {
+  flexDirection: 'row',
+  alignItems: 'center',
+  paddingVertical: 16,
+  justifyContent: 'center',
+};
+
 export const GuideTransferBank = observer(function GuideTransferBank() {
   const navigation = useNavigation();
   const goDetail = (step) => {
@@ -34,279 +47,257 @@ export const GuideTransferBank = observer(function GuideTransferBank() {
     );
   };
   return (
-    <View style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
-      <MHeader
-        title="Hướng dẫn chuyển tiền"
-        onBack={() => {
-          navigation.goBack();
-        }}
-      />
-      <SafeAreaView style={{ flex: 1 }}>
-        <View style={{ flex: 1, backgroundColor: '#F4F4F4' }}>
-          <ScrollView style={{ flex: 1 }}>
-            <View
-              style={[
-                styles.box,
-                { flexDirection: 'row', alignItems: 'center', marginTop: 16 },
-              ]}
-            >
-              <Step1Icon />
-              <View style={{ flex: 1, paddingLeft: 16 }}>
+    <View style={{ flex: 1, backgroundColor: '#F4F4F4' }}>
+      <MHeader title="Vay trực tuyến 24/7" />
+      <View style={{ flex: 1 }}>
+        <View style={$header}>
+          <TouchableOpacity
+            style={$backButton}
+            onPress={() => navigation.goBack()}
+          >
+            <IconBack />
+          </TouchableOpacity>
+          <MText
+            style={{
+              fontSize: 16,
+              fontWeight: '600',
+              fontFamily: 'BeVietnamPro-SemiBold',
+            }}
+          >
+            Hướng dẫn chuyển tiền
+          </MText>
+        </View>
+
+        <ScrollView>
+          <View
+            style={[styles.box, { flexDirection: 'row', alignItems: 'center' }]}
+          >
+            <Step1Icon />
+            <View style={{ flex: 1, paddingLeft: 16 }}>
+              <MText
+                style={[
+                  commonStyles.textNormalBold,
+                  { fonSize: 16, color: color.primary },
+                ]}
+              >
+                BƯỚC 1:
+              </MText>
+              <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
+                Chọn mục{' '}
+                <MText style={commonStyles.textNormalBold}>“Chuyển tiền”</MText>{' '}
+                ở ngân hàng của bạn
+              </MText>
+              <TouchableOpacity
+                style={{ marginTop: 4 }}
+                onPress={() => goDetail(1)}
+              >
                 <MText
                   style={[
-                    commonStyles.textNormalBold,
-                    { fonSize: 16, color: color.primary },
+                    commonStyles.textNormal,
+                    {
+                      fontSize: 12,
+                      color: '#828282',
+                      textDecorationLine: 'underline',
+                    },
                   ]}
                 >
-                  BƯỚC 1:
-                </MText>
-                <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
-                  Chọn mục{' '}
-                  <MText style={commonStyles.textNormalBold}>
-                    “Chuyển tiền”
-                  </MText>{' '}
-                  ở ngân hàng của bạn
+                  Xem ảnh minh hoạ
                 </MText>
-                <TouchableOpacity
-                  style={{ marginTop: 4 }}
-                  onPress={() => goDetail(1)}
-                >
-                  <MText
-                    style={[
-                      commonStyles.textNormal,
-                      {
-                        fontSize: 12,
-                        color: '#828282',
-                        textDecorationLine: 'underline',
-                      },
-                    ]}
-                  >
-                    Xem ảnh minh hoạ
-                  </MText>
-                </TouchableOpacity>
-              </View>
+              </TouchableOpacity>
             </View>
-            <View
-              style={[
-                styles.box,
-                { flexDirection: 'row', alignItems: 'center' },
-              ]}
-            >
-              <Step2Icon />
-              <View style={{ flex: 1, paddingLeft: 16 }}>
+          </View>
+          <View
+            style={[styles.box, { flexDirection: 'row', alignItems: 'center' }]}
+          >
+            <Step2Icon />
+            <View style={{ flex: 1, paddingLeft: 16 }}>
+              <MText
+                style={[
+                  commonStyles.textNormalBold,
+                  { fonSize: 16, color: color.primary },
+                ]}
+              >
+                BƯỚC 2:
+              </MText>
+              <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
+                Chọn ngân hàng nhận{' '}
+                <MText style={commonStyles.textNormalBold}>Techcombank</MText>
+              </MText>
+              <TouchableOpacity
+                style={{ marginTop: 4 }}
+                onPress={() => goDetail(2)}
+              >
                 <MText
                   style={[
-                    commonStyles.textNormalBold,
-                    { fonSize: 16, color: color.primary },
+                    commonStyles.textNormal,
+                    {
+                      fontSize: 12,
+                      color: '#828282',
+                      textDecorationLine: 'underline',
+                    },
                   ]}
                 >
-                  BƯỚC 2:
-                </MText>
-                <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
-                  Chọn ngân hàng nhận{' '}
-                  <MText style={commonStyles.textNormalBold}>Techcombank</MText>
+                  Xem ảnh minh hoạ
                 </MText>
-                <TouchableOpacity
-                  style={{ marginTop: 4 }}
-                  onPress={() => goDetail(2)}
-                >
-                  <MText
-                    style={[
-                      commonStyles.textNormal,
-                      {
-                        fontSize: 12,
-                        color: '#828282',
-                        textDecorationLine: 'underline',
-                      },
-                    ]}
-                  >
-                    Xem ảnh minh hoạ
-                  </MText>
-                </TouchableOpacity>
-              </View>
+              </TouchableOpacity>
             </View>
-            <View
-              style={[
-                styles.box,
-                { flexDirection: 'row', alignItems: 'center' },
-              ]}
-            >
-              <Step3Icon />
-              <View style={{ flex: 1, paddingLeft: 16 }}>
+          </View>
+          <View
+            style={[styles.box, { flexDirection: 'row', alignItems: 'center' }]}
+          >
+            <Step3Icon />
+            <View style={{ flex: 1, paddingLeft: 16 }}>
+              <MText
+                style={[
+                  commonStyles.textNormalBold,
+                  { fonSize: 16, color: color.primary },
+                ]}
+              >
+                BƯỚC 3:
+              </MText>
+              <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
+                Ưu tiên chọn{' '}
+                <MText style={commonStyles.textNormalBold}>
+                  “Chuyển tiền nhanh”
+                </MText>
+              </MText>
+              <MText style={{ fontSize: 12, color: '#FF7A00', marginTop: 8 }}>
+                Lưu ý:{' '}
+                <MText style={{ fontSize: 12, color: '#828282' }}>
+                  Nếu khách hàng chọn Chuyển tiền thường, số tiền thanh toán kỳ
+                  có thể bị chuyển chậm 01 ngày.
+                </MText>
+              </MText>
+              <TouchableOpacity
+                style={{ marginTop: 8 }}
+                onPress={() => goDetail(3)}
+              >
                 <MText
                   style={[
-                    commonStyles.textNormalBold,
-                    { fonSize: 16, color: color.primary },
+                    commonStyles.textNormal,
+                    {
+                      fontSize: 12,
+                      color: '#828282',
+                      textDecorationLine: 'underline',
+                    },
                   ]}
                 >
-                  BƯỚC 3:
+                  Xem ảnh minh hoạ
                 </MText>
-                <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
-                  Ưu tiên chọn{' '}
-                  <MText style={commonStyles.textNormalBold}>
-                    “Chuyển tiền nhanh”
-                  </MText>
-                </MText>
-                <MText style={{ fontSize: 12, color: '#FF7A00', marginTop: 8 }}>
-                  Lưu ý:{' '}
-                  <MText style={{ fontSize: 12, color: '#828282' }}>
-                    Nếu khách hàng chọn Chuyển tiền thường, số tiền thanh toán
-                    kỳ có thể bị chuyển chậm 01 ngày.
-                  </MText>
-                </MText>
-                <TouchableOpacity
-                  style={{ marginTop: 8 }}
-                  onPress={() => goDetail(3)}
-                >
-                  <MText
-                    style={[
-                      commonStyles.textNormal,
-                      {
-                        fontSize: 12,
-                        color: '#828282',
-                        textDecorationLine: 'underline',
-                      },
-                    ]}
-                  >
-                    Xem ảnh minh hoạ
-                  </MText>
-                </TouchableOpacity>
-              </View>
+              </TouchableOpacity>
             </View>
-            <View
-              style={[
-                styles.box,
-                { flexDirection: 'row', alignItems: 'center' },
-              ]}
-            >
-              <Step4Icon />
-              <View style={{ flex: 1, paddingLeft: 16 }}>
+          </View>
+          <View
+            style={[styles.box, { flexDirection: 'row', alignItems: 'center' }]}
+          >
+            <Step4Icon />
+            <View style={{ flex: 1, paddingLeft: 16 }}>
+              <MText
+                style={[
+                  commonStyles.textNormalBold,
+                  { fonSize: 16, color: color.primary },
+                ]}
+              >
+                BƯỚC 4:
+              </MText>
+              <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
+                <MText style={commonStyles.textNormalBold}>
+                  Nhập/ Dán số tài khoản
+                </MText>{' '}
+                từ Tima
+              </MText>
+              <TouchableOpacity
+                style={{ marginTop: 4 }}
+                onPress={() => goDetail(4)}
+              >
                 <MText
                   style={[
-                    commonStyles.textNormalBold,
-                    { fonSize: 16, color: color.primary },
+                    commonStyles.textNormal,
+                    {
+                      fontSize: 12,
+                      color: '#828282',
+                      textDecorationLine: 'underline',
+                    },
                   ]}
                 >
-                  BƯỚC 4:
+                  Xem ảnh minh hoạ
                 </MText>
-                <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
-                  <MText style={commonStyles.textNormalBold}>
-                    Nhập/ Dán số tài khoản
-                  </MText>{' '}
-                  từ Tima
-                </MText>
-                <TouchableOpacity
-                  style={{ marginTop: 4 }}
-                  onPress={() => goDetail(4)}
-                >
-                  <MText
-                    style={[
-                      commonStyles.textNormal,
-                      {
-                        fontSize: 12,
-                        color: '#828282',
-                        textDecorationLine: 'underline',
-                      },
-                    ]}
-                  >
-                    Xem ảnh minh hoạ
-                  </MText>
-                </TouchableOpacity>
-              </View>
+              </TouchableOpacity>
             </View>
-            <View
-              style={[
-                styles.box,
-                { flexDirection: 'row', alignItems: 'center' },
-              ]}
-            >
-              <Step5Icon />
-              <View style={{ flex: 1, paddingLeft: 16 }}>
+          </View>
+          <View
+            style={[styles.box, { flexDirection: 'row', alignItems: 'center' }]}
+          >
+            <Step5Icon />
+            <View style={{ flex: 1, paddingLeft: 16 }}>
+              <MText
+                style={[
+                  commonStyles.textNormalBold,
+                  { fonSize: 16, color: color.primary },
+                ]}
+              >
+                BƯỚC 5:
+              </MText>
+              <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
+                <MText style={commonStyles.textNormalBold}>Nhập số tiền </MText>
+                phải trả
+              </MText>
+              <TouchableOpacity
+                style={{ marginTop: 4 }}
+                onPress={() => goDetail(5)}
+              >
                 <MText
                   style={[
-                    commonStyles.textNormalBold,
-                    { fonSize: 16, color: color.primary },
+                    commonStyles.textNormal,
+                    {
+                      fontSize: 12,
+                      color: '#828282',
+                      textDecorationLine: 'underline',
+                    },
                   ]}
                 >
-                  BƯỚC 5:
+                  Xem ảnh minh hoạ
                 </MText>
-                <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
-                  <MText style={commonStyles.textNormalBold}>
-                    Nhập số tiền{' '}
-                  </MText>
-                  phải trả
-                </MText>
-                <TouchableOpacity
-                  style={{ marginTop: 4 }}
-                  onPress={() => goDetail(5)}
-                >
-                  <MText
-                    style={[
-                      commonStyles.textNormal,
-                      {
-                        fontSize: 12,
-                        color: '#828282',
-                        textDecorationLine: 'underline',
-                      },
-                    ]}
-                  >
-                    Xem ảnh minh hoạ
-                  </MText>
-                </TouchableOpacity>
-              </View>
+              </TouchableOpacity>
             </View>
-            <View
-              style={[
-                styles.box,
-                { flexDirection: 'row', alignItems: 'center' },
-              ]}
-            >
-              <Step6Icon />
-              <View style={{ flex: 1, paddingLeft: 16 }}>
+          </View>
+          <View
+            style={[styles.box, { flexDirection: 'row', alignItems: 'center' }]}
+          >
+            <Step6Icon />
+            <View style={{ flex: 1, paddingLeft: 16 }}>
+              <MText
+                style={[
+                  commonStyles.textNormalBold,
+                  { fonSize: 16, color: color.primary },
+                ]}
+              >
+                BƯỚC 6:
+              </MText>
+              <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
+                Xác nhận thanh toán
+              </MText>
+              <TouchableOpacity
+                style={{ marginTop: 4 }}
+                onPress={() => goDetail(6)}
+              >
                 <MText
                   style={[
-                    commonStyles.textNormalBold,
-                    { fonSize: 16, color: color.primary },
+                    commonStyles.textNormal,
+                    {
+                      fontSize: 12,
+                      color: '#828282',
+                      textDecorationLine: 'underline',
+                    },
                   ]}
                 >
-                  BƯỚC 6:
-                </MText>
-                <MText style={[commonStyles.textNormal, { marginTop: 4 }]}>
-                  Xác nhận thanh toán
+                  Xem ảnh minh hoạ
                 </MText>
-                <TouchableOpacity
-                  style={{ marginTop: 4 }}
-                  onPress={() => goDetail(6)}
-                >
-                  <MText
-                    style={[
-                      commonStyles.textNormal,
-                      {
-                        fontSize: 12,
-                        color: '#828282',
-                        textDecorationLine: 'underline',
-                      },
-                    ]}
-                  >
-                    Xem ảnh minh hoạ
-                  </MText>
-                </TouchableOpacity>
-              </View>
+              </TouchableOpacity>
             </View>
-          </ScrollView>
-        </View>
-        {/* <View
-          style={{
-            marginTop: 8,
-            flexDirection: "row",
-            justifyContent: "center",
-            marginBottom: 16,
-          }}
-        >
-          <MText style={{ fontSize: 12, color: "#333333" }}>Cung cấp bởi </MText>
-          <CIMBBank />
-        </View> */}
-      </SafeAreaView>
+          </View>
+        </ScrollView>
+      </View>
     </View>
   );
 });

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!');
     }