From b6b619eacae63638643ca7edade305cf64b4f120 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 14 Jun 2016 09:56:14 -0300
Subject: [PATCH 1/2] remove ion-content

---
 public/views/create.html | 20 ++++++++------------
 public/views/import.html |  4 ++--
 public/views/join.html   |  5 ++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index 2b32a5ae1..2a009d75a 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -4,20 +4,16 @@
   ng-init="titleSection='Create new wallet';  goBackToState = 'add'; noColor = true">
 </div>
 
-
-
-<ion-content overflow-scroll="true" class="content p20b" ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
+<div class="content p20b" ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
 
   <div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
     <div class="row">
-    <div class="tab-container small-6 medium-3 large-2" ng-class="{'selected': totalCopayers == 1}">
-    <a href
-      ng-click="create.setTotalCopayers(1)" translate>Personal Wallet</a>
-    </div>
-    <div class="tab-container small-6 medium-3 large-2" ng-class="{'selected': totalCopayers != 1}">
-    <a href
-      ng-click="create.setTotalCopayers(3)" translate>Shared Wallet</a>
-    </div>
+      <div class="tab-container small-6 medium-3 large-2" ng-class="{'selected': totalCopayers == 1}">
+        <a href ng-click="create.setTotalCopayers(1)" translate>Personal Wallet</a>
+      </div>
+      <div class="tab-container small-6 medium-3 large-2" ng-class="{'selected': totalCopayers != 1}">
+        <a href ng-click="create.setTotalCopayers(3)" translate>Shared Wallet</a>
+      </div>
     </div>
   </div>
 
@@ -166,5 +162,5 @@
       </div> <!-- large-12 columns -->
     </div> <!-- row -->
   </form>
-</ion-content>
+</div>
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/import.html b/public/views/import.html
index 2fd3a8d04..3b293b44c 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -4,7 +4,7 @@
   ng-init="titleSection='Import wallet';  goBackToState = 'add'; noColor = true">
 </div>
 
-<ion-content overflow-scroll="true" class="content p20b" ng-controller="importController as import" ng-init="type='12'">
+<div class="content p20b" ng-controller="importController as import" ng-init="type='12'">
   <div class="create-tab pr small-only-text-center" ng-hide="create.hideTabs">
     <div class="row">
       <div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type =='12'}">
@@ -216,6 +216,6 @@
       </form>
     </div>
   </div>
-</ion-content>
+</div>
 
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/join.html b/public/views/join.html
index edd866517..c9e537578 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -5,7 +5,7 @@
 </div>
 
 
-<ion-content overflow-scroll="true" class="content p20v" ng-controller="joinController as join">
+<div class="content p20v" ng-controller="joinController as join">
   <form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
     <div class="box-notification m20b" ng-show="join.error">
       <span class="text-warning">
@@ -126,6 +126,5 @@
       </div> <!-- large-12 columns -->
     </div> <!-- row -->
   </form>
-</ion-content>
-
+</div>
 <div class="extra-margin-bottom"></div>

From 9a3d833a809874ef457a04a44b685fb8d3928b90 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 14 Jun 2016 10:00:07 -0300
Subject: [PATCH 2/2] remove ionic-scroll-delegate

