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

package/src/assets/icons/logotima.svg

@@ -1,14 +1,22 @@
 <svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect width="36" height="36" rx="8" fill="url(#paint0_linear_1259_18266)" />
-    <path
-        d="M7 10L9.75012 15.6249L14.3601 15.6286C15.3175 15.6286 15.7898 15.979 15.7852 16.5659C15.7824 16.9398 13.9114 18.6648 13.2359 19.5883C12.0604 21.1962 12.6016 21.537 13.6 23.4999C14.6494 25.5627 15.8 28 15.8 28C15.8 28 19.1736 23.8445 21.3249 21.2296C22.8687 19.3539 23.0666 18.9999 24.6206 18.9999H29L26.8565 14.9696C26.8565 14.9696 26.5104 14.2527 25.9951 13.8807C25.2365 13.3335 24.6278 13.3756 24.6278 13.3756H22.0925C21.4424 13.3756 21.5261 13.2801 19.4416 10.8535C18.9947 10.3334 18.6302 10 18.0065 10L7 10Z"
-        fill="#FDFDFD" />
+    <rect width="36" height="36" rx="8" fill="url(#paint0_linear_125_13255)" />
+    <g clip-path="url(#clip0_125_13255)">
+        <path
+            d="M31 18.0679C31 18.4171 30.8957 19.2192 30.8841 19.2804C30.2537 22.5305 27.1341 25.0003 23.3806 25.0003C22.792 25.0003 22.2184 24.9397 21.668 24.8244C20.4219 24.5641 19.2927 24.0259 18.3632 23.2842L21.2436 21.5514C21.8755 21.8736 22.6047 22.0569 23.3806 22.0569C25.802 22.0569 27.7651 20.2709 27.7651 18.0679C27.7651 17.9245 27.757 17.7829 27.7402 17.6434C27.5077 15.6398 25.6443 14.079 23.3806 14.079C22.5691 14.079 21.8094 14.2794 21.1576 14.6291L13.3251 19.3406C12.58 19.7888 11.5765 19.6027 11.0841 18.9247C10.5914 18.2467 10.796 17.3338 11.5412 16.8855L15.1822 14.6952L17.9841 13.0097C18.0786 12.9533 18.6365 12.6334 18.9437 12.4324L18.9452 12.4314L19.4301 12.1397L19.4312 12.1392C20.5828 11.5026 21.9346 11.1361 23.3806 11.1361C24.3641 11.1361 25.3043 11.3057 26.1681 11.6147C28.9975 12.6265 31.0003 15.1343 31.0003 18.0677L31 18.0679Z"
+            fill="white" />
+        <path
+            d="M24.5313 17.2952C25.024 17.9732 24.8194 18.8861 24.0742 19.3344L20.8091 21.2987L18.0087 22.9832C17.8661 23.0707 16.3911 23.9562 16.3911 23.9562C15.2792 24.5335 13.9915 24.8636 12.6197 24.8636C11.6316 24.8636 10.6873 24.6922 9.82065 24.3808C6.96425 23.3542 4.95304 20.8016 5.00115 17.8274C5.06318 14.0024 8.56563 10.9277 12.7695 11.0015C13.2185 11.0095 13.6576 11.0527 14.0845 11.1284C15.3653 11.3552 16.5308 11.8736 17.4951 12.6051L14.5755 14.3613C13.9868 14.0934 13.3222 13.9428 12.6197 13.9428C11.0936 13.9428 9.74992 14.6519 8.96474 15.7283C8.5094 16.3512 8.24217 17.0972 8.23521 17.8991C8.21608 20.0788 10.1531 21.8857 12.5486 21.9202C13.3315 21.9316 14.0686 21.7557 14.7091 21.4392L14.7117 21.4379C14.9332 21.3288 15.1427 21.2022 15.3387 21.0606L16.2493 20.5129L19.0733 18.8139L20.2358 18.1143L22.2897 16.8789C23.0348 16.4306 24.0383 16.6167 24.531 17.2947L24.5313 17.2952Z"
+            fill="white" />
+    </g>
     <defs>
-        <linearGradient id="paint0_linear_1259_18266" x1="28.3846" y1="32.1923" x2="2.21823"
-            y2="9.67803" gradientUnits="userSpaceOnUse">
-            <stop stop-color="#FF7A00" />
-            <stop offset="1" stop-color="#EF4123" />
+        <linearGradient id="paint0_linear_125_13255" x1="36" y1="36" x2="-4.90531" y2="29.1062"
+            gradientUnits="userSpaceOnUse">
+            <stop stop-color="#FF8E4F" />
+            <stop offset="1" stop-color="#EF592E" />
         </linearGradient>
+        <clipPath id="clip0_125_13255">
+            <rect width="26" height="14" fill="white" transform="translate(5 11)" />
+        </clipPath>
     </defs>
 </svg>
     

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

package/src/screens/terms/TermScreen.tsx

@@ -103,7 +103,7 @@ export const TermScreen = observer(function TermScreen(props) {
                     fontWeight: '400',
                   }}
                 >
-                  của Tima
+                  của Glink
                 </MText>
               </MButton>
             </View>