-
this.props.navigate(primaryUrl)} className="card__link">
+ navigate(primaryUrl)} className="card__link">
{title}
- { !this.props.hidePrice ?
{metadata &&
}
-
- {isConfirmed
- ? metadata.description
- : This file is pending confirmation. }
-
+ {description}
{this.state.showNsfwHelp && this.state.hovered
diff --git a/ui/js/component/fileTileStream/index.js b/ui/js/component/fileTileStream/index.js
index d212dfdae..80807f125 100644
--- a/ui/js/component/fileTileStream/index.js
+++ b/ui/js/component/fileTileStream/index.js
@@ -20,6 +20,9 @@ import {
import {
selectObscureNsfw,
} from 'selectors/app'
+import {
+ makeSelectResolvingUri,
+} from 'selectors/content'
import FileTileStream from './view'
const makeSelect = () => {
@@ -29,6 +32,7 @@ const makeSelect = () => {
const selectAvailabilityForUri = makeSelectAvailabilityForUri()
const selectMetadataForUri = makeSelectMetadataForUri()
const selectSourceForUri = makeSelectSourceForUri()
+ const selectResolvingUri = makeSelectResolvingUri()
const select = (state, props) => ({
claim: selectClaimForUri(state, props),
@@ -38,6 +42,7 @@ const makeSelect = () => {
obscureNsfw: selectObscureNsfw(state),
metadata: selectMetadataForUri(state, props),
source: selectSourceForUri(state, props),
+ isResolvingUri: selectResolvingUri(state, props),
})
return select
diff --git a/ui/js/component/fileTileStream/view.jsx b/ui/js/component/fileTileStream/view.jsx
index 2130df284..6a80772eb 100644
--- a/ui/js/component/fileTileStream/view.jsx
+++ b/ui/js/component/fileTileStream/view.jsx
@@ -5,7 +5,7 @@ import Link from 'component/link';
import FileActions from 'component/fileActions';
import {Thumbnail, TruncatedText,} from 'component/common.js';
import FilePrice from 'component/filePrice'
-import UriIndicator from 'component/channel-indicator.js';
+import UriIndicator from 'component/uriIndicator';
/*should be merged into FileTile once FileTile is refactored to take a single id*/
class FileTileStream extends React.Component {
@@ -63,7 +63,9 @@ class FileTileStream extends React.Component {
const {
metadata,
+ isResolvingUri,
navigate,
+ hidePrice,
} = this.props
const uri = lbryuri.normalize(this.props.uri);
@@ -71,6 +73,15 @@ class FileTileStream extends React.Component {
const title = isConfirmed ? metadata.title : uri;
const obscureNsfw = this.props.obscureNsfw && isConfirmed && metadata.nsfw;
+ let description = ""
+ if (isConfirmed) {
+ description = metadata.description
+ } else if (isResolvingUri) {
+ description = "Loading..."
+ } else {
+ description =
This file is pending confirmation
+ }
+
return (
@@ -101,11 +112,7 @@ class FileTileStream extends React.Component {
-
- {isConfirmed
- ? metadata.description
- : This file is pending confirmation. }
-
+ {description}
-
+
)
}
}
diff --git a/ui/js/reducers/app.js b/ui/js/reducers/app.js
index 13b1bb6b9..380c0f2c9 100644
--- a/ui/js/reducers/app.js
+++ b/ui/js/reducers/app.js
@@ -16,6 +16,12 @@ const defaultState = {
hasSignature: false,
}
+reducers[types.DAEMON_READY] = function(state, action) {
+ return Object.assign({}, state, {
+ daemonReady: true,
+ })
+}
+
reducers[types.NAVIGATE] = function(state, action) {
return Object.assign({}, state, {
currentPath: action.data.path,
diff --git a/ui/js/selectors/app.js b/ui/js/selectors/app.js
index a269e98f2..e0d1a7a43 100644
--- a/ui/js/selectors/app.js
+++ b/ui/js/selectors/app.js
@@ -39,8 +39,7 @@ export const selectPageTitle = createSelector(
case 'wallet':
case 'send':
case 'receive':
- case 'claim':
- case 'referral':
+ case 'rewards':
return 'Wallet'
case 'downloaded':
return 'My Files'
@@ -129,14 +128,12 @@ export const selectHeaderLinks = createSelector(
case 'wallet':
case 'send':
case 'receive':
- case 'claim':
- case 'referral':
+ case 'rewards':
return {
'wallet' : 'Overview',
'send' : 'Send',
'receive' : 'Receive',
- 'claim' : 'Claim Beta Code',
- 'referral' : 'Check Referral Credit',
+ 'rewards': 'Rewards',
};
case 'downloaded':
case 'published':
diff --git a/ui/js/selectors/content.js b/ui/js/selectors/content.js
index be38c21b3..87b91182d 100644
--- a/ui/js/selectors/content.js
+++ b/ui/js/selectors/content.js
@@ -96,3 +96,19 @@ export const shouldFetchPublishedContent = createSelector(
return true
}
)
+
+export const selectResolvingUris = createSelector(
+ _selectState,
+ (state) => state.resolvingUris || []
+)
+
+const selectResolvingUri = (state, props) => {
+ return selectResolvingUris(state).indexOf(props.uri) != -1
+}
+
+export const makeSelectResolvingUri = () => {
+ return createSelector(
+ selectResolvingUri,
+ (resolving) => resolving
+ )
+}
diff --git a/ui/package.json b/ui/package.json
index 8f7e754e1..ee8db2a1a 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -26,6 +26,7 @@
"intersection-observer": "^0.2.1",
"mediaelement": "^2.23.4",
"node-sass": "^3.8.0",
+ "plyr": "^2.0.12",
"rc-progress": "^2.0.6",
"react": "^15.4.0",
"react-dom": "^15.4.0",
@@ -34,8 +35,7 @@
"redux": "^3.6.0",
"redux-logger": "^3.0.1",
"redux-thunk": "^2.2.0",
- "reselect": "^3.0.0",
- "videostream": "^2.4.2"
+ "reselect": "^3.0.0"
},
"devDependencies": {
"babel": "^6.5.2",