Merge pull request #2739 from lbryio/fixes-2

Final fixes

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/fileViewer/index.js

@@ -8,6 +8,7 @@ import {
   makeSelectUriIsStreamable,
   makeSelectTitleForUri,
 } from 'lbry-redux';
+import { doClaimEligiblePurchaseRewards } from 'lbryinc';
 import { makeSelectIsPlaying, makeSelectShouldObscurePreview, selectPlayingUri } from 'redux/selectors/content';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import { doSetPlayingUri } from 'redux/actions/content';
@@ -34,6 +35,7 @@ const select = (state, props) => {
 const perform = dispatch => ({
   clearPlayingUri: () => dispatch(doSetPlayingUri(null)),
   triggerAnalyticsView: (uri, timeToStart) => dispatch(doAnalyticsView(uri, timeToStart)),
+  claimRewards: () => dispatch(doClaimEligiblePurchaseRewards()),
 });
 
 export default withRouter(

src/ui/component/fileViewer/view.jsx

@@ -29,6 +29,7 @@ type Props = {
   floatingPlayerEnabled: boolean,
   clearPlayingUri: () => void,
   triggerAnalyticsView: (string, number) => void,
+  claimRewards: () => void,
 };
 
 export default function FileViewer(props: Props) {
@@ -43,6 +44,7 @@ export default function FileViewer(props: Props) {
     clearPlayingUri,
     floatingPlayerEnabled,
     triggerAnalyticsView,
+    claimRewards,
   } = props;
   const [playTime, setPlayTime] = useState();
   const [fileViewerRect, setFileViewerRect] = usePersistedState('inline-file-viewer:rect');
@@ -73,9 +75,10 @@ export default function FileViewer(props: Props) {
     if (playTime && isReadyToPlay && wasntReadyButNowItIs) {
       const timeToStart = Date.now() - playTime;
       triggerAnalyticsView(uri, timeToStart);
+      claimRewards();
       setPlayTime(null);
     }
-  }, [setPlayTime, triggerAnalyticsView, isReadyToPlay, wasntReadyButNowItIs, playTime, uri]);
+  }, [setPlayTime, triggerAnalyticsView, isReadyToPlay, wasntReadyButNowItIs, playTime, uri, claimRewards]);
 
   useEffect(() => {
     function handleResize() {

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"