fix merge conflicts and i18n

lbry.tv account
display sign in instructions for emails that exist
2019-12-05 19:22:24 +01:00 · 2019-11-28 05:13:49 +01:00 · 2019-11-18 07:22:22 +01:00
171 changed files with 12285 additions and 15803 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -10,7 +10,6 @@
    "__": true
  },
  "rules": {
    "no-console": 2,
    "no-multi-spaces": 0,
    "new-cap": 0,
    "prefer-promise-reject-errors": 0,
--- a/.gitignore
+++ b/.gitignore
@ -1,66 +1,4 @@
 # OSX
 #
 .DS_Store
 # Xcode
 #
 build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
 !default.mode1v3
 *.mode2v3
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
 *.xccheckout
 *.moved-aside
 DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
 # Android/IntelliJ
 #
 build/
 .idea
 .gradle
 local.properties
 *.iml
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 # BUCK
 buck-out/
 \.buckd/
 *.keystore
 !debug.keystore
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
 # Bundle artifact
 *.jsbundle
 # CocoaPods
 /ios/Pods/
 # Other Files
 android/app/google-services.json
 *.log
 .vagrant
-android/app/build/*
+
 android/bin
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,8 +0,0 @@
 stages:
  - build
 build:
  variables:
    REACT_NATIVE_BRANCH: $CI_COMMIT_REF_NAME
  stage: build
  trigger: lbry/lbry-android
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
 [submodule "android"]
 	path = android
 	url = https://github.com/lbryio/lbry-android
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2017-2020 LBRY Inc
+Copyright (c) 2017-2019 LBRY Inc
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish,distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
-# LBRY React Native
+# LBRY Android
 [![pipeline status](https://ci.lbry.tech/lbry/lbry-android/badges/master/pipeline.svg)](https://ci.lbry.tech/lbry/lbry-android/commits/master)
-A mobile browser and wallet for the [LBRY](https://lbry.com) network. This app bundles [LBRY SDK](https://github.com/lbryio/lbry) as a background service with a UI layer built with React Native.
+An Android browser and wallet for the [LBRY](https://lbry.com) network. This app bundles [lbrynet-daemon](https://github.com/lbryio/lbry) as a background service with a UI layer built with React Native. The APK is built using buildozer and the Gradle build tool.
 <img src="https://spee.ch/8/lbry-android.png" alt="LBRY Android Screenshot" width="384px" />
@ -12,41 +12,10 @@ The minimum supported Android version is 5.0 Lollipop. There are two ways to ins
 1. Direct APK install available at [http://build.lbry.io/android/latest.apk](http://build.lbry.io/android/latest.apk). You will need to enable installation from third-party sources on your device in order to install from this source.
 ## Usage
-The app can be launched by opening **LBRY** from the device's app drawer or via the shortcut on the home screen if that was created upon installation.
+The app can be launched by opening **LBRY Browser** from the device's app drawer or via the shortcut on the home screen if that was created upon installation.
 ## Running from Source
-### Software Requirements
+The app is built from source via [Buildozer](https://github.com/kivy/buildozer). After cloning the repository, copy `buildozer.spec.sample` to `buildozer.spec` and modify this file as necessary for your environment. Please see [BUILD.md](BUILD.md) for detailed build instructions.
 * Android Studio
 * WebStorm (or other IDE for editing React Native / JavaScript code)
 * npm
 * yarn
 ### Android Steps
 * Clone the repository using `git clone https://github.com/lbryio/lbry-react-native`
 * Initialise the submodules.
 ```
 cd lbry-react-native
 git submodule update --init --recursive
 ```
 * Install `react-native-cli` globally using `npm install -g react-native-cli`.
 * Install the required package modules by running `yarn` in the cloned repository folder.
 * Download a `google-services.json` from the Firebase console (https://console.firebase.google.com/) and place it in the `android/app` folder. Alternatively, use the included sample JSON file.
 ```
 cp android/app/google-services.sample.json android/app/google-services.json
 ```
 * Open Android Studio and click File > Open...
 * Navigate to the cloned repository on your local filesystem and select the `android` subfolder.
 * Connect your Android device in USB debugging mode, or create an ARM emulator (slower) to run the app.
 * Click Run > Run... and select the corresponding app configuration. Note that it may take a while for the project files to sync before you can run the app
 * In order to edit the React Native / JavaScript files, open the cloned repository folder using WebStorm (or your favourite IDE).
 ### React Native Fast Refresh
 In order to enable fast refresh when updating React Native code
 * Connect your Android device in USB debugging mode, or create an ARM emulator
 * Run `adb reverse tcp:8081 tcp:8081` (`adb` can be found in the `platform-tools` folder of your Android SDK installation)
 * Run `yarn start`
 * Press `r` to reload the app.
 * Anytime you make an update to the React Native code, the app should automatically refresh.
 ## Contributing
 Contributions to this project are welcome, encouraged, and compensated. For more details, see https://lbry.io/faq/contributing
--- a/tests/App-test.js
+++ b/tests/App-test.js
@ -1,14 +0,0 @@
 /**
 * @format
 */
 import 'react-native';
 import React from 'react';
 import App from '../App';
 // Note: test renderer must be required after react-native.
 import renderer from 'react-test-renderer';
 it('renders correctly', () => {
  renderer.create(<App />);
 });
--- a/1
+++ b/1
@ -1 +0,0 @@
 Subproject commit ff30e7f6a4358fd997a9e6d9f75bfe6959eafcb6
--- a/bundle-android.sh
+++ b/bundle-android.sh
@ -1,2 +0,0 @@
 #!/bin/bash
 react-native bundle --platform android --dev false --entry-file src/index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/
--- a/index.js
+++ b/index.js
@ -1,7 +1,3 @@
 if (__DEV__) {
  import('./reactotron').then(() => console.log('Reactotron Configured'));
 }
 import LBRYApp from './src/index';
 export default LBRYApp;
--- a/ios/LbryApp-tvOS/Info.plist
+++ b/ios/LbryApp-tvOS/Info.plist
@ -1,53 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>
 		<dict>
 			<key>localhost</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 			</dict>
 		</dict>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>
 </plist>
--- a/ios/LbryApp-tvOSTests/Info.plist
+++ b/ios/LbryApp-tvOSTests/Info.plist
@ -1,24 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
 </plist>
--- a/ios/LbryApp.xcodeproj/project.pbxproj
+++ b/ios/LbryApp.xcodeproj/project.pbxproj
@ -1,782 +0,0 @@
 // !$*UTF8*$!
 {
 	archiveVersion = 1;
 	classes = {
 	};
 	objectVersion = 46;
 	objects = {
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* LbryAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* LbryAppTests.m */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		2DCD954D1E0B4F2C00145EB5 /* LbryAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* LbryAppTests.m */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
 		00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
 			remoteInfo = LbryApp;
 		};
 		2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 2D02E47A1E0B4A5D006451C7;
 			remoteInfo = "LbryApp-tvOS";
 		};
 /* End PBXContainerItemProxy section */
 /* Begin PBXFileReference section */
 		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
 		00E356EE1AD99517003FC87E /* LbryAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LbryAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* LbryAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LbryAppTests.m; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* LbryApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LbryApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = LbryApp/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = LbryApp/AppDelegate.m; sourceTree = "<group>"; };
 		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = LbryApp/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = LbryApp/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = LbryApp/main.m; sourceTree = "<group>"; };
 		2D02E47B1E0B4A5D006451C7 /* LbryApp-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "LbryApp-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E4901E0B4A5D006451C7 /* LbryApp-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "LbryApp-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
 		00E356EB1AD99517003FC87E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		2D02E4781E0B4A5D006451C7 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		2D02E48D1E0B4A5D006451C7 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
 		00E356EF1AD99517003FC87E /* LbryAppTests */ = {
 			isa = PBXGroup;
 			children = (
 				00E356F21AD99517003FC87E /* LbryAppTests.m */,
 				00E356F01AD99517003FC87E /* Supporting Files */,
 			);
 			path = LbryAppTests;
 			sourceTree = "<group>";
 		};
 		00E356F01AD99517003FC87E /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
 				00E356F11AD99517003FC87E /* Info.plist */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		13B07FAE1A68108700A75B9A /* LbryApp */ = {
 			isa = PBXGroup;
 			children = (
 				008F07F21AC5B25A0029DE68 /* main.jsbundle */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
 				13B07FB71A68108700A75B9A /* main.m */,
 			);
 			name = LbryApp;
 			sourceTree = "<group>";
 		};
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
 			);
 			name = Libraries;
 			sourceTree = "<group>";
 		};
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
 				13B07FAE1A68108700A75B9A /* LbryApp */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
 				00E356EF1AD99517003FC87E /* LbryAppTests */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
 			tabWidth = 2;
 			usesTabs = 0;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				13B07F961A680F5B00A75B9A /* LbryApp.app */,
 				00E356EE1AD99517003FC87E /* LbryAppTests.xctest */,
 				2D02E47B1E0B4A5D006451C7 /* LbryApp-tvOS.app */,
 				2D02E4901E0B4A5D006451C7 /* LbryApp-tvOSTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
 		00E356ED1AD99517003FC87E /* LbryAppTests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "LbryAppTests" */;
 			buildPhases = (
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				00E356F51AD99517003FC87E /* PBXTargetDependency */,
 			);
 			name = LbryAppTests;
 			productName = LbryAppTests;
 			productReference = 00E356EE1AD99517003FC87E /* LbryAppTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		13B07F861A680F5B00A75B9A /* LbryApp */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "LbryApp" */;
 			buildPhases = (
 				FD10A7F022414F080027D42C /* Start Packager */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = LbryApp;
 			productName = "LbryApp";
 			productReference = 13B07F961A680F5B00A75B9A /* LbryApp.app */;
 			productType = "com.apple.product-type.application";
 		};
 		2D02E47A1E0B4A5D006451C7 /* LbryApp-tvOS */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "LbryApp-tvOS" */;
 			buildPhases = (
 				FD10A7F122414F3F0027D42C /* Start Packager */,
 				2D02E4771E0B4A5D006451C7 /* Sources */,
 				2D02E4781E0B4A5D006451C7 /* Frameworks */,
 				2D02E4791E0B4A5D006451C7 /* Resources */,
 				2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = "LbryApp-tvOS";
 			productName = "LbryApp-tvOS";
 			productReference = 2D02E47B1E0B4A5D006451C7 /* LbryApp-tvOS.app */;
 			productType = "com.apple.product-type.application";
 		};
 		2D02E48F1E0B4A5D006451C7 /* LbryApp-tvOSTests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "LbryApp-tvOSTests" */;
 			buildPhases = (
 				2D02E48C1E0B4A5D006451C7 /* Sources */,
 				2D02E48D1E0B4A5D006451C7 /* Frameworks */,
 				2D02E48E1E0B4A5D006451C7 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */,
 			);
 			name = "LbryApp-tvOSTests";
 			productName = "LbryApp-tvOSTests";
 			productReference = 2D02E4901E0B4A5D006451C7 /* LbryApp-tvOSTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
 /* Begin PBXProject section */
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					2D02E47A1E0B4A5D006451C7 = {
 						CreatedOnToolsVersion = 8.2.1;
 						ProvisioningStyle = Automatic;
 					};
 					2D02E48F1E0B4A5D006451C7 = {
 						CreatedOnToolsVersion = 8.2.1;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 2D02E47A1E0B4A5D006451C7;
 					};
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "LbryApp" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 			);
 			mainGroup = 83CBB9F61A601CBA00E9B192;
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				13B07F861A680F5B00A75B9A /* LbryApp */,
 				00E356ED1AD99517003FC87E /* LbryAppTests */,
 				2D02E47A1E0B4A5D006451C7 /* LbryApp-tvOS */,
 				2D02E48F1E0B4A5D006451C7 /* LbryApp-tvOSTests */,
 			);
 		};
 /* End PBXProject section */
 /* Begin PBXResourcesBuildPhase section */
 		00E356EC1AD99517003FC87E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		13B07F8E1A680F5B00A75B9A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		2D02E4791E0B4A5D006451C7 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		2D02E48E1E0B4A5D006451C7 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
 		00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Bundle React Native code and images";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Bundle React Native Code And Images";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		FD10A7F022414F080027D42C /* Start Packager */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
 			);
 			name = "Start Packager";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		FD10A7F122414F3F0027D42C /* Start Packager */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
 			);
 			name = "Start Packager";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
 		00E356EA1AD99517003FC87E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				00E356F31AD99517003FC87E /* LbryAppTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		13B07F871A680F5B00A75B9A /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		2D02E4771E0B4A5D006451C7 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */,
 				2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		2D02E48C1E0B4A5D006451C7 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				2DCD954D1E0B4F2C00145EB5 /* LbryAppTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 /* Begin PBXTargetDependency section */
 		00E356F51AD99517003FC87E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 13B07F861A680F5B00A75B9A /* LbryApp */;
 			targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */;
 		};
 		2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 2D02E47A1E0B4A5D006451C7 /* LbryApp-tvOS */;
 			targetProxy = 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 /* Begin PBXVariantGroup section */
 		13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				13B07FB21A68108700A75B9A /* Base */,
 			);
 			name = LaunchScreen.xib;
 			path = LbryApp;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = LbryAppTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
 					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LbryApp.app/LbryApp";
 			};
 			name = Debug;
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
 				INFOPLIST_FILE = LbryAppTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
 					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LbryApp.app/LbryApp";
 			};
 			name = Release;
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
 				INFOPLIST_FILE = LbryApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = LbryApp;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
 				INFOPLIST_FILE = LbryApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = LbryApp;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
 		};
 		2D02E4971E0B4A5E006451C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "LbryApp-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.LbryApp-tvOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
 		};
 		2D02E4981E0B4A5E006451C7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "LbryApp-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.LbryApp-tvOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
 		};
 		2D02E4991E0B4A5E006451C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "LbryApp-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.LbryApp-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LbryApp-tvOS.app/LbryApp-tvOS";
 				TVOS_DEPLOYMENT_TARGET = 10.1;
 			};
 			name = Debug;
 		};
 		2D02E49A1E0B4A5E006451C7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "LbryApp-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.LbryApp-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LbryApp-tvOS.app/LbryApp-tvOS";
 				TVOS_DEPLOYMENT_TARGET = 10.1;
 			};
 			name = Release;
 		};
 		83CBBA201A601CBA00E9B192 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
 		};
 		83CBBA211A601CBA00E9B192 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 /* Begin XCConfigurationList section */
 		00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "LbryAppTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				00E356F61AD99517003FC87E /* Debug */,
 				00E356F71AD99517003FC87E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "LbryApp" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				13B07F941A680F5B00A75B9A /* Debug */,
 				13B07F951A680F5B00A75B9A /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "LbryApp-tvOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				2D02E4971E0B4A5E006451C7 /* Debug */,
 				2D02E4981E0B4A5E006451C7 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "LbryApp-tvOSTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				2D02E4991E0B4A5E006451C7 /* Debug */,
 				2D02E49A1E0B4A5E006451C7 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "LbryApp" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				83CBBA201A601CBA00E9B192 /* Debug */,
 				83CBBA211A601CBA00E9B192 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
 }
--- a/ios/LbryApp.xcodeproj/xcshareddata/xcschemes/LbryApp-tvOS.xcscheme
+++ b/ios/LbryApp.xcodeproj/xcshareddata/xcschemes/LbryApp-tvOS.xcscheme
@ -1,129 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
   LastUpgradeVersion = "0940"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "NO"
      buildImplicitDependencies = "YES">
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
            buildForRunning = "YES"
            buildForProfiling = "YES"
            buildForArchiving = "YES"
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2D2A28121D9B038B00D4039D"
               BuildableName = "libReact.a"
               BlueprintName = "React-tvOS"
               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
         <BuildActionEntry
            buildForTesting = "YES"
            buildForRunning = "YES"
            buildForProfiling = "YES"
            buildForArchiving = "YES"
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
               BuildableName = "LbryApp-tvOS.app"
               BlueprintName = "LbryApp-tvOS"
               ReferencedContainer = "container:LbryApp.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
         <BuildActionEntry
            buildForTesting = "YES"
            buildForRunning = "YES"
            buildForProfiling = "NO"
            buildForArchiving = "NO"
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
               BuildableName = "LbryApp-tvOSTests.xctest"
               BlueprintName = "LbryApp-tvOSTests"
               ReferencedContainer = "container:LbryApp.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
   </BuildAction>
   <TestAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
               BuildableName = "LbryApp-tvOSTests.xctest"
               BlueprintName = "LbryApp-tvOSTests"
               ReferencedContainer = "container:LbryApp.xcodeproj">
            </BuildableReference>
         </TestableReference>
      </Testables>
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
            BuildableName = "LbryApp-tvOS.app"
            BlueprintName = "LbryApp-tvOS"
            ReferencedContainer = "container:LbryApp.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
      <AdditionalOptions>
      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
            BuildableName = "LbryApp-tvOS.app"
            BlueprintName = "LbryApp-tvOS"
            ReferencedContainer = "container:LbryApp.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <AdditionalOptions>
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
      debugDocumentVersioning = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
            BuildableName = "LbryApp-tvOS.app"
            BlueprintName = "LbryApp-tvOS"
            ReferencedContainer = "container:LbryApp.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </ProfileAction>
   <AnalyzeAction
      buildConfiguration = "Debug">
   </AnalyzeAction>
   <ArchiveAction
      buildConfiguration = "Release"
      revealArchiveInOrganizer = "YES">
   </ArchiveAction>
 </Scheme>
--- a/ios/LbryApp.xcodeproj/xcshareddata/xcschemes/LbryApp.xcscheme
+++ b/ios/LbryApp.xcodeproj/xcshareddata/xcschemes/LbryApp.xcscheme
@ -1,129 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
   LastUpgradeVersion = "0940"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "NO"
      buildImplicitDependencies = "YES">
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
            buildForRunning = "YES"
            buildForProfiling = "YES"
            buildForArchiving = "YES"
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
               BuildableName = "libReact.a"
               BlueprintName = "React"
               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
         <BuildActionEntry
            buildForTesting = "YES"
            buildForRunning = "YES"
            buildForProfiling = "YES"
            buildForArchiving = "YES"
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
               BuildableName = "LbryApp.app"
               BlueprintName = "LbryApp"
               ReferencedContainer = "container:LbryApp.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
         <BuildActionEntry
            buildForTesting = "YES"
            buildForRunning = "YES"
            buildForProfiling = "NO"
            buildForArchiving = "NO"
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
               BuildableName = "LbryAppTests.xctest"
               BlueprintName = "LbryAppTests"
               ReferencedContainer = "container:LbryApp.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
   </BuildAction>
   <TestAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
               BuildableName = "LbryAppTests.xctest"
               BlueprintName = "LbryAppTests"
               ReferencedContainer = "container:LbryApp.xcodeproj">
            </BuildableReference>
         </TestableReference>
      </Testables>
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
            BuildableName = "LbryApp.app"
            BlueprintName = "LbryApp"
            ReferencedContainer = "container:LbryApp.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
      <AdditionalOptions>
      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
            BuildableName = "LbryApp.app"
            BlueprintName = "LbryApp"
            ReferencedContainer = "container:LbryApp.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <AdditionalOptions>
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
      debugDocumentVersioning = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
            BuildableName = "LbryApp.app"
            BlueprintName = "LbryApp"
            ReferencedContainer = "container:LbryApp.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </ProfileAction>
   <AnalyzeAction
      buildConfiguration = "Debug">
   </AnalyzeAction>
   <ArchiveAction
      buildConfiguration = "Release"
      revealArchiveInOrganizer = "YES">
   </ArchiveAction>
 </Scheme>
