From 7a387c43c7a6701a9c3e7876d189722e03161e17 Mon Sep 17 00:00:00 2001
From: Robin Pyon <robin.pyon@gmail.com>
Date: Sun, 29 May 2022 21:38:30 +0100
Subject: [PATCH] Revert "fix: flatten blob gen + upload actions to ensure null
 blobs correctly throw errors and bubble up"

This reverts commit 834ebb0eca4cb4556436b37d24735f9c45e40801.
---
 src/modules/uploads/index.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/uploads/index.ts b/src/modules/uploads/index.ts
index 509e7ba4..f545f1cf 100644
--- a/src/modules/uploads/index.ts
+++ b/src/modules/uploads/index.ts
@@ -124,8 +124,8 @@ export const uploadsAssetStartEpic: MyEpic = action$ =>
       const {file, uploadItem} = action.payload
 
       return merge(
+        // Generate low res preview
         of(null).pipe(
-          // Generate low res preview
           mergeMap(() => generatePreviewBlobUrl$(file)),
           mergeMap(url => {
             return of(
@@ -134,8 +134,10 @@ export const uploadsAssetStartEpic: MyEpic = action$ =>
                 hash: uploadItem.hash
               })
             )
-          }),
-          // Upload asset and receive progress / complete events
+          })
+        ),
+        // Upload asset and receive progress / complete events
+        of(null).pipe(
           // delay(500000), // debug uploads
           mergeMap(() => uploadAsset$(uploadItem.assetType, file, uploadItem.hash)),
           takeUntil(