---
 src/js/controllers/create.js |  8 +-------
 src/js/controllers/import.js | 18 +-----------------
 src/js/controllers/join.js   |  8 +-------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 8235fb256..8332daa5f 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('createController',
-  function($scope, $ionicScrollDelegate, $rootScope, $timeout, $log, lodash, go, profileService, configService, gettext, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) {
+  function($scope, $rootScope, $timeout, $log, lodash, go, profileService, configService, gettext, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isCordova = platformInfo.isCordova;
@@ -89,7 +89,6 @@ angular.module('copayApp.controllers').controller('createController',
     this.create = function(form) {
       if (form && form.$invalid) {
         this.error = gettext('Please enter the required fields');
-        $ionicScrollDelegate.scrollTop();
         return;
       }
 
@@ -117,7 +116,6 @@ angular.module('copayApp.controllers').controller('createController',
         var pathData = derivationPathHelper.parse($scope.derivationPath);
         if (!pathData) {
           this.error = gettext('Invalid derivation path');
-          $ionicScrollDelegate.scrollTop();
           return;
         }
 
@@ -131,7 +129,6 @@ angular.module('copayApp.controllers').controller('createController',
 
       if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
         this.error = gettext('Please enter the wallet recovery phrase');
-        $ionicScrollDelegate.scrollTop();
         return;
       }
 
@@ -139,7 +136,6 @@ angular.module('copayApp.controllers').controller('createController',
         var account = $scope.account;
         if (!account || account < 1) {
           this.error = gettext('Invalid account number');
-          $ionicScrollDelegate.scrollTop();
           return;
         }
 
@@ -155,7 +151,6 @@ angular.module('copayApp.controllers').controller('createController',
           ongoingProcess.set('connecting' + self.seedSourceId, false);
           if (err) {
             self.error = err;
-            $ionicScrollDelegate.scrollTop();
             $scope.$apply();
             return;
           }
@@ -176,7 +171,6 @@ angular.module('copayApp.controllers').controller('createController',
           if (err) {
             $log.warn(err);
             self.error = err;
-            $ionicScrollDelegate.scrollTop();
             $timeout(function() {
               $rootScope.$apply();
             });
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index ca72765f2..c1e518e34 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $rootScope, $ionicScrollDelegate, $timeout, $log, profileService, configService, notification, go, sjcl, gettext, lodash, ledger, trezor, derivationPathHelper, platformInfo, bwsError, bwcService, ongoingProcess) {
+  function($scope, $rootScope, $timeout, $log, profileService, configService, notification, go, sjcl, gettext, lodash, ledger, trezor, derivationPathHelper, platformInfo, bwsError, bwcService, ongoingProcess) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isDevel = platformInfo.isDevel;
@@ -53,7 +53,6 @@ angular.module('copayApp.controllers').controller('importController',
 
       if (err) {
         self.error = err;
-        $ionicScrollDelegate.scrollTop();
         $timeout(function() {
           $rootScope.$apply();
         });
@@ -69,7 +68,6 @@ angular.module('copayApp.controllers').controller('importController',
           ongoingProcess.set('importingWallet', false);
           if (err) {
             self.error = err;
-            $ionicScrollDelegate.scrollTop();
           } else {
             $rootScope.$emit('Local/WalletImported', walletId);
             notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
@@ -90,7 +88,6 @@ angular.module('copayApp.controllers').controller('importController',
             } else {
               self.error = err;
             }
-            $ionicScrollDelegate.scrollTop();
             return $timeout(function() {
               $scope.$apply();
             });
@@ -116,7 +113,6 @@ angular.module('copayApp.controllers').controller('importController',
             } else {
               self.error = err;
             }
-            $ionicScrollDelegate.scrollTop();
             return $timeout(function() {
               $scope.$apply();
             });
@@ -143,7 +139,6 @@ angular.module('copayApp.controllers').controller('importController',
     this.importBlob = function(form) {
       if (form.$invalid) {
         this.error = gettext('There is an error in the form');
-        $ionicScrollDelegate.scrollTop();
         $timeout(function() {
           $scope.$apply();
         });
@@ -156,7 +151,6 @@ angular.module('copayApp.controllers').controller('importController',
 
       if (!backupFile && !backupText) {
         this.error = gettext('Please, select your backup file');
-        $ionicScrollDelegate.scrollTop();
         $timeout(function() {
           $scope.$apply();
         });
@@ -176,7 +170,6 @@ angular.module('copayApp.controllers').controller('importController',
     this.importMnemonic = function(form) {
       if (form.$invalid) {
         this.error = gettext('There is an error in the form');
-        $ionicScrollDelegate.scrollTop();
         $timeout(function() {
           $scope.$apply();
         });
@@ -191,7 +184,6 @@ angular.module('copayApp.controllers').controller('importController',
       var pathData = derivationPathHelper.parse($scope.derivationPath);
       if (!pathData) {
         this.error = gettext('Invalid derivation path');
-        $ionicScrollDelegate.scrollTop();
         return;
       }
       opts.account = pathData.account;
@@ -203,7 +195,6 @@ angular.module('copayApp.controllers').controller('importController',
 
       if (!words) {
         this.error = gettext('Please enter the recovery phrase');
-        $ionicScrollDelegate.scrollTop();
       } else if (words.indexOf('xprv') == 0 || words.indexOf('tprv') == 0) {
         return _importExtendedPrivateKey(words, opts);
       } else {
@@ -211,7 +202,6 @@ angular.module('copayApp.controllers').controller('importController',
 
         if ((wordList.length % 3) != 0) {
           this.error = gettext('Wrong number of recovery words:') + wordList.length;
-          $ionicScrollDelegate.scrollTop();
         }
       }
 
@@ -234,7 +224,6 @@ angular.module('copayApp.controllers').controller('importController',
         ongoingProcess.clear();
         if (err) {
           self.error = err;
-          $ionicScrollDelegate.scrollTop();
           $scope.$apply();
           return;
         }
@@ -248,7 +237,6 @@ angular.module('copayApp.controllers').controller('importController',
           ongoingProcess.set('importingWallet', false);
           if (err) {
             self.error = err;
-            $ionicScrollDelegate.scrollTop();
             return $timeout(function() {
               $scope.$apply();
             });
@@ -263,7 +251,6 @@ angular.module('copayApp.controllers').controller('importController',
     this.importHW = function(form) {
       if (form.$invalid || $scope.account < 0) {
         this.error = gettext('There is an error in the form');
-        $ionicScrollDelegate.scrollTop();
         $timeout(function() {
           $scope.$apply();
         });
@@ -277,7 +264,6 @@ angular.module('copayApp.controllers').controller('importController',
       if (self.seedSourceId == 'trezor') {
         if (account < 1) {
           this.error = gettext('Invalid account number');
-          $ionicScrollDelegate.scrollTop();
           return;
         }
         account = account - 1;
@@ -313,7 +299,6 @@ angular.module('copayApp.controllers').controller('importController',
         ongoingProcess.clear();
         if (err) {
           self.error = err;
-          $ionicScrollDelegate.scrollTop();
           $scope.$apply();
           return;
         }
@@ -327,7 +312,6 @@ angular.module('copayApp.controllers').controller('importController',
           ongoingProcess.set('importingWallet', false);
           if (err) {
             self.error = err;
-            $ionicScrollDelegate.scrollTop();
             return $timeout(function() {
               $scope.$apply();
             });
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 9e7c56f0a..2dec7bf52 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('joinController',
-  function($scope, $rootScope, $timeout, $ionicScrollDelegate, go, notification, profileService, configService, storageService, applicationService, $modal, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) {
+  function($scope, $rootScope, $timeout, go, notification, profileService, configService, storageService, applicationService, $modal, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isDevel = platformInfo.isDevel;
@@ -55,7 +55,6 @@ angular.module('copayApp.controllers').controller('joinController',
     this.join = function(form) {
       if (form && form.$invalid) {
         self.error = gettext('Please enter the required fields');
-        $ionicScrollDelegate.scrollTop();
         return;
       }
 
@@ -78,7 +77,6 @@ angular.module('copayApp.controllers').controller('joinController',
         var pathData = derivationPathHelper.parse($scope.derivationPath);
         if (!pathData) {
           this.error = gettext('Invalid derivation path');
-          $ionicScrollDelegate.scrollTop();
           return;
         }
         opts.account = pathData.account;
@@ -92,7 +90,6 @@ angular.module('copayApp.controllers').controller('joinController',
       if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
 
         this.error = gettext('Please enter the wallet recovery phrase');
-        $ionicScrollDelegate.scrollTop();
         return;
       }
 
@@ -100,7 +97,6 @@ angular.module('copayApp.controllers').controller('joinController',
         var account = $scope.account;
         if (!account || account < 1) {
           this.error = gettext('Invalid account number');
-          $ionicScrollDelegate.scrollTop();
           return;
         }
 
@@ -115,7 +111,6 @@ angular.module('copayApp.controllers').controller('joinController',
           ongoingProcess.set('connecting' + self.seedSourceId, false);
           if (err) {
             self.error = err;
-            $ionicScrollDelegate.scrollTop();
             $scope.$apply();
             return;
           }
@@ -135,7 +130,6 @@ angular.module('copayApp.controllers').controller('joinController',
           if (err) {
             ongoingProcess.set('joiningWallet', false);
             self.error = err;
-            $ionicScrollDelegate.scrollTop();
             $rootScope.$apply();
             return;
           }