react-native-timacare 3.1.42 → 3.1.44

package/src/screens/splash/index.tsx

@@ -18,6 +18,7 @@ import { color } from '../../theme';
 import { MText } from '../../components/MText';
 import { load } from '../../utils/storage';
 import { Api } from '../../services/api';
+import MHeader from '../../components/MHeader';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -31,81 +32,41 @@ export const Splash = observer(function Splash() {
   const [downloading, setDownloading] = useState(false);
 
   const goLogin = async () => {
-    // const token = await load('TOKEN_TIMACARE');
-    // if (token) {
-    //   Api.getInstance().changeAuth(token);
-    //   setTimeout(() => {
-    //     navigation.dispatch(
-    //       CommonActions.reset({
-    //         index: 1,
-    //         routes: [{ name: ScreenNames.Main }],
-    //       })
-    //     );
-    //   }, 300);
-    // } else {
-    //   navigation.push(ScreenNames.Register);
-    // }
-    navigation.push(ScreenNames.Register);
+    setDownloading(true);
+    const token = await load('TOKEN_TIMACARE');
+    if (token) {
+      Api.getInstance().changeAuth(token);
+      setTimeout(() => {
+        setDownloading(false);
+        navigation.dispatch(
+          CommonActions.reset({
+            index: 1,
+            routes: [{ name: ScreenNames.Main }],
+          })
+        );
+      }, 300);
+    } else {
+      navigation.push(ScreenNames.Register);
+    }
   };
 
   useEffect(() => {
-    setTimeout(() => {
-      goLogin();
-    }, 3000);
+    goLogin();
   }, []);
 
   return (
     <View style={[commonStyles.fill, { backgroundColor: 'white' }]}>
-      <Image source={require('./Onboarding.png')} style={logoView} />
-      <View style={[commonStyles.fill]}>
-        <SafeAreaView>
-          <View style={{ marginTop: 30 }}>
-            <LogoTima />
-          </View>
-          {downloading ? (
-            <View
-              style={{
-                alignItems: 'center',
-                marginTop: Dimensions.get('screen').height / 4,
-              }}
-            >
-              <ActivityIndicator size={'large'} color={color.primary} />
-              <MText
-                style={{
-                  marginTop: 8,
-                  color: color.primary,
-                  fontSize: 16,
-                  fontWeight: 'bold',
-                  textAlign: 'center',
-                }}
-              >
-                Đang cập nhật{'\n'}
-                Vui lòng không tắt ứng dụng
-              </MText>
-            </View>
-          ) : (
-            <View />
-          )}
-        </SafeAreaView>
-        <Animatable.View
-          animation={'fadeInUp'}
-          duration={1500}
-          style={{ flex: 1 }}
-        >
-          <View
-            style={{
-              position: 'absolute',
-              bottom: 0,
-              left: 0,
-              right: 0,
-            }}
-          >
-            <Animatable.View animation={'fadeInUp'} duration={2000}>
-              <Image source={require('./Star.png')} style={{ width: '100%' }} />
-            </Animatable.View>
-            <Image source={require('./Bottom.png')} style={{ width: '100%' }} />
-          </View>
-        </Animatable.View>
+      <MHeader title="Vay nhanh 24/7" />
+      <View
+        style={[
+          commonStyles.fill,
+          {
+            alignItems: 'center',
+            justifyContent: 'center',
+          },
+        ]}
+      >
+        {downloading && <ActivityIndicator color={color.primary} />}
       </View>
     </View>
   );

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

@@ -801,6 +801,7 @@ export const OCR = observer(function OCR(props: any) {
                   </LinearGradient>
                 </MButton> */}
               </View>
+              <View style={{ height: 24 }}></View>
             </View>
           </View>
         </LinearGradient>