--- a/ios/LbryApp/AppDelegate.h
+++ b/ios/LbryApp/AppDelegate.h
@ -1,15 +0,0 @@
 /**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
 #import <React/RCTBridgeDelegate.h>
 #import <UIKit/UIKit.h>
@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate>
@property (nonatomic, strong) UIWindow *window;
@end
--- a/ios/LbryApp/AppDelegate.m
+++ b/ios/LbryApp/AppDelegate.m
@ -1,42 +0,0 @@
 /**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
 #import "AppDelegate.h"
 #import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
@implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
                                                   moduleName:@"LbryApp"
                                            initialProperties:nil];
  rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
  UIViewController *rootViewController = [UIViewController new];
  rootViewController.view = rootView;
  self.window.rootViewController = rootViewController;
  [self.window makeKeyAndVisible];
  return YES;
 }
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
 #else
  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif
 }
@end
--- a/ios/LbryApp/Base.lproj/LaunchScreen.xib
+++ b/ios/LbryApp/Base.lproj/LaunchScreen.xib
@ -1,42 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
    </dependencies>
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
        <view contentMode="scaleToFill" id="iN0-l3-epB">
            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                    <rect key="frame" x="20" y="439" width="441" height="21"/>
                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                    <nil key="highlightedColor"/>
                </label>
                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LbryApp" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                    <rect key="frame" x="20" y="140" width="441" height="43"/>
                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                    <nil key="highlightedColor"/>
                </label>
            </subviews>
            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
            <constraints>
                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
            </constraints>
            <nil key="simulatedStatusBarMetrics"/>
            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
            <point key="canvasLocation" x="548" y="455"/>
        </view>
    </objects>
 </document>
--- a/ios/LbryApp/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/LbryApp/Images.xcassets/AppIcon.appiconset/Contents.json
@ -1,38 +0,0 @@
 {
  "images" : [
    {
      "idiom" : "iphone",
      "size" : "29x29",
      "scale" : "2x"
    },
    {
      "idiom" : "iphone",
      "size" : "29x29",
      "scale" : "3x"
    },
    {
      "idiom" : "iphone",
      "size" : "40x40",
      "scale" : "2x"
    },
    {
      "idiom" : "iphone",
      "size" : "40x40",
      "scale" : "3x"
    },
    {
      "idiom" : "iphone",
      "size" : "60x60",
      "scale" : "2x"
    },
    {
      "idiom" : "iphone",
      "size" : "60x60",
      "scale" : "3x"
    }
  ],
  "info" : {
    "version" : 1,
    "author" : "xcode"
  }
 }
--- a/ios/LbryApp/Images.xcassets/Contents.json
+++ b/ios/LbryApp/Images.xcassets/Contents.json
@ -1,6 +0,0 @@
 {
  "info" : {
    "version" : 1,
    "author" : "xcode"
  }
 }
--- a/ios/LbryApp/Info.plist
+++ b/ios/LbryApp/Info.plist
@ -1,57 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
 	<string>LbryApp</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
 			<key>localhost</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 			</dict>
 		</dict>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>
 </plist>
--- a/ios/LbryApp/main.m
+++ b/ios/LbryApp/main.m
@ -1,16 +0,0 @@
 /**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 int main(int argc, char * argv[]) {
  @autoreleasepool {
    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
  }
 }
--- a/ios/LbryAppTests/Info.plist
+++ b/ios/LbryAppTests/Info.plist
@ -1,24 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
 </plist>
--- a/ios/LbryAppTests/LbryAppTests.m
+++ b/ios/LbryAppTests/LbryAppTests.m
@ -1,72 +0,0 @@
 /**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #define TIMEOUT_SECONDS 600
 #define TEXT_TO_LOOK_FOR @"Welcome to React"
@interface LbryAppTests : XCTestCase
@end
@implementation LbryAppTests
 - (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
 {
  if (test(view)) {
    return YES;
  }
  for (UIView *subview in [view subviews]) {
    if ([self findSubviewInView:subview matching:test]) {
      return YES;
    }
  }
  return NO;
 }
 - (void)testRendersWelcomeScreen
 {
  UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
  NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
  BOOL foundElement = NO;
  __block NSString *redboxError = nil;
 #ifdef DEBUG
  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
    if (level >= RCTLogLevelError) {
      redboxError = message;
    }
  });
 #endif
  while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {
    [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
    [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
    foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) {
      if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
        return YES;
      }
      return NO;
    }];
  }
 #ifdef DEBUG
  RCTSetLogFunction(RCTDefaultLogFunction);
 #endif
  XCTAssertNil(redboxError, @"RedBox error: %@", redboxError);
  XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
 }
@end
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,53 +0,0 @@
 platform :ios, '9.0'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 target 'LbryApp' do
  # Pods for LbryAndroid
  pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
  pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
  pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
  pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
  pod 'React', :path => '../node_modules/react-native/'
  pod 'React-Core', :path => '../node_modules/react-native/'
  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
  pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
  target 'LbryAndroidTests' do
    inherit! :search_paths
    # Pods for testing
  end
  use_native_modules!
 end
 target 'LbryAndroid-tvOS' do
  # Pods for LbryAndroid-tvOS
  target 'LbryAndroid-tvOSTests' do
    inherit! :search_paths
    # Pods for testing
  end
 end
--- a/lbry-app-strings.json
+++ b/lbry-app-strings.json
@ -1,326 +0,0 @@
 {
  "Please wait while we get some things ready...": "Please wait while we get some things ready...",
  "Welcome to LBRY.": "Welcome to LBRY.",
  "LBRY is a community-controlled content platform where you can find and publish videos, music, books, and more.": "LBRY is a community-controlled content platform where you can find and publish videos, music, books, and more.",
  "Continue": "Continue",
  "Setup account": "Setup account",
  "A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.": "A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.",
  "This information is disclosed only to LBRY, Inc. and not to the LBRY network.": "This information is disclosed only to LBRY, Inc. and not to the LBRY network.",
  "No, thanks": "No, thanks",
  "Use LBRY": "Use LBRY",
  "Are you sure?": "Are you sure?",
  "Without an account, you will not receive rewards, sync and backup services, or security updates.": "Without an account, you will not receive rewards, sync and backup services, or security updates.",
  "I understand that by uninstalling LBRY I will lose any balances or published content with no recovery option if it is not backed up manually (see wallet page)": "I understand that by uninstalling LBRY I will lose any balances or published content with no recovery option if it is not backed up manually (see wallet page)",
  "Starting up": "Starting up",
  "Connecting": "Connecting",
  "Testing network": "Testing network",
  "Waiting for name resolution": "Waiting for name resolution",
  "Search movies, music, and more": "Search movies, music, and more",
  "Your Tags": "Your Tags",
  "Trending": "Trending",
  "Customize": "Customize",
  "Sign In": "Sign In",
  "SIGN IN": "SIGN IN",
  "Find content": "Find content",
  "Subscriptions": "Subscriptions",
  "All Content": "All Content",
  "Your content": "Your content",
  "Channels": "Channels",
  "Library": "Library",
  "Publishes": "Publishes",
  "New Publish": "New Publish",
  "Wallet": "Wallet",
  "Rewards": "Rewards",
  "Settings": "Settings",
  "About": "About",
  "All tags you follow": "All tags you follow",
  "More tags you follow": "More tags you follow",
  "FREE": "FREE",
  "more": "more",
  "You have not created a channel.\nStart now by creating a new channel!": "You have not created a channel.\nStart now by creating a new channel!",
  "Create a channel": "Create a channel",
  "CONTENT": "CONTENT",
  "ABOUT": "ABOUT",
  "Follow": "Follow",
  "No content to display at this time. Please check back later.": "No content to display at this time. Please check back later.",
  "New": "New",
  "Share": "Share",
  "Tip": "Tip",
  "Report": "Report",
  "Fetching cost info...": "Fetching cost info...",
  "Play": "Play",
  "Connecting...": "Connecting...",
  "Related Content": "Related Content",
  "Loading...": "Loading...",
  "Content Freedom": "Content Freedom",
  "LBRY is a free, open, and community-run digital marketplace. It is a decentralized peer-to-peer content distribution platform for creators to upload and share content, and earn LBRY credits for their effort. Users will be able to find a wide selection of videos, music, ebooks and other digital content they are interested in.": "LBRY is a free, open, and community-run digital marketplace. It is a decentralized peer-to-peer content distribution platform for creators to upload and share content, and earn LBRY credits for their effort. Users will be able to find a wide selection of videos, music, ebooks and other digital content they are interested in.",
  "What is LBRY?": "What is LBRY?",
  "Android App Basics": "Android App Basics",
  "Frequently Asked Questions": "Frequently Asked Questions",
  "Get Social": "Get Social",
  "You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.": "You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.",
  "App info": "App info",
  "App version": "App version",
  "LBRY SDK": "LBRY SDK",
  "Platform": "Platform",
  "Installation ID": "Installation ID",
  "Logs": "Logs",
  "Send log": "Send log",
  "Account Recommended": "Account Recommended",
  "Without an account, you assume all responsibility for securing your wallet and LBRY data.": "Without an account, you assume all responsibility for securing your wallet and LBRY data.",
  "Skip Account": "Skip Account",
  "Sign Up": "Sign Up",
  "Blockchain Sync": "Blockchain Sync",
  "Catching up with the blockchain (%progress%%)": "Catching up with the blockchain (%progress%%)",
  "Network Loading": "Network Loading",
  "Initializing LBRY service": "Initializing LBRY service",
  "%amount% available credits": "%amount% available credits",
  "LBRY credits allow you to purchase content, publish content, and influence the network.": "LBRY credits allow you to purchase content, publish content, and influence the network.",
  "You get credits for free for providing an email address and taking other basic actions.": "You get credits for free for providing an email address and taking other basic actions.",
  "Learn more": "Learn more",
  "Not interested": "Not interested",
  "Get started": "Get started",
  "Get %amount% free credits after creating an account.": "Get %amount% free credits after creating an account.",
  "Balance": "Balance",
  "You currently have": "You currently have",
  "Receive Credits": "Receive Credits",
  "Use this wallet address to receive credits sent by another user (or yourself).": "Use this wallet address to receive credits sent by another user (or yourself).",
  "Get new address": "Get new address",
  "You can generate a new address at any time, and any previous addresses will continue to work. Using multiple addresses can be helpful for keeping track of incoming payments from multiple sources.": "You can generate a new address at any time, and any previous addresses will continue to work. Using multiple addresses can be helpful for keeping track of incoming payments from multiple sources.",
  "Send Credits": "Send Credits",
  "Recipient address": "Recipient address",
  "Amount": "Amount",
  "Send": "Send",
  "Recent Transactions": "Recent Transactions",
  "View All": "View All",
  "Looks like you don't have any recent transactions.": "Looks like you don't have any recent transactions.",
  "Wallet Sync": "Wallet Sync",
  "Sync status": "Sync status",
  "Off": "Off",
  "Manual backup": "Manual backup",
  "Sync FAQ": "Sync FAQ",
  "Fetching transactions...": "Fetching transactions...",
  "Anonymous": "Anonymous",
  "Delete": "Delete",
  "Title": "Title",
  "Channel": "Channel",
  "Deposit": "Deposit",
  "This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.": "This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.",
  "Show optional fields": "Show optional fields",
  "Cancel": "Cancel",
  "Create": "Create",
  "Channel creation requires credits.": "Channel creation requires credits.",
  "Tap here to get some for free.": "Tap here to get some for free.",
  "%balance% available": "%balance% available",
  "Bal: %balance%": "Bal: %balance%",
  "Send a tip": "Send a tip",
  "Record": "Record",
  "Take a photo": "Take a photo",
  "Upload a file": "Upload a file",
  "Please wait while we load your videos...": "Please wait while we load your videos...",
  "Description": "Description",
  "Tags": "Tags",
  "Price": "Price",
  "Your content will be free. Press the toggle to set a price.": "Your content will be free. Press the toggle to set a price.",
  "Content address": "Content address",
  "The address where people can find your content (ex. lbry://myvideo). ": "The address where people can find your content (ex. lbry://myvideo). ",
  "This LBC remains yours and the deposit can be undone at any time.": "This LBC remains yours and the deposit can be undone at any time.",
  "Show extra fields": "Show extra fields",
  "Publish": "Publish",
  "Publishing requires credits.": "Publishing requires credits.",
  "Search for more tags": "Search for more tags",
  "Mature tags": "Mature tags",
  "Publish anonymously": "Publish anonymously",
  "Create a channel...": "Create a channel...",
  "Uploading thumbnail...": "Uploading thumbnail...",
  "Channel name": "Channel name",
  "Deposit cannot be higher than your balance": "Deposit cannot be higher than your balance",
  "There are no results to display for \"%query%\". Please try a different search term.": "There are no results to display for \"%query%\". Please try a different search term.",
  "Nothing here. Publish something!": "Nothing here. Publish something!",
  "Explore content for this tag": "Explore content for this tag",
  "URL does not include name.": "URL does not include name.",
  "Loading decentralized data...": "Loading decentralized data...",
  "View": "View",
  "Additional Options": "Additional Options",
  "Language": "Language",
  "English": "English",
  "Chinese": "Chinese",
  "French": "French",
  "German": "German",
  "Japanese": "Japanese",
  "Russian": "Russian",
  "Spanish": "Spanish",
  "Indonesian": "Indonesian",
  "Italian": "Italian",
  "Dutch": "Dutch",
  "Turkish": "Turkish",
  "Polish": "Polish",
  "Malay": "Malay",
  "Portuguese": "Portuguese",
  "Vietnamese": "Vietnamese",
  "Thai": "Thai",
  "Arabic": "Arabic",
  "Czech": "Czech",
  "Croatian": "Croatian",
  "Cambodian": "Cambodian",
  "Korean": "Korean",
  "Norwegian": "Norwegian",
  "Romanian": "Romanian",
  "Hindi": "Hindi",
  "Greek": "Greek",
  "License": "License",
  "None": "None",
  "Public Domain": "Public Domain",
  "Copyrighted...": "Copyrighted...",
  "Other...": "Other...",
  "Hide extra fields": "Hide extra fields",
  "Download": "Download",
  "%progress%% complete": "%progress%% complete",
  "Email": "Email",
  "Please provide an email address.": "Please provide an email address.",
  "An email has been sent to": "An email has been sent to",
  "Please click the link in the message to complete signing in.": "Please click the link in the message to complete signing in.",
  "Resend": "Resend",
  "Edit": "Edit",
  "Your email address was successfully verified.": "Your email address was successfully verified.",
  "password": "password",
  "Please enter a password to secure your account and wallet.": "Please enter a password to secure your account and wallet.",
  "Retrieving your account information...": "Retrieving your account information...",
  "Please enter the password you used to secure your wallet.": "Please enter the password you used to secure your wallet.",
  "Note: for wallet security purposes, LBRY is unable to reset your password.": "Note: for wallet security purposes, LBRY is unable to reset your password.",
  "On": "On",
  "Connected email": "Connected email",
  "Address copied": "Address copied",
  "Unlocking account": "Unlocking account",
  "Decrypting wallet": "Decrypting wallet",
  "used": "used",
  "Stats": "Stats",
  "Channels you follow": "Channels you follow",
  "Suggested": "Suggested",
  "ALL": "ALL",
  "Customize your tags": "Customize your tags",
  "Done": "Done",
  "Unfollow": "Unfollow",
  "This content is Not Safe For Work. To view adult content, please change your Settings.": "This content is Not Safe For Work. To view adult content, please change your Settings.",
  "No views": "No views",
  "%view% views": "%view% views",
  "Content": "Content",
  "Enable background media playback": "Enable background media playback",
  "Enable this option to play audio or video in the background when the app is suspended.": "Enable this option to play audio or video in the background when the app is suspended.",
  "Choose language": "Choose language",
  "Use device language": "Use device language",
  "Gujarati": "Gujarati",
  "Show mature content": "Show mature content",
  "Notifications": "Notifications",
  "Choose the notifications you would like to receive.": "Choose the notifications you would like to receive.",
  "Content Interests": "Content Interests",
  "Search": "Search",
  "Show URL suggestions": "Show URL suggestions",
  "Other": "Other",
  "Keep the SDK background service running after closing the app": "Keep the SDK background service running after closing the app",
  "Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.": "Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.",
  "There's nothing here yet.\nPlease check back later.": "There's nothing here yet.\nPlease check back later.",
  "%follower% followers": "%follower% followers",
  "Are you sure you want to tip %amount% credits": "Are you sure you want to tip %amount% credits",
  "Send tip": "Send tip",
  "No": "No",
  "Yes": "Yes",
  "History": "History",
  "/wallet": "/wallet",
  "Are you sure you want to tip %amount% credit": "Are you sure you want to tip %amount% credit",
  "Enjoying LBRY?": "Enjoying LBRY?",
  "Are you enjoying your experience with the LBRY app? You can leave a review for us on the Play Store.": "Are you enjoying your experience with the LBRY app? You can leave a review for us on the Play Store.",
  "Never ask again": "Never ask again",
  "Maybe later": "Maybe later",
  "Rate app": "Rate app",
  "This will appear as a tip for %content%, which will boost its ability to be discovered while active.": "This will appear as a tip for %content%, which will boost its ability to be discovered while active.",
  "Learn more.": "Learn more.",
  "Send a tip to %channel%": "Send a tip to %channel%",
  "The transaction URL could not be opened": "The transaction URL could not be opened",
  "Show All": "Show All",
  "Fetching rewards...": "Fetching rewards...",
  "Custom Code": "Custom Code",
  "Are you a supermodel or rockstar that received a custom reward code? Claim it here.": "Are you a supermodel or rockstar that received a custom reward code? Claim it here.",
  "Redeem": "Redeem",
  "Please confirm that you want to use LBRY without creating an account.": "Please confirm that you want to use LBRY without creating an account.",
  "You sent %amount% LBC as a tip, Mahalo!": "You sent %amount% LBC as a tip, Mahalo!",
  "%follower% follower": "%follower% follower",
  "Authenticating": "Authenticating",
  "Waiting for authentication": "Waiting for authentication",
  "Delete file": "Delete file",
  "Are you sure you want to remove this file from your device?": "Are you sure you want to remove this file from your device?",
  "Following": "Following",
  "Update mailing preferences": "Update mailing preferences",
  "Please confirm you want to tip %amount% credits": "Please confirm you want to tip %amount% credits",
  "Send Tip": "Send Tip",
  "You do not have any\ndownloaded content on this device.": "You do not have any\ndownloaded content on this device.",
  "%view% view": "%view% view",
  "No channel name after @.": "No channel name after @.",
  "Loading transactions...": "Loading transactions...",
  "Pending": "Pending",
  "Phone Number": "Phone Number",
  "Please provide a phone number to prevent fraud.": "Please provide a phone number to prevent fraud.",
  "Send verification text": "Send verification text",
  "Open": "Open",
  "for": "for",
  "Everyone": "Everyone",
  "Suggested channels": "Suggested channels",
  "You might also like": "You might also like",
  "Publish something new": "Publish something new",
  "Filter for": "Filter for",
  "Tags you follow": "Tags you follow",
  "Sort content by": "Sort content by",
  "Trending content": "Trending content",
  "New content": "New content",
  "Top content": "Top content",
  "Top": "Top",
  "Past week": "Past week",
  "It looks like you have not\npublished any content to LBRY yet.": "It looks like you have not\npublished any content to LBRY yet.",
  "Stop": "Stop",
  "Unsupported Content": "Unsupported Content",
  "all tags you follow": "all tags you follow",
  "Send LBC": "Send LBC",
  "from": "from",
  "This file cannot be displayed in the LBRY app.": "This file cannot be displayed in the LBRY app.",
  "Please press the Play button.": "Please press the Play button.",
  "Stop download": "Stop download",
  "Are you sure you want to stop downloading this file?": "Are you sure you want to stop downloading this file?",
  "The download will stop momentarily. You do not need to wait to discover something else.": "The download will stop momentarily. You do not need to wait to discover something else.",
  "Connection Failure": "Connection Failure",
  "We could not establish a connection to the SDK. Your data connection may be preventing LBRY from connecting. Contact hello@lbry.com if you think this is a software bug.": "We could not establish a connection to the SDK. Your data connection may be preventing LBRY from connecting. Contact hello@lbry.com if you think this is a software bug.",
  "%num% block behind": "%num% block behind",
  "Delete files": "Delete files",
  "Are you sure you want to delete the selected content?": "Are you sure you want to delete the selected content?",
  "We could not find any videos on your device. Take a photo or record a video to get started.": "We could not find any videos on your device. Take a photo or record a video to get started.",
  "You have already published to the specified content address. Please enter a new address.": "You have already published to the specified content address. Please enter a new address.",
  "Camera": "Camera",
  "Please grant access to make use of your camera": "Please grant access to make use of your camera",
  "OK": "OK",
  "Audio": "Audio",
  "Please grant access to record audio": "Please grant access to record audio",
  "Camera not authorized": "Camera not authorized",
  "There's nothing at this location.": "There's nothing at this location.",
  "Publish something here": "Publish something here",
  "This content cannot be viewed at this time. Please try again in a bit.": "This content cannot be viewed at this time. Please try again in a bit.",
  "Download file": "Download file",
  "Save %title% (%size%) to your device": "Save %title% (%size%) to your device",
  "Save \"%title%\" (%size%) to your device": "Save \"%title%\" (%size%) to your device",
  "Find Channels to follow": "Find Channels to follow",
  "LBRY works better if you follow at least 5 creators you like. Sign in to show creators you follow if you already have an account.": "LBRY works better if you follow at least 5 creators you like. Sign in to show creators you follow if you already have an account.",
  "%remaining% more...": "%remaining% more...",
  "Did you know that you can earn free credits worth up to %amount%?": "Did you know that you can earn free credits worth up to %amount%?",
  "SHOW ME": "SHOW ME",
  "Convert credits to USD on Bittrex": "Convert credits to USD on Bittrex",
  "You also have": "You also have",
  "in tips": "in tips",
  "Earn more tips by uploading cool videos": "Earn more tips by uploading cool videos",
  "You staked": "You staked",
  "in your publishes": "in your publishes",
  "in your supports": "in your supports",
  "Your wallet is not currently synced with lbry.tv. You are responsible for backing up your wallet.": "Your wallet is not currently synced with lbry.tv. You are responsible for backing up your wallet.",
  "A backup of your wallet is synced with lbry.tv": "A backup of your wallet is synced with lbry.tv",
  "What does this mean?": "What does this mean?",
  "LBRY credits allow you to publish or purchase content.": "LBRY credits allow you to publish or purchase content.",
  "You can obtain free credits worth %amount% after you provide an email address.": "You can obtain free credits worth %amount% after you provide an email address.",
  "up to": "up to"
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,90 +1,73 @@
 {
-  "name": "LBRYApp",
+    "name": "LBRYApp",
-  "version": "0.0.1",
+    "version": "0.0.1",
-  "private": true,
+    "private": "true",
-  "scripts": {
+    "scripts": {
-    "android": "react-native run-android",
+        "start": "node node_modules/react-native/local-cli/cli.js start",
-    "ios": "react-native run-ios",
+        "devtools": "react-devtools",
-    "start": "react-native start",
+        "format": "prettier 'src/**/*.{js,json}' --write",
-    "test": "jest",
+        "precommit": "lint-staged"
-    "lint": "eslint .",
+    },
-    "format": "prettier 'src/**/*.{js,json}' --write",
+    "dependencies": {
-    "precommit": "lint-staged"
+        "base-64": "^0.1.0",
-  },
+        "@expo/vector-icons": "^8.1.0",
-  "dependencies": {
+        "gfycat-style-urls": "^1.0.3",
-    "base-64": "^0.1.0",
+        "lbry-redux": "lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
-    "@expo/vector-icons": "^8.1.0",
+        "lbryinc": "lbryio/lbryinc#9ffb883cc11e36d55a729c65b70c405a4a56d35e",
-    "gfycat-style-urls": "^1.0.3",
+        "lodash": ">=4.17.11",
-    "lbry-redux": "lbryio/lbry-redux#69ffd110dbf3633e5847f61f008751edec033017",
+        "merge": ">=1.2.1",
-    "lbryinc": "lbryio/lbryinc#667024ebb7cb207609273174ca422cee47469270",
+        "moment": "^2.22.1",
-    "lodash": ">=4.17.11",
+        "react": "16.8.6",
-    "merge": ">=1.2.1",
+        "react-native": "0.59.10",
-    "moment": "^2.22.1",
+        "@react-native-community/async-storage": "^1.5.1",
-    "react": "16.9.0",
+        "react-native-camera": "^2.11.1",
-    "react-native": "0.61.5",
+        "react-native-country-picker-modal": "^0.6.2",
-    "@react-native-community/async-storage": "^1.5.1",
+        "react-native-exception-handler": "2.9.0",
-    "@react-native-community/masked-view": "^0.1.5",
+        "react-native-fast-image": "^6.1.1",
-    "react-native-camera": "^3.15.0",
+        "react-native-fs": "^2.13.3",
-    "react-native-country-picker-modal": "^1.10.0",
+        "react-native-gesture-handler": "1.3.0",
-    "react-native-exception-handler": "2.10.8",
+        "react-native-image-zoom-viewer": "^2.2.5",
-    "react-native-fast-image": "^7.0.2",
+        "react-native-password-strength-meter": "^0.0.2",
-    "react-native-fs": "^2.16.6",
+        "react-native-phone-input": "lbryio/react-native-phone-input",
-    "react-native-gesture-handler": "1.5.2",
+        "react-native-reanimated": "1.2.0",
-    "react-native-image-zoom-viewer": "^2.2.5",
+        "react-native-super-grid": "^3.0.4",
-    "react-native-password-strength-meter": "^0.0.2",
+        "react-native-vector-icons": "^6.6.0",
-    "react-native-phone-input": "lbryio/react-native-phone-input",
+        "react-native-video": "lbryio/react-native-video#exoplayer-lbry-android",
-    "react-native-progress-circle": "2.1.0",
+        "react-navigation": "^3.11.0",
-    "react-native-reanimated": "1.4.0",
+        "react-navigation-drawer": "^1.4.0",
-    "react-native-safe-area-context": "^0.6.2",
+        "react-navigation-redux-helpers": "^3.0.2",
-    "react-native-screens": "^2.0.0",
+        "react-navigation-stack": "^1.8.1",
-    "react-native-snackbar": "2.0.4",
+        "react-redux": "^5.0.3",
-    "react-native-super-grid": "^3.0.4",
+        "redux": "^4.0.4",
-    "react-native-vector-icons": "^6.6.0",
+        "redux-persist": "^5.10.0",
-    "react-native-video": "lbryio/react-native-video#7992ff945872f9bd00a3736d9ff1318f343abf47",
+        "redux-persist-filesystem-storage": "^1.3.2",
-    "react-native-webview": "^8.0.2",
+        "redux-persist-transform-compress": "^4.2.0",
-    "react-navigation": "^4.0.10",
+        "redux-persist-transform-filter": "0.0.18",
-    "react-navigation-drawer": "2.3.3",
+        "redux-thunk": "^2.3.0",
-    "react-navigation-redux-helpers": "^3.0.2",
+        "rn-fetch-blob": "0.10.15",
-    "react-navigation-tabs": "^2.7.0",
+        "seedrandom": "3.0.3"
-    "react-navigation-stack": "^1.10.3",
+    },
-    "react-redux": "^5.0.3",
+    "devDependencies": {
-    "redux": "^4.0.4",
+        "@babel/core": "^7.5.4",
-    "redux-persist": "^6.0.0",
+        "babel-eslint": "10.0.2",
-    "redux-persist-filesystem-storage": "^2.1.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.5.4",
-    "redux-persist-transform-compress": "^4.2.0",
+        "babel-preset-env": "^1.6.1",
-    "redux-persist-transform-filter": "0.0.18",
+        "babel-preset-stage-2": "^6.18.0",
-    "redux-thunk": "^2.3.0",
+        "babel-plugin-module-resolver": "^3.1.1",
-    "rn-fetch-blob": "0.12.0",
+        "eslint": "^5.16.0",
-    "seedrandom": "3.0.3",
+        "eslint-config-standard": "^12.0.0",
-    "showdown": "1.9.1"
+        "eslint-config-standard-jsx": "^6.0.2",
-  },
+        "eslint-plugin-flowtype": "^2.46.1",
-  "devDependencies": {
+        "eslint-plugin-import": "^2.17.2",
-    "@babel/core": "^7.6.2",
+        "eslint-plugin-node": "^8.0.1",
-    "babel-eslint": "10.0.2",
+        "eslint-plugin-promise": "^4.1.1",
-    "@babel/plugin-proposal-object-rest-spread": "^7.5.4",
+        "eslint-plugin-react": "^7.12.4",
-    "babel-preset-env": "^1.6.1",
+        "eslint-plugin-standard": "^4.0.0",
-    "babel-preset-stage-2": "^6.18.0",
+        "flow-babel-webpack-plugin": "^1.1.1",
-    "babel-plugin-module-resolver": "^3.1.1",
+        "husky": "^0.14.3",
-    "eslint": "^6.5.1",
+        "lint-staged": "^7.0.4",
-    "eslint-config-standard": "^12.0.0",
+        "metro-react-native-babel-preset": "^0.55.0",
-    "eslint-config-standard-jsx": "^6.0.2",
+        "prettier": "^1.11.1",
-    "eslint-plugin-flowtype": "^2.46.1",
+        "react-devtools": "^3.6.3"
-    "eslint-plugin-import": "^2.17.2",
+    }
    "eslint-plugin-node": "^8.0.1",
    "eslint-plugin-promise": "^4.1.1",
    "eslint-plugin-react": "^7.12.4",
    "eslint-plugin-standard": "^4.0.0",
    "flow-babel-webpack-plugin": "^1.1.1",
    "husky": "^0.14.3",
    "lint-staged": "^7.0.4",
    "metro-react-native-babel-preset": "0.56.3",
    "prettier": "^1.11.1",
    "@react-native-community/eslint-config": "^0.0.5",
    "react-devtools": "^3.6.3",
    "reactotron-react-native": "4.0.2",
    "reactotron-redux": "3.1.2"
  },
  "jest": {
    "preset": "react-native"
  }
 }
--- a/reactotron.js
+++ b/reactotron.js
@ -1,12 +0,0 @@
 import AsyncStorage from '@react-native-community/async-storage';
 import Reactotron from 'reactotron-react-native';
 import { reactotronRedux } from 'reactotron-redux';
 const reactotron = Reactotron
  .setAsyncStorageHandler(AsyncStorage) // AsyncStorage would either come from `react-native` or `@react-native-community/async-storage` depending on where you get it from
  .configure() // controls connection & communication settings
  .useReactNative() // add all built-in react native plugins
  .use(reactotronRedux())
  .connect();
 export default reactotron;
--- a/src/component/AppNavigator.js
+++ b/src/component/AppNavigator.js
@ -5,9 +5,7 @@ import DiscoverPage from 'page/discover';
 import DownloadsPage from 'page/downloads';
 import DrawerContent from 'component/drawerContent';
 import FilePage from 'page/file';
 import LiteFilePage from 'page/liteFile';
 import FirstRunScreen from 'page/firstRun';
 import InvitesPage from 'page/invites';
 import PublishPage from 'page/publish';
 import PublishesPage from 'page/publishes';
 import RewardsPage from 'page/rewards';
@ -20,7 +18,7 @@ import SubscriptionsPage from 'page/subscriptions';
 import TransactionHistoryPage from 'page/transactionHistory';
 import VerificationScreen from 'page/verification';
 import WalletPage from 'page/wallet';
