From 9ce342bba706784cbfa9dd846d28134952382353 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sat, 26 Sep 2015 08:26:31 -0300 Subject: [PATCH] WIP trezor support, wallet creation working --- Gruntfile.js | 6 +- public/views/create.html | 24 +- src/js/controllers/create.js | 14 +- src/js/controllers/join.js | 4 +- src/js/controllers/walletHome.js | 1 + src/js/services/profileService.js | 35 ++- src/js/services/trezor.js | 114 +++++++++ src/js/trezor.js | 368 ++++++++++++++++++++++++++++++ 8 files changed, 542 insertions(+), 24 deletions(-) create mode 100644 src/js/services/trezor.js create mode 100644 src/js/trezor.js diff --git a/Gruntfile.js b/Gruntfile.js index 98e6ef651..8aead0647 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -37,7 +37,8 @@ module.exports = function(grunt) { 'src/js/routes.js', 'src/js/services/*.js', 'src/js/models/*.js', - 'src/js/controllers/*.js' + 'src/js/controllers/*.js', + 'src/js/trezor.js' ], tasks: ['concat:js'] } @@ -77,7 +78,8 @@ module.exports = function(grunt) { 'src/js/controllers/*.js', 'src/js/translations.js', 'src/js/version.js', - 'src/js/init.js' + 'src/js/init.js', + 'src/js/trezor.js' ], dest: 'public/js/copay.js' }, diff --git a/public/views/create.html b/public/views/create.html index f6d7ff43f..c11944d16 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -8,7 +8,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
@@ -30,7 +30,7 @@
- Connecting to Ledger Wallet... + Connecting to {{create.hwWallet}} Wallet...
@@ -102,10 +102,16 @@
+ + + -