react-native-timacare 3.0.3-beta → 3.0.5-beta-glink

package/src/assets/icons/tima3.svg

@@ -1,17 +1,22 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <g filter="url(#filter0_d_1670_11432)">
+    <g filter="url(#filter0_d_1_19121)">
         <path
             d="M16.5 16.9091C16.5 15.5786 17.5786 14.5 18.9091 14.5H32C40.5604 14.5 47.5 21.4396 47.5 30C47.5 38.5604 40.5604 45.5 32 45.5C23.4396 45.5 16.5 38.5604 16.5 30V16.9091Z"
-            stroke="url(#paint0_linear_1670_11432)" shape-rendering="crispEdges" />
+            stroke="url(#paint0_linear_1_19121)" shape-rendering="crispEdges" />
     </g>
     <path
         d="M10 16.9091C10 15.3024 11.3024 14 12.9091 14H26C34.8366 14 42 21.1634 42 30C42 38.8366 34.8366 46 26 46C17.1634 46 10 38.8366 10 30V16.9091Z"
-        fill="url(#paint1_linear_1670_11432)" />
-    <path
-        d="M18 23.5L20.0001 27.5624L23.3528 27.5651C24.0491 27.5651 24.3926 27.8182 24.3893 28.242C24.3872 28.5121 23.0264 29.7579 22.5352 30.4249C21.6803 31.5862 22.0739 31.8323 22.8 33.2499C23.5632 34.7397 24.4 36.5 24.4 36.5C24.4 36.5 26.8536 33.4988 28.4181 31.6103C29.5409 30.2556 29.6848 29.9999 30.815 29.9999H34L32.4411 27.0891C32.4411 27.0891 32.1894 26.5714 31.8146 26.3028C31.2629 25.9075 30.8202 25.9379 30.8202 25.9379H28.9763C28.5036 25.9379 28.5644 25.869 27.0484 24.1164C26.7234 23.7408 26.4584 23.5 26.0048 23.5L18 23.5Z"
-        fill="url(#paint2_linear_1670_11432)" />
+        fill="url(#paint1_linear_1_19121)" />
+    <g clip-path="url(#clip0_1_19121)">
+        <path
+            d="M33.9998 30.0436C33.9998 30.268 33.9356 30.7837 33.9284 30.823C33.5405 32.9124 31.6208 34.5001 29.3109 34.5001C28.9487 34.5001 28.5957 34.4611 28.257 34.387C27.4902 34.2197 26.7953 33.8737 26.2233 33.3969L27.9959 32.2829C28.3847 32.4901 28.8335 32.6079 29.3109 32.6079C30.801 32.6079 32.0091 31.4598 32.0091 30.0436C32.0091 29.9514 32.0041 29.8603 31.9937 29.7707C31.8507 28.4826 30.704 27.4792 29.3109 27.4792C28.8115 27.4792 28.344 27.6081 27.9429 27.8329L23.1229 30.8617C22.6644 31.1499 22.0469 31.0302 21.7438 30.5944C21.4406 30.1585 21.5665 29.5716 22.0251 29.2835L24.2657 27.8754L25.99 26.7918C26.0481 26.7556 26.3915 26.5499 26.5805 26.4208L26.5814 26.4201L26.8798 26.2326L26.8805 26.2323C27.5892 25.823 28.4211 25.5874 29.3109 25.5874C29.9161 25.5874 30.4947 25.6964 31.0263 25.8951C32.7675 26.5455 34 28.1577 34 30.0434L33.9998 30.0436Z"
+            fill="url(#paint2_linear_1_19121)" />
+        <path
+            d="M30.0196 29.547C30.3228 29.9829 30.1969 30.5697 29.7383 30.8579L27.729 32.1207L26.0056 33.2036C25.9179 33.2599 25.0102 33.8291 25.0102 33.8291C24.326 34.2002 23.5335 34.4124 22.6893 34.4124C22.0813 34.4124 21.5002 34.3022 20.9669 34.102C19.2091 33.4421 17.9714 31.8011 18.001 29.8891C18.0392 27.4302 20.1945 25.4536 22.7815 25.5011C23.0578 25.5062 23.328 25.534 23.5908 25.5826C24.379 25.7284 25.0962 26.0617 25.6896 26.5319L23.8929 27.6609C23.5307 27.4887 23.1217 27.3919 22.6893 27.3919C21.7502 27.3919 20.9233 27.8478 20.4401 28.5397C20.1599 28.9401 19.9955 29.4197 19.9912 29.9352C19.9794 31.3365 21.1714 32.498 22.6456 32.5202C23.1274 32.5275 23.581 32.4145 23.9751 32.211L23.9768 32.2102C24.113 32.14 24.242 32.0586 24.3626 31.9676L24.923 31.6155L26.6608 30.5233L27.3762 30.0736L28.6401 29.2793C29.0987 28.9912 29.7162 29.1108 30.0194 29.5467L30.0196 29.547Z"
+            fill="url(#paint3_linear_1_19121)" />
+    </g>
     <defs>
