diff --git a/src/js/controllers/preferencesExternal.js b/src/js/controllers/preferencesExternal.js index 12ea10a7d..ebc10043e 100644 --- a/src/js/controllers/preferencesExternal.js +++ b/src/js/controllers/preferencesExternal.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('preferencesExternalController $scope.externalSource = lodash.find(walletService.externalSource, function(source) { return source.id == wallet.getPrivKeyExternalSourceName(); - }).name; + }); $scope.showMneumonicFromHardwarePopup = function() { var title = gettextCatalog.getString('Warning!'); diff --git a/src/js/services/intelTEE.js b/src/js/services/intelTEE.js index 0b5724fe2..a7e459ae7 100644 --- a/src/js/services/intelTEE.js +++ b/src/js/services/intelTEE.js @@ -7,6 +7,7 @@ angular.module('copayApp.services') root.description = { supported: platformInfo.supportsIntelTEE, + version: platformInfo.versionIntelTEE, id: 'intelTEE', name: 'Intel TEE', longName: 'Intel TEE Hardware Wallet', diff --git a/src/js/services/platformInfo.js b/src/js/services/platformInfo.js index f0a0d774c..8396afa07 100644 --- a/src/js/services/platformInfo.js +++ b/src/js/services/platformInfo.js @@ -23,6 +23,27 @@ angular.module('copayApp.services').factory('platformInfo', function($window) { } }; + var getVersionIntelTee = function() { + var v = ''; + var isWindows = navigator.platform.indexOf('Win') > -1; + + if (!isNodeWebkit() || !isWindows) { + return v; + } + + try { + var IntelWallet = require('intelWalletCon'); + if (IntelWallet.getVersion) { + v = IntelWallet.getVersion(); + } else { + v = 'Alpha'; + } + if (v.length > 0) { + $log.info('Intel TEE library ' + v); + } + } catch (e) {} + return v; + }; // Detect mobile devices var ret = { @@ -38,11 +59,12 @@ angular.module('copayApp.services').factory('platformInfo', function($window) { ret.isMobile = ret.isAndroid || ret.isIOS || ret.isWP; ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW; ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW; - ret.isWindows = navigator.platform.indexOf('Win') > -1; ret.supportsLedger = ret.isChromeApp; ret.supportsTrezor = ret.isChromeApp || ret.isDevel; - ret.supportsIntelTEE = ret.isWindows; // TODO need to detect specific chip set for TEE support + + ret.versionIntelTEE = getVersionIntelTee(); + ret.supportsIntelTEE = ret.versionIntelTEE.length > 0; return ret; }); diff --git a/www/views/preferencesExternal.html b/www/views/preferencesExternal.html index 719a0d448..0703932d1 100644 --- a/www/views/preferencesExternal.html +++ b/www/views/preferencesExternal.html @@ -1,10 +1,19 @@ - {{externalSource}} + {{externalSource.longName}} +
+
+ Version + + {{externalSource.version}} + +
+
+