Merge remote-tracking branch 'origin/master' into tag-search-result

src/component/drawerContent/view.js

@@ -9,15 +9,15 @@ import discoverStyle from 'styles/discover';
 
 const groupedMenuItems = {
   'Find content': [
-    { icon: 'hashtag', label: 'Your tags', route: Constants.DRAWER_ROUTE_DISCOVER },
+    { 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 },
+    { icon: 'globe-americas', label: 'All Content', route: Constants.DRAWER_ROUTE_TRENDING },
   ],
   'Your content': [
     { icon: 'at', label: 'Channels', route: Constants.DRAWER_ROUTE_CHANNEL_CREATOR },
     { icon: 'download', label: 'Library', route: Constants.DRAWER_ROUTE_MY_LBRY },
     { icon: 'cloud-upload-alt', label: 'Publishes', route: Constants.DRAWER_ROUTE_PUBLISHES },
-    { icon: 'upload', label: 'New publish', route: Constants.DRAWER_ROUTE_PUBLISH },
+    { icon: 'upload', label: 'New Publish', route: Constants.DRAWER_ROUTE_PUBLISH },
   ],
   Wallet: [
     { icon: 'wallet', label: 'Wallet', route: Constants.DRAWER_ROUTE_WALLET },
@@ -112,14 +112,14 @@ class DrawerContent extends React.PureComponent {
                 accessibilityLabel={'Sign In'}
                 onPress={this.launchSignInFlow}
                 delayPressIn={0}
-                style={discoverStyle.signInMenuItem}
+                style={[discoverStyle.signInMenuItem, discoverStyle.signInMenuItemButton]}
               >
-                <Text style={discoverStyle.signInMenuItemText}>SIGN IN</Text>
+                <Text style={discoverStyle.signInMenuItemButtonText}>SIGN IN</Text>
               </TouchableOpacity>
             )}
 
             {signedIn && (
-              <View style={discoverStyle.signInMenuItem}>
+              <View style={[discoverStyle.signInMenuItem, discoverStyle.signInMenuItemBorder]}>
                 <Text style={discoverStyle.signInMenuItemText} numberOfLines={1}>
                   {user.primary_email.toUpperCase()}
                 </Text>

src/page/firstRun/internal/welcome-page.js

@@ -4,6 +4,7 @@ import { ActivityIndicator, NativeModules, Platform, Text, View } from 'react-na
 import AsyncStorage from '@react-native-community/async-storage';
 import Colors from 'styles/colors';
 import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
+import Link from 'component/link';
 import firstRunStyle from 'styles/firstRun';
 
 class WelcomePage extends React.PureComponent {
@@ -106,6 +107,11 @@ class WelcomePage extends React.PureComponent {
             LBRY is a community-controlled content platform where you can find and publish videos, music, books, and
             more.
           </Text>
+          <Text style={[firstRunStyle.infoParagraph, firstRunStyle.tosParagraph]}>
+            By continuing, I agree to the{' '}
+            <Link style={firstRunStyle.tosLink} text={'Terms of Service'} href={'https://lbry.com/termsofservice'} />{' '}
+            and confirm I am over the age of 13.
+          </Text>
         </View>
       );
     }

src/styles/discover.js

@@ -295,9 +295,7 @@ const discoverStyle = StyleSheet.create({
     color: Colors.DescriptionGrey,
     marginRight: 6,
   },
-  menuScrollContent: {
-    paddingTop: 12,
-  },
+  menuScrollContent: {},
   menuGroup: {
     marginTop: 8,
     marginBottom: 8,
@@ -368,20 +366,32 @@ const discoverStyle = StyleSheet.create({
     height: '100%',
   },
   signInMenuItem: {
-    paddingTop: 6,
+    paddingTop: 16,
     paddingBottom: 12,
     paddingLeft: 16,
     paddingRight: 16,
     marginBottom: 6,
     borderBottomWidth: 1,
+  },
+  signInMenuItemBorder: {
     borderBottomColor: Colors.VeryLightGrey,
   },
+  signInMenuItemButton: {
+    backgroundColor: Colors.LbryGreen,
+    borderBottomColor: Colors.LbryGreen,
+  },
   signInMenuItemText: {
     color: Colors.DescriptionGrey,
     fontFamily: 'Inter-UI-SemiBold',
     fontSize: 14,
     textAlign: 'center',
   },
+  signInMenuItemButtonText: {
+    color: Colors.White,
+    fontFamily: 'Inter-UI-SemiBold',
+    fontSize: 14,
+    textAlign: 'center',
+  },
 });
 
 export default discoverStyle;

src/styles/firstRun.js

@@ -209,6 +209,12 @@ const firstRunStyle = StyleSheet.create({
   revealIcon: {
     color: Colors.White,
   },
+  tosLink: {
+    textDecorationLine: 'underline',
+  },
+  tosParagraph: {
+    marginTop: 48,
+  },
 });
 
 export default firstRunStyle;

src/styles/reward.js

@@ -249,7 +249,8 @@ const rewardStyle = StyleSheet.create({
   },
   learnMoreLink: {
     fontFamily: 'Inter-UI-Regular',
-    color: Colors.NextLbryGreen,
+    color: Colors.White,
+    textDecorationLine: 'underline',
   },
   enrollButton: {
     backgroundColor: Colors.White,