Skip to content

Commit

Permalink
Merge branch 'develop' into chore/ddw-453-earned-delegation-rewards-e…
Browse files Browse the repository at this point in the history
…xport-csv-button-update-styles
  • Loading branch information
topseniors committed Apr 8, 2021
2 parents 8ef1708 + bf22ed9 commit 5e273d4
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 @@ -6,6 +6,7 @@ Changelog
### Chores

- Updated header section styles of delegation rewards screen ([PR 2509](https://github.com/input-output-hk/daedalus/pull/2509))
- Reduced the clock drift tolerance to 4,5 seconds ([PR 2510](https://github.com/input-output-hk/daedalus/pull/2510))
- Updates Catalyst Fund4 dates ([PR 2495](https://github.com/input-output-hk/daedalus/pull/2495))
- Updated `cardano-wallet` to revision `7df30796` ([PR 2495](https://github.com/input-output-hk/daedalus/pull/2495))

Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/config/timingConfig.js
Expand Up @@ -10,7 +10,7 @@ export const NOTIFICATION_DEFAULT_DURATION = 10 * 1000; // 10 seconds / unit: mi
export const ADDRESS_COPY_NOTIFICATION_SMALL_DURATION = 3; // unit: seconds
export const DELETE_WALLET_COUNTDOWN = 10; // unit: seconds
export const FORM_VALIDATION_DEBOUNCE_WAIT = 250; // unit: milliseconds
export const ALLOWED_TIME_DIFFERENCE = 15 * 1000000; // 15 seconds | unit: microseconds
export const ALLOWED_TIME_DIFFERENCE = 4.5 * 1000000; // 4.5 seconds | unit: microseconds
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
Expand Down

0 comments on commit 5e273d4

Please sign in to comment.