fix(scan): pubkey QR scanning issue - close #1002

www/js/controllers/app-controllers.js

@@ -19,7 +19,7 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services'])
         cache: false,
         url: "/lock",
         views: {
-          'menuContent': {
+          menuContent: {
             templateUrl: "templates/common/view_passcode.html",
             controller: 'PassCodeCtrl'
           }
@@ -421,7 +421,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
           ), uri);
 
           // Redirect to an owned wallet
-          if (!action && (csWallet.isUserPubkey(res.pubkey) || csWallet.children.isUserPubkey(res.pubkey))) {
+          if (!action && (csWallet.isUserPubkey(res.pubkey) || csWallet.children.hasPubkey(res.pubkey))) {
             var wallet = csWallet.getByPubkey(res.pubkey);
             return $state.go('app.view_wallet_by_id', {id: wallet.id});
           }

www/plugins/es/js/services/http-services.js

@@ -853,7 +853,7 @@ angular.module('cesium.es.http.services', ['ngResource', 'ngApi', 'cesium.servic
     that.api.registerEvent('node', 'stop');
 
 
-    var exports = {
+    angular.merge(that, {
       getServer: csHttp.getServer,
       node: {
         summary: that.get('/node/summary'),
@@ -909,12 +909,10 @@ angular.module('cesium.es.http.services', ['ngResource', 'ngApi', 'cesium.servic
         findObjectInTree: findObjectInTree
       },
       constants: constants
-    };
-    exports.constants.regexp = regexp;
-    angular.merge(that, exports);
+    });
+    that.constants.regexp = regexp;
   }
 
-
   // Default instance
   var service = new EsHttp(undefined, undefined, undefined, true);