diff --git a/package.json b/package.json
index 55e83e3d3..609de08c9 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
"jsmediatags": "^3.8.1",
"json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git",
- "lbry-redux": "lbryio/lbry-redux#58bbdb9a2e537b3994d545ede120d070a7b41ee5",
+ "lbry-redux": "lbryio/lbry-redux#4e093983eaf3d9e7513119657d731b808ead74a6",
"lbryinc": "lbryio/lbryinc#a93596c51c8fb0a226cb84df04c26a6bb60a45fb",
"lint-staged": "^7.0.2",
"localforage": "^1.7.1",
diff --git a/src/ui/analytics.js b/src/ui/analytics.js
index 47e6eeb2f..7aff3a2f5 100644
--- a/src/ui/analytics.js
+++ b/src/ui/analytics.js
@@ -40,7 +40,7 @@ const analytics: Analytics = {
// @endif
},
apiLogView: (uri, outpoint, claimId, timeToStart) => {
- if (analyticsEnabled) {
+ if (analyticsEnabled && isProduction) {
const params: {
uri: string,
outpoint: string,
diff --git a/src/ui/component/fileDownloadLink/view.jsx b/src/ui/component/fileDownloadLink/view.jsx
index f41035954..488be2b3b 100644
--- a/src/ui/component/fileDownloadLink/view.jsx
+++ b/src/ui/component/fileDownloadLink/view.jsx
@@ -23,9 +23,7 @@ function FileDownloadLink(props: Props) {
if (loading || downloading) {
const progress = fileInfo && fileInfo.written_bytes > 0 ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0;
const label =
- fileInfo && fileInfo.written_bytes > 0
- ? __('Downloading: ') + progress.toFixed(0) + __('% complete')
- : __('Connecting...');
+ fileInfo && fileInfo.written_bytes > 0 ? progress.toFixed(0) + __('% downloaded') : __('Connecting...');
return {label};
}
diff --git a/src/ui/modal/modalRemoveFile/view.jsx b/src/ui/modal/modalRemoveFile/view.jsx
index 9fca2e35a..ccf05e277 100644
--- a/src/ui/modal/modalRemoveFile/view.jsx
+++ b/src/ui/modal/modalRemoveFile/view.jsx
@@ -54,7 +54,7 @@ function ModalRemoveFile(props: Props) {
button="primary"
label={__('OK')}
disabled={!deleteChecked && !abandonChecked}
- onClick={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}
+ onClick={() => deleteFile(outpoint || '', deleteChecked, claimIsMine ? abandonChecked : false)}
/>
diff --git a/src/ui/redux/actions/file.js b/src/ui/redux/actions/file.js
index 99b95cd7c..5bd4abc75 100644
--- a/src/ui/redux/actions/file.js
+++ b/src/ui/redux/actions/file.js
@@ -5,6 +5,7 @@ import { shell } from 'electron';
import { Lbry, batchActions, doAbandonClaim, selectMyClaimsOutpoints } from 'lbry-redux';
import { doHideModal } from 'redux/actions/app';
import { goBack } from 'connected-react-router';
+import { doSetPlayingUri } from 'redux/actions/content';
export function doOpenFileInFolder(path) {
return () => {
@@ -52,7 +53,9 @@ export function doDeleteFileAndMaybeGoBack(fileInfo, deleteFromComputer, abandon
const actions = [];
actions.push(doHideModal());
actions.push(doDeleteFile(fileInfo, deleteFromComputer, abandonClaim));
+ actions.push(doSetPlayingUri(null));
dispatch(batchActions(...actions));
+
if (abandonClaim) {
dispatch(goBack());
}
diff --git a/src/ui/scss/component/_content.scss b/src/ui/scss/component/_content.scss
index cc59f2bb6..99ad73011 100644
--- a/src/ui/scss/component/_content.scss
+++ b/src/ui/scss/component/_content.scss
@@ -23,6 +23,9 @@
position: relative;
width: 100%;
height: 100%;
+ // display: flex;
+ // flex-direction: column;
+ // justify-content: space-between;
}
.content__wrapper--floating {
@@ -85,11 +88,7 @@
}
.content__loading {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
+ height: 100%;
display: flex;
align-items: center;
flex-direction: column;
diff --git a/yarn.lock b/yarn.lock
index d1ad5cbbf..9d9bc61f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6762,9 +6762,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
yargs "^13.2.2"
zstd-codec "^0.1.1"
-lbry-redux@lbryio/lbry-redux#58bbdb9a2e537b3994d545ede120d070a7b41ee5:
+lbry-redux@lbryio/lbry-redux#4e093983eaf3d9e7513119657d731b808ead74a6:
version "0.0.1"
- resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/58bbdb9a2e537b3994d545ede120d070a7b41ee5"
+ resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/4e093983eaf3d9e7513119657d731b808ead74a6"
dependencies:
mime "^2.4.4"
proxy-polyfill "0.1.6"