fixes and remove unused views

This commit is contained in:
Gabriel Bazán 2017-05-09 17:29:33 -03:00
parent 8dfc2de01c
commit ff5b662f39
8 changed files with 14 additions and 29 deletions

View File

@ -121,7 +121,6 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
switch (method) { switch (method) {
case 'pin': case 'pin':
applicationService.pinModal('disable'); applicationService.pinModal('disable');
initMethodSelector();
break; break;
case 'fingerprint': case 'fingerprint':
fingerprintService.check('unlockingApp', function(err) { fingerprintService.check('unlockingApp', function(err) {
@ -136,7 +135,6 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
switch (method) { switch (method) {
case 'pin': case 'pin':
applicationService.pinModal('setup'); applicationService.pinModal('setup');
initMethodSelector();
break; break;
case 'fingerprint': case 'fingerprint':
saveConfig('fingerprint'); saveConfig('fingerprint');
@ -159,7 +157,7 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
}; };
$rootScope.$on('pinModalClosed', function() { $rootScope.$on('pinModalClosed', function() {
initMethodSelector(); init()
}); });
}); });

View File

@ -204,4 +204,5 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
lockTimeControl(bannedUntil); lockTimeControl(bannedUntil);
}); });
}; };
}); });

View File

@ -1,12 +0,0 @@
'use strict';
angular.module('copayApp.controllers').controller('pinTestController', function($scope, applicationService) {
$scope.goodPin = function() {
applicationService.successfullUnlocked = true;
$scope.pintestview.hide();
};
$scope.badPin = function() {};
});

View File

@ -1227,13 +1227,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
disableAnimate: true, disableAnimate: true,
historyRoot: true historyRoot: true
}); });
$state.transitionTo('tabs.home'); $state.transitionTo('tabs.home').then(function() {
// Clear history
$ionicHistory.clearHistory();
});
}); });
}; };
// After everything have been loaded, initialize handler URL // After everything have been loaded, initialize handler URL
$timeout(function() { $timeout(function() {
openURLService.init(); openURLService.init();
}); }, 1000);
}); });
}); });

View File

@ -17,7 +17,7 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
* Development: 'testnet' * Development: 'testnet'
* Production: 'livenet' * Production: 'livenet'
*/ */
credentials.NETWORK = 'testnet'; credentials.NETWORK = 'livenet';
//credentials.NETWORK = 'testnet'; //credentials.NETWORK = 'testnet';
if (credentials.NETWORK == 'testnet') { if (credentials.NETWORK == 'testnet') {

View File

@ -1,4 +1,9 @@
<ion-modal-view id="pin" ng-controller="pinController"> <ion-modal-view id="pin" ng-controller="pinController">
<ion-header-bar align-title="center" class="bar-royal">
<button ng-if="action != 'check'" class="button button-back button-clear" ng-click="hideModal()">
Close
</button>
</ion-header-bar>
<div class="content"> <div class="content">
<div class="block-text row"> <div class="block-text row">
<div class="message" ng-if="!confirmPin && !error" translate>Please enter your PIN</div> <div class="message" ng-if="!confirmPin && !error" translate>Please enter your PIN</div>

View File

@ -1,10 +0,0 @@
<ion-modal-view ng-controller="pinTestController">
<ion-content>
<button class="button button-positive" ng-click="goodPin()">
BIEN PUESTO
</button>
<button class="button button-positive" ng-click="badPin()">
MAL PUESTO
</button>
</ion-content>
</ion-modal-view>

View File

@ -89,7 +89,7 @@
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova || isDevel"> <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova">
<i class="icon ion-ios-locked-outline" ng-if="locked"></i> <i class="icon ion-ios-locked-outline" ng-if="locked"></i>
<i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i> <i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i>
<span class="setting-title">{{'Lock App' | translate}}</span> <span class="setting-title">{{'Lock App' | translate}}</span>