colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Promise.race instead so both promises do not resolve

Browse Source
This commit is contained in:
Josh Perez
2023-05-15 11:08:15 -04:00
committed by GitHub
parent 7a71c6ab80
commit f6676db4d3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ts/state/smart/InstallScreen.tsx
View File

@@ -167,6 +167,7 @@ export function SmartInstallScreen(): ReactElement {
useEffect(() => { useEffect(() => {
let hasCleanedUp = false; let hasCleanedUp = false;
const qrCodeResolution = explodePromise<void>();
const accountManager = window.getAccountManager(); const accountManager = window.getAccountManager();
assertDev(accountManager, 'Expected an account manager'); assertDev(accountManager, 'Expected an account manager');
@@ -175,6 +176,7 @@ export function SmartInstallScreen(): ReactElement {
if (hasCleanedUp) { if (hasCleanedUp) {
return; return;
} }
qrCodeResolution.resolve();
setProvisioningUrl(value); setProvisioningUrl(value);
}; };
@@ -227,7 +229,8 @@ export function SmartInstallScreen(): ReactElement {
); );
const sleepMs = qrCodeBackOff.getAndIncrement(); const sleepMs = qrCodeBackOff.getAndIncrement();
log.info(`InstallScreen/getQRCode: race to ${sleepMs}ms`); log.info(`InstallScreen/getQRCode: race to ${sleepMs}ms`);
await pTimeout(qrCodePromise, sleepMs, sleepError); await pTimeout(qrCodeResolution.promise, sleepMs, sleepError);
await qrCodePromise;
window.IPC.removeSetupMenuItems(); window.IPC.removeSetupMenuItems();
} catch (error) { } catch (error) {