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

Merge pull request #162 from cmgustavo/ref/design-42

Browse source 
Fix transitions for address book and delete wallet
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-22 16:56:41 -03:00 • committed by GitHub
commit 337ab55f10
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/tabs.html
View file

@ -25,7 +25,7 @@ navigation history that also transitions its views in and out.
<ion-nav-view name="tab-send"></ion-nav-view> <ion-nav-view name="tab-send"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="Settings" icon-off="ico-settings" icon-on="ico-settings-selected" href="#/tabs/settings"> <ion-tab title="Settings" icon-off="ico-settings" icon-on="ico-settings-selected" ui-sref="tabs.settings">
<ion-nav-view name="tab-settings"></ion-nav-view> <ion-nav-view name="tab-settings"></ion-nav-view>
</ion-tab> </ion-tab>
</ion-tabs> </ion-tabs>

2
src/js/controllers/addressbookView.js
View file

@ -26,7 +26,7 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f
}); });
$scope.sendTo = function() { $scope.sendTo = function() {
$ionicHistory.clearHistory(); $ionicHistory.removeBackView();
$state.go('tabs.send'); $state.go('tabs.send');
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.send.amount', { $state.transitionTo('tabs.send.amount', {

2
src/js/controllers/preferencesDelete.js
View file

@ -21,7 +21,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
if (err) { if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err.message || err); popupService.showAlert(gettextCatalog.getString('Error'), err.message || err);
} else { } else {
$ionicHistory.clearHistory(); $ionicHistory.removeBackView();
$state.go('tabs.home'); $state.go('tabs.home');
} }
}); });

9
src/js/services/incomingData.js
View file

@ -26,6 +26,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
// data extensions for Payment Protocol with non-backwards-compatible request // data extensions for Payment Protocol with non-backwards-compatible request
if ((/^bitcoin:\?r=[\w+]/).exec(data)) { if ((/^bitcoin:\?r=[\w+]/).exec(data)) {
data = decodeURIComponent(data.replace('bitcoin:?r=', '')); data = decodeURIComponent(data.replace('bitcoin:?r=', ''));
$ionicHistory.removeBackView();
$state.go('tabs.send'); $state.go('tabs.send');
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.send.confirm', {paypro: data}); $state.transitionTo('tabs.send.confirm', {paypro: data});
@ -45,6 +46,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
var amount = parsed.amount ? parsed.amount : ''; var amount = parsed.amount ? parsed.amount : '';
$ionicHistory.removeBackView();
$state.go('tabs.send'); $state.go('tabs.send');
$timeout(function() { $timeout(function() {
if (parsed.r) { if (parsed.r) {
@ -60,7 +62,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
return true; return true;
// Plain URL // Plain URL
} else if (/^https?:\/\//.test(data)) { } else if (/^https?:\/\//.test(data)) {
$ionicHistory.removeBackView();
$state.go('tabs.send'); $state.go('tabs.send');
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.send.confirm', {paypro: data}); $state.transitionTo('tabs.send.confirm', {paypro: data});
@ -69,12 +72,14 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
// Plain Address // Plain Address
} else if (bitcore.Address.isValid(data, 'livenet')) { } else if (bitcore.Address.isValid(data, 'livenet')) {
$ionicHistory.removeBackView();
$state.go('tabs.send'); $state.go('tabs.send');
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.send.amount', {toAddress: data}); $state.transitionTo('tabs.send.amount', {toAddress: data});
}, 100); }, 100);
return true; return true;
} else if (bitcore.Address.isValid(data, 'testnet')) { } else if (bitcore.Address.isValid(data, 'testnet')) {
$ionicHistory.removeBackView();
$state.go('tabs.send'); $state.go('tabs.send');
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.send.amount', {toAddress: data}); $state.transitionTo('tabs.send.amount', {toAddress: data});
@ -89,6 +94,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
// Join // Join
} else if (data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { } else if (data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
$ionicHistory.removeBackView();
$state.go('tabs.home'); $state.go('tabs.home');
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.add.join', {url: data}); $state.transitionTo('tabs.add.join', {url: data});
@ -97,6 +103,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
// Old join // Old join
} else if (data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { } else if (data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
$ionicHistory.removeBackView();
$state.go('tabs.home'); $state.go('tabs.home');
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.add.join', {url: data}); $state.transitionTo('tabs.add.join', {url: data});