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... +
+
+ +
+

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(); - } - }); - }; - });