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

Redux persist #225

Merged
6ea86b96 merged 8 commits from redux-persist into master 2017-06-15 16:13:31 +02:00
Conversation 0 Commits 8 Files changed 7 +6 -8
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b596806fbc - Show all commits

14
ui/js/page/showPage/view.jsx
View file

@ -6,15 +6,13 @@ import FilePage from "page/filePage";
class ShowPage extends React.PureComponent {
componentWillMount() {
this.resolve(this.props);
const { isResolvingUri, resolveUri, uri } = this.props;
if (!isResolvingUri) resolveUri(uri);
}
componentWillReceiveProps(nextProps) {
this.resolve(nextProps);
}
resolve(props) {
const { isResolvingUri, resolveUri, claim, uri } = props;
const { isResolvingUri, resolveUri, claim, uri } = this.props;
if (!isResolvingUri && claim === undefined && uri) {
resolveUri(uri);
@ -26,7 +24,7 @@ class ShowPage extends React.PureComponent {
let innerContent = "";
if (isResolvingUri || !claim) {
if (isResolvingUri && !claim) {
innerContent = (
<section className="card">
<div className="card__inner">
@ -44,7 +42,7 @@ class ShowPage extends React.PureComponent {
</div>
</section>
);
} else if (claim.name.length && claim.name[0] === "@") {
} else if (claim && claim.name.length && claim.name[0] === "@") {
innerContent = <ChannelPage uri={uri} />;
} else if (claim) {
innerContent = <FilePage uri={uri} />;