react-native-timacare 3.1.8-beta → 3.1.10-beta

package/src/screens/toan-trinh-so/ReviewLoan.tsx

@@ -282,8 +282,8 @@ export default function ReviewLoan(props: any) {
         Number(textParam.replace(/\D/g, '')),
         formRef.current.values.loanTime?.id,
         formRef.current.values?.rateTypeId?.id,
-        formRef.current.values.timeInsurenceCustomer?.id,
-        formRef.current.values.timeInsuranceProperty?.id
+        formRef.current.values.timeInsurenceCustomer?.id ?? 0,
+        formRef.current.values.timeInsuranceProperty?.id ?? 0
       );
     }, 500),
     []
@@ -469,8 +469,8 @@ export default function ReviewLoan(props: any) {
                           values.loanAmount,
                           value?.id,
                           values?.rateTypeId,
-                          values.timeInsurenceCustomer?.id,
-                          values.timeInsuranceProperty?.id
+                          values.timeInsurenceCustomer?.id ?? 0,
+                          values.timeInsuranceProperty?.id ?? 0
                         );
                       },
                     });
@@ -574,7 +574,7 @@ export default function ReviewLoan(props: any) {
                               values.loanTime,
                               values?.rateTypeId,
                               value?.id,
-                              values.timeInsuranceProperty?.id
+                              values.timeInsuranceProperty?.id ?? 0
                             );
                           },
                         });
@@ -666,7 +666,7 @@ export default function ReviewLoan(props: any) {
                               values.loanAmount,
                               values.loanTime,
                               values?.rateTypeId,
-                              values?.timeInsurenceCustomer?.id,
+                              values?.timeInsurenceCustomer?.id ?? 0,
                               value?.id
                             );
                           },

package/src/screens/toan-trinh-so/VehicleCamera.tsx

@@ -209,6 +209,7 @@ export default function VehicleCamera(props: any) {
               position: 'absolute',
               width: Dimensions.get('window').width,
               height: Dimensions.get('window').height,
+              zIndex: 1000,
             },
           ]}
         >
@@ -241,6 +242,7 @@ export default function VehicleCamera(props: any) {
               alignItems: 'center',
               gap: 8,
               marginTop: 16,
+              zIndex: 1000,
             }}
           >
             <IconUpload />
@@ -253,89 +255,88 @@ export default function VehicleCamera(props: any) {
               Tải ảnh từ thư viện
             </MText>
           </TouchableOpacity>
-        </View>
-      )}
-
-      <SafeAreaView
-        style={[
-          commonStyles.fill,
-          { position: 'absolute', width: '100%', height: '100%' },
-        ]}
-      >
-        <View
-          style={[
-            commonStyles.row,
-            commonStyles.alignCenter,
-            { paddingVertical: 16 },
-          ]}
-        >
-          <MButton
-            onPress={() => {
-              navigation.goBack();
+          <View
+            style={{
+              position: 'absolute',
+              bottom: 20,
+              left: 0,
+              right: 0,
             }}
+          >
+            {!taking && (
+              <>
+                <MText
+                  style={{
+                    color: 'white',
+                    textAlign: 'center',
+                    fontSize: 14,
+                  }}
+                >
+                  Vui lòng đặt giấy tờ nằm vừa khung hình chữ nhật,{'\n'}chụp đủ
+                  ánh sáng và rõ nét.
+                </MText>
+                <View
+                  style={{
+                    alignItems: 'center',
+                    marginVertical: 24,
+                  }}
+                >
+                  <MButton
+                    onPress={() => {
+                      takePhoto();
+                    }}
+                  >
+                    <TakePhotoSvg />
+                  </MButton>
+                </View>
+              </>
+            )}
+          </View>
+          <SafeAreaView
             style={[
-              {
-                width: 48,
-                height: 48,
-                zIndex: 1000,
-                position: 'absolute',
-                left: 16,
-                top: 16,
-              },
+              commonStyles.fill,
+              { position: 'absolute', width: '100%', height: '100%' },
             ]}
           >
-            <IconBackWhite />
-          </MButton>
-          <View style={{ flex: 1, alignItems: 'center' }}>
-            <MText style={$title}>ĐĂNG KÝ XE</MText>
-          </View>
-        </View>
-        <MText
-          style={{
-            color: 'white',
-            textAlign: 'center',
-          }}
-        >
-          {title}
-        </MText>
-        <View
-          style={{
-            position: 'absolute',
-            bottom: 20,
-            left: 0,
-            right: 0,
-          }}
-        >
-          {!taking && (
-            <>
-              <MText
-                style={{
-                  color: 'white',
-                  textAlign: 'center',
-                  fontSize: 14,
-                }}
-              >
-                Vui lòng đặt giấy tờ nằm vừa khung hình chữ nhật,{'\n'}chụp đủ
-                ánh sáng và rõ nét.
-              </MText>
-              <View
-                style={{
-                  alignItems: 'center',
-                  marginVertical: 24,
+            <View
+              style={[
+                commonStyles.row,
+                commonStyles.alignCenter,
+                { paddingVertical: 16 },
+              ]}
+            >
+              <MButton
+                onPress={() => {
+                  navigation.goBack();
                 }}
+                style={[
+                  {
+                    width: 48,
+                    height: 48,
+                    zIndex: 1000,
+                    position: 'absolute',
+                    left: 16,
+                    top: 16,
+                  },
+                ]}
               >
-                <MButton
-                  onPress={() => {
-                    takePhoto();
-                  }}
-                >
-                  <TakePhotoSvg />
-                </MButton>
+                <IconBackWhite />
+              </MButton>
+              <View style={{ flex: 1, alignItems: 'center' }}>
+                <MText style={$title}>ĐĂNG KÝ XE</MText>
               </View>
-            </>
-          )}
+            </View>
+            <MText
+              style={{
+                color: 'white',
+                textAlign: 'center',
+              }}
+            >
+              {title}
+            </MText>
+          </SafeAreaView>
         </View>
-      </SafeAreaView>
+      )}
       <Modal
         isVisible={showModal}
         style={$modal}