From a06292f733284f2dfb0413279524fe467ec5aa16 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 14 Sep 2016 18:04:44 -0300
Subject: [PATCH] fix disclaimer link and overflow text

---
 public/views/modals/terms.html              | 10 ++++------
 src/js/controllers/onboarding/disclaimer.js |  7 ++++++-
 src/sass/views/onboarding/terms-of-use.scss |  3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/public/views/modals/terms.html b/public/views/modals/terms.html
index 00f4b896f..cdd113c52 100644
--- a/public/views/modals/terms.html
+++ b/public/views/modals/terms.html
@@ -7,14 +7,12 @@
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
-    <div ng-include="'views/includes/terms.html'"></div>
-    <div class="padding-vertical" ng-show="lang != 'en'">
-      <a ng-click="openExternalLink(disclaimerUrl)" translate>Official English Disclaimer</a>
-    </div>
+  <ion-content class="has-header" scroll="false">
+    <ion-scroll ng-include="'views/includes/terms.html'" ng-style="{'height': '60%'}"></ion-scroll>
     <div id="agree-to-terms">
+      <a ng-click="openExternalLink('https://copay.io/disclaimer')" ng-show="lang != 'en'" translate>Official English Disclaimer</a>
       <ion-checkbox ng-model="terms.accept3"></ion-checkbox>
-      <p translate>I have read, understood, and agree with the <a ui-sref="onboarding.terms">Terms of use</a>.</p>
+      <p translate>I have read, understood, and agree with the Terms of use.</p>
       <button ng-disabled="!terms.accept3" class="button button-block button-positive" ng-click="termsModal.hide(); confirm()" translate>Confirm & Finish</button>
     </div>
   </ion-content>
diff --git a/src/js/controllers/onboarding/disclaimer.js b/src/js/controllers/onboarding/disclaimer.js
index ccb64ed82..c4ffbe7cd 100644
--- a/src/js/controllers/onboarding/disclaimer.js
+++ b/src/js/controllers/onboarding/disclaimer.js
@@ -1,8 +1,9 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService) {
+angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService) {
 
   $scope.init = function() {
+    $scope.lang = uxLanguage.currentLanguage;
     $scope.terms = {};
     $scope.accept1 = $scope.accept2 = $scope.accept3 = false;
     $timeout(function() {
@@ -19,6 +20,10 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi
     });
   };
 
+  $scope.openExternalLink = function(url, target) {
+    externalLinkService.open(url, target);
+  };
+
   $scope.openTermsModal = function() {
     $ionicModal.fromTemplateUrl('views/modals/terms.html', {
       scope: $scope
diff --git a/src/sass/views/onboarding/terms-of-use.scss b/src/sass/views/onboarding/terms-of-use.scss
index d5ecd8c45..1a714df08 100644
--- a/src/sass/views/onboarding/terms-of-use.scss
+++ b/src/sass/views/onboarding/terms-of-use.scss
@@ -17,7 +17,8 @@
   #agree-to-terms {
     background: #fff;
     padding: 1rem;
-    position: relative;
+    position: absolute;
+    bottom: 0;
     .checkbox input:before,
     .checkbox .checkbox-icon:before {
       border-radius: 50% !important;