confirm controller refactor / wip1

src/js/controllers/confirm.js

@@ -1,14 +1,29 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bwcError) {
-  var cachedTxp = {};
+
-  var feeLevel;
-  var feePerKb;
-  var toAmount;
-  var isChromeApp = platformInfo.isChromeApp;
   var countDown = null;
-  var cachedSendMax = {};
+
-  $scope.isCordova = platformInfo.isCordova;
+  var tx = {};
+
+  // Config Related values
+  var config = configService.getSync();
+  var walletConfig = config.wallet;
+  var unitToSatoshi = walletConfig.settings.unitToSatoshi;
+  var unitDecimals = walletConfig.settings.unitDecimals;
+  var satToUnit = 1 / unitToSatoshi;
+  var touchIdEnabled = config.touchIdFor && config.touchIdFor[wallet.id];
+  var configFeeLevel = walletConfig.settings.feeLevel ? walletConfig.settings.feeLevel : 'normal';
+
+
+  // Platform info
+  var isChromeApp = platformInfo.isChromeApp;
+  var isCordova = platformInfo.isCordova;
+
+
+  $scope.showWalletSelector = function() {
+    $scope.walletSelector = true;
+  };
 
   $scope.$on("$ionicView.beforeLeave", function(event, data) {
     $ionicConfig.views.swipeBackEnabled(true);
@@ -20,17 +35,83 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
 
-    toAmount = data.stateParams.toAmount;
+    function setWalletSelector(minAmount, cb) {
-    cachedSendMax = {};
+      console.log('[confirm.js.38:minAmount:]', minAmount); //TODO
+      $scope.wallets = profileService.getWallets({
+        onlyComplete: true,
+        network: $scope.network
+      });
+
+      if (!$scope.wallets || !$scope.wallets.length) {
+        $scope.noMatchingWallet = true;
+        $log.warn('No ' + $scope.network + ' wallets to make the payment');
+        $timeout(function() {
+          $scope.$apply();
+        });
+        return;
+      }
+
+      var filteredWallets = [];
+      var index = 0;
+      var walletsUpdated = 0;
+
+      lodash.each($scope.wallets, function(w) {
+        walletService.getStatus(w, {}, function(err, status) {
+          if (err || !status) {
+            $log.error(err);
+          } else {
+            walletsUpdated++;
+            w.status = status;
+
+            if (!status.availableBalanceSat)
+              $log.debug('No balance available in: ' + w.name);
+
+            console.log('[confirm.js.68]', status.availableBalanceSat, minAmount); //TODO
+            if (status.availableBalanceSat > minAmount) {
+              filteredWallets.push(w);
+            }
+          }
+
+          if (++index == $scope.wallets.length) {
+            if (!walletsUpdated)
+              return cb('Could not update any wallet');
+
+            if (lodash.isEmpty(filteredWallets)) {
+              $scope.insufficientFunds = true;
+              $log.warn('No wallet available to make the payment');
+            }
+            $scope.wallets = lodash.clone(filteredWallets);
+            return cb();
+          }
+        });
+      });
+    };
+
+    // Setup $scope
+
+    // Grab stateParams
+    tx = {
+      toAmount: parseInt(data.stateParams.toAmount),
+      sendMax: data.stateParams.useSendMax == 'true' ? true : false,
+      toAddress: data.stateParams.toAddress,
+      description: data.stateParams.description,
+      paypro: data.stateParams.paypro,
+
+      feeLevel: configFeeLevel,
+      spendUnconfirmed: walletConfig.spendUnconfirmed,
+
+      // Vanity tx info (not in the real tx)
+      recipientType: data.stateParams.recipientType || null,
+      toName: data.stateParams.toName,
+      toEmail: data.stateParams.toEmail,
+      toColor: data.stateParams.toColor,
+      network: (new bitcore.Address(data.stateParams.toAddress)).network.name,
+    };
+
+
+    // Other Scope vars
+    $scope.isCordova = isCordova;
     $scope.showAddress = false;
-    $scope.useSendMax = data.stateParams.useSendMax == 'true' ? true : false;
-    $scope.recipientType = data.stateParams.recipientType || null;
-    $scope.toAddress = data.stateParams.toAddress;
-    $scope.toName = data.stateParams.toName;
-    $scope.toEmail = data.stateParams.toEmail;
-    $scope.toColor = data.stateParams.toColor;
-    $scope.description = data.stateParams.description;
-    $scope.paypro = data.stateParams.paypro;
     $scope.insufficientFunds = false;
     $scope.noMatchingWallet = false;
     $scope.paymentExpired = {
@@ -39,218 +120,223 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     $scope.remainingTimeStr = {
       value: null
     };
-    $scope.network = (new bitcore.Address($scope.toAddress)).network.name;
+
-    setFee();
+
-    resetValues();
+    $scope.walletSelectorTitle = gettextCatalog.getString('Send from');
-    setwallets();
+
-    applyButtonText();
+    console.log('[confirm.js.126:tx:]', tx); //TODO
+
+    setWalletSelector(tx.toAmount, function(err) {
+      if (err) {
+        $log.debug('Error updating wallets:' + err);
+        popupService.showAlert(gettextCatalog.getString('Could not update wallets'), bwcError.msg(err), function() {
+          $ionicHistory.nextViewOptions({
+            disableAnimate: true,
+            historyRoot: true
+          });
+          $ionicHistory.clearHistory();
+          $state.go('tabs.send');
+        });
+      }
+
+      $log.debug('Wallet selector is setup');
+
+      if ($scope.wallets.length > 1) {
+        $scope.showWalletSelector();
+      } else {
+        setWallet($scope.wallets[0], tx);
+      }
+    });
   });
 
-  function setFee(customFeeLevel, cb) {
+
-    feeService.getCurrentFeeValue($scope.network, customFeeLevel, function(err, currentFeePerKb) {
+  function getSendMaxInfo(tx, cb) {
-      var config = configService.getSync().wallet;
+    if (!tx.sendMax) return cb();
-      var configFeeLevel = (config.settings && config.settings.feeLevel) ? config.settings.feeLevel : 'normal';
+
-      feePerKb = currentFeePerKb;
+    //ongoingProcess.set('retrievingInputs', true);
-      feeLevel = customFeeLevel ? customFeeLevel : configFeeLevel;
+    walletService.getSendMaxInfo(wallet, {
-      $scope.feeLevel = feeService.feeOpts[feeLevel];
+      feePerKb: tx.feeRate,
-      if (cb) return cb();
+      excludeUnconfirmedUtxos: !tx.spendUnconfirmed,
+      returnInputs: true,
+    }, cb);
+  };
+
+
+  function getTxp(tx, wallet, dryRun, cb) {
+
+    var paypro = tx.paypro;
+    var toAddress = tx.toAddress;
+    var description = tx.description;
+
+    // ToDo: use a credential's (or fc's) function for this
+    if (description && !wallet.credentials.sharedEncryptingKey) {
+      var msg = gettextCatalog.getString('Could not add message to imported wallet without shared encrypting key');
+      $log.warn(msg);
+      return setSendError(msg);
+    }
+
+    if (tx.toAmount > Number.MAX_SAFE_INTEGER) {
+      var msg = gettextCatalog.getString('Amount too big');
+      $log.warn(msg);
+      return setSendError(msg);
+    }
+
+    var txp = {};
+
+    txp.outputs = [{
+      'toAddress': tx.toAddress,
+      'amount': tx.toAmount,
+      'message': tx.description
+    }];
+
+    if (tx.sendMaxInfo) {
+      txp.inputs = tx.sendMaxInfo.inputs;
+      txp.fee = tx.sendMaxInfo.fee;
+    } else {
+      txp.feeLevel = tx.feeLevel;
+    }
+
+    txp.message = description;
+
+    if (tx.paypro) {
+      txp.payProUrl = tx.paypro.url;
+    }
+    txp.excludeUnconfirmedUtxos = !tx.spendUnconfirmed;
+    txp.dryRun = dryRun;
+    walletService.createTx(wallet, txp, function(err, ctxp) {
+      if (err) {
+        setSendError(err);
+        return cb(err);
+      }
+      return cb(null, ctxp);
+    });
+  };
+
+
+
+  function updateTx(tx, wallet, cb) {
+
+    // Amount
+    tx.amountStr = txFormatService.formatAmountStr(tx.amount);
+    tx.amountValueStr = $scope.amountStr.split(' ')[0];
+    tx.amountUnitStr = $scope.amountStr.split(' ')[1];
+    txFormatService.formatAlternativeStr(tx.amount, function(v) {
+      tx.alternativeAmountStr = v;
+    });
+
+    $scope.tx = tx;
+
+
+    feeService.getFeeRate(tx.network, tx.feeLevel, function(err, feeRate) {
+      if (err) return cb(err);
+
+      tx.feeRate = feeRate;
+      tx.feeLevelName = feeService.feeOpts[tx.feeLevel];
+
+      getSendMaxInfo(lodash.clone(tx), function(err, sendMaxInfo) {
+        if (err) {
+          var msg = gettextCatalog.getString('Error getting SendMax information');
+          return setSendError(msg);
+        }
+
+        if (sendMaxInfo) {
+          if (tx.sendMax && tx.sendMaxInfo.amount == 0) {
+            $scope.insufficientFunds = true;
+            popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee'));
+            return cb('no_funds');
+          }
+
+          tx.sendMaxInfo = resp;
+          tx.toAmount = parseFloat((tx.sendMaxInfo.amount * unitToSatoshi).toFixed(0));
+        }
+
+        getTxp(lodash.clone(tx), wallet, true, function(err, txp) {
+          if (err) return cb(err);
+
+          if (tx.sendMaxInfo)
+            showSendMaxWarning(sendMaxInfo, function(err) {});
+
+          tx.feeStr = txFormatService.formatAmountStr(txp.fee);
+          txFormatService.formatAlternativeStr(txp.fee, function(v) {
+            tx.alternativeFeeStr = v;
+          });
+          tx.feeRateStr = (txp.fee / (txp.amount + txp.fee) * 100).toFixed(2) + '%';
+
+          tx.txp = tx.txp || [];
+          tx.txp[wallet.id] = txp;
+
+          return cb();
+        });
+      });
     });
   }
 
   function useSelectedWallet() {
-    if (!$scope.useSendMax) displayValues();
+
+    if (!$scope.useSendMax) {
+      showAmount(tx.toAmount);
+    }
+
     $scope.onWalletSelect($scope.wallet);
   }
 
-  function applyButtonText(multisig) {
+  function setButtonText(isMultisig, isPayPro) {
-    $scope.buttonText = $scope.isCordova ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' ';
+    $scope.buttonText = gettextCatalog.getString(isCordova ? 'Slide' : 'Click') + ' ';
 
-    if ($scope.paypro) {
+    if (isPayPro) {
       $scope.buttonText += gettextCatalog.getString('to pay');
-    } else if (multisig) {
+    } else if (isMultisig) {
       $scope.buttonText += gettextCatalog.getString('to accept');
     } else
       $scope.buttonText += gettextCatalog.getString('to send');
   };
 
-  function setwallets() {
-    $scope.wallets = profileService.getWallets({
-      onlyComplete: true,
-      network: $scope.network
-    });
-
-    if (!$scope.wallets || !$scope.wallets.length) {
-      $scope.noMatchingWallet = true;
-      displayValues();
-      $log.warn('No ' + $scope.network + ' wallets to make the payment');
-      $timeout(function() {
-        $scope.$apply();
-      });
-      return;
-    }
-
-    var filteredWallets = [];
-    var index = 0;
-    var enoughFunds = false;
-    var walletsUpdated = 0;
-
-    lodash.each($scope.wallets, function(w) {
-      walletService.getStatus(w, {}, function(err, status) {
-        if (err || !status) {
-          $log.error(err);
-        } else {
-          walletsUpdated++;
-          w.status = status;
-          if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name);
-          if (status.availableBalanceSat > toAmount) {
-            filteredWallets.push(w);
-            enoughFunds = true;
-          }
-        }
-
-        if (++index == $scope.wallets.length) {
-          if (!lodash.isEmpty(filteredWallets)) {
-            $scope.wallets = lodash.clone(filteredWallets);
-            if ($scope.useSendMax) {
-              if ($scope.wallets.length > 1)
-                $scope.showWalletSelector();
-              else {
-                $scope.wallet = $scope.wallets[0];
-                $scope.getSendMaxInfo();
-              }
-            } else initConfirm();
-          } else {
-
-            // Were we able to update any wallet?
-            if (walletsUpdated) {
-              if (!enoughFunds) $scope.insufficientFunds = true;
-              displayValues();
-              $log.warn('No wallet available to make the payment');
-            } else {
-              popupService.showAlert(gettextCatalog.getString('Could not update wallets'), bwcError.msg(err), function() {
-                $ionicHistory.nextViewOptions({
-                  disableAnimate: true,
-                  historyRoot: true
-                });
-                $ionicHistory.clearHistory();
-                $state.go('tabs.send');
-              });
-            }
-
-          }
-          $timeout(function() {
-            $scope.$apply();
-          });
-        }
-      });
-    });
-  };
 
   $scope.toggleAddress = function() {
     $scope.showAddress = !$scope.showAddress;
   };
 
-  var initConfirm = function() {
-    if ($scope.paypro) _paymentTimeControl($scope.paypro.expires);
 
-    displayValues();
+  function resetView() {
-    if ($scope.wallets.length > 1) $scope.showWalletSelector();
-    else setWallet($scope.wallets[0]);
-    $timeout(function() {
-      $scope.$apply();
-    });
-  };
-
-  function displayValues() {
-    toAmount = parseInt(toAmount);
-    $scope.amountStr = txFormatService.formatAmountStr(toAmount);
-    $scope.displayAmount = getDisplayAmount($scope.amountStr);
-    $scope.displayUnit = getDisplayUnit($scope.amountStr);
-    txFormatService.formatAlternativeStr(toAmount, function(v) {
-      $scope.alternativeAmountStr = v;
-    });
-  };
-
-  function resetValues() {
     $scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.feeFiat = $scope.feeRateStr = $scope.alternativeAmountStr = $scope.insufficientFunds = $scope.noMatchingWallet = null;
     $scope.showAddress = false;
+
+    console.log('[confirm.js.213] RESET'); //TODO
   };
 
-  $scope.getSendMaxInfo = function() {
-    resetValues();
-    var config = configService.getSync().wallet;
 
-    ongoingProcess.set('retrievingInputs', true);
+
-    walletService.getSendMaxInfo($scope.wallet, {
+  function showSendMaxWarning(sendMaxInfo) {
-      feePerKb: feePerKb,
+
-      excludeUnconfirmedUtxos: !config.spendUnconfirmed,
+    function verifyExcludedUtxos() {
-      returnInputs: true,
+      var warningMsg = [];
-    }, function(err, resp) {
+      if (sendMaxInfo.utxosBelowFee > 0) {
-      ongoingProcess.set('retrievingInputs', false);
+        warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", {
-      if (err) {
+          amountBelowFeeStr: txFormatService.formatAmountStr(sendMaxInfo.amountBelowFee)
-        popupService.showAlert(gettextCatalog.getString('Error'), err);
+        }));
-        return;
       }
 
-      if (resp.amount == 0) {
+      if (sendMaxInfo.utxosAboveMaxSize > 0) {
-        $scope.insufficientFunds = true;
+        warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded.", {
-        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee'));
+          amountAboveMaxSizeStr: txFormatService.formatAmountStr(sendMaxInfo.amountAboveMaxSize)
-        return;
+        }));
       }
+      return warningMsg.join('\n');
+    };
 
-      $scope.sendMaxInfo = {
+    var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees.", {
-        sendMax: true,
+      fee: txFormatService.formatAmountStr(sendMaxInfo.fee)
-        amount: resp.amount,
-        inputs: resp.inputs,
-        fee: resp.fee,
-        feePerKb: feePerKb,
-      };
-
-      cachedSendMax[$scope.wallet.id] = $scope.sendMaxInfo;
-
-      var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees.", {
-        fee: txFormatService.formatAmountStr(resp.fee)
-      });
-      var warningMsg = verifyExcludedUtxos();
-
-      if (!lodash.isEmpty(warningMsg))
-        msg += '\n' + warningMsg;
-
-      popupService.showAlert(null, msg, function() {
-        setSendMaxValues(resp);
-
-        createTx($scope.wallet, true, function(err, txp) {
-          if (err) return;
-          cachedTxp[$scope.wallet.id] = txp;
-          apply(txp);
-        });
-      });
-
-      function verifyExcludedUtxos() {
-        var warningMsg = [];
-        if (resp.utxosBelowFee > 0) {
-          warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", {
-            amountBelowFeeStr: txFormatService.formatAmountStr(resp.amountBelowFee)
-          }));
-        }
-
-        if (resp.utxosAboveMaxSize > 0) {
-          warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded.", {
-            amountAboveMaxSizeStr: txFormatService.formatAmountStr(resp.amountAboveMaxSize)
-          }));
-        }
-        return warningMsg.join('\n');
-      };
     });
+    var warningMsg = verifyExcludedUtxos();
+
+    if (!lodash.isEmpty(warningMsg))
+      msg += '\n' + warningMsg;
+
+    popupService.showAlert(null, msg, function() {});
   };
 
   function setSendMaxValues(data) {
-    resetValues();
+    resetView();
-    var config = configService.getSync().wallet;
-    var unitToSatoshi = config.settings.unitToSatoshi;
-    var satToUnit = 1 / unitToSatoshi;
-    var unitDecimals = config.settings.unitDecimals;
-
     $scope.amountStr = txFormatService.formatAmountStr(data.amount, true);
     $scope.displayAmount = getDisplayAmount($scope.amountStr);
     $scope.displayUnit = getDisplayUnit($scope.amountStr);
@@ -272,27 +358,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     $scope.approve();
   });
 
-  $scope.showWalletSelector = function() {
-    $scope.walletSelectorTitle = gettextCatalog.getString('Send from');
-    if (!$scope.useSendMax && ($scope.insufficientFunds || $scope.noMatchingWallet)) return;
-    $scope.showWallets = true;
-  };
-
   $scope.onWalletSelect = function(wallet) {
-    if ($scope.useSendMax) {
+    setWallet(wallet, tx);
-      $scope.wallet = wallet;
-      if (cachedSendMax[wallet.id]) {
-        $log.debug('Send max cached for wallet:', wallet.id);
-        setSendMaxValues(cachedSendMax[wallet.id]);
-        return;
-      }
-      $scope.getSendMaxInfo();
-    } else
-      setWallet(wallet);
-
-    applyButtonText(wallet.credentials.m > 1);
   };
 
+  // TODO 
   $scope.showDescriptionPopup = function() {
     var message = gettextCatalog.getString('Add description');
     var opts = {
@@ -307,14 +377,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     });
   };
 
-  function getDisplayAmount(amountStr) {
-    return $scope.amountStr.split(' ')[0];
-  };
-
-  function getDisplayUnit(amountStr) {
-    return $scope.amountStr.split(' ')[1];
-  };
-
   function _paymentTimeControl(expirationTime) {
     $scope.paymentExpired.value = false;
     setExpirationTime();
@@ -347,31 +409,28 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     };
   };
 
-  function setWallet(wallet, delayed) {
+  /* sets a wallet on the UI, creates a TXPs for that wallet */
-    var stop;
+
+  function setWallet(wallet, tx) {
+
     $scope.wallet = wallet;
-    $scope.fee = $scope.txp = null;
-    if (stop) {
-      $timeout.cancel(stop);
-      stop = null;
-    }
 
-    if (cachedTxp[wallet.id]) {
+    setButtonText(wallet.credentials.m > 1, !!tx.paypro);
-      apply(cachedTxp[wallet.id]);
+
-    } else {
+    //T TODO
-      stop = $timeout(function() {
+    if ($scope.paypro)
-        createTx(wallet, true, function(err, txp) {
+      _paymentTimeControl($scope.paypro.expires);
-          if (err) return;
+
-          cachedTxp[wallet.id] = txp;
+    updateTx(tx, wallet, function(err) {
-          apply(txp);
+      if (err) return;
-        });
+
-      }, delayed ? 2000 : 1);
+      $timeout(function() {
-    }
+        $ionicScrollDelegate.resize();
+        $scope.$apply();
+      }, 10);
+
+    });
 
-    $timeout(function() {
-      $ionicScrollDelegate.resize();
-      $scope.$apply();
-    }, 10);
   };
 
   var setSendError = function(msg) {
@@ -382,75 +441,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     popupService.showAlert(gettextCatalog.getString('Error at confirm'), bwcError.msg(msg));
   };
 
-  function apply(txp) {
-    $scope.fee = txFormatService.formatAmountStr(txp.fee);
-    txFormatService.formatAlternativeStr(txp.fee, function(v) {
-      $scope.feeFiat = v;
-    });
-    $scope.txp = txp;
-    $scope.feeRateStr = (txp.fee / (txp.amount + txp.fee) * 100).toFixed(2) + '%';
-    $timeout(function() {
-      $scope.$apply();
-    });
-  };
-
-  var createTx = function(wallet, dryRun, cb) {
-    var config = configService.getSync().wallet;
-    var currentSpendUnconfirmed = config.spendUnconfirmed;
-    var paypro = $scope.paypro;
-    var toAddress = $scope.toAddress;
-    var description = $scope.description;
-    var unitToSatoshi = config.settings.unitToSatoshi;
-    var unitDecimals = config.settings.unitDecimals;
-
-    // ToDo: use a credential's (or fc's) function for this
-    if (description && !wallet.credentials.sharedEncryptingKey) {
-      var msg = gettextCatalog.getString('Could not add message to imported wallet without shared encrypting key');
-      $log.warn(msg);
-      return setSendError(msg);
-    }
-
-    if (toAmount > Number.MAX_SAFE_INTEGER) {
-      var msg = gettextCatalog.getString('Amount too big');
-      $log.warn(msg);
-      return setSendError(msg);
-    }
-
-    var txp = {};
-    var amount;
-
-    if ($scope.useSendMax) amount = parseFloat((toAmount * unitToSatoshi).toFixed(0));
-    else amount = toAmount;
-
-    txp.outputs = [{
-      'toAddress': toAddress,
-      'amount': amount,
-      'message': description
-    }];
-
-    if ($scope.sendMaxInfo) {
-      txp.inputs = $scope.sendMaxInfo.inputs;
-      txp.fee = $scope.sendMaxInfo.fee;
-    } else
-      txp.feeLevel = feeLevel;
-
-    txp.message = description;
-
-    if (paypro) {
-      txp.payProUrl = paypro.url;
-    }
-    txp.excludeUnconfirmedUtxos = !currentSpendUnconfirmed;
-    txp.dryRun = dryRun;
-
-    walletService.createTx(wallet, txp, function(err, ctxp) {
-      if (err) {
-        setSendError(err);
-        return cb(err);
-      }
-      return cb(null, ctxp);
-    });
-  };
-
   $scope.openPPModal = function() {
     $ionicModal.fromTemplateUrl('views/modals/paypro.html', {
       scope: $scope
@@ -481,14 +471,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     }
 
     ongoingProcess.set('creatingTx', true, onSendStatusChange);
-    createTx(wallet, false, function(err, txp) {
+    getTxp(wallet, false, function(err, txp) {
       ongoingProcess.set('creatingTx', false, onSendStatusChange);
       if (err) return;
 
-      var config = configService.getSync();
       var spendingPassEnabled = walletService.isEncrypted(wallet);
-      var touchIdEnabled = config.touchIdFor && config.touchIdFor[wallet.id];
-      var isCordova = $scope.isCordova;
       var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20;
       var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', {
         amountStr: $scope.amountStr,
@@ -595,13 +582,12 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     };
     $scope.hideModal = function(customFeeLevel) {
       if (customFeeLevel) {
-        cachedTxp = {};
-        cachedSendMax = {};
         ongoingProcess.set('gettingFeeLevels', true);
-        setFee(customFeeLevel, function() {
+        setAndShowFee(customFeeLevel, function() {
           ongoingProcess.set('gettingFeeLevels', false);
-          resetValues();
+          resetView();
-          if ($scope.wallet) useSelectedWallet();
+          if ($scope.wallet)
+            useSelectedWallet();
         })
       }
       $scope.chooseFeeLevelModal.hide();

src/js/controllers/paperWallet.js

@@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
         $scope.wallet.buildTxFromPrivateKey($scope.privateKey, destinationAddress, null, function(err, testTx) {
           if (err) return cb(err);
           var rawTxLength = testTx.serialize().length;
-          feeService.getCurrentFeeValue('livenet', null, function(err, feePerKB) {
+          feeService.getCurrentFeeRate('livenet', null, function(err, feePerKB) {
             var opts = {};
             opts.fee = Math.round((feePerKB * rawTxLength) / 2000);
             $scope.wallet.buildTxFromPrivateKey($scope.privateKey, destinationAddress, opts, function(err, tx) {

src/js/services/bwcError.js

@@ -110,7 +110,7 @@ angular.module('copayApp.services')
             body = gettextCatalog.getString('Amount below minimum allowed');
             break;
           case 'INCORRECT_ADDRESS_NETWORK':
-            body = gettextCatalog.getString('Incorrect address network');
+            body = gettextCatalog.getString('Incorrect network address');
             break;
           case 'COPAYER_REGISTERED':
             body = gettextCatalog.getString('Key already associated with an existing wallet');

src/js/services/feeService.js

@@ -1,8 +1,10 @@
 'use strict';
 
-angular.module('copayApp.services').factory('feeService', function($log, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService, gettextCatalog) {
+angular.module('copayApp.services').factory('feeService', function($log, $timeout, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService, gettextCatalog) {
   var root = {};
 
+  var CACHE_TIME_TS = 60; // 1 min
+
   // Constant fee options to translate
   root.feeOpts = {
     urgent: gettext('Urgent'),
@@ -12,22 +14,26 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
     superEconomy: gettext('Super Economy')
   };
 
+  var cache = {
+    updateTs: 0,
+  };
+
   root.getCurrentFeeLevel = function() {
     return configService.getSync().wallet.settings.feeLevel || 'normal';
   };
 
-  root.getCurrentFeeValue = function(network, customFeeLevel, cb) {
+
+  root.getFeeRate = function(network, feeLevel, cb) {
     network = network || 'livenet';
-    var feeLevel = customFeeLevel || root.getCurrentFeeLevel();
 
     root.getFeeLevels(function(err, levels) {
       if (err) return cb(err);
 
-      var feeLevelValue = lodash.find(levels[network], {
+      var feeLevelRate = lodash.find(levels[network], {
         level: feeLevel
       });
 
-      if (!feeLevelValue || !feeLevelValue.feePerKB) {
+      if (!feeLevelRate || !feeLevelRate.feePerKB) {
         return cb({
           message: gettextCatalog.getString("Could not get dynamic fee for level: {{feeLevel}}", {
             feeLevel: feeLevel
@@ -35,14 +41,26 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
         });
       }
 
-      var fee = feeLevelValue.feePerKB;
+      var feeRate = feeLevelRate.feePerKB;
-      $log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT');
+      $log.debug('Dynamic fee: ' + feeLevel + ' ' + feeRate + ' SAT');
 
-      return cb(null, fee);
+      return cb(null, feeRate);
     });
   };
 
+  root.getCurrentFeeRate = function(network, cb) {
+    return root.getFeeRate(network, root.getCurrentFeeLevel(), cb);
+  };
+
   root.getFeeLevels = function(cb) {
+
+    if (cache.updateTs > Date.now() - CACHE_TIME_TS * 1000 ) {
+      $log.debug('Fee cache hit');
+      $timeout( function() {
+        return cb(null, cache.data);
+      }, 1);
+    }
+
     var walletClient = bwcService.getClient();
     var unitName = configService.getSync().wallet.settings.unitName;
 
@@ -51,10 +69,14 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
         if (errLivenet || errTestnet) {
           return cb(gettextCatalog.getString('Could not get dynamic fee'));
         }
-        return cb(null, {
+
+        cache.updateTs =Date.now();
+        cache.data = {
           'livenet': levelsLivenet,
           'testnet': levelsTestnet
-        });
+        };
+
+        return cb(null, cache.data);
       });
     });
   };

src/js/services/sendMax.js

@@ -10,7 +10,7 @@ angular.module('copayApp.services').service('sendMaxService', function(feeServic
    *
    */
   this.getInfo = function(wallet, cb) {
-    feeService.getCurrentFeeValue(wallet.credentials.network, null, function(err, feePerKb) {
+    feeService.getCurrentFeeRate(wallet.credentials.network, null, function(err, feePerKb) {
       if (err) return cb(err);
 
       var config = configService.getSync().wallet;

www/views/confirm.html

@@ -12,16 +12,16 @@
       <div class="item head">
         <div class="sending-label">
           <img src="img/icon-tx-sent-outline.svg">
-          <span translate ng-if="!useSendMax">Sending</span>
+          <span translate ng-if="!tx.sendMax">Sending</span>
-          <span translate ng-if="useSendMax">Sending maximum amount</span>
+          <span translate ng-if="tx.sendMax">Sending maximum amount</span>
         </div>
         <div class="amount-label">
-          <div class="amount">{{displayAmount || '...'}} <span class="unit">{{displayUnit}}</span></div>
+          <div class="amount">{{tx.amountValueStr || '...'}} <span class="unit">{{tx.amountUnitStr}}</span></div>
-          <div class="alternative">{{alternativeAmountStr || '...'}}</div>
+          <div class="alternative">{{tx.alternativeAmountStr || '...'}}</div>
         </div>
       </div>
       <div class="info">
-        <div class="item single-line" ng-if="paypro">
+        <div class="item single-line" ng-if="tx.paypro">
           <span class="label" translate>Payment Expires:</span>
           <span class="item-note" ng-if="!paymentExpired.value">{{remainingTimeStr.value}}</span>
           <span class="item-note" ng-if="paymentExpired.value" ng-style="{'color': 'red'}" translate>Expired</span>
@@ -32,36 +32,36 @@
           <span class="payment-proposal-to" ng-if="!recipientType">
             <img src="img/icon-bitcoin-small.svg">
 
-            <div copy-to-clipboard="toAddress" ng-if="!paypro" class="ellipsis">
+            <div copy-to-clipboard="tx.toAddress" ng-if="!tx.paypro" class="ellipsis">
-              <contact ng-if="!toName" address="{{toAddress}}"></contact>
+              <contact ng-if="!tx.toName" address="{{tx.toAddress}}"></contact>
-              <span class="m15l size-14" ng-if="toName">{{toName}}</span>
+              <span class="m15l size-14" ng-if="tx.toName">{{tx.toName}}</span>
             </div>
 
-            <div ng-if="paypro" ng-click="openPPModal(paypro)" class="m15l size-14 w100p pointer">
+            <div ng-if="tx.paypro" ng-click="openPPModal(tx.paypro)" class="m15l size-14 w100p pointer">
-              <i ng-show="paypro.verified && paypro.caTrusted" class="ion-locked" style="color:green"></i>
+              <i ng-show="tx.paypro.verified && tx.paypro.caTrusted" class="ion-locked" style="color:green"></i>
-              <i ng-show="!paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
+              <i ng-show="!tx.paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
-              <span class="ellipsis" ng-show="!toName">{{paypro.domain || paypro.toAddress}}</span>
+              <span class="ellipsis" ng-show="!tx.toName">{{tx.paypro.domain || tx.paypro.toAddress}}</span>
-              <span ng-show="toName">{{toName}}</span>
+              <span ng-show="tx.toName">{{tx.toName}}</span>
             </div>
-            <!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{toAddress}}"></contact>
+            <!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{tx.toAddress}}"></contact>
             <span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span> -->
           </span>
           <div class="wallet" ng-if="recipientType == 'wallet'">
             <i class="icon big-icon-svg">
               <img src="img/icon-wallet.svg" ng-class="{'wallet-background-color-default': !toColor}" ng-style="{'background-color': toColor}" class="bg"/>
             </i>
-            <div copy-to-clipboard="toAddress" class="ellipsis">
+            <div copy-to-clipboard="tx.toAddress" class="ellipsis">
-              <contact ng-if="!toName" address="{{toAddress}}"></contact>
+              <contact ng-if="!tx.toName" address="{{tx.toAddress}}"></contact>
-              <span ng-if="toName" class="wallet-name">{{toName}}</span>
+              <span ng-if="tx.toName" class="wallet-name">{{tx.toName}}</span>
             </div>
           </div>
           <div ng-if="recipientType == 'contact' && !isChromeApp" class="gravatar-contact toggle" ng-click="toggleAddress()">
-            <gravatar class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
+            <gravatar class="send-gravatar" name="{{tx.toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
-            <span ng-if="toName && !showAddress">{{toName}}</span>
+            <span ng-if="tx.toName && !showAddress">{{tx.toName}}</span>
-            <span ng-if="toName && showAddress">{{toAddress}}</span>
+            <span ng-if="tx.toName && showAddress">{{tx.toAddress}}</span>
           </div>
         </div>
-        <a class="item item-icon-right" ng-hide="!useSendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">
+        <a class="item item-icon-right" ng-hide="!tx.sendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">
           <span class="label" translate>From</span>
           <div class="wallet" ng-if="wallet">
             <i class="icon big-icon-svg">
@@ -78,17 +78,17 @@
           <i class="icon bp-arrow-right"></i>
         </a>
         <div class="item item-icon-right" ng-if="!insufficientFunds && !noMatchingWallet" ng-click="chooseFeeLevel()">
-          <span class="label">{{'Fee:' | translate}} {{feeLevel | translate}}</span>
+          <span class="label">{{'Fee:' | translate}} {{tx.feeLevel | translate}}</span>
-          <span class="m10l">{{fee || '...'}}</span>
+          <span class="m10l">{{tx.fee || '...'}}</span>
           <span class="item-note m10l">
-            <span>{{feeFiat || '...'}}&nbsp;<span class="fee-rate" ng-if="feeRateStr" translate>- {{feeRateStr}} of the transaction</span></span>
+            <span>{{tx.alternativeFeeStr || '...'}}&nbsp;<span class="fee-rate" ng-if="tx.feeRatePerStr" translate>- {{tx.feeRatePerStr}} of the transaction</span></span>
           </span>
           <i class="icon bp-arrow-right"></i>
         </div>
         <a class="item item-icon-right" ng-if="!insufficientFunds && !noMatchingWallet" ng-click="showDescriptionPopup()">
           <span class="label" translate>Add Memo</span>
           <span class="item-note m10l">
-            {{description}}
+            {{tx.description}}
           </span>
           <i class="icon bp-arrow-right"></i>
         </a>
@@ -132,7 +132,7 @@
     wallet-selector-title="walletSelectorTitle"
     wallet-selector-wallets="wallets"
     wallet-selector-selected-wallet="wallet"
-    wallet-selector-show="showWallets"
+    wallet-selector-show="walletSelector"
     wallet-selector-on-select="onWalletSelect">
   </wallet-selector>