From 547b216edd3ce152805cf57baabe3a0830368abd Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Tue, 4 Sep 2018 13:32:36 +0900
Subject: [PATCH] migrate copayApp to bitcoincom. Clean up

---
 src/js/services/send-flow-router.service.js |  2 +-
 src/js/services/send-flow-state.service.js  |  2 +-
 src/js/services/send-flow.service.js        | 18 ++++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/js/services/send-flow-router.service.js b/src/js/services/send-flow-router.service.js
index 883a08971..32aa8420b 100644
--- a/src/js/services/send-flow-router.service.js
+++ b/src/js/services/send-flow-router.service.js
@@ -3,7 +3,7 @@
 (function(){
 
 angular
-  .module('copayApp.services')
+  .module('bitcoincom.services')
   .factory('sendFlowRouterService', sendFlowRouterService);
   
   function sendFlowRouterService(
diff --git a/src/js/services/send-flow-state.service.js b/src/js/services/send-flow-state.service.js
index 0007ccf4c..7425b65a4 100644
--- a/src/js/services/send-flow-state.service.js
+++ b/src/js/services/send-flow-state.service.js
@@ -3,7 +3,7 @@
 (function(){
 
 angular
-  .module('copayApp.services')
+  .module('bitcoincom.services')
   .factory('sendFlowStateService', sendFlowStateService);
   
   function sendFlowStateService($log) {
diff --git a/src/js/services/send-flow.service.js b/src/js/services/send-flow.service.js
index 41929319d..ea8d38d68 100644
--- a/src/js/services/send-flow.service.js
+++ b/src/js/services/send-flow.service.js
@@ -3,7 +3,7 @@
 (function(){
 
 angular
-  .module('copayApp.services')
+  .module('bitcoincom.services')
   .factory('sendFlowService', sendFlowService);
   
   function sendFlowService(
@@ -47,12 +47,6 @@ angular
               if (err) {
                 popupService.showAlert(gettextCatalog.getString('Error'), err);
               } else {
-                // Fill in the params
-                var toAddr = payProData.toAddress;
-                var amount = payProData.amount;
-                var paymentUrl = payProData.url;
-                var expires = payProData.expires;
-                var time = payProData.time;
                 var name = payProData.domain;
                 
                 // Detect some merchant that we know
@@ -65,18 +59,18 @@ angular
                 // Init thirdParty
                 var thirdPartyData = {
                   id: 'bip70',
-                  amount: amount,
+                  amount: payProData.amount,
                   caTrusted: true,
                   name: name,
                   domain: payProData.domain,
-                  expires: expires,
+                  expires: payProData.expires,
                   memo: payProData.memo,
                   network: 'livenet',
                   requiredFeeRate: payProData.requiredFeeRate,
                   selfSigned: 0,
-                  time: time,
-                  toAddress: toAddr,
-                  url: paymentUrl,
+                  time: payProData.time,
+                  toAddress: payProData.toAddress,
+                  url: payProData.url,
                   verified: true
                 };