fix downloads. file page tweaks.

src/component/AppNavigator.js

@@ -51,6 +51,7 @@ import {
   selectHashChanged,
   selectUser,
 } from 'lbryinc';
+import { doStartDownload, doUpdateDownload, doCompleteDownload } from 'redux/actions/file';
 import { makeSelectClientSetting, selectFullscreenMode } from 'redux/selectors/settings';
 import { decode as atob } from 'base-64';
 import { dispatchNavigateBack, dispatchNavigateToUri, transformUrl } from 'utils/helper';
@@ -311,6 +312,10 @@ class AppWithNavigationState extends React.Component {
     this.emailVerifyCheckInterval = setInterval(() => this.checkEmailVerification(), 5000);
     Linking.addEventListener('url', this._handleUrl);
 
+    DeviceEventEmitter.addListener('onDownloadStarted', this.handleDownloadStarted);
+    DeviceEventEmitter.addListener('onDownloadUpdated', this.handleDownloadUpdated);
+    DeviceEventEmitter.addListener('onDownloadCompleted', this.handleDownloadCompleted);
+
     // call /sync/get with interval
     this.syncGetInterval = setInterval(() => {
       this.setState({ syncHashChanged: false }); // reset local state
@@ -345,7 +350,29 @@ class AppWithNavigationState extends React.Component {
     );
   };
 
+  handleDownloadStarted = evt => {
+    const { dispatch } = this.props;
+    const { uri, outpoint, fileInfo } = evt;
+    dispatch(doStartDownload(uri, outpoint, fileInfo));
+  };
+
+  handleDownloadUpdated = evt => {
+    const { dispatch } = this.props;
+    const { uri, outpoint, fileInfo, progress } = evt;
+    dispatch(doUpdateDownload(uri, outpoint, fileInfo, progress));
+  };
+
+  handleDownloadCompleted = evt => {
+    const { dispatch } = this.props;
+    const { uri, outpoint, fileInfo } = evt;
+    dispatch(doCompleteDownload(uri, outpoint, fileInfo));
+  };
+
   componentWillUnmount() {
+    DeviceEventEmitter.removeListener('onDownloadStarted', this.handleDownloadStarted);
+    DeviceEventEmitter.removeListener('onDownloadUpdated', this.handleDownloadUpdated);
+    DeviceEventEmitter.removeListener('onDownloadCompleted', this.handleDownloadCompleted);
+
     AppState.removeEventListener('change', this._handleAppStateChange);
     BackHandler.removeEventListener('hardwareBackPress');
     Linking.removeEventListener('url', this._handleUrl);

src/component/fileDownloadButton/view.js

@@ -11,11 +11,6 @@ class FileDownloadButton extends React.PureComponent {
     }
   }
 
-  componentWillReceiveProps(nextProps) {
-    // this.checkAvailability(nextProps.uri);
-    // this.restartDownload(nextProps);
-  }
-
   restartDownload(props) {
     const { downloading, fileInfo, uri, restartDownload } = props;
 
@@ -45,6 +40,7 @@ class FileDownloadButton extends React.PureComponent {
       doPause,
       style,
       openFile,
+      onFileActionPress,
       onButtonLayout,
     } = this.props;
 
@@ -72,19 +68,7 @@ class FileDownloadButton extends React.PureComponent {
           text={isPlayable ? __('Play') : isViewable ? __('View') : __('Download')}
           onLayout={onButtonLayout}
           style={[style, fileDownloadButtonStyle.container]}
-          onPress={() => {
+          onPress={onFileActionPress}
-            NativeModules.Firebase.track('purchase_uri', { uri: uri });
-            purchaseUri(uri, costInfo, !isPlayable);
-            if (NativeModules.UtilityModule) {
-              NativeModules.UtilityModule.checkDownloads();
-            }
-            if (isPlayable && onPlay) {
-              this.props.onPlay();
-            }
-            if (isViewable && onView) {
-              this.props.onView();
-            }
-          }}
         />
       );
     } else if (fileInfo && fileInfo.download_path) {

src/component/fileListItem/view.js

@@ -158,7 +158,13 @@ class FileListItem extends React.PureComponent {
             </View>
           )}
           {fileInfo && fileInfo.completed && fileInfo.download_path && (
-            <Icon style={fileListStyle.downloadedIcon} solid color={Colors.NextLbryGreen} name={'folder'} size={16} />
+            <Icon
+              style={featuredResult ? fileListStyle.featuredDownloadedIcon : fileListStyle.downloadedIcon}
+              solid
+              color={Colors.NextLbryGreen}
+              name={'folder'}
+              size={16}
+            />
           )}
           <View style={fileListStyle.detailsContainer}>
             {featuredResult && (

src/component/relatedContent/view.js

@@ -8,18 +8,11 @@ import fileListStyle from 'styles/fileList';
 import relatedContentStyle from 'styles/relatedContent';
 
 export default class RelatedContent extends React.PureComponent {
-  state = {
+  componentDidMount() {
-    urlsResolved: false,
-  };
-
-  componentDidUpdate(prevProps) {
     const { resolveUris, recommendedContent } = this.props;
-
+    if (recommendedContent && recommendedContent.length > 0) {
-    if (recommendedContent && recommendedContent.length > 0 && !this.state.urisResolved) {
-      this.setState({ urisResolved: true }, () => {
       // batch resolve the uris
       resolveUris(recommendedContent);
-      });
     }
   }
 

src/i18n.js

@@ -52,8 +52,9 @@ function checkMessageAndSave(message, messagesFilePath) {
         ); */
       })
       .catch(err => {
-        if (err) {
+        if (err && !isProduction) {
-          throw err;
+          // only do this when not in production
+          console.error(err);
         }
       });
   }

src/index.js

@@ -57,7 +57,7 @@ window.__ = __;
 
 const globalExceptionHandler = (error, isFatal) => {
   if (error && NativeModules.Firebase) {
-    NativeModules.Firebase.logException(isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
+    NativeModules.Firebase.logException(!!isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
   }
 };
 setJSExceptionHandler(globalExceptionHandler, true);

src/page/file/index.js

@@ -8,6 +8,7 @@ import {
   doPurchaseUri,
   doDeletePurchasedUri,
   doResolveUri,
+  doResolveUris,
   doSearch,
   doSendTip,
   doToast,
@@ -28,6 +29,7 @@ import {
   selectPurchasedUris,
   selectFailedPurchaseUris,
   selectPurchaseUriErrorMessage,
+  selectResolvingUris,
   selectIsSearching,
 } from 'lbry-redux';
 import {
@@ -39,13 +41,7 @@ import {
   selectRewardContentClaimIds,
   selectBlackListedOutpoints,
 } from 'lbryinc';
-import {
+import { doDeleteFile, doStopDownloadingFile } from 'redux/actions/file';
-  doStartDownload,
-  doUpdateDownload,
-  doCompleteDownload,
-  doDeleteFile,
-  doStopDownloadingFile,
-} from 'redux/actions/file';
 import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
 import { doToggleFullscreenMode } from 'redux/actions/settings';
 import { selectDrawerStack } from 'redux/selectors/drawer';
@@ -77,6 +73,7 @@ const select = (state, props) => {
     thumbnail: makeSelectThumbnailForUri(contentUri)(state),
     title: makeSelectTitleForUri(contentUri)(state),
     recommendedContent: makeSelectRecommendedContentForUri(contentUri)(state),
+    resolvingUris: selectResolvingUris(state),
     isSearchingRecommendContent: selectIsSearching(state),
     viewCount: makeSelectViewCountForUri(contentUri)(state),
   };
@@ -100,14 +97,12 @@ const perform = dispatch => ({
   purchaseUri: (uri, costInfo, saveFile) => dispatch(doPurchaseUri(uri, costInfo, saveFile)),
   deletePurchasedUri: uri => dispatch(doDeletePurchasedUri(uri)),
   resolveUri: uri => dispatch(doResolveUri(uri)),
+  resolveUris: uris => dispatch(doResolveUris(uris)),
   searchRecommended: query => dispatch(doSearch(query, 20, undefined, true)),
   sendTip: (amount, claimId, isSupport, successCallback, errorCallback) =>
     dispatch(doSendTip(amount, claimId, isSupport, successCallback, errorCallback)),
   setPlayerVisible: () => dispatch(doSetPlayerVisible(true)),
   stopDownload: (uri, fileInfo) => dispatch(doStopDownloadingFile(uri, fileInfo)),
-  startDownload: (uri, outpoint, fileInfo) => dispatch(doStartDownload(uri, outpoint, fileInfo)),
-  updateDownload: (uri, outpoint, fileInfo, progress) => dispatch(doUpdateDownload(uri, outpoint, fileInfo, progress)),
-  completeDownload: (uri, outpoint, fileInfo) => dispatch(doCompleteDownload(uri, outpoint, fileInfo)),
   toggleFullscreenMode: mode => dispatch(doToggleFullscreenMode(mode)),
 });
 

src/page/file/view.js

@@ -72,6 +72,7 @@ class FilePage extends React.PureComponent {
       fileViewLogged: false,
       fullscreenMode: false,
       fileGetStarted: false,
+      hasCheckedAllResolved: false,
       imageUrls: null,
       isLandscape: false,
       mediaLoaded: false,
@@ -101,29 +102,24 @@ class FilePage extends React.PureComponent {
 
   onComponentFocused = () => {
     StatusBar.setHidden(false);
-    NativeModules.Firebase.setCurrentScreen('File');
+    NativeModules.Firebase.setCurrentScreen('File').then(result => {
+      DeviceEventEmitter.addListener('onStoragePermissionGranted', this.handleStoragePermissionGranted);
+      DeviceEventEmitter.addListener('onStoragePermissionRefused', this.handleStoragePermissionRefused);
 
-    DeviceEventEmitter.addListener('onDownloadStarted', this.handleDownloadStarted);
+      const { claim, fetchMyClaims, fileInfo, isResolvingUri, resolveUri, navigation } = this.props;
-    DeviceEventEmitter.addListener('onDownloadUpdated', this.handleDownloadUpdated);
-    DeviceEventEmitter.addListener('onDownloadCompleted', this.handleDownloadCompleted);
-
-    const { fetchMyClaims, fileInfo, isResolvingUri, resolveUri, navigation } = this.props;
       const { uri, uriVars } = navigation.state.params;
       this.setState({ uri, uriVars });
 
-    if (!isResolvingUri) resolveUri(uri);
+      if (!isResolvingUri && !claim) resolveUri(uri);
 
       this.fetchFileInfo(this.props);
       this.fetchCostInfo(this.props);
 
       fetchMyClaims();
 
-    if (NativeModules.Firebase) {
       NativeModules.Firebase.track('open_file_page', { uri: uri });
-    }
-    if (NativeModules.UtilityModule) {
       NativeModules.UtilityModule.keepAwakeOn();
-    }
+    });
   };
 
   componentDidMount() {
@@ -151,6 +147,7 @@ class FilePage extends React.PureComponent {
       navigation,
       contentType,
       notify,
+      recommendedContent: prevRecommendedContent,
       drawerStack: prevDrawerStack,
     } = this.props;
     const { uri } = navigation.state.params;
@@ -162,6 +159,8 @@ class FilePage extends React.PureComponent {
       purchaseUriErrorMessage,
       streamingUrl,
       drawerStack,
+      recommendedContent,
+      resolveUris,
     } = nextProps;
 
     if (Constants.ROUTE_FILE === currentRoute && currentRoute !== prevRoute) {
@@ -177,11 +176,9 @@ class FilePage extends React.PureComponent {
 
     const mediaType = Lbry.getMediaType(contentType);
     const isPlayable = mediaType === 'video' || mediaType === 'audio';
-    if (
+    if (this.state.fileGetStarted || prevPurchasedUris.length !== purchasedUris.length) {
-      (this.state.fileGetStarted || prevPurchasedUris.length !== purchasedUris.length) &&
+      const { permanent_url: permanentUrl } = claim;
-      NativeModules.UtilityModule
+      if (purchasedUris.includes(uri) || purchasedUris.includes(permanentUrl)) {
-    ) {
-      if (purchasedUris.includes(uri)) {
         const { nout, txid } = claim;
         const outpoint = `${txid}:${nout}`;
         NativeModules.UtilityModule.queueDownload(outpoint);
@@ -216,9 +213,23 @@ class FilePage extends React.PureComponent {
     if (claim && !this.state.viewCountFetched) {
       this.setState({ viewCountFetched: true }, () => fetchViewCount(claim.claim_id));
     }
+
+    if (
+      (!prevRecommendedContent && recommendedContent) ||
+      (recommendedContent && prevRecommendedContent && recommendedContent.length !== prevRecommendedContent.length)
+    ) {
+      resolveUris(recommendedContent);
+    }
   }
 
-  componentDidUpdate(prevProps) {
+  shouldComponentUpdate(nextProps, nextState) {
+    return (
+      Object.keys(this.difference(nextProps, this.props)).length > 0 ||
+      Object.keys(this.difference(nextState, this.state)).length > 0
+    );
+  }
+
+  componentDidUpdate(prevProps, prevState) {
     const {
       claim,
       contentType,
@@ -228,7 +239,6 @@ class FilePage extends React.PureComponent {
       resolveUri,
       navigation,
       purchaseUri,
-      searchRecommended,
       title,
     } = this.props;
     const { uri } = this.state;
@@ -236,10 +246,6 @@ class FilePage extends React.PureComponent {
       resolveUri(uri);
     }
 
-    if (title && !this.state.didSearchRecommended) {
-      this.setState({ didSearchRecommended: true }, () => searchRecommended(title));
-    }
-
     // Returned to the page. If mediaLoaded, and currentMediaInfo is different, update
     if (this.state.mediaLoaded && window.currentMediaInfo && window.currentMediaInfo.uri !== this.state.uri) {
       const { metadata } = this.props;
@@ -254,15 +260,7 @@ class FilePage extends React.PureComponent {
     const mediaType = Lbry.getMediaType(contentType);
     const isViewable = mediaType === 'image' || mediaType === 'text';
     if (claim && costInfo && costInfo.cost === 0 && !this.state.autoGetAttempted && isViewable) {
-      this.setState(
+      this.setState({ autoGetAttempted: true }, () => this.checkStoragePermissionForDownload());
-        {
-          autoGetAttempted: true,
-          downloadPressed: true,
-          autoPlayMedia: true,
-          stopDownloadConfirmed: false,
-        },
-        () => purchaseUri(claim.permanent_url, costInfo, true)
-      );
     }
   }
 
@@ -399,27 +397,34 @@ class FilePage extends React.PureComponent {
     }
     window.player = null;
 
-    DeviceEventEmitter.removeListener('onDownloadStarted', this.handleDownloadStarted);
+    DeviceEventEmitter.removeListener('onStoragePermissionGranted', this.handleStoragePermissionGranted);
-    DeviceEventEmitter.removeListener('onDownloadUpdated', this.handleDownloadUpdated);
+    DeviceEventEmitter.removeListener('onStoragePermissionRefused', this.handleStoragePermissionRefused);
-    DeviceEventEmitter.removeListener('onDownloadCompleted', this.handleDownloadCompleted);
   }
 
-  handleDownloadStarted = evt => {
+  handleStoragePermissionGranted = () => {
-    const { startDownload } = this.props;
+    // permission was allowed. proceed to download
-    const { uri, outpoint, fileInfo } = evt;
+    const { notify } = this.props;
-    startDownload(uri, outpoint, fileInfo);
+
+    // update the configured download folder and then download
+    NativeModules.UtilityModule.getDownloadDirectory().then(downloadDirectory => {
+      Lbry.settings_set({
+        key: 'download_dir',
+        value: downloadDirectory,
+      })
+        .then(() => this.performDownload())
+        .catch(() => {
+          notify({ message: 'The file could not be downloaded to the default download directory.', isError: true });
+        });
+    });
   };
 
-  handleDownloadUpdated = evt => {
+  handleStoragePermissionRefused = () => {
-    const { updateDownload } = this.props;
+    const { notify } = this.props;
-    const { uri, outpoint, fileInfo, progress } = evt;
+    this.setState({ downloadPressed: false });
-    updateDownload(uri, outpoint, fileInfo, progress);
+    notify({
-  };
+      message: __('The file could not be downloaded because the permission to write to storage was not granted.'),
-
+      isError: true,
-  handleDownloadCompleted = evt => {
+    });
-    const { completeDownload } = this.props;
-    const { uri, outpoint, fileInfo } = evt;
-    completeDownload(uri, outpoint, fileInfo);
   };
 
   localUriForFileInfo = fileInfo => {
@@ -519,6 +524,7 @@ class FilePage extends React.PureComponent {
   };
 
   onPlaybackStarted = () => {
+    const { searchRecommended, title } = this.props;
     let timeToStartMillis, timeToStart;
     if (this.startTime) {
       timeToStartMillis = Date.now() - this.startTime;
@@ -536,6 +542,11 @@ class FilePage extends React.PureComponent {
       payload['time_to_start_ms'] = timeToStartMillis;
     }
     NativeModules.Firebase.track('play', payload);
+
+    // only fetch recommended content after playback has started
+    if (title) {
+      searchRecommended(title);
+    }
   };
 
   onPlaybackFinished = () => {
@@ -589,14 +600,48 @@ class FilePage extends React.PureComponent {
     ));
   };
 
-  onFileDownloadButtonPlayed = () => {
+  onFileDownloadButtonPressed = () => {
-    const { setPlayerVisible } = this.props;
+    const { claim, costInfo, contentType, purchaseUri, setPlayerVisible } = this.props;
+    const mediaType = Lbry.getMediaType(contentType);
+    const isPlayable = mediaType === 'video' || mediaType === 'audio';
+    const isViewable = mediaType === 'image' || mediaType === 'text';
+
+    const { permanent_url: uri } = claim;
+    NativeModules.Firebase.track('purchase_uri', { uri: uri });
+
+    if (!isPlayable) {
+      this.checkStoragePermissionForDownload();
+    } else {
+      purchaseUri(uri, costInfo, !isPlayable);
+    }
+
+    if (isPlayable) {
       this.startTime = Date.now();
       this.setState({ downloadPressed: true, autoPlayMedia: true, stopDownloadConfirmed: false });
       setPlayerVisible();
+    }
+    if (isViewable) {
+      this.setState({ downloadPressed: true });
+    }
   };
 
   onDownloadPressed = () => {
+    this.checkStoragePermissionForDownload();
+  };
+
+  checkStoragePermissionForDownload = () => {
+    // check if we the permission to write to external storage has been granted
+    NativeModules.UtilityModule.canReadWriteStorage().then(canReadWrite => {
+      if (!canReadWrite) {
+        // request permission
+        NativeModules.UtilityModule.requestStoragePermission();
+      } else {
+        this.performDownload();
+      }
+    });
+  };
+
+  performDownload = () => {
     const { claim, costInfo, purchaseUri } = this.props;
     this.setState(
       {
@@ -604,7 +649,10 @@ class FilePage extends React.PureComponent {
         autoPlayMedia: false,
         stopDownloadConfirmed: false,
       },
-      () => purchaseUri(claim.permanent_url, costInfo, true)
+      () => {
+        purchaseUri(claim.permanent_url, costInfo, true);
+        NativeModules.UtilityModule.checkDownloads();
+      }
     );
   };
 
@@ -621,14 +669,7 @@ class FilePage extends React.PureComponent {
       // file already in library or URI already purchased, use fileGet directly
       this.setState({ fileGetStarted: true }, () => fileGet(uri, true));
     } else {
-      this.setState(
+      this.checkStoragePermissionForDownload();
-        {
-          downloadPressed: true,
-          autoPlayMedia: false,
-          stopDownloadConfirmed: false,
-        },
-        () => purchaseUri(uri, costInfo, true)
-      );
     }
   };
 
@@ -665,17 +706,6 @@ class FilePage extends React.PureComponent {
     }
   };
 
-  onMediaContainerPressed = () => {
-    const { costInfo, contentType, purchaseUri } = this.props;
-    const { uri } = this.state;
-    const mediaType = Lbry.getMediaType(contentType);
-    const isPlayable = mediaType === 'video' || mediaType === 'audio';
-    purchaseUri(uri, costInfo, isPlayable);
-    if (isPlayable) {
-      this.onFileDownloadButtonPlayed();
-    }
-  };
-
   render() {
     const {
       balance,
@@ -710,7 +740,7 @@ class FilePage extends React.PureComponent {
     let innerContent = null;
     if ((isResolvingUri && !claim) || !claim) {
       return (
-        <View style={filePageStyle.container}>
+        <View style={filePageStyle.pageContainer}>
           <UriBar value={uri} navigation={navigation} />
           {isResolvingUri && (
             <View style={filePageStyle.busyContainer}>
@@ -748,13 +778,7 @@ class FilePage extends React.PureComponent {
       );
     }
 
-    if (claim) {
-      if (isChannel) {
-        return <ChannelPage uri={uri} navigation={navigation} />;
-      }
-
     let isClaimBlackListed = false;
-
     if (blackListedOutpoints) {
       for (let i = 0; i < blackListedOutpoints.length; i += 1) {
         const outpoint = blackListedOutpoints[i];
@@ -766,8 +790,7 @@ class FilePage extends React.PureComponent {
     }
 
     if (isClaimBlackListed) {
-        return (
+      innerContent = (
-          <View style={filePageStyle.pageContainer}>
         <View style={filePageStyle.dmcaContainer}>
           <Text style={filePageStyle.dmcaText}>
             {__(
@@ -776,8 +799,6 @@ class FilePage extends React.PureComponent {
           </Text>
           <Link style={filePageStyle.dmcaLink} href="https://lbry.com/faq/dmca" text={__('Read More')} />
         </View>
-            <UriBar value={uri} navigation={navigation} />
-          </View>
       );
     }
 
@@ -833,12 +854,19 @@ class FilePage extends React.PureComponent {
     const localFileUri = this.localUriForFileInfo(fileInfo);
     const unsupported = !isPlayable && !canOpen;
 
-      if (fileInfo && !this.state.autoDownloadStarted && this.state.uriVars && this.state.uriVars.download === 'true') {
+    if (
+      !this.state.autoDownloadStarted &&
+      claim &&
+      costInfo &&
+      ((isPlayable && costInfo.cost === 0) || (this.state.uriVars && this.state.uriVars.download === 'true'))
+    ) {
       this.setState({ autoDownloadStarted: true }, () => {
-          purchaseUri(uri, costInfo, !isPlayable);
+        if (!isPlayable) {
-          if (NativeModules.UtilityModule) {
+          this.checkStoragePermissionForDownload();
-            NativeModules.UtilityModule.checkDownloads();
+        } else {
+          purchaseUri(claim.permanent_url, costInfo, !isPlayable);
         }
+        NativeModules.UtilityModule.checkDownloads();
       });
     }
 
@@ -847,13 +875,16 @@ class FilePage extends React.PureComponent {
       this.setState({ autoOpened: true }, () => this.openFile(localFileUri, mediaType));
     }
 
+    if (isChannel) {
+      return <ChannelPage uri={uri} navigation={navigation} />;
+    }
+
     return (
       <View style={filePageStyle.pageContainer}>
         {!this.state.fullscreenMode && <UriBar value={uri} navigation={navigation} />}
         {this.state.showWebView && isWebViewable && (
           <WebView allowFileAccess source={{ uri: localFileUri }} style={filePageStyle.viewer} />
         )}
-
         {this.state.showImageViewer && (
           <ImageViewer
             style={StyleSheet.flatten(filePageStyle.viewer)}
@@ -861,7 +892,6 @@ class FilePage extends React.PureComponent {
             renderIndicator={() => null}
           />
         )}
-
         {!this.state.showWebView && (
           <View
             style={
@@ -872,7 +902,7 @@ class FilePage extends React.PureComponent {
             <TouchableOpacity
               activeOpacity={0.5}
               style={filePageStyle.mediaContainer}
-                onPress={this.onMediaContainerPressed}
+              onPress={this.onFileDownloadButtonPressed}
             >
               {(canOpen || (!fileInfo || (isPlayable && !canLoadMedia)) || (!canOpen && fileInfo)) && (
                 <FileItemMedia
@@ -908,25 +938,19 @@ class FilePage extends React.PureComponent {
 
               {((isPlayable && !completed && !canLoadMedia) ||
                 canOpen ||
-                  (!completed && !this.state.streamingMode)) &&
+                (!completed && !this.state.streamingMode)) && (
-                  !this.state.downloadPressed && (
                 <FileDownloadButton
                   uri={claim && claim.permanent_url ? claim.permanent_url : uri}
                   style={filePageStyle.downloadButton}
                   openFile={() => this.openFile(localFileUri, mediaType)}
                   isPlayable={isPlayable}
                   isViewable={isViewable}
-                    onPlay={this.onFileDownloadButtonPlayed}
+                  onFileActionPress={this.onFileDownloadButtonPressed}
-                    onView={() => this.setState({ downloadPressed: true })}
                   onButtonLayout={() => this.setState({ downloadButtonShown: true })}
                 />
               )}
               {!fileInfo && (
-                  <FilePrice
+                <FilePrice uri={uri} style={filePageStyle.filePriceContainer} textStyle={filePageStyle.filePriceText} />
-                    uri={uri}
-                    style={filePageStyle.filePriceContainer}
-                    textStyle={filePageStyle.filePriceText}
-                  />
               )}
 
               <TouchableOpacity style={filePageStyle.backButton} onPress={this.onBackButtonPressed}>
@@ -958,7 +982,7 @@ class FilePage extends React.PureComponent {
                 uri={uri}
                 source={this.playerUriForFileInfo(fileInfo)}
                 style={playerStyle}
-                  autoPlay={autoplay || this.state.autoPlayMedia}
+                autoPlay
                 onFullscreenToggled={this.handleFullscreenToggle}
                 onLayout={evt => {
                   if (!this.state.playerHeight) {
@@ -1182,9 +1206,6 @@ class FilePage extends React.PureComponent {
       </View>
     );
   }
-
-    return null;
-  }
 }
 
 export default FilePage;

src/page/firstRun/view.js

@@ -228,7 +228,13 @@ class FirstRunScreen extends React.PureComponent {
   handleContinuePressed = () => {
     const { notify, user, hasSyncedWallet } = this.props;
     const pageIndex = FirstRunScreen.pages.indexOf(this.state.currentPage);
-    if (Constants.FIRST_RUN_PAGE_WALLET === this.state.currentPage) {
+
+    if (Constants.FIRST_RUN_PAGE_WELCOME === this.state.currentPage) {
+      // only show the welcome screen on first run
+      this.closeFinalPage();
+    }
+
+    /* if (Constants.FIRST_RUN_PAGE_WALLET === this.state.currentPage) {
       // do apply sync to check if the password is valid
       if (hasSyncedWallet) {
         this.checkWalletPassword();
@@ -256,7 +262,7 @@ class FirstRunScreen extends React.PureComponent {
       } else {
         this.showNextPage();
       }
-    }
+    } */
   };
 
   handleEmailCollectPageContinue() {
@@ -500,7 +506,12 @@ class FirstRunScreen extends React.PureComponent {
                   {Constants.FIRST_RUN_PAGE_SKIP_ACCOUNT !== this.state.currentPage &&
                     Constants.FIRST_RUN_PAGE_EMAIL_VERIFY !== this.state.currentPage && (
                     <Text style={firstRunStyle.buttonText}>
-                      {Constants.FIRST_RUN_PAGE_WALLET === this.state.currentPage ? __('Use LBRY') : __('Continue')} »
+                      {[Constants.FIRST_RUN_PAGE_WALLET, Constants.FIRST_RUN_PAGE_WELCOME].includes(
+                        this.state.currentPage
+                      )
+                        ? __('Use LBRY')
+                        : __('Continue')}{' '}
+                        »
                     </Text>
                   )}
                 </TouchableOpacity>

src/styles/fileList.js

@@ -94,6 +94,11 @@ const fileListStyle = StyleSheet.create({
     top: 8,
     left: 8,
   },
+  featuredDownloadedIcon: {
+    position: 'absolute',
+    left: 16,
+    top: 16,
+  },
   fileItem: {
     marginLeft: 24,
     marginRight: 24,