Rename incomingData to incomingDataService

src/js/services/incoming-data.service.js

@@ -1,10 +1,10 @@
 'use strict';
 
 /**
- * incomingData is an intermediate to redirect either to the sendFlow
+ * incomingDataService is an intermediate to redirect either to the sendFlow
  * or to import/join a wallet.
  */
-angular.module('copayApp.services').factory('incomingData', function(externalLinkService, bitcoinUriService, $log, $state, $timeout, $ionicHistory, bitcore, bitcoreCash, $rootScope, payproService, scannerService, sendFlowService, appConfigService, popupService, gettextCatalog, bitcoinCashJsService) {
+angular.module('copayApp.services').factory('incomingDataService', function(bitcoinUriService, $log, $state, $rootScope, scannerService, sendFlowService, gettextCatalog) {
 
   var root = {};
 

src/js/services/openURL.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.services').factory('openURLService', function($rootScope, $ionicHistory, $document, $log, $state, platformInfo, lodash, profileService, incomingData, appConfigService) {
+angular.module('copayApp.services').factory('openURLService', function($rootScope, $ionicHistory, $document, $log, $state, platformInfo, lodash, profileService, incomingDataService, appConfigService) {
   var root = {};
 
   var handleOpenURL = function(args) {
@@ -23,7 +23,7 @@ angular.module('copayApp.services').factory('openURLService', function($rootScop
 
     document.addEventListener('handleopenurl', handleOpenURL, false);
 
-    incomingData.redir(url, function onError(err) {
+    incomingDataService.redir(url, function onError(err) {
       if (err) {
         $log.warn('Unknown URL! : ' + url);
         popupService.showAlert(gettextCatalog.getString('Error'), err.message);

src/js/services/send-flow-router.service.js

@@ -12,9 +12,6 @@ angular
   ) {
 
     var service = {
-      // A separate state variable so we can ensure it is cleared of everything,
-      // even other properties added that this service does not know about. (such as "coin")
-
       // Functions
       start: start,
       goNext: goNext,
@@ -24,7 +21,7 @@ angular
     return service;
 
     /**
-     * 
+     * Start new send flow
      */
     function start() {     
       var state = sendFlowStateService.state;
@@ -48,8 +45,8 @@ angular
     }
 
     /**
-     * Strategy
-     * https://bitcoindotcom.atlassian.net/wiki/x/BQDWKQ
+     * Go to the next page
+     * Routing strategy : https://bitcoindotcom.atlassian.net/wiki/x/BQDWKQ
      */
     function goNext() {
       var state = sendFlowStateService.state;
@@ -77,11 +74,10 @@ angular
       }
     }
 
+    /**
+     * Go to the previous page
+     */
     function goBack() {
-
-      /**
-       * Strategy
-       */
       $ionicHistory.goBack();
     }
   };

src/js/services/send-flow-state.service.js

@@ -6,11 +6,10 @@ angular
   .module('copayApp.services')
   .factory('sendFlowStateService', sendFlowStateService);
   
-  function sendFlowStateService() {
+  function sendFlowStateService($log) {
 
     var service = {
-      // A separate state variable so we can ensure it is cleared of everything,
-      // even other properties added that this service does not know about. (such as "coin")
+      // Variables
       state: {
         amount: '',
         displayAddress: null,
@@ -34,7 +33,13 @@ angular
 
     return service;
 
+    /**
+     * Init state & stack
+     * @param {Object} params 
+     */
     function init(params) {
+      $log.debug("send-flow-state init()");
+
       clear();
 
       if (params) {
@@ -42,14 +47,22 @@ angular
       }
     }
 
+    /**
+     * Clear a state & stack
+     */
     function clear() {
-      console.log("sendFlow clear()");
+      $log.debug("send-flow-state clear()");
+
       clearCurrent();
       service.previousStates = [];
     }
 
+    /**
+     * Clear current state only
+     */
     function clearCurrent() {
-      console.log("sendFlow clearCurrent()");
+      $log.debug("send-flow-state clearCurrent()");
+
       service.state = {
         amount: '',
         displayAddress: null,
@@ -62,7 +75,7 @@ angular
     }
 
     /**
-     * Handy for debugging
+     * Get a clone of the current state
      */
     function getClone() {
       var currentState = {};
@@ -74,14 +87,22 @@ angular
       return currentState;
     }
 
+    /**
+     * Fill in the current state from the params
+     * @param {Object} params 
+     */
     function map(params) {
       Object.keys(params).forEach(function forNewParam(key) {
         service.state[key] = params[key];
       });
     };
 
+    /**
+     * Pop state
+     */
     function pop() {
-      console.log('sendFlow pop');
+      $log.debug('send-flow-state pop');
+
       if (service.previousStates.length) {
         var params = service.previousStates.pop();
         clearCurrent();
@@ -91,14 +112,22 @@ angular
       }
     };
 
+    /**
+     * Push state
+     * @param {Object} params 
+     */
     function push(params) {
-      console.log('sendFlow push');
+      $log.debug('send-flow-state push');
+
       var currentParams = getClone();
       service.previousStates.push(currentParams);
       clearCurrent();
       map(params);
     };
 
+    /**
+     * Is empty stack
+     */
     function isEmpty() {
       return service.previousStates.length == 0;
     };

src/js/services/send-flow.service.js

@@ -10,12 +10,11 @@ angular
     sendFlowStateService, sendFlowRouterService
     , bitcoinUriService, payproService, bitcoinCashJsService
     , popupService, gettextCatalog
-    , $state
+    , $state, $log
   ) {
 
     var service = {
-      // A separate state variable so we can ensure it is cleared of everything,
-      // even other properties added that this service does not know about. (such as "coin")
+      // Variables
       state: sendFlowStateService,
       router: sendFlowRouterService,
 
@@ -28,19 +27,19 @@ angular
     return service;
 
     /**
-     * Clears all previous state
+     * Start a new send flow
+     * @param {Object} params 
+     * @param {Function} onError 
      */
     function start(params, onError) {
-      console.log('start()');
+      $log.debug('send-flow start()');
 
       if (params && params.data) {
         var res = bitcoinUriService.parse(params.data);
 
         if (res.isValid) {
 
-          /**
-           * If BIP70
-           */
+          // If BIP70 (url)
           if (res.url) {
             var url = res.url;
             var coin = res.coin || '';
@@ -81,18 +80,14 @@ angular
                   verified: true
                 };
 
-                /**
-                 * Fill in params
-                 */
+                // Fill in params
                 params.amount = thirdPartyData.amount,
                 params.toAddress = thirdPartyData.toAddress,
                 params.coin = coin,
                 params.thirdParty = thirdPartyData
               }
 
-              /**
-               *  Resolve
-               */
+              // Resolve
               _next();
             });
           } else {
@@ -107,7 +102,8 @@ angular
             if (res.publicAddress) {
               var prefix = res.isTestnet ? 'bchtest:' : 'bitcoincash:';
               params.displayAddress = res.publicAddress.cashAddr || res.publicAddress.legacy || res.publicAddress.bitpay;
-              params.toAddress = bitcoinCashJsService.readAddress((prefix + res.publicAddress.cashAddr) || res.publicAddress.legacy || res.publicAddress.bitpay).legacy;
+              var formatAddress = res.publicAddress.cashAddr ? prefix + params.displayAddress : params.displayAddress;
+              params.toAddress = bitcoinCashJsService.readAddress(formatAddress).legacy;
             }
             
             _next();
@@ -126,32 +122,35 @@ angular
       function _next() {
         sendFlowStateService.init(params);
 
-        /**
-         * Routing strategy to -> send-flow-router.service
-         */
+        // Routing strategy to -> send-flow-router.service
         sendFlowRouterService.start();
       }
     }
 
+    /**
+     * Go to the next step
+     * @param {Object} state 
+     */
     function goNext(state) {
-      /**
-       * Save the current route before leaving
-       */
+      $log.debug('send-flow goNext()');
+
+      // Save the current route before leaving
       state.route = $state.current.name;
 
-      /**
-       * Save the state and redirect the user
-       */
+      // Save the state and redirect the user
       sendFlowStateService.push(state);
       sendFlowRouterService.goNext();
     }
 
+    /**
+     * Go to the previous step
+     */
     function goBack() {
-        /**
-         * Remove the state on top and redirect the user
-         */
-        sendFlowStateService.pop();
-        sendFlowRouterService.goBack();
+      $log.debug('send-flow goBack()');
+
+      // Remove the state on top and redirect the user
+      sendFlowStateService.pop();
+      sendFlowRouterService.goBack();
     }
   };
 

src/js/services/shapeshiftService.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.services').factory('shapeshiftService', function ($http, $interval, $log, lodash, moment, ongoingProcess, shapeshiftApiService, storageService, configService, incomingData, platformInfo, servicesService) {
+angular.module('copayApp.services').factory('shapeshiftService', function ($http, $interval, $log, lodash, moment, ongoingProcess, shapeshiftApiService, storageService, configService, incomingDataService, platformInfo, servicesService) {
   var root = {};
   root.ShiftState = 'Shift';
   root.coinIn = '';
@@ -111,7 +111,7 @@ angular.module('copayApp.services').factory('shapeshiftService', function ($http
           toAddress: txData.deposit
         };
         //
-        // if (incomingData.redir(sendAddress, 'shapeshift', shapeshiftData)) {
+        // if (incomingDataService.redir(sendAddress, 'shapeshift', shapeshiftData)) {
           ongoingProcess.set('connectingShapeshift', false);
           // return;
         // }