From 4e9aa0b6e61d31bc2e904f8e9819862f9f04d59a Mon Sep 17 00:00:00 2001
From: Jannik Stehle <50302941+JammingBen@users.noreply.github.com>
Date: Wed, 4 May 2022 15:25:03 +0200
Subject: [PATCH] [full-ci] Remove the upload progress bar and its related
 states (#6825)

Remove the upload progress bar and its related states

Co-authored-by: Saw-jan <saw.jan.grg3e@gmail.com>
---
 ...hancement-remove-upload-progress-component |   6 +
 packages/web-app-files/src/App.vue            |   4 -
 .../src/components/Upload/DetailsWidget.vue   |  50 -----
 .../src/components/Upload/ProgressBar.vue     | 177 ------------------
 .../useFileListHeaderPosition.ts              |   5 +-
 packages/web-app-files/src/store/getters.js   |   3 -
 packages/web-app-files/src/store/state.js     |   2 -
 packages/web-app-files/src/views/Personal.vue |   7 -
 .../web-app-files/src/views/PublicFiles.vue   |   8 -
 .../src/views/spaces/Project.vue              |   8 -
 .../tests/unit/components/Search/List.spec.js |   1 -
 .../components/Upload/DetailsWidget.spec.js   |  59 ------
 .../components/Upload/ProgressBar.spec.js     | 167 -----------------
 .../__snapshots__/ProgressBar.spec.js.snap    |  49 -----
 .../tests/unit/components/components.setup.js |   2 -
 .../fileListHeaderPosition/spec/index.ts      |  20 --
 .../useFileListHeaderPosition.spec.ts         |  16 --
 .../tests/unit/views/Personal.spec.js         |   3 +-
 .../tests/unit/views/spaces/Project.spec.js   |   3 +-
 .../spaces/__snapshots__/Project.spec.js.snap |   2 -
 .../tests/unit/views/views.setup.js           |   2 -
 .../tests/unit/views/views.shared.ts          |   1 -
 .../web-runtime/src/container/bootstrap.ts    |   2 +-
 ...-failures-with-oc10-server-oauth2-login.md |   4 +-
 .../federationSharing.feature                 |   3 +-
 .../federationSharing.feature                 |   3 +-
 tests/acceptance/pageObjects/personalPage.js  |   4 +-
 27 files changed, 17 insertions(+), 594 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-remove-upload-progress-component
 delete mode 100644 packages/web-app-files/src/components/Upload/DetailsWidget.vue
 delete mode 100644 packages/web-app-files/src/components/Upload/ProgressBar.vue
 delete mode 100644 packages/web-app-files/tests/unit/components/Upload/DetailsWidget.spec.js
 delete mode 100644 packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js
 delete mode 100644 packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap

diff --git a/changelog/unreleased/enhancement-remove-upload-progress-component b/changelog/unreleased/enhancement-remove-upload-progress-component
new file mode 100644
index 00000000000..db58b79e943
--- /dev/null
+++ b/changelog/unreleased/enhancement-remove-upload-progress-component
@@ -0,0 +1,6 @@
+Enhancement: Remove the upload progress component
+
+We've removed the upload progress component because the implementation of Uppy made it obsolete.
+
+https://github.com/owncloud/web/pull/6825
+https://github.com/owncloud/web/issues/6819
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
index b9e1d445c57..3296ede5db1 100644
--- a/packages/web-app-files/src/App.vue
+++ b/packages/web-app-files/src/App.vue
@@ -104,8 +104,4 @@ main {
   grid-area: main;
   z-index: 0;
 }
-
-#files-upload-progress {
-  grid-area: upload;
-}
 </style>
