From 372b4697e7fdebb7387b72cb0566389e9ab9b40a Mon Sep 17 00:00:00 2001
From: Gabriel Masclef <gabrielmasclef@hotmail.com>
Date: Fri, 14 Jul 2017 10:18:36 -0300
Subject: [PATCH] Transaction id fixed

---
 src/js/controllers/confirm.js           |  2 +-
 www/views/preferencesNotifications.html | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index ed3d39e29..e5022ab00 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -511,7 +511,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
           if (err) return setSendError(err);
           if (config.notifyIfTxConfirmed && config.notifyIfTxConfirmed.enabled) {
             txConfirmNotification.subscribe(wallet, {
-              txid: txp.id
+              txid: txp.txid
             });
           }
         }, onSendStatusChange);
diff --git a/www/views/preferencesNotifications.html b/www/views/preferencesNotifications.html
index d67e804c8..8673138c7 100644
--- a/www/views/preferencesNotifications.html
+++ b/www/views/preferencesNotifications.html
@@ -19,6 +19,12 @@
         </div>
       </div>
 
+      <div ng-if="PNEnabledByUser">
+        <ion-toggle ng-model="notifyIfTxConfirmed.value" toggle-class="toggle-balanced" ng-change="notifyIfTxConfirmedChange()" ng-if="usePushNotifications" ng-show="pushNotifications.value">
+          <span class="toggle-label" translate>Notify me when transactions are confirmed</span>
+        </ion-toggle>
+      </div>
+
       <ion-toggle ng-model="emailNotifications.value" toggle-class="toggle-balanced" ng-change="emailNotificationsChange()">
         <span class="toggle-label" translate>Enable email notifications</span>
       </ion-toggle>
@@ -44,11 +50,6 @@
         </form>
       </div>
 
-      <div ng-if="PNEnabledByUser">
-        <ion-toggle ng-model="notifyIfTxConfirmed.value" toggle-class="toggle-balanced" ng-change="notifyIfTxConfirmedChange()" ng-if="usePushNotifications">
-          <span class="toggle-label" translate>Notify me when confirm transactions</span>
-        </ion-toggle>
-      </div>
 
     </div>
   </ion-content>