From 3191ba200c7fcaea8d13c8805128aefa2e82f218 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Mon, 20 Oct 2014 10:50:03 -0300 Subject: [PATCH] do not select wallet on 'ready' message --- config.js | 2 +- js/controllers/home.js | 1 + js/services/controllerUtils.js | 2 +- views/includes/sidebar.html | 5 +++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index 805ff00d6..b1d2b87ab 100644 --- a/config.js +++ b/config.js @@ -3,7 +3,7 @@ var defaultConfig = { defaultLanguage: 'en', // DEFAULT network (livenet or testnet) networkName: 'livenet', - logLevel: 'debug', + logLevel: 'info', // wallet limits diff --git a/js/controllers/home.js b/js/controllers/home.js index fc11bd7d9..02aceb3d5 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -31,6 +31,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc controllerUtils.onErrorDigest( $scope, (err.toString() || '').match('PNOTFOUND') ? 'Profile not found' : 'Unknown error'); } else { + console.log('$rootScope.wallet -->', $rootScope.wallet, 'FIRST WALLET ->', firstWallet); controllerUtils.bindProfile($scope, iden, firstWallet); } }); diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 8862faef4..f96e2fac9 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -92,7 +92,7 @@ angular.module('copayApp.services') }); w.on('ready', function(myPeerID) { $scope.loading = false; - $rootScope.wallet = w; + //$rootScope.wallet = w; if ($rootScope.initialConnection) { $rootScope.initialConnection = false; if ($rootScope.pendingPayment) { diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 5bb6d4d4d..da2da481e 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -41,11 +41,12 @@

{{item.name || item.id}}

- - + + {{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}} {{item.balanceInfo.totalBalanceAlternative |noFractionNumber:2}} {{item.balanceInfo.alternativeIsoCode}} + Waiting for copayers...