From 6afd08cab241f3c2bfad0a3c0c7fd02f446f9cc1 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Tue, 28 Feb 2023 19:20:46 +0000
Subject: [PATCH 1/2] Fix uppy.resetProgress()

---
 packages/@uppy/core/src/Uppy.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/@uppy/core/src/Uppy.js b/packages/@uppy/core/src/Uppy.js
index b70d02fc49..d3efed3aa5 100644
--- a/packages/@uppy/core/src/Uppy.js
+++ b/packages/@uppy/core/src/Uppy.js
@@ -233,15 +233,22 @@ class Uppy {
     }
     const files = { ...this.getState().files }
     const updatedFiles = {}
+
     Object.keys(files).forEach(fileID => {
-      const updatedFile = { ...files[fileID] }
-      updatedFile.progress = { ...updatedFile.progress, ...defaultProgress }
-      updatedFiles[fileID] = updatedFile
+      updatedFiles[fileID] = {
+        ...files[fileID],
+        progress: {
+          ...files[fileID].progress, ...defaultProgress,
+        },
+      }
     })
 
     this.setState({
       files: updatedFiles,
       totalProgress: 0,
+      allowNewUpload: true,
+      error: null,
+      recoveredState: null,
     })
 
     this.emit('reset-progress')

From 1ff8f7967e5169a641f3978cca345a883e0b7b0b Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Thu, 2 Mar 2023 20:01:19 +0000
Subject: [PATCH 2/2] Update tests

---
 packages/@uppy/core/src/Uppy.test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/@uppy/core/src/Uppy.test.js b/packages/@uppy/core/src/Uppy.test.js
index 59de92cf0a..fd8faff2b4 100644
--- a/packages/@uppy/core/src/Uppy.test.js
+++ b/packages/@uppy/core/src/Uppy.test.js
@@ -1619,6 +1619,10 @@ describe('src/Core', () => {
         uploadStarted: null,
       })
       expect(core.getState().totalProgress).toEqual(0)
+      expect(core.getState().allowNewUpload).toEqual(true)
+      expect(core.getState().error).toEqual(null)
+      expect(core.getState().recoveredState).toEqual(null)
+
       expect(resetProgressEvent.mock.calls.length).toEqual(1)
     })
   })