From 1b156c3b6574980baf50d9afbd889c6debc62e5f Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 15 May 2015 20:09:45 -0300
Subject: [PATCH 1/3] Fix uri payment path

---
 src/js/init.js                | 2 +-
 src/js/routes.js              | 6 +++---
 src/js/services/uriHandler.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/init.js b/src/js/init.js
index 8cacff9a5..a9acfcce3 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -56,7 +56,7 @@ angular.element(document).ready(function() {
       function handleBitcoinURI(url) {
         if (!url) return;
         setTimeout(function() {
-          window.location = '#/uri-payment/' + url;
+          window.location = '#/payment/' + url;
         }, 1000);
       }
 
diff --git a/src/js/routes.js b/src/js/routes.js
index eda4ad198..a3bdf21e7 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -112,8 +112,8 @@ angular
           }
         }
       })
-      .state('uri-payment', {
-        url: '/uri-payment/:data',
+      .state('payment', {
+        url: '/payment/:data',
         templateUrl: 'views/paymentUri.html',
         views: {
           'main': {
@@ -385,7 +385,7 @@ angular
       walletHome: 0,
       copayers: -1,
       cordova: -1,
-      uri-payment: -1,
+      payment: -1,
 
       preferences: 11,
       preferencesColor: 12,
diff --git a/src/js/services/uriHandler.js b/src/js/services/uriHandler.js
index da67ab4be..3cb09e98e 100644
--- a/src/js/services/uriHandler.js
+++ b/src/js/services/uriHandler.js
@@ -4,7 +4,7 @@ var UriHandler = function() {};
 
 UriHandler.prototype.register = function() {
   var base = window.location.origin + '/';
-  var url = base + '#/uri-payment/%s';
+  var url = base + '#/payment/%s';
 
   if(navigator.registerProtocolHandler) {
     navigator.registerProtocolHandler('bitcoin', url, 'Copay');

From 345e42688ad134fd8bfe73f07a6205294da399ae Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 15 May 2015 20:10:12 -0300
Subject: [PATCH 2/3] Fix uri payment for amount undefined

---
 public/views/paymentUri.html     | 16 ++++++++--------
 src/js/controllers/paymentUri.js |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/public/views/paymentUri.html b/public/views/paymentUri.html
index 9d3b97eea..0c5ece585 100644
--- a/public/views/paymentUri.html
+++ b/public/views/paymentUri.html
@@ -5,20 +5,20 @@
 </div>
 
 <div class="content p20v row payment-uri" ng-controller="paymentUriController as payment">
-  <div class="large-12 columns" ng-init="uri = payment.checkBitcoinUri()">
-    <div class="panel text-center" ng-show="!uri">
+  <div class="large-12 columns" ng-init="payment.checkBitcoinUri()">
+    <div class="panel text-center" ng-if="!payment.uri">
       <h1 translate>Bitcoin URI is NOT valid!</h1>
     </div>
-    <div ng-show="uri">
+    <div ng-if="payment.uri">
       <h1 translate>Make a payment to</h1>
       <div class="panel size-14">
-        <div class="ellipsis"><b translate>Address</b>: {{uri.address.toString()}}</div>
-        <div ng-show="uri.amount"><b translate>Amount</b>: {{uri.amount}}</div>
-        <div ng-show="uri.message"><b translate>Message</b>: {{uri.message}}</div>
-        <div ng-show="uri.network == 'testnet'"><b translate>Network</b>: {{uri.network}}</div>
+        <div class="ellipsis"><b translate>Address</b>: {{payment.uri.address.toString()}}</div>
+        <div ng-show="payment.uri.amount"><b translate>Amount</b>: {{payment.uri.amount}}</div>
+        <div ng-show="payment.uri.message"><b translate>Message</b>: {{payment.uri.message}}</div>
+        <div ng-show="payment.uri.network == 'testnet'"><b translate>Network</b>: {{payment.uri.network}}</div>
       </div>
       <h2 translate>Select a wallet</h2>
-      <ul class="no-bullet" ng-init="wallets = payment.getWallets(uri.network)">
+      <ul class="no-bullet" ng-init="wallets = payment.getWallets(payment.uri.network)">
         <li class="panel" ng-repeat="w in wallets">
         <a ng-click="payment.selectWallet(w.id)">
           <div class="avatar-wallet" 
diff --git a/src/js/controllers/paymentUri.js b/src/js/controllers/paymentUri.js
index 5d0cddefe..831c5c791 100644
--- a/src/js/controllers/paymentUri.js
+++ b/src/js/controllers/paymentUri.js
@@ -29,9 +29,11 @@ angular.module('copayApp.controllers').controller('paymentUriController',
         var satToUnit = 1 / unitToSatoshi;
         var unitName = config.unitName;
 
-        uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName;
+        if (uri.amount) {
+          uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName;
+        }
         uri.network = uri.address.network.name;
-        return uri;
+        this.uri = uri;
       }
     };
 

From aa6289627a6c38d1a721902336d55b7443db0987 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 15 May 2015 20:19:01 -0300
Subject: [PATCH 3/3] Fix uri-payment

---
 src/js/init.js                | 2 +-
 src/js/routes.js              | 2 +-
 src/js/services/uriHandler.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/init.js b/src/js/init.js
index a9acfcce3..8cacff9a5 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -56,7 +56,7 @@ angular.element(document).ready(function() {
       function handleBitcoinURI(url) {
         if (!url) return;
         setTimeout(function() {
-          window.location = '#/payment/' + url;
+          window.location = '#/uri-payment/' + url;
         }, 1000);
       }
 
diff --git a/src/js/routes.js b/src/js/routes.js
index a3bdf21e7..6c0c21f04 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -113,7 +113,7 @@ angular
         }
       })
       .state('payment', {
-        url: '/payment/:data',
+        url: '/uri-payment/:data',
         templateUrl: 'views/paymentUri.html',
         views: {
           'main': {
diff --git a/src/js/services/uriHandler.js b/src/js/services/uriHandler.js
index 3cb09e98e..da67ab4be 100644
--- a/src/js/services/uriHandler.js
+++ b/src/js/services/uriHandler.js
@@ -4,7 +4,7 @@ var UriHandler = function() {};
 
 UriHandler.prototype.register = function() {
   var base = window.location.origin + '/';
-  var url = base + '#/payment/%s';
+  var url = base + '#/uri-payment/%s';
 
   if(navigator.registerProtocolHandler) {
     navigator.registerProtocolHandler('bitcoin', url, 'Copay');