diff --git a/app/config.json b/app/config.json index 345d84ccfb4bac4ed084c5b2bf419785f4f29502..751d25089a8441eef793e427a45bd489dea9a220 100644 --- a/app/config.json +++ b/app/config.json @@ -85,6 +85,7 @@ "useLocalStorage": true, "useRelative": true, "expertMode": true, + "decimalCount": 2, "helptip": { "enable": false, "installDocUrl": { diff --git a/www/js/controllers/wot-controllers.js b/www/js/controllers/wot-controllers.js index 5d45c0e32272203d47c45aa0d20c076c9b0be2c1..e33c53068e5a8194503cb2b9990877c4ded10f57 100644 --- a/www/js/controllers/wot-controllers.js +++ b/www/js/controllers/wot-controllers.js @@ -778,10 +778,13 @@ function WotIdentityAbstractController($scope, $rootScope, $state, $translate, $ }); }; - $scope.doAction = function(action) { + $scope.doAction = function(action, options) { if (action == 'certify') { return $scope.certify(); } + if (action == 'transfer') { + $scope.showTransferModal(options); + } }; /* -- open screens -- */ diff --git a/www/plugins/es/js/controllers/blockchain-controllers.js b/www/plugins/es/js/controllers/blockchain-controllers.js index 72180130b0ca57eee162764bc92549f0800f834f..c374275e4f96c6fea750e6bafdbd8def0b894260 100644 --- a/www/plugins/es/js/controllers/blockchain-controllers.js +++ b/www/plugins/es/js/controllers/blockchain-controllers.js @@ -106,7 +106,6 @@ function ESBlockLookupController($scope, $state, $controller, $ionicPopover, UIU "number": "desc" }; } - request.excludeCurrent = true; promise = esBlockchain.block.search($scope.currency, request); } @@ -122,7 +121,6 @@ function ESBlockLookupController($scope, $state, $controller, $ionicPopover, UIU else { // default sort request.sort = "number:desc"; } - request.excludeCurrent = false; promise = esBlockchain.block.searchText($scope.currency, $scope.search.text, request); } diff --git a/www/plugins/es/js/controllers/notification-controllers.js b/www/plugins/es/js/controllers/notification-controllers.js index 9232ea31d8d88ad0057821e448c6c790fdfc1673..fbfd05bdbaff2bd2acc5a8548b82c46ffa7de466 100644 --- a/www/plugins/es/js/controllers/notification-controllers.js +++ b/www/plugins/es/js/controllers/notification-controllers.js @@ -45,12 +45,16 @@ function NotificationsController($scope, $rootScope, $ionicPopover, $state, $tim $scope.$on('$ionicView.enter', function() { if ($scope.search.loading) { - $scope.load(); - - // Reset unread counter - $timeout(function() { - $scope.resetUnreadCount(); - }, 1000); + $scope.loadWallet({minData: true}) + .then(function() { + $scope.load(); + UIUtils.loading.hide(); + + // Reset unread counter + return $timeout(function() { + $scope.resetUnreadCount(); + }, 1000); + }); } }); diff --git a/www/plugins/es/js/services/blockchain-services.js b/www/plugins/es/js/services/blockchain-services.js index 5958c4ce7efd69a9108dae9e29f7bde7359f29a9..2c940df13897191b2d1aaab565b442eecb0957b1 100644 --- a/www/plugins/es/js/services/blockchain-services.js +++ b/www/plugins/es/js/services/blockchain-services.js @@ -47,7 +47,7 @@ angular.module('cesium.es.blockchain.services', ['cesium.services', 'cesium.es.h exports.raw.block.processSearchResult = function(res, options) { options = options || {}; - options.excludeCurrent = angular.isDefined(options.excludeCurrent) ? options.excludeCurrent : false; + options.excludeCurrent = angular.isDefined(options.excludeCurrent) ? options.excludeCurrent : true; options.fillAvatar = angular.isDefined(options.fillAvatar) ? options.fillAvatar : true; options.cleanData = angular.isDefined(options.cleanData) ? options.cleanData : true; diff --git a/www/plugins/es/js/services/message-services.js b/www/plugins/es/js/services/message-services.js index af1e0dcb092e87b97bbd32bd73cfc3e11231908b..eb9fb301d271c8410a6ee622fc149829c6bb5aed 100644 --- a/www/plugins/es/js/services/message-services.js +++ b/www/plugins/es/js/services/message-services.js @@ -94,11 +94,16 @@ angular.module('cesium.es.message.services', ['ngResource', 'cesium.services', ' console.debug("[ES] [message] detected new message (from notification service)"); var notification = new Notification(event); + notification.issuer = notification.pubkey; + delete notification.pubkey; - csWot.extendAll([notification]) + csWot.extend(notification, 'issuer') .then(function() { + + csWallet.data.messages = csWallet.data.messages || {}; csWallet.data.messages.unreadCount++; + // Raise event api.data.raise.new(notification); }); diff --git a/www/plugins/graph/js/services/data-services.js b/www/plugins/graph/js/services/data-services.js index eb96bc3b814b2a3d4779d20bf6d27cea694c8714..79711c2c92299afd7e8d24f3799cc4a84940fbc5 100644 --- a/www/plugins/graph/js/services/data-services.js +++ b/www/plugins/graph/js/services/data-services.js @@ -15,8 +15,8 @@ angular.module('cesium.graph.data.services', ['cesium.wot.services', 'cesium.es. block: { search: esHttp.post('/:currency/block/_search') }, - blockStat: { - search: esHttp.post('/:currency/blockStat/_search?pretty') + blockstat: { + search: esHttp.post('/:currency/blockstat/_search?pretty') } }, regex: { @@ -302,7 +302,7 @@ angular.module('cesium.graph.data.services', ['cesium.wot.services', 'cesium.es. if (jobs.length < 10) { jobs.push( - exports.raw.blockStat.search(request, {currency: currency}) + exports.raw.blockstat.search(request, {currency: currency}) .then(function (res) { var aggs = res.aggregations; if (!aggs.tx || !aggs.tx.buckets || !aggs.tx.buckets.length) return;