mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-02-23 15:20:55 +01:00
Merge branch 'master' into translations_loc-en-json--master_es_ES
This commit is contained in:
commit
a1c48814e2
2 changed files with 7 additions and 5 deletions
|
@ -268,7 +268,7 @@ export class LightningLdkWallet extends LightningCustodianWallet {
|
|||
|
||||
this._execInBackground(this.reestablishChannels);
|
||||
if (this.timeToCheckBlockchain()) this._execInBackground(this.checkBlockchain);
|
||||
} catch (error) {
|
||||
} catch (error: any) {
|
||||
alert('LDK init error: ' + error.message);
|
||||
}
|
||||
}
|
||||
|
@ -491,7 +491,9 @@ export class LightningLdkWallet extends LightningCustodianWallet {
|
|||
|
||||
try {
|
||||
await this.reconnectPeersWithPendingChannels();
|
||||
} finally {
|
||||
} catch (error: any) {
|
||||
console.log('fetchTransactions failed');
|
||||
console.log(error.message);
|
||||
}
|
||||
|
||||
await this.getUserInvoices(); // it internally updates paid user invoices
|
||||
|
@ -673,7 +675,7 @@ export class LightningLdkWallet extends LightningCustodianWallet {
|
|||
(async () => {
|
||||
try {
|
||||
await func.call(that);
|
||||
} catch (error) {
|
||||
} catch (error: any) {
|
||||
alert('_execInBackground error:' + error.message);
|
||||
}
|
||||
})();
|
||||
|
|
|
@ -273,7 +273,7 @@ const LdkOpenChannel = (props: any) => {
|
|||
address={remoteHostWithPubkey}
|
||||
isLoading={isLoading}
|
||||
inputAccessoryViewID={(BlueDismissKeyboardInputAccessory as any).InputAccessoryViewID}
|
||||
onChangeText={(text) => setParams({ remoteHostWithPubkey: text })}
|
||||
onChangeText={text => setParams({ remoteHostWithPubkey: text })}
|
||||
onBarScanned={onBarScanned}
|
||||
launchedBy={name}
|
||||
/>
|
||||
|
@ -282,7 +282,7 @@ const LdkOpenChannel = (props: any) => {
|
|||
<ArrowPicker
|
||||
onChange={newKey => {
|
||||
const nodes = LightningLdkWallet.getPredefinedNodes();
|
||||
if (nodes[newKey]) setParams({ remoteHostWithPubkey: nodes[newKey]});
|
||||
if (nodes[newKey]) setParams({ remoteHostWithPubkey: nodes[newKey] });
|
||||
}}
|
||||
items={LightningLdkWallet.getPredefinedNodes()}
|
||||
isItemUnknown={!Object.values(LightningLdkWallet.getPredefinedNodes()).some(node => node === remoteHostWithPubkey)}
|
||||
|
|
Loading…
Add table
Reference in a new issue