diff --git a/views/Wallet/Wallet.tsx b/views/Wallet/Wallet.tsx index 64a8117d0..cdd95ed7a 100644 --- a/views/Wallet/Wallet.tsx +++ b/views/Wallet/Wallet.tsx @@ -273,31 +273,6 @@ export default class Wallet extends React.Component { }); } - async refresh() { - const { - NodeInfoStore, - BalanceStore, - ChannelsStore, - ChannelBackupStore, - LightningAddressStore, - LSPStore, - SyncStore, - SettingsStore - } = this.props; - - if (SettingsStore.connecting) { - NodeInfoStore.reset(); - BalanceStore.reset(); - ChannelsStore.reset(); - SyncStore.reset(); - LightningAddressStore.reset(); - LSPStore.reset(); - ChannelBackupStore.reset(); - } - - this.getSettingsAndNavigate(); - } - async fetchData() { const { NodeInfoStore, @@ -332,6 +307,16 @@ export default class Wallet extends React.Component { settings; const expressGraphSyncEnabled = settings.expressGraphSync; + if (connecting) { + NodeInfoStore.reset(); + BalanceStore.reset(); + ChannelsStore.reset(); + SyncStore.reset(); + LightningAddressStore.reset(); + LSPStore.reset(); + ChannelBackupStore.reset(); + } + LnurlPayStore.reset(); if (pos && pos.squareEnabled && posStatus === 'active') @@ -503,7 +488,7 @@ export default class Wallet extends React.Component { RNRestart.Restart(); } else { setConnectingStatus(true); - this.refresh(); + this.getSettingsAndNavigate(); } }} /> @@ -516,7 +501,7 @@ export default class Wallet extends React.Component { navigation={navigation} BalanceStore={BalanceStore} UnitsStore={UnitsStore} - onRefresh={() => this.refresh()} + onRefresh={() => this.getSettingsAndNavigate()} locked={isSyncing} />