Manual merge from Sprint 22 for 575.

This commit is contained in:
Brendon Duncan 2018-09-21 14:38:28 -07:00
commit a17c3518c3

View file

@ -398,12 +398,12 @@ angular
var balanceCryptoAmount = '';
var balanceCryptoCurrencyCode = '';
var balanceFiatAmount = '';
var balanceFiatCurrency = ''
var balanceFiatCurrency = '';
var displayAmount = '';
var displayCurrency = '';
var walletStatus = null;
if (wallet.status.isValid) {
if (wallet.status && wallet.status.isValid) {
walletStatus = wallet.status;
} else if (wallet.cachedStatus.isValid) {
walletStatus = wallet.cachedStatus;