From b1d4e6224cc104a28c336dc07973d3817ac64052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 16 Nov 2015 12:00:10 -0300 Subject: [PATCH 001/183] license and profile creation in the same view --- public/views/disclaimer.html | 116 +++++++++++++++++++------------ public/views/splash.html | 43 ------------ src/css/main.css | 5 +- src/js/controllers/disclaimer.js | 31 ++++++--- src/js/controllers/splash.js | 35 ---------- 5 files changed, 97 insertions(+), 133 deletions(-) delete mode 100644 public/views/splash.html delete mode 100644 src/js/controllers/splash.js diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 5b988b940..8197a5d44 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -1,47 +1,71 @@ -
-
-
- -
-

-
Copay
-
Terms of Use
-

-
-

-

    -
  • The software you are about to use functions as a free, open source, and multi-signature digital wallet.
    • -
  • The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.
    • -
  • While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software.
    • -
  • You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws.
    • -
  • You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software.
    • -
  • IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE.
    • -
  • All transaction requests are irreversible.
    • -
  • The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network.
    • -
  • To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement.
    • -
  • You assume any and all risks associated with the use of the software.
    • -
  • In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software.
    • -
  • We reserve the right to modify this disclaimer from time to time.
    • -
-

-

- Official English Disclaimer -

- -
-

I affirm that I have read, understood, and agree with these terms.

- -
- -
-
-
+
+
+
+
+
+ WELCOME TO COPAY +

A multisignature bitcoin wallet

+
+
+
+
+
+ icon +
+
+
+

+

    +
  • The software you are about to use functions as a free, open source, and multi-signature digital wallet.
    • +
  • The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.
    • +
  • While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software.
    • +
  • You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws.
    • +
  • You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software.
    • +
  • IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE.
    • +
  • All transaction requests are irreversible.
    • +
  • The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network.
    • +
  • To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement.
    • +
  • You assume any and all risks associated with the use of the software.
    • +
  • In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software.
    • +
  • We reserve the right to modify this disclaimer from time to time.
    • +
+

+
+
+
+
+ {{(error)|translate}}. Retrying... +
+
+
+ + Creating Profile... +
+
+
+

+ Official English Disclaimer +

+
+
+

I affirm that I have read, understood, and agree with these terms.

+
+
+
+ +

Already have a wallet?

+ +
+
+
diff --git a/public/views/splash.html b/public/views/splash.html deleted file mode 100644 index 6354688bd..000000000 --- a/public/views/splash.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
-
-
-
- WELCOME TO COPAY -

A multisignature bitcoin wallet

-
-
-
-
-
- icon -
-
-
- {{(error)|translate}}. Retrying... -
-
-
- - Creating Profile... -
-
-
-
- -

Already have a wallet?

