diff --git a/CHANGELOG.md b/CHANGELOG.md index 4368139970..f4ce90becd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ Changelog - New validation message for transactions which are to big in data size ([PR 1308](https://github.com/input-output-hk/daedalus/pull/1308), [PR 1331](https://github.com/input-output-hk/daedalus/pull/1331)) - Structured logging for Daedalus in JSON format, matching the structured logging format used in Cardano SL ([PR 1299](https://github.com/input-output-hk/daedalus/pull/1299)) - Additional instructions for paper wallet certificate creation ([PR 1309](https://github.com/input-output-hk/daedalus/pull/1309)) -- Performant rendering of big lists using virtual lists, applied to lists of transactions and addresses ([PR 1276](https://github.com/input-output-hk/daedalus/pull/1276), [PR 1303](https://github.com/input-output-hk/daedalus/pull/1303), [PR 1305](https://github.com/input-output-hk/daedalus/pull/1305), [PR 1306](https://github.com/input-output-hk/daedalus/pull/1306), [PR 1312](https://github.com/input-output-hk/daedalus/pull/1312), [PR 1313](https://github.com/input-output-hk/daedalus/pull/1313)) +- Performant rendering of big lists using virtual lists, applied to lists of transactions and addresses ([PR 1276](https://github.com/input-output-hk/daedalus/pull/1276), [PR 1303](https://github.com/input-output-hk/daedalus/pull/1303), [PR 1305](https://github.com/input-output-hk/daedalus/pull/1305), [PR 1306](https://github.com/input-output-hk/daedalus/pull/1306), [PR 1312](https://github.com/input-output-hk/daedalus/pull/1312), [PR 1313](https://github.com/input-output-hk/daedalus/pull/1313), [PR 1340](https://github.com/input-output-hk/daedalus/pull/1340)) - "System-info.json" file saved in the public log folder, containing the system specification of the user's computer running Daedalus ([PR 1292](https://github.com/input-output-hk/daedalus/pull/1292)) - Block storage consolidation status screen, available from the application menu ([PR 1275](https://github.com/input-output-hk/daedalus/pull/1275), [PR 1294](https://github.com/input-output-hk/daedalus/pull/1294)) - Application menu in English and Japanese ([PR 1262](https://github.com/input-output-hk/daedalus/pull/1262), [PR 1296](https://github.com/input-output-hk/daedalus/pull/1296)) diff --git a/cardano-sl-src.json b/cardano-sl-src.json index 7cd01f5608..b3cd631de8 100644 --- a/cardano-sl-src.json +++ b/cardano-sl-src.json @@ -1,6 +1,6 @@ { "url": "https://github.com/input-output-hk/cardano-sl", - "rev": "0e51690a30bf510c2a9a6249a80324d18e7bb6c4", - "sha256": "1ldrph59iwnm3v0hfrx1rzd3rhp7w9a4ayifvh04f75sjdx3lp2q", + "rev": "35e8f14b88733a39e4abc7e06d55562ef10986ee", + "sha256": "0iirlrrm84h6s3h30x5021n0p2ljvqwpmf03s3wik8lgb0hfy1y3", "fetchSubmodules": false } diff --git a/source/renderer/app/containers/Root.js b/source/renderer/app/containers/Root.js index 5bb840f1a4..638a8fbeae 100644 --- a/source/renderer/app/containers/Root.js +++ b/source/renderer/app/containers/Root.js @@ -24,7 +24,7 @@ export default class Root extends Component { const isPageThatDoesntNeedWallets = ( isBlockConsolidationStatusPage || - (isAdaRedemptionPage && hasLoadedWallets) + (isAdaRedemptionPage && hasLoadedWallets && isSynced) ); // In case node is in stopping sequence we must show the "Connecting" screen @@ -42,7 +42,7 @@ export default class Root extends Component { if ( !isSynced || - !wallets.hasLoadedWallets || + !hasLoadedWallets || !isSystemTimeCorrect || isNotEnoughDiskSpace ) { diff --git a/source/renderer/app/stores/NetworkStatusStore.js b/source/renderer/app/stores/NetworkStatusStore.js index 6ecac2e2bd..37fe6380e1 100644 --- a/source/renderer/app/stores/NetworkStatusStore.js +++ b/source/renderer/app/stores/NetworkStatusStore.js @@ -499,6 +499,8 @@ export default class NetworkStatusStore extends Store { } Logger.debug('NetworkStatusStore: Connection Lost. Reconnecting...'); } else if (this.hasBeenConnected) { + // Make sure all wallets data is fully reloaded after the connection is re-established + this.stores.wallets.resetWalletsData(); Logger.debug('NetworkStatusStore: Connection Restored'); } } diff --git a/source/renderer/app/stores/WalletsStore.js b/source/renderer/app/stores/WalletsStore.js index c28fad0ab3..67ded1628f 100644 --- a/source/renderer/app/stores/WalletsStore.js +++ b/source/renderer/app/stores/WalletsStore.js @@ -332,6 +332,12 @@ export default class WalletsStore extends Store { } }; + @action resetWalletsData = () => { + this.walletsRequest.reset(); + this.stores.addresses.addressesRequests = []; + this.stores.transactions.transactionsRequests = []; + }; + @action _setIsRestoreActive = (restoringWalletId: ?string) => { this.isRestoreActive = restoringWalletId !== null; this.restoringWalletId = restoringWalletId;