mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix QR-code auto-retry logic

Browse source
This commit is contained in:
Fedor Indutny 2025-01-28 09:11:22 -08:00 • committed by GitHub
commit fb04b1ede3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ts/components/installScreen/InstallScreenQrCodeNotScannedStep.tsx
View file

@ -132,10 +132,35 @@ function InstallScreenQrCode(
retryGetQrCode: () => void;
}
): ReactElement {
const { i18n } = props;
const { i18n, retryGetQrCode } = props;
let contents: ReactNode;
const loadError =
props.loadingState === LoadingState.LoadFailed ? props.error : undefined;
useEffect(() => {
if (loadError !== InstallScreenQRCodeError.MaxRotations) {
return noop;
}
const cleanup = () => {
document.removeEventListener('visibilitychange', onVisibilityChange);
};
const onVisibilityChange = () => {
if (document.hidden) {
return;
}
cleanup();
retryGetQrCode();
};
document.addEventListener('visibilitychange', onVisibilityChange);
return cleanup;
}, [retryGetQrCode, loadError]);
let isJustButton = false;
switch (props.loadingState) {
case LoadingState.Loading:
@ -151,7 +176,7 @@ function InstallScreenQrCode(
>
{i18n('icu:Install__qr-failed-load__error--timeout')}
</span>
<RetryButton onClick={props.retryGetQrCode}>
<RetryButton onClick={retryGetQrCode}>
{i18n('icu:Install__qr-failed-load__retry')}
</RetryButton>
</>
@ -169,7 +194,7 @@ function InstallScreenQrCode(
components={{ paragraph: Paragraph }}
/>
</span>
<RetryButton onClick={props.retryGetQrCode}>
<RetryButton onClick={retryGetQrCode}>
{i18n('icu:Install__qr-failed-load__retry')}
</RetryButton>
</>
@ -198,7 +223,7 @@ function InstallScreenQrCode(
case InstallScreenQRCodeError.MaxRotations:
isJustButton = true;
contents = (
<RetryButton onClick={props.retryGetQrCode}>
<RetryButton onClick={retryGetQrCode}>
{i18n('icu:Install__qr-max-rotations__retry')}
</RetryButton>
);