From 324dfbc36a8eeb844a9a31215ec09b9b3f0798e8 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Wed, 13 Aug 2014 18:54:07 -0400
Subject: [PATCH] finished refactor

---
 js/controllers/send.js | 14 +++++++++++++-
 js/directives.js       |  2 +-
 views/send.html        |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/js/controllers/send.js b/js/controllers/send.js
index 95032a9e0..c72530dd9 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -168,7 +168,6 @@ angular.module('copayApp.controllers').controller('SendController',
                 qrcode.imagedata = context.getImageData(0, 0, qrcode.width, qrcode.height);
 
                 try {
-                  //alert(JSON.stringify(qrcode.process(context)));
                   qrcode.decode();
                 } catch (e) {
                   // error decoding QR
@@ -403,6 +402,19 @@ angular.module('copayApp.controllers').controller('SendController',
 
     $scope.onChanged = function() {
       var scope = $scope;
+      var value = scope.address;
+      var uri;
+
+      if (/^https?:\/\//.test(value)) {
+        uri = {
+          merchant: value
+        };
+      } else {
+        uri = copay.HDPath.parseBitcoinURI(value);
+      }
+      if (!uri || !uri.merchant) {
+        return;
+      }
       notification.info('Fetching Payment',
         'Retrieving Payment Request from ' + uri.merchant);
 
diff --git a/js/directives.js b/js/directives.js
index edb96e1d8..d704b6073 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -29,7 +29,7 @@ angular.module('copayApp.directives')
 
 
           ctrl.$setValidity('validAddress', true);
-          return 'Merchant: ' + uri.merchant;
+          return uri.merchant;
         };
 
         ctrl.$parsers.unshift(validator);
diff --git a/views/send.html b/views/send.html
index 1edc68d64..9861deead 100644
--- a/views/send.html
+++ b/views/send.html
@@ -21,7 +21,7 @@
               </label>
               <div class="small-10 columns">
                 <input type="text" id="address" name="address" ng-disabled="loading"
-                placeholder="Send to" ng-model="address" ngChange="onChanged()" valid-address required>
+                placeholder="Send to" ng-model="address" ng-change="onChanged()" valid-address required>
                 <small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
                 <small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
               </div>