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

Merge pull request #1480 from dan1d/change-reward-eligbility

Browse source 
Fix grayed out rewards cards
This commit is contained in:
Sean Yesmunt 2018-05-15 15:34:20 -04:00 • committed by GitHub
commit 3eba7d774d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -30,11 +30,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Fix don't allow dark mode with automatic night mode enabled ([#1005](https://github.com/lbryio/lbry-app/issues/1005)) * Fix don't allow dark mode with automatic night mode enabled ([#1005](https://github.com/lbryio/lbry-app/issues/1005))
* Fix description box on Publish (dark theme) ([#1356](https://github.com/lbryio/lbry-app/issues/#1356)) * Fix description box on Publish (dark theme) ([#1356](https://github.com/lbryio/lbry-app/issues/#1356))
* Fix price wrapping in price badge ([#1420](https://github.com/lbryio/lbry-app/pull/1420)) * Fix price wrapping in price badge ([#1420](https://github.com/lbryio/lbry-app/pull/1420))
* Fix spacing in search suggestions ([#1422](https://github.com/lbryio/lbry-app/pull/1422)) * Fix spacing in search suggestions ([#1422])(https://github.com/lbryio/lbry-app/pull/1422))
* Fix text/HTML files don't display correctly in-app anymore ([#1379](https://github.com/lbryio/lbry-app/issues/1379)) * Fix text/HTML files don't display correctly in-app anymore ([#1379])(https://github.com/lbryio/lbry-app/issues/1379)
* Fix notification modals when reward is claimed ([#1436](https://github.com/lbryio/lbry-app/issues/1436)) and ([#1407](https://github.com/lbryio/lbry-app/issues/1407)) * Fix notification modals when reward is claimed ([#1436])(https://github.com/lbryio/lbry-app/issues/1436) and ([#1407])(https://github.com/lbryio/lbry-app/issues/1407)
* Fix disabled cards(grayed out) ([#1466])(https://github.com/lbryio/lbry-app/issues/1466)
* Fix markdown render ([#1179](https://github.com/lbryio/lbry-app/issues/1179)) * Fix markdown render ([#1179](https://github.com/lbryio/lbry-app/issues/1179))
## [0.21.3] - 2018-04-23 ## [0.21.3] - 2018-04-23

6
src/renderer/page/rewards/view.jsx
View file

@ -14,6 +14,9 @@ type Props = {
rewards: Array<{ reward_type: boolean }>, rewards: Array<{ reward_type: boolean }>,
user: ?{ user: ?{
is_identity_verified: boolean, is_identity_verified: boolean,
is_reward_approved: boolean,
primary_email: string,
has_verified_email: boolean,
}, },
daemonSettings: { daemonSettings: {
share_usage_data: boolean, share_usage_data: boolean,
@ -131,8 +134,7 @@ class RewardsPage extends React.PureComponent<Props> {
} }
const isNotEligible = const isNotEligible =
!user || !user.primary_email || !user.has_verified_email || !user.is_identity_verified; !user || !user.primary_email || !user.has_verified_email || !user.is_reward_approved;
return ( return (
<div <div
className={classnames('card__list--rewards', { className={classnames('card__list--rewards', {

2
yarn.lock
View file

@ -3100,7 +3100,7 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
version "1.3.45" version "1.3.45"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8"
electron-updater@^2.21.4: electron-updater@^2.21.10:
version "2.21.10" version "2.21.10"
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.10.tgz#aa66757ebf966f4247f247a8433af45cfe8e93b0" resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.10.tgz#aa66757ebf966f4247f247a8433af45cfe8e93b0"
dependencies: dependencies: