LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

RC fixes #2473

Merged
neb-b merged 26 commits from fixes into master 2019-05-14 20:22:04 +02:00
Conversation 0 Commits 26 Files changed 45 +5 -4
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a8cacd13ae - Show all commits

2
package.json
View file

@ -117,7 +117,7 @@
"jsmediatags": "^3.8.1", "jsmediatags": "^3.8.1",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#c8126ab21792d7a85e1123a2363af285a0263654", "lbry-redux": "lbryio/lbry-redux#02f6918238110726c0b3b4248c61a84ac0b969e3",
"lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845", "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",

4
src/ui/component/transactionList/index.js
View file

@ -3,7 +3,7 @@ import { selectClaimedRewardsByTransactionId } from 'lbryinc';
import { doOpenModal } from 'redux/actions/app'; import { doOpenModal } from 'redux/actions/app';
import { import {
selectAllMyClaimsByOutpoint, selectAllMyClaimsByOutpoint,
selectSupportsById, selectSupportsByOutpoint,
selectTransactionListFilter, selectTransactionListFilter,
doSetTransactionListFilter, doSetTransactionListFilter,
} from 'lbry-redux'; } from 'lbry-redux';
@ -11,7 +11,7 @@ import TransactionList from './view';
const select = state => ({ const select = state => ({
rewards: selectClaimedRewardsByTransactionId(state), rewards: selectClaimedRewardsByTransactionId(state),
mySupports: selectSupportsById(state), mySupports: selectSupportsByOutpoint(state),
myClaims: selectAllMyClaimsByOutpoint(state), myClaims: selectAllMyClaimsByOutpoint(state),
filterSetting: selectTransactionListFilter(state), filterSetting: selectTransactionListFilter(state),
}); });

3
src/ui/component/transactionList/view.jsx
View file

@ -43,8 +43,9 @@ class TransactionList extends React.PureComponent<Props> {
} }
isRevokeable(txid: string, nout: number) { isRevokeable(txid: string, nout: number) {
const outpoint = `${txid}:${nout}`;
const { mySupports, myClaims } = this.props; const { mySupports, myClaims } = this.props;
return !!mySupports[txid] || myClaims.has(`${txid}:${nout}`); return !!mySupports[outpoint] || myClaims.has(outpoint);
} }
revokeClaim(txid: string, nout: number) { revokeClaim(txid: string, nout: number) {