dn724/dnault
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

U2F fixes

Browse source
This commit is contained in:
Aleksander Rem 2022-02-06 17:33:58 +01:00
commit 5f57733aca
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop-app/src/lib/ledger.ts
View file

@ -34,7 +34,7 @@ export interface LedgerData {
export class LedgerService { export class LedgerService {
walletPrefix = `44'/165'/`; walletPrefix = `44'/165'/`;
waitTimeout = 30000; waitTimeout = 30000;
pollInterval = 10000; pollInterval = 5000;
pollingLedger = false; pollingLedger = false;
queryingLedger = false; queryingLedger = false;

2
src/app/components/configure-wallet/configure-wallet.component.html
View file

@ -381,7 +381,7 @@
<div uk-icon="icon: warning; ratio: 2;"></div> <div uk-icon="icon: warning; ratio: 2;"></div>
</div> </div>
<p> <p>
<b>No Compatible Bluetooth Hardware Detected</b><br> <b>No Compatible Bluetooth Hardware</b><br>
The Bluetooth support in Nault for desktop is limited to only specific Bluetooth modules.<br> The Bluetooth support in Nault for desktop is limited to only specific Bluetooth modules.<br>
For better compatibility, please try <a href="https://nault.cc" target="_blank" rel="noopener noreferrer">Nault.cc</a> in a browser with Bluetooth support (Chrome, Edge, Opera or Brave). For better compatibility, please try <a href="https://nault.cc" target="_blank" rel="noopener noreferrer">Nault.cc</a> in a browser with Bluetooth support (Chrome, Edge, Opera or Brave).
</p> </p>

6
src/app/services/ledger.service.ts
View file

@ -48,6 +48,7 @@ export class LedgerService {
waitTimeout = 30000; waitTimeout = 30000;
pollInterval = 5000; pollInterval = 5000;
u2fPollInterval = 30000;
pollingLedger = false; pollingLedger = false;
@ -445,7 +446,7 @@ export class LedgerService {
await this.loadLedger(); // Make sure ledger is ready await this.loadLedger(); // Make sure ledger is ready
} }
if (this.isDesktop) { if (this.isDesktop) {
return this.signBlockDesktop(accountIndex, blockData); return await this.signBlockDesktop(accountIndex, blockData);
} else { } else {
return await this.ledger.nano.signBlock(this.ledgerPath(accountIndex), blockData); return await this.ledger.nano.signBlock(this.ledgerPath(accountIndex), blockData);
} }
@ -474,9 +475,10 @@ export class LedgerService {
pollLedgerStatus() { pollLedgerStatus() {
if (!this.pollingLedger) return; if (!this.pollingLedger) return;
setTimeout(async () => { setTimeout(async () => {
if (!this.pollingLedger) return;
await this.checkLedgerStatus(); await this.checkLedgerStatus();
this.pollLedgerStatus(); this.pollLedgerStatus();
}, this.pollInterval); }, this.transportMode === 'U2F' ? this.u2fPollInterval : this.pollInterval);
} }
async checkLedgerStatus() { async checkLedgerStatus() {