react-native-timacare 3.3.19 → 3.3.21

package/src/screens/detail-loan/Payment.tsx

@@ -1,7 +1,6 @@
-//@ts-nocheck
+// @ts-nocheck
 import { StackActions, useNavigation } from '@react-navigation/native';
 import { observer } from 'mobx-react-lite';
-import moment from 'moment';
 import React, { useEffect, useState } from 'react';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
@@ -9,7 +8,6 @@ import { CIMBBank } from '../../assets/icons';
 import Loading from '../../components/Loading';
 import { MText } from '../../components/MText';
 import { ScreenNames } from '../../navigation';
-import { color } from '../../theme';
 import { formatDDMMYYY, formatMoney } from '../../utils';
 import { commonStyles } from '../CommonStyles';
 import DetailLoanStore from './store';
@@ -245,10 +243,11 @@ export const Payment = observer(function Payment({ data }: IProps) {
           style={{
             borderRadius: 30,
             borderWidth: 1,
-            borderColor: '#E0E0E0',
+            borderColor: '#EF592E',
             alignItems: 'center',
             paddingVertical: 10,
-            backgroundColor: '#FFFFFF',
+            backgroundColor: '#FFEAD8',
+            marginTop: 10,
           }}
           onPress={() => {
             navigation.dispatch(
@@ -259,10 +258,23 @@ export const Payment = observer(function Payment({ data }: IProps) {
             );
           }}
         >
-          <MText style={[commonStyles.textNormal, { color: '#333333' }]}>
-            Tất toán hợp đồng
+          <MText style={[commonStyles.textNormal, { color: '#EF592E' }]}>
+            Xem thông tin tất toán
           </MText>
         </TouchableOpacity>
+        <View
+          style={{
+            marginTop: 8,
+            flexDirection: 'row',
+            justifyContent: 'center',
+            alignItems: 'center',
+          }}
+        >
+          <MText style={{ fontSize: 12, color: '#333333' }}>
+            Cung cấp bởi{' '}
+          </MText>
+          <CIMBBank />
+        </View>
       </ScrollView>
       <Loading isLoading={isLoading} />
     </View>

package/src/screens/detail-loan/PaymentAll.tsx

@@ -13,8 +13,10 @@ import { formatMoney } from '../../utils';
 import { commonStyles } from '../CommonStyles';
 import DetailLoanStore from './store';
 import MHeader from '../../components/MHeader';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 export const PaymentAll = observer(function PaymentAll(props: any) {
+  const insets = useSafeAreaInsets();
   const navigation = useNavigation();
   const [data, setData] = useState<any>();
   const [isLoading, setIsLoading] = useState(false);
@@ -40,8 +42,31 @@ export const PaymentAll = observer(function PaymentAll(props: any) {
 
   return (
     <View style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
-      <MHeader title="Tất toán hợp đồng" onBack={() => navigation.goBack()} />
-      <SafeAreaView style={{ flex: 1 }}>
+      <View style={{ flex: 1, marginTop: insets.top }}>
+        <View
+          style={{
+            paddingHorizontal: 16,
+            paddingVertical: 12,
+            alignItems: 'center',
+            justifyContent: 'center',
+          }}
+        >
+          <TouchableOpacity
+            style={{ position: 'absolute', left: 16 }}
+            onPress={() => navigation.goBack()}
+          >
+            <IconBack onPress={() => navigation.goBack()} />
+          </TouchableOpacity>
+          <MText
+            style={{
+              fontFamily: 'BeVietnamPro-SemiBold',
+              fontWeight: '600',
+              fontSize: 16,
+            }}
+          >
+            Tất toán hợp đồng
+          </MText>
+        </View>
         <ScrollView style={{ flex: 1 }}>
           <View
             style={{
@@ -50,7 +75,8 @@ export const PaymentAll = observer(function PaymentAll(props: any) {
               borderRadius: 8,
               borderColor: '#F05123',
               padding: 16,
-              marginTop: 16,
+              marginTop: 10,
+              backgroundColor: '#FFFAF8',
             }}
           >
             <View
@@ -232,9 +258,9 @@ export const PaymentAll = observer(function PaymentAll(props: any) {
             (Đơn vị tính: VNĐ)
           </MText>
         </ScrollView>
-        <View>
+        <View style={{ marginBottom: insets.bottom }}>
           <View
-            style={{ height: 1, backgroundColor: '#E4E8EA', marginBottom: 20 }}
+            style={{ height: 1, backgroundColor: '#E4E8EA', marginBottom: 16 }}
           />
           <View
             style={{
@@ -242,7 +268,7 @@ export const PaymentAll = observer(function PaymentAll(props: any) {
               justifyContent: 'space-between',
               alignItems: 'center',
               paddingHorizontal: 16,
-              marginBottom: 20,
+              marginBottom: 16,
             }}
           >
             <MText
@@ -263,7 +289,7 @@ export const PaymentAll = observer(function PaymentAll(props: any) {
             </MText>
           </View>
           <TouchableOpacity
-            style={{ paddingHorizontal: 16, marginBottom: 20 }}
+            style={{ paddingHorizontal: 16 }}
             onPress={() => {
               navigation.dispatch(
                 StackActions.push(ScreenNames.PaymentInfo, {
@@ -286,13 +312,27 @@ export const PaymentAll = observer(function PaymentAll(props: any) {
               <MText
                 style={[commonStyles.textNormalBold, { color: '#FDFDFD' }]}
               >
-                Xác nhận và thanh toán
+                Xác nhận và tất toán
               </MText>
             </LinearGradient>
           </TouchableOpacity>
+          <View
+            style={{
+              marginTop: 8,
+              flexDirection: 'row',
+              justifyContent: 'center',
+              alignItems: 'center',
+              marginBottom: 16,
+            }}
+          >
+            <MText style={{ fontSize: 12, color: '#333333' }}>
+              Cung cấp bởi{' '}
+            </MText>
+            <CIMBBank />
+          </View>
         </View>
         <Loading isLoading={isLoading} />
-      </SafeAreaView>
+      </View>
     </View>
   );
 });