From 22e93b9dabe78d6a1f0fa98a0e379847ccc8a8b0 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Tue, 2 Jan 2024 10:16:52 +0100
Subject: [PATCH] fix(scan): pubkey QR scanning issue - close #1002
---
www/js/controllers/app-controllers.js | 4 ++--
www/plugins/es/js/services/http-services.js | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index 2b4464c7..cc0b2452 100644
--- a/www/js/controllers/app-controllers.js
+++ b/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});
}
diff --git a/www/plugins/es/js/services/http-services.js b/www/plugins/es/js/services/http-services.js
index 51b57ed7..0904111f 100644
--- a/www/plugins/es/js/services/http-services.js
+++ b/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);
--
GitLab