From ccf2dd45868ce2ee2c5df6b8487c80c96c68c0ba Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Mon, 2 Jul 2018 11:20:34 +1200
Subject: [PATCH] Changes as requested by PR.

---
 src/js/controllers/confirm.js      | 9 +++++----
 src/js/controllers/tab-receive.js  | 2 +-
 src/js/services/txFormatService.js | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index cc48bf6b9..55b94446c 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -287,9 +287,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       tx.amountValueStr = tx.amountStr.split(' ')[0];
       tx.amountUnitStr = tx.amountStr.split(' ')[1];
       txFormatService.formatAlternativeStr(wallet.coin, tx.toAmount, function(v) {
+        var parts = v.split(' ');
         tx.alternativeAmountStr = v;
-        tx.alternativeAmountValueStr = tx.alternativeAmountStr.split(' ')[0];
-        tx.alternativeAmountUnitStr = tx.alternativeAmountStr.split(' ')[1];
+        tx.alternativeAmountValueStr = parts[0];
+        tx.alternativeAmountUnitStr = (parts.length > 0) ? parts[1] : '';
       });
     }
 
@@ -428,8 +429,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
 
   function showSendMaxWarning(wallet, sendMaxInfo) {
-    var feeAlternative,
-      msg;
+    var feeAlternative = '',
+      msg = '';
 
     function verifyExcludedUtxos() {
       var warningMsg = [];
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 4d048e22e..d5b7f1cd1 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -125,7 +125,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
       for (var i = 0; i < data.x.out.length; i++) {
         if (data.x.out[i].addr == watchAddress) {
           $scope.paymentReceivedAmount = txFormatService.formatAmount(data.x.out[i].value, 'full');
-          $scope.paymentReceivedAlternativeAmount = null;  // For when a subsequent payment is received.
+          $scope.paymentReceivedAlternativeAmount = '';  // For when a subsequent payment is received.
           txFormatService.formatAlternativeStr($scope.wallet.coin, data.x.out[i].value, function(alternativeStr){
             if (alternativeStr) {
               $scope.paymentReceivedAlternativeAmount = alternativeStr;
diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js
index c208857a8..ebcb3886a 100644
--- a/src/js/services/txFormatService.js
+++ b/src/js/services/txFormatService.js
@@ -79,7 +79,7 @@ angular.module('copayApp.services').factory('txFormatService', function($filter,
       var lessThanPrefix = '';
       if (subcent) {
         roundedNum = 0.01;
-        lessThanPrefix = '< '
+        lessThanPrefix = '< ';
       }
       var v1 = $filter('formatFiatAmount')(roundedNum);
       if (!v1) return null;