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

Merge pull request #813 from matiu/feature/minor-ux-changes

Browse source 
add testnet in footer / add links
This commit is contained in:
Manuel Aráoz 2014-07-04 14:25:25 -03:00
commit 0f28f607d8
5 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/footer.js
View file

@ -2,6 +2,8 @@
angular.module('copayApp.controllers').controller('FooterController', function($rootScope, $sce, $scope, $http) {
$scope.networkName = config.networkName;
if (config.themes && Array.isArray(config.themes) && config.themes[0]) {
$scope.themes = config.themes;
} else {

2
js/controllers/settings.js
View file

@ -11,7 +11,7 @@ angular.module('copayApp.controllers').controller('SettingsController',
$scope.networkHost = config.network.host;
$scope.networkPort = config.network.port;
$scope.networkSecure = config.network.secure || false;
$scope.disableVideo = typeof config.disableVideo === undefined ? true : config.disableVideo;
$scope.disableVideo = typeof config.disableVideo === undefined ? true : config.disableVideo;
$scope.unitOpts = [{
name: 'Satoshis (100,000,000 satoshis = 1BTC)',

1
js/models/core/Wallet.js
View file

@ -260,6 +260,7 @@ Wallet.decodeSecret = function(secretB) {
}
};
Wallet.prototype._lockIncomming = function() {
this.network.lockIncommingConnections(this.publicKeyRing.getAllCopayerIds());
};

1
js/models/network/WebRTC.js
View file

@ -48,7 +48,6 @@ Network.prototype.cleanUp = function() {
this.privkey = null; //TODO: hide privkey in a closure
this.key = null;
this.copayerId = null;
this.signingKey = null;
this.allowedCopayerIds = null;
this.isInboundPeerAuth = [];
this.copayerForPeer = {};