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

Merge pull request #249 from Bitcoin-com/wallet/task/514

Browse source 
Wallet/task/514
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-08 22:34:44 +09:00 • committed by GitHub
commit 73b18b16b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/shapeshift.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $state, $interval, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) { angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $state, $timeout, $ionicHistory, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) {
var walletsBtc = []; var walletsBtc = [];
var walletsBch = []; var walletsBch = [];
@ -66,8 +66,14 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
var params = { var params = {
thirdParty: JSON.stringify({id: 'shapeshift'}) thirdParty: JSON.stringify({id: 'shapeshift'})
}; };
$state.go('tabs.home').then(function() { $state.go('tabs.home').then(function() {
$state.transitionTo('tabs.send.origin', params); $ionicHistory.clearHistory();
$state.go('tabs.send').then(function() {
$timeout(function () {
$state.transitionTo('tabs.send.origin', params);
}, 60);
});
}); });
} }
}); });

2
www/views/review.html
View file

@ -1,4 +1,4 @@
<ion-view id="view-review" hide-tabs> <ion-view id="view-review" can-swipe-back="false" hide-tabs>
<ion-nav-bar class="bar-royal {{vm.origin.currency.toLowerCase()}}"> <ion-nav-bar class="bar-royal {{vm.origin.currency.toLowerCase()}}">
<ion-nav-title> <ion-nav-title>
{{'Review Transaction' | translate}} {{'Review Transaction' | translate}}

2
www/views/walletSelector.html
View file

@ -1,4 +1,4 @@
<ion-view id="wallet-origin-destination" show-tabs> <ion-view id="wallet-origin-destination" hide-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{sendFlowTitle}}</ion-nav-title> <ion-nav-title>{{sendFlowTitle}}</ion-nav-title>
<ion-nav-back-button ng-click="goBack()"></ion-nav-back-button> <ion-nav-back-button ng-click="goBack()"></ion-nav-back-button>