-        <filter id="filter0_d_1670_11432" x="0" y="0" width="64" height="64"
+        <filter id="filter0_d_1_19121" x="0" y="0" width="64" height="64"
             filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
             <feFlood flood-opacity="0" result="BackgroundImageFix" />
             <feColorMatrix in="SourceAlpha" type="matrix"
@@ -20,25 +25,33 @@
             <feGaussianBlur stdDeviation="8" />
             <feComposite in2="hardAlpha" operator="out" />
             <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
-            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1670_11432" />
-            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1670_11432"
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1_19121" />
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1_19121"
                 result="shape" />
         </filter>
-        <linearGradient id="paint0_linear_1670_11432" x1="23" y1="42.5" x2="48" y2="25"
+        <linearGradient id="paint0_linear_1_19121" x1="23" y1="42.5" x2="48" y2="25"
             gradientUnits="userSpaceOnUse">
             <stop stop-color="white" stop-opacity="0" />
             <stop offset="1" stop-color="white" />
         </linearGradient>
-        <linearGradient id="paint1_linear_1670_11432" x1="10" y1="14" x2="42" y2="46"
+        <linearGradient id="paint1_linear_1_19121" x1="10" y1="14" x2="42" y2="46"
             gradientUnits="userSpaceOnUse">
             <stop stop-color="white" />
             <stop offset="1" stop-color="white" stop-opacity="0.79" />
         </linearGradient>
-        <linearGradient id="paint2_linear_1670_11432" x1="34" y1="36.5" x2="16.0747" y2="32.7819"
+        <linearGradient id="paint2_linear_1_19121" x1="34" y1="34.5001" x2="20.2441" y2="31.2692"
             gradientUnits="userSpaceOnUse">
             <stop stop-color="#FF8E4F" />
             <stop offset="1" stop-color="#EF592E" />
         </linearGradient>
+        <linearGradient id="paint3_linear_1_19121" x1="30.1848" y1="34.4124" x2="16.6648"
+            y2="31.2973" gradientUnits="userSpaceOnUse">
+            <stop stop-color="#FF8E4F" />
+            <stop offset="1" stop-color="#EF592E" />
+        </linearGradient>
+        <clipPath id="clip0_1_19121">
+            <rect width="16" height="9" fill="white" transform="translate(18 25.5)" />
+        </clipPath>
     </defs>
 </svg>
     

package/src/components/CIMBLoading.tsx

@@ -1,7 +1,7 @@
 //@ts-nocheck
 import React from 'react';
 import { Dimensions, Modal, StyleSheet, View } from 'react-native';
-import { LoadingCimb, LoadingTima } from '../assets/icons';
+import { Loading, LoadingCimb, LoadingTima } from '../assets/icons';
 import { commonStyles } from '../screens/CommonStyles';
 import { MText } from './MText';
 import Lottie from 'lottie-react-native';
