react-native-timacare 3.3.24 → 3.3.25

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

@@ -103,6 +103,13 @@ const ShowQrCodeContent = observer(function ShowQrCodeContent(props: any) {
         if (response.kind === 'ok') {
           if (response.data.meta.errorCode === 200) {
             setLinkImage(response.data?.data?.fullPath);
+            if (props?.route?.params?.isFullPayment) {
+              setTimeout(() => {
+                setShowGuide(true);
+              }, 300);
+            } else {
+              setShouldStartGuide(true);
+            }
           } else {
             Alert.alert('Thông báo', response?.data?.meta?.errorMessage);
           }
@@ -115,10 +122,7 @@ const ShowQrCodeContent = observer(function ShowQrCodeContent(props: any) {
         setIsLoading(false);
       })
       .finally(() => {
-        setShouldStartGuide(true);
-        if (props?.route?.params?.isFullPayment) {
-          setShowGuide(true);
-        }
+        setIsLoading(false);
       });
   };
 
@@ -192,7 +196,7 @@ const ShowQrCodeContent = observer(function ShowQrCodeContent(props: any) {
 
   useEffect(() => {
     if (!props?.route?.params?.isFullPayment && shouldStartGuide && canStart) {
-      startGuide()
+      startGuide();
     }
 
     return () => {

package/src/sdkConfig.ts

@@ -21,3 +21,4 @@ export const getSDKConfig = (): SDKConfig => {
     }
     return config;
 };
+

package/src/services/api/api.ts

@@ -31,8 +31,17 @@ export class Api {
   }
 
   public static getInstance(): Api {
+    const sdkConfig = getSDKConfig()
+
     if (!Api.instance) {
-      Api.instance = new Api()
+      Api.instance = new Api(sdkConfig)
+    } else if (
+      Api.instance.config.baseUrl !== sdkConfig.baseUrl ||
+      Api.instance.config.token !== sdkConfig.token ||
+      Api.instance.config.timeout !== sdkConfig.timeout
+    ) {
+      Api.instance.config = sdkConfig
+      Api.instance.setup()
     }
 
     return Api.instance