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

rebase

Browse source
This commit is contained in:
Sean Yesmunt 2018-08-29 23:28:53 -04:00
parent 00c488799f
commit fab8e47801
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -50,7 +50,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#421321a78397251589e5a890f4caa95e79975e2b", "lbry-redux": "lbryio/lbry-redux#d1cee82af119c0c5f98ec27f94b2e7f61e34b54c",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"mammoth": "^1.4.6", "mammoth": "^1.4.6",
"mime": "^2.3.1", "mime": "^2.3.1",

4
src/renderer/component/fileCard/view.jsx
View file

@ -9,7 +9,8 @@ import Icon from 'component/common/icon';
import UriIndicator from 'component/uriIndicator'; import UriIndicator from 'component/uriIndicator';
import * as icons from 'constants/icons'; import * as icons from 'constants/icons';
import classnames from 'classnames'; import classnames from 'classnames';
import { openCopyLinkMenu } from '../../util/contextMenu'; import FilePrice from 'component/filePrice';
import { openCopyLinkMenu } from 'util/contextMenu';
// TODO: iron these out // TODO: iron these out
type Props = { type Props = {
@ -65,6 +66,7 @@ class FileCard extends React.PureComponent<Props> {
position, position,
lastViewed, lastViewed,
clearHistoryUri, clearHistoryUri,
showPrice,
} = this.props; } = this.props;
const shouldHide = !claimIsMine && !pending && obscureNsfw && metadata && metadata.nsfw; const shouldHide = !claimIsMine && !pending && obscureNsfw && metadata && metadata.nsfw;

3
src/renderer/redux/actions/app.js
View file

@ -17,7 +17,7 @@ import { doFetchRewardedContent } from 'redux/actions/content';
import { doFetchDaemonSettings } from 'redux/actions/settings'; import { doFetchDaemonSettings } from 'redux/actions/settings';
import { doAuthNavigate } from 'redux/actions/navigation'; import { doAuthNavigate } from 'redux/actions/navigation';
import { doAuthenticate } from 'redux/actions/user'; import { doAuthenticate } from 'redux/actions/user';
import { doCheckSubscriptions } from 'redux/actions/subscriptions'; import { doCheckSubscriptionsInit } from 'redux/actions/subscriptions';
import { import {
selectIsUpgradeSkipped, selectIsUpgradeSkipped,
selectUpdateUrl, selectUpdateUrl,
@ -28,7 +28,6 @@ import {
selectRemoteVersion, selectRemoteVersion,
selectUpgradeTimer, selectUpgradeTimer,
} from 'redux/selectors/app'; } from 'redux/selectors/app';
import { doAuthenticate } from 'redux/actions/user';
import { lbrySettings as config } from 'package.json'; import { lbrySettings as config } from 'package.json';
const { autoUpdater } = remote.require('electron-updater'); const { autoUpdater } = remote.require('electron-updater');

4
yarn.lock
View file

@ -5655,9 +5655,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#eae0d134d92d83f733b85a8ecebf529a6e9799cf: lbry-redux@lbryio/lbry-redux#d1cee82af119c0c5f98ec27f94b2e7f61e34b54c:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/eae0d134d92d83f733b85a8ecebf529a6e9799cf" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/d1cee82af119c0c5f98ec27f94b2e7f61e34b54c"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"