.

public/views/modals/addressbook.html

@@ -63,7 +63,7 @@
                ng-show="addressbookForm.address.$invalid && addressbookEntry.address"></i>
           </div>
           <div class="qr-scan-icon">
-            <qr-scanner on-scan="onQrCodeScanned(data, addressbookForm)"></qr-scanner>
+            <qr-scanner on-scan="onQrCodeScanned(data)"></qr-scanner>
             <input type="text"
                    id="address"
                    name="address"

public/views/modals/scanner.html

@@ -1,11 +1,11 @@
-<ion-modal-view>
+<ion-modal-view ng-controller="scannerController" ng-init="init()">
   <ion-header-bar align-title="center" class="bar-stable">
     <button ng-click="cancel()" class="button button-clear button-positive" translate>
       Close
     </button>
     <h1 class="title ellipsis" translate>QR-Scanner</h1>
   </ion-header-bar>
-  <ion-content ng-controller="tabScanController" ng-init="init()">
+  <ion-content >
     <canvas id="qr-canvas" width="200" height="150"></canvas>
     <video id="qrcode-scanner-video" width="300" height="225"></video>
   </ion-content>

public/views/tabs.html

@@ -3,7 +3,7 @@ Create tabs with an icon and label, using the tabs-positive style.
 Each tab's child <ion-nav-view> directive will have its own
 navigation history that also transitions its views in and out.
 -->
-<ion-tabs class="tabs-icon-top tabs-color-active-positive">
+<ion-tabs class="tabs-icon-top tabs-color-active-positive" ng-controller="tabsController">
 
   <ion-tab title="Home" icon-off="ion-ios-pulse" icon-on="ion-ios-pulse-strong" href="#/tabs/home">
     <ion-nav-view name="tab-home"></ion-nav-view>
@@ -14,11 +14,13 @@ navigation history that also transitions its views in and out.
   </ion-tab>
 
 
-  <ion-tab title="Scan" icon-off="ion-ios-camera-outline" icon-on="ion-ios-camera" href="#/tabs/scan">
-    <ion-nav-view name="tab-scan"></ion-nav-view>
-  </ion-tab>
+  <!-- this actually NEVER gets rendered -->
+  <qr-scanner class="qr-icon size-24" style="display:none" set-fn="setScanFn(theScanFn)" on-scan="onScan(data)"></qr-scanner>
 
 
+  <ion-tab title="Scan" icon-off="ion-ios-camera" ng-click="scan()" >
+  </ion-tab>
+
   <ion-tab title="Send" icon-off="ion-ios-chatboxes-outline" icon-on="ion-ios-chatboxes" href="#/tabs/send">
     <ion-nav-view name="tab-send"></ion-nav-view>
   </ion-tab>