Merge branch 'feature/ddw-197-implement-ledger-hw-support' of github.…

…com:input-output-hk/daedalus into feature/ddw-197-implement-ledger-hw-support
input-output-hk · Nov 6, 2020 · 85b55b8 · 85b55b8
2 parents f6fa928 + 3d2d285
commit 85b55b8
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ Changelog
 
 - Added hardware wallet support for "Trezor model T" ([PR 2046](https://github.com/input-output-hk/daedalus/pull/2046))
 
+### Chores
+
+- Hided hardware wallet restoration support ([PR 2237](https://github.com/input-output-hk/daedalus/pull/2237))
+
 ## 2.4.1
 
 ### Fixes

diff --git a/source/renderer/app/config/walletRestoreConfig.js b/source/renderer/app/config/walletRestoreConfig.js
@@ -26,7 +26,7 @@ export const IMPORT_WALLET_STEPS: EnumMap<string, ImportWalletStep> = {
 export const WALLET_KINDS: EnumMap<string, WalletKind> = {
   DAEDALUS: 'Daedalus',
   YOROI: 'Yoroi',
-  HARDWARE: 'Hardware',
+  // HARDWARE: 'Hardware',
 };
 
 export const WALLET_DAEDALUS_KINDS: EnumMap<

diff --git a/source/renderer/app/themes/daedalus/cardano.js b/source/renderer/app/themes/daedalus/cardano.js
@@ -204,7 +204,7 @@ export const CARDANO_THEME_OUTPUT = {
     '--theme-dialog-big-button-background-color': '#fff',
     '--theme-dialog-big-button-border-color': '#d2d3d3',
     '--theme-dialog-big-button-label-color': '#5e6066',
-    '--theme-dialog-big-button-description-color': '#5e6066',
+    '--theme-dialog-big-button-description-color': 'rgba(94, 96, 102, 0.6)',
     '--theme-dialog-set-wallet-password-background-color':
       'rgba(32, 34, 37, 0.96)',
     '--theme-dialog-set-wallet-password-box-shadow': 'rgba(0, 0, 0, 0.25)',
@@ -283,7 +283,7 @@ export const CARDANO_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#5e6066',
     '--theme-icon-add-wallet-from-sidebar-color': '#ffffff',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#5e6066',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#ababab',
+    '--theme-icon-add-wallet-dialog-big-button-color': 'rgba(94, 96, 102, 0.5)',
     '--theme-icon-back-button-color': '#5e6066',
     '--theme-icon-close-button-color': '#5e6066',
     '--theme-icon-connecting-ada-api-logo-color': '#ffffff',

diff --git a/source/renderer/app/themes/daedalus/dark-blue.js b/source/renderer/app/themes/daedalus/dark-blue.js
@@ -287,7 +287,7 @@ export const DARK_BLUE_THEME_OUTPUT = {
     '--theme-icon-add-wallet-from-sidebar-color': '#fafbfc',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#e9f4fe',
     '--theme-icon-add-wallet-dialog-big-button-color':
-      'rgba(233, 244, 254, 0.8)',
+      'rgba(233, 244, 254, 0.5)',
     '--theme-icon-back-button-color': '#e9f4fe',
     '--theme-icon-close-button-color': '#fafbfc',
     '--theme-icon-connecting-ada-api-logo-color': '#fafbfc',

diff --git a/source/renderer/app/themes/daedalus/dark-cardano.js b/source/renderer/app/themes/daedalus/dark-cardano.js
@@ -191,7 +191,7 @@ export const DARK_CARDANO_THEME_OUTPUT = {
       'rgba(255, 255, 255, 0.4)',
     '--theme-dialog-big-button-background-color': 'rgba(255, 255, 255, 0.05)',
     '--theme-dialog-big-button-border-color': 'none',
-    '--theme-dialog-big-button-label-color': 'rgba(255, 255, 255, 1)',
+    '--theme-dialog-big-button-label-color': '#ffffff',
     '--theme-dialog-big-button-description-color': 'rgba(255, 255, 255, 0.6)',
     '--theme-dialog-set-wallet-password-background-color':
       'rgba(42, 43, 60, 0.96)',
@@ -269,7 +269,8 @@ export const DARK_CARDANO_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#ffffff',
     '--theme-icon-add-wallet-from-sidebar-color': '#ffffff',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#ffffff',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#ffffff',
+    '--theme-icon-add-wallet-dialog-big-button-color':
+      'rgba(255, 255, 255, 0.5)',
     '--theme-icon-back-button-color': '#ffffff',
     '--theme-icon-close-button-color': '#ffffff',
     '--theme-icon-connecting-ada-api-logo-color': '#ffffff',

diff --git a/source/renderer/app/themes/daedalus/flight-candidate.js b/source/renderer/app/themes/daedalus/flight-candidate.js
@@ -191,7 +191,7 @@ export const FLIGHT_CANDIDATE_THEME_OUTPUT = {
       'rgba(255, 255, 255, 0.4)',
     '--theme-dialog-big-button-background-color': 'rgba(255, 255, 255, 0.05)',
     '--theme-dialog-big-button-border-color': 'none',
-    '--theme-dialog-big-button-label-color': 'rgba(255, 255, 255, 1)',
+    '--theme-dialog-big-button-label-color': '#ffffff',
     '--theme-dialog-big-button-description-color': 'rgba(255, 255, 255, 0.6)',
     '--theme-dialog-set-wallet-password-background-color':
       'rgba(42, 43, 60, 0.96)',
@@ -269,7 +269,8 @@ export const FLIGHT_CANDIDATE_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#ffffff',
     '--theme-icon-add-wallet-from-sidebar-color': '#ffffff',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#ffffff',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#ffffff',
+    '--theme-icon-add-wallet-dialog-big-button-color':
+      'rgba(255, 255, 255, 0.5)',
     '--theme-icon-back-button-color': '#ffffff',
     '--theme-icon-close-button-color': '#ffffff',
     '--theme-icon-connecting-ada-api-logo-color': '#ffffff',

diff --git a/source/renderer/app/themes/daedalus/incentivized-testnet.js b/source/renderer/app/themes/daedalus/incentivized-testnet.js
@@ -192,7 +192,7 @@ export const INCENTIVIZED_TESTNET_THEME_OUTPUT = {
       'rgba(255, 255, 255, 0.4)',
     '--theme-dialog-big-button-background-color': 'rgba(255, 255, 255, 0.05)',
     '--theme-dialog-big-button-border-color': 'none',
-    '--theme-dialog-big-button-label-color': 'rgba(255, 255, 255, 1)',
+    '--theme-dialog-big-button-label-color': '#ffffff',
     '--theme-dialog-big-button-description-color': 'rgba(255, 255, 255, 0.6)',
     '--theme-dialog-set-wallet-password-background-color':
       'rgba(18, 19, 38, 0.91)',
@@ -270,7 +270,8 @@ export const INCENTIVIZED_TESTNET_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#ffffff',
     '--theme-icon-add-wallet-from-sidebar-color': '#ffffff',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#ffffff',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#ffffff',
+    '--theme-icon-add-wallet-dialog-big-button-color':
+      'rgba(255, 255, 255, 0.5)',
     '--theme-icon-back-button-color': '#ffffff',
     '--theme-icon-close-button-color': '#ffffff',
     '--theme-icon-connecting-ada-api-logo-color': '#ffffff',

diff --git a/source/renderer/app/themes/daedalus/light-blue.js b/source/renderer/app/themes/daedalus/light-blue.js
@@ -202,7 +202,7 @@ export const LIGHT_BLUE_THEME_OUTPUT = {
     '--theme-dialog-big-button-background-color': '#fafbfc',
     '--theme-dialog-big-button-border-color': '#c6cdd6',
     '--theme-dialog-big-button-label-color': '#5e6066',
-    '--theme-dialog-big-button-description-color': '#5e6066',
+    '--theme-dialog-big-button-description-color': 'rgba(94, 96, 102, 0.6)',
     '--theme-dialog-set-wallet-password-background-color':
       'rgba(36, 62, 98, 0.96)',
     '--theme-dialog-set-wallet-password-box-shadow': 'rgba(0, 0, 0, 0.25)',
@@ -282,7 +282,7 @@ export const LIGHT_BLUE_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#5e6066',
     '--theme-icon-add-wallet-from-sidebar-color': '#fafbfc',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#5e6066',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#8a98ab',
+    '--theme-icon-add-wallet-dialog-big-button-color': 'rgba(94, 96, 102, 0.5)',
     '--theme-icon-back-button-color': '#5e6066',
     '--theme-icon-close-button-color': '#5e6066',
     '--theme-icon-connecting-ada-api-logo-color': '#fafbfc',

diff --git a/source/renderer/app/themes/daedalus/shelley-testnet.js b/source/renderer/app/themes/daedalus/shelley-testnet.js
@@ -191,7 +191,7 @@ export const SHELLEY_TESTNET_THEME_OUTPUT = {
       'rgba(255, 255, 255, 0.4)',
     '--theme-dialog-big-button-background-color': 'rgba(255, 255, 255, 0.05)',
     '--theme-dialog-big-button-border-color': 'none',
-    '--theme-dialog-big-button-label-color': 'rgba(255, 255, 255, 1)',
+    '--theme-dialog-big-button-label-color': '#ffffff',
     '--theme-dialog-big-button-description-color': 'rgba(255, 255, 255, 0.6)',
     '--theme-dialog-set-wallet-password-background-color':
       'rgba(42, 43, 60, 0.96)',
@@ -269,7 +269,8 @@ export const SHELLEY_TESTNET_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#ffffff',
     '--theme-icon-add-wallet-from-sidebar-color': '#ffffff',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#ffffff',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#ffffff',
+    '--theme-icon-add-wallet-dialog-big-button-color':
+      'rgba(255, 255, 255, 0.5)',
     '--theme-icon-back-button-color': '#ffffff',
     '--theme-icon-close-button-color': '#ffffff',
     '--theme-icon-connecting-ada-api-logo-color': '#ffffff',

diff --git a/source/renderer/app/themes/daedalus/white.js b/source/renderer/app/themes/daedalus/white.js
@@ -270,7 +270,7 @@ export const WHITE_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#2d2d2d',
     '--theme-icon-add-wallet-from-sidebar-color': '#2d2d2d',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#2d2d2d',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#2d2d2d',
+    '--theme-icon-add-wallet-dialog-big-button-color': 'rgba(45, 45, 45, 0.5)',
     '--theme-icon-back-button-color': '#2d2d2d',
     '--theme-icon-close-button-color': '#2d2d2d',
     '--theme-icon-connecting-ada-api-logo-color': '#2d2d2d',

diff --git a/source/renderer/app/themes/daedalus/yellow.js b/source/renderer/app/themes/daedalus/yellow.js
@@ -193,7 +193,7 @@ export const YELLOW_THEME_OUTPUT = {
     '--theme-dialog-big-button-background-color': '#ffffff',
     '--theme-dialog-big-button-border-color': '#e1dac6',
     '--theme-dialog-big-button-label-color': '#2d2d2d',
-    '--theme-dialog-big-button-description-color': '#2d2d2d',
+    '--theme-dialog-big-button-description-color': 'rgba(45, 45, 45, 0.6)',
     '--theme-dialog-set-wallet-password-background-color':
       'rgba(255, 185, 35, 0.96)',
     '--theme-dialog-set-wallet-password-box-shadow': 'rgba(0, 0, 0, 0.25)',
@@ -273,7 +273,7 @@ export const YELLOW_THEME_OUTPUT = {
     '--theme-icon-node-update-notification-arrow-color': '#2d2d2d',
     '--theme-icon-add-wallet-from-sidebar-color': '#2d2d2d',
     '--theme-icon-ada-summary-wallet-amount-symbol-color': '#2d2d2d',
-    '--theme-icon-add-wallet-dialog-big-button-color': '#2d2d2d',
+    '--theme-icon-add-wallet-dialog-big-button-color': 'rgba(45, 45, 45, 0.5)',
     '--theme-icon-back-button-color': '#2d2d2d',
     '--theme-icon-close-button-color': '#2d2d2d',
     '--theme-icon-connecting-ada-api-logo-color': '#2d2d2d',