Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f1c48e734e | ||
|
|
f202943adb | ||
|
|
bc04f7105b | ||
|
|
13fd9002fa | ||
|
|
fe5462971e |
No files matched your search
@@ -3,7 +3,7 @@ import { doSetClientSetting } from 'redux/actions/settings';
|
||||
import { makeSelectClientSetting } from 'redux/selectors/settings';
|
||||
import { doToast } from 'lbry-redux';
|
||||
import { selectUserEmail } from 'lbryinc';
|
||||
import Constants from 'constants';
|
||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||
import WalletSyncDriver from './view';
|
||||
|
||||
const select = state => ({
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React from 'react';
|
||||
import { Alert, NativeModules, Switch, Text, View } from 'react-native';
|
||||
import Button from 'component/button';
|
||||
import Constants from 'constants';
|
||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||
import Link from 'component/link';
|
||||
import walletStyle from 'styles/wallet';
|
||||
|
||||
@@ -43,7 +43,7 @@ class WalletSyncDriver extends React.PureComponent<Props> {
|
||||
<Text style={walletStyle.labelText}>Sync status</Text>
|
||||
</View>
|
||||
<View style={walletStyle.tableColRow}>
|
||||
<Text selectable={true} style={walletStyle.valueText}>
|
||||
<Text selectable style={walletStyle.valueText}>
|
||||
{deviceWalletSynced ? 'On' : 'Off'}
|
||||
</Text>
|
||||
<Switch
|
||||
@@ -59,8 +59,8 @@ class WalletSyncDriver extends React.PureComponent<Props> {
|
||||
<Text style={walletStyle.labelText}>Connected email</Text>
|
||||
</View>
|
||||
<View style={walletStyle.tableCol}>
|
||||
<Text selectable={true} style={walletStyle.valueText}>
|
||||
{userEmail ? userEmail : 'No connected email'}
|
||||
<Text selectable style={walletStyle.valueText} numberOfLines={1}>
|
||||
{userEmail || 'No connected email'}
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
@@ -61,6 +61,7 @@ class FilePage extends React.PureComponent {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
attemptAutoGet: false,
|
||||
autoPlayMedia: false,
|
||||
autoDownloadStarted: false,
|
||||
downloadButtonShown: false,
|
||||
@@ -189,10 +190,12 @@ class FilePage extends React.PureComponent {
|
||||
const {
|
||||
claim,
|
||||
contentType,
|
||||
costInfo,
|
||||
fileInfo,
|
||||
isResolvingUri,
|
||||
resolveUri,
|
||||
navigation,
|
||||
purchaseUri,
|
||||
searchRecommended,
|
||||
title,
|
||||
} = this.props;
|
||||
@@ -214,6 +217,21 @@ class FilePage extends React.PureComponent {
|
||||
uri: this.state.uri,
|
||||
};
|
||||
}
|
||||
|
||||
// attempt to retrieve images and html/text automatically once the claim is loaded, and it's free
|
||||
const mediaType = Lbry.getMediaType(contentType);
|
||||
const isViewable = mediaType === 'image' || mediaType === 'text';
|
||||
if (claim && costInfo && costInfo.cost === 0 && !this.state.autoGetAttempted && isViewable) {
|
||||
this.setState(
|
||||
{
|
||||
autoGetAttempted: true,
|
||||
downloadPressed: true,
|
||||
autoPlayMedia: true,
|
||||
stopDownloadConfirmed: false,
|
||||
},
|
||||
() => purchaseUri(claim.permanent_url, costInfo, true)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fetchFileInfo(props) {
|
||||
|
||||
@@ -28,12 +28,32 @@ class WalletPage extends React.PureComponent {
|
||||
walletReady: false,
|
||||
hasCheckedSync: false,
|
||||
revealPassword: false,
|
||||
autoPassword: false,
|
||||
autoLoginAttempted: false,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
this.checkWalletReady();
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
const { hasSyncedWallet, getSyncIsPending, onPasswordChanged, autoLogin } = this.props;
|
||||
if (this.state.walletReady && this.state.hasCheckedSync && !getSyncIsPending) {
|
||||
if (!hasSyncedWallet && !this.state.autoPassword) {
|
||||
// new account, in which case, don't ask for a password, and act as the final first run step
|
||||
this.setState({ password: '', autoPassword: true });
|
||||
if (onPasswordChanged) {
|
||||
onPasswordChanged('', true);
|
||||
}
|
||||
}
|
||||
|
||||
if (hasSyncedWallet && !this.state.autoLoginAttempted && autoLogin) {
|
||||
autoLogin();
|
||||
this.setState({ autoLoginAttempted: true });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
checkWalletReady = () => {
|
||||
// make sure the sdk wallet component is ready
|
||||
Lbry.status()
|
||||
@@ -69,6 +89,7 @@ class WalletPage extends React.PureComponent {
|
||||
hasSyncedWallet,
|
||||
syncApplyIsPending,
|
||||
syncApplyStarted,
|
||||
syncApplyCompleted,
|
||||
} = this.props;
|
||||
|
||||
let content;
|
||||
@@ -79,14 +100,15 @@ class WalletPage extends React.PureComponent {
|
||||
<Text style={firstRunStyle.paragraph}>Retrieving your account information...</Text>
|
||||
</View>
|
||||
);
|
||||
} else if (syncApplyStarted || syncApplyIsPending) {
|
||||
} else if (syncApplyStarted || syncApplyIsPending || syncApplyCompleted) {
|
||||
content = (
|
||||
<View style={firstRunStyle.centered}>
|
||||
<ActivityIndicator size="large" color={Colors.White} style={firstRunStyle.waiting} />
|
||||
<Text style={firstRunStyle.paragraph}>{syncApplyIsPending ? 'Validating password' : 'Synchronizing'}...</Text>
|
||||
</View>
|
||||
);
|
||||
} else {
|
||||
} else if (hasSyncedWallet && this.state.autoLoginAttempted) {
|
||||
// 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>
|
||||
|
||||
@@ -35,6 +35,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
showBottomContainer: false,
|
||||
walletPassword: '',
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
@@ -78,8 +79,9 @@ 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 });
|
||||
this.setState({ showBottomContainer: true, syncApplyStarted: false, syncApplyCompleted: false });
|
||||
} else {
|
||||
this.setState({ syncApplyCompleted: true });
|
||||
// password successfully verified
|
||||
NativeModules.UtilityModule.setSecureValue(
|
||||
Constants.KEY_WALLET_PASSWORD,
|
||||
@@ -160,6 +162,13 @@ class FirstRunScreen extends React.PureComponent {
|
||||
});
|
||||
};
|
||||
|
||||
autoLogin = () => {
|
||||
const { hasSyncedWallet } = this.props;
|
||||
if (hasSyncedWallet && !this.state.syncApplyStarted) {
|
||||
this.checkWalletPassword();
|
||||
}
|
||||
};
|
||||
|
||||
handleContinuePressed = () => {
|
||||
const { notify, user, hasSyncedWallet } = this.props;
|
||||
const pageIndex = FirstRunScreen.pages.indexOf(this.state.currentPage);
|
||||
@@ -265,8 +274,12 @@ class FirstRunScreen extends React.PureComponent {
|
||||
this.setState({ showBottomContainer: true, showSkip: true });
|
||||
};
|
||||
|
||||
onWalletPasswordChanged = password => {
|
||||
onWalletPasswordChanged = (password, finalStep) => {
|
||||
this.setState({ walletPassword: password !== null ? password : '' });
|
||||
if (finalStep) {
|
||||
// final step for a new user
|
||||
this.setFreshPassword();
|
||||
}
|
||||
};
|
||||
|
||||
onWalletViewLayout = () => {
|
||||
@@ -372,8 +385,10 @@ class FirstRunScreen extends React.PureComponent {
|
||||
getSyncIsPending={getSyncIsPending}
|
||||
syncApplyIsPending={syncApplyIsPending}
|
||||
syncApplyStarted={this.state.syncApplyStarted}
|
||||
syncApplyCompleted={this.state.syncApplyCompleted}
|
||||
onWalletViewLayout={this.onWalletViewLayout}
|
||||
onPasswordChanged={this.onWalletPasswordChanged}
|
||||
autoLogin={this.autoLogin}
|
||||
/>
|
||||
);
|
||||
break;
|
||||
|
||||
@@ -16,8 +16,12 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
password: null,
|
||||
placeholder: 'password',
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
syncChecked: false,
|
||||
revealPassword: false,
|
||||
autoPassword: false,
|
||||
autoLoginAttempted: false,
|
||||
autoLoginFlow: true,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
@@ -64,9 +68,11 @@ 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 });
|
||||
this.setState({ syncApplyStarted: false, autoLoginFlow: false });
|
||||
} else {
|
||||
// password successfully verified
|
||||
this.setState({ syncApplyCompleted: true });
|
||||
|
||||
if (NativeModules.UtilityModule) {
|
||||
NativeModules.UtilityModule.setSecureValue(
|
||||
Constants.KEY_WALLET_PASSWORD,
|
||||
@@ -79,6 +85,19 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
}
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
const { hasSyncedWallet } = this.props;
|
||||
if (this.state.syncChecked && !this.state.autoPassword && !hasSyncedWallet) {
|
||||
// new user sync, don't prompt for a password
|
||||
this.setState({ password: '', autoPassword: true });
|
||||
this.onEnableSyncPressed();
|
||||
}
|
||||
|
||||
if (this.state.syncChecked && hasSyncedWallet && !this.state.autoLoginAttempted) {
|
||||
this.setState({ autoLoginAttempted: true, password: '' }, () => this.onEnableSyncPressed());
|
||||
}
|
||||
}
|
||||
|
||||
finishSync = (notifyUnlockFailed = false) => {
|
||||
const { navigation, notify, setClientSetting } = this.props;
|
||||
|
||||
@@ -133,7 +152,16 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
<Text style={firstRunStyle.paragraph}>Retrieving your account information...</Text>
|
||||
</View>
|
||||
);
|
||||
} else {
|
||||
} else if (this.state.autoLoginFlow && (syncApplyIsPending || this.state.syncApplyCompleted)) {
|
||||
// first attempt at auto-login, only display activity indicator
|
||||
content = (
|
||||
<View>
|
||||
<View style={firstRunStyle.centerInside}>
|
||||
<ActivityIndicator size={'small'} color={Colors.White} />
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
} else if (hasSyncedWallet && this.state.autoLoginAttempted) {
|
||||
content = (
|
||||
<View>
|
||||
<Text style={rewardStyle.verificationTitle}>Wallet Sync</Text>
|
||||
@@ -198,7 +226,7 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
onPress={this.onEnableSyncPressed}
|
||||
/>
|
||||
)}
|
||||
{syncApplyIsPending && (
|
||||
{(syncApplyIsPending || this.state.syncApplyCompleted) && (
|
||||
<View style={firstRunStyle.centerInside}>
|
||||
<ActivityIndicator size={'small'} color={Colors.White} />
|
||||
</View>
|
||||
|
||||
Reference in new issue
Block a user