mirror of https://github.com/BTCPrivate/copay.git
fixes
This commit is contained in:
parent
a34d483cd3
commit
35756cf529
|
@ -75,7 +75,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<div ng-if="btx.action == 'received'">
|
<div ng-if="btx.action == 'received' || 'moved'">
|
||||||
<span translate>Date</span>
|
<span translate>Date</span>
|
||||||
<span class="item-note">
|
<span class="item-note">
|
||||||
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<a class="item" ng-show="wallet.isPrivKeyExternal()">
|
<a class="item" ng-show="wallet.isPrivKeyExternal()">
|
||||||
<span translate>Hardware Wallet</span>
|
<span translate>Hardware Wallet</span>
|
||||||
<span class="item-note">
|
<span class="item-note">
|
||||||
{{wallet.externalSource}}
|
{{externalSource}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesColor">
|
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesColor">
|
||||||
|
@ -45,12 +45,12 @@
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<div ng-show="wallet.canSign()">
|
<div ng-show="wallet.canSign()">
|
||||||
<ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()">
|
<ion-toggle ng-model="encryptEnabled.value" toggle-class="toggle-balanced" ng-change="encryptChange()">
|
||||||
<span class="toggle-label" translate>Request Spending Password</span>
|
<span class="toggle-label" translate>Request Spending Password</span>
|
||||||
</ion-toggle>
|
</ion-toggle>
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="wallet.canSign() && touchIdAvailable">
|
<div ng-show="wallet.canSign() && touchIdAvailable">
|
||||||
<ion-toggle ng-model="touchIdEnabled" toggle-class="toggle-balanced" ng-change="touchIdChange()">
|
<ion-toggle ng-model="touchIdEnabled.value" toggle-class="toggle-balanced" ng-change="touchIdChange()">
|
||||||
<span class="toggle-label" translate>Request Fingerprint</span>
|
<span class="toggle-label" translate>Request Fingerprint</span>
|
||||||
</ion-toggle>
|
</ion-toggle>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
</ion-checkbox>
|
</ion-checkbox>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="box-notification error" ng-show="!canSign">
|
<div class="box-notification error ng-hide" ng-show="!canSign">
|
||||||
<span class="size-14">
|
<span class="size-14">
|
||||||
<i class="ion-alert-circled"></i>
|
<i class="ion-alert-circled"></i>
|
||||||
<span translate>
|
<span translate>
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="box-notification error" ng-show="formData.noSignEnabled">
|
<div class="box-notification error ng-hide" ng-show="formData.noSignEnabled">
|
||||||
<span class="size-14">
|
<span class="size-14">
|
||||||
<i class="ion-alert-circled"></i>
|
<i class="ion-alert-circled"></i>
|
||||||
<span translate>
|
<span translate>
|
||||||
|
|
|
@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.goHome = function() {
|
$scope.goHome = function() {
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
var SMALL_FONT_SIZE_LIMIT = 13;
|
var SMALL_FONT_SIZE_LIMIT = 13;
|
||||||
var LENGTH_EXPRESSION_LIMIT = 19;
|
var LENGTH_EXPRESSION_LIMIT = 19;
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
$scope.toAddress = $stateParams.toAddress;
|
||||||
|
$scope.toName = $stateParams.toName;
|
||||||
|
$scope.toEmail = $stateParams.toEmail;
|
||||||
|
|
||||||
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
|
|
||||||
if (!$stateParams.toAddress) {
|
if (!$stateParams.toAddress) {
|
||||||
$log.error('Bad params at amount')
|
$log.error('Bad params at amount')
|
||||||
|
@ -46,11 +50,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
angular.element($window).off('keydown');
|
angular.element($window).off('keydown');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$scope.toAddress = $stateParams.toAddress;
|
|
||||||
$scope.toName = $stateParams.toName;
|
|
||||||
$scope.toEmail = $stateParams.toEmail;
|
|
||||||
|
|
||||||
var config = configService.getSync().wallet.settings;
|
var config = configService.getSync().wallet.settings;
|
||||||
$scope.unitName = config.unitName;
|
$scope.unitName = config.unitName;
|
||||||
$scope.alternativeIsoCode = config.alternativeIsoCode;
|
$scope.alternativeIsoCode = config.alternativeIsoCode;
|
||||||
|
|
|
@ -97,7 +97,7 @@ angular.module('copayApp.controllers').controller('backupController',
|
||||||
if ($stateParams.fromOnboarding) {
|
if ($stateParams.fromOnboarding) {
|
||||||
$state.go('onboarding.disclaimer');
|
$state.go('onboarding.disclaimer');
|
||||||
} else {
|
} else {
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,6 +4,16 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
var cachedTxp = {};
|
var cachedTxp = {};
|
||||||
var isChromeApp = platformInfo.isChromeApp;
|
var isChromeApp = platformInfo.isChromeApp;
|
||||||
|
|
||||||
|
$scope.toAddress = $stateParams.toAddress;
|
||||||
|
$scope.toName = $stateParams.toName;
|
||||||
|
$scope.toEmail = $stateParams.toEmail;
|
||||||
|
$scope.description = $stateParams.description;
|
||||||
|
$scope.paypro = $stateParams.paypro;
|
||||||
|
|
||||||
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
|
initConfirm();
|
||||||
|
});
|
||||||
|
|
||||||
var initConfirm = function() {
|
var initConfirm = function() {
|
||||||
if ($stateParams.paypro) {
|
if ($stateParams.paypro) {
|
||||||
return setFromPayPro($stateParams.paypro, function(err) {
|
return setFromPayPro($stateParams.paypro, function(err) {
|
||||||
|
@ -26,12 +36,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
var amount = $scope.toAmount = parseInt($stateParams.toAmount);
|
var amount = $scope.toAmount = parseInt($stateParams.toAmount);
|
||||||
$scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
|
$scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
|
||||||
|
|
||||||
$scope.toAddress = $stateParams.toAddress;
|
|
||||||
$scope.toName = $stateParams.toName;
|
|
||||||
$scope.toEmail = $stateParams.toEmail;
|
|
||||||
$scope.description = $stateParams.description;
|
|
||||||
$scope.paypro = $stateParams.paypro;
|
|
||||||
|
|
||||||
var networkName = (new bitcore.Address($scope.toAddress)).network.name;
|
var networkName = (new bitcore.Address($scope.toAddress)).network.name;
|
||||||
$scope.network = networkName;
|
$scope.network = networkName;
|
||||||
|
|
||||||
|
@ -306,8 +310,4 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
$scope.cancel = function() {
|
$scope.cancel = function() {
|
||||||
$state.go('tabs.send');
|
$state.go('tabs.send');
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data) {
|
|
||||||
initConfirm();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -175,12 +175,11 @@ angular.module('copayApp.controllers').controller('createController',
|
||||||
if ($scope.seedSource.id == 'set') {
|
if ($scope.seedSource.id == 'set') {
|
||||||
profileService.setBackupFlag(client.credentials.walletId);
|
profileService.setBackupFlag(client.credentials.walletId);
|
||||||
}
|
}
|
||||||
|
$ionicHistory.removeBackView();
|
||||||
if (!client.isComplete()) {
|
if (!client.isComplete()) {
|
||||||
$ionicHistory.nextViewOptions({
|
$ionicHistory.nextViewOptions({
|
||||||
disableAnimate: true
|
disableAnimate: true
|
||||||
});
|
});
|
||||||
$ionicHistory.removeBackView();
|
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$state.transitionTo('tabs.copayers', {
|
$state.transitionTo('tabs.copayers', {
|
||||||
|
|
|
@ -71,7 +71,7 @@ angular.module('copayApp.controllers').controller('exportController',
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
|
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -158,7 +158,7 @@ angular.module('copayApp.controllers').controller('exportController',
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
init();
|
init();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -345,6 +345,7 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
if (err) $log.error(err);
|
if (err) $log.error(err);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home', {
|
$state.go('tabs.home', {
|
||||||
fromOnboarding: $stateParams.fromOnboarding
|
fromOnboarding: $stateParams.fromOnboarding
|
||||||
});
|
});
|
||||||
|
|
|
@ -145,7 +145,7 @@ angular.module('copayApp.controllers').controller('joinController',
|
||||||
walletService.updateRemotePreferences(client, {}, function() {
|
walletService.updateRemotePreferences(client, {}, function() {
|
||||||
$log.debug('Remote preferences saved for:' + client.credentials.walletId)
|
$log.debug('Remote preferences saved for:' + client.credentials.walletId)
|
||||||
});
|
});
|
||||||
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
});
|
});
|
||||||
}, 100);
|
}, 100);
|
||||||
|
|
|
@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
var walletSettings = configWallet.settings;
|
var walletSettings = configWallet.settings;
|
||||||
var wallet;
|
var wallet;
|
||||||
$scope.title = gettextCatalog.getString('Transaction');
|
$scope.title = gettextCatalog.getString('Transaction');
|
||||||
|
console.log($scope.btx);
|
||||||
$scope.init = function() {
|
$scope.init = function() {
|
||||||
wallet = $scope.wallet;
|
wallet = $scope.wallet;
|
||||||
$scope.alternativeIsoCode = walletSettings.alternativeIsoCode;
|
$scope.alternativeIsoCode = walletSettings.alternativeIsoCode;
|
||||||
|
|
|
@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('txStatusController', function
|
||||||
if ($scope.cb) $timeout($scope.cb, 100);
|
if ($scope.cb) $timeout($scope.cb, 100);
|
||||||
|
|
||||||
$scope.cancel = function() {
|
$scope.cancel = function() {
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
$scope.txStatusModal.hide();
|
$scope.txStatusModal.hide();
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,7 +96,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
|
||||||
popupService.showAlert(gettextCatalog.getString('Error sweeping wallet:'), err || err.toString());
|
popupService.showAlert(gettextCatalog.getString('Error sweeping wallet:'), err || err.toString());
|
||||||
} else {
|
} else {
|
||||||
$scope.openStatusModal('broadcasted', function() {
|
$scope.openStatusModal('broadcasted', function() {
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -120,7 +120,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
var wallet = profileService.getWallet($stateParams.walletId);
|
var wallet = profileService.getWallet($stateParams.walletId);
|
||||||
$scope.wallet = wallet;
|
$scope.wallet = wallet;
|
||||||
$scope.isCordova = platformInfo.isCordova;
|
$scope.isCordova = platformInfo.isCordova;
|
||||||
|
|
|
@ -47,7 +47,7 @@ angular.module('copayApp.controllers').controller('paymentUriController',
|
||||||
this.selectWallet = function(wid) {
|
this.selectWallet = function(wid) {
|
||||||
var self = this;
|
var self = this;
|
||||||
profileService.setAndStoreFocus(wid, function() {});
|
profileService.setAndStoreFocus(wid, function() {});
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$rootScope.$emit('paymentUri', self.bitcoinURI);
|
$rootScope.$emit('paymentUri', self.bitcoinURI);
|
||||||
|
|
|
@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
|
|
||||||
$scope.encryptChange = function() {
|
$scope.encryptChange = function() {
|
||||||
if (!wallet) return;
|
if (!wallet) return;
|
||||||
var val = $scope.encryptEnabled;
|
var val = $scope.encryptEnabled.value;
|
||||||
|
|
||||||
if (val && !walletService.isEncrypted(wallet)) {
|
if (val && !walletService.isEncrypted(wallet)) {
|
||||||
$log.debug('Encrypting private key for', wallet.name);
|
$log.debug('Encrypting private key for', wallet.name);
|
||||||
|
@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
$log.warn(err);
|
$log.warn(err);
|
||||||
|
|
||||||
// ToDo show error?
|
// ToDo show error?
|
||||||
$scope.encryptEnabled = false;
|
$scope.encryptEnabled.value = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
profileService.updateCredentials(JSON.parse(wallet.export()), function() {
|
profileService.updateCredentials(JSON.parse(wallet.export()), function() {
|
||||||
|
@ -31,7 +31,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
$log.warn(err);
|
$log.warn(err);
|
||||||
|
|
||||||
// ToDo show error?
|
// ToDo show error?
|
||||||
$scope.encryptEnabled = true;
|
$scope.encryptEnabled.value = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
profileService.updateCredentials(JSON.parse(wallet.export()), function() {
|
profileService.updateCredentials(JSON.parse(wallet.export()), function() {
|
||||||
|
@ -43,10 +43,10 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.touchIdChange = function() {
|
$scope.touchIdChange = function() {
|
||||||
var newStatus = $scope.touchIdEnabled;
|
var newStatus = $scope.touchIdEnabled.value;
|
||||||
walletService.setTouchId(wallet, !!newStatus, function(err) {
|
walletService.setTouchId(wallet, !!newStatus, function(err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
$scope.touchIdEnabled = !newStatus;
|
$scope.touchIdEnabled.value = !newStatus;
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}, 1);
|
}, 1);
|
||||||
|
@ -56,7 +56,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data){
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
$scope.externalSource = null;
|
$scope.externalSource = null;
|
||||||
|
|
||||||
if (!wallet)
|
if (!wallet)
|
||||||
|
@ -64,12 +64,17 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
|
|
||||||
var config = configService.getSync();
|
var config = configService.getSync();
|
||||||
|
|
||||||
$scope.encryptEnabled = walletService.isEncrypted(wallet);
|
$scope.encryptEnabled = {
|
||||||
|
value: walletService.isEncrypted(wallet)
|
||||||
|
};
|
||||||
|
|
||||||
if (wallet.isPrivKeyExternal)
|
if (wallet.isPrivKeyExternal)
|
||||||
$scope.externalSource = wallet.getPrivKeyExternalSourceName() == 'ledger' ? 'Ledger' : 'Trezor';
|
$scope.externalSource = wallet.getPrivKeyExternalSourceName() == 'ledger' ? 'Ledger' : 'Trezor';
|
||||||
|
|
||||||
$scope.touchIdAvailable = fingerprintService.isAvailable();
|
$scope.touchIdAvailable = fingerprintService.isAvailable();
|
||||||
$scope.touchIdEnabled = config.touchIdFor ? config.touchIdFor[walletId] : null;
|
$scope.touchIdEnabled = {
|
||||||
|
value: config.touchIdFor ? config.touchIdFor[walletId] : null
|
||||||
|
};
|
||||||
|
|
||||||
$scope.deleted = false;
|
$scope.deleted = false;
|
||||||
if (wallet.credentials && !wallet.credentials.mnemonicEncrypted && !wallet.credentials.mnemonic) {
|
if (wallet.credentials && !wallet.credentials.mnemonicEncrypted && !wallet.credentials.mnemonic) {
|
||||||
|
|
|
@ -125,13 +125,13 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
|
||||||
$scope.$emit('Local/ClearHistory');
|
$scope.$emit('Local/ClearHistory');
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
}, 100);
|
}, 100);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
$scope.csvHistory();
|
$scope.csvHistory();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('preferencesInformation',
|
angular.module('copayApp.controllers').controller('preferencesInformation',
|
||||||
function($scope, $log, $timeout, $ionicHistory, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) {
|
function($scope, $log, $timeout, $ionicHistory, $ionicScrollDelegate, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) {
|
||||||
var base = 'xpub';
|
var base = 'xpub';
|
||||||
var wallet = profileService.getWallet($stateParams.walletId);
|
var wallet = profileService.getWallet($stateParams.walletId);
|
||||||
var walletId = wallet.id;
|
var walletId = wallet.id;
|
||||||
|
@ -65,7 +65,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
|
||||||
opts.colorFor[walletId] = color;
|
opts.colorFor[walletId] = color;
|
||||||
|
|
||||||
configService.set(opts, function(err) {
|
configService.set(opts, function(err) {
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
if (err) $log.warn(err);
|
if (err) $log.warn(err);
|
||||||
});
|
});
|
||||||
|
@ -77,11 +77,11 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
|
||||||
|
|
||||||
$scope.scan = function() {
|
$scope.scan = function() {
|
||||||
walletService.startScan(wallet);
|
walletService.startScan(wallet);
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
var c = wallet.credentials;
|
var c = wallet.credentials;
|
||||||
var basePath = c.getBaseAddressDerivationPath();
|
var basePath = c.getBaseAddressDerivationPath();
|
||||||
|
|
||||||
|
@ -116,7 +116,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
});
|
});
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,9 @@
|
||||||
angular.module('copayApp.controllers').controller('preferencesLogs',
|
angular.module('copayApp.controllers').controller('preferencesLogs',
|
||||||
function($scope, historicLog, gettextCatalog) {
|
function($scope, historicLog, gettextCatalog) {
|
||||||
|
|
||||||
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
|
$scope.logs = historicLog.get();
|
||||||
|
|
||||||
$scope.prepare = function() {
|
$scope.prepare = function() {
|
||||||
var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
|
var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
|
||||||
log += '\n\n';
|
log += '\n\n';
|
||||||
|
@ -28,7 +31,5 @@ angular.module('copayApp.controllers').controller('preferencesLogs',
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
|
||||||
$scope.logs = historicLog.get();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -28,10 +28,16 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
$scope.spendUnconfirmed = {value : config.wallet.spendUnconfirmed};
|
$scope.spendUnconfirmed = {
|
||||||
$scope.glideraEnabled = {value: config.glidera.enabled};
|
value: config.wallet.spendUnconfirmed
|
||||||
|
};
|
||||||
|
$scope.glideraEnabled = {
|
||||||
|
value: config.glidera.enabled
|
||||||
|
};
|
||||||
$scope.coinbaseEnabled = config.coinbase.enabled;
|
$scope.coinbaseEnabled = config.coinbase.enabled;
|
||||||
$scope.pushNotifications = {value: config.pushNotifications.enabled};
|
$scope.pushNotifications = {
|
||||||
|
value: config.pushNotifications.enabled
|
||||||
|
};
|
||||||
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
|
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
|
||||||
return w.id != self.walletId;
|
return w.id != self.walletId;
|
||||||
});
|
});
|
||||||
|
@ -94,7 +100,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
updateConfig();
|
updateConfig();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ angular.module('copayApp.services')
|
||||||
if (isChromeApp) {
|
if (isChromeApp) {
|
||||||
chrome.runtime.reload();
|
chrome.runtime.reload();
|
||||||
} else if (isNW) {
|
} else if (isNW) {
|
||||||
$ionicHistory.clearHistory();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
var win = require('nw.gui').Window.get();
|
var win = require('nw.gui').Window.get();
|
||||||
|
|
Loading…
Reference in New Issue