finishing buy flow
This commit is contained in:
parent
090b05984b
commit
f60ee6f4fd
3 changed files with 50 additions and 9 deletions
|
|
@ -448,7 +448,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||
return;
|
||||
}
|
||||
$scope.success = data;
|
||||
$scope.sendStatus = 'success';
|
||||
$timeout(function() {
|
||||
$scope.$digest();
|
||||
});
|
||||
|
|
@ -536,6 +536,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName;
|
||||
var fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false;
|
||||
var fromAmazon = previousView.match(/tabs.giftcards.amazon/) ? true : false;
|
||||
var fromGlidera = previousView.match(/tabs.buyandsell.glidera/) ? true : false;
|
||||
|
||||
$ionicHistory.nextViewOptions({
|
||||
disableAnimate: true
|
||||
|
|
@ -560,6 +561,15 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
cardClaimCode: $scope.amazonGiftCard ? $scope.amazonGiftCard.claimCode : null
|
||||
});
|
||||
});
|
||||
} else if (fromGlidera) {
|
||||
$ionicHistory.nextViewOptions({
|
||||
disableAnimate: true,
|
||||
historyRoot: true
|
||||
});
|
||||
$ionicHistory.clearHistory();
|
||||
$state.go('tabs.home').then(function() {
|
||||
$state.transitionTo('tabs.buyandsell.glidera');
|
||||
});
|
||||
} else {
|
||||
$ionicHistory.nextViewOptions({
|
||||
disableAnimate: true,
|
||||
|
|
|
|||
|
|
@ -47,10 +47,21 @@
|
|||
color: #9B9B9B;
|
||||
}
|
||||
}
|
||||
.buy-price {
|
||||
bottom: 20px;
|
||||
position: absolute;
|
||||
color: $light-gray;
|
||||
.glidera-explanation {
|
||||
padding: 0 1rem;
|
||||
margin: 1rem 0;
|
||||
white-space: normal;
|
||||
}
|
||||
.glidera-description {
|
||||
text-align: center;
|
||||
font-size: 15px;
|
||||
color: $mid-gray;
|
||||
margin: 1rem 0;
|
||||
a {
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
cursor: hand;
|
||||
}
|
||||
}
|
||||
}
|
||||
.item {
|
||||
|
|
@ -250,4 +261,12 @@
|
|||
color: rgba(58, 58, 58, .6);
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.glidera-success {
|
||||
margin-top: 15px;
|
||||
span {
|
||||
font-size: 15px;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue