diff --git a/package.json b/package.json index 8b82a3891..6f3ee8702 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ }, "license": "MIT", "lbrySettings": { - "lbrynetDaemonVersion": "0.18.2", + "lbrynetDaemonVersion": "0.19.0rc35", "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip" } } diff --git a/src/renderer/constants/action_types.js b/src/renderer/constants/action_types.js index df8cf1407..0bd5cae80 100644 --- a/src/renderer/constants/action_types.js +++ b/src/renderer/constants/action_types.js @@ -62,8 +62,8 @@ export const FETCH_CLAIM_LIST_MINE_STARTED = 'FETCH_CLAIM_LIST_MINE_STARTED'; export const FETCH_CLAIM_LIST_MINE_COMPLETED = 'FETCH_CLAIM_LIST_MINE_COMPLETED'; export const ABANDON_CLAIM_STARTED = 'ABANDON_CLAIM_STARTED'; export const ABANDON_CLAIM_SUCCEEDED = 'ABANDON_CLAIM_SUCCEEDED'; -export const FETCH_CHANNEL_LIST_MINE_STARTED = 'FETCH_CHANNEL_LIST_MINE_STARTED'; -export const FETCH_CHANNEL_LIST_MINE_COMPLETED = 'FETCH_CHANNEL_LIST_MINE_COMPLETED'; +export const FETCH_CHANNEL_LIST_STARTED = 'FETCH_CHANNEL_LIST_STARTED'; +export const FETCH_CHANNEL_LIST_COMPLETED = 'FETCH_CHANNEL_LIST_COMPLETED'; export const CREATE_CHANNEL_STARTED = 'CREATE_CHANNEL_STARTED'; export const CREATE_CHANNEL_COMPLETED = 'CREATE_CHANNEL_COMPLETED'; export const PUBLISH_STARTED = 'PUBLISH_STARTED'; diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js index 64ad8517e..130403458 100644 --- a/src/renderer/lbry.js +++ b/src/renderer/lbry.js @@ -211,11 +211,11 @@ Lbry.getAppVersionInfo = () => /** * Returns results from the file_list API method, plus dummy entries for pending publishes. - * (If a real publish with the same name is found, the pending publish will be ignored and removed.) + * (If a real publish with the same claim name is found, the pending publish will be ignored and removed.) */ Lbry.file_list = (params = {}) => new Promise((resolve, reject) => { - const { name, channel_name: channelName, outpoint } = params; + const { claim_name, channel_name: channelName, outpoint } = params; /** * If we're searching by outpoint, check first to see if there's a matching pending publish. @@ -234,10 +234,10 @@ Lbry.file_list = (params = {}) => 'file_list', params, fileInfos => { - removePendingPublishIfNeeded({ name, channelName, outpoint }); + removePendingPublishIfNeeded({ claim_name, channelName, outpoint }); // if a naked file_list call, append the pending file infos - if (!name && !channelName && !outpoint) { + if (!claim_name && !channelName && !outpoint) { const dummyFileInfos = Lbry.getPendingPublishes().map(pendingPublishToDummyFileInfo); resolve([...fileInfos, ...dummyFileInfos]); diff --git a/src/renderer/redux/actions/content.js b/src/renderer/redux/actions/content.js index 2ca2c4dbb..e0609672e 100644 --- a/src/renderer/redux/actions/content.js +++ b/src/renderer/redux/actions/content.js @@ -419,17 +419,17 @@ export function doPlayUri(uri) { export function doFetchChannelListMine() { return dispatch => { dispatch({ - type: ACTIONS.FETCH_CHANNEL_LIST_MINE_STARTED, + type: ACTIONS.FETCH_CHANNEL_LIST_STARTED, }); const callback = channels => { dispatch({ - type: ACTIONS.FETCH_CHANNEL_LIST_MINE_COMPLETED, + type: ACTIONS.FETCH_CHANNEL_LIST_COMPLETED, data: { claims: channels }, }); }; - Lbry.channel_list_mine().then(callback); + Lbry.channel_list().then(callback); }; } diff --git a/src/renderer/redux/actions/wallet.js b/src/renderer/redux/actions/wallet.js index df2faeb8d..6422b6315 100644 --- a/src/renderer/redux/actions/wallet.js +++ b/src/renderer/redux/actions/wallet.js @@ -35,7 +35,7 @@ export function doFetchTransactions() { type: ACTIONS.FETCH_TRANSACTIONS_STARTED, }); - Lbry.transaction_list({ include_tip_info: true }).then(results => { + Lbry.transaction_list().then(results => { dispatch({ type: ACTIONS.FETCH_TRANSACTIONS_COMPLETED, data: { diff --git a/src/renderer/redux/reducers/claims.js b/src/renderer/redux/reducers/claims.js index 73eee7815..5078bfccc 100644 --- a/src/renderer/redux/reducers/claims.js +++ b/src/renderer/redux/reducers/claims.js @@ -71,10 +71,10 @@ reducers[ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED] = (state, action) => { }); }; -reducers[ACTIONS.FETCH_CHANNEL_LIST_MINE_STARTED] = state => +reducers[ACTIONS.FETCH_CHANNEL_LIST_STARTED] = state => Object.assign({}, state, { fetchingMyChannels: true }); -reducers[ACTIONS.FETCH_CHANNEL_LIST_MINE_COMPLETED] = (state, action) => { +reducers[ACTIONS.FETCH_CHANNEL_LIST_COMPLETED] = (state, action) => { const { claims } = action.data; const myChannelClaims = new Set(state.myChannelClaims); const byId = Object.assign({}, state.byId);