diff --git a/ui/js/component/fileActions/index.js b/ui/js/component/fileActions/index.js index 8e9555a14..1d8ba6088 100644 --- a/ui/js/component/fileActions/index.js +++ b/ui/js/component/fileActions/index.js @@ -43,6 +43,7 @@ const makeSelect = () => { const selectIsAvailableForUri = makeSelectIsAvailableForUri() const selectDownloadingForUri = makeSelectDownloadingForUri() const selectCostInfoForUri = makeSelectCostInfoForUri() + const selectLoadingForUri = makeSelectLoadingForUri() const select = (state, props) => ({ fileInfo: selectFileInfoForUri(state, props), @@ -51,6 +52,7 @@ const makeSelect = () => { modal: selectCurrentModal(state), downloading: selectDownloadingForUri(state, props), costInfo: selectCostInfoForUri(state, props), + loading: selectLoadingForUri(state, props), }) return select diff --git a/ui/js/component/fileActions/view.jsx b/ui/js/component/fileActions/view.jsx index 604261376..8b3d2678b 100644 --- a/ui/js/component/fileActions/view.jsx +++ b/ui/js/component/fileActions/view.jsx @@ -63,6 +63,7 @@ class FileActions extends React.Component { closeModal, startDownload, costInfo, + loading, } = this.props const deleteChecked = this.state.deleteChecked, @@ -73,9 +74,7 @@ class FileActions extends React.Component { let content - console.log(fileInfo) - - if (downloading) { + if (loading || downloading) { const progress = (fileInfo && fileInfo.written_bytes) ? fileInfo.written_bytes / fileInfo.total_bytes * 100 : 0, diff --git a/ui/js/component/video/view.jsx b/ui/js/component/video/view.jsx index 723b92c62..09ca9a5ac 100644 --- a/ui/js/component/video/view.jsx +++ b/ui/js/component/video/view.jsx @@ -126,7 +126,7 @@ class Video extends React.Component { return (