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

Rc fixes #2075

Merged
neb-b merged 2 commits from rc-fixes into master 2018-10-30 19:06:52 +01:00
Conversation 1 Commits 2 Files changed 3 +69 -70
3 changed files with 69 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/renderer/redux/actions/subscriptions.js
View file

@ -205,7 +205,7 @@ export const doRemoveUnreadSubscription = (channelUri: string, readUri: string)
dispatch(doRemoveUnreadSubscriptions(channelUri, [readUri])); dispatch(doRemoveUnreadSubscriptions(channelUri, [readUri]));
}; };
export const doCheckSubscription = (subscriptionUri: string, shouldNotify?: boolean) => async ( export const doCheckSubscription = (subscriptionUri: string, shouldNotify?: boolean) => (
dispatch: ReduxDispatch, dispatch: ReduxDispatch,
getState: GetState getState: GetState
) => { ) => {
@ -223,7 +223,7 @@ export const doCheckSubscription = (subscriptionUri: string, shouldNotify?: bool
); );
} }
const claimListByChannel = await Lbry.claim_list_by_channel({ uri: subscriptionUri, page: 1 }); Lbry.claim_list_by_channel({ uri: subscriptionUri, page: 1 }).then(claimListByChannel => {
const claimResult = claimListByChannel[subscriptionUri] || {}; const claimResult = claimListByChannel[subscriptionUri] || {};
const { claims_in_channel: claimsInChannel } = claimResult; const { claims_in_channel: claimsInChannel } = claimResult;
@ -303,6 +303,7 @@ export const doCheckSubscription = (subscriptionUri: string, shouldNotify?: bool
page: 1, page: 1,
}, },
}); });
});
}; };
export const doChannelSubscribe = (subscription: Subscription) => ( export const doChannelSubscribe = (subscription: Subscription) => (

3
src/renderer/scss/component/_card.scss
View file

@ -227,8 +227,7 @@
.card__subtitle { .card__subtitle {
color: $lbry-gray-5; color: $lbry-gray-5;
font-size: .9em; font-size: 0.9em;
line-height: .9em;
padding-top: $spacing-vertical * 1/3; padding-top: $spacing-vertical * 1/3;
@media (min-width: $large-breakpoint) { @media (min-width: $large-breakpoint) {

1
webpack.renderer.additions.js
View file

@ -13,7 +13,6 @@ const isDev = PROCESS_ARGV && PROCESS_ARGV.original &&
module.exports = { module.exports = {
// This rule is temporarily necessary until https://github.com/electron-userland/electron-webpack/issues/60 is fixed. // This rule is temporarily necessary until https://github.com/electron-userland/electron-webpack/issues/60 is fixed.
entry: ['babel-polyfill', `${ELECTRON_RENDERER_PROCESS_ROOT}/index.js`],
module: { module: {
rules: [ rules: [
{ {