diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 7ddc0119a..5fb0b3ca2 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -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, diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 83d375def..98a512fe0 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -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; + } + } } diff --git a/www/views/confirm.html b/www/views/confirm.html index 433f8944c..3d8172fa6 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -19,9 +19,17 @@
{{displayAmount || '...'}} {{displayUnit}}
{{alternativeAmountStr || '...'}}
-
-
- Buy {{buyPrice.subtotal|currency:'':2}} {{buyPrice.currency}} in Bitcoin at {{buyPrice.price}} {{buyPrice.currency}}/BTC +
+
+
+ Buy {{buyPrice.subtotal|currency:'':2}} {{buyPrice.currency}} in Bitcoin at {{buyPrice.price}} {{buyPrice.currency}}/BTC +
+
+ Fiat will be immediately withdrawn from your bank account +
+
+ Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time your recive a payment +
@@ -66,7 +74,7 @@
- + Add Memo {{description}} @@ -106,6 +114,10 @@ slide-success-hide-on-confirm="true"> Payment Sent Proposal Created +
+ A transfer has been initiated from your bank account + Your bitcoins should arrive to your wallet in 2-4 business day +