Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ddw-754-update-catalyst-links
Browse files Browse the repository at this point in the history
  • Loading branch information
mchappell committed Oct 26, 2021
2 parents c4bcc41 + 1c13cfa commit ab3d5b2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,7 @@

### Features

- Fixed the Delegation popover timeout ([PR 2722](https://github.com/input-output-hk/daedalus/pull/2722))
- Removed "Alonzo tada" icon and "Alonzo countdown" screen ([PR 2708](https://github.com/input-output-hk/daedalus/pull/2708))

### Fixes
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/config/timingConfig.js
Expand Up @@ -14,7 +14,7 @@ export const ALLOWED_TIME_DIFFERENCE = 4.5 * 1000000; // 4.5 seconds | unit: mic
export const NETWORK_STATUS_POLL_INTERVAL = 2000; // 2 seconds | unit: milliseconds
export const NETWORK_CLOCK_POLL_INTERVAL = 1000; // 1 second | unit: milliseconds
export const WALLET_UTXO_API_REQUEST_INTERVAL = 5 * 1000; // 5 seconds | unit: milliseconds
export const STAKE_POOL_TOOLTIP_HOVER_WAIT = 100; // 700 milliseconds | unit: milliseconds
export const STAKE_POOL_TOOLTIP_HOVER_WAIT = 500; // 500 milliseconds | unit: milliseconds
export const COPY_STATE_DIRECTORY_PATH_NOTIFICATION_DURATION = 10; // unit: seconds
export const NEWS_POLL_INTERVAL = 30 * 60 * 1000; // 30 minutes | unit: milliseconds
export const NEWS_POLL_INTERVAL_ON_ERROR = 1 * 60 * 1000; // 1 minute | unit: milliseconds
Expand Down

0 comments on commit ab3d5b2

Please sign in to comment.