From b7b7b2e38e7c6170c31aae32d7a96cfe1e7facef Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Thu, 31 Jul 2014 11:39:46 -0700
Subject: [PATCH] paypro: create real paypro txs. start potentially adding more
 merchant data to notifications.

---
 js/controllers/send.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/js/controllers/send.js b/js/controllers/send.js
index 429287947..ee280ee5d 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -62,12 +62,14 @@ angular.module('copayApp.controllers').controller('SendController',
       var w = $rootScope.wallet;
 
       function done(ntxid, ca) {
+        var txp = w.txProposals.txps[ntxid];
+        var merchantData = txp.merchant;
         if (w.isShared()) {
           $scope.loading = false;
           var message = 'The transaction proposal has been created';
           if (ca) {
             message += '.\nThis payment protocol transaction'
-              + 'has been verified through ' + ca;
+              + 'has been verified through ' + ca + '.';
           }
           notification.success('Success!', message);
           $scope.loadTxs();
@@ -75,7 +77,9 @@ angular.module('copayApp.controllers').controller('SendController',
           w.sendTx(ntxid, function(txid, ca) {
             if (txid) {
               notification.success('Transaction broadcast', 'Transaction id: ' + txid);
-              if (ca) notification.success('Root Certificate', ca);
+              if (ca) {
+                notification.success('Root Certificate', ca);
+              }
             } else {
               notification.error('Error', 'There was an error sending the transaction.');
             }
@@ -88,8 +92,12 @@ angular.module('copayApp.controllers').controller('SendController',
 
       var uri = address.indexOf('bitcoin:') === 0
         && copay.HDPath.parseBitcoinURI(address);
-      if (uri.merchant) {
-        w.createTx(uri.merchant, commentText, done);
+
+      if (uri && uri.merchant) {
+        w.createPaymentTx({
+          uri: uri.merchant,
+          memo: commentText
+        }, done);
       } else {
         w.createTx(address, amount, commentText, done);
       }