Check bucket & prefix after obj's for new bucket are fetched (#7838)

Fixes #7837

browser/app/js/objects/actions.js

@@ -77,25 +77,32 @@ export const fetchObjects = () => {
           prefix: currentPrefix
         })
         .then(res => {
-          let objects = []
+          // we need to check if the bucket name and prefix are the same as
-          if (res.objects) {
+          // when the request was made before updating the displayed objects
-            objects = res.objects.map(object => {
+          if (
-              return {
+            currentBucket === getCurrentBucket(getState()) &&
-                ...object,
+            currentPrefix === getCurrentPrefix(getState())
-                name: object.name.replace(currentPrefix, "")
+          ) {
-              }
+            let objects = []
-            })
+            if (res.objects) {
+              objects = res.objects.map(object => {
+                return {
+                  ...object,
+                  name: object.name.replace(currentPrefix, "")
+                }
+              })
+            }
+
+            const sortBy = SORT_BY_LAST_MODIFIED
+            const sortOrder = SORT_ORDER_DESC
+            dispatch(setSortBy(sortBy))
+            dispatch(setSortOrder(sortOrder))
+            const sortedList = sortObjectsList(objects, sortBy, sortOrder)
+            dispatch(setList(sortedList))
+
+            dispatch(setPrefixWritable(res.writable))
+            dispatch(setListLoading(false))
           }
-
-          const sortBy = SORT_BY_LAST_MODIFIED
-          const sortOrder = SORT_ORDER_DESC
-          dispatch(setSortBy(sortBy))
-          dispatch(setSortOrder(sortOrder))
-          const sortedList = sortObjectsList(objects, sortBy, sortOrder)
-          dispatch(setList(sortedList))
-
-          dispatch(setPrefixWritable(res.writable))
-          dispatch(setListLoading(false))
         })
         .catch(err => {
           if (web.LoggedIn()) {