fix: abandoning without file
This fixes not being able to abandon without first downloading the file. I noticed the "go back" part is broken here and in the prod app...Sean can you see what's up there?
This commit is contained in:
parent
f8c4d6dce4
commit
6f0d42cb37
1 changed files with 12 additions and 2 deletions
|
@ -2,7 +2,14 @@ import * as ACTIONS from 'constants/action_types';
|
||||||
// @if TARGET='app'
|
// @if TARGET='app'
|
||||||
import { shell } from 'electron';
|
import { shell } from 'electron';
|
||||||
// @endif
|
// @endif
|
||||||
import { Lbry, batchActions, doAbandonClaim, selectMyClaimsOutpoints, makeSelectFileInfoForUri } from 'lbry-redux';
|
import {
|
||||||
|
Lbry,
|
||||||
|
batchActions,
|
||||||
|
doAbandonClaim,
|
||||||
|
selectMyClaimsOutpoints,
|
||||||
|
makeSelectFileInfoForUri,
|
||||||
|
makeSelectClaimForUri,
|
||||||
|
} from 'lbry-redux';
|
||||||
import { doHideModal } from 'redux/actions/app';
|
import { doHideModal } from 'redux/actions/app';
|
||||||
import { goBack } from 'connected-react-router';
|
import { goBack } from 'connected-react-router';
|
||||||
import { doSetPlayingUri } from 'redux/actions/content';
|
import { doSetPlayingUri } from 'redux/actions/content';
|
||||||
|
@ -54,9 +61,12 @@ export function doDeleteFileAndMaybeGoBack(uri, deleteFromComputer, abandonClaim
|
||||||
const state = getState();
|
const state = getState();
|
||||||
const playingUri = selectPlayingUri(state);
|
const playingUri = selectPlayingUri(state);
|
||||||
const { outpoint } = makeSelectFileInfoForUri(uri)(state) || '';
|
const { outpoint } = makeSelectFileInfoForUri(uri)(state) || '';
|
||||||
|
const { nout, txid } = makeSelectClaimForUri(uri)(state);
|
||||||
|
const claimOutpoint = `${txid}:${nout}`;
|
||||||
|
|
||||||
const actions = [];
|
const actions = [];
|
||||||
actions.push(doHideModal());
|
actions.push(doHideModal());
|
||||||
actions.push(doDeleteFile(outpoint, deleteFromComputer, abandonClaim));
|
actions.push(doDeleteFile(outpoint || claimOutpoint, deleteFromComputer, abandonClaim));
|
||||||
|
|
||||||
if (playingUri === uri) {
|
if (playingUri === uri) {
|
||||||
actions.push(doSetPlayingUri(null));
|
actions.push(doSetPlayingUri(null));
|
||||||
|
|
Loading…
Add table
Reference in a new issue