Merge branch 'master' into upload-logs

src/components/pages/gallery/Upload.tsx

@@ -113,7 +113,7 @@ export default function Upload(props: Props) {
             props.setFiles
         );
 
-        if (isElectron()) {
+        if (isElectron() && ImportService.checkAllElectronAPIsExists()) {
             ImportService.getPendingUploads().then(
                 ({ files: electronFiles, collectionName, type }) => {
                     resumeDesktopUpload(type, electronFiles, collectionName);

src/services/upload/uploadManager.ts

@@ -363,7 +363,7 @@ class UploadManager {
                 `failed to do post file upload action -> ${e.message}
                 ${(e as Error).stack}`
             );
-            // shallow errors as we don't want to break complete upload
+            throw e;
         }
     }