-import { NavigationActions, StackActions } from 'react-navigation';
+import { NavigationActions } from 'react-navigation';
 import { createDrawerNavigator } from 'react-navigation-drawer';
 import { createStackNavigator } from 'react-navigation-stack';
 import {
@ -31,7 +29,6 @@ import {
 import { connect } from 'react-redux';
 import {
  AppState,
  Alert,
  BackHandler,
  DeviceEventEmitter,
  Linking,
@ -41,23 +38,9 @@ import {
  ToastAndroid,
 } from 'react-native';
 import { selectDrawerStack } from 'redux/selectors/drawer';
-import {
+import { SETTINGS, doDismissToast, doPopulateSharedUserState, doPreferenceGet, doToast, selectToast } from 'lbry-redux';
  Lbry,
  ACTIONS,
  SETTINGS,
  doBalanceSubscribe,
  doDismissToast,
  doPopulateSharedUserState,
  doPreferenceGet,
  doToast,
  selectToast,
 } from 'lbry-redux';
 import {
  Lbryio,
  rewards as REWARD_TYPES,
  doBlackListedOutpointsSubscribe,
  doClaimRewardType,
  doFilteredOutpointsSubscribe,
  doGetSync,
  doUserCheckEmailVerified,
  doUserEmailVerify,
@ -68,7 +51,6 @@ 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';
@ -80,20 +62,27 @@ import NavigationButton from 'component/navigationButton';
 import discoverStyle from 'styles/discover';
 import searchStyle from 'styles/search';
 import SearchRightHeaderIcon from 'component/searchRightHeaderIcon';
 import Snackbar from 'react-native-snackbar';
 import { doSetSdkReady } from 'redux/actions/settings';
 const SYNC_GET_INTERVAL = 1000 * 60 * 5; // every 5 minutes
 const menuNavigationButton = navigation => (
  <NavigationButton
    name="bars"
    size={24}
    style={discoverStyle.drawerMenuButton}
    iconStyle={discoverStyle.drawerHamburger}
    onPress={() => navigation.openDrawer()}
  />
 );
 const discoverStack = createStackNavigator(
  {
-    Subscriptions: {
+    Discover: {
-      screen: SubscriptionsPage,
+      screen: DiscoverPage,
-      navigationOptions: {
+      navigationOptions: ({ navigation }) => ({
-        title: 'Following',
+        title: 'Explore',
        header: null,
-        drawerIcon: ({ tintColor }) => <Icon name="heart" solid size={drawerIconSize} style={{ color: tintColor }} />,
+      }),
      },
    },
    File: {
      screen: FilePage,
@ -117,7 +106,7 @@ const discoverStack = createStackNavigator(
  {
    headerMode: 'screen',
    transitionConfig: () => ({ screenInterpolator: () => null }),
-  },
+  }
 );
 discoverStack.navigationOptions = ({ navigation }) => {
@ -151,7 +140,7 @@ const walletStack = createStackNavigator(
  {
    headerMode: 'screen',
    transitionConfig: () => ({ screenInterpolator: () => null }),
-  },
+  }
 );
 const drawerIconSize = 18;
@ -160,17 +149,10 @@ const drawer = createDrawerNavigator(
    DiscoverStack: {
      screen: discoverStack,
      navigationOptions: {
-        title: 'Following',
+        title: 'Explore',
        drawerIcon: ({ tintColor }) => <Icon name="home" size={drawerIconSize} style={{ color: tintColor }} />,
      },
    },
    Discover: {
      screen: DiscoverPage,
      navigationOptions: ({ navigation }) => ({
        title: 'Your Tags',
        header: null,
      }),
    },
    Trending: {
      screen: TrendingPage,
      navigationOptions: {
@ -178,6 +160,13 @@ const drawer = createDrawerNavigator(
        drawerIcon: ({ tintColor }) => <Icon name="fire" size={drawerIconSize} style={{ color: tintColor }} />,
      },
    },
    Subscriptions: {
      screen: SubscriptionsPage,
      navigationOptions: {
        title: 'Subscriptions',
        drawerIcon: ({ tintColor }) => <Icon name="heart" solid size={drawerIconSize} style={{ color: tintColor }} />,
      },
    },
    WalletStack: {
      screen: walletStack,
      navigationOptions: {
@ -211,12 +200,6 @@ const drawer = createDrawerNavigator(
        drawerIcon: ({ tintColor }) => <Icon name="award" size={drawerIconSize} style={{ color: tintColor }} />,
      },
    },
    Invites: {
      screen: InvitesPage,
      navigationOptions: {
        drawerIcon: ({ tintColor }) => <Icon name="user-friends" size={drawerIconSize} style={{ color: tintColor }} />,
      },
    },
    Downloads: {
      screen: DownloadsPage,
      navigationOptions: {
@ -240,18 +223,17 @@ const drawer = createDrawerNavigator(
    },
  },
  {
-    drawerWidth: 299,
+    drawerWidth: 300,
    drawerBackgroundColor: 'transparent',
    headerMode: 'none',
    backBehavior: 'none',
    unmountInactiveRoutes: true,
    contentComponent: DrawerContent,
    overlayColor: 'rgba(0, 0, 0, 0.7)',
    contentOptions: {
      activeTintColor: Colors.LbryGreen,
      labelStyle: discoverStyle.menuText,
    },
-  },
+  }
 );
 const mainStackNavigator = new createStackNavigator(
@ -277,16 +259,10 @@ const mainStackNavigator = new createStackNavigator(
        drawerLockMode: 'locked-closed',
      },
    },
    LiteFile: {
      screen: LiteFilePage,
      navigationOptions: {
        drawerLockMode: 'locked-closed',
      },
    },
  },
  {
    headerMode: 'none',
-  },
+  }
 );
 export const AppNavigator = mainStackNavigator;
@ -325,7 +301,7 @@ class AppWithNavigationState extends React.Component {
        }
        return false;
-      }.bind(this),
+      }.bind(this)
    );
  }
@ -334,12 +310,6 @@ class AppWithNavigationState extends React.Component {
    this.emailVerifyCheckInterval = setInterval(() => this.checkEmailVerification(), 5000);
    Linking.addEventListener('url', this._handleUrl);
    DeviceEventEmitter.addListener('onSdkReady', this.handleSdkReady);
    DeviceEventEmitter.addListener('onDownloadAborted', this.handleDownloadAborted);
    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
@ -370,115 +340,11 @@ class AppWithNavigationState extends React.Component {
      },
      error => {
        /* failed */
      },
    );
  };
  checkNewAndroidReward = () => {
    const { dispatch, doToast } = this.props;
    const claimRewardCallback = err => {
      if (err) {
        // an error occurred, do not display anything
        return;
      }
      // reward successfully claimed
      NativeModules.UtilityModule.setNativeBooleanSetting(Constants.SETTING_NEW_ANDROID_REWARD_CLAIMED, true);
    };
    NativeModules.UtilityModule.getNativeBooleanSetting(Constants.SETTING_NEW_ANDROID_REWARD_CLAIMED, false).then(
      rewardClaimed => {
        if (!rewardClaimed) {
          dispatch(
            doClaimRewardType(REWARD_TYPES.TYPE_NEW_ANDROID, { notifyError: false, callback: claimRewardCallback }),
          );
        }
      },
    );
  };
  handleSdkReady = () => {
    const { dispatch } = this.props;
    dispatch(doSetSdkReady());
    dispatch(doBalanceSubscribe());
    dispatch(doBlackListedOutpointsSubscribe());
    dispatch(doFilteredOutpointsSubscribe());
    Lbry.wallet_status().then(secureWalletStatus => {
      // For now, automatically unlock the wallet if a password is set so that downloads work
      NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => {
        if ((secureWalletStatus.is_encrypted && !secureWalletStatus.is_locked) || secureWalletStatus.is_locked) {
          this.setState({
            message: __('Unlocking account'),
            details: __('Decrypting wallet'),
          });
          // unlock the wallet and then finish the splash screen
          Lbry.wallet_unlock({ password: password || '' }).then(unlocked => {
            if (unlocked) {
            } else {
              // this.handleAccountUnlockFailed();
            }
          });
        }
      });
    });
    this.checkNewAndroidReward();
  };
  handleAccountUnlockFailed() {
    const { dispatch } = this.props;
    dispatch(
      doToast({
        message: __(
          'Your wallet failed to unlock, which means you may not be able to play any videos or access your funds. Restart the app to fix this.',
        ),
        isError: true,
      }),
    );
  }
  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));
  };
  handleDownloadAborted = evt => {
    const { dispatch } = this.props;
    const { uri, outpoint } = evt;
    dispatch({
      type: ACTIONS.DOWNLOADING_CANCELED,
      data: { uri, outpoint },
    });
    dispatch({
      type: ACTIONS.FILE_DELETE,
      data: {
        outpoint,
      },
    });
  };
  componentWillUnmount() {
    DeviceEventEmitter.removeListener('onSdkReady', this.handleSdkReady);
    DeviceEventEmitter.removeListener('onDownloadAborted', this.handleDownloadAborted);
    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);
