LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-08-28 16:01:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: multiple youtube channel reward

Browse source
This commit is contained in:
Thomas Zarebczan 2020-03-26 15:14:22 -04:00 • committed by Sean Yesmunt
parent 6cd5048572
commit cc5751617c
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -131,7 +131,7 @@
"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#db0f48b56f80d556b7774f0a70d32d16f07ccdcc", "lbry-redux": "lbryio/lbry-redux#db0f48b56f80d556b7774f0a70d32d16f07ccdcc",
"lbryinc": "lbryio/lbryinc#e2bba80797e412f17d092b0964ff252a337bdbd2", "lbryinc": "lbryio/lbryinc#402a9a199f0bcb4cf6bd25a4ee1fb98e30b48187",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"lodash-es": "^4.17.14", "lodash-es": "^4.17.14",

9
ui/component/rewardLink/index.js
View file

@ -1,17 +1,14 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { makeSelectRewardByType, makeSelectIsRewardClaimPending, doClaimRewardType } from 'lbryinc'; import { makeSelectRewardByClaimCode, makeSelectIsRewardClaimPending, doClaimRewardType } from 'lbryinc';
import RewardLink from './view'; import RewardLink from './view';
const select = (state, props) => ({ const select = (state, props) => ({
isPending: makeSelectIsRewardClaimPending()(state, props), isPending: makeSelectIsRewardClaimPending()(state, props),
reward: makeSelectRewardByType()(state, props.reward_type), reward: makeSelectRewardByClaimCode()(state, props.claim_code),
}); });
const perform = dispatch => ({ const perform = dispatch => ({
claimReward: reward => dispatch(doClaimRewardType(reward.reward_type, { notifyError: true })), claimReward: reward => dispatch(doClaimRewardType(reward.reward_type, { notifyError: true })),
}); });
export default connect( export default connect(select, perform)(RewardLink);
select,
perform
)(RewardLink);

3
ui/component/rewardTile/view.jsx
View file

@ -19,6 +19,7 @@ type Props = {
created_at: string, created_at: string,
reward_description: string, reward_description: string,
reward_type: string, reward_type: string,
claim_code: string,
}, },
user: User, user: User,
}; };
@ -57,7 +58,7 @@ const RewardTile = (props: Props) => {
<Icon icon={ICONS.COMPLETED} /> {__('Reward claimed.')} <Icon icon={ICONS.COMPLETED} /> {__('Reward claimed.')}
</span> </span>
) : ( ) : (
<RewardLink button reward_type={reward.reward_type} /> <RewardLink button claim_code={reward.claim_code} />
))} ))}
</div> </div>
} }

4
yarn.lock
View file

@ -6146,9 +6146,9 @@ lbry-redux@lbryio/lbry-redux#db0f48b56f80d556b7774f0a70d32d16f07ccdcc:
reselect "^3.0.0" reselect "^3.0.0"
uuid "^3.3.2" uuid "^3.3.2"
lbryinc@lbryio/lbryinc#e2bba80797e412f17d092b0964ff252a337bdbd2: lbryinc@lbryio/lbryinc#402a9a199f0bcb4cf6bd25a4ee1fb98e30b48187:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/e2bba80797e412f17d092b0964ff252a337bdbd2" resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/402a9a199f0bcb4cf6bd25a4ee1fb98e30b48187"
dependencies: dependencies:
reselect "^3.0.0" reselect "^3.0.0"