diff --git a/packages/web-app-files/src/components/Upload/DetailsWidget.vue b/packages/web-app-files/src/components/Upload/DetailsWidget.vue
deleted file mode 100644
index 426fef9539b..00000000000
--- a/packages/web-app-files/src/components/Upload/DetailsWidget.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <ul class="oc-list oc-list-divider oc-ml-rm oc-mr-rm">
-    <li v-for="item in items" :key="item.id">
-      <div class="oc-flex oc-flex-middle">
-        <oc-icon name="file-copy2" class="oc-mr-s" />
-        <div class="oc-width-expand">
-          <div class="oc-flex">
-            <div class="oc-text-bold oc-width-expand oc-text-truncate upload-details-item-name">
-              {{ item.name }}
-            </div>
-            <div class="oc-width-auto oc-text-nowrap upload-details-item-size">
-              {{ getResourceSize(item.size) }}
-            </div>
-          </div>
-          <div class="oc-m-rm oc-position-relative oc-width-expand">
-            <oc-progress
-              :aria-hidden="true"
-              :max="100"
-              :value="item.progress | toInt"
-              class="oc-width-expand oc-m-rm"
-            />
-            <span :aria-hidden="true" class="oc-position-center oc-progress-text">
-              {{ item.progress | roundNumber }} %
-            </span>
-          </div>
-        </div>
-      </div>
-    </li>
-  </ul>
-</template>
-<script>
-import Mixins from '../../mixins'
-import MixinResources from '../../mixins/resources'
-
-export default {
-  filters: {
-    toInt(value) {
-      return parseInt(value)
-    }
-  },
-  mixins: [Mixins, MixinResources],
-  props: {
-    items: {
-      type: Array,
-      default: () => [],
-      required: true
-    }
-  }
-}
-</script>
diff --git a/packages/web-app-files/src/components/Upload/ProgressBar.vue b/packages/web-app-files/src/components/Upload/ProgressBar.vue
deleted file mode 100644
index d2d9129d785..00000000000
--- a/packages/web-app-files/src/components/Upload/ProgressBar.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <div class="files-upload-progress oc-clearfix oc-py-rm">
-    <div class="oc-m-rm oc-position-relative oc-width-expand">
-      <oc-progress
-        ref="progressbar"
-        :aria-hidden="true"
-        :max="100"
-        :value="totalUploadProgress"
-        class="oc-width-expand oc-m-rm"
-      />
-      <span :aria-hidden="true" class="oc-position-center oc-progress-text">
-        {{ totalUploadProgress | roundNumber }} %
-      </span>
-      <oc-hidden-announcer :announcement="announcement" level="assertive" />
-    </div>
-    <oc-grid
-      flex
-      class="oc-mt-s oc-mb-s oc-text-muted oc-cursor-pointer"
-      :aria-label="$gettext('Click row to toggle upload progress details')"
-      @click.native="$_toggleExpanded"
-    >
-      <oc-icon
-        class="oc-width-auto"
-        :name="expanded ? 'arrow-up-s' : 'arrow-down-s'"
-        fill-type="line"
-      />
-      <div class="oc-width-expand oc-text-truncate">
-        <span
-          v-if="count === 1"
-          id="files-upload-progress-single"
-          key="upload-progress-single"
-          v-translate="{ fileName: inProgress[0].name }"
-          translate-comment="Upload progress when only uploading one file shows the name of the file."
-        >
-          Uploading "%{ fileName }"
-        </span>
-        <span
-          v-else
-          id="files-upload-progress-multi"
-          key="upload-progress-multi"
-          v-translate="{ count }"
-          :translate-n="count"
-          translate-plural="Uploading %{ count } items"
-          translate-comment="Upload progress when uploading multiple files only shows the number of uploads."
-        >
-          Uploading %{ count } item
-        </span>
-      </div>
-      <div class="oc-width-auto">
-        <span
-          v-if="expanded"
-          id="files-upload-progress-collapse-details"
-          key="upload-progress-collapse-details"
-          v-translate
-          translate-comment="Hide details panel of upload progress"
-        >
-          Hide Details
-        </span>
-        <span
-          v-else
-          id="files-upload-progress-expand-details"
-          key="upload-progress-expand-details"
-          v-translate
-          translate-comment="Show details panel of upload progress"
-        >
-          Show Details
-        </span>
-      </div>
-    </oc-grid>
-    <details-widget
-      v-if="expanded"
-      :items="inProgress"
-      class="oc-width-expand oc-upload-details-scrollable"
-    />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import DetailsWidget from './DetailsWidget.vue'
-import Mixins from '../../mixins'
-
-export default {
-  name: 'UploadProgress',
-  components: {
-    DetailsWidget
-  },
-  mixins: [Mixins],
-  data() {
-    return {
-      expanded: false,
-      announcement: '',
-      announcementOnComplete: this.$gettext('Upload complete')
-    }
-  },
-  computed: {
-    ...mapGetters('Files', ['inProgress']),
-
-    count() {
-      return this.inProgress.length
-    },
-
-    totalUploadProgress() {
-      let totalSizeSum = 0
-      let progressSizeSum = 0
-
-      for (const item of this.inProgress) {
-        totalSizeSum += item.size
-        progressSizeSum += (item.size * item.progress) / 100
-      }
-
-      if (this.inProgress.length > 0 && totalSizeSum > 0) {
-        return (progressSizeSum / totalSizeSum) * 100
-      } else {
-        return 100
-      }
-    },
-
-    uploadPending() {
-      return this.totalUploadProgress < 100
-    }
-  },
-  watch: {
-    totalUploadProgress(value) {
-      if (value === 100) {
-        this.expanded = false
-        this.announcement = this.announcementOnComplete
-      }
-    }
-  },
-  created() {
-    this.$root.$on('upload-start', () => {
-      this.$nextTick(() => {
-        this.delayForScreenreader(() => this.$refs.progressbar.$el.focus())
-      })
-    })
-    window.addEventListener('beforeunload', this.confirmUnload)
-  },
-  beforeDestroy() {
-    window.removeEventListener('beforeunload', this.confirmUnload)
-  },
-  methods: {
-    $_toggleExpanded() {
-      this.expanded = !this.expanded
-    },
-    confirmUnload(event) {
-      if (this.uploadPending) {
-        event.preventDefault()
-        event.returnValue = ''
-      }
-    }
-  }
-}
-</script>
-
-<style>
-/* FIXME: move whole text part to ODS. it is useful to have a text component available for the progress bar. */
-.files-upload-progress .oc-progress-text {
-  font-size: 0.75em;
-  color: var(--oc-color-text-inverse);
-}
-.files-upload-progress .oc-progress {
-  box-shadow: 0 0 2px var(--oc-color-border);
-}
-</style>
-<style scoped>
-.files-upload-progress {
-  background-color: var(--oc-color-background-muted);
-}
-/* FIXME: move to ODS somehow? with the very specific max-height it probably doesn't make a generic css class from it... */
-.oc-upload-details-scrollable {
-  max-height: 200px;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  resize: both;
-}
-</style>
diff --git a/packages/web-app-files/src/composables/fileListHeaderPosition/useFileListHeaderPosition.ts b/packages/web-app-files/src/composables/fileListHeaderPosition/useFileListHeaderPosition.ts
index 01813592db8..25a732fae2a 100644
--- a/packages/web-app-files/src/composables/fileListHeaderPosition/useFileListHeaderPosition.ts
+++ b/packages/web-app-files/src/composables/fileListHeaderPosition/useFileListHeaderPosition.ts
@@ -1,8 +1,6 @@
-import { ref, nextTick, onMounted, Ref, watch } from '@vue/composition-api'
-import { useStore } from 'web-pkg/src/composables/store'
+import { ref, nextTick, onMounted, Ref } from '@vue/composition-api'
 
 export const useFileListHeaderPosition = (): { y: Ref; refresh: () => void } => {
-  const store = useStore()
   const y = ref(0)
   const refresh = async (): Promise<void> => {
     await nextTick()
@@ -18,7 +16,6 @@ export const useFileListHeaderPosition = (): { y: Ref; refresh: () => void } =>
 
   window.onresize = refresh
   onMounted(refresh)
-  watch(() => store.getters['Files/inProgress'].length > 0, refresh)
 
   return { y, refresh }
 }
diff --git a/packages/web-app-files/src/store/getters.js b/packages/web-app-files/src/store/getters.js
index bbe323ba063..3b48a020173 100644
--- a/packages/web-app-files/src/store/getters.js
+++ b/packages/web-app-files/src/store/getters.js
@@ -1,9 +1,6 @@
 import { ShareTypes } from '../helpers/share'
 
 export default {
-  inProgress: (state) => {
-    return state.inProgress
-  },
   selectedFiles: (state, getters) => {
     return getters.filesAll.filter((f) => state.selectedIds.includes(f.id))
   },
diff --git a/packages/web-app-files/src/store/state.js b/packages/web-app-files/src/store/state.js
index 7e587852dfe..7bba9e74451 100644
--- a/packages/web-app-files/src/store/state.js
+++ b/packages/web-app-files/src/store/state.js
@@ -3,8 +3,6 @@ export default {
   files: [],
   filesSearched: null,
   selectedIds: [],
-  inProgress: [],
-  shareOpen: null,
   versions: [],
   spaces: [],
 
diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
index c2f91899808..b55bfb21e08 100644
--- a/packages/web-app-files/src/views/Personal.vue
+++ b/packages/web-app-files/src/views/Personal.vue
@@ -11,7 +11,6 @@
     </app-bar>
     <app-loading-spinner v-if="loadResourcesTask.isRunning" />
     <template v-else>
-      <progress-bar v-show="$_uploadProgressVisible" id="files-upload-progress" class="oc-p-s" />
       <not-found-message v-if="folderNotFound" class="files-not-found oc-height-1-1" />
       <no-content-message
         v-else-if="isEmpty"
@@ -88,7 +87,6 @@ import { bus } from 'web-pkg/src/instance'
 import { breadcrumbsFromPath, concatBreadcrumbs } from '../helpers/breadcrumbs'
 
 import AppBar from '../components/AppBar/AppBar.vue'
-import ProgressBar from '../components/Upload/ProgressBar.vue'
 import CreateAndUpload from '../components/AppBar/CreateAndUpload.vue'
 import ResourceTable from '../components/FilesList/ResourceTable.vue'
 import QuickActions from '../components/FilesList/QuickActions.vue'
@@ -112,7 +110,6 @@ const visibilityObserver = new VisibilityObserver()
 export default defineComponent({
   components: {
     AppBar,
-    ProgressBar,
     CreateAndUpload,
     ResourceTable,
     QuickActions,
@@ -146,15 +143,11 @@ export default defineComponent({
     ...mapGetters('Files', [
       'highlightedFile',
       'currentFolder',
-      'inProgress',
       'totalFilesCount',
       'totalFilesSize'
     ]),
     ...mapGetters(['user', 'homeFolder', 'configuration']),
 
-    $_uploadProgressVisible() {
-      return this.inProgress.length > 0
-    },
     isEmpty() {
       return this.paginatedResources.length < 1
     },
diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
index 9542e76b0d9..085cf6735d4 100644
--- a/packages/web-app-files/src/views/PublicFiles.vue
+++ b/packages/web-app-files/src/views/PublicFiles.vue
@@ -11,7 +11,6 @@
     </app-bar>
     <app-loading-spinner v-if="loadResourcesTask.isRunning" />
     <template v-else>
-      <progress-bar v-show="$_uploadProgressVisible" id="files-upload-progress" class="oc-p-s" />
       <not-found-message v-if="folderNotFound" class="files-not-found oc-height-1-1" />
       <no-content-message
         v-else-if="isEmpty"
@@ -79,7 +78,6 @@ import { bus } from 'web-pkg/src/instance'
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import AppBar from '../components/AppBar/AppBar.vue'
-import ProgressBar from '../components/Upload/ProgressBar.vue'
 import CreateAndUpload from '../components/AppBar/CreateAndUpload.vue'
 import NotFoundMessage from '../components/FilesList/NotFoundMessage.vue'
 import ListInfo from '../components/FilesList/ListInfo.vue'
@@ -95,7 +93,6 @@ const visibilityObserver = new VisibilityObserver()
 export default defineComponent({
   components: {
     AppBar,
-    ProgressBar,
     CreateAndUpload,
     ResourceTable,
     ListInfo,
@@ -119,17 +116,12 @@ export default defineComponent({
       'publicLinkPassword',
       'currentFolder',
       'highlightedFile',
-      'inProgress',
       'totalFilesCount',
       'totalFilesSize'
     ]),
     ...mapGetters(['configuration']),
     ...mapState('Files/sidebar', { sidebarClosed: 'closed' }),
 
-    $_uploadProgressVisible() {
-      return this.inProgress.length > 0
-    },
-
     breadcrumbs() {
       const breadcrumbs = breadcrumbsFromPath(this.$route.path, this.$route.params.item)
       const rootRoute = breadcrumbs.shift()
diff --git a/packages/web-app-files/src/views/spaces/Project.vue b/packages/web-app-files/src/views/spaces/Project.vue
index 42b4aaf3f71..d17cae27a21 100644
--- a/packages/web-app-files/src/views/spaces/Project.vue
+++ b/packages/web-app-files/src/views/spaces/Project.vue
@@ -11,7 +11,6 @@
     </app-bar>
     <app-loading-spinner v-if="loadResourcesTask.isRunning" />
     <template v-else>
-      <progress-bar v-show="$_uploadProgressVisible" id="files-upload-progress" class="oc-p-s" />
       <not-found-message v-if="!space.id" class="space-not-found oc-height-1-1" />
       <div v-else-if="isSpaceRoot">
         <div class="oc-px-m oc-mt-m" :class="{ 'oc-flex': imageContent && !imageExpanded }">
@@ -134,7 +133,6 @@ import ResourceTable from '../../components/FilesList/ResourceTable.vue'
 import { createLocationSpaces } from '../../router'
 import { mapActions, mapGetters, mapMutations } from 'vuex'
 import AppBar from '../../components/AppBar/AppBar.vue'
-import ProgressBar from '../../components/Upload/ProgressBar.vue'
 import CreateAndUpload from '../../components/AppBar/CreateAndUpload.vue'
 import ListInfo from '../../components/FilesList/ListInfo.vue'
 import Pagination from '../../components/FilesList/Pagination.vue'
@@ -152,7 +150,6 @@ const visibilityObserver = new VisibilityObserver()
 export default defineComponent({
   components: {
     AppBar,
-    ProgressBar,
     CreateAndUpload,
     NoContentMessage,
     AppLoadingSpinner,
@@ -193,7 +190,6 @@ export default defineComponent({
     ...mapGetters('Files', [
       'highlightedFile',
       'currentFolder',
-      'inProgress',
       'totalFilesCount',
       'totalFilesSize'
     ]),
@@ -220,10 +216,6 @@ export default defineComponent({
       return this.paginatedResources.length < 1
     },
 
-    $_uploadProgressVisible() {
-      return this.inProgress.length > 0
-    },
-
     markdownCollapseIcon() {
       return this.markdownCollapsed === true ? 'add' : 'subtract'
     },
diff --git a/packages/web-app-files/tests/unit/components/Search/List.spec.js b/packages/web-app-files/tests/unit/components/Search/List.spec.js
index 6bd2c1ead03..e4d879b466b 100644
--- a/packages/web-app-files/tests/unit/components/Search/List.spec.js
+++ b/packages/web-app-files/tests/unit/components/Search/List.spec.js
@@ -130,7 +130,6 @@ function createStore(activeFiles) {
           selectedFiles: () => [],
           totalFilesCount: () => ({ files: activeFiles.length, folders: 0 }),
           totalFilesSize: () => getTotalSize(activeFiles),
-          inProgress: () => [],
           currentFolder: () => {
             return {
               path: '',
diff --git a/packages/web-app-files/tests/unit/components/Upload/DetailsWidget.spec.js b/packages/web-app-files/tests/unit/components/Upload/DetailsWidget.spec.js
deleted file mode 100644
index e980c87d053..00000000000
--- a/packages/web-app-files/tests/unit/components/Upload/DetailsWidget.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils'
-import DesignSystem from 'owncloud-design-system'
-
-import DetailsWidget from '@files/src/components/Upload/DetailsWidget.vue'
-
-const selectors = {
-  oCProgress: 'oc-progress-stub',
-  itemName: '.upload-details-item-name',
-  itemSize: '.upload-details-item-size',
-  progressText: '.oc-progress-text'
-}
-
-const item = {
-  id: 1,
-  name: 'lorem.txt',
-  size: 100,
-  progress: 20
-}
-
-const localVue = createLocalVue()
-localVue.use(DesignSystem)
-
-const wrapper = shallowMount(DetailsWidget, {
-  localVue,
-  propsData: { items: [item] },
-  stubs: {
-    'oc-progress': true,
-    'oc-icon': true
-  }
-})
-
-describe('DetailsWidget component', () => {
-  describe('when an item is provided in prop', () => {
-    it('should have correct props in oc-progress', () => {
-      const ocProgress = wrapper.find(selectors.oCProgress)
-
-      expect(ocProgress.exists()).toBeTruthy()
-      expect(ocProgress.props().value).toBe(item.progress)
-    })
-    it('should show item name', () => {
-      const itemName = wrapper.find(selectors.itemName)
-
-      expect(itemName.exists()).toBeTruthy()
-      expect(itemName.text()).toEqual(item.name)
-    })
-    it('should show item size', () => {
-      const itemSize = wrapper.find(selectors.itemSize)
-
-      expect(itemSize.exists()).toBeTruthy()
-      expect(itemSize.text()).toEqual(item.size + ' B')
-    })
-    it('should show progress percentage', () => {
-      const progressText = wrapper.find(selectors.progressText)
-
-      expect(progressText.exists()).toBeTruthy()
-      expect(progressText.text()).toEqual(item.progress + ' %')
-    })
-  })
-})
diff --git a/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js b/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js
deleted file mode 100644
index 54812ad1328..00000000000
--- a/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils'
-import Vuex from 'vuex'
-import DesignSystem from 'owncloud-design-system'
-import GetTextPlugin from 'vue-gettext'
-import ProgressBar from '@files/src/components/Upload/ProgressBar.vue'
-
-const localVue = createLocalVue()
-localVue.use(Vuex)
-localVue.use(DesignSystem)
-localVue.use(GetTextPlugin, {
-  translations: 'does-not-matter.json',
-  silent: true
-})
-
-const selectors = {
-  ocProgress: 'progressbar',
-  ocProgressText: '.oc-progress-text',
-  ocIcon: 'oc-icon-stub',
-  expandedToggle: 'oc-grid-stub',
-  progressSingle: '#files-upload-progress-single',
-  progressMulti: '#files-upload-progress-multi',
-  showDetails: '#files-upload-progress-expand-details',
-  hideDetails: '#files-upload-progress-collapse-details',
-  detailsWidget: 'details-widget-stub'
-}
-
-const items = [
-  {
-    id: 1,
-    name: 'lorem.txt',
-    size: 100,
-    progress: 20
-  },
-  {
-    id: 2,
-    name: 'lorem.png',
-    size: 100,
-    progress: 10
-  }
-]
-describe('ProgressBar component', () => {
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-  const spyToggleExpanded = jest.spyOn(ProgressBar.methods, '$_toggleExpanded')
-
-  describe('when a single file is uploaded', () => {
-    let wrapper
-    let store
-    beforeEach(() => {
-      store = createStore([items[0]])
-      wrapper = getShallowWrapper(store)
-    })
-
-    it('should show correct progress value for one file but no file count', () => {
-      expect(wrapper).toMatchSnapshot()
-    })
-  })
-
-  describe('when multiple files are uploaded', () => {
-    let wrapper
-    let store
-    beforeEach(() => {
-      store = createStore(items)
-      wrapper = getShallowWrapper(store)
-    })
-
-    it('should show total progress value but no file names', () => {
-      // explicitly check progress computation as that is hard to verify/miss in snapshot updates
-      const ocProgressStub = wrapper.findComponent({ ref: selectors.ocProgress })
-      const ocProgressText = wrapper.find(selectors.ocProgressText)
-      const totalProgress = items.reduce((total, item) => total + item.progress, 0) / items.length
-      expect(ocProgressStub.props().value).toEqual(totalProgress)
-      expect(ocProgressText.text()).toBe(`${totalProgress} %`)
-
-      expect(wrapper).toMatchSnapshot()
-    })
-  })
-
-  describe('when expanded is false', () => {
-    let wrapper
-    let store
-    beforeEach(() => {
-      store = createStore(items)
-      wrapper = getShallowWrapper(store)
-    })
-    it('should have "arrow-down-s" as oc-icon name', () => {
-      const ocIcon = wrapper.find(selectors.ocIcon)
-
-      expect(ocIcon.props().name).toEqual('arrow-down-s')
-    })
-    it('should show the text "Show Details"', () => {
-      const showDetails = wrapper.find(selectors.showDetails)
-      const hideDetails = wrapper.find(selectors.hideDetails)
-
-      expect(hideDetails.exists()).toBeFalsy()
-      expect(showDetails.exists()).toBeTruthy()
-      expect(showDetails.text()).toEqual('Show Details')
-    })
-    it('should call "$_toggleExpanded" method if expand is toggled', async () => {
-      const expandedToggle = wrapper.find(selectors.expandedToggle)
-      await expandedToggle.trigger('click')
-
-      expect(spyToggleExpanded).toHaveBeenCalledTimes(1)
-    })
-    it('should not show details-widget component', () => {
-      const detailsWidget = wrapper.find(selectors.detailsWidget)
-
-      expect(detailsWidget.exists()).toBeFalsy()
-    })
-  })
-
-  describe('when expanded is true', () => {
-    let wrapper
-    let store
-    beforeEach(() => {
-      store = createStore(items)
-      wrapper = getShallowWrapper(store, true)
-    })
-    it('should change oc-icon name to "arrow-up-s"', () => {
-      const ocIcon = wrapper.find(selectors.ocIcon)
-
-      expect(ocIcon.props().name).toEqual('arrow-up-s')
-    })
-    it('should show the text "Hide Details"', () => {
-      const showDetails = wrapper.find(selectors.showDetails)
-      const hideDetails = wrapper.find(selectors.hideDetails)
-
-      expect(showDetails.exists()).toBeFalsy()
-      expect(hideDetails.exists()).toBeTruthy()
-      expect(hideDetails.text()).toEqual('Hide Details')
-    })
-    it('should show details-widget with in-porgress items as prop', () => {
-      const detailsWidget = wrapper.find(selectors.detailsWidget)
-
-      expect(detailsWidget.exists()).toBeTruthy()
-      expect(detailsWidget.props().items).toMatchObject(items)
-    })
-  })
-})
-
-function getShallowWrapper(store, expanded = false) {
-  return shallowMount(ProgressBar, {
-    localVue,
-    data() {
-      return {
-        expanded,
-        announcement: '',
-        announcementOnComplete: 'Upload complete'
-      }
-    },
-    store
-  })
-}
-
-function createStore(inProgress = []) {
-  return new Vuex.Store({
-    modules: {
-      Files: {
-        namespaced: true,
-        getters: {
-          inProgress: jest.fn(() => inProgress)
-        }
-      }
-    }
-  })
-}
diff --git a/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap b/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap
deleted file mode 100644
index 117af18fe25..00000000000
--- a/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap
+++ /dev/null
@@ -1,49 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ProgressBar component when a single file is uploaded should show correct progress value for one file but no file count 1`] = `
-<div class="files-upload-progress oc-clearfix oc-py-rm">
-  <div class="oc-m-rm oc-position-relative oc-width-expand">
-    <oc-progress-stub value="20" max="100" size="default" variation="primary" aria-hidden="true" class="oc-width-expand oc-m-rm"></oc-progress-stub> <span aria-hidden="true" class="oc-position-center oc-progress-text">
-      20 %
-    </span>
-    <oc-hidden-announcer-stub level="assertive" announcement=""></oc-hidden-announcer-stub>
-  </div>
-  <oc-grid-stub gutter="collapse" flex="true" aria-label="Click row to toggle upload progress details" class="oc-mt-s oc-mb-s oc-text-muted oc-cursor-pointer">
-    <oc-icon-stub name="arrow-down-s" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" class="oc-width-auto"></oc-icon-stub>
-    <div class="oc-width-expand oc-text-truncate"><span id="files-upload-progress-single" translate-comment="Upload progress when only uploading one file shows the name of the file." data-msgid="
-        Uploading &quot;%{ fileName }&quot;
-      " data-current-language="en_US">
-        Uploading "lorem.txt"
-      </span></div>
-    <div class="oc-width-auto"><span id="files-upload-progress-expand-details" translate-comment="Show details panel of upload progress" data-msgid="
-        Show Details
-      " data-current-language="en_US">
-        Show Details
-      </span></div>
-  </oc-grid-stub>
-  <!---->
-</div>
-`;
-
-exports[`ProgressBar component when multiple files are uploaded should show total progress value but no file names 1`] = `
-<div class="files-upload-progress oc-clearfix oc-py-rm">
-  <div class="oc-m-rm oc-position-relative oc-width-expand">
-    <oc-progress-stub value="15" max="100" size="default" variation="primary" aria-hidden="true" class="oc-width-expand oc-m-rm"></oc-progress-stub> <span aria-hidden="true" class="oc-position-center oc-progress-text">
-      15 %
-    </span>
-    <oc-hidden-announcer-stub level="assertive" announcement=""></oc-hidden-announcer-stub>
-  </div>
-  <oc-grid-stub gutter="collapse" flex="true" aria-label="Click row to toggle upload progress details" class="oc-mt-s oc-mb-s oc-text-muted oc-cursor-pointer">
-    <oc-icon-stub name="arrow-down-s" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" class="oc-width-auto"></oc-icon-stub>
-    <div class="oc-width-expand oc-text-truncate"><span id="files-upload-progress-multi" translate-n="2" translate-plural="Uploading %{ count } items" translate-comment="Upload progress when uploading multiple files only shows the number of uploads." data-msgid="
-        Uploading %{ count } item
-      " data-current-language="en_US">Uploading 2 items</span></div>
-    <div class="oc-width-auto"><span id="files-upload-progress-expand-details" translate-comment="Show details panel of upload progress" data-msgid="
-        Show Details
-      " data-current-language="en_US">
-        Show Details
-      </span></div>
-  </oc-grid-stub>
-  <!---->
-</div>
-`;
diff --git a/packages/web-app-files/tests/unit/components/components.setup.js b/packages/web-app-files/tests/unit/components/components.setup.js
index 72859c9e957..d4329e99181 100644
--- a/packages/web-app-files/tests/unit/components/components.setup.js
+++ b/packages/web-app-files/tests/unit/components/components.setup.js
@@ -61,7 +61,6 @@ export const getStore = function ({
   pages = null,
   sidebarClosed = false,
   currentFolder = null,
-  inProgress = [null],
   selectedFiles = [],
   totalFilesCount = null,
   totalFilesSize = null,
@@ -125,7 +124,6 @@ export const getStore = function ({
           totalFilesSize: () => totalFilesSize,
           selectedFiles: () => selectedFiles,
           activeFiles: (state) => state.activeFiles,
-          inProgress: () => inProgress,
           highlightedFile: () => highlightedFile,
           currentFolder: () => currentFolder,
           pages: () => pages,
diff --git a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts
index 11ddaed3a40..4f7ee2ab826 100644
--- a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts
+++ b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts
@@ -21,26 +21,6 @@ export const createWrapper = (): Wrapper<Vue> =>
     }),
     {
       localVue,
-      store: new Vuex.Store({
-        modules: {
-          Files: {
-            state: {
-              inProgress: []
-            },
-            mutations: {
-              UPDATE(state, value) {
-                state.inProgress = value
-              }
-            },
-            getters: {
-              inProgress(state) {
-                return state.inProgress
-              }
-            },
-            namespaced: true
-          }
-        }
-      }),
       attachTo: document.body
     }
   )
diff --git a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts
index 6d1502498a0..e657b20c056 100644
--- a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts
@@ -44,20 +44,4 @@ describe('useFileListHeaderPosition', () => {
 
     wrapper.destroy()
   })
-
-  it('should calculate y on upload', async () => {
-    const wrapper = createWrapper()
-    const appBar = createAppBar()
-
-    appBar.createElement()
-
-    for (const height of [2, 3, 4, 5, 6]) {
-      appBar.resize(height)
-      wrapper.vm.store.commit('Files/UPDATE', height % 2 === 0 ? [undefined] : [])
-      await nextTick()
-      expect(wrapper.vm.y).toBe(height)
-    }
-
-    wrapper.destroy()
-  })
 })
diff --git a/packages/web-app-files/tests/unit/views/Personal.spec.js b/packages/web-app-files/tests/unit/views/Personal.spec.js
index 7e8ae7f67f7..69db70422bd 100644
--- a/packages/web-app-files/tests/unit/views/Personal.spec.js
+++ b/packages/web-app-files/tests/unit/views/Personal.spec.js
@@ -179,8 +179,7 @@ function createWrapper(selectedFiles = [resourceForestJpg]) {
     store: getStore({
       selectedFiles: [...selectedFiles],
       highlightedFile: resourceForestJpg,
-      pages: 4,
-      inProgress: [null]
+      pages: 4
     }),
     localVue,
     stubs,
diff --git a/packages/web-app-files/tests/unit/views/spaces/Project.spec.js b/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
index c7b3cdd7e09..65bbccd837c 100644
--- a/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
+++ b/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
@@ -288,8 +288,7 @@ function getMountedWrapper(spaceResources = [], spaceItem = null, imageContent =
             selectedFiles: () => [],
             totalFilesSize: () => 10,
             pages: () => 1,
-            currentFileOutgoingCollaborators: () => [spaceShare],
-            inProgress: jest.fn(() => [])
+            currentFileOutgoingCollaborators: () => [spaceShare]
           }
         }
       }
diff --git a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap
index 1fab80754b6..4c0d9bcffef 100644
--- a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap
+++ b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap
@@ -3,7 +3,6 @@
 exports[`Spaces project view space image should show if given 1`] = `
 <div class="space-overview">
   <app-bar-stub breadcrumbs="" breadcrumbscontextactionsitems="[object Object]" hasbulkactions="true" hassidebartoggle="true" hasviewoptions="true"></app-bar-stub>
-  <progress-bar-stub id="files-upload-progress" class="oc-p-s" style="display: none;"></progress-bar-stub>
   <div>
     <div class="oc-px-m oc-mt-m oc-flex">
       <div class="oc-width-1-4 oc-mr-l"><img alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAApgAAAKYB3X3/OAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAANCSURBVEiJtZZPbBtFFMZ/M7ubXdtdb1xSFyeilBapySVU8h8OoFaooFSqiihIVIpQBKci6KEg9Q6H9kovIHoCIVQJJCKE1ENFjnAgcaSGC6rEnxBwA04Tx43t2FnvDAfjkNibxgHxnWb2e/u992bee7tCa00YFsffekFY+nUzFtjW0LrvjRXrCDIAaPLlW0nHL0SsZtVoaF98mLrx3pdhOqLtYPHChahZcYYO7KvPFxvRl5XPp1sN3adWiD1ZAqD6XYK1b/dvE5IWryTt2udLFedwc1+9kLp+vbbpoDh+6TklxBeAi9TL0taeWpdmZzQDry0AcO+jQ12RyohqqoYoo8RDwJrU+qXkjWtfi8Xxt58BdQuwQs9qC/afLwCw8tnQbqYAPsgxE1S6F3EAIXux2oQFKm0ihMsOF71dHYx+f3NND68ghCu1YIoePPQN1pGRABkJ6Bus96CutRZMydTl+TvuiRW1m3n0eDl0vRPcEysqdXn+jsQPsrHMquGeXEaY4Yk4wxWcY5V/9scqOMOVUFthatyTy8QyqwZ+kDURKoMWxNKr2EeqVKcTNOajqKoBgOE28U4tdQl5p5bwCw7BWquaZSzAPlwjlithJtp3pTImSqQRrb2Z8PHGigD4RZuNX6JYj6wj7O4TFLbCO/Mn/m8R+h6rYSUb3ekokRY6f/YukArN979jcW+V/S8g0eT/N3VN3kTqWbQ428m9/8k0P/1aIhF36PccEl6EhOcAUCrXKZXXWS3XKd2vc/TRBG9O5ELC17MmWubD2nKhUKZa26Ba2+D3P+4/MNCFwg59oWVeYhkzgN/JDR8deKBoD7Y+ljEjGZ0sosXVTvbc6RHirr2reNy1OXd6pJsQ+gqjk8VWFYmHrwBzW/n+uMPFiRwHB2I7ih8ciHFxIkd/3Omk5tCDV1t+2nNu5sxxpDFNx+huNhVT3/zMDz8usXC3ddaHBj1GHj/As08fwTS7Kt1HBTmyN29vdwAw+/wbwLVOJ3uAD1wi/dUH7Qei66PfyuRj4Ik9is+hglfbkbfR3cnZm7chlUWLdwmprtCohX4HUtlOcQjLYCu+fzGJH2QRKvP3UNz8bWk1qMxjGTOMThZ3kvgLI5AzFfo379UAAAAASUVORK5CYII=" class="space-overview-image oc-cursor-pointer"></div>
@@ -39,7 +38,6 @@ exports[`Spaces project view space image should show if given 1`] = `
 exports[`Spaces project view space readme should show if given 1`] = `
 <div class="space-overview">
   <app-bar-stub breadcrumbs="" breadcrumbscontextactionsitems="[object Object]" hasbulkactions="true" hassidebartoggle="true" hasviewoptions="true"></app-bar-stub>
-  <progress-bar-stub id="files-upload-progress" class="oc-p-s" style="display: none;"></progress-bar-stub>
   <div>
     <div class="oc-px-m oc-mt-m oc-flex">
       <div class="oc-width-1-4 oc-mr-l"><img alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAApgAAAKYB3X3/OAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAANCSURBVEiJtZZPbBtFFMZ/M7ubXdtdb1xSFyeilBapySVU8h8OoFaooFSqiihIVIpQBKci6KEg9Q6H9kovIHoCIVQJJCKE1ENFjnAgcaSGC6rEnxBwA04Tx43t2FnvDAfjkNibxgHxnWb2e/u992bee7tCa00YFsffekFY+nUzFtjW0LrvjRXrCDIAaPLlW0nHL0SsZtVoaF98mLrx3pdhOqLtYPHChahZcYYO7KvPFxvRl5XPp1sN3adWiD1ZAqD6XYK1b/dvE5IWryTt2udLFedwc1+9kLp+vbbpoDh+6TklxBeAi9TL0taeWpdmZzQDry0AcO+jQ12RyohqqoYoo8RDwJrU+qXkjWtfi8Xxt58BdQuwQs9qC/afLwCw8tnQbqYAPsgxE1S6F3EAIXux2oQFKm0ihMsOF71dHYx+f3NND68ghCu1YIoePPQN1pGRABkJ6Bus96CutRZMydTl+TvuiRW1m3n0eDl0vRPcEysqdXn+jsQPsrHMquGeXEaY4Yk4wxWcY5V/9scqOMOVUFthatyTy8QyqwZ+kDURKoMWxNKr2EeqVKcTNOajqKoBgOE28U4tdQl5p5bwCw7BWquaZSzAPlwjlithJtp3pTImSqQRrb2Z8PHGigD4RZuNX6JYj6wj7O4TFLbCO/Mn/m8R+h6rYSUb3ekokRY6f/YukArN979jcW+V/S8g0eT/N3VN3kTqWbQ428m9/8k0P/1aIhF36PccEl6EhOcAUCrXKZXXWS3XKd2vc/TRBG9O5ELC17MmWubD2nKhUKZa26Ba2+D3P+4/MNCFwg59oWVeYhkzgN/JDR8deKBoD7Y+ljEjGZ0sosXVTvbc6RHirr2reNy1OXd6pJsQ+gqjk8VWFYmHrwBzW/n+uMPFiRwHB2I7ih8ciHFxIkd/3Omk5tCDV1t+2nNu5sxxpDFNx+huNhVT3/zMDz8usXC3ddaHBj1GHj/As08fwTS7Kt1HBTmyN29vdwAw+/wbwLVOJ3uAD1wi/dUH7Qei66PfyuRj4Ik9is+hglfbkbfR3cnZm7chlUWLdwmprtCohX4HUtlOcQjLYCu+fzGJH2QRKvP3UNz8bWk1qMxjGTOMThZ3kvgLI5AzFfo379UAAAAASUVORK5CYII=" class="space-overview-image oc-cursor-pointer"></div>
diff --git a/packages/web-app-files/tests/unit/views/views.setup.js b/packages/web-app-files/tests/unit/views/views.setup.js
index de5c3d8c42e..f35909d421a 100644
--- a/packages/web-app-files/tests/unit/views/views.setup.js
+++ b/packages/web-app-files/tests/unit/views/views.setup.js
@@ -100,7 +100,6 @@ export const getStore = function ({
   pages = null,
   sidebarClosed = false,
   currentFolder = null,
-  inProgress = [null],
   selectedFiles = [],
   totalFilesCount = null,
   totalFilesSize = null,
@@ -166,7 +165,6 @@ export const getStore = function ({
           totalFilesSize: () => totalFilesSize,
           selectedFiles: () => selectedFiles,
           activeFiles: (state) => state.activeFiles,
-          inProgress: () => inProgress,
           highlightedFile: () => highlightedFile,
           currentFolder: () => currentFolder,
           pages: () => pages,
diff --git a/packages/web-app-files/tests/unit/views/views.shared.ts b/packages/web-app-files/tests/unit/views/views.shared.ts
index 657d0c3edd5..adec8a5352d 100644
--- a/packages/web-app-files/tests/unit/views/views.shared.ts
+++ b/packages/web-app-files/tests/unit/views/views.shared.ts
@@ -55,7 +55,6 @@ export const accentuatesTableRowTest = async <V extends Vue>(
   jest.useFakeTimers()
 
   const store = getStore({
-    inProgress: [],
     activeFiles: [forestJpg],
     totalFilesSize: 0,
     totalFilesCount: {
diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index d5f8717b4ef..d26e31064f9 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -251,7 +251,7 @@ export const announceClientService = ({
 }
 
 /**
- * announce uppyService and owncloud SDK and inject it into vue
+ * announce uppyService and inject it into vue
  *
  * @param vue
  */
diff --git a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md
index 48eb5925d5d..5caee570ac9 100644
--- a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md
+++ b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md
@@ -132,9 +132,9 @@ Other free text and markdown formatting can be used elsewhere in the document if
 
 ### [Federated shares not showing in shared with me page](https://github.com/owncloud/web/issues/2510)
 -   [webUISharingExternalToRoot/federationSharing.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature#L32)
--   [webUISharingExternalToRoot/federationSharing.feature:169](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature#L169)
+-   [webUISharingExternalToRoot/federationSharing.feature:170](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature#L170)
 -   [webUISharingExternal/federationSharing.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L38)
--   [webUISharingExternal/federationSharing.feature:165](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L165)
+-   [webUISharingExternal/federationSharing.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L166)
 
 ### [browsing directly to a details 'tab' is not possible](https://github.com/owncloud/web/issues/5464)
 -   [webUIFiles/browseDirectlyToDetailsTab.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L21)
diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
index 0ef307be9f0..7582773ee06 100644
--- a/tests/acceptance/features/webUISharingExternal/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
@@ -123,7 +123,8 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     And the user opens folder "Shares" using the webUI
     And the user opens folder "simple-folder" using the webUI
     And the user uploads file "new-lorem.txt" using the webUI
-    Then as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
+    Then file "new-lorem.txt" should be listed on the webUI
+    And as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
 
   @issue-3309
   Scenario: rename a file in a received share - remote server shares - local server receives
diff --git a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
index be39f18572e..fbb652d6e9c 100644
--- a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
@@ -127,7 +127,8 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     When the user reloads the current page of the webUI
     And the user opens folder "simple-folder" using the webUI
     And the user uploads file "new-lorem.txt" using the webUI
-    Then as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
+    Then file "new-lorem.txt" should be listed on the webUI
+    And as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
 
   @issue-3309
   Scenario: rename a file in a received share - remote server shares - local server receives
diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js
index 480dd78611c..1b67d535f50 100644
--- a/tests/acceptance/pageObjects/personalPage.js
+++ b/tests/acceptance/pageObjects/personalPage.js
@@ -167,7 +167,6 @@ module.exports = {
           this.api.globals.waitForConditionPollInterval,
           false
         )
-        .waitForElementNotVisible('@fileUploadProgress')
         .click('@uploadFilesButton')
     },
     /**
@@ -217,7 +216,6 @@ module.exports = {
           this.api.globals.waitForConditionPollInterval,
           false
         )
-        .waitForElementNotVisible('@fileUploadProgress')
         .click('@uploadFilesButton')
     },
     /**
@@ -412,7 +410,7 @@ module.exports = {
       selector: '#folderUploadInput'
     },
     fileUploadProgress: {
-      selector: '#files-upload-progress'
+      selector: '#upload-info'
     },
     dialog: {
       selector: '.oc-modal'