fix addressbook add scanner and some refactors

src/js/controllers/addressbookAdd.js

@@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
     'email': ''
   };
 
-  $scope.onQrCodeScanned = function(data, addressbookForm) {
+  $scope.onQrCodeScannedAddressBook = function(data, addressbookForm) {
     $timeout(function() {
       var form = addressbookForm;
       if (data && form) {

src/js/controllers/join.js

@@ -33,7 +33,7 @@ angular.module('copayApp.controllers').controller('joinController',
       }
     };
 
-    this.onQrCodeScanned = function(data) {
+    this.onQrCodeScannedJoin = function(data) {
       $scope.secret = data;
       if ($scope.joinForm) {
         $scope.joinForm.secret.$setViewValue(data);
@@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('joinController',
     if ($stateParams.url) {
       var data = $stateParams.url;
       data = data.replace('copay:', '');
-      this.onQrCodeScanned(data);
+      this.onQrCodeScannedJoin(data);
     }
 
     var updateSeedSourceSelect = function() {

src/js/controllers/onboarding/welcomeController.js

@@ -8,13 +8,6 @@ angular.module('copayApp.controllers').controller('welcomeController', function(
     startupService.ready();
   });
 
-  $scope.goImport = function(code) {
-    $state.go('onboarding.import', {
-      fromOnboarding: true,
-      code: code
-    });
-  };
-
   $scope.createProfile = function() {
     $log.debug('Creating profile');
     profileService.createProfile(function(err) {

www/views/addressbook.add.html

@@ -47,7 +47,7 @@
                    valid-address required>
           </label>
           <div class="qr-scan-icon">
-            <qr-scanner on-scan="onQrCodeScanned(data, addressbookForm)"></qr-scanner>
+            <qr-scanner on-scan="onQrCodeScannedAddressBook(data, addressbookForm)"></qr-scanner>
           </div>
         </div>
       </div>

www/views/join.html

@@ -36,7 +36,7 @@
                    wallet-secret required>
           </label>
           <div class="qr-scan-icon">
-            <qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
+            <qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScannedJoin(data)"></qr-scanner>
           </div>
         </div>
         <div class="item item-divider"></div>

www/views/onboarding/welcome.html

@@ -1,6 +1,5 @@
 <ion-view id="onboard-welcome" class="onboarding">
   <ion-content ng-controller="welcomeController" ng-init="createProfile()" scroll="false">
-    <!-- <qr-scanner id="qrcode" on-scan="goImport(data)"></qr-scanner> -->
     <div id="logo-tagline">
         <img src='img/bitpay-logo.svg' id="logo" />
         <p id="lead" translate>Take control of your money,<br />get started with bitcoin.</p>