anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix join message

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-11-11 16:23:56 -03:00
commit c5d3ff191a
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/controllers/index.js
View file

@ -92,6 +92,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setSpendUnconfirmed();
$timeout(function() {
$rootScope.$apply();
self.hasProfile = true;
self.noFocusedWallet = false;
self.onGoingProcess = {};
@ -141,7 +142,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var defaults = configService.getDefaults();
var config = configService.getSync();
self.usingCustomBWS = config.bwsFor && (config.bwsFor[self.walletId] != defaults.bws.url);
self.usingCustomBWS = config.bwsFor && config.bwsFor[self.walletId] && (config.bwsFor[self.walletId] != defaults.bws.url);
};
self.setTab = function(tab, reset, tries, switchState) {

4
src/js/controllers/join.js
View file

@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('joinController',
var defaults = configService.getDefaults();
$scope.bwsurl = defaults.bws.url;
$scope.derivationPath = derivationPathHelper.default;
$scope.account = 1;
this.onQrCodeScanned = function(data) {
$scope.secret = data;
@ -43,7 +44,6 @@ angular.module('copayApp.controllers').controller('joinController',
this.setSeedSource = function(src) {
self.seedSourceId = $scope.seedSource.id;
self.accountValues = lodash.range(1, 100);
$timeout(function() {
$rootScope.$apply();
@ -55,7 +55,6 @@ angular.module('copayApp.controllers').controller('joinController',
self.error = gettext('Please enter the required fields');
return;
}
self.loading = true;
var opts = {
secret: form.secret.$modelValue,
@ -120,6 +119,7 @@ angular.module('copayApp.controllers').controller('joinController',
};
this._join = function(opts) {
self.loading = true;
$timeout(function() {
profileService.joinWallet(opts, function(err) {
if (err) {