anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Manual merge from Sprint 22 for 575.

Browse source
This commit is contained in:
Brendon Duncan 2018-09-21 14:38:28 -07:00
commit a17c3518c3
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/review.controller.js
View file

@ -79,7 +79,7 @@ angular
$scope.$on("$ionicView.beforeEnter", onBeforeEnter); $scope.$on("$ionicView.beforeEnter", onBeforeEnter);
function onBeforeEnter(event, data) { function onBeforeEnter(event, data) {
console.log('review onBeforeEnter sendflow ', sendFlowService.state); console.log('review onBeforeEnter sendflow ', sendFlowService.state);
// Reset from last time // Reset from last time
@ -100,7 +100,7 @@ angular
vm.originWallet = profileService.getWallet(originWalletId); vm.originWallet = profileService.getWallet(originWalletId);
vm.origin.currency = vm.originWallet.coin.toUpperCase(); vm.origin.currency = vm.originWallet.coin.toUpperCase();
coin = vm.originWallet.coin; coin = vm.originWallet.coin;
if (sendFlowData.thirdParty) { if (sendFlowData.thirdParty) {
vm.thirdParty = sendFlowData.thirdParty; vm.thirdParty = sendFlowData.thirdParty;
switch (vm.thirdParty.id) { switch (vm.thirdParty.id) {
@ -398,12 +398,12 @@ angular
var balanceCryptoAmount = ''; var balanceCryptoAmount = '';
var balanceCryptoCurrencyCode = ''; var balanceCryptoCurrencyCode = '';
var balanceFiatAmount = ''; var balanceFiatAmount = '';
var balanceFiatCurrency = '' var balanceFiatCurrency = '';
var displayAmount = ''; var displayAmount = '';
var displayCurrency = ''; var displayCurrency = '';
var walletStatus = null; var walletStatus = null;
if (wallet.status.isValid) { if (wallet.status && wallet.status.isValid) {
walletStatus = wallet.status; walletStatus = wallet.status;
} else if (wallet.cachedStatus.isValid) { } else if (wallet.cachedStatus.isValid) {
walletStatus = wallet.cachedStatus; walletStatus = wallet.cachedStatus;