@@ -16,7 +16,7 @@ export default function CIMBLoading({ isLoading }: IProps) {
       <View style={styles.modalBackground}>
         <View style={styles.activityIndicatorWrapper}>
           <LinearGradient
-            colors={['#FDFDFD', '#FDFDFD']}
+            colors={['rgba(255, 255, 255, 1)', 'rgba(255, 255, 255, 1)']}
             style={{
               width: Dimensions.get('window').width - 50,
               borderRadius: 6,
@@ -30,12 +30,12 @@ export default function CIMBLoading({ isLoading }: IProps) {
                 flexDirection: 'row',
                 marginBottom: 24,
                 justifyContent: 'space-between',
+                alignItems: 'center',
               }}
             >
-              <View>
-                <LoadingTima />
-              </View>
-              <Lottie source={require('./loading.json')} autoPlay loop />
+              <LoadingTima />
+              {/* <Lottie source={require('./loading.json')} autoPlay loop /> */}
+              <Loading />
               <LoadingCimb />
             </View>
             <MText

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

@@ -201,7 +201,7 @@ export const Info = observer(function Info({ loan }: IProps) {
                 }}
               >
                 <MText style={[commonStyles.textNormal, { color: '#828282' }]}>
-                  Nghĩa vụ phải trả Tima
+                  Nghĩa vụ phải trả Glink
                 </MText>
                 <MText style={[commonStyles.textNormal, { color: '#828282' }]}>
                   {formatMoney(data?.totalMoneyTima)} VNĐ

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

@@ -110,7 +110,7 @@ export const Payment = observer(function Payment({ data }: IProps) {
                     { color: '#828282', paddingLeft: 15 },
                   ]}
                 >
-                  Nghĩa vụ phải trả Tima
+                  Nghĩa vụ phải trả Glink
                 </MText>
               </View>
               <MText style={[commonStyles.textNormal, { color: '#828282' }]}>

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

@@ -83,7 +83,7 @@ export const PaymentAll = observer(function PaymentAll(props: any) {
               style={{ flexDirection: 'row', justifyContent: 'space-between' }}
             >
               <MText style={[commonStyles.textNormal, { color: '#333333' }]}>
-                Nghĩa vụ phải trả Tima
+                Nghĩa vụ phải trả Glink
               </MText>
               <MText
                 style={[commonStyles.textNormalBold, { color: '#F05123' }]}

package/src/screens/home/CIMBxTima.tsx

@@ -39,7 +39,7 @@ const logoView: ImageStyle = {
 export const CIMBxTima = observer(function CIMBxTima(props) {
   const navigation = useNavigation();
   const [loading, setLoading] = useState(false);
-  const loan = props.route.params.loan;
+  const loan = props.route.params?.loan;
 
   const onSubmit = (values: any) => {
     setLoading(true);
@@ -91,9 +91,23 @@ export const CIMBxTima = observer(function CIMBxTima(props) {
         >
           {({ values, setFieldValue, isValid, handleSubmit }) => (
             <ScrollView style={{ flex: 1, marginBottom: 16 }}>
+              <View
+                style={{
+                  padding: 16,
+                }}
+              >
+                <Image
+                  source={require('./glink.png')}
+                  resizeMode="cover"
+                  style={{
+                    height: 60,
+                    width: 280,
+                  }}
+                />
+              </View>
               <Image
                 source={require('./bg.png')}
-                resizeMode="contain"
+                resizeMode="cover"
                 style={{
                   width: Dimensions.get('window').width,
                   height: Dimensions.get('window').height / 2 - 120,

package/src/screens/home/index.tsx

@@ -812,7 +812,7 @@ export const Home = observer(function Home() {
                                         <MText
                                           style={commonStyles.textNormalBold}
                                         >
-                                          Đơn vay {item?.id}
+                                          Mã Đơn vay-{item?.id}
                                         </MText>
                                         <MText style={commonStyles.textNormal}>
                                           Số tiền vay (VND):{' '}
@@ -1694,7 +1694,7 @@ export const Home = observer(function Home() {
                                   <Contract />
                                   <View style={{ flex: 1, paddingLeft: 8 }}>
                                     <MText style={commonStyles.textNormalBold}>
-                                      Đơn vay {item?.id}
+                                      Mã Đơn vay-{item?.id}
                                     </MText>
                                     <MText style={commonStyles.textNormal}>
                                       Số tiền vay (VND):{' '}
@@ -1988,7 +1988,7 @@ export const Home = observer(function Home() {
                           <ContractActive />
                           <View style={{ flex: 1, paddingLeft: 8 }}>
                             <MText style={commonStyles.textNormalBold}>
-                              Đơn vay-{loan?.id}
+                              Mã Đơn vay-{loan?.id}
                             </MText>
                             <MText style={commonStyles.textNormal}>
                               Số tiền vay (VND): {formatMoney(loan?.loanAmount)}
@@ -2185,10 +2185,11 @@ export const Home = observer(function Home() {
                     ? require('./accept.png')
                     : require('./reject.png')
                 }
-                resizeMode="stretch"
+                resizeMode="cover"
                 style={{
                   width: '100%',
                   height: (Dimensions.get('window').height / 2) * 0.8,
+                  borderRadius: 8,
                 }}
               />
               {loanCimb?.isCimbApproveFull === true ? (

package/src/screens/introduction/index.tsx

@@ -2,7 +2,13 @@
 import { StackActions, useNavigation } from '@react-navigation/native';
 import { observer } from 'mobx-react-lite';
 import React, { useEffect } from 'react';
-import { SafeAreaView, ScrollView, TouchableOpacity, View } from 'react-native';
+import {
+  Image,
+  SafeAreaView,
+  ScrollView,
+  TouchableOpacity,
+  View,
+} from 'react-native';
 import {
   CIMBBank,
   IconBack,
@@ -99,13 +105,26 @@ export const Introduction = observer(function Introduction(props: any) {
               alignItems: 'center',
             }}
           >
-            <TimaSmall />
+            {/* <TimaSmall /> */}
+            <Image
+              source={require('./glink_logo.png')}
+              style={{
+                width: 16,
+                height: 16,
+              }}
+            />
             <MText style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}>
               {item?.h1}
             </MText>
           </View>
           <View style={{ flexDirection: 'row', marginTop: 8 }}>
-            <TimaSmall style={{ marginTop: 5 }} />
+            <Image
+              source={require('./glink_logo.png')}
+              style={{
+                width: 16,
+                height: 16,
+              }}
+            />
             <MText style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}>
               {item?.h2}
             </MText>
@@ -113,7 +132,13 @@ export const Introduction = observer(function Introduction(props: any) {
           <View
             style={{ flexDirection: 'row', marginTop: 8, alignItems: 'center' }}
           >
-            <TimaSmall />
+            <Image
+              source={require('./glink_logo.png')}
+              style={{
+                width: 16,
+                height: 16,
+              }}
+            />
             <MText style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}>
               {item?.h3}
             </MText>
@@ -184,7 +209,7 @@ export const Introduction = observer(function Introduction(props: any) {
             borderColor: '#EF4123',
             borderRadius: 30,
             marginHorizontal: 16,
-            marginTop: 8,
+            marginTop: 16,
           }}
         >
           <LinearGradient

package/src/screens/loginWithPassword/index.tsx

@@ -112,7 +112,7 @@ export const LoginWithPassword = observer(function LoginWithPassword(
             setFieldValue,
             isValid,
           }) => (
-            <View style={{ flex: 1 }}>
+            <View style={{ flex: 1, marginTop: 16 }}>
               <TextInput
                 secureTextEntry
                 style={{

package/src/screens/nationalID/index.tsx

@@ -123,7 +123,13 @@ export const NationalID = observer(function NationalID(props: any) {
                   marginTop: 16,
                 }}
               >
-                <TimaSmallWhite />
+                <Image
+                  source={require('../../assets/img/glink_logo_White.png')}
+                  style={{
+                    width: 24,
+                    height: 24,
+                  }}
+                />
                 <MText
                   style={[
                     commonStyles.textNormalBold,
@@ -159,7 +165,13 @@ export const NationalID = observer(function NationalID(props: any) {
                     alignItems: 'center',
                   }}
                 >
-                  <TimaSmall />
+                  <Image
+                    source={require('./glink_logo.png')}
+                    style={{
+                      width: 16,
+                      height: 16,
+                    }}
+                  />
                   <MText
                     style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
                   >
@@ -167,7 +179,13 @@ export const NationalID = observer(function NationalID(props: any) {
                   </MText>
                 </View>
                 <View style={{ flexDirection: 'row', marginTop: 8 }}>
-                  <TimaSmall style={{ marginTop: 5 }} />
+                  <Image
+                    source={require('./glink_logo.png')}
+                    style={{
+                      width: 16,
+                      height: 16,
+                    }}
+                  />
                   <MText
                     style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
                   >
@@ -182,7 +200,13 @@ export const NationalID = observer(function NationalID(props: any) {
                     alignItems: 'center',
                   }}
                 >
-                  <TimaSmall />
+                  <Image
+                    source={require('./glink_logo.png')}
+                    style={{
+                      width: 16,
+                      height: 16,
+                    }}
+                  />
                   <MText
                     style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
                   >

package/src/screens/nationalIDBack/index.tsx

@@ -102,7 +102,13 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
                   marginTop: 16,
                 }}
               >
-                <TimaSmallWhite />
+                <Image
+                  source={require('../../assets/img/glink_logo_White.png')}
+                  style={{
+                    width: 24,
+                    height: 24,
+                  }}
+                />
                 <MText
                   style={[
                     commonStyles.textNormalBold,
@@ -139,7 +145,13 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
                     alignItems: 'center',
                   }}
                 >
-                  <TimaSmall />
+                  <Image
+                    source={require('../nationalID/glink_logo.png')}
+                    style={{
+                      width: 16,
+                      height: 16,
+                    }}
+                  />
                   <MText
                     style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
                   >
@@ -147,7 +159,13 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
                   </MText>
                 </View>
                 <View style={{ flexDirection: 'row', marginTop: 8 }}>
-                  <TimaSmall style={{ marginTop: 5 }} />
+                  <Image
+                    source={require('../nationalID/glink_logo.png')}
+                    style={{
+                      width: 16,
+                      height: 16,
+                    }}
+                  />
                   <MText
                     style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
                   >
@@ -162,7 +180,13 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
                     alignItems: 'center',
                   }}
                 >
-                  <TimaSmall />
+                  <Image
+                    source={require('../nationalID/glink_logo.png')}
+                    style={{
+                      width: 16,
+                      height: 16,
+                    }}
+                  />
                   <MText
                     style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
                   >

package/src/screens/register/index.tsx

@@ -179,7 +179,13 @@ export const Register = observer(function Register() {
       <SafeAreaView style={{ flex: 1 }}>
         <ScrollView style={{ flex: 1 }}>
           <View style={{ alignItems: 'center', marginTop: 40 }}>
-            <LogoWhite />
+            <Image
+              source={require('../../assets/img/glink_logo_Primary.png')}
+              style={{
+                width: 140,
+                height: 140,
+              }}
+            />
           </View>
           <View style={{ marginTop: 50 }}>
             <Formik
@@ -327,7 +333,7 @@ export const Register = observer(function Register() {
                               fontWeight: '400',
                             }}
                           >
-                            của Tima
+                            của Glink
                           </MText>
                         </MButton>
                       </View>

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

@@ -127,7 +127,7 @@ export const SchedulePayment = observer(function SchedulePayment(props: any) {
                 >
                   <View style={{ flex: 1, paddingRight: 15 }}>
                     <MText style={commonStyles.textNormal}>
-                      Nghĩa vụ phải trả Tima
+                      Nghĩa vụ phải trả Glink
                     </MText>
                   </View>
                   <MText style={commonStyles.textNormal}>