fix: more bugs

We should still allow file removal if someone doesn't want to delete the file from their PC, but delete it from My Library
No need to show connecting/status while claim is resolving
Fix channel edit bug on vanity url

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#027c517ec653f328eeed2cf509b1062b0f787f22",
+    "lbry-redux": "lbryio/lbry-redux#1af092ce2cb507d9a41711b864874c0bd76935ae",
     "lbryinc": "lbryio/lbryinc#1ce266b3c52654190b955e9c869b8e302aa5c585",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",

src/ui/component/channelEdit/index.js

@@ -7,6 +7,7 @@ import {
   makeSelectMetadataItemForUri,
   doUpdateChannel,
   makeSelectAmountForUri,
+  makeSelectClaimForUri,
 } from 'lbry-redux';
 import ChannelPage from './view';
 
@@ -22,6 +23,7 @@ const select = (state, props) => ({
   locations: makeSelectMetadataItemForUri(props.uri, 'locations')(state),
   languages: makeSelectMetadataItemForUri(props.uri, 'languages')(state),
   amount: makeSelectAmountForUri(props.uri)(state),
+  claim: makeSelectClaimForUri(props.uri)(state),
 });
 
 const perform = dispatch => ({

src/ui/component/channelEdit/view.jsx

@@ -1,13 +1,12 @@
 // @flow
 import React, { useState } from 'react';
-import { parseURI } from 'lbry-redux';
 import { Form, FormField } from 'component/common/form';
 import Button from 'component/button';
 import SelectAsset from 'component/selectAsset';
 import TagSelect from 'component/tagsSelect';
 
 type Props = {
-  uri: string,
+  claim: ChannelClaim,
   title: ?string,
   amount: string,
   cover: ?string,
@@ -28,7 +27,7 @@ type Props = {
 
 function ChannelForm(props: Props) {
   const {
-    uri,
+    claim,
     title,
     cover,
     description,
@@ -44,7 +43,7 @@ function ChannelForm(props: Props) {
     updateThumb,
     updateCover,
   } = props;
-  const { claimId } = parseURI(uri);
+  const { claim_id: claimId } = claim;
 
   // fill this in with sdk data
   const channelParams = {

src/ui/component/fileDownloadLink/index.js

@@ -1,10 +1,5 @@
 import { connect } from 'react-redux';
-import {
-  makeSelectFileInfoForUri,
-  makeSelectDownloadingForUri,
-  makeSelectLoadingForUri,
-  makeSelectClaimIsMine,
-} from 'lbry-redux';
+import { makeSelectFileInfoForUri, makeSelectDownloadingForUri, makeSelectClaimIsMine } from 'lbry-redux';
 import { doOpenModal } from 'redux/actions/app';
 import { doSetPlayingUri, doPlayUri } from 'redux/actions/content';
 import FileDownloadLink from './view';
@@ -12,7 +7,6 @@ import FileDownloadLink from './view';
 const select = (state, props) => ({
   fileInfo: makeSelectFileInfoForUri(props.uri)(state),
   downloading: makeSelectDownloadingForUri(props.uri)(state),
-  loading: makeSelectLoadingForUri(props.uri)(state),
   claimIsMine: makeSelectClaimIsMine(props.uri)(state),
 });
 

src/ui/component/fileDownloadLink/view.jsx

@@ -9,7 +9,6 @@ type Props = {
   uri: string,
   claimIsMine: boolean,
   downloading: boolean,
-  loading: boolean,
   isStreamable: boolean,
   fileInfo: ?FileListItem,
   openModal: (id: string, { path: string }) => void,
@@ -18,9 +17,9 @@ type Props = {
 };
 
 function FileDownloadLink(props: Props) {
-  const { fileInfo, downloading, loading, openModal, pause, claimIsMine, download, uri } = props;
+  const { fileInfo, downloading, openModal, pause, claimIsMine, download, uri } = props;
 
-  if (downloading || loading) {
+  if (downloading) {
     const progress = fileInfo && fileInfo.written_bytes > 0 ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0;
     const label =
       fileInfo && fileInfo.written_bytes > 0 ? progress.toFixed(0) + __('% downloaded') : __('Connecting...');

src/ui/modal/modalRemoveFile/view.jsx

@@ -48,7 +48,7 @@ function ModalRemoveFile(props: Props) {
           />
         )}
         <div className="card__actions">
-          <Button type="submit" button="primary" label={__('OK')} disabled={!deleteChecked && !abandonChecked} />
+          <Button type="submit" button="primary" label={__('OK')} />
           <Button button="link" label={__('Cancel')} onClick={closeModal} />
         </div>
       </Form>

src/ui/redux/actions/file.js

@@ -53,7 +53,7 @@ export function doDeleteFileAndMaybeGoBack(uri, deleteFromComputer, abandonClaim
   return (dispatch, getState) => {
     const state = getState();
     const playingUri = selectPlayingUri(state);
-    const { outpoint } = makeSelectFileInfoForUri(uri)(state);
+    const { outpoint } = makeSelectFileInfoForUri(uri)(state) || '';
     const actions = [];
     actions.push(doHideModal());
     actions.push(doDeleteFile(outpoint, deleteFromComputer, abandonClaim));

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#027c517ec653f328eeed2cf509b1062b0f787f22:
+lbry-redux@lbryio/lbry-redux#1af092ce2cb507d9a41711b864874c0bd76935ae:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/027c517ec653f328eeed2cf509b1062b0f787f22"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/1af092ce2cb507d9a41711b864874c0bd76935ae"
   dependencies:
     mime "^2.4.4"
     proxy-polyfill "0.1.6"