diff --git a/dist/bundle.es.js b/dist/bundle.es.js index f26168b..8cfe276 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -103,9 +103,6 @@ const SET_DRAFT_TRANSACTION_ADDRESS = 'SET_DRAFT_TRANSACTION_ADDRESS'; const FETCH_UTXO_COUNT_STARTED = 'FETCH_UTXO_COUNT_STARTED'; const FETCH_UTXO_COUNT_COMPLETED = 'FETCH_UTXO_COUNT_COMPLETED'; const FETCH_UTXO_COUNT_FAILED = 'FETCH_UTXO_COUNT_FAILED'; -const TIP_CLAIM_MASS_STARTED = 'TIP_CLAIM_MASS_STARTED'; -const TIP_CLAIM_MASS_COMPLETED = 'TIP_CLAIM_MASS_COMPLETED'; -const TIP_CLAIM_MASS_FAILED = 'TIP_CLAIM_MASS_FAILED'; const DO_UTXO_CONSOLIDATE_STARTED = 'DO_UTXO_CONSOLIDATE_STARTED'; const DO_UTXO_CONSOLIDATE_COMPLETED = 'DO_UTXO_CONSOLIDATE_COMPLETED'; const DO_UTXO_CONSOLIDATE_FAILED = 'DO_UTXO_CONSOLIDATE_FAILED'; @@ -380,9 +377,6 @@ var action_types = /*#__PURE__*/Object.freeze({ FETCH_UTXO_COUNT_STARTED: FETCH_UTXO_COUNT_STARTED, FETCH_UTXO_COUNT_COMPLETED: FETCH_UTXO_COUNT_COMPLETED, FETCH_UTXO_COUNT_FAILED: FETCH_UTXO_COUNT_FAILED, - TIP_CLAIM_MASS_STARTED: TIP_CLAIM_MASS_STARTED, - TIP_CLAIM_MASS_COMPLETED: TIP_CLAIM_MASS_COMPLETED, - TIP_CLAIM_MASS_FAILED: TIP_CLAIM_MASS_FAILED, DO_UTXO_CONSOLIDATE_STARTED: DO_UTXO_CONSOLIDATE_STARTED, DO_UTXO_CONSOLIDATE_COMPLETED: DO_UTXO_CONSOLIDATE_COMPLETED, DO_UTXO_CONSOLIDATE_FAILED: DO_UTXO_CONSOLIDATE_FAILED, @@ -1070,6 +1064,7 @@ const Lbry = { stream_abandon: params => daemonCallWithResult('stream_abandon', params), stream_list: params => daemonCallWithResult('stream_list', params), channel_abandon: params => daemonCallWithResult('channel_abandon', params), + channel_sign: params => daemonCallWithResult('channel_sign', params), support_create: params => daemonCallWithResult('support_create', params), support_list: params => daemonCallWithResult('support_list', params), stream_repost: params => daemonCallWithResult('stream_repost', params), @@ -1931,7 +1926,7 @@ const selectWalletEncryptSucceeded = reselect.createSelector(selectState, state const selectPendingSupportTransactions = reselect.createSelector(selectState, state => state.pendingSupportTransactions); -const selectPendingOtherTransactions = reselect.createSelector(selectState, state => state.pendingTxos); +const selectPendingOtherTransactions = reselect.createSelector(selectState, state => state.pendingConsolidateTxos); const selectAbandonClaimSupportError = reselect.createSelector(selectState, state => state.abandonClaimSupportError); @@ -2126,12 +2121,6 @@ const selectIsFetchingUtxoCounts = reselect.createSelector(selectState, state => const selectIsConsolidatingUtxos = reselect.createSelector(selectState, state => state.consolidatingUtxos); -const selectIsMassClaimingTips = reselect.createSelector(selectState, state => state.massClaimingTips); - -const selectPendingConsolidateTxid = reselect.createSelector(selectState, state => state.pendingConsolidateTxid); - -const selectPendingMassClaimTxid = reselect.createSelector(selectState, state => state.pendingMassClaimTxid); - const selectUtxoCounts = reselect.createSelector(selectState, state => state.utxoCounts); var _extends$2 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; @@ -2844,12 +2833,15 @@ function doFetchUtxoCounts() { type: FETCH_UTXO_COUNT_STARTED }); - let resultSets = yield Promise.all([lbryProxy.txo_list({ type: 'other', is_not_spent: true, page: 1, page_size: 1 }), lbryProxy.txo_list({ type: 'support', is_not_spent: true, page: 1, page_size: 1 })]); + let resultSets = yield Promise.all([lbryProxy.txo_list({ type: 'other', is_not_spent: true, page: 1, page_size: 1 })] + // removing until we figure out sdk load / need it + // Lbry.txo_list({ type: 'support', is_not_spent: true }), + ); const counts = {}; const paymentCount = resultSets[0]['total_items']; - const supportCount = resultSets[1]['total_items']; + // const supportCount = resultSets[1]['total_items']; counts['other'] = typeof paymentCount === 'number' ? paymentCount : 0; - counts['support'] = typeof supportCount === 'number' ? supportCount : 0; + counts['support'] = 0; dispatch({ type: FETCH_UTXO_COUNT_COMPLETED, @@ -2880,8 +2872,7 @@ function doUtxoConsolidate() { }); dispatch({ - type: DO_UTXO_CONSOLIDATE_COMPLETED, - data: { txid: result.txid } + type: DO_UTXO_CONSOLIDATE_COMPLETED }); dispatch(doCheckPendingTxs()); }); @@ -2892,34 +2883,6 @@ function doUtxoConsolidate() { })(); } -function doTipClaimMass() { - return (() => { - var _ref3 = _asyncToGenerator(function* (dispatch) { - dispatch({ - type: TIP_CLAIM_MASS_STARTED - }); - - const results = yield lbryProxy.txo_spend({ type: 'support', is_not_my_input: true }); - const result = results[0]; - - dispatch({ - type: PENDING_CONSOLIDATED_TXOS_UPDATED, - data: { txids: [result.txid] } - }); - - dispatch({ - type: TIP_CLAIM_MASS_COMPLETED, - data: { txid: result.txid } - }); - dispatch(doCheckPendingTxs()); - }); - - return function (_x3) { - return _ref3.apply(this, arguments); - }; - })(); -} - function doGetNewAddress() { return dispatch => { dispatch({ @@ -3263,8 +3226,6 @@ const doCheckPendingTxs = () => (dispatch, getState) => { const state = getState(); const pendingSupportTxs = selectPendingSupportTransactions(state); // {} const pendingConsolidateTxes = selectPendingOtherTransactions(state); - const pendingConsTxid = selectPendingConsolidateTxid(state); - const pendingMassCLaimTxid = selectPendingMassClaimTxid(state); const promises = []; const newPendingTxes = {}; @@ -3310,18 +3271,6 @@ const doCheckPendingTxs = () => (dispatch, getState) => { } } if (noLongerPendingConsolidate.length) { - if (noLongerPendingConsolidate.includes(pendingConsTxid)) { - dispatch(doToast({ - title: __('Wallet Job'), - message: __('Your wallet is finished consolidating') - })); - } - if (noLongerPendingConsolidate.includes(pendingMassCLaimTxid)) { - dispatch(doToast({ - title: __('Wallet Job'), - message: __('Your tips have been collected') - })); - } dispatch({ type: PENDING_CONSOLIDATED_TXOS_UPDATED, data: { txids: noLongerPendingConsolidate, remove: true } @@ -6009,14 +5958,11 @@ const defaultState$5 = { fetchingUtxoCounts: false, fetchingUtxoError: undefined, consolidatingUtxos: false, - pendingConsolidateTxid: null, - massClaimingTips: false, - pendingMassClaimTxid: null, txoPage: {}, fetchingTxos: false, fetchingTxosError: undefined, pendingSupportTransactions: {}, - pendingTxos: [], + pendingConsolidateTxos: [], abandonClaimSupportError: undefined }; @@ -6088,10 +6034,8 @@ const walletReducer = handleActions({ }, [DO_UTXO_CONSOLIDATE_COMPLETED]: (state, action) => { - const { txid } = action.data; return _extends$d({}, state, { - consolidatingUtxos: false, - pendingConsolidateTxid: txid + consolidatingUtxos: false }); }, @@ -6101,43 +6045,17 @@ const walletReducer = handleActions({ }); }, - [TIP_CLAIM_MASS_STARTED]: state => { - return _extends$d({}, state, { - massClaimingTips: true - }); - }, - - [TIP_CLAIM_MASS_COMPLETED]: (state, action) => { - const { txid } = action.data; - return _extends$d({}, state, { - massClaimingTips: false, - pendingMassClaimTxid: txid - }); - }, - - [TIP_CLAIM_MASS_FAILED]: (state, action) => { - return _extends$d({}, state, { - massClaimingTips: false - }); - }, - [PENDING_CONSOLIDATED_TXOS_UPDATED]: (state, action) => { - const { pendingTxos, pendingMassClaimTxid, pendingConsolidateTxid } = state; + const pendingTxos = state.pendingConsolidateTxos; const { txids, remove } = action.data; if (remove) { const newTxos = pendingTxos.filter(txo => !txids.includes(txo)); - const newPendingMassClaimTxid = txids.includes(pendingMassClaimTxid) ? undefined : pendingMassClaimTxid; - const newPendingConsolidateTxid = txids.includes(pendingConsolidateTxid) ? undefined : pendingConsolidateTxid; - return _extends$d({}, state, { - pendingTxos: newTxos, - pendingMassClaimTxid: newPendingMassClaimTxid, - pendingConsolidateTxid: newPendingConsolidateTxid - }); + return _extends$d({}, state, { pendingConsolidateTxos: newTxos }); } else { const newPendingSet = new Set([...pendingTxos, ...txids]); - return _extends$d({}, state, { pendingTxos: Array.from(newPendingSet) }); + return _extends$d({}, state, { pendingConsolidateTxos: Array.from(newPendingSet) }); } }, @@ -6512,7 +6430,6 @@ exports.doSetDraftTransactionAmount = doSetDraftTransactionAmount; exports.doSetFileListSort = doSetFileListSort; exports.doSetTransactionListFilter = doSetTransactionListFilter; exports.doSupportAbandonForClaim = doSupportAbandonForClaim; -exports.doTipClaimMass = doTipClaimMass; exports.doToast = doToast; exports.doUpdateBalance = doUpdateBalance; exports.doUpdateBlockHeight = doUpdateBlockHeight; @@ -6646,7 +6563,6 @@ exports.selectIsFetchingMyPurchases = selectIsFetchingMyPurchases; exports.selectIsFetchingTransactions = selectIsFetchingTransactions; exports.selectIsFetchingTxos = selectIsFetchingTxos; exports.selectIsFetchingUtxoCounts = selectIsFetchingUtxoCounts; -exports.selectIsMassClaimingTips = selectIsMassClaimingTips; exports.selectIsResolvingPublishUris = selectIsResolvingPublishUris; exports.selectIsSendingSupport = selectIsSendingSupport; exports.selectIsStillEditing = selectIsStillEditing; @@ -6666,9 +6582,7 @@ exports.selectMyClaimsWithoutChannels = selectMyClaimsWithoutChannels; exports.selectMyPurchases = selectMyPurchases; exports.selectMyPurchasesCount = selectMyPurchasesCount; exports.selectMyStreamUrlsCount = selectMyStreamUrlsCount; -exports.selectPendingConsolidateTxid = selectPendingConsolidateTxid; exports.selectPendingIds = selectPendingIds; -exports.selectPendingMassClaimTxid = selectPendingMassClaimTxid; exports.selectPendingOtherTransactions = selectPendingOtherTransactions; exports.selectPendingSupportTransactions = selectPendingSupportTransactions; exports.selectPlayingUri = selectPlayingUri; diff --git a/dist/flow-typed/Lbry.js b/dist/flow-typed/Lbry.js index a134a3c..1790e68 100644 --- a/dist/flow-typed/Lbry.js +++ b/dist/flow-typed/Lbry.js @@ -137,8 +137,8 @@ declare type CommentListResponse = { declare type MyReactions = { // Keys are the commentId - [string]: Array -} + [string]: Array, +}; declare type OthersReactions = { // Keys are the commentId @@ -146,12 +146,12 @@ declare type OthersReactions = { // Keys are the reaction_type, e.g. 'like' [string]: number, }, -} +}; declare type CommentReactListResponse = { my_reactions: Array, others_reactions: Array, -} +}; declare type CommentHideResponse = { // keyed by the CommentIds entered @@ -176,6 +176,11 @@ declare type ChannelListResponse = { total_pages: number, }; +declare type ChannelSignResponse = { + signature: string, + signing_ts: string, +}; + declare type FileListResponse = { items: Array, page: number, @@ -285,6 +290,7 @@ declare type LbryTypes = { channel_update: (params: {}) => Promise, channel_import: (params: {}) => Promise, channel_list: (params: {}) => Promise, + channel_sign: (params: {}) => Promise, stream_abandon: (params: {}) => Promise, stream_list: (params: {}) => Promise, channel_abandon: (params: {}) => Promise, diff --git a/flow-typed/Lbry.js b/flow-typed/Lbry.js index a134a3c..1790e68 100644 --- a/flow-typed/Lbry.js +++ b/flow-typed/Lbry.js @@ -137,8 +137,8 @@ declare type CommentListResponse = { declare type MyReactions = { // Keys are the commentId - [string]: Array -} + [string]: Array, +}; declare type OthersReactions = { // Keys are the commentId @@ -146,12 +146,12 @@ declare type OthersReactions = { // Keys are the reaction_type, e.g. 'like' [string]: number, }, -} +}; declare type CommentReactListResponse = { my_reactions: Array, others_reactions: Array, -} +}; declare type CommentHideResponse = { // keyed by the CommentIds entered @@ -176,6 +176,11 @@ declare type ChannelListResponse = { total_pages: number, }; +declare type ChannelSignResponse = { + signature: string, + signing_ts: string, +}; + declare type FileListResponse = { items: Array, page: number, @@ -285,6 +290,7 @@ declare type LbryTypes = { channel_update: (params: {}) => Promise, channel_import: (params: {}) => Promise, channel_list: (params: {}) => Promise, + channel_sign: (params: {}) => Promise, stream_abandon: (params: {}) => Promise, stream_list: (params: {}) => Promise, channel_abandon: (params: {}) => Promise, diff --git a/src/constants/action_types.js b/src/constants/action_types.js index 5e3f672..bdd4273 100644 --- a/src/constants/action_types.js +++ b/src/constants/action_types.js @@ -82,9 +82,6 @@ export const SET_DRAFT_TRANSACTION_ADDRESS = 'SET_DRAFT_TRANSACTION_ADDRESS'; export const FETCH_UTXO_COUNT_STARTED = 'FETCH_UTXO_COUNT_STARTED'; export const FETCH_UTXO_COUNT_COMPLETED = 'FETCH_UTXO_COUNT_COMPLETED'; export const FETCH_UTXO_COUNT_FAILED = 'FETCH_UTXO_COUNT_FAILED'; -export const TIP_CLAIM_MASS_STARTED = 'TIP_CLAIM_MASS_STARTED'; -export const TIP_CLAIM_MASS_COMPLETED = 'TIP_CLAIM_MASS_COMPLETED'; -export const TIP_CLAIM_MASS_FAILED = 'TIP_CLAIM_MASS_FAILED'; export const DO_UTXO_CONSOLIDATE_STARTED = 'DO_UTXO_CONSOLIDATE_STARTED'; export const DO_UTXO_CONSOLIDATE_COMPLETED = 'DO_UTXO_CONSOLIDATE_COMPLETED'; export const DO_UTXO_CONSOLIDATE_FAILED = 'DO_UTXO_CONSOLIDATE_FAILED'; diff --git a/src/index.js b/src/index.js index 5464d69..14c14b6 100644 --- a/src/index.js +++ b/src/index.js @@ -122,7 +122,6 @@ export { doSupportAbandonForClaim, doFetchUtxoCounts, doUtxoConsolidate, - doTipClaimMass, } from 'redux/actions/wallet'; export { doPopulateSharedUserState, doPreferenceGet, doPreferenceSet } from 'redux/actions/sync'; @@ -318,9 +317,6 @@ export { makeSelectPendingAmountByUri, selectIsFetchingUtxoCounts, selectIsConsolidatingUtxos, - selectIsMassClaimingTips, selectUtxoCounts, selectPendingOtherTransactions, - selectPendingConsolidateTxid, - selectPendingMassClaimTxid, } from 'redux/selectors/wallet'; diff --git a/src/lbry.js b/src/lbry.js index 51f4111..bfa20eb 100644 --- a/src/lbry.js +++ b/src/lbry.js @@ -86,6 +86,7 @@ const Lbry: LbryTypes = { stream_abandon: params => daemonCallWithResult('stream_abandon', params), stream_list: params => daemonCallWithResult('stream_list', params), channel_abandon: params => daemonCallWithResult('channel_abandon', params), + channel_sign: params => daemonCallWithResult('channel_sign', params), support_create: params => daemonCallWithResult('support_create', params), support_list: params => daemonCallWithResult('support_list', params), stream_repost: params => daemonCallWithResult('stream_repost', params), diff --git a/src/redux/actions/claims.js b/src/redux/actions/claims.js index 8dc29e1..3e4f028 100644 --- a/src/redux/actions/claims.js +++ b/src/redux/actions/claims.js @@ -10,6 +10,7 @@ import { selectClaimsByUri, selectMyChannelClaims, selectPendingIds, + selectClaimsById, } from 'redux/selectors/claims'; import { doFetchTxoPage } from 'redux/actions/wallet'; import { selectSupportsByOutpoint } from 'redux/selectors/wallet'; @@ -64,7 +65,7 @@ export function doResolveUris( } = {}; return Lbry.resolve({ urls: urisToResolve, ...options }).then( - async(result: ResolveResponse) => { + async (result: ResolveResponse) => { let repostedResults = {}; const repostsToResolve = []; const fallbackResolveInfo = { diff --git a/src/redux/actions/wallet.js b/src/redux/actions/wallet.js index b8bbe0f..354c813 100644 --- a/src/redux/actions/wallet.js +++ b/src/redux/actions/wallet.js @@ -6,8 +6,6 @@ import { selectPendingSupportTransactions, selectTxoPageParams, selectPendingOtherTransactions, - selectPendingConsolidateTxid, - selectPendingMassClaimTxid, } from 'redux/selectors/wallet'; import { creditsToString } from 'util/format-credits'; import { selectMyClaimsRaw } from 'redux/selectors/claims'; @@ -139,13 +137,14 @@ export function doFetchUtxoCounts() { let resultSets = await Promise.all([ Lbry.txo_list({ type: 'other', is_not_spent: true, page: 1, page_size: 1 }), - Lbry.txo_list({ type: 'support', is_not_spent: true, page: 1, page_size: 1 }), + // removing until we figure out sdk load / need it + // Lbry.txo_list({ type: 'support', is_not_spent: true }), ]); const counts = {}; const paymentCount = resultSets[0]['total_items']; - const supportCount = resultSets[1]['total_items']; + // const supportCount = resultSets[1]['total_items']; counts['other'] = typeof paymentCount === 'number' ? paymentCount : 0; - counts['support'] = typeof supportCount === 'number' ? supportCount : 0; + counts['support'] = 0; dispatch({ type: ACTIONS.FETCH_UTXO_COUNT_COMPLETED, @@ -171,29 +170,6 @@ export function doUtxoConsolidate() { dispatch({ type: ACTIONS.DO_UTXO_CONSOLIDATE_COMPLETED, - data: { txid: result.txid }, - }); - dispatch(doCheckPendingTxs()); - }; -} - -export function doTipClaimMass() { - return async dispatch => { - dispatch({ - type: ACTIONS.TIP_CLAIM_MASS_STARTED, - }); - - const results = await Lbry.txo_spend({ type: 'support', is_not_my_input: true }); - const result = results[0]; - - dispatch({ - type: ACTIONS.PENDING_CONSOLIDATED_TXOS_UPDATED, - data: { txids: [result.txid] }, - }); - - dispatch({ - type: ACTIONS.TIP_CLAIM_MASS_COMPLETED, - data: { txid: result.txid }, }); dispatch(doCheckPendingTxs()); }; @@ -589,8 +565,6 @@ export const doCheckPendingTxs = () => (dispatch, getState) => { const state = getState(); const pendingSupportTxs = selectPendingSupportTransactions(state); // {} const pendingConsolidateTxes = selectPendingOtherTransactions(state); - const pendingConsTxid = selectPendingConsolidateTxid(state); - const pendingMassCLaimTxid = selectPendingMassClaimTxid(state); const promises = []; const newPendingTxes = {}; @@ -636,20 +610,6 @@ export const doCheckPendingTxs = () => (dispatch, getState) => { } } if (noLongerPendingConsolidate.length) { - if (noLongerPendingConsolidate.includes(pendingConsTxid)) { - dispatch( - doToast({ - message: __('Your wallet is finished consolidating'), - }) - ); - } - if (noLongerPendingConsolidate.includes(pendingMassCLaimTxid)) { - dispatch( - doToast({ - message: __('Your tips have been collected'), - }) - ); - } dispatch({ type: ACTIONS.PENDING_CONSOLIDATED_TXOS_UPDATED, data: { txids: noLongerPendingConsolidate, remove: true }, diff --git a/src/redux/reducers/wallet.js b/src/redux/reducers/wallet.js index de5ac68..174cd16 100644 --- a/src/redux/reducers/wallet.js +++ b/src/redux/reducers/wallet.js @@ -49,12 +49,8 @@ type WalletState = { txoPage: any, fetchingTxos: boolean, fetchingTxosError?: string, - consolidatingUtxos: boolean, - pendingConsolidateTxid?: string, - massClaimingTips: boolean, - pendingMassClaimTxid?: string, pendingSupportTransactions: {}, // { claimId: {txid: 123, amount 12.3}, } - pendingTxos: Array, + pendingConsolidateTxos: Array, abandonClaimSupportError?: string, }; @@ -95,14 +91,11 @@ const defaultState = { fetchingUtxoCounts: false, fetchingUtxoError: undefined, consolidatingUtxos: false, - pendingConsolidateTxid: null, - massClaimingTips: false, - pendingMassClaimTxid: null, txoPage: {}, fetchingTxos: false, fetchingTxosError: undefined, pendingSupportTransactions: {}, - pendingTxos: [], + pendingConsolidateTxos: [], abandonClaimSupportError: undefined, }; @@ -184,11 +177,9 @@ export const walletReducer = handleActions( }, [ACTIONS.DO_UTXO_CONSOLIDATE_COMPLETED]: (state: WalletState, action) => { - const { txid } = action.data; return { ...state, consolidatingUtxos: false, - pendingConsolidateTxid: txid, }; }, @@ -199,51 +190,17 @@ export const walletReducer = handleActions( }; }, - [ACTIONS.TIP_CLAIM_MASS_STARTED]: (state: WalletState) => { - return { - ...state, - massClaimingTips: true, - }; - }, - - [ACTIONS.TIP_CLAIM_MASS_COMPLETED]: (state: WalletState, action) => { - const { txid } = action.data; - return { - ...state, - massClaimingTips: false, - pendingMassClaimTxid: txid, - }; - }, - - [ACTIONS.TIP_CLAIM_MASS_FAILED]: (state: WalletState, action) => { - return { - ...state, - massClaimingTips: false, - }; - }, - [ACTIONS.PENDING_CONSOLIDATED_TXOS_UPDATED]: (state: WalletState, action) => { - const { pendingTxos, pendingMassClaimTxid, pendingConsolidateTxid } = state; + const pendingTxos = state.pendingConsolidateTxos; const { txids, remove } = action.data; if (remove) { const newTxos = pendingTxos.filter(txo => !txids.includes(txo)); - const newPendingMassClaimTxid = txids.includes(pendingMassClaimTxid) - ? undefined - : pendingMassClaimTxid; - const newPendingConsolidateTxid = txids.includes(pendingConsolidateTxid) - ? undefined - : pendingConsolidateTxid; - return { - ...state, - pendingTxos: newTxos, - pendingMassClaimTxid: newPendingMassClaimTxid, - pendingConsolidateTxid: newPendingConsolidateTxid, - }; + return { ...state, pendingConsolidateTxos: newTxos }; } else { const newPendingSet = new Set([...pendingTxos, ...txids]); - return { ...state, pendingTxos: Array.from(newPendingSet) }; + return { ...state, pendingConsolidateTxos: Array.from(newPendingSet) }; } }, diff --git a/src/redux/selectors/wallet.js b/src/redux/selectors/wallet.js index 89316d7..d7b27d9 100644 --- a/src/redux/selectors/wallet.js +++ b/src/redux/selectors/wallet.js @@ -28,7 +28,7 @@ export const selectPendingSupportTransactions = createSelector( export const selectPendingOtherTransactions = createSelector( selectState, - state => state.pendingTxos + state => state.pendingConsolidateTxos ); export const selectAbandonClaimSupportError = createSelector( @@ -396,21 +396,6 @@ export const selectIsConsolidatingUtxos = createSelector( state => state.consolidatingUtxos ); -export const selectIsMassClaimingTips = createSelector( - selectState, - state => state.massClaimingTips -); - -export const selectPendingConsolidateTxid = createSelector( - selectState, - state => state.pendingConsolidateTxid -); - -export const selectPendingMassClaimTxid = createSelector( - selectState, - state => state.pendingMassClaimTxid -); - export const selectUtxoCounts = createSelector( selectState, state => state.utxoCounts