diff --git a/app/src/component/floatingWalletBalance/view.js b/app/src/component/floatingWalletBalance/view.js index be0843f8..fed4c241 100644 --- a/app/src/component/floatingWalletBalance/view.js +++ b/app/src/component/floatingWalletBalance/view.js @@ -2,10 +2,11 @@ import React from 'react'; import { ActivityIndicator, Text, TouchableOpacity, View } from 'react-native'; import { formatCredits } from 'lbry-redux' -import Address from '../address'; -import Button from '../button'; -import Colors from '../../styles/colors'; -import floatingButtonStyle from '../../styles/floatingButton'; +import Address from 'component/address'; +import Button from 'component/button'; +import Colors from 'styles/colors'; +import Icon from 'react-native-vector-icons/FontAwesome5'; +import floatingButtonStyle from 'styles/floatingButton'; type Props = { balance: number, @@ -27,7 +28,8 @@ class FloatingWalletBalance extends React.PureComponent { {unclaimedRewardAmount > 0 && navigation && navigation.navigate({ routeName: 'Rewards' })} > - claim {unclaimedRewardAmount} + + {unclaimedRewardAmount} } ); diff --git a/app/src/component/uriBar/view.js b/app/src/component/uriBar/view.js index 6dc82f9a..4cea8a3a 100644 --- a/app/src/component/uriBar/view.js +++ b/app/src/component/uriBar/view.js @@ -118,7 +118,7 @@ class UriBar extends React.PureComponent { style={uriBarStyle.uriText} onLayout={() => { this.setSelection(); }} selectTextOnFocus={true} - placeholder={'Search movies, music, and more'} + placeholder={'Search for videos, music, games and more'} underlineColorAndroid={'transparent'} numberOfLines={1} clearButtonMode={'while-editing'} diff --git a/app/src/page/channel/view.js b/app/src/page/channel/view.js index c4329e65..14da2754 100644 --- a/app/src/page/channel/view.js +++ b/app/src/page/channel/view.js @@ -6,7 +6,6 @@ import Colors from 'styles/colors'; import Button from 'component/button'; import FileList from 'component/fileList'; import PageHeader from 'component/pageHeader'; -import SubscribeButton from 'component/subscribeButton'; import UriBar from 'component/uriBar'; import channelPageStyle from 'styles/channelPage'; @@ -83,11 +82,7 @@ class ChannelPage extends React.PureComponent { return ( - - - {name} - - + navigateBack(navigation, drawerStack, popDrawerStack)} /> {contentList} {(totalPages > 1) && this.state.showPageButtons && @@ -104,6 +99,7 @@ class ChannelPage extends React.PureComponent { disabled={!!fetching} onPress={this.handleNextPage} />} } + ) } diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js index e369f37a..c2a15559 100644 --- a/app/src/page/file/view.js +++ b/app/src/page/file/view.js @@ -16,6 +16,7 @@ import { WebView } from 'react-native'; import { navigateToUri } from 'utils/helper'; +import Icon from 'react-native-vector-icons/FontAwesome5'; import ImageViewer from 'react-native-image-zoom-viewer'; import Button from 'component/button'; import Colors from 'styles/colors'; @@ -62,6 +63,7 @@ class FilePage extends React.PureComponent { mediaLoaded: false, pageSuspended: false, relatedContentY: 0, + showDescription: false, showImageViewer: false, showWebView: false, showTipView: false, @@ -538,15 +540,8 @@ class FilePage extends React.PureComponent { thumbnail={metadata.thumbnail} />} - {showActions && + {(showActions && showFileActions) && - -