From 7acd2331f73ae0ba7f2145bcc741ee4797322688 Mon Sep 17 00:00:00 2001 From: Gabrielbazan7 Date: Tue, 21 Mar 2017 11:28:43 -0400 Subject: [PATCH] Update external hardware preferences view. --- src/js/controllers/preferencesExternal.js | 3 +++ src/sass/views/tab-settings.scss | 7 +++++ www/views/preferencesExternal.html | 32 ++++++++++++++--------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/js/controllers/preferencesExternal.js b/src/js/controllers/preferencesExternal.js index ebc10043e..6be633901 100644 --- a/src/js/controllers/preferencesExternal.js +++ b/src/js/controllers/preferencesExternal.js @@ -2,11 +2,14 @@ angular.module('copayApp.controllers').controller('preferencesExternalController', function($scope, $stateParams, lodash, gettextCatalog, popupService, profileService, walletService) { var wallet = profileService.getWallet($stateParams.walletId); + $scope.wallet = wallet; $scope.externalSource = lodash.find(walletService.externalSource, function(source) { return source.id == wallet.getPrivKeyExternalSourceName(); }); + $scope.hardwareConnected = $scope.externalSource.version.length > 0; + $scope.showMneumonicFromHardwarePopup = function() { var title = gettextCatalog.getString('Warning!'); var message = gettextCatalog.getString('Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin.'); diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index b31dca0fa..08d87ef94 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -3,6 +3,13 @@ .icon-bitpay { background-image: url("../img/icon-bitpay.svg"); } + .warning { + color: $v-warning-color; + } + .centered { + width: 100%; + text-align: center; + } .disabled { color: $v-light-gray; } diff --git a/www/views/preferencesExternal.html b/www/views/preferencesExternal.html index 0703932d1..beb4db140 100644 --- a/www/views/preferencesExternal.html +++ b/www/views/preferencesExternal.html @@ -1,23 +1,31 @@ - + {{externalSource.longName}} -
-
- Version - - {{externalSource.version}} - -
+
+
+ Hardware not connected.
+ Check installation and retry.
-
- +
+
+
+ Version + + {{externalSource.version || 'hardware disconnected'}} + +
+
+ +
+ +