Manual merge from Sprint 22 for 575.
This commit is contained in:
parent
c0912c5f17
commit
a17c3518c3
1 changed files with 4 additions and 4 deletions
|
|
@ -79,7 +79,7 @@ angular
|
|||
|
||||
$scope.$on("$ionicView.beforeEnter", onBeforeEnter);
|
||||
|
||||
|
||||
|
||||
function onBeforeEnter(event, data) {
|
||||
console.log('review onBeforeEnter sendflow ', sendFlowService.state);
|
||||
// Reset from last time
|
||||
|
|
@ -100,7 +100,7 @@ angular
|
|||
vm.originWallet = profileService.getWallet(originWalletId);
|
||||
vm.origin.currency = vm.originWallet.coin.toUpperCase();
|
||||
coin = vm.originWallet.coin;
|
||||
|
||||
|
||||
if (sendFlowData.thirdParty) {
|
||||
vm.thirdParty = sendFlowData.thirdParty;
|
||||
switch (vm.thirdParty.id) {
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue