Merged fixes.

# Conflicts:
#	src/js/controllers/walletSelectorController.js

src/js/controllers/amount.js

@@ -67,15 +67,14 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
   }
 
   function onBeforeEnter(event, data) {
-    console.log('amount onBeforeEnter sendflow ', sendFlowService.getState());
-
     if (data.direction == "back") {
       sendFlowService.popState();
     }
+    console.log('amount onBeforeEnter after back sendflow ', sendFlowService.state);
     
     initCurrencies();
 
-    passthroughParams = sendFlowService;
+    passthroughParams = sendFlowService.getStateClone();
 
     vm.fromWalletId = passthroughParams.fromWalletId;
     vm.toWalletId = passthroughParams.toWalletId;

src/js/controllers/review.controller.js

@@ -75,9 +75,9 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
 
 
   function onBeforeEnter(event, data) {
-    console.log('walletSelector onBeforeEnter sendflow ', sendFlowService.getState());
+    console.log('walletSelector onBeforeEnter sendflow ', sendFlowService.state);
     defaults = configService.getDefaults();
-    sendFlowData = sendFlowService.getState();
+    sendFlowData = sendFlowService.getStateClone();
     originWalletId = sendFlowData.fromWalletId;
     satoshis = parseInt(sendFlowData.amount, 10);
     toAddress = sendFlowData.toAddress;

src/js/controllers/tab-send.js

@@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
 
   $scope.$on("$ionicView.enter", function(event, data) {
 
-    var stateParams = sendFlowService.getState();
+    var stateParams = sendFlowService.getStateClone();
     $scope.fromWallet = profileService.getWallet(stateParams.fromWalletId);
 
     clipboardService.readFromClipboard(function(text) {
@@ -184,7 +184,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
 
       $log.debug('Got toAddress:' + toAddress + ' | ' + item.name);
       
-      var stateParams = sendFlowService.getState();
+      var stateParams = sendFlowService.getStateClone();
       stateParams.toAddress = toAddress,
       stateParams.coin = item.coin;
       sendFlowService.pushState(stateParams);
@@ -200,7 +200,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
 
   $scope.startWalletToWalletTransfer = function() {
     console.log('startWalletToWalletTransfer()');
-    var params = sendFlowService.getState();
+    var params = sendFlowService.getStateClone();
     sendFlowService.pushState(params);
     $state.transitionTo('tabs.send.wallet-to-wallet', {
       fromWalletId: sendFlowService.fromWalletId
@@ -222,7 +222,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     console.log(data);
-    console.log('tab-send onBeforeEnter sendflow ', sendFlowService.getState());
+    console.log('tab-send onBeforeEnter sendflow ', sendFlowService.state);
     $scope.isIOS = platformInfo.isIOS && platformInfo.isCordova;
     $scope.showWalletsBch = $scope.showWalletsBtc = $scope.showWallets = false;
 

src/js/controllers/walletSelectorController.js

@@ -11,13 +11,12 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
   $scope.$on("$ionicView.enter", onEnter);
   
   function onBeforeEnter(event, data) {
-    console.log('walletSelector onBeforeEnter sendflow', sendFlowService.getState());
-
     if (data.direction == "back") {
       sendFlowService.popState();
     }
+    console.log('walletSelector onBeforeEnter after back sendflow', sendFlowService.state);
 
-    var stateParams = sendFlowService.getState();
+    $scope.params = sendFlowService.getStateClone();
 
     var config = configService.getSync().wallet.settings;
     priceDisplayAsFiat = config.priceDisplay === 'fiat';
@@ -29,24 +28,23 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
         $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
         break;
       case 'tabs.send.destination':
-        if (stateParams.fromWalletId) {
+        if ($scope.params.fromWalletId && !$scope.params.thirdParty) {
           $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
         }
         break;
       default:
-        if (!stateParams.thirdParty) {
+        if (!$scope.params.thirdParty) {
           $scope.sendFlowTitle = gettextCatalog.getString('Send');
         }
        // nop
     }
 
-    $scope.params = sendFlowService;
     $scope.coin = false; // Wallets to show (for destination screen or contacts)
     $scope.type = $scope.params['fromWalletId'] ? 'destination' : 'origin'; // origin || destination
     fromWalletId = $scope.params['fromWalletId'];
 
     if ($scope.type === 'destination' && $scope.params.toAddress) {
-      $state.transitionTo(getNextStep());
+      $state.transitionTo(getNextStep($scope.params));
     }
 
     if ($scope.params.coin) {
@@ -106,13 +104,10 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
     }
   }
 
-  function getNextStep() {
+  function getNextStep(params) {
-    if ($scope.thirdParty) {
+    if (!params.toWalletId && !params.toAddress) { // If we have no toAddress or fromWallet
-      $scope.params.thirdParty = $scope.thirdParty
-    }
-    if (!$scope.params.toWalletId && !$scope.params.toAddress) { // If we have no toAddress or fromWallet
       return 'tabs.send.destination';
-    } else if (!$scope.params.amount) { // If we have no amount
+    } else if (!params.amount) { // If we have no amount
       return 'tabs.send.amount';
     } else { // If we do have them
       return 'tabs.send.review';
@@ -196,14 +191,16 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
   
 
   $scope.useWallet = function(wallet) {
-    var params = sendFlowService.getState();
+    var params = sendFlowService.getStateClone();
     if ($scope.type === 'origin') { // we're on the origin screen, set wallet to send from
       params.fromWalletId = wallet.id;
     } else { // we're on the destination screen, set wallet to send to
       params.toWalletId = wallet.id;
     }
     sendFlowService.pushState(params);
-    $state.transitionTo(getNextStep(), $scope.params);
+    var nextStep = getNextStep(params);
+    console.log('walletSelector nextStep', nextStep);
+    $state.transitionTo(nextStep, $scope.params);
   };
 
   $scope.goBack = function() {

src/js/directives/formattedAmount.js

@@ -86,15 +86,24 @@
     }
 
     function formatNumbers() {
+      console.log('formatNumbers() "' + $scope.value + '", "' + $scope.currency + '"');
+      // Might get "< 0.01 USD" being passed in.
       // During watch, may be changed from having a separate currency value,
       // to both being in value. Don't want to use previous currency value.
       // Try to extract currency from value..
       var currencySplit = $scope.value.split(" ");
-      if (currencySplit.length === 2 && !$scope.currency) {
+      if (currencySplit.length >= 2 && !$scope.currency) {
-        $scope.currency = currencySplit[1];
+        $scope.currency = currencySplit[currencySplit.length - 1];
       }
       $scope.currency = $scope.currency || '';
       
+      // Redo this when we have proper formatting for low fees
+      if ($scope.value.indexOf("<") === 0) {
+        buildAmount($scope.value, '', '');
+        $scope.currency = '';
+        $scope.canShow = true;
+        return;
+      }
 
       var parsed = parseFloat($scope.value);
       var valueFormatted = '';

src/js/services/incomingData.js

@@ -82,7 +82,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       });
       // Timeout is required to enable the "Back" button
       $timeout(function() {
-        var params = sendFlowService.getState();
+        var params = sendFlowService.getStateClone();
         
         if (amount) {
           params.amount = amount;
@@ -455,7 +455,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       stateParams.requiredFeeRate = thirdPartyData.requiredFeeRate * 1024;
     }
 
-    sendFlowService.pushState(thirdPartyData);
+    // This does not make sense, thirdPartyData gets added by stateParams below
+    //sendFlowService.pushState(thirdPartyData); 
 
     scannerService.pausePreview();
     $state.go('tabs.send', {}, {

src/js/services/sendFlowService.js

@@ -9,17 +9,21 @@ angular
   function sendFlowService($log) {
 
     var service = {
-      amount: '',
+      // A separate state variable so we can ensure it is cleared of everything,
-      fromWalletId: '',
+      // even other properties added that this service does not know about. (such as "coin")
-      sendMax: false,
+      state: {
-      thirdParty: null,
+        amount: '',
-      toAddress: '',
+        fromWalletId: '',
-      toWalletId: '',
+        sendMax: false,
+        thirdParty: null,
+        toAddress: '',
+        toWalletId: ''
+      },
       previousStates: [],
 
       // Functions
       clear: clear,
-      getState: getState,
+      getStateClone: getStateClone,
       map: map,
       popState: popState,
       pushState: pushState,
@@ -36,22 +40,24 @@ angular
 
     function clearCurrent() {
       console.log("sendFlow clearCurrent()");
-      service.amount = '';
+      service.state = {
-      service.fromWalletId = '';
+        amount: '',
-      service.sendMax = false;
+        fromWalletId: '',
-      service.thirdParty = null;
+        sendMax: false,
-      service.toAddress = '';
+        thirdParty: null,
-      service.toWalletId = '';
+        toAddress: '',
+        toWalletId: ''
+      }
     }
 
     /**
      * Handy for debugging
      */
-    function getState() {
+    function getStateClone() {
       var currentState = {};
-      Object.keys(service).forEach(function forCurrentParam(key) {
+      Object.keys(service.state).forEach(function forCurrentParam(key) {
-        if (typeof service[key] !== 'function' && key !== 'previousStates') {
+        if (typeof service.state[key] !== 'function' && key !== 'previousStates') {
-          currentState[key] = service[key];
+          currentState[key] = service.state[key];
         }
       });
       return currentState;
@@ -68,7 +74,7 @@ angular
 
     function map(params) {
       Object.keys(params).forEach(function forNewParam(key) {
-        service[key] = params[key];
+        service.state[key] = params[key];
       });
     };
 
@@ -85,7 +91,7 @@ angular
 
     function pushState(params) {
       console.log('sendFlow push');
-      var currentParams = getState();
+      var currentParams = getStateClone();
       service.previousStates.push(currentParams);
       clearCurrent();
       map(params);

src/sass/views/review.scss

@@ -1,5 +1,4 @@
 #view-review {
-  background-color: #494949;
 
   slide-to-accept, slide-to-accept-success {
     margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */