Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6be536da98 | ||
|
|
cdfd1f99d0 | ||
|
|
f2ca5fb53e | ||
|
|
b9fdb41cf2 | ||
|
|
65b4dd8729 | ||
|
|
dd34e0a64b | ||
|
|
a2d0f0dcf8 | ||
|
|
d289616347 | ||
|
|
f9ee88e3ee | ||
|
|
c0b810ba8d | ||
|
|
3798e49f27 | ||
|
|
74ab2ecb93 |
No files matched your search
Generated
+2
-2
@@ -5640,8 +5640,8 @@
|
||||
}
|
||||
},
|
||||
"lbry-redux": {
|
||||
"version": "github:lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
|
||||
"from": "github:lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
|
||||
"version": "github:lbryio/lbry-redux#8ac92e3abfa0a9aacdb2fa4a144c3fadc4da6b11",
|
||||
"from": "github:lbryio/lbry-redux#8ac92e3abfa0a9aacdb2fa4a144c3fadc4da6b11",
|
||||
"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#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
|
||||
"lbry-redux": "lbryio/lbry-redux#8ac92e3abfa0a9aacdb2fa4a144c3fadc4da6b11",
|
||||
"lbryinc": "lbryio/lbryinc#9ffb883cc11e36d55a729c65b70c405a4a56d35e",
|
||||
"lodash": ">=4.17.11",
|
||||
"merge": ">=1.2.1",
|
||||
|
||||
@@ -291,7 +291,7 @@ class ChannelPage extends React.PureComponent {
|
||||
onPress={this.onSharePressed}
|
||||
/>
|
||||
{!ownedChannel && <SubscribeButton style={channelPageStyle.subscribeButton} uri={fullUri} name={name} />}
|
||||
{false && !ownedChannel && (
|
||||
{!ownedChannel && (
|
||||
<SubscribeNotificationButton
|
||||
style={[channelPageStyle.subscribeButton, channelPageStyle.bellButton]}
|
||||
uri={fullUri}
|
||||
|
||||
@@ -1074,7 +1074,7 @@ class FilePage extends React.PureComponent {
|
||||
hideText={false}
|
||||
/>
|
||||
)}
|
||||
{false && channelName && (
|
||||
{channelName && (
|
||||
<SubscribeNotificationButton
|
||||
style={[filePageStyle.actionButton, filePageStyle.bellButton]}
|
||||
uri={fullChannelUri}
|
||||
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
doUserEmailNew,
|
||||
doUserResendVerificationEmail,
|
||||
selectAuthToken,
|
||||
selectEmailAlreadyExists,
|
||||
selectEmailNewErrorMessage,
|
||||
selectEmailNewIsPending,
|
||||
selectEmailToVerify,
|
||||
@@ -29,7 +28,6 @@ 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}>
|
||||
{__('A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.')}
|
||||
{__('An account will allow you to earn rewards and keep your account and settings synced.')}
|
||||
</Text>
|
||||
<Text style={firstRunStyle.infoParagraph}>
|
||||
{__('This information is disclosed only to LBRY, Inc. and not to the LBRY network.')}
|
||||
|
||||
@@ -17,26 +17,24 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { onEmailViewLayout, email, emailAlreadyExists } = this.props;
|
||||
const { onEmailViewLayout, email } = this.props;
|
||||
|
||||
const content = (
|
||||
<View onLayout={() => onEmailViewLayout('verify')}>
|
||||
<Text style={firstRunStyle.title}>{emailAlreadyExists ? __('Sign In') : __('Verify Email')}</Text>
|
||||
|
||||
<Text style={firstRunStyle.title}>Verify Email</Text>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
{__('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')}.
|
||||
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.
|
||||
</Text>
|
||||
|
||||
<View style={firstRunStyle.buttonContainer}>
|
||||
<Button
|
||||
style={firstRunStyle.verificationButton}
|
||||
theme={'light'}
|
||||
text={__('Resend')}
|
||||
text={'Resend'}
|
||||
onPress={this.onResendPressed}
|
||||
/>
|
||||
</View>
|
||||
|
||||
@@ -379,7 +379,6 @@ class FirstRunScreen extends React.PureComponent {
|
||||
authenticating,
|
||||
authToken,
|
||||
checkSync,
|
||||
emailAlreadyExists,
|
||||
emailNewErrorMessage,
|
||||
emailNewPending,
|
||||
emailToVerify,
|
||||
@@ -421,7 +420,6 @@ class FirstRunScreen extends React.PureComponent {
|
||||
<EmailVerifyPage
|
||||
onEmailViewLayout={this.onEmailViewLayout}
|
||||
email={this.state.email}
|
||||
emailAlreadyExists={emailAlreadyExists}
|
||||
notify={notify}
|
||||
resendVerificationEmail={resendVerificationEmail}
|
||||
/>
|
||||
|
||||
@@ -14,7 +14,6 @@ import {
|
||||
selectPhoneToVerify,
|
||||
selectPhoneVerifyIsPending,
|
||||
selectPhoneVerifyErrorMessage,
|
||||
selectEmailAlreadyExists,
|
||||
selectEmailNewErrorMessage,
|
||||
selectEmailNewIsPending,
|
||||
selectEmailToVerify,
|
||||
@@ -33,7 +32,6 @@ 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,20 +105,16 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { emailAlreadyExists, emailNewPending } = this.props;
|
||||
const { emailNewPending } = this.props;
|
||||
|
||||
return (
|
||||
<View style={firstRunStyle.container}>
|
||||
<Text style={rewardStyle.verificationTitle}>
|
||||
{Constants.PHASE_COLLECTION === this.state.phase
|
||||
? __('Email')
|
||||
: emailAlreadyExists
|
||||
? __('Sign In')
|
||||
: __('Verify Email')}
|
||||
{Constants.PHASE_COLLECTION === this.state.phase ? __('Email') : __('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}
|
||||
@@ -142,7 +138,7 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
<Button
|
||||
style={rewardStyle.verificationButton}
|
||||
theme={'light'}
|
||||
text={__('Continue')}
|
||||
text={__('Send verification email')}
|
||||
onPress={this.onSendVerificationPressed}
|
||||
/>
|
||||
)}
|
||||
@@ -158,12 +154,8 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
{Constants.PHASE_VERIFICATION === this.state.phase && (
|
||||
<View>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
{__('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')}
|
||||
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.
|
||||
</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') : __('Phone Number')}
|
||||
{this.state.phase === Constants.PHASE_VERIFICATION ? 'Verify ' : ''}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%', { phone })}.
|
||||
Please enter the verification code sent to {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,7 +14,7 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
state = {
|
||||
checkSyncStarted: false,
|
||||
password: null,
|
||||
placeholder: __('password'),
|
||||
placeholder: 'password',
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
syncChecked: false,
|
||||
@@ -182,7 +182,7 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
}}
|
||||
onBlur={() => {
|
||||
if (!this.state.password || this.state.password.length === 0) {
|
||||
this.setState({ placeholder: __('password') });
|
||||
this.setState({ placeholder: 'password' });
|
||||
}
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -118,7 +118,6 @@ class VerificationScreen extends React.PureComponent {
|
||||
addUserEmail,
|
||||
checkSync,
|
||||
emailNewErrorMessage,
|
||||
emailAlreadyExists,
|
||||
emailNewPending,
|
||||
emailToVerify,
|
||||
getSync,
|
||||
@@ -149,7 +148,6 @@ class VerificationScreen extends React.PureComponent {
|
||||
page = (
|
||||
<EmailVerifyPage
|
||||
addUserEmail={addUserEmail}
|
||||
emailAlreadyExists={emailAlreadyExists}
|
||||
emailNewErrorMessage={emailNewErrorMessage}
|
||||
emailNewPending={emailNewPending}
|
||||
emailToVerify={emailToVerify}
|
||||
|
||||
Reference in new issue
Block a user