react-native-timacare 3.3.18 → 3.3.20

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

@@ -1,24 +1,14 @@
-//@ts-nocheck
-import { CommonActions, useNavigation } from '@react-navigation/native';
+// @ts-nocheck
+import { useNavigation } from '@react-navigation/native';
 import { observer } from 'mobx-react-lite';
 import React, { useState } from 'react';
-import {
-  Image,
-  ImageStyle,
-  SafeAreaView,
-  TouchableOpacity,
-  View,
-} from 'react-native';
-import LinearGradient from 'react-native-linear-gradient';
+import { ImageStyle, TouchableOpacity, View } from 'react-native';
 import { IconBack } from '../../assets/icons';
-import MButton from '../../components/MButton';
 import { MText } from '../../components/MText';
-import { ScreenNames } from '../../navigation';
-import { color } from '../../theme';
-import { commonStyles } from '../CommonStyles';
 import { Info } from './Info';
 import { Payment } from './Payment';
-import MHeader from '../../components/MHeader';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+
 const logoView: ImageStyle = {
   position: 'absolute',
   width: '100%',
@@ -27,30 +17,44 @@ const logoView: ImageStyle = {
 };
 
 export const DetailLoan = observer(function DetailLoan(props: any) {
+  const insets = useSafeAreaInsets();
   const navigation = useNavigation();
   const [tab, setTab] = useState(1);
 
   return (
     <View style={{ flex: 1, backgroundColor: '#FDFDFD' }}>
-      <MHeader
-        title={`Đơn vay ${props.route?.params?.loan?.id}`}
-        onBack={() =>
-          navigation.dispatch(
-            CommonActions.reset({
-              index: 1,
-              routes: [{ name: ScreenNames.Main }],
-            })
-          )
-        }
-      />
-      <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,
+            }}
+          >
+            HD-{props.route?.params?.loan?.id}
+          </MText>
+        </View>
         <View
           style={{
             flexDirection: 'row',
             backgroundColor: '#F2F2F2',
             borderRadius: 30,
             marginHorizontal: 16,
-            marginTop: 16,
+            marginTop: 10,
           }}
         >
           <TouchableOpacity onPress={() => setTab(1)} style={{ flex: 1 }}>
@@ -60,13 +64,13 @@ export const DetailLoan = observer(function DetailLoan(props: any) {
                 borderRadius: 30,
                 paddingVertical: 10,
                 borderWidth: 1,
-                borderColor: tab === 1 ? '#FF7A00' : '#F2F2F2',
+                borderColor: tab === 1 ? '#EF4123' : '#F2F2F2',
                 backgroundColor: tab === 1 ? '#FFFFFF' : '#F2F2F2',
               }}
             >
               <MText
                 style={{
-                  color: tab === 1 ? '#FF7A00' : '#333333',
+                  color: tab === 1 ? '#EF4123' : '#333333',
                   fontWeight: tab === 1 ? 'bold' : '400',
                 }}
               >
@@ -86,13 +90,13 @@ export const DetailLoan = observer(function DetailLoan(props: any) {
                 borderRadius: 30,
                 paddingVertical: 10,
                 borderWidth: 1,
-                borderColor: tab === 2 ? '#FF7A00' : '#F2F2F2',
+                borderColor: tab === 2 ? '#EF4123' : '#F2F2F2',
                 backgroundColor: tab === 2 ? '#FFFFFF' : '#F2F2F2',
               }}
             >
               <MText
                 style={{
-                  color: tab === 2 ? '#FF7A00' : '#333333',
+                  color: tab === 2 ? '#EF4123' : '#333333',
                   fontWeight: tab === 2 ? 'bold' : '400',
                 }}
               >
@@ -106,7 +110,7 @@ export const DetailLoan = observer(function DetailLoan(props: any) {
         ) : (
           <Payment data={props?.route.params?.loan} />
         )}
-      </SafeAreaView>
+      </View>
     </View>
   );
 });

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