LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

password fix 2

Browse source
This commit is contained in:
jessop 2020-09-18 09:55:43 -04:00 • committed by Sean Yesmunt
parent 5f54469971
commit 99955ba59c
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
static/app-strings.json
View file

@ -1308,5 +1308,6 @@
"Enabling sync will switch to your cloud profile.": "Enabling sync will switch to your cloud profile.",
"Disabling sync will switch to your local profile.": "Disabling sync will switch to your local profile.",
"Something went wrong...": "Something went wrong...",
"To enable Sync, close LBRY completely and check 'Remember Password' during wallet unlock.": "To enable Sync, close LBRY completely and check 'Remember Password' during wallet unlock.",
"--end--": "--end--"
}

41
ui/component/syncEnableFlow/view.jsx
View file

@ -47,6 +47,7 @@ function SyncEnableFlow(props: Props) {
const [step, setStep] = React.useState(INITIAL);
const [prefDict, setPrefDict]: [any, (any) => void] = React.useState();
const [error, setError] = React.useState();
const [password, setPassword] = React.useState('');
const handleSyncToggle = async () => {
const shared = prefDict.shared;
@ -108,36 +109,32 @@ function SyncEnableFlow(props: Props) {
if (mode) {
checkSync();
if (mode === ENABLE_MODE) {
setStep(FETCH_FOR_ENABLE);
getSavedPassword().then(pw => {
setPassword(pw);
setStep(FETCH_FOR_ENABLE);
});
} else {
setStep(FETCH_FOR_DISABLE);
}
}
}, [mode]);
}, [mode, setPassword]);
React.useEffect(() => {
if (step === FETCH_FOR_ENABLE) {
getSavedPassword()
.then(pw => {
getSync(pw, (e, hasChanged) => {
if (e) {
setStep(ERROR);
setError(e && e.message ? e.message : e);
} else {
Lbry.preference_get().then(result => {
const prefs = {};
if (result[SHARED_KEY]) prefs[SHARED_KEY] = result[SHARED_KEY];
if (result[LOCAL_KEY]) prefs[LOCAL_KEY] = result[LOCAL_KEY];
setPrefDict(prefs);
setStep(CONFIRM);
});
}
});
})
.catch(e => {
getSync(password, (e, hasChanged) => {
if (e) {
setStep(ERROR);
setError(e && e.message ? e.message : e);
});
} else {
Lbry.preference_get().then(result => {
const prefs = {};
if (result[SHARED_KEY]) prefs[SHARED_KEY] = result[SHARED_KEY];
if (result[LOCAL_KEY]) prefs[LOCAL_KEY] = result[LOCAL_KEY];
setPrefDict(prefs);
setStep(CONFIRM);
});
}
});
}
if (step === FETCH_FOR_DISABLE) {
Lbry.preference_get().then(result => {
@ -148,7 +145,7 @@ function SyncEnableFlow(props: Props) {
setStep(CONFIRM);
});
}
}, [step, setPrefDict, setStep]);
}, [step, setPrefDict, setStep, password]);
if (getSyncPending) {
return (