Merge branch 'catalyst-qr-codes' of https://github.com/input-output-h…

…k/daedalus into catalyst-qr-codes
input-output-hk · Nov 24, 2020 · 30d9c4e · 30d9c4e
2 parents 82cbad0 + 2bfb2bd
commit 30d9c4e
Show file tree

Hide file tree

Showing 41 changed files with 1 addition and 1 deletion.
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_1024x1024.png b/installers/icons/mainnet_catalyst.iconset/icon_1024x1024.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_1024x1024@2x.png b/installers/icons/mainnet_catalyst.iconset/icon_1024x1024@2x.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_128x128.png b/installers/icons/mainnet_catalyst.iconset/icon_128x128.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_128x128@2x.png b/installers/icons/mainnet_catalyst.iconset/icon_128x128@2x.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_256x256.png b/installers/icons/mainnet_catalyst.iconset/icon_256x256.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_256x256@2x.png b/installers/icons/mainnet_catalyst.iconset/icon_256x256@2x.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_40x40.png b/installers/icons/mainnet_catalyst.iconset/icon_40x40.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_40x40@2x.png b/installers/icons/mainnet_catalyst.iconset/icon_40x40@2x.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_48x48.png b/installers/icons/mainnet_catalyst.iconset/icon_48x48.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_48x48@2x.png b/installers/icons/mainnet_catalyst.iconset/icon_48x48@2x.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_512x512.png b/installers/icons/mainnet_catalyst.iconset/icon_512x512.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_512x512@2x.png b/installers/icons/mainnet_catalyst.iconset/icon_512x512@2x.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_64x64.png b/installers/icons/mainnet_catalyst.iconset/icon_64x64.png
diff --git a/installers/icons/mainnet_catalyst.iconset/icon_64x64@2x.png b/installers/icons/mainnet_catalyst.iconset/icon_64x64@2x.png
diff --git a/installers/icons/mainnet_catalyst/1024x1024.png b/installers/icons/mainnet_catalyst/1024x1024.png
diff --git a/installers/icons/mainnet_catalyst/1024x1024@2x.png b/installers/icons/mainnet_catalyst/1024x1024@2x.png
diff --git a/installers/icons/mainnet_catalyst/128x128.ico b/installers/icons/mainnet_catalyst/128x128.ico
diff --git a/installers/icons/mainnet_catalyst/128x128.png b/installers/icons/mainnet_catalyst/128x128.png
diff --git a/installers/icons/mainnet_catalyst/128x128@2x.png b/installers/icons/mainnet_catalyst/128x128@2x.png
diff --git a/installers/icons/mainnet_catalyst/16x16@2x.png b/installers/icons/mainnet_catalyst/16x16@2x.png
diff --git a/installers/icons/mainnet_catalyst/18x18@2x.png b/installers/icons/mainnet_catalyst/18x18@2x.png
diff --git a/installers/icons/mainnet_catalyst/19x19@2x.png b/installers/icons/mainnet_catalyst/19x19@2x.png
diff --git a/installers/icons/mainnet_catalyst/22x22@2x.png b/installers/icons/mainnet_catalyst/22x22@2x.png
diff --git a/installers/icons/mainnet_catalyst/24x24@2x.png b/installers/icons/mainnet_catalyst/24x24@2x.png
diff --git a/installers/icons/mainnet_catalyst/256x256.ico b/installers/icons/mainnet_catalyst/256x256.ico
diff --git a/installers/icons/mainnet_catalyst/256x256.png b/installers/icons/mainnet_catalyst/256x256.png
diff --git a/installers/icons/mainnet_catalyst/256x256@2x.png b/installers/icons/mainnet_catalyst/256x256@2x.png
diff --git a/installers/icons/mainnet_catalyst/32x32@2x.png b/installers/icons/mainnet_catalyst/32x32@2x.png
diff --git a/installers/icons/mainnet_catalyst/40x40.ico b/installers/icons/mainnet_catalyst/40x40.ico
diff --git a/installers/icons/mainnet_catalyst/40x40.png b/installers/icons/mainnet_catalyst/40x40.png
diff --git a/installers/icons/mainnet_catalyst/40x40@2x.png b/installers/icons/mainnet_catalyst/40x40@2x.png
diff --git a/installers/icons/mainnet_catalyst/48x48.ico b/installers/icons/mainnet_catalyst/48x48.ico
diff --git a/installers/icons/mainnet_catalyst/48x48.png b/installers/icons/mainnet_catalyst/48x48.png
diff --git a/installers/icons/mainnet_catalyst/48x48@2x.png b/installers/icons/mainnet_catalyst/48x48@2x.png
diff --git a/installers/icons/mainnet_catalyst/512x512.png b/installers/icons/mainnet_catalyst/512x512.png
diff --git a/installers/icons/mainnet_catalyst/512x512@2x.png b/installers/icons/mainnet_catalyst/512x512@2x.png
diff --git a/installers/icons/mainnet_catalyst/64x64.ico b/installers/icons/mainnet_catalyst/64x64.ico
diff --git a/installers/icons/mainnet_catalyst/64x64.png b/installers/icons/mainnet_catalyst/64x64.png
diff --git a/installers/icons/mainnet_catalyst/64x64@2x.png b/installers/icons/mainnet_catalyst/64x64@2x.png
diff --git a/installers/icons/mainnet_catalyst/mainnet_catalyst.ico b/installers/icons/mainnet_catalyst/mainnet_catalyst.ico
diff --git a/source/renderer/app/config/votingConfig.js b/source/renderer/app/config/votingConfig.js
@@ -6,4 +6,4 @@ export const PIN_CODE_LENGTH = 4;
 
 export const VOTING_REGISTRATION_TRANSACTION_CHECK_INTERVAL = 1 * 1000; // 1 second | unit: milliseconds;
 export const VOTING_REGISTRATION_TRANSACTION_CHECKER_TIMEOUT = 30 * 1000; // 30 seconds | unit: milliseconds;
-export const VOTING_COUNTDOWN_INTERVAL = 60 * 60; // 60 minutes | unit: seconds;
+export const VOTING_COUNTDOWN_INTERVAL = 60; // 60 minutes | unit: seconds;