Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
372a572ee6 | ||
|
|
01eb112888 | ||
|
|
bb9e990f5a | ||
|
|
3237652d35 | ||
|
|
fd715886cd |
No files matched your search
@@ -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>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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}>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -21,6 +21,7 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
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 });
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user