@ -498,7 +364,7 @@ class AppWithNavigationState extends React.Component {
      this.setState({ verifyPending: false });
      NativeModules.Firebase.track('email_verified', { email: user.primary_email });
-      Snackbar.show({ title: __('Your email address was successfully verified.'), duration: Snackbar.LENGTH_LONG });
+      ToastAndroid.show(__('Your email address was successfully verified.'), ToastAndroid.LONG);
      // get user settings after email verification
      this.getUserSettings();
@ -515,7 +381,7 @@ class AppWithNavigationState extends React.Component {
    const { toast, emailToVerify, emailVerifyPending, emailVerifyErrorMessage, user } = nextProps;
    if (toast) {
-      const { message, isError } = toast;
+      const { message } = toast;
      let currentDisplayType;
      if (!currentDisplayType && message) {
        // default to toast if no display type set and there is a message specified
@ -523,14 +389,7 @@ class AppWithNavigationState extends React.Component {
      }
      if (currentDisplayType === 'toast') {
-        const props = {
+        ToastAndroid.show(message, ToastAndroid.LONG);
          title: message,
          duration: Snackbar.LENGTH_LONG,
        };
        if (isError) {
          props.backgroundColor = Colors.Red;
        }
        Snackbar.show(props);
      }
      dispatch(doDismissToast());
@ -609,7 +468,7 @@ class AppWithNavigationState extends React.Component {
        try {
          verification = JSON.parse(atob(evt.url.substring(15)));
        } catch (error) {
-          // console.log(error);
+          console.log(error);
        }
        if (verification.token && verification.recaptcha) {
@ -625,7 +484,7 @@ class AppWithNavigationState extends React.Component {
          dispatch(
            doToast({
              message: 'Invalid Verification URI',
-            }),
+            })
          );
        }
      } else {
--- a/src/component/channelIconItem/index.js
+++ b/src/component/channelIconItem/index.js
@ -19,4 +19,7 @@ const perform = dispatch => ({
  resolveUri: uri => dispatch(doResolveUri(uri)),
 });
-export default connect(select, perform)(ChannelIconItem);
+export default connect(
  select,
  perform
 )(ChannelIconItem);
--- a/src/component/channelIconItem/view.js
+++ b/src/component/channelIconItem/view.js
@ -51,7 +51,7 @@ export default class ChannelIconItem extends React.PureComponent {
      <TouchableOpacity style={channelIconStyle.container} onPress={onPress}>
        {isResolvingUri && (
          <View style={channelIconStyle.centered}>
-            <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
+            <ActivityIndicator size={'small'} color={Colors.LbryGreen} />
          </View>
        )}
        <View
--- a/src/component/channelSelector/index.js
+++ b/src/component/channelSelector/index.js
@ -19,11 +19,11 @@ const select = state => ({
 const perform = dispatch => ({
  notify: data => dispatch(doToast(data)),
  createChannel: (name, amount) => dispatch(doCreateChannel(name, amount)),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
 });
 export default connect(
  select,
-  perform,
+  perform
 )(ChannelSelector);
--- a/src/component/channelSelector/view.js
+++ b/src/component/channelSelector/view.js
@ -1,5 +1,5 @@
 import React from 'react';
-import { CLAIM_VALUES, formatCredits, isNameValid } from 'lbry-redux';
+import { CLAIM_VALUES, isNameValid } from 'lbry-redux';
 import { ActivityIndicator, NativeModules, Picker, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { logPublish } from 'utils/helper';
 import Button from 'component/button';
@ -14,7 +14,6 @@ export default class ChannelSelector extends React.PureComponent {
    super(props);
    this.state = {
      creditsInputFocused: false,
      currentSelectedValue: Constants.ITEM_ANONYMOUS,
      newChannelName: '',
      newChannelBid: 0.1,
@ -36,14 +35,10 @@ export default class ChannelSelector extends React.PureComponent {
  }
  componentWillReceiveProps(nextProps) {
-    const { channels: prevChannels = [], channelName: prevChannelName } = this.props;
+    const { channels: prevChannels = [], channelName } = this.props;
-    const { channels = [], channelName } = nextProps;
+    const { channels = [] } = nextProps;
    if (channels && channels.length !== prevChannels.length && channelName !== this.state.currentSelectedValue) {
      this.setState({ currentSelectedValue: prevChannelName });
    }
    if (channelName !== prevChannelName) {
      this.setState({ currentSelectedValue: channelName });
    }
  }
@ -193,11 +188,10 @@ export default class ChannelSelector extends React.PureComponent {
  render() {
    const channel = this.state.addingChannel ? 'new' : this.props.channel;
-    const { balance, enabled, fetchingChannels, channels = [], showAnonymous } = this.props;
+    const { enabled, fetchingChannels, channels = [] } = this.props;
-    const pickerItems = (showAnonymous
+    const pickerItems = [Constants.ITEM_ANONYMOUS, Constants.ITEM_CREATE_A_CHANNEL].concat(
-      ? [Constants.ITEM_ANONYMOUS, Constants.ITEM_CREATE_A_CHANNEL]
+      channels ? channels.map(ch => ch.name) : []
-      : [Constants.ITEM_CREATE_A_CHANNEL]
+    );
    ).concat(channels ? channels.map(ch => ch.name) : []);
    const {
      newChannelName,
@ -250,26 +244,18 @@ export default class ChannelSelector extends React.PureComponent {
                style={channelSelectorStyle.bidAmountInput}
                value={String(newChannelBid)}
                onChangeText={this.handleNewChannelBidChange}
                onFocus={() => this.setState({ creditsInputFocused: true })}
                onBlur={() => this.setState({ creditsInputFocused: false })}
                placeholder={'0.00'}
                keyboardType={'number-pad'}
                underlineColorAndroid={Colors.NextLbryGreen}
              />
              <Text style={channelSelectorStyle.currency}>LBC</Text>
              <View style={channelSelectorStyle.balance}>
                {this.state.creditsInputFocused && <Icon name="coins" size={12} />}
                {this.state.creditsInputFocused && (
                  <Text style={channelSelectorStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
                )}
              </View>
            </View>
            <Text style={channelSelectorStyle.helpText}>
              {__('This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.')}
            </Text>
            <View style={channelSelectorStyle.buttonContainer}>
-              {creatingChannel && <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />}
+              {creatingChannel && <ActivityIndicator size={'small'} color={Colors.LbryGreen} />}
              {!creatingChannel && (
                <View style={channelSelectorStyle.buttons}>
                  <Link style={channelSelectorStyle.cancelLink} text={__('Cancel')} onPress={this.handleCreateCancel} />
--- a/src/component/claimList/index.js
+++ b/src/component/claimList/index.js
@ -12,15 +12,18 @@ import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import ClaimList from './view';
 const select = state => ({
  showNsfwContent: selectShowNsfw(state),
  claimSearchByQuery: selectClaimSearchByQuery(state),
  lastPageReached: selectClaimSearchByQueryLastPageReached(state),
  loadingByQuery: selectFetchingClaimSearchByQuery(state),
  loading: selectFetchingClaimSearch(state),
  showNsfwContent: selectShowNsfw(state),
 });
 const perform = dispatch => ({
  claimSearch: options => dispatch(doClaimSearch(options)),
 });
-export default connect(select, perform)(ClaimList);
+export default connect(
  select,
  perform
 )(ClaimList);
--- a/src/component/claimList/view.js
+++ b/src/component/claimList/view.js
@ -147,7 +147,7 @@ class ClaimList extends React.PureComponent {
  renderMorePlaceholder = () => {
    return (
      <TouchableOpacity style={discoverStyle.fileItemMore} onPress={this.onMorePressed}>
-        <Text style={discoverStyle.moreText}>{__('more')}</Text>
+        <Text style={discoverStyle.moreText}>more</Text>
        <Icon style={discoverStyle.moreIcon} name={'angle-double-down'} color={Colors.White} size={16} />
      </TouchableOpacity>
    );
--- a/src/component/claimResultItem/index.js
+++ b/src/component/claimResultItem/index.js
@ -1,39 +0,0 @@
 import { connect } from 'react-redux';
 import {
  doResolveUri,
  makeSelectClaimForUri,
  makeSelectMetadataForUri,
  makeSelectFileInfoForUri,
  makeSelectIsUriResolving,
  makeSelectClaimIsNsfw,
  makeSelectShortUrlForUri,
  makeSelectTitleForUri,
  makeSelectThumbnailForUri,
 } from 'lbry-redux';
 import { doSetPlayerVisible } from 'redux/actions/drawer';
 import { selectBlackListedOutpoints, selectFilteredOutpoints, selectRewardContentClaimIds } from 'lbryinc';
 import { selectShowNsfw } from 'redux/selectors/settings';
 import ClaimResultItem from './view';
 const select = (state, props) => ({
  blackListedOutpoints: selectBlackListedOutpoints(state),
  claim: makeSelectClaimForUri(props.uri)(state),
  fileInfo: makeSelectFileInfoForUri(props.uri)(state),
  filteredOutpoints: selectFilteredOutpoints(state),
  isDownloaded: !!makeSelectFileInfoForUri(props.uri)(state),
  metadata: makeSelectMetadataForUri(props.uri)(state),
  nsfw: makeSelectClaimIsNsfw(props.uri)(state),
  isResolvingUri: makeSelectIsUriResolving(props.uri)(state),
  obscureNsfw: !selectShowNsfw(state),
  rewardedContentClaimIds: selectRewardContentClaimIds(state),
  shortUrl: makeSelectShortUrlForUri(props.uri)(state),
  title: makeSelectTitleForUri(props.uri)(state),
  thumbnail: makeSelectThumbnailForUri(props.uri)(state),
 });
 const perform = dispatch => ({
  resolveUri: uri => dispatch(doResolveUri(uri)),
  setPlayerVisible: (visible, uri) => dispatch(doSetPlayerVisible(visible, uri)),
 });
 export default connect(select, perform)(ClaimResultItem);
--- a/src/component/claimResultItem/view.js
+++ b/src/component/claimResultItem/view.js
@ -1,180 +0,0 @@
 import React from 'react';
 import { normalizeURI, parseURI } from 'lbry-redux';
 import { ActivityIndicator, Platform, Text, TouchableOpacity, View } from 'react-native';
 import { navigateToUri, getDownloadProgress, getStorageForFileInfo } from 'utils/helper';
 import Colors from 'styles/colors';
 import ChannelIconItem from 'component/channelIconItem';
 import channelIconStyle from 'styles/channelIcon';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import DateTime from 'component/dateTime';
 import FastImage from 'react-native-fast-image';
 import FileItemMedia from 'component/fileItemMedia';
 import FilePrice from 'component/filePrice';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
 import NsfwOverlay from 'component/nsfwOverlay';
 import ProgressBar from 'component/progressBar';
 import fileListStyle from 'styles/fileList';
 import seedrandom from 'seedrandom';
 class ClaimResultItem extends React.PureComponent {
  state = {
    autoStyle: null,
  };
  componentDidMount() {
    const { result } = this.props;
    if (!result || !result.name || !result.claimId) {
      this.setState({
        autoStyle:
          ChannelIconItem.AUTO_THUMB_STYLES[Math.floor(Math.random() * ChannelIconItem.AUTO_THUMB_STYLES.length)],
      });
    } else {
      // result property set, use deterministic random style
      const rng = seedrandom(normalizeURI(`${result.name}#${result.claimId}`));
      const index = Math.floor(rng.quick() * ChannelIconItem.AUTO_THUMB_STYLES.length);
      this.setState({ autoStyle: ChannelIconItem.AUTO_THUMB_STYLES[index] });
    }
  }
  onPressHandler = () => {
    const { autoplay, navigation, result, urlOpenHandler, setPlayerVisible } = this.props;
    const { claimId, name } = result;
    const url = normalizeURI(`${name}#${claimId}`);
    if (urlOpenHandler) {
      urlOpenHandler(url);
    } else {
      navigateToUri(navigation, url, { autoplay }, false, url, setPlayerVisible);
    }
  };
  render() {
    const { fileInfo, navigation, obscureNsfw, result, rewardedContentClaimIds, setPlayerVisible, style } = this.props;
    const {
      channel,
      channel_claim_id: channelClaimId,
      claimId,
      duration,
      fee,
      name,
      nsfw,
      release_time: releaseTime,
      thumbnail_url: thumbnailUrl,
      title,
    } = result;
    const isChannel = name && name.startsWith('@');
    const hasThumbnail = !!thumbnailUrl;
    const obscure = obscureNsfw && nsfw;
    const url = normalizeURI(`${name}#${claimId}`);
    const hasChannel = !!channel;
    const channelUrl = hasChannel ? normalizeURI(`${channel}#${channelClaimId}`) : null;
    const isRewardContent = rewardedContentClaimIds.includes(claimId);
    return (
      <View style={style}>
        <TouchableOpacity
          style={[style, isChannel ? fileListStyle.channelContainer : null]}
          onPress={this.onPressHandler}
        >
          {!isChannel && (
            <FileItemMedia
              style={fileListStyle.thumbnail}
              duration={duration}
              resizeMode="cover"
              title={title || name || normalizeURI(url).substring(7)}
              thumbnail={thumbnailUrl}
            />
          )}
          {isChannel && (
            <View style={fileListStyle.channelThumbnailView}>
              <View style={[fileListStyle.channelThumbnailContainer, this.state.autoStyle]}>
                {hasThumbnail && (
                  <FastImage
                    style={fileListStyle.channelThumbnail}
                    resizeMode={FastImage.resizeMode.cover}
                    source={{ uri: thumbnailUrl }}
                  />
                )}
                {!hasThumbnail && (
                  <Text style={channelIconStyle.autothumbCharacter}>
                    {title ? title.substring(0, 1).toUpperCase() : name.substring(1, 2).toUpperCase()}
                  </Text>
                )}
              </View>
            </View>
          )}
          {fileInfo && fileInfo.completed && fileInfo.download_path && (
            <Icon style={fileListStyle.downloadedIcon} solid color={Colors.NextLbryGreen} name={'folder'} size={16} />
          )}
          <FilePrice
            cost={fee ? parseFloat(fee) / 100000000 : 0}
            uri={url}
            style={fileListStyle.filePriceContainer}
            iconStyle={fileListStyle.filePriceIcon}
            textStyle={fileListStyle.filePriceText}
          />
          <View style={fileListStyle.detailsContainer}>
            {(title || name) && (
              <View style={fileListStyle.titleContainer}>
                <Text style={fileListStyle.title} numberOfLines={3}>
                  {title || name}
                </Text>
                {isRewardContent && <Icon style={fileListStyle.rewardIcon} name="award" size={12} />}
              </View>
            )}
            {(hasChannel || isChannel) && (
              <Link
                style={fileListStyle.publisher}
                text={isChannel ? name : channel}
                onPress={() => {
                  navigateToUri(
                    navigation,
                    normalizeURI(isChannel ? url : channelUrl),
                    null,
                    false,
                    isChannel ? url : channelUrl,
                    setPlayerVisible,
                  );
                }}
              />
            )}
            <View style={fileListStyle.info}>
              {fileInfo && !isNaN(fileInfo.written_bytes) && fileInfo.written_bytes > 0 && (
                <Text style={fileListStyle.infoText}>{getStorageForFileInfo(fileInfo)}</Text>
              )}
              <DateTime
                style={fileListStyle.publishInfo}
                textStyle={fileListStyle.infoText}
                timeAgo
                date={releaseTime}
              />
            </View>
            {fileInfo && fileInfo.download_path && (
              <View style={fileListStyle.downloadInfo}>
                {!fileInfo.completed && (
                  <ProgressBar
                    borderRadius={3}
                    color={Colors.NextLbryGreen}
                    height={3}
                    style={fileListStyle.progress}
                    progress={getDownloadProgress(fileInfo)}
                  />
                )}
              </View>
            )}
          </View>
        </TouchableOpacity>
        {obscure && <NsfwOverlay onPress={() => navigation.navigate({ routeName: 'Settings', key: 'settingsPage' })} />}
      </View>
    );
  }
 }
 export default ClaimResultItem;
--- a/src/component/customRewardCard/view.js
+++ b/src/component/customRewardCard/view.js
@ -74,7 +74,7 @@ class CustomRewardCard extends React.PureComponent<Props> {
            />
            <Button
              style={rewardStyle.redeemButton}
-              text={__('Redeem')}
+              text={'Redeem'}
              disabled={!this.state.rewardCode || this.state.rewardCode.trim().length === 0 || rewardIsPending}
              onPress={() => {
                if (!rewardIsPending) {
--- a/src/component/drawerContent/index.js
+++ b/src/component/drawerContent/index.js
@ -1,19 +1,18 @@
 import { connect } from 'react-redux';
-import { doToast, selectBalance, selectMyChannelClaims } from 'lbry-redux';
+import { doFetchChannelListMine, selectMyChannelClaims } from 'lbry-redux';
-import { selectUnclaimedRewardValue, selectUser } from 'lbryinc';
+import { selectUser } from 'lbryinc';
 import { selectSdkReady } from 'redux/selectors/settings';
 import DrawerContent from './view';
 const select = state => ({
  balance: selectBalance(state),
  channels: selectMyChannelClaims(state),
  sdkReady: selectSdkReady(state),
  unclaimedRewardAmount: selectUnclaimedRewardValue(state),
  user: selectUser(state),
 });
 const perform = dispatch => ({
-  notify: data => dispatch(doToast(data)),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
 });
-export default connect(select, perform)(DrawerContent);
+export default connect(
  select,
  perform
 )(DrawerContent);
--- a/src/component/drawerContent/view.js
+++ b/src/component/drawerContent/view.js
@ -6,13 +6,11 @@ import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import channelIconStyle from 'styles/channelIcon';
 import discoverStyle from 'styles/discover';
 import { Lbryio } from 'lbryinc';
 import { formatUsd } from 'utils/helper';
 const groupedMenuItems = {
  'Find content': [
    { icon: 'heart', solid: true, label: 'Following', route: Constants.DRAWER_ROUTE_SUBSCRIPTIONS },
    { icon: 'hashtag', label: 'Your Tags', route: Constants.DRAWER_ROUTE_DISCOVER },
    { icon: 'heart', solid: true, label: 'Subscriptions', route: Constants.DRAWER_ROUTE_SUBSCRIPTIONS },
    { icon: 'globe-americas', label: 'All Content', route: Constants.DRAWER_ROUTE_TRENDING },
  ],
  'Your content': [
@ -24,7 +22,6 @@ const groupedMenuItems = {
  Wallet: [
    { icon: 'wallet', label: 'Wallet', route: Constants.DRAWER_ROUTE_WALLET },
    { icon: 'award', label: 'Rewards', route: Constants.DRAWER_ROUTE_REWARDS },
    { icon: 'user-friends', label: 'Invites', route: Constants.DRAWER_ROUTE_INVITES },
  ],
  Settings: [
    { icon: 'cog', label: 'Settings', route: Constants.DRAWER_ROUTE_SETTINGS },
@ -33,27 +30,11 @@ const groupedMenuItems = {
 };
 const groupNames = Object.keys(groupedMenuItems);
 const routesRequiringSdkReady = [
  Constants.DRAWER_ROUTE_CHANNEL_CREATOR,
  Constants.DRAWER_ROUTE_MY_LBRY,
  Constants.DRAWER_ROUTE_PUBLISHES,
  Constants.DRAWER_ROUTE_PUBLISH,
  Constants.DRAWER_ROUTE_WALLET,
  Constants.DRAWER_ROUTE_REWARDS,
  Constants.DRAWER_ROUTE_INVITES,
 ];
 class DrawerContent extends React.PureComponent {
  state = {
    usdExchangeRate: 0,
  };
  componentDidMount() {
-    Lbryio.getExchangeRates().then(rates => {
+    const { fetchChannelListMine } = this.props;
-      if (!isNaN(rates.LBC_USD)) {
+    fetchChannelListMine();
        this.setState({ usdExchangeRate: rates.LBC_USD });
      }
    });
  }
  getAvatarImageUrl = () => {
@ -80,23 +61,8 @@ class DrawerContent extends React.PureComponent {
    });
  };
  handleItemPress = routeName => {
    const { navigation, notify, sdkReady } = this.props;
    if (!sdkReady && routesRequiringSdkReady.includes(routeName)) {
      if (navigation.closeDrawer) {
        navigation.closeDrawer();
      }
      notify({
        message: __('The background service is still initializing. Please try again when initialization is complete.'),
      });
      return;
    }
    navigation.navigate({ routeName: routeName });
  };
  render() {
-    const { activeTintColor, balance, navigation, unclaimedRewardAmount, user, onItemPress } = this.props;
+    const { activeTintColor, navigation, user, onItemPress } = this.props;
    const { state } = navigation;
    const activeItemKey = state.routes[state.index] ? state.routes[state.index].key : null;
@ -178,7 +144,7 @@ class DrawerContent extends React.PureComponent {
                    const focused =
                      activeItemKey === item.route ||
                      (activeItemKey === Constants.FULL_ROUTE_NAME_DISCOVER &&
-                        item.route === Constants.DRAWER_ROUTE_SUBSCRIPTIONS) ||
+                        item.route === Constants.DRAWER_ROUTE_DISCOVER) ||
                      (activeItemKey === Constants.FULL_ROUTE_NAME_WALLET &&
                        item.route === Constants.DRAWER_ROUTE_WALLET);
                    return (
@ -190,7 +156,7 @@ class DrawerContent extends React.PureComponent {
                          focused ? discoverStyle.menuItemTouchAreaFocused : null,
                        ]}
                        key={item.label}
-                        onPress={() => this.handleItemPress(item.route)}
+                        onPress={() => navigation.navigate({ routeName: item.route })}
                        delayPressIn={0}
                      >
                        <View style={discoverStyle.menuItemIcon}>
@ -203,15 +169,6 @@ class DrawerContent extends React.PureComponent {
                        </View>
                        <Text style={[discoverStyle.menuItem, focused ? discoverStyle.menuItemFocused : null]}>
                          {__(item.label)}
                          {item.label === 'Wallet' && this.state.usdExchangeRate > 0 && (
                            <Text> ({formatUsd(parseFloat(balance) * parseFloat(this.state.usdExchangeRate))})</Text>
                          )}
                          {item.label === 'Rewards' && this.state.usdExchangeRate > 0 && (
                            <Text>
                              {' '}
                              ({formatUsd(parseFloat(unclaimedRewardAmount) * parseFloat(this.state.usdExchangeRate))})
                            </Text>
                          )}
                        </Text>
                      </TouchableOpacity>
                    );
--- a/src/component/fileDownloadButton/view.js
+++ b/src/component/fileDownloadButton/view.js
@ -11,6 +11,11 @@ class FileDownloadButton extends React.PureComponent {
    }
  }
  componentWillReceiveProps(nextProps) {
    // this.checkAvailability(nextProps.uri);
    // this.restartDownload(nextProps);
  }
  restartDownload(props) {
    const { downloading, fileInfo, uri, restartDownload } = props;
@ -30,6 +35,7 @@ class FileDownloadButton extends React.PureComponent {
      fileInfo,
      downloading,
      uri,
      purchaseUri,
      costInfo,
      isPlayable,
      isViewable,
@ -39,23 +45,12 @@ class FileDownloadButton extends React.PureComponent {
      doPause,
      style,
      openFile,
      onFileActionPress,
      onButtonLayout,
    } = this.props;
-    if (fileInfo && fileInfo.download_path && fileInfo.completed) {
+    if ((fileInfo && !fileInfo.stopped) || loading || downloading) {
      return (
        <TouchableOpacity
          onLayout={onButtonLayout}
          style={[style, fileDownloadButtonStyle.container]}
          onPress={openFile}
        >
          <Text style={fileDownloadButtonStyle.text}>{isViewable ? __('View') : __('Open')}</Text>
        </TouchableOpacity>
      );
    } else if ((fileInfo && !fileInfo.stopped) || loading || downloading) {
      const progress = fileInfo && fileInfo.written_bytes ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0,
-        label = fileInfo ? __('%progress%% complete', { progress: progress.toFixed(0) }) : __('Connecting...');
+        label = fileInfo ? progress.toFixed(0) + '% complete' : __('Connecting...');
      return (
        <View style={[style, fileDownloadButtonStyle.container]}>
@ -77,9 +72,33 @@ class FileDownloadButton extends React.PureComponent {
          text={isPlayable ? __('Play') : isViewable ? __('View') : __('Download')}
          onLayout={onButtonLayout}
          style={[style, fileDownloadButtonStyle.container]}
-          onPress={onFileActionPress}
+          onPress={() => {
            if (NativeModules.Firebase) {
              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) {
      return (
        <TouchableOpacity
          onLayout={onButtonLayout}
          style={[style, fileDownloadButtonStyle.container]}
          onPress={openFile}
        >
          <Text style={fileDownloadButtonStyle.text}>{isViewable ? __('View') : __('Open')}</Text>
        </TouchableOpacity>
      );
    }
    return null;
--- a/src/component/fileItem/index.js
+++ b/src/component/fileItem/index.js
@ -10,7 +10,6 @@ import {
  makeSelectClaimIsNsfw,
  makeSelectShortUrlForUri,
 } from 'lbry-redux';
 import { doSetPlayerVisible } from 'redux/actions/drawer';
 import { selectBlackListedOutpoints, selectFilteredOutpoints, selectRewardContentClaimIds } from 'lbryinc';
 import { selectShowNsfw } from 'redux/selectors/settings';
 import FileItem from './view';
@ -32,7 +31,9 @@ const select = (state, props) => ({
 const perform = dispatch => ({
  resolveUri: uri => dispatch(doResolveUri(uri)),
  setPlayerVisible: (visible, uri) => dispatch(doSetPlayerVisible(visible, uri)),
 });
-export default connect(select, perform)(FileItem);
+export default connect(
  select,
  perform
 )(FileItem);
--- a/src/component/fileItem/view.js
+++ b/src/component/fileItem/view.js
@ -56,7 +56,6 @@ class FileItem extends React.PureComponent {
      obscureNsfw,
      showDetails,
      compactView,
      setPlayerVisible,
      titleBeforeThumbnail,
    } = this.props;
@ -70,9 +69,7 @@ class FileItem extends React.PureComponent {
      const outpointsToHide = !blackListedOutpoints
        ? filteredOutpoints
        : blackListedOutpoints.concat(filteredOutpoints);
-      shouldHide = outpointsToHide.some(
+      shouldHide = outpointsToHide.some(outpoint => outpoint.txid === claim.txid && outpoint.nout === claim.nout);
        outpoint => outpoint && outpoint.txid === claim.txid && outpoint.nout === claim.nout,
      );
    }
    if (shouldHide) {
      // don't display blacklisted or filtered outpoints on the Your tags page
@ -110,12 +107,7 @@ class FileItem extends React.PureComponent {
            <Icon style={discoverStyle.downloadedIcon} solid color={Colors.NextLbryGreen} name={'folder'} size={16} />
          )}
          {!compactView && (!fileInfo || !fileInfo.completed || !fileInfo.download_path) && (
-            <FilePrice
+            <FilePrice uri={uri} style={discoverStyle.filePriceContainer} textStyle={discoverStyle.filePriceText} />
              uri={uri}
              style={discoverStyle.filePriceContainer}
              iconStyle={discoverStyle.filePriceIcon}
              textStyle={discoverStyle.filePriceText}
            />
          )}
          {!compactView && (
            <View style={isRewardContent ? discoverStyle.rewardTitleContainer : null}>
@ -137,8 +129,7 @@ class FileItem extends React.PureComponent {
                      normalizeURI(shortChannelUri || fullChannelUri),
                      null,
                      false,
-                      fullChannelUri,
+                      fullChannelUri
                      setPlayerVisible,
                    );
                  }}
                />
--- a/src/component/fileItemMedia/view.js
+++ b/src/component/fileItemMedia/view.js
@ -61,7 +61,6 @@ class FileItemMedia extends React.PureComponent {
    let style = this.props.style;
    const { duration, isResolvingUri, thumbnail, title, resizeMode } = this.props;
    const atStyle = this.state.autoThumbStyle;
    const hasDuration = !!duration;
    if (this.isThumbnailValid(thumbnail) && !this.state.imageLoadFailed) {
      if (style == null) {
@ -76,7 +75,7 @@ class FileItemMedia extends React.PureComponent {
            resizeMode={this.getFastImageResizeMode(resizeMode)}
            style={fileItemMediaStyle.image}
          />
-          {duration > 0 && (
+          {duration && (
            <VideoDuration
              duration={duration}
              style={fileItemMediaStyle.duration}
@ -105,7 +104,7 @@ class FileItemMedia extends React.PureComponent {
                .toUpperCase()}
          </Text>
        )}
-        {duration > 0 && (
+        {duration && (
          <VideoDuration
            duration={duration}
            style={fileItemMediaStyle.duration}
--- a/src/component/fileListItem/index.js
+++ b/src/component/fileListItem/index.js
@ -10,7 +10,6 @@ import {
  makeSelectTitleForUri,
  makeSelectThumbnailForUri,
 } from 'lbry-redux';
 import { doSetPlayerVisible } from 'redux/actions/drawer';
 import { selectBlackListedOutpoints, selectFilteredOutpoints, selectRewardContentClaimIds } from 'lbryinc';
 import { selectShowNsfw } from 'redux/selectors/settings';
 import FileListItem from './view';
@ -33,7 +32,9 @@ const select = (state, props) => ({
 const perform = dispatch => ({
  resolveUri: uri => dispatch(doResolveUri(uri)),
  setPlayerVisible: (visible, uri) => dispatch(doSetPlayerVisible(visible, uri)),
 });
-export default connect(select, perform)(FileListItem);
+export default connect(
  select,
  perform
 )(FileListItem);
--- a/src/component/fileListItem/view.js
+++ b/src/component/fileListItem/view.js
@ -1,15 +1,11 @@
 import React from 'react';
 import { normalizeURI, parseURI } from 'lbry-redux';
 import { ActivityIndicator, Platform, Text, TouchableOpacity, View } from 'react-native';
-import { navigateToUri, getDownloadProgress, getStorageForFileInfo } from 'utils/helper';
+import { navigateToUri, formatBytes } from 'utils/helper';
 import Colors from 'styles/colors';
 import ChannelIconItem from 'component/channelIconItem';
 import channelIconStyle from 'styles/channelIcon';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import DateTime from 'component/dateTime';
 import FastImage from 'react-native-fast-image';
 import FileItemMedia from 'component/fileItemMedia';
 import FilePrice from 'component/filePrice';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
 import NsfwOverlay from 'component/nsfwOverlay';
@ -18,10 +14,27 @@ import fileListStyle from 'styles/fileList';
 class FileListItem extends React.PureComponent {
  state = {
    autoStyle: null,
    url: null,
  };
  getStorageForFileInfo = fileInfo => {
    if (!fileInfo.completed) {
      const written = formatBytes(fileInfo.written_bytes);
      const total = formatBytes(fileInfo.total_bytes);
      return `(${written} / ${total})`;
    }
    return formatBytes(fileInfo.written_bytes);
  };
  formatTitle = title => {
    if (!title) {
      return title;
    }
    return title.length > 80 ? title.substring(0, 77).trim() + '...' : title;
  };
  getDownloadProgress = fileInfo => {
    return Math.ceil((fileInfo.written_bytes / fileInfo.total_bytes) * 100);
  };
@ -31,16 +44,11 @@ class FileListItem extends React.PureComponent {
    if (!claim && !batchResolve) {
      resolveUri(uri);
    }
    this.setState({
      autoStyle:
        ChannelIconItem.AUTO_THUMB_STYLES[Math.floor(Math.random() * ChannelIconItem.AUTO_THUMB_STYLES.length)],
    });
  }
  componentDidUpdate() {
-    const { claim, resolveUri, uri, batchResolve } = this.props;
+    const { claim, resolveUri, uri } = this.props;
-    if (!claim && uri !== this.state.url && !batchResolve) {
+    if (!claim && uri !== this.state.url) {
      this.setState({ url: uri }, () => resolveUri(uri));
    }
  }
@ -80,7 +88,6 @@ class FileListItem extends React.PureComponent {
      onPress,
      navigation,
      rewardedContentClaimIds,
      setPlayerVisible,
      thumbnail,
      hideChannel,
      onLongPress,
@ -99,13 +106,9 @@ class FileListItem extends React.PureComponent {
      isRewardContent,
      channelClaimId,
      fullChannelUri,
      repostUrl,
      repostChannel,
      repostChannelUrl,
      shortChannelUri,
      shouldHide,
-      signingChannel,
+      signingChannel;
      isRepost;
    if (claim) {
      name = claim.name;
      signingChannel = claim.signing_channel;
@ -115,21 +118,12 @@ class FileListItem extends React.PureComponent {
      channelClaimId = signingChannel ? signingChannel.claim_id : null;
      fullChannelUri = channelClaimId ? `${channel}#${channelClaimId}` : channel;
      shortChannelUri = signingChannel ? signingChannel.short_url : null;
      repostUrl = claim.repost_url;
      repostChannelUrl = claim.repost_channel_url;
      if (repostUrl) {
        const { claimName: repostName, channelName } = parseURI(repostUrl);
        repostChannel = channelName;
      }
      isRepost = !!repostUrl;
      if (blackListedOutpoints || filteredOutpoints) {
        const outpointsToHide = !blackListedOutpoints
          ? filteredOutpoints
          : blackListedOutpoints.concat(filteredOutpoints);
-        shouldHide = outpointsToHide.some(
+        shouldHide = outpointsToHide.some(outpoint => outpoint.txid === claim.txid && outpoint.nout === claim.nout);
          outpoint => outpoint && outpoint.txid === claim.txid && outpoint.nout === claim.nout,
        );
      }
      // TODO: hide channels on tag pages?
@ -140,35 +134,10 @@ class FileListItem extends React.PureComponent {
      return null;
    }
    const actualHideChannel = !isRepost && hideChannel;
    const isChannel = name && name.startsWith('@');
    const hasThumbnail = !!thumbnail;
    return (
-      <View>
+      <View style={style}>
        {isRepost && (
          <View style={fileListStyle.repostInfo}>
            <Icon name={'retweet'} size={14} style={fileListStyle.repostIcon} />
            <Text style={fileListStyle.repostChannelName}>
              <Link
                text={`@${repostChannel}`}
                onPress={() =>
                  navigateToUri(
                    navigation,
                    normalizeURI(repostChannelUrl || `@${repostChannel}`),
                    null,
                    false,
                    null,
                    false,
                  )
                }
              />{' '}
              reposted
            </Text>
          </View>
        )}
        <TouchableOpacity
-          style={[style, isChannel ? fileListStyle.channelContainer : null]}
+          style={style}
          onPress={this.onPressHandler}
          onLongPress={() => {
            if (onLongPress) {
@ -176,55 +145,21 @@ class FileListItem extends React.PureComponent {
            }
          }}
        >
-          {!isChannel && (
+          <FileItemMedia
-            <FileItemMedia
+            style={fileListStyle.thumbnail}
-              style={fileListStyle.thumbnail}
+            duration={duration}
-              duration={duration}
+            resizeMode="cover"
-              resizeMode="cover"
+            title={title || name || normalizeURI(uri).substring(7)}
-              title={title || name || normalizeURI(uri).substring(7)}
+            thumbnail={thumbnail}
-              thumbnail={thumbnail}
+          />
            />
          )}
          {isChannel && (
            <View style={fileListStyle.channelThumbnailView}>
              <View style={[fileListStyle.channelThumbnailContainer, this.state.autoStyle]}>
                {hasThumbnail && (
                  <FastImage
                    style={fileListStyle.channelThumbnail}
                    resizeMode={FastImage.resizeMode.cover}
                    source={{ uri: thumbnail }}
                  />
                )}
                {!hasThumbnail && (
                  <Text style={channelIconStyle.autothumbCharacter}>
                    {title ? title.substring(0, 1).toUpperCase() : claim.name.substring(1, 2).toUpperCase()}
                  </Text>
                )}
              </View>
            </View>
          )}
          {selected && (
            <View style={fileListStyle.selectedOverlay}>
              <Icon name={'check-circle'} solid color={Colors.NextLbryGreen} size={32} />
            </View>
          )}
          {fileInfo && fileInfo.completed && fileInfo.download_path && (
-            <Icon
+            <Icon style={fileListStyle.downloadedIcon} solid color={Colors.NextLbryGreen} name={'folder'} size={16} />
              style={featuredResult ? fileListStyle.featuredDownloadedIcon : fileListStyle.downloadedIcon}
              solid
              color={Colors.NextLbryGreen}
              name={'folder'}
              size={16}
            />
          )}
          <FilePrice
            uri={uri}
            style={fileListStyle.filePriceContainer}
            iconStyle={fileListStyle.filePriceIcon}
            textStyle={fileListStyle.filePriceText}
          />
          <View style={fileListStyle.detailsContainer}>
            {featuredResult && (
              <Text style={fileListStyle.featuredUri} numberOfLines={1}>
@ -237,7 +172,7 @@ class FileListItem extends React.PureComponent {
                {!title && !name && <Text style={fileListStyle.uri}>{uri}</Text>}
                {!title && !name && (
                  <View style={fileListStyle.row}>
-                    <ActivityIndicator size={'small'} color={featuredResult ? Colors.White : Colors.NextLbryGreen} />
+                    <ActivityIndicator size={'small'} color={featuredResult ? Colors.White : Colors.LbryGreen} />
                  </View>
                )}
              </View>
@ -245,11 +180,8 @@ class FileListItem extends React.PureComponent {
            {(title || name) && (
              <View style={fileListStyle.titleContainer}>
-                <Text
+                <Text style={featuredResult ? fileListStyle.featuredTitle : fileListStyle.title}>
-                  style={featuredResult ? fileListStyle.featuredTitle : fileListStyle.title}
+                  {this.formatTitle(title) || this.formatTitle(name)}
                  numberOfLines={actualHideChannel ? 4 : 3}
                >
                  {title || name}
                </Text>
                {isRewardContent && <Icon style={fileListStyle.rewardIcon} name="award" size={12} />}
              </View>
@ -261,18 +193,17 @@ class FileListItem extends React.PureComponent {
              </View>
            )}
-            {(channel || isChannel) && !actualHideChannel && (
+            {channel && !hideChannel && (
              <Link
                style={fileListStyle.publisher}
-                text={isChannel ? name : channel}
+                text={channel}
                onPress={() => {
                  navigateToUri(
                    navigation,
-                    normalizeURI(isChannel ? uri : shortChannelUri || fullChannelUri),
+                    normalizeURI(shortChannelUri || fullChannelUri),
                    null,
                    false,
-                    isChannel ? claim && claim.permanent_url : fullChannelUri,
+                    fullChannelUri
                    setPlayerVisible,
                  );
                }}
              />
@ -280,7 +211,7 @@ class FileListItem extends React.PureComponent {
            <View style={fileListStyle.info}>
              {fileInfo && !isNaN(fileInfo.written_bytes) && fileInfo.written_bytes > 0 && (
-                <Text style={fileListStyle.infoText}>{getStorageForFileInfo(fileInfo)}</Text>
+                <Text style={fileListStyle.infoText}>{this.getStorageForFileInfo(fileInfo)}</Text>
              )}
              <DateTime style={fileListStyle.publishInfo} textStyle={fileListStyle.infoText} timeAgo uri={uri} />
            </View>
@ -293,7 +224,7 @@ class FileListItem extends React.PureComponent {
                    color={Colors.NextLbryGreen}
                    height={3}
                    style={fileListStyle.progress}
-                    progress={getDownloadProgress(fileInfo)}
+                    progress={this.getDownloadProgress(fileInfo)}
                  />
                )}
              </View>
--- a/src/component/filePrice/view.js
+++ b/src/component/filePrice/view.js
@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Text, View } from 'react-native';
 import { formatCredits, formatFullPrice } from 'lbry-redux';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 class CreditAmount extends React.PureComponent {
  static propTypes = {
@ -63,27 +62,25 @@ class CreditAmount extends React.PureComponent {
      }
    }
-    return (
+    /* {this.props.isEstimate ? (
-      <Text style={style} numberOfLines={1}>
+          <span
-        {amountText}
+            className="credit-amount__estimate"
-      </Text>
+            title={__('This is an estimate and does not include data fees')}
-    );
+          >
            *
          </span>
        ) : null} */
    return <Text style={style}>{amountText}</Text>;
  }
 }
 class FilePrice extends React.PureComponent {
  componentWillMount() {
-    const { cost } = this.props;
+    this.fetchCost(this.props);
    if (isNaN(parseFloat(cost))) {
      this.fetchCost(this.props);
    }
  }
  componentWillReceiveProps(nextProps) {
-    const { cost } = this.props;
+    this.fetchCost(nextProps);
    if (isNaN(parseFloat(cost))) {
      this.fetchCost(nextProps);
    }
  }
  fetchCost(props) {
@ -95,25 +92,30 @@ class FilePrice extends React.PureComponent {
  }
  render() {
-    const { cost, costInfo, look = 'indicator', showFullPrice = false, style, iconStyle, textStyle } = this.props;
+    const { costInfo, look = 'indicator', showFullPrice = false, style, textStyle } = this.props;
    const isEstimate = costInfo ? !costInfo.includesData : null;
-    const amount = cost ? parseFloat(cost) : costInfo ? parseFloat(costInfo.cost) : 0;
+
-    if (isNaN(amount) || amount === 0) {
+    if (!costInfo) {
-      return null;
+      return (
        <View style={style}>
          <Text style={textStyle}>???</Text>
        </View>
      );
    }
    return (
      <View style={style}>
        <Icon name="coins" size={9} style={iconStyle} />
        <CreditAmount
          style={textStyle}
          label={false}
-          amount={amount}
+          amount={parseFloat(costInfo.cost)}
          isEstimate={isEstimate}
          showFree
          showFullPrice={showFullPrice}
-        />
+        >
          ???
        </CreditAmount>
      </View>
    );
  }
--- a/src/component/floatingWalletBalance/index.js
+++ b/src/component/floatingWalletBalance/index.js
@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import { selectBalance } from 'lbry-redux';
 import { selectUnclaimedRewardValue } from 'lbryinc';
-import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
+import Constants from 'constants';
 import FloatingWalletBalance from './view';
 const select = state => ({
@ -11,4 +11,7 @@ const select = state => ({
  rewardsNotInterested: makeSelectClientSetting(Constants.SETTING_REWARDS_NOT_INTERESTED)(state),
 });
-export default connect(select, null)(FloatingWalletBalance);
+export default connect(
  select,
  null
 )(FloatingWalletBalance);
--- a/src/component/mediaPlayer/view.js
+++ b/src/component/mediaPlayer/view.js
@ -36,7 +36,7 @@ class MediaPlayer extends React.PureComponent {
  constructor(props) {
    super(props);
    this.state = {
-      buffering: true,
+      buffering: false,
      backgroundPlayEnabled: false,
      autoPaused: false,
      rate: 1,
@ -45,9 +45,9 @@ class MediaPlayer extends React.PureComponent {
      resizeMode: 'contain',
      duration: 0.0,
      currentTime: 0.0,
-      paused: true,
+      paused: !props.autoPlay,
      fullscreenMode: false,
-      areControlsVisible: false,
+      areControlsVisible: true,
      controlsTimeout: -1,
      seekerOffset: 0,
      seekerPosition: 0,
@ -87,9 +87,7 @@ class MediaPlayer extends React.PureComponent {
  }
  onLoad = data => {
    const { autoPlay } = this.props;
    this.setState({
      buffering: false,
      duration: data.duration,
    });
@ -102,17 +100,13 @@ class MediaPlayer extends React.PureComponent {
    if (this.props.onMediaLoaded) {
      this.props.onMediaLoaded();
    }
    if (autoPlay) {
      this.setState({ paused: false });
    }
  };
  onProgress = data => {
    const { savePosition, claim } = this.props;
    this.setState({ buffering: false, currentTime: data.currentTime });
-    if (claim && data.currentTime > 0 && Math.floor(data.currentTime) % positionSaveInterval === 0) {
+    if (data.currentTime > 0 && Math.floor(data.currentTime) % positionSaveInterval === 0) {
      const { claim_id: claimId, txid, nout } = claim;
      savePosition(claimId, `${txid}:${nout}`, data.currentTime);
    }
@ -173,7 +167,7 @@ class MediaPlayer extends React.PureComponent {
  togglePlay = () => {
    this.showPlayerControls();
-    this.setState({ paused: !this.state.paused }, this.updateBackgroundMediaNotification);
+    this.setState({ paused: !this.state.paused }, this.handlePausedState);
  };
  handlePausedState = () => {
@ -194,7 +188,7 @@ class MediaPlayer extends React.PureComponent {
  };
  onEnd = () => {
-    this.setState({ paused: true }, this.updateBackgroundMediaNotification);
+    this.setState({ paused: true });
    if (this.props.onPlaybackFinished) {
      this.props.onPlaybackFinished();
    }
@ -333,10 +327,6 @@ class MediaPlayer extends React.PureComponent {
    }
  };
  onFocusChanged = evt => {
    this.setState({ paused: !(this.state.paused && evt.hasAudioFocus) }, this.updateBackgroundMediaNotification);
  };
  onBuffer = () => {
    if (!this.state.paused) {
      this.setState({ buffering: true }, () => this.manualHidePlayerControls());
@ -351,12 +341,6 @@ class MediaPlayer extends React.PureComponent {
    this.setState({ paused: true }, this.updateBackgroundMediaNotification);
  };
  handleSeek = time => {
    const { currentTime } = this.state;
    const newTime = currentTime + time;
    this.seekTo(newTime);
  };
  updateBackgroundMediaNotification = () => {
    this.handlePausedState();
    const { backgroundPlayEnabled } = this.props;
@ -378,26 +362,14 @@ class MediaPlayer extends React.PureComponent {
            <Icon name={'arrow-left'} size={18} style={mediaPlayerStyle.backButtonIcon} />
          </TouchableOpacity>
-          <View style={mediaPlayerStyle.midControls}>
+          <TouchableOpacity style={mediaPlayerStyle.playPauseButton} onPress={this.togglePlay}>
-            <TouchableOpacity style={mediaPlayerStyle.rewind10} onPress={() => this.handleSeek(-10)}>
+            {this.state.paused && <Icon name="play" size={40} color="#ffffff" />}
-              <Icon name="undo" size={24} color={Colors.White} />
+            {!this.state.paused && <Icon name="pause" size={40} color="#ffffff" />}
-              <Text style={[mediaPlayerStyle.midControlText, mediaPlayerStyle.leftMidControlText]}>10</Text>
+          </TouchableOpacity>
            </TouchableOpacity>
            <TouchableOpacity style={mediaPlayerStyle.playPauseButton} onPress={this.togglePlay}>
              {this.state.paused && <Icon name="play" size={40} color={Colors.White} />}
              {!this.state.paused && <Icon name="pause" size={40} color={Colors.White} />}
            </TouchableOpacity>
            <TouchableOpacity style={mediaPlayerStyle.forward10} onPress={() => this.handleSeek(10)}>
              <Icon name="redo" size={24} color={Colors.White} />
              <Text style={[mediaPlayerStyle.midControlText, mediaPlayerStyle.rightMidControlText]}>10</Text>
            </TouchableOpacity>
          </View>
          <TouchableOpacity style={mediaPlayerStyle.toggleFullscreenButton} onPress={this.toggleFullscreenMode}>
-            {this.state.fullscreenMode && <Icon name="compress" size={16} color={Colors.White} />}
+            {this.state.fullscreenMode && <Icon name="compress" size={16} color="#ffffff" />}
-            {!this.state.fullscreenMode && <Icon name="expand" size={16} color={Colors.White} />}
+            {!this.state.fullscreenMode && <Icon name="expand" size={16} color="#ffffff" />}
          </TouchableOpacity>
          <Text style={mediaPlayerStyle.elapsedDuration}>{this.formatTime(this.state.currentTime)}</Text>
@ -449,7 +421,7 @@ class MediaPlayer extends React.PureComponent {
    const seekerCircleStyle = [this.state.seeking ? mediaPlayerStyle.bigSeekerCircle : mediaPlayerStyle.seekerCircle];
    if (!this.state.seeking) {
      seekerCircleStyle.push(
-        this.state.fullscreenMode ? mediaPlayerStyle.seekerCircleTopFs : mediaPlayerStyle.seekerCircleTop,
+        this.state.fullscreenMode ? mediaPlayerStyle.seekerCircleTopFs : mediaPlayerStyle.seekerCircleTop
      );
    }
@ -468,7 +440,6 @@ class MediaPlayer extends React.PureComponent {
          }}
          resizeMode={this.state.resizeMode}
          playInBackground={this.state.backgroundPlayEnabled}
          playWhenInactive={this.state.backgroundPlayEnabled}
          style={mediaPlayerStyle.player}
          rate={this.state.rate}
          volume={this.state.volume}
@ -479,7 +450,6 @@ class MediaPlayer extends React.PureComponent {
          onEnd={this.onEnd}
          onError={this.onError}
          minLoadRetryCount={999}
          onAudioFocusChanged={this.onFocusChanged}
        />
        {this.state.firstPlay && thumbnail && (
--- a/src/component/modalRepostView/index.js
+++ b/src/component/modalRepostView/index.js
@ -1,28 +0,0 @@
 import { connect } from 'react-redux';
 import {
  doClearRepostError,
  doFetchChannelListMine,
  doRepost,
  doToast,
  selectBalance,
  selectMyChannelClaims,
  selectRepostError,
  selectRepostLoading,
 } from 'lbry-redux';
 import ModalRepostView from './view';
 const select = state => ({
  balance: selectBalance(state),
  channels: selectMyChannelClaims(state),
  reposting: selectRepostLoading(state),
  error: selectRepostError(state),
 });
 const perform = dispatch => ({
  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
  notify: data => dispatch(doToast(data)),
  repost: options => dispatch(doRepost(options)),
  clearError: () => dispatch(doClearRepostError()),
 });
 export default connect(select, perform)(ModalRepostView);
--- a/src/component/modalRepostView/view.js
+++ b/src/component/modalRepostView/view.js
@ -1,204 +0,0 @@
 import React from 'react';
 import { ActivityIndicator, Alert, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { formatCredits, creditsToString } from 'lbry-redux';
 import modalStyle from 'styles/modal';
 import modalRepostStyle from 'styles/modalRepost';
 import ChannelSelector from 'component/channelSelector';
 import Button from 'component/button';
 import Colors from 'styles/colors';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
 import { logPublish } from 'utils/helper';
 export default class ModalRepostView extends React.PureComponent {
  depositAmountInput;
  state = {
    channelName: null,
    creditsInputFocused: false,
    depositAmount: '0.01',
    repostName: null,
    repostStarted: false,
    showAdvanced: false,
  };
  componentDidMount() {
    const { claim, fetchChannelListMine } = this.props;
    const { name } = claim;
    fetchChannelListMine();
    this.setState({ repostName: name });
    this.checkChannelSelection(this.props);
  }
  componentWillReceiveProps(nextProps) {
    this.checkChannelSelection(nextProps);
    const { notify } = this.props;
    const { reposting, error } = nextProps;
    if (this.state.repostStarted && !reposting && error) {
      this.setState({ repostStarted: false });
      notify({ message: error, isError: true });
    }
  }
  checkChannelSelection = props => {
    const { channels = [] } = props;
    if (!this.state.channelName && channels && channels.length > 0) {
      const firstChannel = channels[0];
      this.setState({ channelName: firstChannel.name });
    }
  };
  handleChannelChange = channelName => {
    const { channels = [] } = this.props;
    if (channels && channels.length > 0) {
      const filtered = channels.filter(c => c.name === channelName);
      if (filtered.length > 0) {
        const channel = filtered[0];
        this.setState({ channelName });
      }
    }
  };
  handleRepost = () => {
    const { claim, balance, notify, repost, onRepostSuccessful, channels = [], clearError } = this.props;
    const { depositAmount, repostName, channelName } = this.state;
    if (parseInt(depositAmount, 10) > balance) {
      notify({
        message: 'Insufficient credits',
        isError: true,
      });
      return;
    }
    clearError();
    const channel = channels.filter(ch => ch.name === channelName)[0];
    this.setState({ repostStarted: true }, () => {
      repost({
        name: repostName,
        bid: creditsToString(depositAmount),
        channel_id: channel.claim_id,
        claim_id: claim.claim_id,
      }).then(repostClaim => {
        logPublish(repostClaim);
        this.setState({ repostStarted: false });
        notify({ message: __('The content was successfully reposted!') });
        if (onRepostSuccessful) onRepostSuccessful();
      });
    });
  };
  render() {
    const { balance, channels, reposting, title, onCancelPress, onOverlayPress } = this.props;
    const canRepost = !!this.state.channelName && !!this.state.repostName;
    const channelsLoaded = channels && channels.length > 0;
    const processing = this.state.repostStarted || reposting || !channelsLoaded;
    return (
      <TouchableOpacity style={modalStyle.overlay} activeOpacity={1} onPress={onOverlayPress}>
        <TouchableOpacity style={modalStyle.container} activeOpacity={1}>
          <View
            style={modalRepostStyle.container}
            onLayout={() => {
              if (this.tipAmountInput) {
                this.tipAmountInput.focus();
              }
            }}
          >
            <Text style={modalRepostStyle.title} numberOfLines={1}>
              {__('Repost %title%', { title })}
            </Text>
            <Text style={modalRepostStyle.infoText}>
              {__('Repost your favorite content to help more people discover them!')}
            </Text>
            <Text style={modalRepostStyle.label}>{__('Channel to post on')}</Text>
            <ChannelSelector
              showAnonymous={false}
              channelName={this.state.channelName}
              onChannelChange={this.handleChannelChange}
            />
            {this.state.showAdvanced && (
              <View>
                <Text style={modalRepostStyle.label}>{__('Name')}</Text>
                <View style={modalRepostStyle.nameRow}>
                  <TextInput
                    editable={false}
                    value={this.state.channelName ? `lbry://${this.state.channelName}/` : ''}
                    style={modalRepostStyle.input}
                  />
                  <TextInput
                    editable={canRepost}
                    value={this.state.repostName}
                    underlineColorAndroid={Colors.NextLbryGreen}
                    selectTextOnFocus
                    onChangeText={value => this.setState({ repostName: value })}
                    style={modalRepostStyle.input}
                  />
                </View>
                <Text style={modalRepostStyle.label}>{__('Deposit')}</Text>
                <View style={modalRepostStyle.row}>
                  <View style={modalRepostStyle.amountRow}>
                    <TextInput
                      editable={!this.state.repostStarted}
                      ref={ref => (this.depositAmountInput = ref)}
                      onChangeText={value => this.setState({ tipAmount: value })}
                      underlineColorAndroid={Colors.NextLbryGreen}
                      keyboardType={'numeric'}
                      onFocus={() => this.setState({ creditsInputFocused: true })}
                      onBlur={() => this.setState({ creditsInputFocused: false })}
                      placeholder={'0'}
                      value={this.state.depositAmount}
                      selectTextOnFocus
                      style={modalRepostStyle.depositAmountInput}
                    />
                    <Text style={modalRepostStyle.currency}>LBC</Text>
                    <View style={modalRepostStyle.balance}>
                      {this.state.creditsInputFocused && <Icon name="coins" size={12} />}
                      {this.state.creditsInputFocused && (
                        <Text style={modalRepostStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
                      )}
                    </View>
                  </View>
                </View>
              </View>
            )}
            <View style={modalRepostStyle.buttonRow}>
              {!processing && (
                <Link
                  style={modalRepostStyle.cancelLink}
                  text={__('Cancel')}
                  onPress={() => {
                    if (onCancelPress) onCancelPress();
                  }}
                />
              )}
              {processing && <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />}
              <View style={modalRepostStyle.rightButtonRow}>
                <Link
                  style={modalRepostStyle.advancedLink}
                  text={this.state.showAdvanced ? __('Hide advanced') : __('Show advanced')}
                  onPress={() => {
                    this.setState({ showAdvanced: !this.state.showAdvanced });
                  }}
                />
                <Button
                  text={__('Repost')}
                  style={modalRepostStyle.button}
                  disabled={!canRepost || this.state.repostStarted || reposting}
                  onPress={this.handleRepost}
                />
              </View>
            </View>
          </View>
        </TouchableOpacity>
      </TouchableOpacity>
    );
  }
 }
--- a/src/component/modalSuggestedSubscriptions/index.js
+++ b/src/component/modalSuggestedSubscriptions/index.js
@ -1,9 +1,4 @@
 import { connect } from 'react-redux';
 import { selectFetchingClaimSearch } from 'lbry-redux';
 import ModalSuggestedSubscriptions from './view';
-const select = state => ({
+export default connect()(ModalSuggestedSubscriptions);
  loadingSuggested: selectFetchingClaimSearch(state),
 });
 export default connect(select)(ModalSuggestedSubscriptions);
--- a/src/component/modalSuggestedSubscriptions/view.js
+++ b/src/component/modalSuggestedSubscriptions/view.js
@ -1,26 +1,23 @@
 import React from 'react';
-import { ActivityIndicator, ScrollView, Text, TouchableOpacity, View } from 'react-native';
+import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
 import modalStyle from 'styles/modal';
 import subscriptionsStyle from 'styles/subscriptions';
 import Button from 'component/button';
 import Colors from 'styles/colors';
-import SuggestedSubscriptionsGrid from 'component/suggestedSubscriptionsGrid';
+import SuggestedSubscriptions from 'component/suggestedSubscriptions';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import Icon from 'react-native-vector-icons/FontAwesome5';
 export default class ModalSuggestedSubcriptions extends React.PureComponent {
  render() {
-    const { loadingSuggested, navigation, onDonePress, onOverlayPress } = this.props;
+    const { navigation, onDonePress, onOverlayPress } = this.props;
    return (
      <TouchableOpacity style={modalStyle.overlay} activeOpacity={1} onPress={onOverlayPress}>
        <TouchableOpacity style={[modalStyle.container, subscriptionsStyle.modalContainer]} activeOpacity={1}>
-          <SuggestedSubscriptionsGrid inModal navigation={navigation} />
+          <SuggestedSubscriptions inModal navigation={navigation} />
-          <View style={modalStyle.wideButtons}>
+          <View style={modalStyle.buttons}>
-            <Button style={modalStyle.wideDoneButton} text={__('Done')} onPress={onDonePress} />
+            <Button style={modalStyle.doneButton} text={__('Done')} onPress={onDonePress} />
            {loadingSuggested && (
              <ActivityIndicator size="small" color={Colors.White} style={subscriptionsStyle.modalLoading} />
            )}
          </View>
        </TouchableOpacity>
      </TouchableOpacity>
--- a/src/component/modalTipView/index.js
+++ b/src/component/modalTipView/index.js
@ -1,17 +0,0 @@
 import { connect } from 'react-redux';
 import { doSendTip, doToast, selectBalance } from 'lbry-redux';
 import { selectSdkReady } from 'redux/selectors/settings';
 import ModalTipView from './view';
 const select = state => ({
  balance: selectBalance(state),
  sdkReady: selectSdkReady(state),
 });
 const perform = dispatch => ({
  notify: data => dispatch(doToast(data)),
  sendTip: (amount, claimId, isSupport, successCallback, errorCallback) =>
    dispatch(doSendTip(amount, claimId, isSupport, successCallback, errorCallback)),
 });
 export default connect(select, perform)(ModalTipView);
--- a/src/component/modalTipView/view.js
+++ b/src/component/modalTipView/view.js
@ -1,157 +0,0 @@
 import React from 'react';
 import { ActivityIndicator, Alert, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { formatCredits } from 'lbry-redux';
 import modalStyle from 'styles/modal';
 import modalTipStyle from 'styles/modalTip';
 import Button from 'component/button';
 import Colors from 'styles/colors';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
 export default class ModalTipView extends React.PureComponent {
  tipAmountInput = null;
  state = {
    creditsInputFocused: false,
    sendTipStarted: false,
    tipAmount: null,
  };
  handleSendTip = () => {
    const { claim, balance, notify, onSendTipFailed, onSendTipSuccessful, sdkReady, sendTip } = this.props;
    const { tipAmount } = this.state;
    if (!sdkReady) {
      notify({
        message: __(
          'The background service is still initializing. You can still explore and watch content during the initialization process.',
        ),
      });
      return;
    }
    if (tipAmount > balance) {
      notify({
        message: 'Insufficient credits',
        isError: true,
      });
      return;
    }
    const amount = parseInt(tipAmount, 10);
    const message =
      amount === 1
        ? __('Please confirm you want to tip %amount% credit', { amount })
        : __('Please confirm you want to tip %amount% credits', { amount });
    Alert.alert(
      __('Send Tip'),
      message,
      [
        { text: __('No') },
        {
          text: __('Yes'),
          onPress: () => {
            this.setState({ sendTipStarted: true }, () =>
              sendTip(
                tipAmount,
                claim.claim_id,
                false,
                () => {
                  // success
                  this.setState({ tipAmount: null, sendTipStarted: false });
                  if (onSendTipSuccessful) onSendTipSuccessful();
                },
                () => {
                  // error
                  if (onSendTipFailed) onSendTipFailed();
                },
              ),
            );
          },
        },
      ],
      { cancelable: true },
    );
  };
  render() {
    const { balance, channelName, contentName, onCancelPress, onOverlayPress } = this.props;
    const canSendTip = this.state.tipAmount > 0;
    return (
      <TouchableOpacity style={modalStyle.overlay} activeOpacity={1} onPress={onOverlayPress}>
        <TouchableOpacity style={modalStyle.container} activeOpacity={1}>
          <View
            style={modalTipStyle.container}
            onLayout={() => {
              if (this.tipAmountInput) {
                this.tipAmountInput.focus();
              }
            }}
          >
            <Text style={modalTipStyle.title} numberOfLines={1}>
              {channelName ? __('Send a tip to %channel%', { channel: channelName }) : __('Send a tip')}
            </Text>
            <View style={modalTipStyle.row}>
              <View style={modalTipStyle.amountRow}>
                <TextInput
                  editable={!this.state.sendTipStarted}
                  ref={ref => (this.tipAmountInput = ref)}
                  onChangeText={value => this.setState({ tipAmount: value })}
                  underlineColorAndroid={Colors.NextLbryGreen}
                  keyboardType={'numeric'}
                  onFocus={() => this.setState({ creditsInputFocused: true })}
                  onBlur={() => this.setState({ creditsInputFocused: false })}
                  placeholder={'0'}
                  value={this.state.tipAmount}
                  selectTextOnFocus
                  style={modalTipStyle.tipAmountInput}
                />
                <Text style={modalTipStyle.currency}>LBC</Text>
                <View style={modalTipStyle.balance}>
                  {this.state.creditsInputFocused && <Icon name="coins" size={12} />}
                  {this.state.creditsInputFocused && (
                    <Text style={modalTipStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
                  )}
                </View>
              </View>
              {this.state.sendTipStarted && <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />}
            </View>
            <View style={modalTipStyle.info}>
              <Text style={modalTipStyle.infoText}>
                {__(
                  'This will appear as a tip for %content%, which will boost its ability to be discovered while active.',
                  { content: contentName },
                )}{' '}
                <Link
                  style={modalTipStyle.learnMoreLink}
                  text={__('Learn more.')}
                  href={'https://lbry.com/faq/tipping'}
                />
              </Text>
            </View>
            <View style={modalTipStyle.buttonRow}>
              <Link
                style={modalTipStyle.cancelTipLink}
                text={__('Cancel')}
                onPress={() => {
                  if (onCancelPress) onCancelPress();
                }}
              />
              <Button
                text={__('Send')}
                style={modalTipStyle.button}
                disabled={!canSendTip || this.state.sendTipStarted}
                onPress={this.handleSendTip}
              />
            </View>
          </View>
        </TouchableOpacity>
      </TouchableOpacity>
    );
  }
 }
--- a/src/component/relatedContent/index.js
+++ b/src/component/relatedContent/index.js
@ -1,35 +1,25 @@
 import { connect } from 'react-redux';
 import {
  doResolveUris,
  doResolvedSearch,
  makeSelectClaimForUri,
-  makeSelectResolvedRecommendedContentForUri,
+  makeSelectRecommendedContentForUri,
-  selectResolvingUris,
+  makeSelectTitleForUri,
  selectIsSearching,
 } from 'lbry-redux';
 import { selectShowNsfw } from 'redux/selectors/settings';
 import RelatedContent from './view';
 const RESULT_SIZE = 16;
 const select = (state, props) => ({
  claim: makeSelectClaimForUri(props.uri)(state),
  recommendedContent: makeSelectRecommendedContentForUri(props.uri)(state),
  title: makeSelectTitleForUri(props.uri)(state),
  isSearching: selectIsSearching(state),
  recommendedContent: makeSelectResolvedRecommendedContentForUri(
    props.uri,
    RESULT_SIZE,
    props.claimId,
    props.claimName,
    props.title,
  )(state),
  resolvingUris: selectResolvingUris(state),
  showNsfwContent: selectShowNsfw(state),
 });
 const perform = dispatch => ({
  resolveUris: uris => dispatch(doResolveUris(uris)),
  searchRecommended: (query, claimId, nsfw) =>
    dispatch(doResolvedSearch(query, RESULT_SIZE, undefined, true, { related_to: claimId }, nsfw)),
 });
-export default connect(select, perform)(RelatedContent);
+export default connect(
  select,
  perform
 )(RelatedContent);
--- a/src/component/relatedContent/view.js
+++ b/src/component/relatedContent/view.js
@ -4,42 +4,44 @@ import { normalizeURI } from 'lbry-redux';
 import { navigateToUri } from 'utils/helper';
 import Colors from 'styles/colors';
 import FileListItem from 'component/fileListItem';
 import ClaimResultItem from 'component/claimResultItem';
 import fileListStyle from 'styles/fileList';
 import relatedContentStyle from 'styles/relatedContent';
 export default class RelatedContent extends React.PureComponent {
-  componentDidMount() {
+  state = {
-    const { title, claimId, searchRecommended, showNsfwContent } = this.props;
+    urlsResolved: false,
-    if (title && claimId) {
+  };
-      searchRecommended(title, claimId, showNsfwContent);
+
  componentDidUpdate(prevProps) {
    const { resolveUris, recommendedContent } = this.props;
    if (recommendedContent && recommendedContent.length > 0 && !this.state.urisResolved) {
      this.setState({ urisResolved: true }, () => {
        // batch resolve the uris
        resolveUris(recommendedContent);
      });
    }
  }
  shouldComponentUpdate(nextProps, nextState) {
    const { isSearching, recommendedContent } = nextProps;
    return isSearching || (!isSearching && recommendedContent && recommendedContent.length > 0);
  }
  render() {
-    const { isSearching, recommendedContent, navigation, urlOpenHandler, uri, fullUri } = this.props;
+    const { recommendedContent, navigation, uri, fullUri } = this.props;
    return (
      <View style={relatedContentStyle.container}>
-        <Text style={relatedContentStyle.title}>{__('Related Content')}</Text>
+        <Text style={relatedContentStyle.title}>Related Content</Text>
        {isSearching && <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />}
        {recommendedContent &&
-          recommendedContent.map(result => (
+          recommendedContent
-            <ClaimResultItem
+            .filter(recommendedUri => recommendedUri !== normalizeURI(fullUri))
-              style={fileListStyle.item}
+            .map(recommendedUri => (
-              uri={result ? normalizeURI(`${result.name}#${result.claimId}`) : null}
+              <FileListItem
-              urlOpenHandler={urlOpenHandler}
+                style={fileListStyle.item}
-              key={result.claimId}
+                key={recommendedUri}
-              result={result}
+                uri={recommendedUri}
-              navigation={navigation}
+                batchResolve
-              autoplay
+                navigation={navigation}
-            />
+                autoplay
-          ))}
+              />
            ))}
      </View>
    );
  }
--- a/src/component/rewardCard/view.js
+++ b/src/component/rewardCard/view.js
@ -1,11 +1,10 @@
 // @flow
 import React from 'react';
 import { ActivityIndicator, Text, TouchableOpacity, View } from 'react-native';
-import { formatUsd } from 'utils/helper';
+import Colors from '../../styles/colors';
 import Colors from 'styles/colors';
 import Icon from 'react-native-vector-icons/FontAwesome5';
-import Link from 'component/link';
+import Link from '../link';
-import rewardStyle from 'styles/reward';
+import rewardStyle from '../../styles/reward';
 type Props = {
  canClaim: boolean,
@ -62,7 +61,7 @@ class RewardCard extends React.PureComponent<Props> {
    if (reward) {
      const claimed = !!reward.transaction_id;
      if (!claimed && reward.reward_range && reward.reward_range.includes('-')) {
-        return reward.reward_range.split('-')[1];
+        return reward.reward_range.split('-')[0] + '+'; // ex: 5+
      } else if (reward.reward_amount > 0) {
        return reward.reward_amount;
      }
@ -73,7 +72,7 @@ class RewardCard extends React.PureComponent<Props> {
  };
  render() {
-    const { canClaim, isPending, onClaimPress, reward, usdExchangeRate } = this.props;
+    const { canClaim, isPending, onClaimPress, reward } = this.props;
    const claimed = !!reward.transaction_id;
    return (
@ -118,16 +117,8 @@ class RewardCard extends React.PureComponent<Props> {
          )}
        </View>
        <View style={rewardStyle.rightCol}>
          {reward.reward_range && reward.reward_range.indexOf('-') > -1 && (
            <Text style={rewardStyle.rightColHeader}>{__('up to')}</Text>
          )}
          <Text style={rewardStyle.rewardAmount}>{this.getDisplayAmount()}</Text>
          <Text style={rewardStyle.rewardCurrency}>LBC</Text>
          {usdExchangeRate > 0 && (
            <Text style={rewardStyle.rewardUsd}>
              &asymp;{formatUsd(parseFloat(this.getDisplayAmount()) * parseFloat(usdExchangeRate))}
            </Text>
          )}
        </View>
      </TouchableOpacity>
    );
--- a/src/component/rewardEnrolment/view.js
+++ b/src/component/rewardEnrolment/view.js
@ -7,7 +7,6 @@ import Link from 'component/link';
 import Colors from 'styles/colors';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import rewardStyle from 'styles/reward';
 import { formatUsd } from '../../utils/helper';
 class RewardEnrolment extends React.Component {
  componentDidMount() {
@ -30,25 +29,20 @@ class RewardEnrolment extends React.Component {
  };
  render() {
-    const { unclaimedRewardAmount, usdExchangeRate } = this.props;
+    const { fetching, navigation, unclaimedRewardAmount, user } = this.props;
    return (
      <View style={rewardStyle.enrollContainer}>
        <View style={rewardStyle.summaryRow}>
          <Icon name="award" size={36} color={Colors.White} />
-          <Text style={rewardStyle.summaryText}>
+          <Text style={rewardStyle.summaryText}>{unclaimedRewardAmount} available credits</Text>
            {unclaimedRewardAmount === 1 && __('%amount% available credit', { amount: unclaimedRewardAmount })}
            {unclaimedRewardAmount !== 1 && __('%amount% available credits', { amount: unclaimedRewardAmount })}
          </Text>
        </View>
        <View style={rewardStyle.onboarding}>
          <Text style={rewardStyle.enrollDescText}>
-            {__('LBRY credits allow you to publish or purchase content.')}
+            {__('LBRY credits allow you to purchase content, publish content, and influence the network.')}
            {'\n\n'}
-            {__('You can obtain free credits worth %amount% after you provide an email address.', {
+            {__('You get credits for free for providing an email address and taking other basic actions.')}
              amount: formatUsd(parseFloat(unclaimedRewardAmount) * parseFloat(usdExchangeRate)),
            })}
            {'\n\n'}
            <Link style={rewardStyle.learnMoreLink} text={__('Learn more')} onPress={this.onLearnMorePressed} />.
          </Text>
--- a/src/component/sdkLoadingStatus/index.js
+++ b/src/component/sdkLoadingStatus/index.js
@ -1,4 +0,0 @@
 import { connect } from 'react-redux';
 import SdkLoadingStatus from './view';
 export default connect()(SdkLoadingStatus);
--- a/src/component/sdkLoadingStatus/view.js
+++ b/src/component/sdkLoadingStatus/view.js
@ -1,15 +0,0 @@
 import { ActivityIndicator, Text, View } from 'react-native';
 import React from 'react';
 import discoverStyle from 'styles/discover';
 import Colors from 'styles/colors';
 export default class SdkLoadingStatus extends React.PureComponent {
  render() {
    return (
      <View style={discoverStyle.sdkLoading}>
        <ActivityIndicator color={Colors.White} size={'small'} />
        <Text style={discoverStyle.sdkLoadingText}>{__('The LBRY background service is initializing...')}</Text>
      </View>
    );
  }
 }
--- a/src/component/storageStatsCard/view.js
+++ b/src/component/storageStatsCard/view.js
@ -75,10 +75,10 @@ class StorageStatsCard extends React.PureComponent {
        <View style={[storageStatsStyle.row, storageStatsStyle.totalSizeContainer]}>
          <View style={storageStatsStyle.summary}>
            <Text style={storageStatsStyle.totalSize}>{formatBytes(this.state.totalBytes, 2)}</Text>
-            <Text style={storageStatsStyle.annotation}>{__('used')}</Text>
+            <Text style={storageStatsStyle.annotation}>used</Text>
          </View>
          <View style={[storageStatsStyle.row, storageStatsStyle.toggleStatsContainer]}>
-            <Text style={storageStatsStyle.statsText}>{__('Stats')}</Text>
+            <Text style={storageStatsStyle.statsText}>Stats</Text>
            <Switch
              style={storageStatsStyle.statsToggle}
              value={this.state.showStats}
--- a/src/component/subscribeButtonOverlay/index.js
+++ b/src/component/subscribeButtonOverlay/index.js
@ -1,18 +0,0 @@
 import { connect } from 'react-redux';
 import { doChannelSubscribe, doChannelUnsubscribe, selectSubscriptions, makeSelectIsSubscribed } from 'lbryinc';
 import { doToast } from 'lbry-redux';
 import SubscribeButtonOverlay from './view';
 const select = (state, props) => ({
  subscriptions: selectSubscriptions(state),
  isSubscribed: makeSelectIsSubscribed(props.uri, true)(state),
 });
 export default connect(
  select,
  {
    doChannelSubscribe,
    doChannelUnsubscribe,
    doToast,
  },
 )(SubscribeButtonOverlay);
--- a/src/component/subscribeButtonOverlay/view.js
+++ b/src/component/subscribeButtonOverlay/view.js
@ -1,36 +0,0 @@
 import React from 'react';
 import { normalizeURI, parseURI } from 'lbry-redux';
 import { NativeModules, Text, View, TouchableOpacity } from 'react-native';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Button from 'component/button';
 import Colors from 'styles/colors';
 class SubscribeButtonOverlay extends React.PureComponent {
  handlePress = () => {
    const { claim, isSubscribed, doChannelSubscribe, doChannelUnsubscribe, uri } = this.props;
    if (!claim) {
      return;
    }
    const subscriptionHandler = isSubscribed ? doChannelUnsubscribe : doChannelSubscribe;
    const { name: claimName } = claim;
    subscriptionHandler({
      channelName: claimName,
      uri: normalizeURI(uri),
    });
  };
  render() {
    const { uri, isSubscribed, style } = this.props;
    let styles = style.length ? style : [style];
    return (
      <TouchableOpacity style={styles} opacity={0.7} onPress={this.handlePress}>
        {isSubscribed && <Icon name={'heart'} size={20} solid color={Colors.Red} />}
        {!isSubscribed && <Icon name={'heart'} size={20} color={Colors.Red} />}
      </TouchableOpacity>
    );
  }
 }
 export default SubscribeButtonOverlay;
--- a/src/component/suggestedSubscriptionItem/index.js
+++ b/src/component/suggestedSubscriptionItem/index.js
@ -6,7 +6,6 @@ import {
  makeSelectTitleForUri,
  makeSelectIsUriResolving,
 } from 'lbry-redux';
 import { doChannelSubscribe, doChannelUnsubscribe, makeSelectIsSubscribed } from 'lbryinc';
 import SuggestedSubscriptionItem from './view';
 const select = (state, props) => ({
@ -14,13 +13,13 @@ const select = (state, props) => ({
  title: makeSelectTitleForUri(props.uri)(state),
  claim: makeSelectClaimForUri(props.uri)(state),
  isResolvingUri: makeSelectIsUriResolving(props.uri)(state),
  isSubscribed: makeSelectIsSubscribed(props.uri, true)(state),
 });
 const perform = dispatch => ({
  resolveUri: uri => dispatch(doResolveUri(uri)),
  subscribe: subscription => doChannelSubscribe(subscription),
  unsubscribe: subscription => doChannelUnsubscribe(subscription),
 });
-export default connect(select, perform)(SuggestedSubscriptionItem);
+export default connect(
  select,
  perform
 )(SuggestedSubscriptionItem);
--- a/src/component/suggestedSubscriptionItem/view.js
+++ b/src/component/suggestedSubscriptionItem/view.js
@ -1,37 +1,25 @@
 import React from 'react';
 import { buildURI, normalizeURI } from 'lbry-redux';
-import { ActivityIndicator, FlatList, Image, Text, TouchableOpacity, View } from 'react-native';
+import { ActivityIndicator, FlatList, Image, Text, View } from 'react-native';
 import { navigateToUri } from 'utils/helper';
 import Colors from 'styles/colors';
 import ChannelIconItem from 'component/channelIconItem';
 import channelIconStyle from 'styles/channelIcon';
 import discoverStyle from 'styles/discover';
 import FileItem from 'component/fileItem';
-import SubscribeButtonOverlay from 'component/subscribeButtonOverlay';
+import SubscribeButton from 'component/subscribeButton';
 import subscriptionsStyle from 'styles/subscriptions';
 import Link from 'component/link';
 import Tag from 'component/tag';
 class SuggestedSubscriptionItem extends React.PureComponent {
  state = {
    autoStyle: null,
  };
  componentDidMount() {
    const { claim, uri, resolveUri } = this.props;
    if (!claim) {
      resolveUri(uri);
    }
    this.setState({
      autoStyle:
        ChannelIconItem.AUTO_THUMB_STYLES[Math.floor(Math.random() * ChannelIconItem.AUTO_THUMB_STYLES.length)],
    });
  }
  render() {
    const { claim, isResolvingUri, navigation, thumbnail, title, uri } = this.props;
    let shortUrl, tags;
    if (claim) {
      shortUrl = claim.short_url;
@ -40,60 +28,54 @@ class SuggestedSubscriptionItem extends React.PureComponent {
      }
    }
    const hasThumbnail = !!thumbnail;
    if (isResolvingUri) {
      return (
        <View style={subscriptionsStyle.itemLoadingContainer}>
-          <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
+          <ActivityIndicator size={'small'} color={Colors.LbryGreen} />
        </View>
      );
    }
    return (
-      <TouchableOpacity style={subscriptionsStyle.suggestedItem}>
+      <View style={subscriptionsStyle.suggestedItem}>
-        <View style={[subscriptionsStyle.suggestedItemThumbnailContainer, this.state.autoStyle]}>
+        <View style={subscriptionsStyle.suggestedItemThumbnailContainer}>
-          {hasThumbnail && (
+          <Image
-            <Image style={subscriptionsStyle.suggestedItemThumbnail} resizeMode={'cover'} source={{ uri: thumbnail }} />
+            style={subscriptionsStyle.suggestedItemThumbnail}
-          )}
+            resizeMode={'cover'}
-          {!hasThumbnail && (
+            source={thumbnail ? { uri: thumbnail } : require('../../assets/default_avatar.jpg')}
-            <Text style={channelIconStyle.autothumbCharacter}>
+          />
              {title ? title.substring(0, 1).toUpperCase() : claim ? claim.name.substring(1, 2).toUpperCase() : ''}
            </Text>
          )}
        </View>
        <View style={subscriptionsStyle.suggestedItemDetails}>
-          <Text style={subscriptionsStyle.suggestedItemTitle} numberOfLines={2}>
+          {title && (
-            {title || claim.name}
+            <Text style={subscriptionsStyle.suggestedItemTitle} numberOfLines={1}>
-          </Text>
+              {title}
            </Text>
          )}
          {claim && (
            <Link
              style={subscriptionsStyle.suggestedItemName}
              numberOfLines={1}
              text={claim.name}
              onPress={() => navigateToUri(navigation, normalizeURI(shortUrl || uri), null, false, claim.permanent_url)}
            />
          )}
          {tags && (
            <View style={subscriptionsStyle.suggestedItemTagList}>
              {tags &&
                tags
-                  .slice(0, 1)
+                  .slice(0, 3)
                  .map(tag => (
-                    <Tag
+                    <Tag style={subscriptionsStyle.tag} key={tag} name={tag} navigation={navigation} truncate />
                      numberOfLines={1}
                      onPress={this.handleItemPress}
                      style={subscriptionsStyle.tag}
                      key={tag}
                      name={tag}
                      navigation={navigation}
                      truncate
                    />
                  ))}
            </View>
          )}
        </View>
        {claim && (
-          <SubscribeButtonOverlay
+          <SubscribeButton style={subscriptionsStyle.suggestedItemSubscribe} uri={normalizeURI(claim.permanent_url)} />
            claim={claim}
            style={subscriptionsStyle.suggestedItemSubscribeOverlay}
            uri={normalizeURI(claim.permanent_url)}
          />
        )}
-      </TouchableOpacity>
+      </View>
    );
  }
 }
--- a/src/component/suggestedSubscriptions/index.js
+++ b/src/component/suggestedSubscriptions/index.js
@ -16,4 +16,7 @@ const perform = dispatch => ({
  claimSearch: options => dispatch(doClaimSearch(options)),
 });
-export default connect(select, perform)(SuggestedSubscriptions);
+export default connect(
  select,
  perform
 )(SuggestedSubscriptions);
--- a/src/component/suggestedSubscriptionsGrid/index.js
+++ b/src/component/suggestedSubscriptionsGrid/index.js
@ -1,27 +0,0 @@
 import { connect } from 'react-redux';
 import {
  doClaimSearch,
  selectFetchingClaimSearch,
  selectClaimSearchByQuery,
  selectClaimSearchByQueryLastPageReached,
  selectFollowedTags,
 } from 'lbry-redux';
 import { selectSubscriptions, selectSuggestedChannels, selectIsFetchingSuggested } from 'lbryinc';
 import { selectShowNsfw } from 'redux/selectors/settings';
 import SuggestedSubscriptionsGrid from './view';
 const select = state => ({
  followedTags: selectFollowedTags(state),
  subscriptions: selectSubscriptions(state),
  suggested: selectSuggestedChannels(state),
  loading: selectIsFetchingSuggested(state) || selectFetchingClaimSearch(state),
  claimSearchByQuery: selectClaimSearchByQuery(state),
  lastPageReached: selectClaimSearchByQueryLastPageReached(state),
  showNsfwContent: selectShowNsfw(state),
 });
 const perform = dispatch => ({
  claimSearch: options => dispatch(doClaimSearch(options)),
 });
 export default connect(select, perform)(SuggestedSubscriptionsGrid);
--- a/src/component/suggestedSubscriptionsGrid/view.js
+++ b/src/component/suggestedSubscriptionsGrid/view.js
@ -1,111 +0,0 @@
 import React from 'react';
 import { ActivityIndicator, SectionList, Text, View } from 'react-native';
 import { MATURE_TAGS, createNormalizedClaimSearchKey, normalizeURI } from 'lbry-redux';
 import { navigateToUri } from 'utils/helper';
 import { FlatGrid } from 'react-native-super-grid';
 import SubscribeButton from 'component/subscribeButton';
 import SuggestedSubscriptionItem from 'component/suggestedSubscriptionItem';
 import Colors from 'styles/colors';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import discoverStyle from 'styles/discover';
 import subscriptionsStyle from 'styles/subscriptions';
 import Link from 'component/link';
 import _ from 'lodash';
 const suggestedPageSize = 24;
 const softLimit = 2400;
 class SuggestedSubscriptionsGrid extends React.PureComponent {
  state = {
    currentPage: 1,
    options: {},
    // maintain a local state of subscriptions so that changes don't affect the search
    subscriptionIds: [],
  };
  buildClaimSearchOptions() {
    const { showNsfwContent } = this.props;
    const { currentPage } = this.state;
    const options = {
      no_totals: true,
      page: currentPage,
      page_size: suggestedPageSize,
      claim_type: 'channel',
      order_by: [Constants.ORDER_BY_EFFECTIVE_AMOUNT],
    };
    if (!showNsfwContent) {
      options.not_tags = MATURE_TAGS;
    }
    if (this.state.subscriptionIds.length > 0) {
      options.not_channel_ids = this.state.subscriptionIds;
    }
    return options;
  }
  doClaimSearch() {
    const { claimSearch } = this.props;
    const options = this.buildClaimSearchOptions();
    claimSearch(options);
  }
  handleVerticalEndReached = () => {
    // fetch more content
    const { claimSearchByQuery, lastPageReached } = this.props;
    const options = this.buildClaimSearchOptions();
    const claimSearchKey = createNormalizedClaimSearchKey(options);
    const uris = claimSearchByQuery[claimSearchKey];
    if (
      lastPageReached[claimSearchKey] ||
      (uris.length > 0 && uris.length < suggestedPageSize) || uris.length >= softLimit
    ) {
      return;
    }
    this.setState({ currentPage: this.state.currentPage + 1 }, () => this.doClaimSearch());
  };
  componentDidMount() {
    const { claimSearch, followedTags, showNsfwContent, subscriptions } = this.props;
    if (subscriptions && subscriptions.length > 0) {
      this.setState(
        {
          subscriptionIds: subscriptions.map(subscription => subscription.uri.split('#')[1]),
        },
        () => this.doClaimSearch(),
      );
    } else {
      this.doClaimSearch();
    }
  }
  render() {
    const { claimSearchByQuery, inModal, navigation } = this.props;
    const options = this.buildClaimSearchOptions();
    const claimSearchKey = createNormalizedClaimSearchKey(options);
    const claimSearchUris = claimSearchByQuery[claimSearchKey];
    return (
      <FlatGrid
        initialNumToRender={24}
        maxToRenderPerBatch={48}
        removeClippedSubviews
        itemDimension={120}
        spacing={1}
        items={claimSearchUris}
        style={inModal ? subscriptionsStyle.modalScrollContainer : subscriptionsStyle.scrollContainer}
        contentContainerStyle={
          inModal ? subscriptionsStyle.modalSuggestedScrollContent : subscriptionsStyle.suggestedScrollContent
        }
        renderItem={({ item, index }) => (
          <SuggestedSubscriptionItem key={item} uri={normalizeURI(item)} navigation={navigation} />
        )}
        onEndReached={this.handleVerticalEndReached}
        onEndReachedThreshold={0.2}
      />
    );
  }
 }
 export default SuggestedSubscriptionsGrid;
--- a/src/component/tag/view.js
+++ b/src/component/tag/view.js
@ -30,7 +30,7 @@ export default class Tag extends React.PureComponent {
  };
  render() {
-    const { name, numberOfLines, onPress, style, type, truncate } = this.props;
+    const { name, onPress, style, type, truncate } = this.props;
    let styles = [];
    if (style) {
@ -50,9 +50,7 @@ export default class Tag extends React.PureComponent {
    return (
      <TouchableOpacity style={styles} onPress={onPress || this.onPressDefault}>
        <View style={tagStyle.content}>
-          <Text style={tagStyle.text} numberOfLines={numberOfLines}>
+          <Text style={tagStyle.text}>{truncate ? formatTagName(name) : name}</Text>
            {truncate ? formatTagName(name) : name}
          </Text>
          {type && <Icon style={tagStyle.icon} name={type === 'add' ? 'plus' : 'times'} size={8} />}
        </View>
      </TouchableOpacity>
--- a/src/component/tagSearch/view.js
+++ b/src/component/tagSearch/view.js
@ -74,7 +74,7 @@ export default class TagSearch extends React.PureComponent {
        <TextInput
          editable={editable}
          style={tagStyle.searchInput}
-          placeholder={__('Search for more tags')}
+          placeholder={'Search for more tags'}
          underlineColorAndroid={Colors.NextLbryGreen}
          value={this.state.tag}
          numberOfLines={1}
--- a/src/component/transactionListRecent/view.js
+++ b/src/component/transactionListRecent/view.js
@ -26,7 +26,7 @@ class TransactionListRecent extends React.PureComponent<Props> {
    return (
      <View style={walletStyle.transactionsCard}>
        <View style={[walletStyle.row, walletStyle.transactionsHeader]}>
-          <Text style={walletStyle.transactionsTitle}>{__('Recent Transactions')}</Text>
+          <Text style={walletStyle.transactionsTitle}>Recent Transactions</Text>
          <Link style={walletStyle.link} navigation={navigation} text={__('View All')} href={'#TransactionHistory'} />
        </View>
        {fetchingTransactions && <Text style={walletStyle.infoText}>{__('Fetching transactions...')}</Text>}
--- a/src/component/uriBar/index.js
+++ b/src/component/uriBar/index.js
@ -6,7 +6,6 @@ import {
  selectSearchSuggestions,
  SETTINGS,
 } from 'lbry-redux';
 import { doSetPlayerVisible } from 'redux/actions/drawer';
 import { selectCurrentRoute } from 'redux/selectors/drawer';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import UriBar from './view';
@ -25,10 +24,9 @@ const select = state => {
 const perform = dispatch => ({
  updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)),
  setPlayerVisible: (visible, uri) => dispatch(doSetPlayerVisible(visible, uri)),
 });
 export default connect(
  select,
-  perform,
+  perform
 )(UriBar);
--- a/src/component/uriBar/view.js
+++ b/src/component/uriBar/view.js
@ -1,14 +1,13 @@
 // @flow
 import React from 'react';
 import { SEARCH_TYPES, isNameValid, isURIValid, normalizeURI } from 'lbry-redux';
-import { Alert, Dimensions, FlatList, Keyboard, Text, TextInput, TouchableOpacity, View } from 'react-native';
+import { Dimensions, FlatList, Keyboard, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { navigateToUri, transformUrl } from 'utils/helper';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import UriBarItem from './internal/uri-bar-item';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import NavigationButton from 'component/navigationButton';
 import uriBarStyle from 'styles/uriBar';
 import { NavigationActions, StackActions } from 'react-navigation';
 class UriBar extends React.PureComponent {
  static INPUT_TIMEOUT = 2500; // 2.5 seconds
@ -19,20 +18,18 @@ class UriBar extends React.PureComponent {
  keyboardDidHideListener = null;
  changeTextTimeout = -1;
  state = {
    changeTextTimeout: null,
    currentValue: null,
    inputText: null,
    focused: false,
    keyboardHeight: 0,
    selection: undefined,
  };
  componentDidMount() {
    this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow);
    this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide);
-    this.setState({ selection: { start: 0, end: 0 } });
+    this.setSelection();
  }
  componentWillUnmount() {
@ -54,14 +51,15 @@ class UriBar extends React.PureComponent {
  }
  handleChangeText = text => {
    this.setState({ selection: undefined });
    const newValue = text || '';
-    clearTimeout(this.changeTextTimeout);
+    clearTimeout(this.state.changeTextTimeout);
    const { updateSearchQuery, onSearchSubmitted, showUriBarSuggestions, navigation } = this.props;
-    this.changeTextTimeout = -1;
+    updateSearchQuery(text);
    let timeout = -1;
    if (!showUriBarSuggestions) {
-      this.changeTextTimeout = setTimeout(() => {
+      timeout = setTimeout(() => {
        if (text.trim().length === 0) {
          // don't do anything if the text is empty
          return;
@ -69,7 +67,6 @@ class UriBar extends React.PureComponent {
        if (!text.startsWith('lbry://')) {
          // not a URI input, so this is a search, perform a direct search
          updateSearchQuery(text);
          if (onSearchSubmitted) {
            onSearchSubmitted(text);
          } else {
@ -77,14 +74,12 @@ class UriBar extends React.PureComponent {
          }
        }
      }, UriBar.INPUT_TIMEOUT);
    } else {
      updateSearchQuery(text);
    }
-    this.setState({ inputText: newValue, currentValue: newValue });
+    this.setState({ inputText: newValue, currentValue: newValue, changeTextTimeout: timeout });
  };
  handleItemPress = item => {
-    const { navigation, onSearchSubmitted, setPlayerVisible, updateSearchQuery } = this.props;
+    const { navigation, onSearchSubmitted, updateSearchQuery } = this.props;
    const { type, value } = item;
    Keyboard.dismiss();
@ -113,7 +108,7 @@ class UriBar extends React.PureComponent {
      });
    } else {
      const uri = normalizeURI(value);
-      navigateToUri(navigation, uri, null, false, null, setPlayerVisible);
+      navigateToUri(navigation, uri);
    }
  };
@ -128,8 +123,14 @@ class UriBar extends React.PureComponent {
    this.setState({ focused: false, keyboardHeight: 0 });
  };
  setSelection() {
    if (this.textInput) {
      this.textInput.setNativeProps({ selection: { start: 0, end: 0 } });
    }
  }
  handleSubmitEditing = () => {
-    const { navigation, onSearchSubmitted, setPlayerVisible, updateSearchQuery } = this.props;
+    const { navigation, onSearchSubmitted, updateSearchQuery } = this.props;
    if (this.state.inputText) {
      let inputText = this.state.inputText,
        inputTextIsUrl = false;
@ -138,7 +139,7 @@ class UriBar extends React.PureComponent {
        // if it's a URI (lbry://...), open the file page
        if (transformedUrl && isURIValid(transformedUrl)) {
          inputTextIsUrl = true;
-          navigateToUri(navigation, transformedUrl, null, false, null, setPlayerVisible);
+          navigateToUri(navigation, transformedUrl);
        }
      }
@ -158,58 +159,9 @@ class UriBar extends React.PureComponent {
    }
  };
-  handleFocus = () => {
+  onSearchPageBlurred() {
-    this.setState(
+    this.setState({ currenValueSet: false });
-      {
+  }
        focused: true,
      },
      () => {
        this.setState({
          selection: { start: 0, end: this.state.currentValue ? this.state.currentValue.length : 0 },
        });
      },
    );
  };
  handleTouchStart = () => {
    if (this.state.focused) {
      this.setState({ selection: null });
    }
  };
  handleBlur = () => {
    this.setState({
      focused: false,
      selection: { start: 0, end: 0 },
    });
  };
  handleNavigationButtonPress = () => {
    const { navigation } = this.props;
    if (!navigation.openDrawer) {
      Alert.alert(
        __('Stop watching?'),
        'The LBRY service is still loading stuff in the background. Would you like to continue?',
        [
          { text: __('No') },
          {
            text: __('Yes'),
            onPress: () => {
              const resetAction = StackActions.reset({
                index: 0,
                actions: [
                  NavigationActions.navigate({ routeName: 'Splash', params: { resetUrl: 'lbry://?subscriptions' } }),
                ],
              });
              navigation.dispatch(resetAction);
            },
          },
        ],
      );
    } else {
      navigation.openDrawer();
    }
  };
  render() {
    const {
@ -290,7 +242,7 @@ class UriBar extends React.PureComponent {
              size={24}
              style={uriBarStyle.drawerMenuButton}
              iconStyle={uriBarStyle.drawerHamburger}
-              onPress={this.handleNavigationButtonPress}
+              onPress={() => navigation.openDrawer()}
            />
          )}
          {!selectionMode && (
@ -298,10 +250,12 @@ class UriBar extends React.PureComponent {
              ref={ref => {
                this.textInput = ref;
              }}
              onTouchStart={this.handleTouchStart}
              autoCorrect={false}
              style={uriBarStyle.uriText}
-              selection={this.state.selection}
+              onLayout={() => {
                this.setSelection();
              }}
              selectTextOnFocus
              placeholder={__('Search movies, music, and more')}
              underlineColorAndroid={'transparent'}
              numberOfLines={1}
@ -310,8 +264,11 @@ class UriBar extends React.PureComponent {
              returnKeyType={'go'}
              inlineImageLeft={'baseline_search_black_24'}
              inlineImagePadding={16}
-              onFocus={this.handleFocus}
+              onFocus={() => this.setState({ focused: true })}
-              onBlur={this.handleBlur}
+              onBlur={() => {
                this.setState({ focused: false });
                this.setSelection();
              }}
              onChangeText={this.handleChangeText}
              onSubmitEditing={this.handleSubmitEditing}
            />
--- a/src/component/walletBalance/index.js
+++ b/src/component/walletBalance/index.js
@ -6,4 +6,7 @@ const select = state => ({
  balance: selectBalance(state),
 });
-export default connect(select, null)(WalletBalance);
+export default connect(
  select,
  null
 )(WalletBalance);
--- a/src/component/walletBalance/view.js
+++ b/src/component/walletBalance/view.js
@ -1,9 +1,9 @@
 // @flow
 import React from 'react';
 import { Image, Text, View } from 'react-native';
-import { formatCredits } from 'lbry-redux';
+import { Lbry, formatCredits } from 'lbry-redux';
-import { Lbryio } from 'lbryinc';
+import Address from 'component/address';
-import { formatUsd } from 'utils/helper';
+import Button from 'component/button';
 import walletStyle from 'styles/wallet';
 type Props = {
@ -11,18 +11,6 @@ type Props = {
 };
 class WalletBalance extends React.PureComponent<Props> {
  state = {
    usdExchangeRate: 0,
  };
  componentDidMount() {
    Lbryio.getExchangeRates().then(rates => {
      if (!isNaN(rates.LBC_USD)) {
        this.setState({ usdExchangeRate: rates.LBC_USD });
      }
    });
  }
  render() {
    const { balance } = this.props;
    return (
@ -33,13 +21,6 @@ class WalletBalance extends React.PureComponent<Props> {
        <Text style={walletStyle.balance}>
          {(balance || balance === 0) && formatCredits(parseFloat(balance), 2) + ' LBC'}
        </Text>
        <Text style={walletStyle.usdBalance}>
          {this.state.usdExchangeRate > 0 && (
            <Text>
              &asymp;{formatUsd(isNaN(balance) ? 0 : parseFloat(balance) * parseFloat(this.state.usdExchangeRate))}
            </Text>
          )}
        </Text>
      </View>
    );
  }
--- a/src/component/walletBalanceExtra/index.js
+++ b/src/component/walletBalanceExtra/index.js
@ -1,14 +0,0 @@
 import { connect } from 'react-redux';
 import { selectClaimsBalance, selectSupportsBalance, selectTipsBalance } from 'lbry-redux';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import WalletBalanceExtra from './view';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 const select = state => ({
  claimsBalance: selectClaimsBalance(state) || 0,
  deviceWalletSynced: makeSelectClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED)(state),
  supportsBalance: selectSupportsBalance(state) || 0,
  tipsBalance: selectTipsBalance(state) || 0,
 });
 export default connect(select, null)(WalletBalanceExtra);
--- a/src/component/walletBalanceExtra/view.js
+++ b/src/component/walletBalanceExtra/view.js
@ -1,115 +0,0 @@
 // @flow
 import React from 'react';
 import { Text, View } from 'react-native';
 import { formatCredits } from 'lbry-redux';
 import { Lbryio } from 'lbryinc';
 import { formatUsd } from 'utils/helper';
 import Colors from 'styles/colors';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
 import walletStyle from 'styles/wallet';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 type Props = {
  claimsBalance: number,
  supportsBalance: number,
  tipsBalance: number,
 };
 class WalletBalanceExtra extends React.PureComponent<Props> {
  state = {
    usdExchangeRate: 0,
  };
  componentDidMount() {
    Lbryio.getExchangeRates().then(rates => {
      if (!isNaN(rates.LBC_USD)) {
        this.setState({ usdExchangeRate: rates.LBC_USD });
      }
    });
  }
  render() {
    const { claimsBalance, deviceWalletSynced, navigation, supportsBalance, tipsBalance } = this.props;
    return (
      <View style={walletStyle.balanceExtra}>
        <View style={walletStyle.usdInfoCard}>
          <Text style={walletStyle.usdInfoText}>
            You can convert your credits to USD and withdraw the converted amount using an exchange.{' '}
            <Link
              style={walletStyle.usdConvertFaqLink}
              href={'https://lbry.com/faq/exchanges'}
              text={__('Learn more')}
            />
            .
          </Text>
          <Link
            style={walletStyle.usdConvertLink}
            href={'https://bittrex.com/Account/Register?referralCode=4M1-P30-BON'}
            text={__('Convert credits to USD on Bittrex')}
          />
        </View>
        <View style={walletStyle.balanceExtraCard}>
          <View style={walletStyle.walletExtraRow}>
            <View style={walletStyle.walletExtraCol}>
              <Icon style={walletStyle.walletExtraIcon} color={Colors.LbryGreen} name={'gift'} size={16} />
              <Text style={walletStyle.walletExtraCaption}>{__('You also have')}</Text>
              <View style={walletStyle.balanceRow}>
                <Text style={walletStyle.walletExtraBalance}>{formatCredits(parseFloat(tipsBalance), 2)}</Text>
                <Text style={walletStyle.walletExtraCurrency}>LBC</Text>
              </View>
              <Text style={walletStyle.usdWalletExtraBalance}>
                &asymp;{formatUsd(parseFloat(tipsBalance) * parseFloat(this.state.usdExchangeRate))}
              </Text>
              <Text style={walletStyle.text}>{__('in tips')}</Text>
              <Link
                style={walletStyle.earnTipsLink}
                onPress={() => {
                  navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISH });
                }}
                text={__('Earn more tips by uploading cool videos')}
              />
            </View>
            <View style={walletStyle.walletExtraCol}>
              <Icon style={walletStyle.walletExtraIcon} color={Colors.LbryGreen} name={'lock'} size={16} />
              <Text style={walletStyle.walletExtraCaption}>{__('You staked')}</Text>
              <View style={walletStyle.balanceRow}>
                <Text style={walletStyle.walletExtraBalance}>{formatCredits(parseFloat(claimsBalance), 2)}</Text>
                <Text style={walletStyle.walletExtraCurrency}>LBC</Text>
              </View>
              <Text style={walletStyle.text}>{__('in your publishes')}</Text>
              <View style={[walletStyle.balanceRow, walletStyle.walletExtraTopMargin]}>
                <Text style={walletStyle.walletExtraBalance}>{formatCredits(parseFloat(supportsBalance), 2)}</Text>
                <Text style={walletStyle.walletExtraCurrency}>LBC</Text>
              </View>
              <Text style={walletStyle.text}>{__('in your supports')}</Text>
            </View>
          </View>
        </View>
        <View style={walletStyle.syncDriverCustody}>
          <Text style={walletStyle.syncInfoText}>
            {deviceWalletSynced
              ? __('A backup of your wallet is synced with lbry.tv')
              : __('Your wallet is not currently synced with lbry.tv. You are responsible for backing up your wallet.')}
          </Text>
          <Link
            text={__('What does this mean?')}
            href={
              deviceWalletSynced
                ? 'https://lbry.com/faq/account-sync'
                : 'https://lbry.com/faq/how-to-backup-wallet#android'
            }
            style={walletStyle.syncInfoLink}
          />
        </View>
      </View>
    );
  }
 }
 export default WalletBalanceExtra;
--- a/src/component/walletRewardsDriver/index.js
+++ b/src/component/walletRewardsDriver/index.js
@ -1,10 +1,9 @@
 import { connect } from 'react-redux';
-import { selectUnclaimedRewardValue, selectUser } from 'lbryinc';
+import { selectUnclaimedRewardValue } from 'lbryinc';
 import WalletRewardsDriver from './view';
 const select = state => ({
  unclaimedRewardAmount: selectUnclaimedRewardValue(state),
  user: selectUser(state),
 });
 export default connect(select)(WalletRewardsDriver);
--- a/src/component/walletRewardsDriver/view.js
+++ b/src/component/walletRewardsDriver/view.js
@ -5,31 +5,15 @@ import walletStyle from 'styles/wallet';
 class WalletRewardsDriver extends React.PureComponent<Props> {
  render() {
-    const { navigation, unclaimedRewardAmount, user } = this.props;
+    const { navigation, unclaimedRewardAmount } = this.props;
    const signedIn = user && user.has_verified_email;
    return (
      <TouchableOpacity style={walletStyle.rewardDriverCard} onPress={() => navigation.navigate('Rewards')}>
        <Icon name="award" size={16} style={walletStyle.rewardIcon} />
-        {signedIn && (
+        <Text style={walletStyle.rewardDriverText}>
-          <Text style={walletStyle.rewardDriverText}>
+          Get {unclaimedRewardAmount > 0 ? unclaimedRewardAmount : ''} free credit
-            {unclaimedRewardAmount === 0 && __('Free credits available in rewards.')}
+          {unclaimedRewardAmount === 1 ? '' : 's'} after creating an account.
-            {unclaimedRewardAmount === 1 &&
+        </Text>
              __('%amount% free credit available in rewards.', { amount: unclaimedRewardAmount })}
            {unclaimedRewardAmount > 1 &&
              __('%amount% free credits available in rewards.', { amount: unclaimedRewardAmount })}{' '}
            {__('Tap to learn more.')}
          </Text>
        )}
        {!signedIn && (
          <Text style={walletStyle.rewardDriverText}>
            {unclaimedRewardAmount === 1 &&
              __('Get %amount% free credit after creating an account.', { amount: unclaimedRewardAmount })}
            {unclaimedRewardAmount !== 1 &&
              __('Get %amount% free credits after creating an account.', { amount: unclaimedRewardAmount })}
          </Text>
        )}
      </TouchableOpacity>
    );
  }
--- a/src/component/walletSend/view.js
+++ b/src/component/walletSend/view.js
@ -1,10 +1,9 @@
 // @flow
 import React from 'react';
-import { formatCredits, regexAddress } from 'lbry-redux';
+import { regexAddress } from 'lbry-redux';
 import { Alert, Clipboard, TextInput, Text, View } from 'react-native';
 import Button from 'component/button';
 import Colors from 'styles/colors';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import walletStyle from 'styles/wallet';
 type DraftTransaction = {
@ -25,7 +24,6 @@ class WalletSend extends React.PureComponent<Props> {
    address: null,
    addressChanged: false,
    addressValid: false,
    creditsInputFocused: false,
  };
  componentWillUpdate(nextProps) {
@ -38,10 +36,9 @@ class WalletSend extends React.PureComponent<Props> {
  handleSend = () => {
    const { balance, sendToAddress, notify } = this.props;
    const { address, amount } = this.state;
-    if (address && (!regexAddress.test(address) || address.substring(0, 1) === 'r')) {
+    if (address && !regexAddress.test(address)) {
      notify({
        message: __('The recipient address is not a valid LBRY address.'),
        isError: true,
      });
      return;
    }
@ -49,7 +46,6 @@ class WalletSend extends React.PureComponent<Props> {
    if (amount > balance) {
      notify({
        message: __('Insufficient credits'),
        isError: true,
      });
      return;
    }
@ -74,7 +70,6 @@ class WalletSend extends React.PureComponent<Props> {
      const { notify } = this.props;
      notify({
        message: __('The recipient address is not a valid LBRY address.'),
        isError: true,
      });
    }
  };
@ -100,10 +95,9 @@ class WalletSend extends React.PureComponent<Props> {
              this.setState({
                address: value,
                addressChanged: true,
-                addressValid: value.trim().length === 0 || (regexAddress.test(value) && !value.startsWith('r')),
+                addressValid: value.trim().length === 0 || regexAddress.test(value),
              })
            }
            numberOfLines={1}
            onBlur={this.handleAddressInputBlur}
            onSubmitEditing={this.handleAddressInputSubmit}
            placeholder={'bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs'}
@ -124,8 +118,6 @@ class WalletSend extends React.PureComponent<Props> {
            <TextInput
              ref={ref => (this.amountInput = ref)}
              onChangeText={value => this.setState({ amount: value })}
              onFocus={() => this.setState({ creditsInputFocused: true })}
              onBlur={() => this.setState({ creditsInputFocused: false })}
              keyboardType={'numeric'}
              placeholder={'0'}
              underlineColorAndroid={Colors.NextLbryGreen}
@ -133,15 +125,9 @@ class WalletSend extends React.PureComponent<Props> {
              style={[walletStyle.input, walletStyle.amountInput]}
            />
            <Text style={[walletStyle.text, walletStyle.currency]}>LBC</Text>
            <View style={walletStyle.balanceFocus}>
              {this.state.creditsInputFocused && <Icon name="coins" size={12} />}
              {this.state.creditsInputFocused && (
                <Text style={walletStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
              )}
            </View>
          </View>
          <Button
-            text={__('Send')}
+            text={'Send'}
            style={[walletStyle.button, walletStyle.sendButton]}
            disabled={!canSend}
            onPress={this.handleSend}
--- a/src/component/walletSignIn/view.js
+++ b/src/component/walletSignIn/view.js
@ -29,12 +29,14 @@ class WalletSignIn extends React.Component {
    return (
      <View style={walletStyle.signInContainer}>
        <View style={walletStyle.signInSummaryRow}>
-          <Text style={walletStyle.signInTitle}>{__('Account Recommended')}</Text>
+          <Text style={walletStyle.signInTitle}>Account Recommended</Text>
        </View>
        <View style={walletStyle.onboarding}>
          <Text style={walletStyle.onboardingText}>
-            {__('A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.')}
+            {__(
              'An account with LBRY Inc. allows you to earn rewards, backup your wallet, and keep everything synced.'
            )}
            {'\n\n'}
            {__('Without an account, you assume all responsibility for securing your wallet and LBRY data.')}
          </Text>
--- a/src/component/walletSyncDriver/view.js
+++ b/src/component/walletSyncDriver/view.js
@ -27,7 +27,7 @@ class WalletSyncDriver extends React.PureComponent<Props> {
            },
          },
        ],
-        { cancelable: true },
+        { cancelable: true }
      );
    }
  };
--- a/src/constants.js
+++ b/src/constants.js
@ -44,10 +44,6 @@ const Constants = {
  SETTING_BACKUP_DISMISSED: 'backupDismissed',
  SETTING_REWARDS_NOT_INTERESTED: 'rewardsNotInterested',
  SETTING_DEVICE_WALLET_SYNCED: 'deviceWalletSynced',
  SETTING_DHT_ENABLED: 'dhtEnabled',
  SETTING_NEW_ANDROID_REWARD_CLAIMED: 'newAndroidRewardClaimed',
  ACTION_SDK_READY: 'SDK_READY',
  ACTION_DELETE_COMPLETED_BLOBS: 'DELETE_COMPLETED_BLOBS',
  ACTION_FIRST_RUN_PAGE_CHANGED: 'FIRST_RUN_PAGE_CHANGED',
@ -68,8 +64,6 @@ const Constants = {
  ACTION_CLEAR_PUBLISH_FORM_STATE: 'CLEAR_PUBLISH_FORM_STATE',
  ACTION_CLEAR_CHANNEL_FORM_STATE: 'CLEAR_CHANNEL_FORM_STATE',
  ACTION_SET_EXPLICIT_NAVIGATE_BACK: 'SET_EXPLICIT_NAVIGATE_BACK',
  ACTION_FULLSCREEN_MODE_TOGGLED: 'FULLSCREEN_MODE_TOGGLED',
  ORIENTATION_HORIZONTAL: 'horizontal',
@ -96,14 +90,11 @@ const Constants = {
  DRAWER_ROUTE_TAG: 'Tag',
  DRAWER_ROUTE_CHANNEL_CREATOR: 'ChannelCreator',
  DRAWER_ROUTE_CHANNEL_CREATOR_FORM: 'ChannnelCreatorForm',
  DRAWER_ROUTE_INVITES: 'Invites',
  DRAWER_ROUTE_LITE_FILE: 'LiteFile',
  FULL_ROUTE_NAME_DISCOVER: 'DiscoverStack',
  FULL_ROUTE_NAME_WALLET: 'WalletStack',
  ROUTE_FILE: 'File',
  DRAWER_ROUTE_FILE_VIEW: 'FileView',
  ITEM_CREATE_A_CHANNEL: 'Create a channel...',
  ITEM_ANONYMOUS: 'Publish anonymously',
@ -142,7 +133,7 @@ const Constants = {
  ORDER_BY_EFFECTIVE_AMOUNT: 'effective_amount',
-  DEFAULT_PAGE_SIZE: 20,
+  DEFAULT_PAGE_SIZE: 10,
  ALL_PLACEHOLDER: '_all',
@ -150,7 +141,7 @@ const Constants = {
  TRUE_STRING: 'true',
-  MINIMUM_TRANSACTION_BALANCE: 0.01,
+  MINIMUM_TRANSACTION_BALANCE: 0.1,
  SHARE_BASE_URL: 'https://open.lbry.com',
 };
@ -173,12 +164,7 @@ export const DrawerRoutes = [
  Constants.DRAWER_ROUTE_SEARCH,
  Constants.DRAWER_ROUTE_TRANSACTION_HISTORY,
  Constants.DRAWER_ROUTE_CHANNEL_CREATOR,
  Constants.DRAWER_ROUTE_INVITES,
 ];
 // sub-pages for main routes
-export const InnerDrawerRoutes = [
+export const InnerDrawerRoutes = [Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM, Constants.DRAWER_ROUTE_PUBLISH_FORM];
  Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM,
  Constants.DRAWER_ROUTE_PUBLISH_FORM,
  Constants.DRAWER_ROUTE_FILE_VIEW,
 ];
--- a/src/i18n.js
+++ b/src/i18n.js
@ -52,9 +52,8 @@ function checkMessageAndSave(message, messagesFilePath) {
        ); */
      })
      .catch(err => {
-        if (err && !isProduction) {
+        if (err) {
-          // only do this when not in production
+          throw err;
          console.error(err);
        }
      });
  }
@ -75,6 +74,6 @@ export function __(message, tokens) {
  }
  return translatedMessage.replace(/%([^%]+)%/g, function($1, $2) {
-    return tokens.hasOwnProperty($2) ? tokens[$2] : $2;
+    return tokens[$2] || $2;
  });
 }
--- a/src/index.js
+++ b/src/index.js
@ -27,7 +27,6 @@ import {
  homepageReducer,
  rewardsReducer,
  selectUserVerifiedEmail,
  statsReducer,
  subscriptionsReducer,
  syncReducer,
  userReducer,
@ -42,7 +41,6 @@ import AppWithNavigationState, {
 } from 'component/AppNavigator';
 import { REHYDRATE, PURGE, persistCombineReducers, persistStore } from 'redux-persist';
 import { __ } from 'i18n';
 import reactotron from '../reactotron';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import getStoredStateMigrateV4 from 'redux-persist/lib/integration/getStoredStateMigrateV4';
 import FilesystemStorage from 'redux-persist-filesystem-storage';
@ -55,14 +53,10 @@ import settingsReducer from 'redux/reducers/settings';
 import thunk from 'redux-thunk';
 window.__ = __;
 if (!NativeModules.UtilityModule.dhtEnabled) {
  Lbry.alternateConnectionString = 'https://api.lbry.tv/api/v1/proxy';
  Lbry.methodsUsingAlternateConnectionString = ['claim_search', 'resolve'];
 }
 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);
@ -99,7 +93,6 @@ const compressor = createCompressor();
 const authFilter = createFilter('auth', ['authToken']);
 const blockedFilter = createFilter('blocked', ['blockedChannels']);
 const contentFilter = createFilter('content', ['positions']);
 const drawerFilter = createFilter('drawer', ['lastRouteInStack']);
 const saveClaimsFilter = createFilter('claims', ['claimsByUri']);
 const subscriptionsFilter = createFilter('subscriptions', ['enabledChannelNotifications', 'subscriptions', 'latest']);
 const settingsFilter = createFilter('settings', ['clientSettings']);
@ -107,13 +100,12 @@ const tagsFilter = createFilter('tags', ['followedTags']);
 const walletFilter = createFilter('wallet', ['receiveAddress']);
 const v4PersistOptions = {
-  whitelist: ['auth', 'blocked', 'claims', 'drawer', 'content', 'subscriptions', 'settings', 'tags', 'wallet'],
+  whitelist: ['auth', 'blocked', 'claims', 'content', 'subscriptions', 'settings', 'tags', 'wallet'],
  // Order is important. Needs to be compressed last or other transforms can't
  // read the data
  transforms: [
    authFilter,
    blockedFilter,
    drawerFilter,
    saveClaimsFilter,
    subscriptionsFilter,
    settingsFilter,
@ -148,7 +140,6 @@ const reducers = persistCombineReducers(persistOptions, {
  rewards: rewardsReducer,
  settings: settingsReducer,
  search: searchReducer,
  stats: statsReducer,
  subscriptions: subscriptionsReducer,
  sync: syncReducer,
  tags: tagsReducer,
@ -186,7 +177,7 @@ const sharedStateCallback = ({ dispatch, getState }) => {
  const emailVerified = selectUserVerifiedEmail(state);
  if (syncEnabled && emailVerified) {
    NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password =>
-      dispatch(doGetSync(password)),
+      dispatch(doGetSync(password))
    );
  }
 };
@ -202,13 +193,13 @@ const composeEnhancers = compose;
 const store = createStore(
  enableBatching(reducers),
  {}, // initial state,
-  composeEnhancers(applyMiddleware(...middleware), reactotron.createEnhancer()),
+  composeEnhancers(applyMiddleware(...middleware))
 );
 window.store = store;
-const persistor = persistStore(store, null, err => {
+const persistor = persistStore(store, persistOptions, err => {
  if (err) {
-    // console.log('Unable to load saved SETTINGS');
+    console.log('Unable to load saved SETTINGS');
  }
 });
 window.persistor = persistor;
--- a/src/page/about/view.js
+++ b/src/page/about/view.js
@ -10,7 +10,6 @@ import aboutStyle from 'styles/about';
 class AboutPage extends React.PureComponent {
  state = {
    appVersion: null,
    firebaseToken: null,
    lbryId: null,
    versionInfo: null,
  };
@ -46,12 +45,11 @@ class AboutPage extends React.PureComponent {
    setPlayerVisible();
    NativeModules.Firebase.setCurrentScreen('About').then(result => {
-      NativeModules.VersionInfo.getAppVersion().then(version => {
+      if (NativeModules.VersionInfo) {
-        this.setState({ appVersion: version });
+        NativeModules.VersionInfo.getAppVersion().then(version => {
-      });
+          this.setState({ appVersion: version });
-      NativeModules.Firebase.getMessagingToken().then(firebaseToken => {
+        });
-        this.setState({ firebaseToken });
+      }
      });
      Lbry.version().then(info => {
        this.setState({
          versionInfo: info,
@ -76,10 +74,10 @@ class AboutPage extends React.PureComponent {
      <View style={aboutStyle.container}>
        <PageHeader title={'About LBRY'} onBackPressed={() => navigateBack(navigation, drawerStack, popDrawerStack)} />
        <ScrollView style={aboutStyle.scrollContainer}>
-          <Text style={aboutStyle.title}>{__('Content Freedom')}</Text>
+          <Text style={aboutStyle.title}>Content Freedom</Text>
          <Text style={aboutStyle.paragraph}>
            {__(
-              'LBRY is a free, open, and community-run digital marketplace. It is a decentralized peer-to-peer content distribution platform for creators to upload and share content, and earn LBRY credits for their effort. Users will be able to find a wide selection of videos, music, ebooks and other digital content they are interested in.',
+              'LBRY is a free, open, and community-run digital marketplace. It is a decentralized peer-to-peer content distribution platform for creators to upload and share content, and earn LBRY credits for their effort. Users will be able to find a wide selection of videos, music, ebooks and other digital content they are interested in.'
            )}
          </Text>
          <View style={aboutStyle.links}>
@ -87,10 +85,10 @@ class AboutPage extends React.PureComponent {
            <Link style={aboutStyle.link} href="https://lbry.com/faq/android-basics" text={__('Android App Basics')} />
            <Link style={aboutStyle.link} href="https://lbry.com/faq" text={__('Frequently Asked Questions')} />
          </View>
-          <Text style={aboutStyle.socialTitle}>{__('Get Social')}</Text>
+          <Text style={aboutStyle.socialTitle}>Get Social</Text>
          <Text style={aboutStyle.paragraph}>
            {__(
-              'You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.',
+              'You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.'
            )}
          </Text>
          <View style={aboutStyle.links}>
@ -166,15 +164,6 @@ class AboutPage extends React.PureComponent {
            </View>
          </View>
          <View style={aboutStyle.row}>
            <View style={aboutStyle.col}>
              <Text style={aboutStyle.text}>{__('Firebase Token')}</Text>
              <Text selectable style={aboutStyle.lineValueText}>
                {this.state.firebaseToken ? this.state.firebaseToken : loading}
              </Text>
            </View>
          </View>
          <View style={aboutStyle.row}>
            <View style={aboutStyle.col}>
              <Text style={aboutStyle.text}>{__('Logs')}</Text>
--- a/src/page/channel/index.js
+++ b/src/page/channel/index.js
@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 import { doAbandonClaim, doFetchChannelListMine, makeSelectClaimForUri, selectMyChannelClaims } from 'lbry-redux';
 import { doFetchSubCount, makeSelectSubCountForUri } from 'lbryinc';
 import { doPopDrawerStack } from 'redux/actions/drawer';
 import { doSetSortByItem, doSetTimeItem } from 'redux/actions/settings';
 import { selectDrawerStack } from 'redux/selectors/drawer';
@ -12,14 +11,12 @@ const select = (state, props) => ({
  claim: makeSelectClaimForUri(props.uri)(state),
  drawerStack: selectDrawerStack(state),
  sortByItem: selectSortByItem(state),
  subCount: makeSelectSubCountForUri(props.uri)(state),
  timeItem: selectTimeItem(state),
 });
 const perform = dispatch => ({
  abandonClaim: (txid, nout) => dispatch(doAbandonClaim(txid, nout)),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
  fetchSubCount: claimId => dispatch(doFetchSubCount(claimId)),
  popDrawerStack: () => dispatch(doPopDrawerStack()),
  setSortByItem: item => dispatch(doSetSortByItem(item)),
  setTimeItem: item => dispatch(doSetTimeItem(item)),
@ -27,5 +24,5 @@ const perform = dispatch => ({
 export default connect(
  select,
-  perform,
+  perform
 )(ChannelPage);
--- a/src/page/channel/view.js
+++ b/src/page/channel/view.js
@ -23,7 +23,6 @@ import EmptyStateView from 'component/emptyStateView';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
 import ModalPicker from 'component/modalPicker';
 import ModalTipView from 'component/modalTipView';
 import PageHeader from 'component/pageHeader';
 import SubscribeButton from 'component/subscribeButton';
 import SubscribeNotificationButton from 'component/subscribeNotificationButton';
@ -37,10 +36,8 @@ class ChannelPage extends React.PureComponent {
    autoStyle: null,
    showSortPicker: false,
    showTimePicker: false,
    showTipView: false,
    orderBy: ['release_time'], // sort by new by default
    activeTab: Constants.CONTENT_TAB,
    currentSortByItem: Constants.CLAIM_SEARCH_SORT_BY_ITEMS[1], // should always default to sorting channel pages by new
  };
  componentWillMount() {
@ -51,17 +48,16 @@ class ChannelPage extends React.PureComponent {
  }
  componentDidMount() {
-    const { claim, fetchChannelListMine, fetchSubCount } = this.props;
+    const { fetchChannelListMine, setSortByItem } = this.props;
    NativeModules.Firebase.setCurrentScreen('Channel');
    setSortByItem(Constants.CLAIM_SEARCH_SORT_BY_ITEMS[1]); // sort by newest first
    fetchChannelListMine();
    if (claim) {
      fetchSubCount(claim.claim_id);
    }
  }
  handleSortByItemSelected = item => {
-    // sort by specific only to this component state
+    const { setSortByItem } = this.props;
-    this.setState({ currentSortByItem: item, orderBy: getOrderBy(item), showSortPicker: false });
+    setSortByItem(item);
    this.setState({ orderBy: getOrderBy(item), showSortPicker: false });
  };
  handleTimeItemSelected = item => {
@ -71,18 +67,17 @@ class ChannelPage extends React.PureComponent {
  };
  listHeader = () => {
-    const { timeItem } = this.props;
+    const { sortByItem, timeItem } = this.props;
    const { currentSortByItem } = this.state;
    return (
      <View style={channelPageStyle.listHeader}>
        <View style={discoverStyle.pickerRow}>
          <View style={discoverStyle.leftPickerRow}>
            <TouchableOpacity style={discoverStyle.tagSortBy} onPress={() => this.setState({ showSortPicker: true })}>
-              <Text style={discoverStyle.tagSortText}>{__(currentSortByItem.label.split(' ')[0])}</Text>
+              <Text style={discoverStyle.tagSortText}>{__(sortByItem.label.split(' ')[0])}</Text>
              <Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} />
            </TouchableOpacity>
-            {Constants.SORT_BY_TOP === currentSortByItem.name && (
+            {Constants.SORT_BY_TOP === sortByItem.name && (
              <TouchableOpacity style={discoverStyle.tagTime} onPress={() => this.setState({ showTimePicker: true })}>
                <Text style={discoverStyle.tagSortText}>{__(timeItem.label)}</Text>
                <Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} />
@ -173,14 +168,9 @@ class ChannelPage extends React.PureComponent {
      const { permanent_url: permanentUrl } = claim;
      navigation.navigate({
        routeName: Constants.DRAWER_ROUTE_CHANNEL_CREATOR,
-        params: { editChannelUrl: permanentUrl, returnUrl: permanentUrl },
+        params: { editChannelUrl: permanentUrl },
      });
    }
    this.onEditPressed = null;
  };
  onTipPressed = () => {
    this.setState({ showTipView: true });
  };
  onSharePressed = () => {
@ -211,15 +201,15 @@ class ChannelPage extends React.PureComponent {
            },
          },
        ],
-        { cancelable: true },
+        { cancelable: true }
      );
    }
  };
  render() {
-    const { channels, claim, navigation, uri, drawerStack, popDrawerStack, subCount, timeItem } = this.props;
+    const { channels, claim, navigation, uri, drawerStack, popDrawerStack, sortByItem, timeItem } = this.props;
    const { name, permanent_url: permanentUrl } = claim;
-    const { autoStyle, currentSortByItem, showSortPicker, showTimePicker, showTipView } = this.state;
+    const { autoStyle, showSortPicker, showTimePicker } = this.state;
    const ownedChannel = channels ? channels.map(channel => channel.permanent_url).includes(permanentUrl) : false;
    let thumbnailUrl,
@ -262,10 +252,6 @@ class ChannelPage extends React.PureComponent {
            <View style={channelPageStyle.channelHeader}>
              <Text style={channelPageStyle.channelName}>{title && title.trim().length > 0 ? title : name}</Text>
              <Text style={[channelPageStyle.followerCount, subCount >= 1 ? channelPageStyle.followerCountBg : null]}>
                {subCount === 1 && __('%follower% follower', { follower: subCount })}
                {subCount > 1 && __('%follower% followers', { follower: subCount })}
              </Text>
            </View>
            <View style={[channelPageStyle.avatarImageContainer, autoStyle]}>
@ -285,7 +271,7 @@ class ChannelPage extends React.PureComponent {
                  style={channelPageStyle.actionButton}
                  theme={'light'}
                  icon={'edit'}
-                  text={__('Edit')}
+                  text={'Edit'}
                  onPress={this.onEditPressed}
                />
              )}
@ -294,7 +280,7 @@ class ChannelPage extends React.PureComponent {
                  style={[channelPageStyle.actionButton, channelPageStyle.deleteButton]}
                  theme={'light'}
                  icon={'trash-alt'}
-                  text={__('Delete')}
+                  text={'Delete'}
                  onPress={this.onDeletePressed}
                />
              )}
@ -304,12 +290,6 @@ class ChannelPage extends React.PureComponent {
                icon={'share-alt'}
                onPress={this.onSharePressed}
              />
              <Button
                style={[channelPageStyle.actionButton, channelPageStyle.tipButton]}
                theme={'light'}
                icon={'gift'}
                onPress={this.onTipPressed}
              />
              {!ownedChannel && <SubscribeButton style={channelPageStyle.subscribeButton} uri={fullUri} name={name} />}
              {false && !ownedChannel && (
                <SubscribeNotificationButton
@ -326,14 +306,14 @@ class ChannelPage extends React.PureComponent {
              style={channelPageStyle.tab}
              onPress={() => this.setState({ activeTab: Constants.CONTENT_TAB })}
            >
-              <Text style={channelPageStyle.tabTitle}>{__('CONTENT')}</Text>
+              <Text style={channelPageStyle.tabTitle}>CONTENT</Text>
              {Constants.CONTENT_TAB === this.state.activeTab && <View style={channelPageStyle.activeTabHint} />}
            </TouchableOpacity>
            <TouchableOpacity
              style={channelPageStyle.tab}
              onPress={() => this.setState({ activeTab: Constants.ABOUT_TAB })}
            >
-              <Text style={channelPageStyle.tabTitle}>{__('ABOUT')}</Text>
+              <Text style={channelPageStyle.tabTitle}>ABOUT</Text>
              {Constants.ABOUT_TAB === this.state.activeTab && <View style={channelPageStyle.activeTabHint} />}
            </TouchableOpacity>
          </View>
@ -347,7 +327,7 @@ class ChannelPage extends React.PureComponent {
            title={__('Sort content by')}
            onOverlayPress={() => this.setState({ showSortPicker: false })}
            onItemSelected={this.handleSortByItemSelected}
-            selectedItem={currentSortByItem}
+            selectedItem={sortByItem}
            items={Constants.CLAIM_SEARCH_SORT_BY_ITEMS}
          />
        )}
@ -360,16 +340,6 @@ class ChannelPage extends React.PureComponent {
            items={Constants.CLAIM_SEARCH_TIME_ITEMS}
          />
        )}
        {showTipView && (
          <ModalTipView
            claim={claim}
            channelName={claim.name}
            contentName={title}
            onCancelPress={() => this.setState({ showTipView: false })}
            onOverlayPress={() => this.setState({ showTipView: false })}
            onSendTipSuccessful={() => this.setState({ showTipView: false })}
          />
        )}
      </View>
    );
  }
--- a/src/page/channelCreator/index.js
+++ b/src/page/channelCreator/index.js
@ -13,16 +13,10 @@ import {
  doToast,
 } from 'lbry-redux';
 import { doGetSync } from 'lbryinc';
-import {
+import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
  doPushDrawerStack,
  doPopDrawerStack,
  doSetPlayerVisible,
  doSetExplicitNavigateBack,
 } from 'redux/actions/drawer';
 import { doUpdateChannelFormState, doClearChannelFormState } from 'redux/actions/form';
 import { selectDrawerStack } from 'redux/selectors/drawer';
 import { selectChannelFormState, selectHasChannelFormState } from 'redux/selectors/form';
 import { selectSdkReady } from 'redux/selectors/settings';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import ChannelCreator from './view';
@ -34,7 +28,6 @@ const select = state => ({
  fetchingChannels: selectFetchingMyChannels(state),
  balance: selectBalance(state),
  hasFormState: selectHasChannelFormState(state),
  sdkReady: selectSdkReady(state),
  updatingChannel: selectUpdatingChannel(state),
  updateChannelError: selectUpdateChannelError(state),
 });
@ -44,14 +37,16 @@ const perform = dispatch => ({
  notify: data => dispatch(doToast(data)),
  clearChannelFormState: () => dispatch(doClearChannelFormState()),
  createChannel: (name, amount, optionalParams) => dispatch(doCreateChannel(name, amount, optionalParams)),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
  getSync: (password, callback) => dispatch(doGetSync(password, callback)),
  updateChannel: params => dispatch(doUpdateChannel(params)),
  updateChannelFormState: data => dispatch(doUpdateChannelFormState(data)),
  pushDrawerStack: (routeName, params) => dispatch(doPushDrawerStack(routeName, params)),
  popDrawerStack: () => dispatch(doPopDrawerStack()),
  setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
  setExplicitNavigateBack: flag => dispatch(doSetExplicitNavigateBack(flag)),
 });
-export default connect(select, perform)(ChannelCreator);
+export default connect(
  select,
  perform
 )(ChannelCreator);
--- a/src/page/channelCreator/view.js
+++ b/src/page/channelCreator/view.js
@ -1,5 +1,5 @@
 import React from 'react';
-import { CLAIM_VALUES, Lbry, formatCredits, isNameValid, regexInvalidURI } from 'lbry-redux';
+import { CLAIM_VALUES, isNameValid, regexInvalidURI } from 'lbry-redux';
 import {
  ActivityIndicator,
  Alert,
@ -14,14 +14,13 @@ import {
  TouchableOpacity,
  View,
 } from 'react-native';
-import { navigateBack, navigateToUri, logPublish, uploadImageAsset } from 'utils/helper';
+import { navigateToUri, logPublish, uploadImageAsset } from 'utils/helper';
 import Button from 'component/button';
 import ChannelIconItem from 'component/channelIconItem';
 import ChannelRewardsDriver from 'component/channelRewardsDriver';
 import Colors from 'styles/colors';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import EmptyStateView from 'component/emptyStateView';
 import FastImage from 'react-native-fast-image';
 import FloatingWalletBalance from 'component/floatingWalletBalance';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
@ -37,17 +36,15 @@ export default class ChannelCreator extends React.PureComponent {
  state = {
    autoStyle: null,
    returnUrl: null,
    canSave: true,
    claimId: null,
    creditsInputFocused: false,
    currentSelectedValue: Constants.ITEM_ANONYMOUS,
    currentPhase: null,
    displayName: null,
    channelNameUserEdited: false,
    newChannelTitle: '',
    newChannelName: '',
-    newChannelBid: 0.01,
+    newChannelBid: 0.1,
    addingChannel: false,
    creatingChannel: false,
    editChannelUrl: null,
@ -78,7 +75,6 @@ export default class ChannelCreator extends React.PureComponent {
    descriptionFocused: false,
    websiteFocused: false,
    emailFocused: false,
    hasReturnedBack: false,
  };
  didFocusListener;
@ -120,14 +116,7 @@ export default class ChannelCreator extends React.PureComponent {
  };
  componentWillReceiveProps(nextProps) {
-    const {
+    const { currentRoute: prevRoute, drawerStack: prevDrawerStack, notify } = this.props;
      currentRoute: prevRoute,
      drawerStack: prevDrawerStack,
      popDrawerStack,
      setPlayerVisible,
      navigation,
      notify,
    } = this.props;
    const { currentRoute, drawerStack, updatingChannel, updateChannelError } = nextProps;
    if (Constants.DRAWER_ROUTE_CHANNEL_CREATOR === currentRoute && currentRoute !== prevRoute) {
@ -151,11 +140,6 @@ export default class ChannelCreator extends React.PureComponent {
    ) {
      // navigated back from the form
      this.setState({ currentPhase: Constants.PHASE_LIST });
      if (!this.state.hasReturnedBack && this.state.returnUrl) {
        this.setState({ hasReturnedBack: true }, () => {
          navigateBack(navigation, drawerStack, popDrawerStack, setPlayerVisible);
        });
      }
    }
  }
@ -176,19 +160,20 @@ export default class ChannelCreator extends React.PureComponent {
    NativeModules.Firebase.setCurrentScreen('Channels').then(result => {
      pushDrawerStack(Constants.DRAWER_ROUTE_CHANNEL_CREATOR, navigation.state.params ? navigation.state.params : null);
      setPlayerVisible();
-      fetchChannelListMine();
+      if (!fetchingChannels) {
        fetchChannelListMine();
      }
      DeviceEventEmitter.addListener('onDocumentPickerFilePicked', this.onFilePicked);
      DeviceEventEmitter.addListener('onDocumentPickerCanceled', this.onPickerCanceled);
      let isEditMode = false;
      if (navigation.state.params) {
-        const { editChannelUrl, displayForm, returnUrl } = navigation.state.params;
+        const { editChannelUrl, displayForm } = navigation.state.params;
        if (editChannelUrl) {
          isEditMode = true;
          this.setState({ editChannelUrl, currentPhase: Constants.PHASE_CREATE });
        }
        this.setState({ returnUrl });
      }
      if (!isEditMode && hasFormState) {
@ -239,9 +224,9 @@ export default class ChannelCreator extends React.PureComponent {
            error => {
              notify({ message: `The image could not be uploaded: ${error}` });
              this.setState({ uploadingImage: false });
-            },
+            }
          );
-        },
+        }
      );
    } else {
      // could not determine the file path
@ -280,7 +265,7 @@ export default class ChannelCreator extends React.PureComponent {
  handleCreateCancel = () => {
    const { clearChannelFormState } = this.props;
    clearChannelFormState(); // explicitly clear state on cancel?
-    this.setState({ showCreateChannel: false, newChannelName: '', newChannelBid: 0.01 });
+    this.setState({ showCreateChannel: false, newChannelName: '', newChannelBid: 0.1 });
  };
  handlePickerValueChange = (itemValue, itemIndex) => {
@ -503,12 +488,12 @@ export default class ChannelCreator extends React.PureComponent {
          claim_id: claimId,
          amount: newChannelBid,
        },
-        optionalParams,
+        optionalParams
      );
      this.setState({ updateChannelStarted: true }, () => updateChannel(params));
    } else {
      this.setState({ creatingChannel: true }, () =>
-        createChannel(channelName, newChannelBid, optionalParams).then(success, failure),
+        createChannel(channelName, newChannelBid, optionalParams).then(success, failure)
      );
    }
  };
@ -541,7 +526,7 @@ export default class ChannelCreator extends React.PureComponent {
        avatarImagePickerOpen: false,
        coverImagePickerOpen: true,
      },
-      () => this.checkStoragePermission(),
+      () => NativeModules.UtilityModule.openDocumentPicker('image/*')
    );
  };
@ -557,7 +542,7 @@ export default class ChannelCreator extends React.PureComponent {
        avatarImagePickerOpen: true,
        coverImagePickerOpen: false,
      },
-      () => this.checkStoragePermission(),
+      () => NativeModules.UtilityModule.openDocumentPicker('image/*')
    );
  };
@ -589,7 +574,7 @@ export default class ChannelCreator extends React.PureComponent {
      channelNameUserEdited: false,
      newChannelTitle: '',
      newChannelName: '',
-      newChannelBid: 0.01,
+      newChannelBid: 0.1,
      addingChannel: false,
      creatingChannel: false,
      newChannelNameError: '',
@ -687,7 +672,7 @@ export default class ChannelCreator extends React.PureComponent {
          },
        },
      ],
-      { cancelable: true },
+      { cancelable: true }
    );
  };
@ -763,52 +748,8 @@ export default class ChannelCreator extends React.PureComponent {
    this.addOrRemoveItem(channel);
  };
  checkStoragePermission = () => {
    // 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 {
        NativeModules.UtilityModule.openDocumentPicker('image/*');
      }
    });
  };
  handleStoragePermissionGranted = () => {
    // update the configured download folder
    NativeModules.UtilityModule.getDownloadDirectory().then(downloadDirectory => {
      Lbry.settings_set({
        key: 'download_dir',
        value: downloadDirectory,
      })
        .then(() => {})
        .catch(() => {});
    });
    // open picker for images
    NativeModules.UtilityModule.openDocumentPicker('image/*');
  };
  handleStoragePermissionRefused = () => {
    const { notify } = this.props;
    notify({
      message: __('Pictures from your device cannot be used because the permission to read storage was not granted.'),
      isError: true,
    });
    this.setState({ avatarImagePickerOpen: false, coverImagePickerOpen: false });
  };
  render() {
-    const {
+    const { abandoningClaimIds, balance, fetchingChannels, updatingChannel, channels = [], navigation } = this.props;
      abandoningClaimIds,
      balance,
      fetchingChannels,
      sdkReady,
      updatingChannel,
      channels = [],
      navigation,
    } = this.props;
    const {
      autoStyle,
      autoStyles,
@ -832,19 +773,6 @@ export default class ChannelCreator extends React.PureComponent {
    const hasChannels = channels && channels.length > 0;
    if (!sdkReady) {
      return (
        <View style={channelCreatorStyle.container}>
          <UriBar navigation={navigation} />
          <EmptyStateView
            message={__(
              'The background service is still initializing. You can still explore and watch content during the initialization process.',
            )}
          />
        </View>
      );
    }
    return (
      <View style={channelCreatorStyle.container}>
        <UriBar
@ -902,9 +830,9 @@ export default class ChannelCreator extends React.PureComponent {
                >
                  <View style={[channelCreatorStyle.channelListAvatar, itemAutoStyle]}>
                    {itemThumbnailUrl && (
-                      <FastImage
+                      <Image
                        style={channelCreatorStyle.avatarImage}
-                        resizeMode={FastImage.resizeMode.cover}
+                        resizeMode={'cover'}
                        source={{ uri: itemThumbnailUrl }}
                      />
                    )}
@ -939,7 +867,7 @@ export default class ChannelCreator extends React.PureComponent {
                  style={channelCreatorStyle.coverImage}
                  resizeMode={'cover'}
                  source={
-                    !!coverImageUrl && coverImageUrl.trim().length > 0
+                    coverImageUrl !== null && coverImageUrl.trim().length > 0
                      ? { uri: coverImageUrl }
                      : require('../../assets/default_channel_cover.png')
                  }
@ -958,15 +886,14 @@ export default class ChannelCreator extends React.PureComponent {
              <View style={[channelCreatorStyle.avatarImageContainer, autoStyle]}>
                <TouchableOpacity style={channelCreatorStyle.avatarTouchArea} onPress={this.onAvatarImagePress}>
-                  {!!thumbnailUrl && thumbnailUrl.trim().length > 0 && (
+                  {thumbnailUrl !== null && thumbnailUrl.trim().length > 0 && (
                    <Image
                      style={channelCreatorStyle.avatarImage}
                      resizeMode={'cover'}
                      source={{ uri: thumbnailUrl }}
                    />
                  )}
-                  {(!!thumbnailUrl || (!!thumbnailUrl && thumbnailUrl.trim().length === 0)) &&
+                  {(thumbnailUrl === null || thumbnailUrl.trim().length === 0) && newChannelName.length > 0 && (
                    newChannelName.length > 0 && (
                    <Text style={channelIconStyle.autothumbCharacter}>
                      {newChannelName.substring(0, 1).toUpperCase()}
                    </Text>
@ -1033,19 +960,11 @@ export default class ChannelCreator extends React.PureComponent {
                  style={channelCreatorStyle.bidAmountInput}
                  value={String(newChannelBid)}
                  onChangeText={this.handleNewChannelBidChange}
                  onFocus={() => this.setState({ creditsInputFocused: true })}
                  onBlur={() => this.setState({ creditsInputFocused: false })}
                  placeholder={'0.00'}
                  keyboardType={'number-pad'}
                  underlineColorAndroid={Colors.NextLbryGreen}
                />
                <Text style={channelCreatorStyle.currency}>LBC</Text>
                <View style={channelCreatorStyle.balance}>
                  {this.state.creditsInputFocused && <Icon name="coins" size={12} />}
                  {this.state.creditsInputFocused && (
                    <Text style={channelCreatorStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
                  )}
                </View>
              </View>
              <Text style={channelCreatorStyle.helpText}>
                {__('This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.')}
--- a/src/page/discover/index.js
+++ b/src/page/discover/index.js
@ -11,9 +11,9 @@ import {
  selectSubscriptionClaims,
  selectUnreadSubscriptions,
 } from 'lbryinc';
-import { doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
+import { doPushDrawerStack } from 'redux/actions/drawer';
 import { doSetClientSetting, doSetSortByItem, doSetTimeItem } from 'redux/actions/settings';
-import { makeSelectClientSetting, selectSdkReady, selectSortByItem, selectTimeItem } from 'redux/selectors/settings';
+import { makeSelectClientSetting, selectSortByItem, selectTimeItem } from 'redux/selectors/settings';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import DiscoverPage from './view';
@ -27,7 +27,6 @@ const select = state => ({
  followedTags: selectFollowedTags(state),
  ratingReminderDisabled: makeSelectClientSetting(Constants.SETTING_RATING_REMINDER_DISABLED)(state),
  ratingReminderLastShown: makeSelectClientSetting(Constants.SETTING_RATING_REMINDER_LAST_SHOWN)(state),
  sdkReady: selectSdkReady(state),
  sortByItem: selectSortByItem(state),
  timeItem: selectTimeItem(state),
  unreadSubscriptions: selectUnreadSubscriptions(state),
@ -42,9 +41,11 @@ const perform = dispatch => ({
  pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_DISCOVER)),
  removeUnreadSubscriptions: () => dispatch(doRemoveUnreadSubscriptions()),
  setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
  setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
  setSortByItem: item => dispatch(doSetSortByItem(item)),
  setTimeItem: item => dispatch(doSetTimeItem(item)),
 });
-export default connect(select, perform)(DiscoverPage);
+export default connect(
  select,
  perform
 )(DiscoverPage);
--- a/src/page/discover/view.js
+++ b/src/page/discover/view.js
@ -23,7 +23,6 @@ import Icon from 'react-native-vector-icons/FontAwesome5';
 import Link from 'component/link';
 import ModalTagSelector from 'component/modalTagSelector';
 import ModalPicker from 'component/modalPicker';
 import SdkLoadingStatus from 'component/sdkLoadingStatus';
 import UriBar from 'component/uriBar';
 import _ from 'lodash';
@ -38,6 +37,29 @@ class DiscoverPage extends React.PureComponent {
  };
  componentDidMount() {
    // Track the total time taken if this is the first launch
    AsyncStorage.getItem('firstLaunchTime').then(startTime => {
      if (startTime !== null && !isNaN(parseInt(startTime, 10))) {
        // We don't need this value anymore once we've retrieved it
        AsyncStorage.removeItem('firstLaunchTime');
        // We know this is the first app launch because firstLaunchTime is set and it"s a valid number
        const start = parseInt(startTime, 10);
        const now = moment().unix();
        const delta = now - start;
        AsyncStorage.getItem('firstLaunchSuspended').then(suspended => {
          AsyncStorage.removeItem('firstLaunchSuspended');
          const appSuspended = suspended === 'true';
          if (NativeModules.Firebase) {
            NativeModules.Firebase.track('first_run_time', {
              total_seconds: delta,
              app_suspended: appSuspended,
            });
          }
        });
      }
    });
    const { sortByItem, fetchRewardedContent, fileList, followedTags } = this.props;
    this.buildTagCollection(followedTags);
@ -64,11 +86,11 @@ class DiscoverPage extends React.PureComponent {
  }
  onComponentFocused = () => {
-    const { pushDrawerStack, setPlayerVisible, currentRoute } = this.props;
+    const { fetchSubscriptions, pushDrawerStack } = this.props;
-    pushDrawerStack();
+    // pushDrawerStack();
-
+    NativeModules.Firebase.setCurrentScreen('Your tags').then(result => {
-    NativeModules.Firebase.setCurrentScreen('Your tags');
+      fetchSubscriptions();
-    setPlayerVisible();
+    });
  };
  handleSortByItemSelected = item => {
@ -101,6 +123,46 @@ class DiscoverPage extends React.PureComponent {
    return null;
  };
  componentDidUpdate(prevProps, prevState) {
    const { unreadSubscriptions, enabledChannelNotifications } = this.props;
    const utility = NativeModules.UtilityModule;
    const hasUnread =
      prevProps.unreadSubscriptions &&
      prevProps.unreadSubscriptions.length !== unreadSubscriptions.length &&
      unreadSubscriptions.length > 0;
    if (hasUnread) {
      unreadSubscriptions.map(({ channel, uris }) => {
        const { claimName: channelName } = parseURI(channel);
        // check if notifications are enabled for the channel
        if (enabledChannelNotifications.includes(channelName)) {
          uris.forEach(uri => {
            Lbry.resolve({ urls: uri }).then(result => {
              const sub = result[uri];
              if (sub && sub.value) {
                const { source, title, thumbnail } = sub.value;
                const isPlayable =
                  source && source.media_type && ['audio', 'video'].includes(source.media_type.substring(0, 5));
                if (title) {
                  utility.showNotificationForContent(
                    uri,
                    title,
                    channelName,
                    thumbnail ? thumbnail.url : null,
                    isPlayable
                  );
                }
              }
            });
          });
        }
      });
    }
  }
  showRatingReminder = () => {
    const { ratingReminderDisabled, ratingReminderLastShown, setClientSetting } = this.props;
@ -115,7 +177,7 @@ class DiscoverPage extends React.PureComponent {
            Alert.alert(
              __('Enjoying LBRY?'),
              __(
-                'Are you enjoying your experience with the LBRY app? You can leave a review for us on the Play Store.',
+                'Are you enjoying your experience with the LBRY app? You can leave a review for us on the Play Store.'
              ),
              [
                {
@ -131,7 +193,7 @@ class DiscoverPage extends React.PureComponent {
                  },
                },
              ],
-              { cancelable: false },
+              { cancelable: false }
            );
          }
        }
@ -269,28 +331,26 @@ class DiscoverPage extends React.PureComponent {
  );
  render() {
-    const { currentRoute, navigation, sdkReady, sortByItem, timeItem } = this.props;
+    const { navigation, sortByItem, timeItem } = this.props;
-    const { showModalTagSelector, showSortPicker, showTimePicker } = this.state;
+    const { orderBy, showModalTagSelector, showSortPicker, showTimePicker } = this.state;
    return (
      <View style={discoverStyle.container}>
        <UriBar navigation={navigation} belowOverlay={showModalTagSelector} />
-        {currentRoute !== Constants.ROUTE_FILE && currentRoute !== Constants.DRAWER_ROUTE_FILE_VIEW && (
+        <SectionList
-          <SectionList
+          ListHeaderComponent={this.sectionListHeader}
-            ListHeaderComponent={this.sectionListHeader}
+          ListFooterComponent={this.sectionListFooter}
-            ListFooterComponent={this.sectionListFooter}
+          style={discoverStyle.scrollContainer}
-            style={discoverStyle.scrollContainer}
+          contentContainerStyle={discoverStyle.scrollPadding}
-            contentContainerStyle={discoverStyle.scrollPadding}
+          initialNumToRender={4}
-            initialNumToRender={4}
+          maxToRenderPerBatch={4}
-            maxToRenderPerBatch={4}
+          removeClippedSubviews
-            removeClippedSubviews
+          renderItem={this.renderSectionListItem}
-            renderItem={this.renderSectionListItem}
+          renderSectionHeader={this.renderSectionHeader}
-            renderSectionHeader={this.renderSectionHeader}
+          sections={this.buildSections()}
-            sections={this.buildSections()}
+          keyExtractor={(item, index) => item}
-            keyExtractor={(item, index) => item}
+        />
-          />
+        {!showModalTagSelector && !showSortPicker && !showTimePicker && (
        )}
        {sdkReady && !showModalTagSelector && !showSortPicker && !showTimePicker && (
          <FloatingWalletBalance navigation={navigation} />
        )}
        {showModalTagSelector && (
@ -317,8 +377,6 @@ class DiscoverPage extends React.PureComponent {
            items={Constants.CLAIM_SEARCH_TIME_ITEMS}
          />
        )}
        {!sdkReady && <SdkLoadingStatus />}
      </View>
    );
  }
--- a/src/page/downloads/index.js
+++ b/src/page/downloads/index.js
@ -11,17 +11,15 @@ import {
 import { doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
 import { doDeleteFile } from 'redux/actions/file';
 import { selectCurrentRoute } from 'redux/selectors/drawer';
 import { selectSdkReady } from 'redux/selectors/settings';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import DownloadsPage from './view';
 const select = state => ({
  claims: selectMyClaimsWithoutChannels(state),
  currentRoute: selectCurrentRoute(state),
  downloadedUris: selectDownloadedUris(state),
  fileInfos: selectFileInfosDownloaded(state),
  downloadedUris: selectDownloadedUris(state),
  fetching: selectIsFetchingFileList(state) || selectIsFetchingClaimListMine(state),
  sdkReady: selectSdkReady(state),
 });
 const perform = dispatch => ({
@ -34,4 +32,7 @@ const perform = dispatch => ({
  setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
 });
-export default connect(select, perform)(DownloadsPage);
+export default connect(
  select,
  perform
 )(DownloadsPage);
--- a/src/page/downloads/view.js
+++ b/src/page/downloads/view.js
@ -79,7 +79,7 @@ class DownloadsPage extends React.PureComponent {
    const { claims, fileInfos } = this.props;
    const claimUris = claims.map(claim => normalizeURI(`${claim.name}#${claim.claim_id}`));
    return fileInfos.filter(
-      fileInfo => !claimUris.includes(normalizeURI(`${fileInfo.claim_name}#${fileInfo.claim_id}`)),
+      fileInfo => !claimUris.includes(normalizeURI(`${fileInfo.claim_name}#${fileInfo.claim_id}`))
    );
  };
@ -125,11 +125,7 @@ class DownloadsPage extends React.PureComponent {
          onPress: () => {
            const uris = Object.keys(selectedClaimsMap);
            uris.forEach(uri => {
-              const { txid, nout, name, claim_id: claimId } = selectedClaimsMap[uri];
+              const { txid, nout } = selectedClaimsMap[uri];
              if (name && claimId) {
                NativeModules.UtilityModule.deleteDownload(normalizeURI(`${name}#${claimId}`));
              }
              deleteFile(`${txid}:${nout}`, true);
            });
            this.onExitSelectionMode();
@ -139,29 +135,16 @@ class DownloadsPage extends React.PureComponent {
      ],
      {
        cancelable: true,
-      },
+      }
    );
  };
  render() {
-    const { downloadedUris, fetching, navigation, sdkReady } = this.props;
+    const { fetching, claims, downloadedUris, fileInfos, navigation } = this.props;
    const { selectionMode, selectedUris } = this.state;
    const filteredUris = this.getFilteredUris();
    const hasDownloads = filteredUris && filteredUris.length > 0;
    if (!sdkReady) {
      return (
        <View style={downloadsStyle.container}>
          <UriBar navigation={navigation} />
          <EmptyStateView
            message={__(
              'The background service is still initializing. You can still explore and watch content during the initialization process.',
            )}
          />
        </View>
      );
    }
    return (
      <View style={downloadsStyle.container}>
        <UriBar
@ -201,7 +184,7 @@ class DownloadsPage extends React.PureComponent {
                      this.handleSelectItem(item, claim);
                    } else {
                      // TODO: when shortUrl is available for my claims, navigate to that URL instead
-                      navigateToUri(navigation, item, { autoplay: true }, false, null);
+                      navigateToUri(navigation, item, { autoplay: true });
                    }
                  }}
                  onLongPress={claim => this.handleItemLongPress(item, claim)}
--- a/src/page/file/index.js
+++ b/src/page/file/index.js
@ -8,7 +8,7 @@ import {
  doPurchaseUri,
  doDeletePurchasedUri,
  doResolveUri,
-  doResolveUris,
+  doSearch,
  doSendTip,
  doToast,
  makeSelectIsUriResolving,
@ -18,6 +18,7 @@ import {
  makeSelectContentPositionForUri,
  makeSelectContentTypeForUri,
  makeSelectMetadataForUri,
  makeSelectRecommendedContentForUri,
  makeSelectStreamingUrlForUri,
  makeSelectThumbnailForUri,
  makeSelectTitleForUri,
@ -27,21 +28,25 @@ import {
  selectPurchasedUris,
  selectFailedPurchaseUris,
  selectPurchaseUriErrorMessage,
  selectIsSearching,
 } from 'lbry-redux';
 import {
  doClaimEligiblePurchaseRewards,
  doFetchCostInfoForUri,
  doFetchViewCount,
  makeSelectCostInfoForUri,
  makeSelectViewCountForUri,
  selectRewardContentClaimIds,
  selectBlackListedOutpoints,
 } from 'lbryinc';
-import { doDeleteFile, doStopDownloadingFile } from 'redux/actions/file';
+import {
-import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
+  doStartDownload,
  doUpdateDownload,
  doCompleteDownload,
  doDeleteFile,
  doStopDownloadingFile,
 } from 'redux/actions/file';
 import { doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
 import { doToggleFullscreenMode } from 'redux/actions/settings';
-import { selectDrawerStack, makeSelectPlayerVisible } from 'redux/selectors/drawer';
+import { selectDrawerStack } from 'redux/selectors/drawer';
 import { selectSdkReady } from 'redux/selectors/settings';
 import FilePage from './view';
 const select = (state, props) => {
@ -61,17 +66,16 @@ const select = (state, props) => {
    fileInfo: makeSelectFileInfoForUri(contentUri)(state),
    rewardedContentClaimIds: selectRewardContentClaimIds(state, selectProps),
    channelUri: makeSelectChannelForClaimUri(contentUri, true)(state),
    isPlayerVisible: makeSelectPlayerVisible(uri)(state), // use navigation uri for this selector
    position: makeSelectContentPositionForUri(contentUri)(state),
    purchasedUris: selectPurchasedUris(state),
    failedPurchaseUris: selectFailedPurchaseUris(state),
    myClaimUris: selectMyClaimUrisWithoutChannels(state),
    purchaseUriErrorMessage: selectPurchaseUriErrorMessage(state),
    sdkReady: selectSdkReady(state),
    streamingUrl: makeSelectStreamingUrlForUri(contentUri)(state),
    thumbnail: makeSelectThumbnailForUri(contentUri)(state),
    title: makeSelectTitleForUri(contentUri)(state),
-    viewCount: makeSelectViewCountForUri(contentUri)(state),
+    recommendedContent: makeSelectRecommendedContentForUri(contentUri)(state),
    isSearchingRecommendContent: selectIsSearching(state),
  };
 };
@ -84,21 +88,25 @@ const perform = dispatch => ({
  fetchFileInfo: uri => dispatch(doFetchFileInfo(uri)),
  fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
  fetchMyClaims: () => dispatch(doFetchClaimListMine()),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
  fetchViewCount: claimId => dispatch(doFetchViewCount(claimId)),
  fileGet: (uri, saveFile) => dispatch(doFileGet(uri, saveFile)),
  notify: data => dispatch(doToast(data)),
  popDrawerStack: () => dispatch(doPopDrawerStack()),
  pushDrawerStack: (routeName, params) => dispatch(doPushDrawerStack(routeName, params)),
  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: (visible, uri) => dispatch(doSetPlayerVisible(visible, uri)),
+  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)),
 });
-export default connect(select, perform)(FilePage);
+export default connect(
  select,
  perform
 )(FilePage);
--- a/src/page/file/view.js
+++ b/src/page/file/view.js
--- a/src/page/firstRun/internal/wallet-page.js
+++ b/src/page/firstRun/internal/wallet-page.js
@ -113,7 +113,7 @@ class WalletPage extends React.PureComponent {
      // only display this view if it's not a new user (or auto-login has been attempted once)
      content = (
        <View onLayout={onWalletViewLayout}>
-          <Text style={firstRunStyle.title}>{__('Password')}</Text>
+          <Text style={firstRunStyle.title}>Password</Text>
          <Text style={firstRunStyle.paragraph}>
            {hasSyncedWallet
              ? __('Please enter the password you used to secure your wallet.')
@ -146,6 +146,15 @@ class WalletPage extends React.PureComponent {
              <Icon name={this.state.revealPassword ? 'eye-slash' : 'eye'} size={16} style={firstRunStyle.revealIcon} />
            </TouchableOpacity>
          </View>
          {(!this.state.password || this.state.password.trim().length === 0) && (
            <View style={firstRunStyle.passwordWarning}>
              <Text style={firstRunStyle.passwordWarningText}>
                {hasSyncedWallet
                  ? __('If you did not provide a password, please press Use LBRY to continue.')
                  : __('You can proceed without a password, but this is not recommended.')}
              </Text>
            </View>
          )}
          {(!hasSyncedWallet && this.state.password && this.state.password.trim().length) > 0 && (
            <View style={firstRunStyle.passwordStrength}>
--- a/src/page/firstRun/internal/welcome-page.js
+++ b/src/page/firstRun/internal/welcome-page.js
@ -103,7 +103,7 @@ class WelcomePage extends React.PureComponent {
    } else {
      content = (
        <View onLayout={onWelcomePageLayout}>
-          <Text style={firstRunStyle.title}>{__('Welcome to LBRY.')}</Text>
+          <Text style={firstRunStyle.title}>Welcome to LBRY.</Text>
          <Text style={firstRunStyle.paragraph}>
            {__(
              'LBRY is a community-controlled content platform where you can find and publish videos, music, books, and more.'
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Akinwale Ariwodola	817fdf38a6	fix merge conflicts and i18n	2019-12-05 19:22:24 +01:00
Akinwale Ariwodola	e137e8f76c	lbry.tv account	2019-11-28 05:13:49 +01:00
Akinwale Ariwodola	ab84327659	display sign in instructions for emails that exist	2019-11-18 07:22:22 +01:00
		`@ -1 +0,0 @@`
			`Subproject commit ff30e7f6a4358fd997a9e6d9f75bfe6959eafcb6`
		`@ -1,2 +0,0 @@`
			`#!/bin/bash`
			`react-native bundle --platform android --dev false --entry-file src/index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/`