make action sheet come up if non paypro url has been scanned

src/js/controllers/tab-scan.js

@@ -99,9 +99,15 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
 
   function handleSuccessfulScan(contents){
     $log.debug('Scan returned: "' + contents + '"');
+    scannerService.pausePreview();
     incomingData.redir(contents);
   }
 
+  $rootScope.$on('incomingDataMenu.menuHidden', function() {
+    scannerService.resumePreview();
+    activate();
+  });
+
   $scope.openSettings = function(){
     scannerService.openSettings();
   };

src/js/directives/incomingDataMenu.js

@@ -1,16 +1,20 @@
 'use strict';
 
 angular.module('copayApp.directives')
-  .directive('incomingDataMenu', function($timeout) {
+  .directive('incomingDataMenu', function($timeout, $rootScope) {
     return {
       restrict: 'E',
       templateUrl: 'views/includes/incomingDataMenu.html',
       link: function(scope, element, attrs) {
-        console.log('incomingDataMenu constructed');
-        $timeout(function() {
+        $rootScope.$on('incomingDataMenu.showMenu', function() {
           scope.showMenu = true;
-        }, 5000);
-
+        });
+        scope.$watch('showMenu', function() {
+          console.log('scope.showMenu', scope.showMenu);
+          if(!scope.showMenu) {
+            $rootScope.$broadcast('incomingDataMenu.menuHidden');
+          }
+        });
       }
     };
   });

src/js/services/incomingData.js

@@ -1,10 +1,14 @@
 'use strict';
 
-angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, profileService, popupService, ongoingProcess, platformInfo, gettextCatalog) {
+angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, profileService, popupService, ongoingProcess, platformInfo, gettextCatalog, scannerService, $rootScope) {
 
   var root = {};
 
-  root.redir = function(data) {
+  root.showMenu = function() {
+    $rootScope.$broadcast('incomingDataMenu.showMenu');
+  };
+
+  root.redir = function(data, resumeScan) {
     $log.debug('Processing incoming data:'  +data);
 
     function sanitizeUri(data) {
@@ -66,6 +70,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
       getPayProDetails(data, function(err, details) {
         if(err) {
           console.log('getPayProDetails err', err);
+          root.showMenu();
           return;
         }
         console.log('paypro details', details);
@@ -143,12 +148,12 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
       ongoingProcess.set('fetchingPayPro', false);
 
       if (err) {
-        $log.warn('Could not fetch payment request:', err);
-        var msg = err.toString();
-        if (msg.match('HTTP')) {
-          msg = gettextCatalog.getString('Could not fetch payment information');
-        }
-        popupService.showAlert(msg);
+        // $log.warn('Could not fetch payment request:', err);
+        // var msg = err.toString();
+        // if (msg.match('HTTP')) {
+        //   msg = gettextCatalog.getString('Could not fetch payment information');
+        // }
+        // popupService.showAlert(msg);
         return cb(true);
       }
 

src/js/services/scannerService.js

@@ -1,9 +1,9 @@
 'use strict';
 
-angular.module('copayApp.services').service('scannerService', function($log, $timeout, platformInfo, $rootScope) {
+angular.module('copayApp.services').service('scannerService', function($log, $timeout, platformInfo, $rootScope, $window) {
 
   var isDesktop = !platformInfo.isCordova;
-  var QRScanner = window.QRScanner;
+  var QRScanner = $window.QRScanner;
   var lightEnabled = false;
   var backCamera = true; // the plugin defaults to the back camera
 
@@ -55,8 +55,8 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
       canEnableLight: canEnableLight,
       canChangeCamera: canChangeCamera,
       canOpenSettings: canOpenSettings
-    }
-  }
+    };
+  };
 
   var initializeStarted = false;
   /**
@@ -123,10 +123,10 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
   }
   this.isInitialized = function(){
     return initializeCompleted;
-  }
+  };
   this.initializeStarted = function(){
     return initializeStarted;
-  }
+  };
 
   var nextHide = null;
   var nextDestroy = null;
@@ -167,6 +167,14 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
     QRScanner.scan(callback);
   };
 
+  this.pausePreview = function() {
+    QRScanner.pausePreview();
+  };
+
+  this.resumePreview = function() {
+    QRScanner.resumePreview();
+  };
+
   /**
    * Deactivate the QRScanner. To balance user-perceived performance and power
    * consumption, this kicks off a countdown which will "sleep" the scanner
@@ -177,7 +185,7 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
    */
   this.deactivate = function(callback) {
     $log.debug('Deactivating scanner...');
-    // QRScanner.cancelScan();
+    QRScanner.cancelScan();
     nextHide = $timeout(_hide, hideAfterSeconds * 1000);
     nextDestroy = $timeout(_destroy, destroyAfterSeconds * 1000);
   };

www/views/includes/actionSheet.html

@@ -4,7 +4,5 @@
   ng-click="hide()">
 </div>
 <div class="bp-action-sheet__sheet" ng-class="{'slide-up': show}">
-  <!-- <img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
-  <div class="header">Send from</div> -->
   <ng-transclude></ng-transclude>
 </div>