From c5a31cf376ca7dc83d524d9da89ca7fe9c42b6df Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 20 May 2022 09:46:34 -0700
Subject: [PATCH] 1.3.6-7 Production Build - Resolve errors on local upload and
 deleting.

---
 app.json                                      |  6 ++--
 .../local-upload-progress.component.jsx       | 35 +++++++++----------
 util/local-document-upload.utility.js         | 14 ++++----
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/app.json b/app.json
index 32d32fb..3c20d15 100644
--- a/app.json
+++ b/app.json
@@ -4,19 +4,19 @@
     "slug": "imexmobile",
     "version": "1.3.6",
     "extra": {
-      "expover": "6"
+      "expover": "7"
     },
     "orientation": "default",
     "icon": "./assets/logo192noa.png",
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "com.imex.imexmobile",
-      "buildNumber": "6",
+      "buildNumber": "7",
       "googleServicesFile": "./GoogleService-Info.plist"
     },
     "android": {
       "package": "com.imex.imexmobile",
-      "versionCode": 1100011,
+      "versionCode": 1100012,
       "googleServicesFile": "./google-services.json"
     },
     "splash": {
diff --git a/components/local-upload-progress/local-upload-progress.component.jsx b/components/local-upload-progress/local-upload-progress.component.jsx
index 5026597..5e19a67 100644
--- a/components/local-upload-progress/local-upload-progress.component.jsx
+++ b/components/local-upload-progress/local-upload-progress.component.jsx
@@ -59,7 +59,7 @@ export function UploadProgress({
     }
   }, [uploads]);
 
-  function handleOnSuccess({ duration }) {
+  async function handleOnSuccess({ duration, data }) {
     //If it's not in production, show a toast with the time.
     Toast.show({
       type: "success",
@@ -67,8 +67,16 @@ export function UploadProgress({
       //
       //   text2: duration,
     });
+    if (deleteAfterUpload) {
+      try {
+        await MediaLibrary.deleteAssetsAsync(data);
+      } catch (error) {
+        console.log("Unable to delete picture.", error);
+      }
+    }
 
     logImEXEvent("imexmobile_successful_upload");
+    forceRerender();
     setProgress({ ...progress, speed: 0, percent: 1, uploadInProgress: false });
   }
 
@@ -86,9 +94,14 @@ export function UploadProgress({
     Toast.show({
       type: "error",
       text1: "Unable to upload documents.",
-      text2: (error && error.message) || JSON.stringify(error),
+      text2: error,
       autoHide: false,
     });
+    setProgress({
+      speed: 0,
+      percent: 1,
+      uploadInProgress: false,
+    });
   }
 
   const beginUploads = async (data) => {
@@ -106,28 +119,12 @@ export function UploadProgress({
       onError: ({ assetid, error }) => handleOnError({ assetid, error }),
       onProgress: ({ percent, loaded }) =>
         handleOnProgress({ percent, loaded }),
-      onSuccess: ({ duration }) => handleOnSuccess({ duration }),
+      onSuccess: ({ duration }) => handleOnSuccess({ duration, data }),
       context: {
         jobid:
           selectedCameraJobId !== "temp" ? selectedCameraJobId : "temporary",
       },
     });
-
-    if (deleteAfterUpload) {
-      try {
-        await MediaLibrary.deleteAssetsAsync(data);
-      } catch (error) {
-        console.log("Unable to delete picture.", error);
-      }
-    }
-
-    setProgress({
-      loading: false,
-      speed: 0,
-      uploadInProgress: false,
-    });
-
-    forceRerender();
   };
 
   return (
diff --git a/util/local-document-upload.utility.js b/util/local-document-upload.utility.js
index 0ffa0da..4502659 100644
--- a/util/local-document-upload.utility.js
+++ b/util/local-document-upload.utility.js
@@ -115,9 +115,11 @@ export const handleLocalUpload = async ({
 
       if (imexMediaServerResponse.status !== 200) {
         if (onError) {
-          onError(
-            imexMediaServerResponse.data || imexMediaServerResponse.statusText
-          );
+          onError({
+            error:
+              imexMediaServerResponse.data ||
+              imexMediaServerResponse.statusText,
+          });
         }
       } else {
         onSuccess &&
@@ -126,11 +128,11 @@ export const handleLocalUpload = async ({
           });
       }
     } catch (error) {
-      console.log("Error uploading documents:", error);
-      onError && onError(error.message);
+      console.log("Error uploading documents:", error.message);
+      onError && onError({ error: error.message });
     }
   } catch (error) {
     console.log("Uncaught error", error);
-    onError && onError(error.message);
+    onError && onError({ error: error.message });
   }
 };