Compare commits
12
Commits
i18n
..
i18n-strings
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b43454adc | ||
|
|
d69c1931ac | ||
|
|
970b53ffdc | ||
|
|
372a572ee6 | ||
|
|
01eb112888 | ||
|
|
bb9e990f5a | ||
|
|
3237652d35 | ||
|
|
fd715886cd | ||
|
|
fa2de8382a | ||
|
|
f03a88ab2a | ||
|
|
184d5d1ec3 | ||
|
|
1a190fb0fe |
No files matched your search
Generated
+2
-2
@@ -5640,8 +5640,8 @@
|
||||
}
|
||||
},
|
||||
"lbry-redux": {
|
||||
"version": "github:lbryio/lbry-redux#8ac92e3abfa0a9aacdb2fa4a144c3fadc4da6b11",
|
||||
"from": "github:lbryio/lbry-redux#8ac92e3abfa0a9aacdb2fa4a144c3fadc4da6b11",
|
||||
"version": "github:lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
|
||||
"from": "github:lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
|
||||
"requires": {
|
||||
"proxy-polyfill": "0.1.6",
|
||||
"reselect": "^3.0.0",
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
"base-64": "^0.1.0",
|
||||
"@expo/vector-icons": "^8.1.0",
|
||||
"gfycat-style-urls": "^1.0.3",
|
||||
"lbry-redux": "lbryio/lbry-redux#8ac92e3abfa0a9aacdb2fa4a144c3fadc4da6b11",
|
||||
"lbry-redux": "lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
|
||||
"lbryinc": "lbryio/lbryinc#9ffb883cc11e36d55a729c65b70c405a4a56d35e",
|
||||
"lodash": ">=4.17.11",
|
||||
"merge": ">=1.2.1",
|
||||
|
||||
@@ -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>
|
||||
);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -50,7 +50,7 @@ class FileDownloadButton extends React.PureComponent {
|
||||
|
||||
if ((fileInfo && !fileInfo.stopped) || loading || downloading) {
|
||||
const progress = fileInfo && fileInfo.written_bytes ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0,
|
||||
label = fileInfo ? progress.toFixed(0) + '% complete' : __('Connecting...');
|
||||
label = fileInfo ? __('%progress%% complete', { progress: progress.toFixed(0) }) : __('Connecting...');
|
||||
|
||||
return (
|
||||
<View style={[style, fileDownloadButtonStyle.container]}>
|
||||
|
||||
@@ -28,7 +28,7 @@ export default class RelatedContent extends React.PureComponent {
|
||||
|
||||
return (
|
||||
<View style={relatedContentStyle.container}>
|
||||
<Text style={relatedContentStyle.title}>Related Content</Text>
|
||||
<Text style={relatedContentStyle.title}>{__('Related Content')}</Text>
|
||||
{recommendedContent &&
|
||||
recommendedContent
|
||||
.filter(recommendedUri => recommendedUri !== normalizeURI(fullUri))
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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>}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { connect } from 'react-redux';
|
||||
import { selectUnclaimedRewardValue } from 'lbryinc';
|
||||
import { selectUnclaimedRewardValue, selectUser } from 'lbryinc';
|
||||
import WalletRewardsDriver from './view';
|
||||
|
||||
const select = state => ({
|
||||
unclaimedRewardAmount: selectUnclaimedRewardValue(state),
|
||||
user: selectUser(state),
|
||||
});
|
||||
|
||||
export default connect(select)(WalletRewardsDriver);
|
||||
@@ -5,15 +5,31 @@ import walletStyle from 'styles/wallet';
|
||||
|
||||
class WalletRewardsDriver extends React.PureComponent<Props> {
|
||||
render() {
|
||||
const { navigation, unclaimedRewardAmount } = this.props;
|
||||
const { navigation, unclaimedRewardAmount, user } = 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} />
|
||||
<Text style={walletStyle.rewardDriverText}>
|
||||
Get {unclaimedRewardAmount > 0 ? unclaimedRewardAmount : ''} free credit
|
||||
{unclaimedRewardAmount === 1 ? '' : 's'} after creating an account.
|
||||
</Text>
|
||||
{signedIn && (
|
||||
<Text style={walletStyle.rewardDriverText}>
|
||||
{unclaimedRewardAmount === 0 && __('Free credits available in rewards.')}
|
||||
{unclaimedRewardAmount === 1 &&
|
||||
__('%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>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ class WalletSend extends React.PureComponent<Props> {
|
||||
<Text style={[walletStyle.text, walletStyle.currency]}>LBC</Text>
|
||||
</View>
|
||||
<Button
|
||||
text={'Send'}
|
||||
text={__('Send')}
|
||||
style={[walletStyle.button, walletStyle.sendButton]}
|
||||
disabled={!canSend}
|
||||
onPress={this.handleSend}
|
||||
|
||||
@@ -29,14 +29,12 @@ 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}>
|
||||
{__(
|
||||
'An account with LBRY Inc. allows you to earn rewards, backup your wallet, and keep everything synced.'
|
||||
)}
|
||||
{__('A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.')}
|
||||
{'\n\n'}
|
||||
{__('Without an account, you assume all responsibility for securing your wallet and LBRY data.')}
|
||||
</Text>
|
||||
|
||||
@@ -74,7 +74,7 @@ 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.'
|
||||
@@ -85,7 +85,7 @@ 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.'
|
||||
|
||||
@@ -271,7 +271,7 @@ class ChannelPage extends React.PureComponent {
|
||||
style={channelPageStyle.actionButton}
|
||||
theme={'light'}
|
||||
icon={'edit'}
|
||||
text={'Edit'}
|
||||
text={__('Edit')}
|
||||
onPress={this.onEditPressed}
|
||||
/>
|
||||
)}
|
||||
@@ -280,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}
|
||||
/>
|
||||
)}
|
||||
@@ -291,7 +291,7 @@ class ChannelPage extends React.PureComponent {
|
||||
onPress={this.onSharePressed}
|
||||
/>
|
||||
{!ownedChannel && <SubscribeButton style={channelPageStyle.subscribeButton} uri={fullUri} name={name} />}
|
||||
{!ownedChannel && (
|
||||
{false && !ownedChannel && (
|
||||
<SubscribeNotificationButton
|
||||
style={[channelPageStyle.subscribeButton, channelPageStyle.bellButton]}
|
||||
uri={fullUri}
|
||||
@@ -306,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>
|
||||
|
||||
@@ -86,11 +86,9 @@ class DiscoverPage extends React.PureComponent {
|
||||
}
|
||||
|
||||
onComponentFocused = () => {
|
||||
const { fetchSubscriptions, pushDrawerStack } = this.props;
|
||||
const { pushDrawerStack } = this.props;
|
||||
// pushDrawerStack();
|
||||
NativeModules.Firebase.setCurrentScreen('Your tags').then(result => {
|
||||
fetchSubscriptions();
|
||||
});
|
||||
NativeModules.Firebase.setCurrentScreen('Your tags');
|
||||
};
|
||||
|
||||
handleSortByItemSelected = item => {
|
||||
@@ -123,46 +121,6 @@ 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;
|
||||
|
||||
|
||||
+60
-51
@@ -597,6 +597,18 @@ class FilePage extends React.PureComponent {
|
||||
setPlayerVisible();
|
||||
};
|
||||
|
||||
onDownloadPressed = () => {
|
||||
const { claim, costInfo, purchaseUri } = this.props;
|
||||
this.setState(
|
||||
{
|
||||
downloadPressed: true,
|
||||
autoPlayMedia: false,
|
||||
stopDownloadConfirmed: false,
|
||||
},
|
||||
() => purchaseUri(claim.permanent_url, costInfo, true)
|
||||
);
|
||||
};
|
||||
|
||||
onBackButtonPressed = () => {
|
||||
const { navigation, drawerStack, popDrawerStack } = this.props;
|
||||
navigateBack(navigation, drawerStack, popDrawerStack);
|
||||
@@ -819,7 +831,7 @@ class FilePage extends React.PureComponent {
|
||||
<View style={filePageStyle.pageContainer}>
|
||||
{!this.state.fullscreenMode && <UriBar value={uri} navigation={navigation} />}
|
||||
{this.state.showWebView && isWebViewable && (
|
||||
<WebView source={{ uri: localFileUri }} style={filePageStyle.viewer} />
|
||||
<WebView allowFileAccess source={{ uri: localFileUri }} style={filePageStyle.viewer} />
|
||||
)}
|
||||
|
||||
{this.state.showImageViewer && (
|
||||
@@ -938,48 +950,8 @@ class FilePage extends React.PureComponent {
|
||||
/>
|
||||
)}
|
||||
|
||||
{showActions && showFileActions && (
|
||||
<View style={filePageStyle.actions}>
|
||||
{showFileActions && (
|
||||
<View style={filePageStyle.fileActions}>
|
||||
{canEdit && (
|
||||
<Button
|
||||
style={[filePageStyle.actionButton, filePageStyle.editButton]}
|
||||
theme={'light'}
|
||||
icon={'edit'}
|
||||
text={__('Edit')}
|
||||
onPress={this.onEditPressed}
|
||||
/>
|
||||
)}
|
||||
|
||||
{(completed || canEdit) && (
|
||||
<Button
|
||||
style={filePageStyle.actionButton}
|
||||
theme={'light'}
|
||||
icon={'trash-alt'}
|
||||
text={__('Delete')}
|
||||
onPress={this.onDeletePressed}
|
||||
/>
|
||||
)}
|
||||
{!completed &&
|
||||
fileInfo &&
|
||||
!fileInfo.stopped &&
|
||||
fileInfo.written_bytes < fileInfo.total_bytes &&
|
||||
!this.state.stopDownloadConfirmed && (
|
||||
<Button
|
||||
style={filePageStyle.actionButton}
|
||||
icon={'stop'}
|
||||
theme={'light'}
|
||||
text={__('Stop Download')}
|
||||
onPress={this.onStopDownloadPressed}
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
)}
|
||||
<ScrollView
|
||||
style={showActions ? filePageStyle.scrollContainerActions : filePageStyle.scrollContainer}
|
||||
style={filePageStyle.scrollContainer}
|
||||
contentContainerstyle={showActions ? null : filePageStyle.scrollContent}
|
||||
keyboardShouldPersistTaps={'handled'}
|
||||
ref={ref => {
|
||||
@@ -1015,13 +987,50 @@ class FilePage extends React.PureComponent {
|
||||
<Text style={filePageStyle.largeButtonText}>{__('Tip')}</Text>
|
||||
</TouchableOpacity>
|
||||
|
||||
<TouchableOpacity
|
||||
style={filePageStyle.largeButton}
|
||||
onPress={() => Linking.openURL(`https://lbry.com/dmca/${claim.claim_id}`)}
|
||||
>
|
||||
<Icon name={'flag'} size={20} style={filePageStyle.largeButtonIcon} />
|
||||
<Text style={filePageStyle.largeButtonText}>{__('Report')}</Text>
|
||||
</TouchableOpacity>
|
||||
<View style={filePageStyle.sharedLargeButton}>
|
||||
{!isPlayable && !fileInfo && (
|
||||
<TouchableOpacity style={filePageStyle.innerLargeButton} onPress={this.onDownloadPressed}>
|
||||
<Icon name={'download'} size={20} style={filePageStyle.largeButtonIcon} />
|
||||
<Text style={filePageStyle.largeButtonText}>{__('Download')}</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
|
||||
{!completed &&
|
||||
fileInfo &&
|
||||
!fileInfo.stopped &&
|
||||
fileInfo.written_bytes > 0 &&
|
||||
fileInfo.written_bytes < fileInfo.total_bytes &&
|
||||
!this.state.stopDownloadConfirmed && (
|
||||
<TouchableOpacity style={filePageStyle.innerLargeButton} onPress={this.onStopDownloadPressed}>
|
||||
<Icon name={'stop'} size={20} style={filePageStyle.largeButtonIcon} />
|
||||
<Text style={filePageStyle.largeButtonText}>{__('Stop')}</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
</View>
|
||||
|
||||
{!canEdit && (
|
||||
<TouchableOpacity
|
||||
style={filePageStyle.largeButton}
|
||||
onPress={() => Linking.openURL(`https://lbry.com/dmca/${claim.claim_id}`)}
|
||||
>
|
||||
<Icon name={'flag'} size={20} style={filePageStyle.largeButtonIcon} />
|
||||
<Text style={filePageStyle.largeButtonText}>{__('Report')}</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
|
||||
{canEdit && (
|
||||
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.onEditPressed}>
|
||||
<Icon name={'edit'} size={20} style={filePageStyle.largeButtonIcon} />
|
||||
<Text style={filePageStyle.largeButtonText}>{__('Edit')}</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
|
||||
{(completed || canEdit) && (
|
||||
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.onDeletePressed}>
|
||||
<Icon name={'trash-alt'} size={20} style={filePageStyle.largeButtonIcon} />
|
||||
<Text style={filePageStyle.largeButtonText}>{__('Delete')}</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
</View>
|
||||
|
||||
<View style={filePageStyle.channelRow}>
|
||||
@@ -1074,7 +1083,7 @@ class FilePage extends React.PureComponent {
|
||||
hideText={false}
|
||||
/>
|
||||
)}
|
||||
{channelName && (
|
||||
{false && channelName && (
|
||||
<SubscribeNotificationButton
|
||||
style={[filePageStyle.actionButton, filePageStyle.bellButton]}
|
||||
uri={fullChannelUri}
|
||||
@@ -1128,7 +1137,7 @@ class FilePage extends React.PureComponent {
|
||||
</Text>
|
||||
{tags && tags.length > 0 && (
|
||||
<View style={filePageStyle.tagContainer}>
|
||||
<Text style={filePageStyle.tagTitle}>Tags</Text>
|
||||
<Text style={filePageStyle.tagTitle}>{__('Tags')}</Text>
|
||||
<View style={filePageStyle.tagList}>{this.renderTags(tags)}</View>
|
||||
</View>
|
||||
)}
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
doUserEmailNew,
|
||||
doUserResendVerificationEmail,
|
||||
selectAuthToken,
|
||||
selectEmailAlreadyExists,
|
||||
selectEmailNewErrorMessage,
|
||||
selectEmailNewIsPending,
|
||||
selectEmailToVerify,
|
||||
@@ -28,6 +29,7 @@ const select = state => ({
|
||||
authenticating: selectAuthenticationIsPending(state),
|
||||
authToken: selectAuthToken(state),
|
||||
emailToVerify: selectEmailToVerify(state),
|
||||
emailAlreadyExists: selectEmailAlreadyExists(state),
|
||||
emailNewErrorMessage: selectEmailNewErrorMessage(state),
|
||||
emailNewPending: selectEmailNewIsPending(state),
|
||||
hasSyncedWallet: selectHasSyncedWallet(state),
|
||||
|
||||
@@ -64,7 +64,7 @@ class EmailCollectPage extends React.PureComponent {
|
||||
}}
|
||||
/>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
{__('An account will allow you to earn rewards and keep your account and settings synced.')}
|
||||
{__('A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.')}
|
||||
</Text>
|
||||
<Text style={firstRunStyle.infoParagraph}>
|
||||
{__('This information is disclosed only to LBRY, Inc. and not to the LBRY network.')}
|
||||
|
||||
@@ -17,24 +17,26 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { onEmailViewLayout, email } = this.props;
|
||||
const { onEmailViewLayout, email, emailAlreadyExists } = this.props;
|
||||
|
||||
const content = (
|
||||
<View onLayout={() => onEmailViewLayout('verify')}>
|
||||
<Text style={firstRunStyle.title}>Verify Email</Text>
|
||||
<Text style={firstRunStyle.title}>{emailAlreadyExists ? __('Sign In') : __('Verify Email')}</Text>
|
||||
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
An email has been sent to{' '}
|
||||
<Text style={firstRunStyle.nowrap} numberOfLines={1}>
|
||||
{email}
|
||||
</Text>
|
||||
. Please follow the instructions in the message to verify your email address.
|
||||
{__('An email has been sent to')}
|
||||
{'\n\n'}
|
||||
{email}
|
||||
{'\n\n'}
|
||||
{emailAlreadyExists && __('Please click the link in the message to complete signing in')}
|
||||
{!emailAlreadyExists && __('Please click the link in the message to verify your email address')}.
|
||||
</Text>
|
||||
|
||||
<View style={firstRunStyle.buttonContainer}>
|
||||
<Button
|
||||
style={firstRunStyle.verificationButton}
|
||||
theme={'light'}
|
||||
text={'Resend'}
|
||||
text={__('Resend')}
|
||||
onPress={this.onResendPressed}
|
||||
/>
|
||||
</View>
|
||||
|
||||
@@ -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,15 +146,6 @@ 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}>
|
||||
|
||||
@@ -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.'
|
||||
|
||||
@@ -28,6 +28,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
emailCollectTracked: false,
|
||||
emailSubmitted: false,
|
||||
enterPasswordTracked: false,
|
||||
autoLoginTried: false,
|
||||
isFirstRun: false,
|
||||
launchUrl: null,
|
||||
languageLoaded: false,
|
||||
@@ -38,7 +39,6 @@ class FirstRunScreen extends React.PureComponent {
|
||||
walletPassword: '',
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
language: null,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
@@ -126,8 +126,16 @@ class FirstRunScreen extends React.PureComponent {
|
||||
|
||||
if (this.state.syncApplyStarted && !syncApplyIsPending) {
|
||||
if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
this.setState({ showBottomContainer: true, syncApplyStarted: false, syncApplyCompleted: false });
|
||||
if (this.state.autoLoginTried) {
|
||||
// don't show the error message for auto-login if it fails
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
}
|
||||
this.setState({
|
||||
autoLoginTried: true,
|
||||
showBottomContainer: true,
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
});
|
||||
} else {
|
||||
this.setState({ syncApplyCompleted: true });
|
||||
// password successfully verified
|
||||
@@ -379,6 +387,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
authenticating,
|
||||
authToken,
|
||||
checkSync,
|
||||
emailAlreadyExists,
|
||||
emailNewErrorMessage,
|
||||
emailNewPending,
|
||||
emailToVerify,
|
||||
@@ -420,6 +429,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
<EmailVerifyPage
|
||||
onEmailViewLayout={this.onEmailViewLayout}
|
||||
email={this.state.email}
|
||||
emailAlreadyExists={emailAlreadyExists}
|
||||
notify={notify}
|
||||
resendVerificationEmail={resendVerificationEmail}
|
||||
/>
|
||||
|
||||
@@ -104,7 +104,7 @@ class RewardsPage extends React.PureComponent {
|
||||
if (this.state.isEmailVerified && this.state.isIdentityVerified && !this.state.isRewardApproved) {
|
||||
return (
|
||||
<View style={[rewardStyle.card, rewardStyle.verification]}>
|
||||
<Text style={rewardStyle.title}>Manual Reward Verification</Text>
|
||||
<Text style={rewardStyle.title}>{__('Manual Reward Verification')}</Text>
|
||||
<Text style={rewardStyle.text}>
|
||||
__('You need to be manually verified before you can start claiming rewards.') Please request to be verified
|
||||
on the{' '}
|
||||
|
||||
@@ -109,8 +109,7 @@ class SearchPage extends React.PureComponent {
|
||||
return (
|
||||
<View style={searchStyle.noResults}>
|
||||
<Text style={searchStyle.noResultsText}>
|
||||
There are no results to display for <Text style={searchStyle.boldText}>{query}</Text>. Please try a different
|
||||
search term.
|
||||
{__('There are no results to display for "%query%". Please try a different search term.', { query })}
|
||||
</Text>
|
||||
</View>
|
||||
);
|
||||
|
||||
@@ -171,7 +171,6 @@ class SplashScreen extends React.PureComponent {
|
||||
|
||||
_updateStatusCallback(status) {
|
||||
const { fetchSubscriptions, getSync, setClientSetting } = this.props;
|
||||
const blockchainHeaders = status.blockchain_headers;
|
||||
const startupStatus = status.startup_status;
|
||||
const walletStatus = status.wallet;
|
||||
|
||||
@@ -222,10 +221,11 @@ class SplashScreen extends React.PureComponent {
|
||||
return;
|
||||
}
|
||||
|
||||
if (blockchainHeaders) {
|
||||
const headerSyncProgress = walletStatus ? walletStatus.headers_synchronization_progress : null;
|
||||
if (headerSyncProgress && headerSyncProgress < 100) {
|
||||
this.setState({
|
||||
isDownloadingHeaders: blockchainHeaders.downloading_headers,
|
||||
headersDownloadProgress: blockchainHeaders.download_progress,
|
||||
isDownloadingHeaders: true,
|
||||
headersDownloadProgress: headerSyncProgress,
|
||||
});
|
||||
} else {
|
||||
// set downloading flag to false if blockchain_headers isn't in the status response
|
||||
@@ -234,15 +234,16 @@ class SplashScreen extends React.PureComponent {
|
||||
});
|
||||
}
|
||||
|
||||
if (blockchainHeaders && blockchainHeaders.downloading_headers) {
|
||||
const downloadProgress = blockchainHeaders.download_progress ? blockchainHeaders.download_progress : 0;
|
||||
if (headerSyncProgress < 100) {
|
||||
const downloadProgress = headerSyncProgress || 0;
|
||||
this.setState({
|
||||
message: __('Blockchain Sync'),
|
||||
details: `Catching up with the blockchain (${downloadProgress}%)`, // TODO: i18n tokenization
|
||||
details: __('Catching up with the blockchain (%progress%%)', { progress: downloadProgress }),
|
||||
});
|
||||
} else if (walletStatus && walletStatus.blocks_behind > 0) {
|
||||
const behind = walletStatus.blocks_behind;
|
||||
const behindText = behind + ' block' + (behind === 1 ? '' : 's') + ' behind'; // TODO: i18n tokenization
|
||||
const behindText =
|
||||
behind === 1 ? __('%num% block behind', { num: behind }) : __('%num% blocks behind', { num: behind });
|
||||
this.setState({
|
||||
message: __('Blockchain Sync'),
|
||||
details: behindText,
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
selectPhoneToVerify,
|
||||
selectPhoneVerifyIsPending,
|
||||
selectPhoneVerifyErrorMessage,
|
||||
selectEmailAlreadyExists,
|
||||
selectEmailNewErrorMessage,
|
||||
selectEmailNewIsPending,
|
||||
selectEmailToVerify,
|
||||
@@ -32,6 +33,7 @@ import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||
import Verification from './view';
|
||||
|
||||
const select = state => ({
|
||||
emailAlreadyExists: selectEmailAlreadyExists(state),
|
||||
emailToVerify: selectEmailToVerify(state),
|
||||
emailNewErrorMessage: selectEmailNewErrorMessage(state),
|
||||
emailNewPending: selectEmailNewIsPending(state),
|
||||
|
||||
@@ -105,16 +105,20 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { emailNewPending } = this.props;
|
||||
const { emailAlreadyExists, emailNewPending } = this.props;
|
||||
|
||||
return (
|
||||
<View style={firstRunStyle.container}>
|
||||
<Text style={rewardStyle.verificationTitle}>
|
||||
{Constants.PHASE_COLLECTION === this.state.phase ? __('Email') : __('Verify Email')}
|
||||
{Constants.PHASE_COLLECTION === this.state.phase
|
||||
? __('Email')
|
||||
: emailAlreadyExists
|
||||
? __('Sign In')
|
||||
: __('Verify Email')}
|
||||
</Text>
|
||||
{Constants.PHASE_COLLECTION === this.state.phase && (
|
||||
<View>
|
||||
<Text style={firstRunStyle.paragraph}>Please provide an email address.</Text>
|
||||
<Text style={firstRunStyle.paragraph}>{__('Please provide an email address.')}</Text>
|
||||
<TextInput
|
||||
style={firstRunStyle.emailInput}
|
||||
placeholder={this.state.placeholder}
|
||||
@@ -138,7 +142,7 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
<Button
|
||||
style={rewardStyle.verificationButton}
|
||||
theme={'light'}
|
||||
text={__('Send verification email')}
|
||||
text={__('Continue')}
|
||||
onPress={this.onSendVerificationPressed}
|
||||
/>
|
||||
)}
|
||||
@@ -154,8 +158,12 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
{Constants.PHASE_VERIFICATION === this.state.phase && (
|
||||
<View>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
An email has been sent to <Text style={firstRunStyle.nowrap}>{this.state.email}</Text>. Please follow the
|
||||
instructions in the message to verify your email address.
|
||||
{__('An email has been sent to')}
|
||||
{'\n\n'}
|
||||
{this.state.email}
|
||||
{'\n\n'}
|
||||
{emailAlreadyExists && __('Please click the link in the message to complete signing in.')}
|
||||
{!emailAlreadyExists && __('Please click the link in the message to verify your email address')}
|
||||
</Text>
|
||||
|
||||
<View style={rewardStyle.buttonContainer}>
|
||||
|
||||
@@ -20,22 +20,22 @@ class ManualVerifyPage extends React.PureComponent {
|
||||
render() {
|
||||
return (
|
||||
<View style={firstRunStyle.container}>
|
||||
<Text style={rewardStyle.verificationTitle}>Manual Reward Verification</Text>
|
||||
<Text style={rewardStyle.verificationTitle}>{__('Manual Reward Verification')}</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>
|
||||
{__(
|
||||
'This account must undergo review before you can participate in the rewards program. This can take anywhere from several minutes to several days.'
|
||||
)}
|
||||
</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>
|
||||
If you continue to see this message, please request to be verified on the{' '}
|
||||
{__('If you continue to see this message, please request to be verified on the')}{' '}
|
||||
<Link
|
||||
style={rewardStyle.underlinedTextLink}
|
||||
href="https://discordapp.com/invite/Z3bERWA"
|
||||
text="LBRY Discord server"
|
||||
text={__('LBRY Discord server')}
|
||||
/>
|
||||
.
|
||||
</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>Please enjoy free content in the meantime!</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>{__('Please enjoy free content in the meantime!')}</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
notify({ message: String(phoneVerifyErrorMessage) });
|
||||
this.setState({ codeVerifyStarted: false, phoneVerifyFailed: true });
|
||||
} else {
|
||||
notify({ message: 'Your phone number was successfully verified.' });
|
||||
notify({ message: __('Your phone number was successfully verified.') });
|
||||
this.setState({ codeVerifySuccessful: true, phoneVerifyFailed: false });
|
||||
if (onPhoneVerifySuccessful) {
|
||||
onPhoneVerifySuccessful();
|
||||
@@ -103,7 +103,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
|
||||
if (!this.phoneInput.isValidNumber()) {
|
||||
return notify({
|
||||
message: 'Please provide a valid telephone number.',
|
||||
message: __('Please provide a valid telephone number.'),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
return (
|
||||
<View style={firstRunStyle.container}>
|
||||
<Text style={rewardStyle.verificationTitle}>
|
||||
{this.state.phase === Constants.PHASE_VERIFICATION ? 'Verify ' : ''}Phone Number
|
||||
{this.state.phase === Constants.PHASE_VERIFICATION ? __('Verify Phone Number') : __('Phone Number')}
|
||||
</Text>
|
||||
|
||||
<View style={rewardStyle.phoneVerificationContainer}>
|
||||
@@ -169,7 +169,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
<Button
|
||||
style={[rewardStyle.verificationButton, rewardStyle.topMarginMedium]}
|
||||
theme={'light'}
|
||||
text={'Send verification text'}
|
||||
text={__('Send verification text')}
|
||||
onPress={this.onSendTextPressed}
|
||||
/>
|
||||
)}
|
||||
@@ -187,7 +187,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
{!phoneVerifyIsPending && !this.codeVerifyStarted && (
|
||||
<View>
|
||||
<Text style={[rewardStyle.bottomMarginSmall, firstRunStyle.paragraph]}>
|
||||
Please enter the verification code sent to {phone}.
|
||||
{__('Please enter the verification code sent to %phone%', { phone })}.
|
||||
</Text>
|
||||
<TextInput
|
||||
style={rewardStyle.verificationCodeInput}
|
||||
@@ -202,16 +202,16 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
<Button
|
||||
style={[rewardStyle.verificationButton, rewardStyle.topMarginSmall]}
|
||||
theme={'light'}
|
||||
text={'Verify'}
|
||||
text={__('Verify')}
|
||||
onPress={this.onVerifyPressed}
|
||||
/>
|
||||
<Link style={rewardStyle.verificationLink} text={'Edit'} onPress={this.onEditPressed} />
|
||||
<Link style={rewardStyle.verificationLink} text={__('Edit')} onPress={this.onEditPressed} />
|
||||
</View>
|
||||
</View>
|
||||
)}
|
||||
{phoneVerifyIsPending && (
|
||||
<View style={firstRunStyle.centered}>
|
||||
<Text style={firstRunStyle.paragraph}>Verifying your phone number...</Text>
|
||||
<Text style={firstRunStyle.paragraph}>{__('Verifying your phone number...')}</Text>
|
||||
<ActivityIndicator
|
||||
color={Colors.White}
|
||||
size="small"
|
||||
|
||||
@@ -14,13 +14,14 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
state = {
|
||||
checkSyncStarted: false,
|
||||
password: null,
|
||||
placeholder: 'password',
|
||||
placeholder: __('password'),
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
syncChecked: false,
|
||||
revealPassword: false,
|
||||
autoPassword: false,
|
||||
autoLoginAttempted: false,
|
||||
autoLoginTried: false,
|
||||
autoLoginFlow: true,
|
||||
};
|
||||
|
||||
@@ -67,8 +68,10 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
|
||||
if (this.state.syncApplyStarted && !syncApplyIsPending) {
|
||||
if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
this.setState({ syncApplyStarted: false, autoLoginFlow: false });
|
||||
if (this.state.autoLoginTried) {
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
}
|
||||
this.setState({ autoLoginTried: true, syncApplyStarted: false, autoLoginFlow: false });
|
||||
} else {
|
||||
// password successfully verified
|
||||
this.setState({ syncApplyCompleted: true });
|
||||
@@ -182,7 +185,7 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
}}
|
||||
onBlur={() => {
|
||||
if (!this.state.password || this.state.password.length === 0) {
|
||||
this.setState({ placeholder: 'password' });
|
||||
this.setState({ placeholder: __('password') });
|
||||
}
|
||||
}}
|
||||
/>
|
||||
@@ -194,16 +197,6 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
</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}>
|
||||
<BarPasswordStrengthDisplay
|
||||
|
||||
@@ -118,6 +118,7 @@ class VerificationScreen extends React.PureComponent {
|
||||
addUserEmail,
|
||||
checkSync,
|
||||
emailNewErrorMessage,
|
||||
emailAlreadyExists,
|
||||
emailNewPending,
|
||||
emailToVerify,
|
||||
getSync,
|
||||
@@ -148,6 +149,7 @@ class VerificationScreen extends React.PureComponent {
|
||||
page = (
|
||||
<EmailVerifyPage
|
||||
addUserEmail={addUserEmail}
|
||||
emailAlreadyExists={emailAlreadyExists}
|
||||
emailNewErrorMessage={emailNewErrorMessage}
|
||||
emailNewPending={emailNewPending}
|
||||
emailToVerify={emailToVerify}
|
||||
|
||||
+10
-1
@@ -381,10 +381,19 @@ const filePageStyle = StyleSheet.create({
|
||||
backButtonIcon: {
|
||||
color: Colors.White,
|
||||
},
|
||||
sharedLargeButton: {
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
marginRight: 36,
|
||||
},
|
||||
innerLargeButton: {
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
},
|
||||
largeButton: {
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
marginRight: 48,
|
||||
marginRight: 36,
|
||||
},
|
||||
largeButtonIcon: {
|
||||
color: Colors.DescriptionGrey,
|
||||
|
||||
Reference in new issue
Block a user