Merge pull request #1831 from numbersprotocol/camera-rebrand-fix-capt…

…ure-flow-2 fix(custom-camera): make sure confirm button works properly
numbersprotocol · Jul 19, 2022 · 63588b8 · 63588b8
2 parents edc1503 + 58f6baf
commit 63588b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/features/home/custom-camera/custom-camera.page.ts b/src/app/features/home/custom-camera/custom-camera.page.ts
@@ -166,13 +166,12 @@ export class CustomCameraPage implements OnInit, OnDestroy {
 
   async confirmCurrentCapture() {
     if (this.curCaptureFilePath && this.curCaptureType) {
-      await this.customCameraService.uploadToCapture(
+      this.customCameraService.uploadToCapture(
         this.curCaptureFilePath,
         this.curCaptureType
       );
-      this.removeCurrentCapture();
+      this.leaveCustomCamera();
     }
-    this.leaveCustomCamera();
   }
 
   async isTorchOn() {

diff --git a/src/app/features/home/custom-camera/custom-camera.service.ts b/src/app/features/home/custom-camera/custom-camera.service.ts
@@ -58,6 +58,7 @@ export class CustomCameraService {
       const base64 = await blobToBase64(itemBlob);
       const mimeType = itemToUpload.mimeType;
       await this.captureService.capture({ base64, mimeType });
+      await this.removeFile(filePath);
     } catch (error) {
       const errMsg = this.translocoService.translate(`error.internetError`);
       await this.errorService.toastError$(errMsg).toPromise();