From bc4a8f73d833a4ebaef9b18bc9c63788e97cacda Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Fri, 1 Aug 2014 20:33:50 -0700
Subject: [PATCH] paypro: _resetPayPro to reset the form.

---
 js/directives.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/js/directives.js b/js/directives.js
index ec04e4195..6859c5fa0 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -18,6 +18,7 @@ angular.module('copayApp.directives')
             if (uri && uri.merchant) {
               scope.wallet.fetchPaymentTx(uri.merchant, function(err, merchantData) {
                 if (err) {
+                  if (scope._resetPayPro) scope._resetPayPro();
                   ctrl.$setValidity('validAddress', false);
                   return;
                 }
@@ -80,10 +81,10 @@ angular.module('copayApp.directives')
                 sendall.attr('class', sendall.attr('class') + ' hidden');
 
                 // Reset all the changes from the payment protocol weirdness.
-                // XXX Bad hook.
-                if (!scope.__watchingAddress) {
-                  scope.__watchingAddress = true;
-                  scope.$watch('address', function(newValue, oldValue) {
+                // XXX Bad hook. Find a better more angular-y way of doing this.
+                // This will also closure scope every variable above forever.
+                if (!scope._resetPayPro) {
+                  scope._resetPayPro = function() {
                     var val = address.val();
                     var uri = copay.HDPath.parseBitcoinURI(val || '');
                     if (!uri || !uri.merchant) {
@@ -108,11 +109,15 @@ angular.module('copayApp.directives')
                     }
                     // TODO: Check paymentRequest expiration,
                     // delete if beyond expiration date.
-                  });
+                  };
+                  scope.$watch('address',scope._resetPayPro);
                 }
 
                 ctrl.$setValidity('validAddress', true);
 
+                // XXX With PayPro, since amount is already filled in among
+                // other field oddities, the form is always invalid. Make it
+                // valid.
                 scope.sendForm.$valid = true;
                 scope.sendForm.$invalid = false;
                 scope.sendForm.$pristine = true;