spend unconfirmed transactions on by default
This commit is contained in:
parent
c364e414d9
commit
82bd0d5818
3 changed files with 4 additions and 25 deletions
|
|
@ -5,9 +5,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
|
||||||
var updateConfig = function() {
|
var updateConfig = function() {
|
||||||
var config = configService.getSync();
|
var config = configService.getSync();
|
||||||
|
|
||||||
$scope.spendUnconfirmed = {
|
|
||||||
value: config.wallet.spendUnconfirmed
|
|
||||||
};
|
|
||||||
$scope.recentTransactionsEnabled = {
|
$scope.recentTransactionsEnabled = {
|
||||||
value: config.recentTransactions.enabled
|
value: config.recentTransactions.enabled
|
||||||
};
|
};
|
||||||
|
|
@ -17,17 +14,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.spendUnconfirmedChange = function() {
|
|
||||||
var opts = {
|
|
||||||
wallet: {
|
|
||||||
spendUnconfirmed: $scope.spendUnconfirmed.value
|
|
||||||
}
|
|
||||||
};
|
|
||||||
configService.set(opts, function(err) {
|
|
||||||
if (err) $log.debug(err);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.nextStepsChange = function() {
|
$scope.nextStepsChange = function() {
|
||||||
var opts = {
|
var opts = {
|
||||||
hideNextSteps: {
|
hideNextSteps: {
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
||||||
wallet: {
|
wallet: {
|
||||||
requiredCopayers: 2,
|
requiredCopayers: 2,
|
||||||
totalCopayers: 3,
|
totalCopayers: 3,
|
||||||
spendUnconfirmed: false,
|
spendUnconfirmed: true,
|
||||||
reconnectDelay: 5000,
|
reconnectDelay: 5000,
|
||||||
idleDurationMin: 4,
|
idleDurationMin: 4,
|
||||||
settings: {
|
settings: {
|
||||||
|
|
@ -147,6 +147,9 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
||||||
// Always support Bitcoin Cash
|
// Always support Bitcoin Cash
|
||||||
configCache.cashSupport = true;
|
configCache.cashSupport = true;
|
||||||
|
|
||||||
|
// Always be able to spend unconfirmed transactions
|
||||||
|
configCache.wallet.spendUnconfirmed = true;
|
||||||
|
|
||||||
if (!configCache.recentTransactions) {
|
if (!configCache.recentTransactions) {
|
||||||
configCache.recentTransactions = defaultConfig.recentTransactions;
|
configCache.recentTransactions = defaultConfig.recentTransactions;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,16 +7,6 @@
|
||||||
|
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<div class="settings-list list">
|
<div class="settings-list list">
|
||||||
|
|
||||||
<ion-toggle class="has-comment" ng-model="spendUnconfirmed.value" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
|
|
||||||
<span class="toggle-label" translate>Use Unconfirmed Funds</span>
|
|
||||||
</ion-toggle>
|
|
||||||
<div class="comment" translate>
|
|
||||||
If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="item item-divider"></div>
|
|
||||||
|
|
||||||
<ion-toggle class="has-comment" ng-model="recentTransactionsEnabled.value" toggle-class="toggle-balanced" ng-change="recentTransactionsChange()">
|
<ion-toggle class="has-comment" ng-model="recentTransactionsEnabled.value" toggle-class="toggle-balanced" ng-change="recentTransactionsChange()">
|
||||||
<span class="toggle-label" translate>Recent Transaction Card</span>
|
<span class="toggle-label" translate>Recent Transaction Card</span>
|
||||||
</ion-toggle>
|
</ion-toggle>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue