react-native-timacare 0.0.19 → 0.0.21

package/src/screens/nationalID/index.tsx

@@ -19,7 +19,7 @@ import {
   StackActions,
   useNavigation,
 } from '@react-navigation/native';
-import { observer } from 'mobx-react-lite';
+import { observer, Observer } from 'mobx-react-lite';
 import { commonStyles } from '../CommonStyles';
 import KeyboardSpacer from '../../components/keyboardspace';
 import MButton from '../../components/MButton';
@@ -239,29 +239,41 @@ export const NationalID = observer(function NationalID(props: any) {
             </MText>
           </MButton>
 
-          <MButton
-            //@ts-ignore
-            disabled={!photo || nationalIDStore.isLoading || appStore.isLoading}
-            onPress={nextStep}
-            style={{ flex: 1 }}
-          >
-            <LinearGradient
-              colors={['#FF7A00', '#EF4123']}
-              style={[
-                commonStyles.alignCenter,
-                commonStyles.justifyCenter,
-                {
-                  height: 40,
-                  borderRadius: 30,
-                  marginLeft: 8,
-                },
-              ]}
-            >
-              <MText style={[commonStyles.textNormal, { color: 'white' }]}>
-                Tiếp tục
-              </MText>
-            </LinearGradient>
-          </MButton>
+          <Observer>
+            {() => (
+              <MButton
+                //@ts-ignore
+                disabled={
+                  !photo || nationalIDStore.isLoading || appStore.isLoading
+                }
+                onPress={nextStep}
+                style={{ flex: 1 }}
+              >
+                <LinearGradient
+                  colors={['#FF7A00', '#EF4123']}
+                  style={[
+                    commonStyles.alignCenter,
+                    commonStyles.justifyCenter,
+                    {
+                      height: 40,
+                      borderRadius: 30,
+                      marginLeft: 8,
+                    },
+                  ]}
+                >
+                  {nationalIDStore.isLoading ? (
+                    <ActivityIndicator color={'white'} size="small" />
+                  ) : (
+                    <MText
+                      style={[commonStyles.textNormal, { color: 'white' }]}
+                    >
+                      Tiếp tục
+                    </MText>
+                  )}
+                </LinearGradient>
+              </MButton>
+            )}
+          </Observer>
         </View>
         {loan?.isPipelineCIMB && (
           <View

package/src/screens/nationalIDBack/index.tsx

@@ -1,6 +1,7 @@
 //@ts-nocheck
 import React, { useState } from 'react';
 import {
+  ActivityIndicator,
   Alert,
   Dimensions,
   Image,
@@ -11,7 +12,7 @@ import {
   View,
 } from 'react-native';
 import { StackActions, useNavigation } from '@react-navigation/native';
-import { observer } from 'mobx-react-lite';
+import { observer, Observer } from 'mobx-react-lite';
 import { commonStyles } from '../CommonStyles';
 import KeyboardSpacer from '../../components/keyboardspace';
 import MButton from '../../components/MButton';
@@ -237,29 +238,41 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
             </MText>
           </MButton>
 
-          <MButton
-            //@ts-ignore
-            disabled={!photo || nationalIDStore.isLoading || appStore.isLoading}
-            onPress={nextStep}
-            style={{ flex: 1 }}
-          >
-            <LinearGradient
-              colors={['#FF7A00', '#EF4123']}
-              style={[
-                commonStyles.alignCenter,
-                commonStyles.justifyCenter,
-                {
-                  height: 40,
-                  borderRadius: 30,
-                  marginLeft: 8,
-                },
-              ]}
-            >
-              <MText style={[commonStyles.textNormal, { color: 'white' }]}>
-                Tiếp tục
-              </MText>
-            </LinearGradient>
-          </MButton>
+          <Observer>
+            {() => (
+              <MButton
+                //@ts-ignore
+                disabled={
+                  !photo || nationalIDStore.isLoading || appStore.isLoading
+                }
+                onPress={nextStep}
+                style={{ flex: 1 }}
+              >
+                <LinearGradient
+                  colors={['#FF7A00', '#EF4123']}
+                  style={[
+                    commonStyles.alignCenter,
+                    commonStyles.justifyCenter,
+                    {
+                      height: 40,
+                      borderRadius: 30,
+                      marginLeft: 8,
+                    },
+                  ]}
+                >
+                  {nationalIDStore.isLoading ? (
+                    <ActivityIndicator color={'white'} size="small" />
+                  ) : (
+                    <MText
+                      style={[commonStyles.textNormal, { color: 'white' }]}
+                    >
+                      Tiếp tục
+                    </MText>
+                  )}
+                </LinearGradient>
+              </MButton>
+            )}
+          </Observer>
         </View>
         {loan?.isPipelineCIMB && (
           <View

package/src/screens/quick-submit/index.tsx

@@ -5,9 +5,10 @@ import {
   useNavigation,
 } from '@react-navigation/native';
 import { Formik } from 'formik';
-import { observer } from 'mobx-react-lite';
+import { observer, Observer } from 'mobx-react-lite';
 import React, { useEffect, useRef, useState } from 'react';
 import {
+  ActivityIndicator,
   SafeAreaView,
   ScrollView,
   StyleSheet,
@@ -40,8 +41,6 @@ export const QuickSubmit = observer(function QuickSubmit(props: any) {
   const [showDatePicker, setShowDatePicker] = useState(false);
   const [typePicker, setTypePicker] = useState(0);
 
-  console.log(props.route);
-
   useEffect(() => {
     QuickSubmitStore.getBrandProduct();
     QuickSubmitStore.getProvinces();
@@ -975,35 +974,43 @@ export const QuickSubmit = observer(function QuickSubmit(props: any) {
                   </View>
                 </View> */}
                 <View style={{ marginTop: 40 }}>
-                  <TouchableOpacity
-                    disabled={!isValid || QuickSubmitStore.loadingButton}
-                    onPress={() => {
-                      handleSubmit();
-                    }}
-                  >
-                    <LinearGradient
-                      colors={
-                        isValid
-                          ? ['#FF7A00', '#EF4123']
-                          : ['#BDBDBD', '#BDBDBD']
-                      }
-                      style={{
-                        alignItems: 'center',
-                        borderRadius: 30,
-                        height: 40,
-                        justifyContent: 'center',
-                      }}
-                    >
-                      <MText
-                        style={[
-                          commonStyles.textNormalBold,
-                          { color: '#FFFFFF' },
-                        ]}
+                  <Observer>
+                    {() => (
+                      <TouchableOpacity
+                        disabled={!isValid || QuickSubmitStore.loadingButton}
+                        onPress={() => {
+                          handleSubmit();
+                        }}
                       >
-                        Tiếp tục
-                      </MText>
-                    </LinearGradient>
-                  </TouchableOpacity>
+                        <LinearGradient
+                          colors={
+                            isValid
+                              ? ['#FF7A00', '#EF4123']
+                              : ['#BDBDBD', '#BDBDBD']
+                          }
+                          style={{
+                            alignItems: 'center',
+                            borderRadius: 30,
+                            height: 40,
+                            justifyContent: 'center',
+                          }}
+                        >
+                          {QuickSubmitStore.loadingButton ? (
+                            <ActivityIndicator color={'white'} size="small" />
+                          ) : (
+                            <MText
+                              style={[
+                                commonStyles.textNormalBold,
+                                { color: '#FFFFFF' },
+                              ]}
+                            >
+                              Tiếp tục
+                            </MText>
+                          )}
+                        </LinearGradient>
+                      </TouchableOpacity>
+                    )}
+                  </Observer>
                 </View>
                 <View
                   style={{

package/src/screens/selfie/index.tsx

@@ -14,7 +14,7 @@ import {
   ViewStyle,
 } from 'react-native';
 import { CommonActions, useNavigation } from '@react-navigation/native';
-import { observer } from 'mobx-react-lite';
+import { observer, Observer } from 'mobx-react-lite';
 import { commonStyles } from '../CommonStyles';
 import KeyboardSpacer from '../../components/keyboardspace';
 import MButton from '../../components/MButton';
@@ -185,30 +185,39 @@ export const Selfie = observer(function Selfie(props: any) {
               Chụp ảnh
             </MText>
           </MButton>
-
-          <MButton
-            //@ts-ignore
-            disabled={!photo || selfieStore.isLoading || appStore.isLoading}
-            onPress={nextStep}
-            style={{ flex: 1 }}
-          >
-            <LinearGradient
-              colors={['#FF7A00', '#EF4123']}
-              style={[
-                commonStyles.alignCenter,
-                commonStyles.justifyCenter,
-                {
-                  height: 40,
-                  borderRadius: 30,
-                  marginLeft: 8,
-                },
-              ]}
-            >
-              <MText style={[commonStyles.textNormal, { color: 'white' }]}>
-                Tiếp tục
-              </MText>
-            </LinearGradient>
-          </MButton>
+          <Observer>
+            {() => (
+              <MButton
+                //@ts-ignore
+                disabled={!photo || selfieStore.isLoading || appStore.isLoading}
+                onPress={nextStep}
+                style={{ flex: 1 }}
+              >
+                <LinearGradient
+                  colors={['#FF7A00', '#EF4123']}
+                  style={[
+                    commonStyles.alignCenter,
+                    commonStyles.justifyCenter,
+                    {
+                      height: 40,
+                      borderRadius: 30,
+                      marginLeft: 8,
+                    },
+                  ]}
+                >
+                  {selfieStore.isLoading ? (
+                    <ActivityIndicator color={'white'} size="small" />
+                  ) : (
+                    <MText
+                      style={[commonStyles.textNormal, { color: 'white' }]}
+                    >
+                      Tiếp tục
+                    </MText>
+                  )}
+                </LinearGradient>
+              </MButton>
+            )}
+          </Observer>
         </View>
         {loan?.isPipelineCIMB && (
           <View

package/src/screens/uploadVideo/index.tsx

@@ -1,5 +1,5 @@
 //@ts-nocheck
-import { observer } from 'mobx-react-lite';
+import { observer, Observer } from 'mobx-react-lite';
 import React, { useEffect, useRef, useState } from 'react';
 import {
   Alert,
@@ -22,6 +22,7 @@ import {
   request,
   RESULTS,
 } from 'react-native-permissions';
+import Loading from '../../components/Loading';
 
 export const Video = observer(function Video(props: any) {
   const navigation = useNavigation();
@@ -362,6 +363,7 @@ export const Video = observer(function Video(props: any) {
                 alignItems: 'center',
                 marginBottom: 20,
               }}
+              disabled={videoStore.isLoading}
               onPress={() => {
                 startVideo();
               }}
@@ -371,6 +373,7 @@ export const Video = observer(function Video(props: any) {
           )}
         </View>
       </View>
+      <Observer>{() => <Loading isLoading={videoStore.isLoading} />}</Observer>
     </SafeAreaView>
   );
 });

package/src/screens/uploadVideo/videoStore.tsx

@@ -11,6 +11,7 @@ class Store {
     try {
       this.isLoading = true;
       const response = await Api.getInstance().uploadVideo(loanID, body);
+      console.log(response);
       this.isLoading = false;
       if (response.kind === 'ok') {
         if (response.data.meta.errorCode === 200) {