- -
-
-
-
diff --git a/src/css/main.css b/src/css/main.css index 9767bbd71..a817b3ac7 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -7,7 +7,6 @@ font-family: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif; } - .panel h1, .panel h2, .panel h3, .panel h4, .panel h5, .panel h6, .panel p, .panel li, .panel dl { color: #2C3E50; } @@ -1094,6 +1093,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } /*/////////////////////////////////////////////////*/ +.scrollArea { + height: 280px; + overflow: scroll; +} .tabbable { border: 2px solid #213140; diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js index 88533fd31..f1cedcc71 100644 --- a/src/js/controllers/disclaimer.js +++ b/src/js/controllers/disclaimer.js @@ -1,29 +1,44 @@ 'use strict'; angular.module('copayApp.controllers').controller('disclaimerController', - function($scope, $timeout, storageService, applicationService, gettextCatalog, isCordova, uxLanguage) { + function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, uxLanguage, go) { - $scope.agree = function() { + $scope.create = function(noWallet) { + $scope.creatingProfile = true; if (isCordova) { window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true); } $scope.loading = true; $timeout(function() { storageService.setCopayDisclaimerFlag(function(err) { - $timeout(function() { - if (isCordova) { - window.plugins.spinnerDialog.hide(); + if (isCordova) { + window.plugins.spinnerDialog.hide(); + } + profileService.create({ + noWallet: noWallet + }, function(err) { + if (err) { + $scope.creatingProfile = false; + $log.warn(err); + $scope.error = err; + $scope.$apply(); + $timeout(function() { + $scope.create(noWallet); + }, 3000); } - applicationService.restart(); - }, 1000); + }); }); }, 100); }; - + $scope.init = function() { storageService.getCopayDisclaimerFlag(function(err, val) { $scope.lang = uxLanguage.currentLanguage; $scope.agreed = val; + + if (profileService.profile) { + go.walletHome(); + } $timeout(function() { $scope.$digest(); }, 1); diff --git a/src/js/controllers/splash.js b/src/js/controllers/splash.js deleted file mode 100644 index b52b2d443..000000000 --- a/src/js/controllers/splash.js +++ /dev/null @@ -1,35 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('splashController', - function($scope, $timeout, $log, profileService, storageService, go) { - - $scope.create = function(noWallet) { - $scope.creatingProfile = true; - - $timeout(function() { - profileService.create({ - noWallet: noWallet - }, function(err) { - if (err) { - $scope.creatingProfile = false; - $log.warn(err); - $scope.error = err; - $scope.$apply(); - $timeout(function() { - $scope.create(noWallet); - }, 3000); - } - }); - }, 100); - }; - - $scope.init = function() { - storageService.getCopayDisclaimerFlag(function(err, val) { - if (!val) go.path('disclaimer'); - - if (profileService.profile) { - go.walletHome(); - } - }); - }; - }); From f2375a7bac16a0eaf41179cad18d9517345c20de Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 16 Nov 2015 17:04:46 -0300 Subject: [PATCH 002/183] add style on disclaimer --- public/views/disclaimer.html | 28 ++++++++++++---------------- src/css/main.css | 14 +++++++++++++- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 8197a5d44..aed44567e 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -1,22 +1,20 @@ -
-
-
- WELCOME TO COPAY -

A multisignature bitcoin wallet

-
-
-
-
-
+
icon
+
+
+ WELCOME TO COPAY +

A multisignature bitcoin wallet

+
+
-

+

  • The software you are about to use functions as a free, open source, and multi-signature digital wallet.
  • The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.
    • @@ -56,15 +54,13 @@

-

I affirm that I have read, understood, and agree with these terms.

+

I affirm that I have read, understood, and agree with these terms.

-
+
-

Already have a wallet?

-
diff --git a/src/css/main.css b/src/css/main.css index a817b3ac7..bb4cf5588 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1096,6 +1096,18 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .scrollArea { height: 280px; overflow: scroll; + background: #213140; + border: 1px solid #4B6178; + border-radius: 5px; + margin: 1.6rem; + color: #A5B2BF; + line-height: 30px; + padding: 0.5rem; +} + +.scrollArea ul { + font-size: 0.8rem; + text-align: left; } .tabbable { @@ -1203,7 +1215,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .splash .container-image { - padding: 2rem 0; + padding: 1rem 0; } .preferences li { From 7b3e308e25c9436eb23ac3d09fec7f9ae48c8c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 16 Nov 2015 17:43:54 -0300 Subject: [PATCH 003/183] adding delete words option to security Preferences --- public/views/preferences.html | 7 +- public/views/preferencesDeleteWords.html | 32 +++++++ public/views/securityPreferences.html | 19 ++++ src/js/controllers/preferencesDeleteWords.js | 23 +++++ src/js/controllers/securityPreferences.js | 12 +++ src/js/routes.js | 92 ++++++++++++-------- 6 files changed, 150 insertions(+), 35 deletions(-) create mode 100644 public/views/preferencesDeleteWords.html create mode 100644 public/views/securityPreferences.html create mode 100644 src/js/controllers/preferencesDeleteWords.js create mode 100644 src/js/controllers/securityPreferences.js diff --git a/public/views/preferences.html b/public/views/preferences.html index ff31aaa0f..7af803f41 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -56,7 +56,12 @@
Backup
- + +
  • + +
    Security Preferences
    +
    • +
  • Advanced
    diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html new file mode 100644 index 000000000..218845048 --- /dev/null +++ b/public/views/preferencesDeleteWords.html @@ -0,0 +1,32 @@ +
    +
    + + +
    + +

    +
    + Wallet: {{index.walletName}} + ({{index.alias}}) +
    +

    Warning!

    +
    + + {{preferences.error|translate}} + +
    +
    +

    + Once you have copied your wallet seed down, it is recommended to delete it from this device. +

    + +
    +
    diff --git a/public/views/securityPreferences.html b/public/views/securityPreferences.html new file mode 100644 index 000000000..f9754ff50 --- /dev/null +++ b/public/views/securityPreferences.html @@ -0,0 +1,19 @@ +
    +
    + + +
    + +

    + +
      + +
    • + +
      Delete seed words
      +
      • + +
    diff --git a/src/js/controllers/preferencesDeleteWords.js b/src/js/controllers/preferencesDeleteWords.js new file mode 100644 index 000000000..6c14ba9ea --- /dev/null +++ b/src/js/controllers/preferencesDeleteWords.js @@ -0,0 +1,23 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesDeleteWordsController', + function($scope, $rootScope, $filter, $timeout, $modal, $log, confirmDialog, storageService, notification, profileService, isCordova, go, gettext, gettextCatalog, animationService) { + var self = this; + var fc = profileService.focusedClient; + var msg = gettext('Are you sure you want to delete the backup words?'); + var successMsg = gettext('Backup words deleted'); + + self.delete = function() { + confirmDialog.show(msg, + function(ok) { + if (ok) { + fc.clearMnemonic(); + profileService.updateCredentialsFC(function() { + notification.success(successMsg); + go.walletHome(); + }); + } + }); + }; + + }); diff --git a/src/js/controllers/securityPreferences.js b/src/js/controllers/securityPreferences.js new file mode 100644 index 000000000..b864ae2eb --- /dev/null +++ b/src/js/controllers/securityPreferences.js @@ -0,0 +1,12 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('securityPreferencesController', + function($scope, profileService) { + var self = this; + var fc = profileService.focusedClient; + self.deleted = false; + if (fc.credentials && !fc.credentials.mnemonicEncrypted && !fc.credentials.mnemonic) { + self.deleted = true; + } + + }); diff --git a/src/js/routes.js b/src/js/routes.js index 44f7ca551..0e2da59b8 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -286,6 +286,18 @@ angular } }) + .state('securityPreferences', { + url: '/securityPreferences', + templateUrl: 'views/securityPreferences.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/securityPreferences.html' + }, + } + }) + .state('preferencesAdvanced', { url: '/preferencesAdvanced', templateUrl: 'views/preferencesAdvanced.html', @@ -297,29 +309,30 @@ angular }, } }) - .state('preferencesColor', { - url: '/preferencesColor', - templateUrl: 'views/preferencesColor.html', - walletShouldBeComplete: true, - needProfile: true, - views: { - 'main': { - templateUrl: 'views/preferencesColor.html' - }, - } - }) - .state('preferencesAltCurrency', { - url: '/preferencesAltCurrency', - templateUrl: 'views/preferencesAltCurrency.html', + .state('preferencesColor', { + url: '/preferencesColor', + templateUrl: 'views/preferencesColor.html', walletShouldBeComplete: true, needProfile: true, views: { 'main': { - templateUrl: 'views/preferencesAltCurrency.html' + templateUrl: 'views/preferencesColor.html' }, } }) + + .state('preferencesAltCurrency', { + url: '/preferencesAltCurrency', + templateUrl: 'views/preferencesAltCurrency.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesAltCurrency.html' + }, + } + }) .state('preferencesAlias', { url: '/preferencesAlias', templateUrl: 'views/preferencesAlias.html', @@ -356,6 +369,17 @@ angular } }) + .state('deleteWords', { + url: '/deleteWords', + templateUrl: 'views/preferencesDeleteWords.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesDeleteWords.html' + }, + } + }) .state('delete', { url: '/delete', templateUrl: 'views/preferencesDeleteWallet.html', @@ -379,16 +403,16 @@ angular }) .state('about', { - url: '/about', - templateUrl: 'views/preferencesAbout.html', - walletShouldBeComplete: true, - needProfile: true, - views: { - 'main': { - templateUrl: 'views/preferencesAbout.html' - }, - } - }) + url: '/about', + templateUrl: 'views/preferencesAbout.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesAbout.html' + }, + } + }) .state('logs', { url: '/logs', templateUrl: 'views/preferencesLogs.html', @@ -450,14 +474,14 @@ angular }) .state('add', { - url: '/add', - needProfile: true, - views: { - 'main': { - templateUrl: 'views/add.html' - }, - } - }) + url: '/add', + needProfile: true, + views: { + 'main': { + templateUrl: 'views/add.html' + }, + } + }) .state('cordova', { url: '/cordova/:status/:isHome', views: { @@ -539,7 +563,7 @@ angular $state.transitionTo('copayers'); event.preventDefault(); - } + } if (!animationService.transitionAnimated(fromState, toState)) { event.preventDefault(); From 8217c7bfbd4146c7d30ff68cd851605d384c862c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 17 Nov 2015 11:10:09 -0300 Subject: [PATCH 004/183] create profile before accepting terms --- src/js/controllers/disclaimer.js | 50 ++++++++++++++------------------ src/js/controllers/index.js | 26 +++++++++-------- 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js index f1cedcc71..0ad075bca 100644 --- a/src/js/controllers/disclaimer.js +++ b/src/js/controllers/disclaimer.js @@ -1,47 +1,39 @@ 'use strict'; angular.module('copayApp.controllers').controller('disclaimerController', - function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, uxLanguage, go) { + function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, applicationService, uxLanguage, go) { - $scope.create = function(noWallet) { + + $scope.create = function() { $scope.creatingProfile = true; if (isCordova) { window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true); } $scope.loading = true; - $timeout(function() { - storageService.setCopayDisclaimerFlag(function(err) { - if (isCordova) { - window.plugins.spinnerDialog.hide(); - } - profileService.create({ - noWallet: noWallet - }, function(err) { - if (err) { - $scope.creatingProfile = false; - $log.warn(err); - $scope.error = err; - $scope.$apply(); - $timeout(function() { - $scope.create(noWallet); - }, 3000); - } - }); - }); - }, 100); + storageService.setCopayDisclaimerFlag(function(err) { + $scope.creatingProfile = false; + if (isCordova) { + window.plugins.spinnerDialog.hide(); + } + applicationService.restart(); + }); }; - $scope.init = function() { + $scope.init = function(noWallet) { storageService.getCopayDisclaimerFlag(function(err, val) { $scope.lang = uxLanguage.currentLanguage; $scope.agreed = val; - if (profileService.profile) { - go.walletHome(); - } - $timeout(function() { - $scope.$digest(); - }, 1); + profileService.create({ + noWallet: noWallet + }, function(err) { + if (err) { + $log.warn(err); + $scope.error = err; + $scope.$apply(); + } + }); }); }; + }); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 3dcedc4ae..dd359e663 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -142,7 +142,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r var defaults = configService.getDefaults(); var config = configService.getSync(); - self.usingCustomBWS = config.bwsFor && config.bwsFor[self.walletId] && (config.bwsFor[self.walletId] != defaults.bws.url); + self.usingCustomBWS = config.bwsFor && config.bwsFor[self.walletId] && (config.bwsFor[self.walletId] != defaults.bws.url); }; self.setTab = function(tab, reset, tries, switchState) { @@ -807,7 +807,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r return i_cb(null, newTxs); } - if (walletId == profileService.focusedClient.credentials.walletId) + if (walletId == profileService.focusedClient.credentials.walletId) self.txProgress = newTxs.length; $timeout(function() { @@ -822,7 +822,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r var newHistory = lodash.compact(txs.concat(txsFromLocal)); $log.debug('Tx History synced. Total Txs: ' + newHistory.length); - if (walletId == profileService.focusedClient.credentials.walletId) { + if (walletId == profileService.focusedClient.credentials.walletId) { self.completeHistory = newHistory; self.txHistory = newHistory.slice(0, self.historyShowLimit); self.historyShowShowAll = newHistory.length >= self.historyShowLimit; @@ -1295,15 +1295,17 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/NewFocusedWallet', function() { self.setFocusedWallet(); self.updateTxHistory(); - go.walletHome(); - storageService.getCleanAndScanAddresses(function(err, walletId) { - if (walletId && profileService.walletClients[walletId]) { - $log.debug('Clear last address cache and Scan ', walletId); - addressService.expireAddress(walletId, function(err) { - self.startScan(walletId); - }); - storageService.removeCleanAndScanAddresses(function() {}); - } + storageService.getCopayDisclaimerFlag(function(err, val) { + if (val) go.walletHome(); + storageService.getCleanAndScanAddresses(function(err, walletId) { + if (walletId && profileService.walletClients[walletId]) { + $log.debug('Clear last address cache and Scan ', walletId); + addressService.expireAddress(walletId, function(err) { + self.startScan(walletId); + }); + storageService.removeCleanAndScanAddresses(function() {}); + } + }); }); }); From 04e989ce44398e6fde162f0d38c63ac6b71c3a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 17 Nov 2015 12:39:51 -0300 Subject: [PATCH 005/183] error handling --- public/views/disclaimer.html | 2 +- src/js/controllers/disclaimer.js | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index aed44567e..b6f97f477 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -58,7 +58,7 @@
    -
    diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js index 0ad075bca..8e038aee4 100644 --- a/src/js/controllers/disclaimer.js +++ b/src/js/controllers/disclaimer.js @@ -2,19 +2,11 @@ angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, applicationService, uxLanguage, go) { - + self = this; + $scope.noProfile = true; $scope.create = function() { - $scope.creatingProfile = true; - if (isCordova) { - window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true); - } - $scope.loading = true; storageService.setCopayDisclaimerFlag(function(err) { - $scope.creatingProfile = false; - if (isCordova) { - window.plugins.spinnerDialog.hide(); - } applicationService.restart(); }); }; @@ -27,10 +19,17 @@ angular.module('copayApp.controllers').controller('disclaimerController', profileService.create({ noWallet: noWallet }, function(err) { - if (err) { + if (err && !'EEXIST') { $log.warn(err); $scope.error = err; $scope.$apply(); + $scope.noProfile = true; + $timeout(function() { + $scope.init(); + }, 3000); + } else { + $scope.error = ""; + $scope.noProfile = false; } }); }); From 1e418ef0604b232525a67eb6d00704f3d5162a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 17 Nov 2015 12:42:15 -0300 Subject: [PATCH 006/183] delete creating profile flag --- public/views/disclaimer.html | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index b6f97f477..4dd615f7b 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -33,21 +33,9 @@
    • -
    +
    {{(error)|translate}}. Retrying...
    -
    -
    - - Creating Profile... -
    -

    Official English Disclaimer @@ -56,7 +44,7 @@

    I affirm that I have read, understood, and agree with these terms.

    -
    +
    diff --git a/src/css/main.css b/src/css/main.css index bb4cf5588..16b0b35b1 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1107,7 +1107,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .scrollArea ul { font-size: 0.8rem; - text-align: left; + text-align: justify; + margin-left: 0; +} + +.scrollArea li { + list-style-type:none; + display: inline; } .tabbable { diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js index 8e038aee4..be720f3f9 100644 --- a/src/js/controllers/disclaimer.js +++ b/src/js/controllers/disclaimer.js @@ -1,38 +1,37 @@ 'use strict'; angular.module('copayApp.controllers').controller('disclaimerController', - function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, applicationService, uxLanguage, go) { + function($scope, $timeout, $log, profileService, isCordova, storageService, gettextCatalog, uxLanguage, go) { self = this; - $scope.noProfile = true; + $scope.lang = uxLanguage.currentLanguage; - $scope.create = function() { - storageService.setCopayDisclaimerFlag(function(err) { - applicationService.restart(); + $scope.goHome = function() { + go.walletHome(); + }; + + var create = function () { + $scope.creatingProfile = true; + profileService.create({}, function(err) { + + if (err) { + + if (err == 'EEXISTS') + return go.walletHome(); + + $log.warn(err); + $scope.error = err; + $scope.$apply(); + $timeout(function() { + $log.warn('Retrying to create profile......'); + create(); + }, 3000); + } else { + $scope.error = ""; + $scope.creatingProfile = false; + } }); }; - $scope.init = function(noWallet) { - storageService.getCopayDisclaimerFlag(function(err, val) { - $scope.lang = uxLanguage.currentLanguage; - $scope.agreed = val; - - profileService.create({ - noWallet: noWallet - }, function(err) { - if (err && !'EEXIST') { - $log.warn(err); - $scope.error = err; - $scope.$apply(); - $scope.noProfile = true; - $timeout(function() { - $scope.init(); - }, 3000); - } else { - $scope.error = ""; - $scope.noProfile = false; - } - }); - }); - }; +// create(); }); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index dd359e663..da6a734b5 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1295,17 +1295,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/NewFocusedWallet', function() { self.setFocusedWallet(); self.updateTxHistory(); - storageService.getCopayDisclaimerFlag(function(err, val) { - if (val) go.walletHome(); - storageService.getCleanAndScanAddresses(function(err, walletId) { - if (walletId && profileService.walletClients[walletId]) { - $log.debug('Clear last address cache and Scan ', walletId); - addressService.expireAddress(walletId, function(err) { - self.startScan(walletId); - }); - storageService.removeCleanAndScanAddresses(function() {}); - } - }); + storageService.getCleanAndScanAddresses(function(err, walletId) { + if (walletId && profileService.walletClients[walletId]) { + $log.debug('Clear last address cache and Scan ', walletId); + addressService.expireAddress(walletId, function(err) { + self.startScan(walletId); + }); + storageService.removeCleanAndScanAddresses(function() {}); + } }); }); diff --git a/src/js/routes.js b/src/js/routes.js index 44f7ca551..12e51be4c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -75,17 +75,6 @@ angular // link: http://stackoverflow.com/questions/15606751/angular-changes-urls-to-unsafe-in-extension-page?lq=1 $compileProvider.imgSrcSanitizationWhitelist(/^\s*((https?|ftp|file|blob|chrome-extension):|data:image\/)/); - $stateProvider - .state('splash', { - url: '/splash', - needProfile: false, - views: { - 'main': { - templateUrl: 'views/splash.html', - } - } - }); - $stateProvider .state('translators', { url: '/translators', @@ -521,9 +510,6 @@ angular if (err) { if (err.message && err.message.match('NOPROFILE')) { $log.debug('No profile... redirecting'); - $state.transitionTo('splash'); - } else if (err.message && err.message.match('NONAGREEDDISCLAIMER')) { - $log.debug('Display disclaimer... redirecting'); $state.transitionTo('disclaimer'); } else { throw new Error(err); // TODO diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index f159deeaf..1770ea751 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -134,32 +134,26 @@ angular.module('copayApp.services') }; root.loadAndBindProfile = function(cb) { - storageService.getCopayDisclaimerFlag(function(err, val) { - if (!val) { - return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer')); - } else { - storageService.getProfile(function(err, profile) { - if (err) { - $rootScope.$emit('Local/DeviceError', err); - return cb(err); - } - if (!profile) { - // Migration?? - storageService.tryToMigrate(function(err, migratedProfile) { - if (err) return cb(err); - if (!migratedProfile) - return cb(new Error('NOPROFILE: No profile')); - - profile = migratedProfile; - return root.bindProfile(profile, cb); - }) - } else { - $log.debug('Profile read'); - return root.bindProfile(profile, cb); - } - - }); + storageService.getProfile(function(err, profile) { + if (err) { + $rootScope.$emit('Local/DeviceError', err); + return cb(err); } + if (!profile) { + // Migration?? + storageService.tryToMigrate(function(err, migratedProfile) { + if (err) return cb(err); + if (!migratedProfile) + return cb(new Error('NOPROFILE: No profile')); + + profile = migratedProfile; + return root.bindProfile(profile, cb); + }) + } else { + $log.debug('Profile read'); + return root.bindProfile(profile, cb); + } + }); }; @@ -276,8 +270,8 @@ angular.module('copayApp.services') // check if exist if (lodash.find(root.profile.credentials, { - 'walletId': walletData.walletId - })) { + 'walletId': walletData.walletId + })) { return cb(gettext('Cannot join the same wallet more that once')); } } catch (ex) { diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index b9c2deb0e..9178cb69c 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -199,14 +199,6 @@ angular.module('copayApp.services') storage.remove('config', cb); }; - root.setCopayDisclaimerFlag = function(cb) { - storage.set('agreeDisclaimer', true, cb); - }; - - root.getCopayDisclaimerFlag = function(cb) { - storage.get('agreeDisclaimer', cb); - }; - root.setRemotePrefsStoredFlag = function(cb) { storage.set('remotePrefStored', true, cb); }; From c1d19a29739f658be5f2ada488c0a725df4a580d Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 17 Nov 2015 14:03:03 -0300 Subject: [PATCH 008/183] add title and button text --- public/views/disclaimer.html | 3 ++- src/css/main.css | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index a75ce92c2..65ee16367 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -12,6 +12,7 @@
    +
    Terms of Use

      @@ -49,7 +50,7 @@
    diff --git a/src/css/main.css b/src/css/main.css index 16b0b35b1..bbc8e4ac7 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1099,7 +1099,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { background: #213140; border: 1px solid #4B6178; border-radius: 5px; - margin: 1.6rem; + margin: 0 1.6rem 1.6rem 1.6rem; color: #A5B2BF; line-height: 30px; padding: 0.5rem; From 3fb2086407d211bf222d06610270f36a49c9e763 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 17 Nov 2015 14:10:41 -0300 Subject: [PATCH 009/183] move title inside the scrolable area --- public/views/disclaimer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 65ee16367..9c4cd2a92 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -12,9 +12,9 @@
    -
    Terms of Use

    +

    Terms of Use
    • The software you are about to use functions as a free, open source, and multi-signature digital wallet.
    • The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.
      • From 25300a1c4af9b41dc9f62e910f6ca77d7df13bc1 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 17 Nov 2015 14:11:27 -0300 Subject: [PATCH 010/183] fix margins --- src/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/main.css b/src/css/main.css index bbc8e4ac7..16b0b35b1 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1099,7 +1099,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { background: #213140; border: 1px solid #4B6178; border-radius: 5px; - margin: 0 1.6rem 1.6rem 1.6rem; + margin: 1.6rem; color: #A5B2BF; line-height: 30px; padding: 0.5rem; From e1ce85745b7bf12899b0015066ac1888fdcad8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 17 Nov 2015 15:49:17 -0300 Subject: [PATCH 011/183] uncomment create function --- src/js/controllers/disclaimer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js index be720f3f9..4d55984cc 100644 --- a/src/js/controllers/disclaimer.js +++ b/src/js/controllers/disclaimer.js @@ -9,13 +9,13 @@ angular.module('copayApp.controllers').controller('disclaimerController', go.walletHome(); }; - var create = function () { + var create = function() { $scope.creatingProfile = true; profileService.create({}, function(err) { if (err) { - if (err == 'EEXISTS') + if (err == 'EEXISTS') return go.walletHome(); $log.warn(err); @@ -32,6 +32,6 @@ angular.module('copayApp.controllers').controller('disclaimerController', }); }; -// create(); + create(); }); From 1c841e5f217082b7452efb65ef3853b4ec13f166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 18 Nov 2015 10:41:06 -0300 Subject: [PATCH 012/183] moving delete wallet and request password to security preferences --- public/views/preferences.html | 16 ------------ public/views/preferencesAdvanced.html | 5 ---- public/views/preferencesDeleteWords.html | 3 +++ public/views/securityPreferences.html | 32 ++++++++++++++++++------ 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 7af803f41..1b905d09e 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -67,22 +67,6 @@
      Advanced
    -
    -

    - Spending Restrictions -

    -
      -
    • - -
      Request Password
      -
      • -
    • - -
      Scan Fingerprint
      -
      • -
    -
    -

    diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 1fc70c1a0..195914114 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -28,11 +28,6 @@ Wallet Service URL - -
  • - -
    Delete Wallet
    -
    • diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html index 218845048..0025f6808 100644 --- a/public/views/preferencesDeleteWords.html +++ b/public/views/preferencesDeleteWords.html @@ -22,6 +22,9 @@

    Once you have copied your wallet seed down, it is recommended to delete it from this device.

    +

    + Need to do backup +

    -
    - -

    - +

      - -
    • - -
      Delete seed words
      +
    • + +
      Delete Wallet
      • +
    • + +
      Delete seed words
      +
    +
    +

    + Spending Restrictions +

    +
      +
    • + +
      Request Password
      +
      • +
    • + +
      Scan Fingerprint
      +
      • +
    +
    +

    From eef61bfd51418ac958e4c57ea14169f411ec556a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 18 Nov 2015 15:14:09 -0300 Subject: [PATCH 013/183] security preferences in wallet preferences --- public/views/preferences.html | 42 +++++++++++++++++++----- public/views/preferencesAdvanced.html | 10 +++++- public/views/preferencesDeleteWords.html | 42 +++++++++++++++++------- public/views/securityPreferences.html | 35 -------------------- src/js/controllers/preferences.js | 17 ++++++---- src/js/routes.js | 12 ------- 6 files changed, 84 insertions(+), 74 deletions(-) delete mode 100644 public/views/securityPreferences.html diff --git a/public/views/preferences.html b/public/views/preferences.html index 1b905d09e..a75e66212 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -9,8 +9,8 @@

    -
      +
      • @@ -45,8 +45,6 @@
        Hardware wallet
        • -

        -

      • @@ -56,17 +54,45 @@
        Backup
        • - -
      • - -
        Security Preferences
        -
      • Advanced
        • +
      +

      + Security preferences +

      + +
      + +
        + +
      • + +
        Request Password
        +
        • + +
      • + +
        Scan Fingerprint
        +
        • +
      + +
      +
      + +
        +
      • + +
        Delete seed words
        +
        • +
      + +
      +
    +
    diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 195914114..52bb3634f 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -7,6 +7,7 @@

    +
    • @@ -26,9 +27,16 @@
    • - Wallet Service URL +
      Wallet Service URL
      • + +
    • + +
      Delete Wallet
      +
      • +
    +
    diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html index 0025f6808..796ec99bf 100644 --- a/public/views/preferencesDeleteWords.html +++ b/public/views/preferencesDeleteWords.html @@ -1,35 +1,53 @@
    + ng-init="titleSection='Delete Seed Words'; goBackToState = 'preferences'">

    +
    + Wallet: {{index.walletName}} ({{index.alias}}) +
    +

    Warning!

    +
    + {{preferences.error|translate}} +
    +
    -

    - Once you have copied your wallet seed down, it is recommended to delete it from this device. -

    -

    - Need to do backup -

    + +

    + + Once you have copied your wallet seed down, it is recommended to delete it from this device. + +

    + +

    + + Need to do backup + +

    + +
    -
    + +
    diff --git a/public/views/securityPreferences.html b/public/views/securityPreferences.html deleted file mode 100644 index 3ee9fce2e..000000000 --- a/public/views/securityPreferences.html +++ /dev/null @@ -1,35 +0,0 @@ -
    -
    - -
    -

    -
      -
    • - -
      Delete Wallet
      -
      • -
    • - -
      Delete seed words
      -
      • - -
    -
    -

    - Spending Restrictions -

    -
      -
    • - -
      Request Password
      -
      • -
    • - -
      Scan Fingerprint
      -
      • -
    -
    -

    diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 1701f16be..046d4e6da 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -2,7 +2,13 @@ angular.module('copayApp.controllers').controller('preferencesController', function($scope, $rootScope, $timeout, $log, configService, profileService) { - + + var fc = profileService.focusedClient; + $scope.deleted = false; + if (fc.credentials && !fc.credentials.mnemonicEncrypted && !fc.credentials.mnemonic) { + $scope.deleted = true; + } + this.init = function() { var config = configService.getSync(); var fc = profileService.focusedClient; @@ -37,8 +43,8 @@ angular.module('copayApp.controllers').controller('preferencesController', }); }); } else { - if (!val && fc.hasPrivKeyEncrypted()) { - profileService.unlockFC(function(err){ + if (!val && fc.hasPrivKeyEncrypted()) { + profileService.unlockFC(function(err) { if (err) { $scope.encrypt = true; return; @@ -70,14 +76,13 @@ angular.module('copayApp.controllers').controller('preferencesController', opts.touchIdFor[walletId] = newVal; $rootScope.$emit('Local/RequestTouchid', function(err) { - if (err) { + if (err) { $log.debug(err); $timeout(function() { $scope.touchidError = true; $scope.touchid = oldVal; }, 100); - } - else { + } else { configService.set(opts, function(err) { if (err) { $log.debug(err); diff --git a/src/js/routes.js b/src/js/routes.js index 0e2da59b8..b2baef96c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -286,18 +286,6 @@ angular } }) - .state('securityPreferences', { - url: '/securityPreferences', - templateUrl: 'views/securityPreferences.html', - walletShouldBeComplete: true, - needProfile: true, - views: { - 'main': { - templateUrl: 'views/securityPreferences.html' - }, - } - }) - .state('preferencesAdvanced', { url: '/preferencesAdvanced', templateUrl: 'views/preferencesAdvanced.html', From ebedb64237d1ca62b043506afe7edb1d5d0f6e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 19 Nov 2015 15:15:36 -0300 Subject: [PATCH 014/183] refactor --- public/views/preferences.html | 1 + public/views/preferencesAdvanced.html | 2 +- public/views/preferencesDeleteWords.html | 4 ++-- src/js/controllers/preferencesDeleteWords.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index a75e66212..8cd8e7649 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -93,6 +93,7 @@
    +

    diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 52bb3634f..47a043629 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -27,7 +27,7 @@
  • -
    Wallet Service URL
    +
    Wallet Service URL
  • diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html index 796ec99bf..d63f27be6 100644 --- a/public/views/preferencesDeleteWords.html +++ b/public/views/preferencesDeleteWords.html @@ -34,13 +34,13 @@

    -

    +

    Need to do backup

    -
    • -
    +
    Show advanced options diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 9a14d960b..e4c04e26d 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -23,6 +23,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.isMobile = isMobile.any(); this.isWindowsPhoneApp = isMobile.Windows() && isCordova; this.blockUx = false; + this.disableAdvSend = false; this.isRateAvailable = false; this.showScanner = false; this.isMobile = isMobile.any(); @@ -1022,6 +1023,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.lockAmount = false; this.currentSendFeeLevel = null; this.hideAdvSend = true; + this.disableAdvSend = false; $scope.currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed; this._amount = this._address = null; @@ -1285,15 +1287,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.setForm(null, amount, null, feeRate); }; - this.sendAll = function(amount, feeStr, feeRate) { + this.sendAll = function(amount, feeStr, feeRate, currentFeeLevel) { var self = this; var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", { fee: feeStr }); confirmDialog.show(msg, function(confirmed) { - if (confirmed) + if (confirmed) { self._doSendAll(amount, feeRate); + self.disableAdvSend = true; + self.currentSendFeeLevel = currentFeeLevel; + $scope.currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed; + } }); }; From 95bac39e99c1cbd44fdd968a96d46232d027adaf Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 23 Nov 2015 12:56:43 -0300 Subject: [PATCH 019/183] Swipe to close modals --- public/views/modals/glidera-tx-details.html | 4 +++- public/views/modals/tx-details.html | 4 +++- public/views/modals/txp-details.html | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/views/modals/glidera-tx-details.html b/public/views/modals/glidera-tx-details.html index 5902bbc72..14c4abbf2 100644 --- a/public/views/modals/glidera-tx-details.html +++ b/public/views/modals/glidera-tx-details.html @@ -12,7 +12,9 @@ -
    +
    bought diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 23676a05e..8347aa1f7 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -12,7 +12,9 @@ -
    +
    +-{{btx.amountStr}} diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 05d6ead49..6dd1d565a 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -11,7 +11,10 @@ -
    +

    Details
    -

    Activity

    +

    Activity

    No activity in your account diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 63f8c5ecd..1d2d7960a 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -21,19 +21,14 @@
    -

    -
    - -
    -
    - Daily sell limit: - {{index.glideraLimits.dailySell|currency:'':2}} {{index.glideraLimits.currency}} - (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}}) -
    - Monthly sell limit: - {{index.glideraLimits.monthlySell|currency:'':2}} {{index.glideraLimits.currency}} - (remaining {{index.glideraLimits.monthlySellRemaining|currency:'':2}} {{index.glideraLimits.currency}}) -
    +

    + Daily sell limit: + {{index.glideraLimits.dailySell|currency:'':2}} {{index.glideraLimits.currency}} + (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}}) +
    + Monthly sell limit: + {{index.glideraLimits.monthlySell|currency:'':2}} {{index.glideraLimits.currency}} + (remaining {{index.glideraLimits.monthlySellRemaining|currency:'':2}} {{index.glideraLimits.currency}})

    diff --git a/src/css/main.css b/src/css/main.css index 716fc180b..83e858c19 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -74,7 +74,7 @@ h4.title a { } -.preferences h4, .modal-content h4, .walletHome h4 { +.preferences h4, .modal-content h4, .walletHome h4, .glidera h4 { background: #F6F7F9; padding: 25px 0px 5px 20px; text-transform: uppercase; @@ -1024,6 +1024,9 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .black { background-color: #2C3E50; } +.white { + background-color: #FFFFFF; +} .text-italic {font-style: italic;} .text-light {font-weight: 200;} .text-bold {font-weight: 700;} From f5c22c8c2d428f771a1ed79b1d3d76254b6e097f Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 2 Dec 2015 14:47:02 -0300 Subject: [PATCH 084/183] error notification --- public/views/walletHome.html | 1 - src/css/main.css | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index e5cfc79f0..17b234750 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -285,7 +285,6 @@ {{home.error|translate}} - ×
    diff --git a/src/css/main.css b/src/css/main.css index 83e858c19..fbdab9a70 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -270,9 +270,10 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu .box-notification { position: relative; font-size: 12px; - padding: 0.5rem 2rem 0.5rem 0.7rem; + padding: 0.5rem; border-radius: 2px; - background: #F2F5F8; + background: #FFFFFF; + box-shadow: 1px 1px 0px 0px rgba(0,0,0,0.10); margin: 0 auto; margin-bottom: 1.6rem; } From 3c0d5d6450ad8d0561f7cbddb2af338d3daf9ab1 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 2 Dec 2015 15:57:36 -0300 Subject: [PATCH 085/183] navigation bar style --- public/views/includes/menu-item.html | 2 +- src/css/mobile.css | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/views/includes/menu-item.html b/public/views/includes/menu-item.html index 79e09d0cf..50b0e424c 100644 --- a/public/views/includes/menu-item.html +++ b/public/views/includes/menu-item.html @@ -1,4 +1,4 @@ - +
    {{ item.title|translate }} diff --git a/src/css/mobile.css b/src/css/mobile.css index f891c52e2..3ffad4890 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -150,7 +150,8 @@ _:-ms-fullscreen, :root .main { bottom: 0; width: 100%; z-index: 5; - background: #2C3E50; + background: #FFFFFF; + box-shadow: 0px -1px 3px 0px rgba(0,0,0,0.20); } .second-bottom-bar { @@ -246,15 +247,13 @@ ul.copayer-list img { } .bottombar-item a { - color: #9EA9B3; + color: #A5B2BF; padding: 0.5rem 0; display: block; - border-top: 3px solid #122232; } .bottombar-item a.active { - color: #E4E8EC; - background-color: #122232; + color: #2C3E50; } .box-founds { From eec710d87bda5c93c3f5ea27d0a74e04ebc17380 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 2 Dec 2015 16:01:25 -0300 Subject: [PATCH 086/183] Fix camera position --- bower.json | 6 +++--- public/views/walletHome.html | 14 +++++++------- src/css/main.css | 2 +- src/css/mobile.css | 8 +++++--- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/bower.json b/bower.json index 0804d4c5c..9b03088e4 100644 --- a/bower.json +++ b/bower.json @@ -9,15 +9,15 @@ "dependencies": { "angular": "1.4.6", "angular-bitcore-wallet-client": "1.1.7", - "angular-foundation": "0.7.0", - "angular-gettext": "2.1.0", + "angular-foundation": "0.8.0", + "angular-gettext": "2.1.2", "angular-moment": "0.10.1", "angular-qrcode": "monospaced/angular-qrcode#~6.0.3", "angular-ui-router": "0.2.15", "angular-ui-switch": "0.1.1", "animate.css": "3.4.0", "fastclick": "1.0.6", - "foundation": "5.5.2", + "foundation": "5.5.3", "foundation-icon-fonts": "*", "moment": "2.10.3", "ng-lodash": "0.2.3", diff --git a/public/views/walletHome.html b/public/views/walletHome.html index e5cfc79f0..053c399b8 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -72,7 +72,7 @@ -->
    -
    +
    @@ -110,10 +110,7 @@
    {{ (index.alias || index.walletName) | limitTo: 1}} -
    -
    - -
    +

    @@ -133,6 +130,9 @@

    +
    + +
    @@ -265,10 +265,10 @@ -->
    -
    +

    - Send All diff --git a/src/css/main.css b/src/css/main.css index 83e858c19..8b780552a 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -54,7 +54,6 @@ h4 { font-size: 0.75rem; text-align: center; line-height: 1.5; - min-height: 62px; } h4.title a { @@ -524,6 +523,7 @@ ul.manage li { .p5h {padding: 0 5px;} .p20h {padding: 0 20px;} .p20v {padding: 20px 0;} +.p20b {padding-bottom: 20px;} .p25l {padding-left: 25px;} .p15 {padding:15px;} .p20 {padding:20px;} diff --git a/src/css/mobile.css b/src/css/mobile.css index f891c52e2..b5b75ef4f 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -170,7 +170,7 @@ _:-ms-fullscreen, :root .main { .amount { width: 100%; text-align: center; - padding: 2.5rem 1rem 1.5rem 1rem; + padding: 1.5rem 1rem 1.5rem 1rem; margin-bottom: 11px; color: #fff; height: 175px; @@ -226,12 +226,14 @@ _:-ms-fullscreen, :root .main { position: absolute; padding: 15px 17px; border-radius: 100%; - top: -40px; + top: inherit; right: 15px; + bottom: 45px; } .send .camera-icon a { - top: 32px; + top: inherit; + bottom: 0; } .copayers { From ce71258934ed267b083e6855370ec1b67be2dde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 2 Dec 2015 14:53:35 -0300 Subject: [PATCH 087/183] change in button name --- public/views/walletHome.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 5f5a406fc..44650e9f5 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -505,7 +505,7 @@ - Download CSV file + CSV

    From 00e0076a9017d0365e2e1b23eefd9b3b1cf36582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 2 Dec 2015 15:34:34 -0300 Subject: [PATCH 088/183] transaction history options in preferences advanced --- public/views/preferencesAdvanced.html | 5 +++++ public/views/preferencesHistory.html | 21 ++++++++++++++++++++ public/views/preferencesInformation.html | 8 -------- public/views/walletHome.html | 12 ++--------- src/js/controllers/preferencesHistory.js | 21 ++++++++++++++++++++ src/js/controllers/preferencesInformation.js | 15 +------------- src/js/routes.js | 12 +++++++++++ 7 files changed, 62 insertions(+), 32 deletions(-) create mode 100644 public/views/preferencesHistory.html create mode 100644 src/js/controllers/preferencesHistory.js diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 47a043629..5ada33cbf 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -30,6 +30,11 @@
    Wallet Service URL
    +
  • + +
    Transaction History
    +
    • +
  • Delete Wallet
    diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html new file mode 100644 index 000000000..6df8ac0ec --- /dev/null +++ b/public/views/preferencesHistory.html @@ -0,0 +1,21 @@ +
    +
    +
    +

    +
      +
    • + +
      • +
    • + +
      • +
    +
    diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index 1ca38d889..3e0ea6d54 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -146,14 +146,6 @@
    • -
      -

      Transaction history

      -
    • - -
      • -

    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 44650e9f5..d4eccff5a 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -496,19 +496,11 @@
    -
    -
    -
    - - - - CSV - -
    -
    diff --git a/src/js/controllers/preferencesHistory.js b/src/js/controllers/preferencesHistory.js new file mode 100644 index 000000000..2a71425bb --- /dev/null +++ b/src/js/controllers/preferencesHistory.js @@ -0,0 +1,21 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesHistory', + function($scope, $log, $timeout, storageService, go, profileService) { + var fc = profileService.focusedClient; + var c = fc.credentials; + + this.clearTransactionHistory = function() { + storageService.removeTxHistory(c.walletId, function(err) { + if (err) { + $log.error(err); + return; + } + $scope.$emit('Local/ClearHistory'); + + $timeout(function() { + go.walletHome(); + }, 100); + }); + } + }); diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index b0ea5a395..081a24908 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', var c = fc.credentials; this.init = function() { - var basePath = c.getBaseAddressDerivationPath(); + var basePath = c.getBaseAddressDerivationPath(); $scope.walletName = c.walletName; $scope.walletId = c.walletId; @@ -94,17 +94,4 @@ angular.module('copayApp.controllers').controller('preferencesInformation', }, 100); }; - this.clearTransactionHistory = function() { - storageService.removeTxHistory(c.walletId, function(err) { - if (err) { - $log.error(err); - return; - } - $scope.$emit('Local/ClearHistory'); - - $timeout(function() { - go.walletHome(); - }, 100); - }); - } }); diff --git a/src/js/routes.js b/src/js/routes.js index 60db0e35d..2e24d4bc9 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -342,6 +342,18 @@ angular } }) + .state('preferencesHistory', { + url: '/preferencesHistory', + templateUrl: 'views/preferencesHistory.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesHistory.html' + }, + + } + }) .state('deleteWords', { url: '/deleteWords', templateUrl: 'views/preferencesDeleteWords.html', From e98edfbb9ee04ed55041b086f91129c99acc6da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 2 Dec 2015 16:11:02 -0300 Subject: [PATCH 089/183] adding animation --- src/js/services/animationService.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/services/animationService.js b/src/js/services/animationService.js index 75586a3c2..dc43de45d 100644 --- a/src/js/services/animationService.js +++ b/src/js/services/animationService.js @@ -36,6 +36,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo preferencesFee: 12, preferencesAltCurrency: 12, preferencesBwsUrl: 13, + preferencesHistory: 13, preferencesAlias: 12, preferencesEmail: 12, export: 13, From b11aa2b61853256fff171ca21ee2b231a3b94bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 2 Dec 2015 16:35:49 -0300 Subject: [PATCH 090/183] fix topbar color --- public/views/preferencesBwsUrl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index bca608ea3..c5dabeb7c 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -1,7 +1,7 @@
    + ng-init="titleSection='Wallet Service URL'; goBackToState = 'preferencesAdvanced';">
    From acff47b4efec301b5ca156a53dfe482ab472f38b Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 2 Dec 2015 16:51:56 -0300 Subject: [PATCH 091/183] fix some details --- public/views/includes/menu-item.html | 2 +- public/views/walletHome.html | 4 ++-- src/css/main.css | 5 +++-- src/css/mobile.css | 11 ++++++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/public/views/includes/menu-item.html b/public/views/includes/menu-item.html index 50b0e424c..898b6c6a9 100644 --- a/public/views/includes/menu-item.html +++ b/public/views/includes/menu-item.html @@ -1,5 +1,5 @@ - +
    {{ item.title|translate }} diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 5f5a406fc..f4e883ace 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -107,7 +107,7 @@
    -
    +
    {{ (index.alias || index.walletName) | limitTo: 1}}
    @@ -265,7 +265,7 @@ -->
    -
    +

    Date: Wed, 2 Dec 2015 16:42:57 -0300 Subject: [PATCH 092/183] Fix active-menu class --- public/views/includes/menu-item.html | 3 ++- src/css/mobile.css | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/public/views/includes/menu-item.html b/public/views/includes/menu-item.html index 898b6c6a9..20d73af7a 100644 --- a/public/views/includes/menu-item.html +++ b/public/views/includes/menu-item.html @@ -1,4 +1,5 @@ - +
    {{ item.title|translate }} diff --git a/src/css/mobile.css b/src/css/mobile.css index 47836301e..c8f79cc39 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -259,10 +259,6 @@ ul.copayer-list img { display: block; } -.bottombar-item a.active { - color: #2C3E50; -} - .box-founds { background-color: #213140; } From b20654d6f571ac484ea751513bed55f9e59d9f09 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 2 Dec 2015 18:20:22 -0300 Subject: [PATCH 093/183] Simplify menu. Fix contacts color --- public/views/modals/destination-address.html | 14 +- public/views/walletHome.html | 219 +++++++++---------- src/css/main.css | 6 - src/js/controllers/index.js | 14 +- src/js/controllers/walletHome.js | 3 +- 5 files changed, 126 insertions(+), 130 deletions(-) diff --git a/public/views/modals/destination-address.html b/public/views/modals/destination-address.html index f3b00f1e7..9be81d04f 100644 --- a/public/views/modals/destination-address.html +++ b/public/views/modals/destination-address.html @@ -1,5 +1,5 @@
    -

    @@ -386,14 +383,14 @@
    +
    + + {{home.error|translate}} + +
    -
    - -
    - - {{home.error|translate}} - -
    +
    +
    diff --git a/src/css/main.css b/src/css/main.css index e0cd00855..4318fc8af 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -75,7 +75,7 @@ h4.title a { .preferences h4, .modal-content h4, .walletHome h4, .glidera h4 { background: #F6F7F9; - padding: 25px 0px 5px 20px; + padding: 25px 0px 5px 10px; text-transform: uppercase; color: #555; font-size: 12px; @@ -272,9 +272,6 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu padding: 0.5rem; border-radius: 2px; background: #FFFFFF; - box-shadow: 1px 1px 0px 0px rgba(0,0,0,0.10); - margin: 0 auto; - margin-bottom: 1.6rem; } .box-notification .box-icon { @@ -482,6 +479,7 @@ ul.manage li { .m0 {margin: 0;} .p0i {padding: 0 !important;} .db {display: block;} +.dib {display: inline-block;} .size-10 { font-size: 10px; } .size-12 { font-size: 12px; } .size-14 { font-size: 14px; } @@ -529,6 +527,7 @@ ul.manage li { .p25l {padding-left: 25px;} .p15 {padding:15px;} .p20 {padding:20px;} +.p20t {padding-top:20px;} .p10 {padding:10px;} .p10b {padding-bottom:10px;} .p45t {padding-top:45px;} diff --git a/src/css/mobile.css b/src/css/mobile.css index c8f79cc39..585fa132e 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -744,6 +744,27 @@ textarea:focus padding-top: 1rem; } +.payment-proposal-head { + color: #fff; + padding: 0 10px 20px 10px; + text-align: center; +} + +.payment-proposal-to { + display: inline-block; + padding: 3px 15px; + background-color: rgba(0, 0, 0, 0.1); +} + +.payment-proposal-to i { + margin-right: 10px; + padding-right: 10px; + border-right: 1px solid; + border-color: rgba(0, 0, 0, 0.1); + font-size: 25px; + vertical-align: middle; +} + ::-webkit-input-placeholder { color: #B7C2CD; } From 0ed427070abd2425269b6aa14a5f5317819e2862 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 15:07:38 -0300 Subject: [PATCH 096/183] ui tx proposal pending --- public/img/icon-proposal.svg | 20 ++++++++++ public/views/includes/transaction.html | 55 +++++++++++++------------- src/css/main.css | 8 +++- 3 files changed, 54 insertions(+), 29 deletions(-) create mode 100644 public/img/icon-proposal.svg diff --git a/public/img/icon-proposal.svg b/public/img/icon-proposal.svg new file mode 100644 index 000000000..63e90d1b8 --- /dev/null +++ b/public/img/icon-proposal.svg @@ -0,0 +1,20 @@ + + + + Oval 145 Copy 5 + send + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index 24093e465..4b3fa3fcb 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -1,37 +1,36 @@
    -
    - -   -
    -
    -
    - Send {{tx.amountStr}} - -
    -
    - - Recipients: - {{tx.recipientCount}} +
    +
    + + sync +
    +
    + + {{index.addressbook[tx.toAddress]}} + + {{tx.message}} - - To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - - - {{index.addressbook[tx.toAddress] || tx.toAddress}} - + + Sending -
    -
    - {{tx.message}} -
    + + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + +
    -
    -
    +
    + + - {{tx.amountStr}} + +
    + +
    +
    +
    diff --git a/src/css/main.css b/src/css/main.css index b91d4365c..8c6d02f7f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -342,6 +342,12 @@ ul.tx-copayers { text-align: center; } +.icon-circle-active { + position: absolute; + bottom: 2px; + right: 2px; +} + .icon-sign { padding: 0.2rem 0.3rem; border-radius: 100%; @@ -1422,7 +1428,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .spinner > div { - background-color: #fff; + background-color: #8597A7; height: 100%; width: 2px; display: inline-block; From 5768fffc128c812997e3ff06fb863c35c1d3e1de Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 15:08:44 -0300 Subject: [PATCH 097/183] fix transactions downloading notification --- public/views/walletHome.html | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index b19d04430..c7cd7de3c 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -176,26 +176,18 @@
    + + No transactions yet +

    Could not fetch transaction history

     - - No transactions yet -
    -
    -
    - sync -
    -
    - Initial transaction history synchronization can take some minutes for wallets with many transactions. - Please stand by. -
    -
    +
    -
    - {{index.txProgress}}
    - Transactions Downloaded +
    + {{index.txProgress}} + Transactions Downloaded
    + Wait some minutes...
    From 69d83ec5278ae8be5643520c20e64f15a4a8d517 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Dec 2015 15:11:23 -0300 Subject: [PATCH 098/183] New design for transaction info --- public/views/modals/tx-details.html | 33 ++++++++++++++-------------- public/views/modals/txp-details.html | 8 +++---- src/css/main.css | 4 ++-- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 1e1294504..8b1673cb4 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -15,11 +15,11 @@
    -
    -
    +
    +
    +-{{btx.amountStr}}
    -
    +
    -
    @@ -29,7 +29,7 @@
    • - To: + To {{btx.merchant.domain}} @@ -44,7 +44,7 @@
    • - Recipients: + Recipients {{btx.recipientCount}} @@ -57,7 +57,7 @@
  • - Note: + Note {{btx.message}}
    • @@ -66,28 +66,28 @@ This transaction has become invalid; possibly due to a double spend attempt.
  • - Date: + Date
  • - Fee: + Fee {{btx.feeStr}}
  • - Note: + Note {{btx.message}}
  • - Merchant message: + Merchant message {{btx.merchant.pr.pd.memo}}
  • - Confirmations: + Confirmations Unconfirmed @@ -107,11 +107,12 @@

    Participants

    • - - - - - {{c.copayerName}} ({{'Me'|translate}}) + + + + + + {{c.copayerName}} ({{'Me'|translate}})
    • diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index c79149cd4..ae30f4e4c 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -161,11 +161,11 @@
    • - {{ac.copayerName}} ({{'Me'|translate}}) - - Rejected - Signed + + + + {{ac.copayerName}} ({{'Me'|translate}})
    diff --git a/src/css/main.css b/src/css/main.css index 4318fc8af..b0806d3ea 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -343,7 +343,8 @@ ul.tx-copayers { padding: 0.2rem 0.3rem; border-radius: 100%; color: #fff; - margin-right: 7px; + font-size: 10px; + margin-top: 3px; } .icon-sign.check { @@ -625,7 +626,6 @@ input[type=number]::-webkit-outer-spin-button { } .header-modal { - border-bottom: 1px solid #E2E7ED; background: #fff; width: 100%; padding: 0.8rem; From 5ed135b68966a377306a4a3c8ce5520b9889fb2c Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 15:48:03 -0300 Subject: [PATCH 099/183] fix spinner home --- src/css/main.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/css/main.css b/src/css/main.css index 8c6d02f7f..a2f714b74 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1427,8 +1427,12 @@ input.ng-invalid-match, input.ng-invalid-match:focus { vertical-align: middle; } -.spinner > div { +.walletHome .spinner > div { background-color: #8597A7; +} + +.spinner > div { + background-color: #fff; height: 100%; width: 2px; display: inline-block; From afc52d69ce4308a7d104cc5da5faec1acf6d0b11 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Dec 2015 16:22:44 -0300 Subject: [PATCH 100/183] Updates tx-status, new design --- public/views/modals/tx-status.html | 27 +++++++++++++++------------ src/css/main.css | 1 + src/css/mobile.css | 17 ++++++++++------- src/js/services/txStatus.js | 5 ++++- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 507a85e6b..7d6481f5c 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -1,18 +1,21 @@ -
    - -
    - Payment Sent +
    + +
    + {{tx.amountStr}}
    -
    - OKAY +
    + Sent +
    +
    + OKAY
    - -
    + +
    Payment Proposal Created
    @@ -23,8 +26,8 @@
    - -
    + +
    Payment Accepted
    @@ -33,8 +36,8 @@
    - -
    + +
    Payment Rejected
    diff --git a/src/css/main.css b/src/css/main.css index b0806d3ea..2546f314c 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -513,6 +513,7 @@ ul.manage li { .m20r {margin-right: 20px;} .m20t {margin-top: 20px;} .m20tp {margin-top: 20%;} +.m30tp {margin-top: 30%;} .m15 {margin: 15px;} .m15h {margin: 0 15px;} .p10t {padding-top: 10px;} diff --git a/src/css/mobile.css b/src/css/mobile.css index 585fa132e..8ab2e81fb 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -705,14 +705,15 @@ textarea:focus position: absolute; width: 100%; height: 100%; - background: #1ABC9C; + background: rgba(24,44,58,0.90); } .popup-txsent i { font-size: 5rem; - background-color: #fff; - color: #1ABC9C; + color: #4A90E2; border-radius: 100%; + border-color: #4A90E2; + border: 2px solid; width: 150px; height: 150px; display: block; @@ -722,9 +723,10 @@ textarea:focus .popup-txsigned i { font-size: 5rem; - background-color: #1ABC9C; - color: #fff; + color: #4A90E2; border-radius: 100%; + border-color: #4A90E2; + border: 2px solid; width: 150px; height: 150px; display: block; @@ -734,9 +736,10 @@ textarea:focus .popup-txrejected i { font-size: 5rem; - background-color: #ED4A43; - color: #fff; + color: #4A90E2; border-radius: 100%; + border-color: #4A90E2; + border: 2px solid; width: 150px; height: 150px; display: block; diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js index a4b45d485..8456d85d1 100644 --- a/src/js/services/txStatus.js +++ b/src/js/services/txStatus.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout) { +angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout, txFormatService) { var root = {}; root.notify = function(txp, cb) { @@ -42,8 +42,11 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, }; var openModal = function(type, txp, cb) { + var fc = profileService.focusedClient; var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.type = type; + $scope.tx = txFormatService.processTx(txp); + $scope.color = fc.backgroundColor; $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; From 65eb43b5ec8409ba5a93f1556d78b67094291912 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 16:51:07 -0300 Subject: [PATCH 101/183] fix modal tx details --- public/views/modals/tx-details.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 8b1673cb4..8c545a92d 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -17,6 +17,19 @@ ng-swipe-right="cancel()">
    +
    + sync +

    Received

    +
    +
    + sync +

    Sent

    +
    +
    + sync +

    Moved

    +
    + +-{{btx.amountStr}}
    From c0530bda79690cb333e43bd1fa5bd028a0ea212f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 3 Dec 2015 16:53:34 -0300 Subject: [PATCH 102/183] link in transaction History options --- public/views/preferencesHistory.html | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html index 6df8ac0ec..dca514b7a 100644 --- a/public/views/preferencesHistory.html +++ b/public/views/preferencesHistory.html @@ -6,16 +6,12 @@

    From 0596c6fd425e0778de7c024a0792bfa4903396fe Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Dec 2015 16:54:30 -0300 Subject: [PATCH 103/183] Fix paypro modal --- public/views/modals/paypro.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html index 9b73e9a3e..a7484be79 100644 --- a/public/views/modals/paypro.html +++ b/public/views/modals/paypro.html @@ -24,15 +24,15 @@

    Details

    • - Pay To: + Pay To {{paypro.domain}}
    • - Address: + Address {{paypro.toAddress}}
    • - Certified by: + Certified by @@ -51,11 +51,11 @@
    • - Memo: + Memo {{paypro.memo}}
    • - Expires: + Expires {{paypro.expires * 1000 | amTimeAgo }}
    From af904caa05863364e43d89da176217408a68ef09 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 17:01:19 -0300 Subject: [PATCH 104/183] fix ui details --- public/views/create.html | 2 +- public/views/import.html | 2 +- public/views/modals/destination-address.html | 2 +- src/css/mobile.css | 13 +++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index d7b4fc04c..3f2e0fcb2 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -6,7 +6,7 @@ -
    +
    diff --git a/public/views/import.html b/public/views/import.html index a85b49116..9faa92c66 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -4,7 +4,7 @@ ng-init="titleSection='Import wallet'; goBackToState = 'add'; noColor = true">
    -
    +