From f2c51f77358a3f09ac9a2d986eeba57b103f05a9 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Tue, 2 Jul 2019 22:30:34 -0400
Subject: [PATCH 1/5] successfully publishes using lbry-redux

updates lbry-redux hash

adds streamPublish success and fail callbacks

passing callbacks in doPublish( success, fail )

update redux

prepare rebase
---
 .../publishAdditionalOptions/index.js         |   9 +-
 src/ui/component/publishFile/index.js         |   5 +-
 src/ui/component/publishForm/index.js         |  10 +-
 src/ui/component/publishForm/view.jsx         |   2 +-
 src/ui/component/publishFormErrors/index.js   |   2 +-
 src/ui/component/publishName/index.js         |   9 +-
 src/ui/component/publishPrice/index.js        |   3 +-
 src/ui/component/publishText/index.js         |   3 +-
 src/ui/component/selectThumbnail/index.js     |   9 +-
 src/ui/index.jsx                              |  50 +++-
 .../modal/modalAutoGenerateThumbnail/index.js |   3 +-
 .../modalConfirmThumbnailUpload/index.js      |   2 +-
 src/ui/modal/modalPublish/index.js            |   2 +-
 src/ui/page/file/index.js                     |   2 +-
 src/ui/page/fileListPublished/index.js        |   3 +-
 src/ui/reducers.js                            |   3 +-
 src/ui/redux/actions/publish.js               |  64 +++++-
 src/ui/redux/reducers/publish.js              | 214 +++++++++---------
 18 files changed, 243 insertions(+), 152 deletions(-)

diff --git a/src/ui/component/publishAdditionalOptions/index.js b/src/ui/component/publishAdditionalOptions/index.js
index 0d1481e57..463b8cb05 100644
--- a/src/ui/component/publishAdditionalOptions/index.js
+++ b/src/ui/component/publishAdditionalOptions/index.js
@@ -1,19 +1,18 @@
 import { connect } from 'react-redux';
-import { doResolveUri, selectBalance } from 'lbry-redux';
 import {
+  doResolveUri,
+  selectBalance,
   selectPublishFormValues,
   selectIsStillEditing,
   selectMyClaimForUri,
   selectIsResolvingPublishUris,
   selectTakeOverAmount,
-} from 'redux/selectors/publish';
-import {
   doResetThumbnailStatus,
   doClearPublish,
   doUpdatePublishForm,
-  doPublish,
   doPrepareEdit,
-} from 'redux/actions/publish';
+} from 'lbry-redux';
+import { doPublish } from 'redux/actions/publish';
 import { selectUnclaimedRewardValue } from 'lbryinc';
 import PublishPage from './view';
 
