From 82bd0d5818737f9677483330e956d470189b55c5 Mon Sep 17 00:00:00 2001
From: Kadir Sekha <sekhakadir@gmail.com>
Date: Fri, 27 Oct 2017 17:30:15 +0900
Subject: [PATCH] spend unconfirmed transactions on by default

---
 src/js/controllers/advancedSettings.js | 14 --------------
 src/js/services/configService.js       |  5 ++++-
 www/views/advancedSettings.html        | 10 ----------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index cd5604395..282ec4025 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -5,9 +5,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
   var updateConfig = function() {
     var config = configService.getSync();
 
-    $scope.spendUnconfirmed = {
-      value: config.wallet.spendUnconfirmed
-    };
     $scope.recentTransactionsEnabled = {
       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() {
     var opts = {
       hideNextSteps: {
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 612390373..ed5bcee21 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -54,7 +54,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
     wallet: {
       requiredCopayers: 2,
       totalCopayers: 3,
-      spendUnconfirmed: false,
+      spendUnconfirmed: true,
       reconnectDelay: 5000,
       idleDurationMin: 4,
       settings: {
@@ -147,6 +147,9 @@ angular.module('copayApp.services').factory('configService', function(storageSer
         // Always support Bitcoin Cash
         configCache.cashSupport = true;
 
+        // Always be able to spend unconfirmed transactions
+        configCache.wallet.spendUnconfirmed = true;
+
         if (!configCache.recentTransactions) {
           configCache.recentTransactions = defaultConfig.recentTransactions;
         }
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html
index 253c35c8f..20662ba04 100644
--- a/www/views/advancedSettings.html
+++ b/www/views/advancedSettings.html
@@ -7,16 +7,6 @@
 
   <ion-content>
     <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()">
         <span class="toggle-label" translate>Recent Transaction Card</span>
       </ion-toggle>