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

Merge branch 'master' into markdown-fix

Browse source
This commit is contained in:
Baltazar Gomez 2018-05-11 01:57:10 -06:00 • committed by GitHub
commit 6d820058dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* 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 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

2
package.json
View file

@ -51,7 +51,7 @@
"formik": "^0.10.4", "formik": "^0.10.4",
"hast-util-sanitize": "^1.1.2", "hast-util-sanitize": "^1.1.2",
"keytar": "^4.2.1", "keytar": "^4.2.1",
"lbry-redux": "lbryio/lbry-redux", "lbry-redux": "lbryio/lbry-redux#86530690e93a4cfb702ade32d9f2121ccbca47a6",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"mixpanel-browser": "^2.17.1", "mixpanel-browser": "^2.17.1",
"moment": "^2.22.0", "moment": "^2.22.0",

16
src/renderer/redux/actions/rewards.js
View file

@ -1,6 +1,6 @@
import * as ACTIONS from 'constants/action_types'; import * as ACTIONS from 'constants/action_types';
import { MODALS } from 'lbry-redux';
import Lbryio from 'lbryio'; import Lbryio from 'lbryio';
import { doNotify, MODALS } from 'lbry-redux';
import { selectUnclaimedRewardsByType } from 'redux/selectors/rewards'; import { selectUnclaimedRewardsByType } from 'redux/selectors/rewards';
import { selectUserIsRewardApproved } from 'redux/selectors/user'; import { selectUserIsRewardApproved } from 'redux/selectors/user';
import rewards from 'rewards'; import rewards from 'rewards';
@ -40,10 +40,11 @@ export function doClaimRewardType(rewardType) {
} }
if (!userIsRewardApproved && rewardType !== rewards.TYPE_CONFIRM_EMAIL) { if (!userIsRewardApproved && rewardType !== rewards.TYPE_CONFIRM_EMAIL) {
dispatch({ const action = doNotify({
type: ACTIONS.OPEN_MODAL, id: MODALS.REWARD_APPROVAL_REQUIRED,
data: { modal: MODALS.REWARD_APPROVAL_REQUIRED }, isError: false,
}); });
dispatch(action);
return; return;
} }
@ -61,10 +62,11 @@ export function doClaimRewardType(rewardType) {
}, },
}); });
if (successReward.reward_type === rewards.TYPE_NEW_USER) { if (successReward.reward_type === rewards.TYPE_NEW_USER) {
dispatch({ const action = doNotify({
type: ACTIONS.OPEN_MODAL, id: MODALS.FIRST_REWARD,
data: { modal: MODALS.FIRST_REWARD }, isError: false,
}); });
dispatch(action);
} }
}; };

4
yarn.lock
View file

@ -5809,9 +5809,9 @@ lazy-val@^1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
lbry-redux@lbryio/lbry-redux: lbry-redux@lbryio/lbry-redux#86530690e93a4cfb702ade32d9f2121ccbca47a6:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/62f04be2be163cea2ad5fb7a2426ee0d95122d54" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/86530690e93a4cfb702ade32d9f2121ccbca47a6"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"