diff --git a/src/ui/component/publishFile/index.js b/src/ui/component/publishFile/index.js
index 5d909d94d..21525c70c 100644
--- a/src/ui/component/publishFile/index.js
+++ b/src/ui/component/publishFile/index.js
@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
-import { selectBalance } from 'lbry-redux';
-import { selectIsStillEditing, makeSelectPublishFormValue } from 'redux/selectors/publish';
-import { doUpdatePublishForm } from 'redux/actions/publish';
+
+import { selectBalance, selectIsStillEditing, makeSelectPublishFormValue, doUpdatePublishForm } from 'lbry-redux';
 import PublishPage from './view';
 
 const select = state => ({
diff --git a/src/ui/component/publishForm/index.js b/src/ui/component/publishForm/index.js
index 929e444ed..7c27d24ec 100644
--- a/src/ui/component/publishForm/index.js
+++ b/src/ui/component/publishForm/index.js
@@ -1,19 +1,17 @@
 import { connect } from 'react-redux';
-import { doResolveUri } from 'lbry-redux';
 import {
+  doResolveUri,
   selectPublishFormValues,
   selectIsStillEditing,
   selectMyClaimForUri,
   selectIsResolvingPublishUris,
   selectTakeOverAmount,
-} from 'redux/selectors/publish';
-import {
   doResetThumbnailStatus,
   doClearPublish,
   doUpdatePublishForm,
-  doPublish,
   doPrepareEdit,
-} from 'redux/actions/publish';
+} from 'lbry-redux';
+import { doPublish } from 'redux/actions/publish';
 import { selectUnclaimedRewardValue } from 'lbryinc';
 import PublishPage from './view';
 
@@ -34,7 +32,7 @@ const perform = dispatch => ({
   updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
   clearPublish: () => dispatch(doClearPublish()),
   resolveUri: uri => dispatch(doResolveUri(uri)),
-  publish: params => dispatch(doPublish(params)),
+  publish: (success, fail) => dispatch(doPublish(success, fail)),
   prepareEdit: (claim, uri) => dispatch(doPrepareEdit(claim, uri)),
   resetThumbnailStatus: () => dispatch(doResetThumbnailStatus()),
 });
diff --git a/src/ui/component/publishForm/view.jsx b/src/ui/component/publishForm/view.jsx
index bae773b6f..b4c1167a0 100644
--- a/src/ui/component/publishForm/view.jsx
+++ b/src/ui/component/publishForm/view.jsx
@@ -170,7 +170,7 @@ function PublishForm(props: Props) {
           <div className="card__actions">
             <Button
               button="primary"
-              onClick={publish}
+              onClick={() => publish(success, fail)}
               label={submitLabel}
               disabled={formDisabled || !formValid || uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS}
             />
diff --git a/src/ui/component/publishFormErrors/index.js b/src/ui/component/publishFormErrors/index.js
index 9a1332d94..54ddef686 100644
--- a/src/ui/component/publishFormErrors/index.js
+++ b/src/ui/component/publishFormErrors/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { makeSelectPublishFormValue, selectIsStillEditing } from 'redux/selectors/publish';
+import { makeSelectPublishFormValue, selectIsStillEditing } from 'lbry-redux';
 import PublishPage from './view';
 
 const select = state => ({
diff --git a/src/ui/component/publishName/index.js b/src/ui/component/publishName/index.js
index ef6ca56da..53a739789 100644
--- a/src/ui/component/publishName/index.js
+++ b/src/ui/component/publishName/index.js
@@ -5,9 +5,11 @@ import {
   selectMyClaimForUri,
   selectIsResolvingPublishUris,
   selectTakeOverAmount,
-} from 'redux/selectors/publish';
-import { doUpdatePublishForm, doPrepareEdit } from 'redux/actions/publish';
-import { selectBalance } from 'lbry-redux';
+  doUpdatePublishForm,
+  doPrepareEdit,
+  selectBalance,
+} from 'lbry-redux';
+
 import PublishPage from './view';
 
 const select = state => ({
@@ -15,7 +17,6 @@ const select = state => ({
   channel: makeSelectPublishFormValue('channel')(state),
   bid: makeSelectPublishFormValue('bid')(state),
   uri: makeSelectPublishFormValue('uri')(state),
-  bid: makeSelectPublishFormValue('bid')(state),
   isStillEditing: selectIsStillEditing(state),
   isResolvingUri: selectIsResolvingPublishUris(state),
   amountNeededForTakeover: selectTakeOverAmount(state),
diff --git a/src/ui/component/publishPrice/index.js b/src/ui/component/publishPrice/index.js
index 255f02dc1..7313d0f9c 100644
--- a/src/ui/component/publishPrice/index.js
+++ b/src/ui/component/publishPrice/index.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
-import { doUpdatePublishForm } from 'redux/actions/publish';
-import { makeSelectPublishFormValue } from 'redux/selectors/publish';
+import { makeSelectPublishFormValue, doUpdatePublishForm } from 'lbry-redux';
 import PublishPage from './view';
 
 const select = state => ({
diff --git a/src/ui/component/publishText/index.js b/src/ui/component/publishText/index.js
index f9f7933e5..da8902408 100644
--- a/src/ui/component/publishText/index.js
+++ b/src/ui/component/publishText/index.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
-import { makeSelectPublishFormValue } from 'redux/selectors/publish';
-import { doUpdatePublishForm } from 'redux/actions/publish';
+import { doUpdatePublishForm, makeSelectPublishFormValue } from 'lbry-redux';
 import PublishPage from './view';
 
 const select = state => ({
diff --git a/src/ui/component/selectThumbnail/index.js b/src/ui/component/selectThumbnail/index.js
index 1311ed7d5..87ccdb780 100644
--- a/src/ui/component/selectThumbnail/index.js
+++ b/src/ui/component/selectThumbnail/index.js
@@ -1,20 +1,19 @@
 import { connect } from 'react-redux';
-import { doResolveUri } from 'lbry-redux';
 import {
+  doResolveUri,
   selectPublishFormValues,
   selectIsStillEditing,
   selectMyClaimForUri,
   selectIsResolvingPublishUris,
   selectTakeOverAmount,
-} from 'redux/selectors/publish';
-import {
   doResetThumbnailStatus,
   doClearPublish,
   doUpdatePublishForm,
-  doPublish,
   doPrepareEdit,
-} from 'redux/actions/publish';
+} from 'lbry-redux';
+
 import { doOpenModal } from 'redux/actions/app';
+import { doPublish } from 'redux/actions/publish';
 import { selectUnclaimedRewardValue } from 'lbryinc';
 import PublishPage from './view';
 
diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index c7c62822a..a0319324d 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -12,7 +12,16 @@ import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import { doConditionalAuthNavigate, doDaemonReady, doAutoUpdate, doOpenModal, doHideModal } from 'redux/actions/app';
-import { Lbry, doToast, isURIValid, setSearchApi } from 'lbry-redux';
+import {
+  Lbry,
+  doToast,
+  isURIValid,
+  setSearchApi,
+  // reduxCallbacks,
+  // batchActions,
+  // selectMyClaimsWithoutChannels,
+  // doError,
+} from 'lbry-redux';
 import { doInitLanguage, doUpdateIsNightAsync } from 'redux/actions/settings';
 import {
   doAuthenticate,
@@ -129,6 +138,45 @@ rewards.setCallback('claimRewardSuccess', () => {
   app.store.dispatch(doHideModal(MODALS.REWARD_APPROVAL_REQUIRED));
 });
 
+// mimicking app.js.doOpenModal(id, modalProps {}) here
+// reduxCallbacks.setCallback('streamPublishSuccess', successResponse => {
+//   const state = store.getState();
+//   analytics.apiLogPublish();
+//   const myClaims = selectMyClaimsWithoutChannels(state);
+//   const pendingClaim = successResponse.outputs[0];
+//   const uri = pendingClaim.permanent_url;
+//   const actions = [];
+//
+//   actions.push({
+//     type: ACTIONS.PUBLISH_SUCCESS,
+//   });
+//
+//   // We have to fake a temp claim until the new pending one is returned by claim_list_mine
+//   // We can't rely on claim_list_mine because there might be some delay before the new claims are returned
+//   // Doing this allows us to show the pending claim immediately, it will get overwritten by the real one
+//   const isMatch = claim => claim.claim_id === pendingClaim.claim_id;
+//   const isEdit = myClaims.some(isMatch);
+//
+//   const myNewClaims = isEdit
+//     ? myClaims.map(claim => (isMatch(claim) ? pendingClaim : claim))
+//     : myClaims.concat(pendingClaim);
+//
+//   actions.push(doOpenModal(MODALS.PUBLISH, { uri, isEdit }));
+//
+//   actions.push({
+//     type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
+//     data: {
+//       claims: myNewClaims,
+//     },
+//   });
+//
+//   store.dispatch(batchActions(...actions));
+// });
+//
+// reduxCallbacks.setCallback('streamPublishFail', error => {
+//   store.dispatch({ type: ACTIONS.PUBLISH_FAIL });
+//   store.dispatch(doError(error.message));
+// });
 // @if TARGET='app'
 ipcRenderer.on('open-uri-requested', (event, uri, newSession) => {
   if (uri && uri.startsWith('lbry://')) {
diff --git a/src/ui/modal/modalAutoGenerateThumbnail/index.js b/src/ui/modal/modalAutoGenerateThumbnail/index.js
index f1d3234bc..d17116afe 100644
--- a/src/ui/modal/modalAutoGenerateThumbnail/index.js
+++ b/src/ui/modal/modalAutoGenerateThumbnail/index.js
@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 import { doHideModal } from 'redux/actions/app';
-import { doUploadThumbnail } from 'redux/actions/publish';
-import { doToast } from 'lbry-redux';
+import { doToast, doUploadThumbnail } from 'lbry-redux';
 import ModalAutoGenerateThumbnail from './view';
 
 const perform = dispatch => ({
diff --git a/src/ui/modal/modalConfirmThumbnailUpload/index.js b/src/ui/modal/modalConfirmThumbnailUpload/index.js
index 6e60f6520..f30c9a74f 100644
--- a/src/ui/modal/modalConfirmThumbnailUpload/index.js
+++ b/src/ui/modal/modalConfirmThumbnailUpload/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { doHideModal } from 'redux/actions/app';
-import { doUploadThumbnail, doUpdatePublishForm } from 'redux/actions/publish';
+import { doUploadThumbnail, doUpdatePublishForm } from 'lbry-redux';
 import ModalConfirmThumbnailUpload from './view';
 
 const perform = dispatch => ({
diff --git a/src/ui/modal/modalPublish/index.js b/src/ui/modal/modalPublish/index.js
index f6c26449d..e7f5efdf0 100644
--- a/src/ui/modal/modalPublish/index.js
+++ b/src/ui/modal/modalPublish/index.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { doHideModal } from 'redux/actions/app';
 import ModalPublishSuccess from './view';
-import { doClearPublish } from 'redux/actions/publish';
+import { doClearPublish } from 'lbry-redux';
 import { push } from 'connected-react-router';
 
 const perform = dispatch => ({
diff --git a/src/ui/page/file/index.js b/src/ui/page/file/index.js
index 6a19d2d0f..c2ddd41e6 100644
--- a/src/ui/page/file/index.js
+++ b/src/ui/page/file/index.js
@@ -16,11 +16,11 @@ import {
   makeSelectTitleForUri,
   makeSelectThumbnailForUri,
   makeSelectClaimIsNsfw,
+  doPrepareEdit,
 } from 'lbry-redux';
 import { doFetchViewCount, makeSelectViewCountForUri, makeSelectCostInfoForUri, doFetchCostInfoForUri } from 'lbryinc';
 import { selectShowNsfw, makeSelectClientSetting } from 'redux/selectors/settings';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
-import { doPrepareEdit } from 'redux/actions/publish';
 import { doOpenModal } from 'redux/actions/app';
 import FilePage from './view';
 
diff --git a/src/ui/page/fileListPublished/index.js b/src/ui/page/fileListPublished/index.js
index a1bfceff6..9a6c75c79 100644
--- a/src/ui/page/fileListPublished/index.js
+++ b/src/ui/page/fileListPublished/index.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
-import { selectIsFetchingClaimListMine, selectMyClaimUrisWithoutChannels } from 'lbry-redux';
-import { doCheckPendingPublishes } from 'redux/actions/publish';
+import { selectIsFetchingClaimListMine, selectMyClaimUrisWithoutChannels, doCheckPendingPublishes } from 'lbry-redux';
 import FileListPublished from './view';
 
 const select = state => ({
diff --git a/src/ui/reducers.js b/src/ui/reducers.js
index 66f0ae7c0..e3d7d04ed 100644
--- a/src/ui/reducers.js
+++ b/src/ui/reducers.js
@@ -8,6 +8,7 @@ import {
   notificationsReducer,
   tagsReducer,
   commentReducer,
+  publishReducer,
 } from 'lbry-redux';
 import {
   userReducer,
@@ -23,7 +24,7 @@ import availabilityReducer from 'redux/reducers/availability';
 import contentReducer from 'redux/reducers/content';
 import settingsReducer from 'redux/reducers/settings';
 import subscriptionsReducer from 'redux/reducers/subscriptions';
-import publishReducer from 'redux/reducers/publish';
+
 
 export default history =>
   combineReducers({
diff --git a/src/ui/redux/actions/publish.js b/src/ui/redux/actions/publish.js
index 112a83b16..698108a58 100644
--- a/src/ui/redux/actions/publish.js
+++ b/src/ui/redux/actions/publish.js
@@ -9,19 +9,23 @@ import {
   batchActions,
   creditsToString,
   selectPendingById,
-  selectMyClaimsWithoutChannels,
   doError,
   isClaimNsfw,
+  selectMyClaimForUri,
+  selectPublishFormValues,
+  selectMyClaimsWithoutChannels,
 } from 'lbry-redux';
-import { doOpenModal } from 'redux/actions/app';
+// import { doOpenModal } from 'redux/actions/app';
 import { selectosNotificationsEnabled } from 'redux/selectors/settings';
-import { selectMyClaimForUri, selectPublishFormValues } from 'redux/selectors/publish';
 import { push } from 'connected-react-router';
-import analytics from 'analytics';
+// import analytics from 'analytics';
 import { formatLbryUriForWeb } from 'util/uri';
 // @if TARGET='app'
 import fs from 'fs';
 import path from 'path';
+import { store } from '../../store';
+import analytics from '../../analytics';
+import { doOpenModal } from './app';
 // @endif
 
 export const doResetThumbnailStatus = () => (dispatch: Dispatch) => {
@@ -207,6 +211,49 @@ export const doPrepareEdit = (claim: StreamClaim, uri: string, fileInfo: FileLis
   dispatch({ type: ACTIONS.DO_PREPARE_EDIT, data: publishData });
 };
 
+const publishSuccess = successResponse => {
+  const state = store.getState();
+  analytics.apiLogPublish();
+  const myClaims = selectMyClaimsWithoutChannels(state);
+  const pendingClaim = successResponse.outputs[0];
+  const uri = pendingClaim.permanent_url;
+  const actions = [];
+
+  actions.push({
+    type: ACTIONS.PUBLISH_SUCCESS,
+  });
+
+  // We have to fake a temp claim until the new pending one is returned by claim_list_mine
+  // We can't rely on claim_list_mine because there might be some delay before the new claims are returned
+  // Doing this allows us to show the pending claim immediately, it will get overwritten by the real one
+  const isMatch = claim => claim.claim_id === pendingClaim.claim_id;
+  const isEdit = myClaims.some(isMatch);
+
+  const myNewClaims = isEdit
+    ? myClaims.map(claim => (isMatch(claim) ? pendingClaim : claim))
+    : myClaims.concat(pendingClaim);
+
+  actions.push(doOpenModal(MODALS.PUBLISH, { uri, isEdit }));
+
+  actions.push({
+    type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
+    data: {
+      claims: myNewClaims,
+    },
+  });
+
+  store.dispatch(batchActions(...actions));
+};
+
+const publishFail = error => {
+  store.dispatch({ type: ACTIONS.PUBLISH_FAIL });
+  store.dispatch(doError(error.message));
+};
+
+export const doPublishDesktop = (publishSuccess, publishFail) => {
+  doPublish(publishSuccess, publishFail);
+};
+
 export const doPublish = () => (dispatch: Dispatch, getState: () => {}) => {
   dispatch({ type: ACTIONS.PUBLISH_START });
 
@@ -252,17 +299,20 @@ export const doPublish = () => (dispatch: Dispatch, getState: () => {}) => {
 
   const publishPayload: {
     name: ?string,
-    channel_id?: string,
     bid: number,
+    description?: string,
+    channel_id?: string,
     file_path?: string,
-    tags: Array<string>,
-    locations?: Array<Location>,
+
     license_url?: string,
     license?: string,
     thumbnail_url?: string,
     release_time?: number,
     fee_currency?: string,
     fee_amount?: string,
+    tags: Array<string>,
+    locations?: Array<Location>,
+    languages?: Array<string>,
   } = {
     name,
     title,
diff --git a/src/ui/redux/reducers/publish.js b/src/ui/redux/reducers/publish.js
index 2749e666b..6b4bcad56 100644
--- a/src/ui/redux/reducers/publish.js
+++ b/src/ui/redux/reducers/publish.js
@@ -1,107 +1,107 @@
-// @flow
-import { handleActions } from 'util/redux-utils';
-import { buildURI } from 'lbry-redux';
-import * as ACTIONS from 'constants/action_types';
-import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses';
-import { CHANNEL_ANONYMOUS } from 'constants/claim';
-
-type PublishState = {
-  editingURI: ?string,
-  filePath: ?string,
-  contentIsFree: boolean,
-  fee: {
-    amount: number,
-    currency: string,
-  },
-  title: string,
-  thumbnail_url: string,
-  thumbnailPath: string,
-  uploadThumbnailStatus: string,
-  description: string,
-  language: string,
-  channel: string,
-  channelId: ?string,
-  name: string,
-  nameError: ?string,
-  bid: number,
-  bidError: ?string,
-  otherLicenseDescription: string,
-  licenseUrl: string,
-  tags: Array<string>,
-};
-
-const defaultState: PublishState = {
-  editingURI: undefined,
-  filePath: undefined,
-  contentIsFree: true,
-  fee: {
-    amount: 1,
-    currency: 'LBC',
-  },
-  title: '',
-  thumbnail_url: '',
-  thumbnailPath: '',
-  uploadThumbnailStatus: THUMBNAIL_STATUSES.API_DOWN,
-  description: '',
-  language: 'en',
-  nsfw: false,
-  channel: CHANNEL_ANONYMOUS,
-  channelId: '',
-  name: '',
-  nameError: undefined,
-  bid: 0.1,
-  bidError: undefined,
-  licenseType: 'None',
-  otherLicenseDescription: 'All rights reserved',
-  licenseUrl: '',
-  tags: [],
-  publishing: false,
-  publishSuccess: false,
-  publishError: undefined,
-};
-
-export default handleActions(
-  {
-    [ACTIONS.UPDATE_PUBLISH_FORM]: (state, action): PublishState => {
-      const { data } = action;
-      return {
-        ...state,
-        ...data,
-      };
-    },
-    [ACTIONS.CLEAR_PUBLISH]: (): PublishState => ({
-      ...defaultState,
-    }),
-    [ACTIONS.PUBLISH_START]: (state: PublishState): PublishState => ({
-      ...state,
-      publishing: true,
-    }),
-    [ACTIONS.PUBLISH_FAIL]: (state: PublishState): PublishState => ({
-      ...state,
-      publishing: false,
-    }),
-    [ACTIONS.PUBLISH_SUCCESS]: (state: PublishState): PublishState => ({
-      ...state,
-      publishing: false,
-    }),
-    [ACTIONS.DO_PREPARE_EDIT]: (state: PublishState, action) => {
-      const { ...publishData } = action.data;
-      const { channel, name, uri } = publishData;
-
-      // The short uri is what is presented to the user
-      // The editingUri is the full uri with claim id
-      const shortUri = buildURI({
-        channelName: channel,
-        contentName: name,
-      });
-
-      return {
-        ...defaultState,
-        ...publishData,
-        editingURI: uri,
-        uri: shortUri,
-      };
-    },
-  },
-  defaultState
-);
+// // @flow
+// import { handleActions } from 'util/redux-utils';
+// import { buildURI } from 'lbry-redux';
+// import * as ACTIONS from 'constants/action_types';
+// import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses';
+// import { CHANNEL_ANONYMOUS } from 'constants/claim';
+//
+// type PublishState = {
+//   editingURI: ?string,
+//   filePath: ?string,
+//   contentIsFree: boolean,
+//   fee: {
+//     amount: number,
+//     currency: string,
+//   },
+//   title: string,
+//   thumbnail_url: string,
+//   thumbnailPath: string,
+//   uploadThumbnailStatus: string,
+//   description: string,
+//   language: string,
+//   channel: string,
+//   channelId: ?string,
+//   name: string,
+//   nameError: ?string,
+//   bid: number,
+//   bidError: ?string,
+//   otherLicenseDescription: string,
+//   licenseUrl: string,
+//   tags: Array<string>,
+// };
+//
+// const defaultState: PublishState = {
+//   editingURI: undefined,
+//   filePath: undefined,
+//   contentIsFree: true,
+//   fee: {
+//     amount: 1,
+//     currency: 'LBC',
+//   },
+//   title: '',
+//   thumbnail_url: '',
+//   thumbnailPath: '',
+//   uploadThumbnailStatus: THUMBNAIL_STATUSES.API_DOWN,
+//   description: '',
+//   language: 'en',
+//   nsfw: false,
+//   channel: CHANNEL_ANONYMOUS,
+//   channelId: '',
+//   name: '',
+//   nameError: undefined,
+//   bid: 0.1,
+//   bidError: undefined,
+//   licenseType: 'None',
+//   otherLicenseDescription: 'All rights reserved',
+//   licenseUrl: '',
+//   tags: [],
+//   publishing: false,
+//   publishSuccess: false,
+//   publishError: undefined,
+// };
+//
+// export default handleActions(
+//   {
+//     [ACTIONS.UPDATE_PUBLISH_FORM]: (state, action): PublishState => {
+//       const { data } = action;
+//       return {
+//         ...state,
+//         ...data,
+//       };
+//     },
+//     [ACTIONS.CLEAR_PUBLISH]: (): PublishState => ({
+//       ...defaultState,
+//     }),
+//     [ACTIONS.PUBLISH_START]: (state: PublishState): PublishState => ({
+//       ...state,
+//       publishing: true,
+//     }),
+//     [ACTIONS.PUBLISH_FAIL]: (state: PublishState): PublishState => ({
+//       ...state,
+//       publishing: false,
+//     }),
+//     [ACTIONS.PUBLISH_SUCCESS]: (state: PublishState): PublishState => ({
+//       ...state,
+//       publishing: false,
+//     }),
+//     [ACTIONS.DO_PREPARE_EDIT]: (state: PublishState, action) => {
+//       const { ...publishData } = action.data;
+//       const { channel, name, uri } = publishData;
+//
+//       // The short uri is what is presented to the user
+//       // The editingUri is the full uri with claim id
+//       const shortUri = buildURI({
+//         channelName: channel,
+//         contentName: name,
+//       });
+//
+//       return {
+//         ...defaultState,
+//         ...publishData,
+//         editingURI: uri,
+//         uri: shortUri,
+//       };
+//     },
+//   },
+//   defaultState
+// );
-- 
2.45.2


From 76b554732302c9920ff5f5912441cc132ba9d235 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Fri, 12 Jul 2019 10:58:24 -0400
Subject: [PATCH 2/5] moves publish callback into desktop redux wrapper

---
 .../publishAdditionalOptions/index.js         |   4 +-
 src/ui/component/publishForm/index.js         |   4 +-
 src/ui/component/publishForm/view.jsx         |   2 +-
 src/ui/component/selectThumbnail/index.js     |   4 +-
 src/ui/redux/actions/publish.js               | 471 +++---------------
 5 files changed, 75 insertions(+), 410 deletions(-)

diff --git a/src/ui/component/publishAdditionalOptions/index.js b/src/ui/component/publishAdditionalOptions/index.js
index 463b8cb05..fdb542edb 100644
--- a/src/ui/component/publishAdditionalOptions/index.js
+++ b/src/ui/component/publishAdditionalOptions/index.js
@@ -12,7 +12,7 @@ import {
   doUpdatePublishForm,
   doPrepareEdit,
 } from 'lbry-redux';
-import { doPublish } from 'redux/actions/publish';
+import { doPublishDesktop } from 'redux/actions/publish';
 import { selectUnclaimedRewardValue } from 'lbryinc';
 import PublishPage from './view';
 
@@ -34,7 +34,7 @@ const perform = dispatch => ({
   updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
   clearPublish: () => dispatch(doClearPublish()),
   resolveUri: uri => dispatch(doResolveUri(uri)),
-  publish: params => dispatch(doPublish(params)),
+  publish: () => dispatch(doPublishDesktop()),
   prepareEdit: (claim, uri) => dispatch(doPrepareEdit(claim, uri)),
   resetThumbnailStatus: () => dispatch(doResetThumbnailStatus()),
 });
diff --git a/src/ui/component/publishForm/index.js b/src/ui/component/publishForm/index.js
index 7c27d24ec..8b8457aa9 100644
--- a/src/ui/component/publishForm/index.js
+++ b/src/ui/component/publishForm/index.js
@@ -11,7 +11,7 @@ import {
   doUpdatePublishForm,
   doPrepareEdit,
 } from 'lbry-redux';
-import { doPublish } from 'redux/actions/publish';
+import { doPublishDesktop } from 'redux/actions/publish';
 import { selectUnclaimedRewardValue } from 'lbryinc';
 import PublishPage from './view';
 
@@ -32,7 +32,7 @@ const perform = dispatch => ({
   updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
   clearPublish: () => dispatch(doClearPublish()),
   resolveUri: uri => dispatch(doResolveUri(uri)),
-  publish: (success, fail) => dispatch(doPublish(success, fail)),
+  publish: () => dispatch(doPublishDesktop()),
   prepareEdit: (claim, uri) => dispatch(doPrepareEdit(claim, uri)),
   resetThumbnailStatus: () => dispatch(doResetThumbnailStatus()),
 });
diff --git a/src/ui/component/publishForm/view.jsx b/src/ui/component/publishForm/view.jsx
index b4c1167a0..bae773b6f 100644
--- a/src/ui/component/publishForm/view.jsx
+++ b/src/ui/component/publishForm/view.jsx
@@ -170,7 +170,7 @@ function PublishForm(props: Props) {
           <div className="card__actions">
             <Button
               button="primary"
-              onClick={() => publish(success, fail)}
+              onClick={publish}
               label={submitLabel}
               disabled={formDisabled || !formValid || uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS}
             />
diff --git a/src/ui/component/selectThumbnail/index.js b/src/ui/component/selectThumbnail/index.js
index 87ccdb780..e1eef354f 100644
--- a/src/ui/component/selectThumbnail/index.js
+++ b/src/ui/component/selectThumbnail/index.js
@@ -13,7 +13,7 @@ import {
 } from 'lbry-redux';
 
 import { doOpenModal } from 'redux/actions/app';
-import { doPublish } from 'redux/actions/publish';
+import { doPublishDesktop } from 'redux/actions/publish';
 import { selectUnclaimedRewardValue } from 'lbryinc';
 import PublishPage from './view';
 
@@ -34,7 +34,7 @@ const perform = dispatch => ({
   updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
   clearPublish: () => dispatch(doClearPublish()),
   resolveUri: uri => dispatch(doResolveUri(uri)),
-  publish: params => dispatch(doPublish(params)),
+  publish: () => dispatch(doPublishDesktop()),
   prepareEdit: (claim, uri) => dispatch(doPrepareEdit(claim, uri)),
   resetThumbnailStatus: () => dispatch(doResetThumbnailStatus()),
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
diff --git a/src/ui/redux/actions/publish.js b/src/ui/redux/actions/publish.js
index 698108a58..f68b2f052 100644
--- a/src/ui/redux/actions/publish.js
+++ b/src/ui/redux/actions/publish.js
@@ -1,369 +1,33 @@
 // @flow
-import { CC_LICENSES, COPYRIGHT, OTHER, NONE, PUBLIC_DOMAIN } from 'constants/licenses';
 import * as MODALS from 'constants/modal_types';
 import {
-  ACTIONS,
-  Lbry,
-  selectMyChannelClaims,
-  THUMBNAIL_STATUSES,
   batchActions,
-  creditsToString,
-  selectPendingById,
+  // selectPendingById,
   doError,
-  isClaimNsfw,
-  selectMyClaimForUri,
-  selectPublishFormValues,
   selectMyClaimsWithoutChannels,
+  doPublish,
+  // doCheckPendingPublishes,
 } from 'lbry-redux';
-// import { doOpenModal } from 'redux/actions/app';
-import { selectosNotificationsEnabled } from 'redux/selectors/settings';
-import { push } from 'connected-react-router';
+import * as ACTIONS from 'constants/action_types';
+// import { selectosNotificationsEnabled } from 'redux/selectors/settings';
+// import { push } from 'connected-react-router';
 // import analytics from 'analytics';
-import { formatLbryUriForWeb } from 'util/uri';
-// @if TARGET='app'
-import fs from 'fs';
-import path from 'path';
-import { store } from '../../store';
+// import { formatLbryUriForWeb } from 'util/uri';
 import analytics from '../../analytics';
 import { doOpenModal } from './app';
-// @endif
 
-export const doResetThumbnailStatus = () => (dispatch: Dispatch) => {
-  dispatch({
-    type: ACTIONS.UPDATE_PUBLISH_FORM,
-    data: {
-      thumbnailPath: '',
-    },
-  });
-
-  return fetch('https://spee.ch/api/config/site/publishing')
-    .then(res => res.json())
-    .then(status => {
-      if (status.disabled) {
-        throw Error();
-      }
-
-      return dispatch({
-        type: ACTIONS.UPDATE_PUBLISH_FORM,
-        data: {
-          uploadThumbnailStatus: THUMBNAIL_STATUSES.READY,
-          thumbnail: '',
-        },
-      });
-    })
-    .catch(() =>
-      dispatch({
-        type: ACTIONS.UPDATE_PUBLISH_FORM,
-        data: {
-          uploadThumbnailStatus: THUMBNAIL_STATUSES.API_DOWN,
-          thumbnail: '',
-        },
-      })
-    );
-};
-
-export const doClearPublish = () => (dispatch: Dispatch) => {
-  dispatch({ type: ACTIONS.CLEAR_PUBLISH });
-  return dispatch(doResetThumbnailStatus());
-};
-
-export const doUpdatePublishForm = (publishFormValue: UpdatePublishFormData) => (dispatch: Dispatch) =>
-  dispatch({
-    type: ACTIONS.UPDATE_PUBLISH_FORM,
-    data: { ...publishFormValue },
-  });
-
-export const doUploadThumbnail = (filePath: string, thumbnailBuffer: Uint8Array) => (dispatch: Dispatch) => {
-  let thumbnail, fileExt, fileName, fileType;
-
-  if (filePath) {
-    thumbnail = fs.readFileSync(filePath);
-    fileExt = path.extname(filePath);
-    fileName = path.basename(filePath);
-    fileType = `image/${fileExt.slice(1)}`;
-  } else if (thumbnailBuffer) {
-    thumbnail = thumbnailBuffer;
-    fileExt = '.png';
-    fileName = 'thumbnail.png';
-    fileType = 'image/png';
-  } else {
-    return null;
-  }
-
-  const makeid = () => {
-    let text = '';
-    const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    for (let i = 0; i < 24; i += 1) text += possible.charAt(Math.floor(Math.random() * 62));
-    return text;
-  };
-
-  const uploadError = (error = '') =>
-    dispatch(
-      batchActions(
-        {
-          type: ACTIONS.UPDATE_PUBLISH_FORM,
-          data: {
-            uploadThumbnailStatus: THUMBNAIL_STATUSES.READY,
-            thumbnail: '',
-            nsfw: false,
-          },
-        },
-        doError(error)
-      )
-    );
-
-  dispatch({
-    type: ACTIONS.UPDATE_PUBLISH_FORM,
-    data: { uploadThumbnailStatus: THUMBNAIL_STATUSES.IN_PROGRESS },
-  });
-
-  const data = new FormData();
-  const name = makeid();
-  const file = new File([thumbnail], fileName, { type: fileType });
-  data.append('name', name);
-  data.append('file', file);
-
-  return fetch('https://spee.ch/api/claim/publish', {
-    method: 'POST',
-    body: data,
-  })
-    .then(response => response.json())
-    .then(json =>
-      json.success
-        ? dispatch({
-            type: ACTIONS.UPDATE_PUBLISH_FORM,
-            data: {
-              uploadThumbnailStatus: THUMBNAIL_STATUSES.COMPLETE,
-              thumbnail: `${json.data.url}${fileExt}`,
-            },
-          })
-        : uploadError(json.message)
-    )
-    .catch(err => uploadError(err.message));
-};
-
-export const doPrepareEdit = (claim: StreamClaim, uri: string, fileInfo: FileListItem) => (dispatch: Dispatch) => {
-  const { name, amount, value } = claim;
-  const channelName = (claim && claim.signing_channel && claim.signing_channel.normalized_name) || null;
-  const {
-    author,
-    description,
-    // use same values as default state
-    // fee will be undefined for free content
-    fee = {
-      amount: '0',
-      currency: 'LBC',
-    },
-    languages,
-    license,
-    license_url: licenseUrl,
-    thumbnail,
-    title,
-    tags,
-  } = value;
-
-  const publishData: UpdatePublishFormData = {
-    name,
-    bid: Number(amount),
-    contentIsFree: fee.amount === '0',
-    author,
-    description,
-    fee,
-    languages,
-    thumbnail: thumbnail ? thumbnail.url : null,
-    title,
-    uri,
-    uploadThumbnailStatus: thumbnail ? THUMBNAIL_STATUSES.MANUAL : undefined,
-    licenseUrl,
-    nsfw: isClaimNsfw(claim),
-    tags: tags ? tags.map(tag => ({ name: tag })) : [],
-  };
-
-  if (channelName) {
-    publishData['channel'] = channelName;
-  }
-
-  // Make sure custom liscence's are mapped properly
-  // If the license isn't one of the standard licenses, map the custom license and description/url
-  if (!CC_LICENSES.some(({ value }) => value === license)) {
-    if (!license || license === NONE || license === PUBLIC_DOMAIN) {
-      publishData.licenseType = license;
-    } else if (license && !licenseUrl && license !== NONE) {
-      publishData.licenseType = COPYRIGHT;
-    } else {
-      publishData.licenseType = OTHER;
-    }
-
-    publishData.otherLicenseDescription = license;
-  } else {
-    publishData.licenseType = license;
-  }
-
-  if (fileInfo && fileInfo.download_path) {
-    try {
-      fs.accessSync(fileInfo.download_path, fs.constants.R_OK);
-      publishData.filePath = fileInfo.download_path;
-    } catch (e) {
-      console.error(e.name, e.message); // eslint-disable-line no-console
-    }
-  }
-
-  dispatch({ type: ACTIONS.DO_PREPARE_EDIT, data: publishData });
-};
-
-const publishSuccess = successResponse => {
-  const state = store.getState();
-  analytics.apiLogPublish();
-  const myClaims = selectMyClaimsWithoutChannels(state);
-  const pendingClaim = successResponse.outputs[0];
-  const uri = pendingClaim.permanent_url;
-  const actions = [];
-
-  actions.push({
-    type: ACTIONS.PUBLISH_SUCCESS,
-  });
-
-  // We have to fake a temp claim until the new pending one is returned by claim_list_mine
-  // We can't rely on claim_list_mine because there might be some delay before the new claims are returned
-  // Doing this allows us to show the pending claim immediately, it will get overwritten by the real one
-  const isMatch = claim => claim.claim_id === pendingClaim.claim_id;
-  const isEdit = myClaims.some(isMatch);
-
-  const myNewClaims = isEdit
-    ? myClaims.map(claim => (isMatch(claim) ? pendingClaim : claim))
-    : myClaims.concat(pendingClaim);
-
-  actions.push(doOpenModal(MODALS.PUBLISH, { uri, isEdit }));
-
-  actions.push({
-    type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
-    data: {
-      claims: myNewClaims,
-    },
-  });
-
-  store.dispatch(batchActions(...actions));
-};
-
-const publishFail = error => {
-  store.dispatch({ type: ACTIONS.PUBLISH_FAIL });
-  store.dispatch(doError(error.message));
-};
-
-export const doPublishDesktop = (publishSuccess, publishFail) => {
-  doPublish(publishSuccess, publishFail);
-};
-
-export const doPublish = () => (dispatch: Dispatch, getState: () => {}) => {
-  dispatch({ type: ACTIONS.PUBLISH_START });
-
-  const state = getState();
-  const publishData = selectPublishFormValues(state);
-  const myClaimForUri = selectMyClaimForUri(state);
-
-  const myChannels = selectMyChannelClaims(state);
-  const myClaims = selectMyClaimsWithoutChannels(state);
-
-  const {
-    name,
-    bid,
-    filePath,
-    description,
-    language,
-    licenseUrl,
-    licenseType,
-    otherLicenseDescription,
-    thumbnail,
-    channel,
-    title,
-    contentIsFree,
-    fee,
-    uri,
-    tags,
-    locations,
-  } = publishData;
-
-  let publishingLicense;
-  switch (licenseType) {
-    case COPYRIGHT:
-    case OTHER:
-      publishingLicense = otherLicenseDescription;
-      break;
-    default:
-      publishingLicense = licenseType;
-  }
-
-  // get the claim id from the channel name, we will use that instead
-  const namedChannelClaim = myChannels.find(myChannel => myChannel.name === channel);
-  const channelId = namedChannelClaim ? namedChannelClaim.claim_id : '';
-
-  const publishPayload: {
-    name: ?string,
-    bid: number,
-    description?: string,
-    channel_id?: string,
-    file_path?: string,
-
-    license_url?: string,
-    license?: string,
-    thumbnail_url?: string,
-    release_time?: number,
-    fee_currency?: string,
-    fee_amount?: string,
-    tags: Array<string>,
-    locations?: Array<Location>,
-    languages?: Array<string>,
-  } = {
-    name,
-    title,
-    description,
-    locations,
-    bid: creditsToString(bid),
-    languages: [language],
-    tags: tags && tags.map(tag => tag.name),
-    thumbnail_url: thumbnail,
-  };
-
-  if (publishingLicense) {
-    publishPayload.license = publishingLicense;
-  }
-
-  if (licenseUrl) {
-    publishPayload.license_url = licenseUrl;
-  }
-
-  // Set release time to curret date. On edits, keep original release/transaction time as release_time
-  if (myClaimForUri && myClaimForUri.value.release_time) {
-    publishPayload.release_time = Number(myClaimForUri.value.release_time);
-  } else if (myClaimForUri && myClaimForUri.timestamp) {
-    publishPayload.release_time = Number(myClaimForUri.timestamp);
-  } else {
-    publishPayload.release_time = Number(Math.round(Date.now() / 1000));
-  }
-
-  if (channelId) {
-    publishPayload.channel_id = channelId;
-  }
-
-  if (!contentIsFree && fee && (fee.currency && Number(fee.amount) > 0)) {
-    publishPayload.fee_currency = fee.currency;
-    publishPayload.fee_amount = creditsToString(fee.amount);
-  }
-
-  // Only pass file on new uploads, not metadata only edits.
-  // The sdk will figure it out
-  if (filePath) publishPayload.file_path = filePath;
-
-  const success = successResponse => {
+export const doPublishDesktop = () => (dispatch: Dispatch, getState: () => {}) => {
+  const publishSuccess = successResponse => {
+    const state = getState();
     analytics.apiLogPublish();
-
+    const myClaims = selectMyClaimsWithoutChannels(state);
     const pendingClaim = successResponse.outputs[0];
+    const uri = pendingClaim.permanent_url;
     const actions = [];
 
     actions.push({
       type: ACTIONS.PUBLISH_SUCCESS,
     });
-
     // We have to fake a temp claim until the new pending one is returned by claim_list_mine
     // We can't rely on claim_list_mine because there might be some delay before the new claims are returned
     // Doing this allows us to show the pending claim immediately, it will get overwritten by the real one
@@ -373,74 +37,75 @@ export const doPublish = () => (dispatch: Dispatch, getState: () => {}) => {
     const myNewClaims = isEdit
       ? myClaims.map(claim => (isMatch(claim) ? pendingClaim : claim))
       : myClaims.concat(pendingClaim);
-
     actions.push(doOpenModal(MODALS.PUBLISH, { uri, isEdit }));
-
     actions.push({
       type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
       data: {
         claims: myNewClaims,
       },
     });
-
     dispatch(batchActions(...actions));
   };
 
-  const failure = error => {
-    dispatch({ type: ACTIONS.PUBLISH_FAIL });
-    dispatch(doError(error.message));
+  const publishFail = error => {
+    const actions = [];
+    actions.push({ type: ACTIONS.PUBLISH_FAIL });
+    actions.push(doError(error.message));
+    dispatch(batchActions(...actions));
   };
 
-  return Lbry.publish(publishPayload).then(success, failure);
+  return dispatch(doPublish(publishSuccess, publishFail));
 };
 
 // Calls claim_list_mine until any pending publishes are confirmed
-export const doCheckPendingPublishes = () => (dispatch: Dispatch, getState: GetState) => {
-  const state = getState();
-  const pendingById = selectPendingById(state);
+export const doCheckPendingPublishesApp = () => (dispatch: Dispatch, getState: GetState) => {};
 
-  if (!Object.keys(pendingById).length) {
-    return;
-  }
-
-  let publishCheckInterval;
-
-  const checkFileList = () => {
-    Lbry.claim_list().then(claims => {
-      if (claims) {
-        claims.forEach(claim => {
-          // If it's confirmed, check if it was pending previously
-          if (claim.confirmations > 0 && pendingById[claim.claim_id]) {
-            delete pendingById[claim.claim_id];
-
-            // If it's confirmed, check if we should notify the user
-            if (selectosNotificationsEnabled(getState())) {
-              const notif = new window.Notification('LBRY Publish Complete', {
-                body: `${claim.value.title} has been published to lbry://${claim.name}. Click here to view it`,
-                silent: false,
-              });
-              notif.onclick = () => {
-                dispatch(push(formatLbryUriForWeb(claim.permanent_url)));
-              };
-            }
-          }
-        });
-      }
-
-      dispatch({
-        type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
-        data: {
-          claims,
-        },
-      });
-
-      if (!Object.keys(pendingById).length) {
-        clearInterval(publishCheckInterval);
-      }
-    });
-  };
-
-  publishCheckInterval = setInterval(() => {
-    checkFileList();
-  }, 30000);
-};
+// export const doCheckPendingPublishes = () => (dispatch: Dispatch, getState: GetState) => {
+//   const state = getState();
+//   const pendingById = selectPendingById(state);
+//
+//   if (!Object.keys(pendingById).length) {
+//     return;
+//   }
+//
+//   let publishCheckInterval;
+//
+//   const checkFileList = () => {
+//     Lbry.claim_list().then(claims => {
+//       if (claims) {
+//         claims.forEach(claim => {
+//           // If it's confirmed, check if it was pending previously
+//           if (claim.confirmations > 0 && pendingById[claim.claim_id]) {
+//             delete pendingById[claim.claim_id];
+//
+//             // If it's confirmed, check if we should notify the user
+//             if (selectosNotificationsEnabled(getState())) {
+//               const notif = new window.Notification('LBRY Publish Complete', {
+//                 body: `${claim.value.title} has been published to lbry://${claim.name}. Click here to view it`,
+//                 silent: false,
+//               });
+//               notif.onclick = () => {
+//                 dispatch(push(formatLbryUriForWeb(claim.permanent_url)));
+//               };
+//             }
+//           }
+//         });
+//       }
+//
+//       dispatch({
+//         type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
+//         data: {
+//           claims,
+//         },
+//       });
+//
+//       if (!Object.keys(pendingById).length) {
+//         clearInterval(publishCheckInterval);
+//       }
+//     });
+//   };
+//
+//   publishCheckInterval = setInterval(() => {
+//     checkFileList();
+//   }, 30000);
+// };
-- 
2.45.2


From 6ac727e19ea0975ade6e8a7ef3b6db70eb712a9e Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Fri, 12 Jul 2019 22:59:45 -0400
Subject: [PATCH 3/5] cleanup

---
 src/ui/page/fileListPublished/index.js |  5 +-
 src/ui/redux/actions/publish.js        | 80 +++++++-------------------
 2 files changed, 24 insertions(+), 61 deletions(-)

diff --git a/src/ui/page/fileListPublished/index.js b/src/ui/page/fileListPublished/index.js
index 9a6c75c79..0be607a99 100644
--- a/src/ui/page/fileListPublished/index.js
+++ b/src/ui/page/fileListPublished/index.js
@@ -1,5 +1,6 @@
 import { connect } from 'react-redux';
-import { selectIsFetchingClaimListMine, selectMyClaimUrisWithoutChannels, doCheckPendingPublishes } from 'lbry-redux';
+import { selectIsFetchingClaimListMine, selectMyClaimUrisWithoutChannels } from 'lbry-redux';
+import { doCheckPendingPublishesApp } from 'redux/actions/publish';
 import FileListPublished from './view';
 
 const select = state => ({
@@ -8,7 +9,7 @@ const select = state => ({
 });
 
 const perform = dispatch => ({
-  checkPendingPublishes: () => dispatch(doCheckPendingPublishes()),
+  checkPendingPublishes: () => dispatch(doCheckPendingPublishesApp()),
 });
 
 export default connect(
diff --git a/src/ui/redux/actions/publish.js b/src/ui/redux/actions/publish.js
index f68b2f052..9409d4774 100644
--- a/src/ui/redux/actions/publish.js
+++ b/src/ui/redux/actions/publish.js
@@ -4,23 +4,22 @@ import {
   batchActions,
   // selectPendingById,
   doError,
-  selectMyClaimsWithoutChannels,
+  selectMyClaims,
   doPublish,
-  // doCheckPendingPublishes,
+  doCheckPendingPublishes,
 } from 'lbry-redux';
 import * as ACTIONS from 'constants/action_types';
-// import { selectosNotificationsEnabled } from 'redux/selectors/settings';
-// import { push } from 'connected-react-router';
-// import analytics from 'analytics';
-// import { formatLbryUriForWeb } from 'util/uri';
-import analytics from '../../analytics';
+import { selectosNotificationsEnabled } from 'redux/selectors/settings';
+import { push } from 'connected-react-router';
+import analytics from 'analytics';
+import { formatLbryUriForWeb } from 'util/uri';
 import { doOpenModal } from './app';
 
 export const doPublishDesktop = () => (dispatch: Dispatch, getState: () => {}) => {
   const publishSuccess = successResponse => {
     const state = getState();
     analytics.apiLogPublish();
-    const myClaims = selectMyClaimsWithoutChannels(state);
+    const myClaims = selectMyClaims(state);
     const pendingClaim = successResponse.outputs[0];
     const uri = pendingClaim.permanent_url;
     const actions = [];
@@ -58,54 +57,17 @@ export const doPublishDesktop = () => (dispatch: Dispatch, getState: () => {}) =
 };
 
 // Calls claim_list_mine until any pending publishes are confirmed
-export const doCheckPendingPublishesApp = () => (dispatch: Dispatch, getState: GetState) => {};
-
-// export const doCheckPendingPublishes = () => (dispatch: Dispatch, getState: GetState) => {
-//   const state = getState();
-//   const pendingById = selectPendingById(state);
-//
-//   if (!Object.keys(pendingById).length) {
-//     return;
-//   }
-//
-//   let publishCheckInterval;
-//
-//   const checkFileList = () => {
-//     Lbry.claim_list().then(claims => {
-//       if (claims) {
-//         claims.forEach(claim => {
-//           // If it's confirmed, check if it was pending previously
-//           if (claim.confirmations > 0 && pendingById[claim.claim_id]) {
-//             delete pendingById[claim.claim_id];
-//
-//             // If it's confirmed, check if we should notify the user
-//             if (selectosNotificationsEnabled(getState())) {
-//               const notif = new window.Notification('LBRY Publish Complete', {
-//                 body: `${claim.value.title} has been published to lbry://${claim.name}. Click here to view it`,
-//                 silent: false,
-//               });
-//               notif.onclick = () => {
-//                 dispatch(push(formatLbryUriForWeb(claim.permanent_url)));
-//               };
-//             }
-//           }
-//         });
-//       }
-//
-//       dispatch({
-//         type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
-//         data: {
-//           claims,
-//         },
-//       });
-//
-//       if (!Object.keys(pendingById).length) {
-//         clearInterval(publishCheckInterval);
-//       }
-//     });
-//   };
-//
-//   publishCheckInterval = setInterval(() => {
-//     checkFileList();
-//   }, 30000);
-// };
+export const doCheckPendingPublishesApp = () => (dispatch: Dispatch, getState: GetState) => {
+  const onConfirmed = claim => {
+    if (selectosNotificationsEnabled(getState())) {
+      const notif = new window.Notification('LBRY Publish Complete', {
+        body: `${claim.value.title} has been published to lbry://${claim.name}. Click here to view it`,
+        silent: false,
+      });
+      notif.onclick = () => {
+        dispatch(push(formatLbryUriForWeb(claim.permanent_url)));
+      };
+    }
+  };
+  return dispatch(doCheckPendingPublishes(onConfirmed));
+};
-- 
2.45.2


From df56d2b0042ed3284305579b9a5fee28a09195d8 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Tue, 16 Jul 2019 10:55:49 -0400
Subject: [PATCH 4/5] more cleanup

---
 src/ui/index.jsx                 |  50 +-------------
 src/ui/redux/actions/publish.js  |   9 +--
 src/ui/redux/reducers/publish.js | 108 +------------------------------
 3 files changed, 3 insertions(+), 164 deletions(-)

diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index a0319324d..c7c62822a 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -12,16 +12,7 @@ import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import { doConditionalAuthNavigate, doDaemonReady, doAutoUpdate, doOpenModal, doHideModal } from 'redux/actions/app';
-import {
-  Lbry,
-  doToast,
-  isURIValid,
-  setSearchApi,
-  // reduxCallbacks,
-  // batchActions,
-  // selectMyClaimsWithoutChannels,
-  // doError,
-} from 'lbry-redux';
+import { Lbry, doToast, isURIValid, setSearchApi } from 'lbry-redux';
 import { doInitLanguage, doUpdateIsNightAsync } from 'redux/actions/settings';
 import {
   doAuthenticate,
@@ -138,45 +129,6 @@ rewards.setCallback('claimRewardSuccess', () => {
   app.store.dispatch(doHideModal(MODALS.REWARD_APPROVAL_REQUIRED));
 });
 
-// mimicking app.js.doOpenModal(id, modalProps {}) here
-// reduxCallbacks.setCallback('streamPublishSuccess', successResponse => {
-//   const state = store.getState();
-//   analytics.apiLogPublish();
-//   const myClaims = selectMyClaimsWithoutChannels(state);
-//   const pendingClaim = successResponse.outputs[0];
-//   const uri = pendingClaim.permanent_url;
-//   const actions = [];
-//
-//   actions.push({
-//     type: ACTIONS.PUBLISH_SUCCESS,
-//   });
-//
-//   // We have to fake a temp claim until the new pending one is returned by claim_list_mine
-//   // We can't rely on claim_list_mine because there might be some delay before the new claims are returned
-//   // Doing this allows us to show the pending claim immediately, it will get overwritten by the real one
-//   const isMatch = claim => claim.claim_id === pendingClaim.claim_id;
-//   const isEdit = myClaims.some(isMatch);
-//
-//   const myNewClaims = isEdit
-//     ? myClaims.map(claim => (isMatch(claim) ? pendingClaim : claim))
-//     : myClaims.concat(pendingClaim);
-//
-//   actions.push(doOpenModal(MODALS.PUBLISH, { uri, isEdit }));
-//
-//   actions.push({
-//     type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
-//     data: {
-//       claims: myNewClaims,
-//     },
-//   });
-//
-//   store.dispatch(batchActions(...actions));
-// });
-//
-// reduxCallbacks.setCallback('streamPublishFail', error => {
-//   store.dispatch({ type: ACTIONS.PUBLISH_FAIL });
-//   store.dispatch(doError(error.message));
-// });
 // @if TARGET='app'
 ipcRenderer.on('open-uri-requested', (event, uri, newSession) => {
   if (uri && uri.startsWith('lbry://')) {
diff --git a/src/ui/redux/actions/publish.js b/src/ui/redux/actions/publish.js
index 9409d4774..d130d822a 100644
--- a/src/ui/redux/actions/publish.js
+++ b/src/ui/redux/actions/publish.js
@@ -1,13 +1,6 @@
 // @flow
 import * as MODALS from 'constants/modal_types';
-import {
-  batchActions,
-  // selectPendingById,
-  doError,
-  selectMyClaims,
-  doPublish,
-  doCheckPendingPublishes,
-} from 'lbry-redux';
+import { batchActions, doError, selectMyClaims, doPublish, doCheckPendingPublishes } from 'lbry-redux';
 import * as ACTIONS from 'constants/action_types';
 import { selectosNotificationsEnabled } from 'redux/selectors/settings';
 import { push } from 'connected-react-router';
diff --git a/src/ui/redux/reducers/publish.js b/src/ui/redux/reducers/publish.js
index 6b4bcad56..d8ca50794 100644
--- a/src/ui/redux/reducers/publish.js
+++ b/src/ui/redux/reducers/publish.js
@@ -1,107 +1 @@
-// // @flow
-// import { handleActions } from 'util/redux-utils';
-// import { buildURI } from 'lbry-redux';
-// import * as ACTIONS from 'constants/action_types';
-// import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses';
-// import { CHANNEL_ANONYMOUS } from 'constants/claim';
-//
-// type PublishState = {
-//   editingURI: ?string,
-//   filePath: ?string,
-//   contentIsFree: boolean,
-//   fee: {
-//     amount: number,
-//     currency: string,
-//   },
-//   title: string,
-//   thumbnail_url: string,
-//   thumbnailPath: string,
-//   uploadThumbnailStatus: string,
-//   description: string,
-//   language: string,
-//   channel: string,
-//   channelId: ?string,
-//   name: string,
-//   nameError: ?string,
-//   bid: number,
-//   bidError: ?string,
-//   otherLicenseDescription: string,
-//   licenseUrl: string,
-//   tags: Array<string>,
-// };
-//
-// const defaultState: PublishState = {
-//   editingURI: undefined,
-//   filePath: undefined,
-//   contentIsFree: true,
-//   fee: {
-//     amount: 1,
-//     currency: 'LBC',
-//   },
-//   title: '',
-//   thumbnail_url: '',
-//   thumbnailPath: '',
-//   uploadThumbnailStatus: THUMBNAIL_STATUSES.API_DOWN,
-//   description: '',
-//   language: 'en',
-//   nsfw: false,
-//   channel: CHANNEL_ANONYMOUS,
-//   channelId: '',
-//   name: '',
-//   nameError: undefined,
-//   bid: 0.1,
-//   bidError: undefined,
-//   licenseType: 'None',
-//   otherLicenseDescription: 'All rights reserved',
-//   licenseUrl: '',
-//   tags: [],
-//   publishing: false,
-//   publishSuccess: false,
-//   publishError: undefined,
-// };
-//
-// export default handleActions(
-//   {
-//     [ACTIONS.UPDATE_PUBLISH_FORM]: (state, action): PublishState => {
-//       const { data } = action;
-//       return {
-//         ...state,
-//         ...data,
-//       };
-//     },
-//     [ACTIONS.CLEAR_PUBLISH]: (): PublishState => ({
-//       ...defaultState,
-//     }),
-//     [ACTIONS.PUBLISH_START]: (state: PublishState): PublishState => ({
-//       ...state,
-//       publishing: true,
-//     }),
-//     [ACTIONS.PUBLISH_FAIL]: (state: PublishState): PublishState => ({
-//       ...state,
-//       publishing: false,
-//     }),
-//     [ACTIONS.PUBLISH_SUCCESS]: (state: PublishState): PublishState => ({
-//       ...state,
-//       publishing: false,
-//     }),
-//     [ACTIONS.DO_PREPARE_EDIT]: (state: PublishState, action) => {
-//       const { ...publishData } = action.data;
-//       const { channel, name, uri } = publishData;
-//
-//       // The short uri is what is presented to the user
-//       // The editingUri is the full uri with claim id
-//       const shortUri = buildURI({
-//         channelName: channel,
-//         contentName: name,
-//       });
-//
-//       return {
-//         ...defaultState,
-//         ...publishData,
-//         editingURI: uri,
-//         uri: shortUri,
-//       };
-//     },
-//   },
-//   defaultState
-// );
+// deleted, moved to lbry-redux
-- 
2.45.2


From 27800748d9f873f40924e77f70afd44efeaa0b11 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 29 Jul 2019 14:50:36 -0400
Subject: [PATCH 5/5] update lbry-redux

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5eb7a9872..10c130b86 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#ea56de4548480eb1a10b752b3cecbad7de2f8914",
+    "lbry-redux": "lbryio/lbry-redux#8910693fe1fc4166fdc748d128344012c3d61874",
     "lbryinc": "lbryio/lbryinc#a93596c51c8fb0a226cb84df04c26a6bb60a45fb",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
diff --git a/yarn.lock b/yarn.lock
index 25f8a1bb0..0006ec5a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6653,9 +6653,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#ea56de4548480eb1a10b752b3cecbad7de2f8914:
+lbry-redux@lbryio/lbry-redux#8910693fe1fc4166fdc748d128344012c3d61874:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/ea56de4548480eb1a10b752b3cecbad7de2f8914"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/8910693fe1fc4166fdc748d128344012c3d61874"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
-- 
2.45.2