implement slide to pay

This commit is contained in:
Marty Alcala 2016-10-07 20:03:51 -04:00
commit 777c2efc32
22 changed files with 659 additions and 50 deletions

View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) {
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory) {
var cachedTxp = {};
var isChromeApp = platformInfo.isChromeApp;
@ -273,9 +273,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (err) return setSendError(err);
});
}
ongoingProcess.set('creatingTx', true);
ongoingProcess.set('creatingTx', true, onSendStatusChange);
createTx(wallet, false, function(err, txp) {
ongoingProcess.set('creatingTx', false);
ongoingProcess.set('creatingTx', false, onSendStatusChange);
if (err) return;
var config = configService.getSync();
@ -308,9 +309,29 @@ angular.module('copayApp.controllers').controller('confirmController', function(
});
};
function onSendStatusChange(processName, showName, isOn) {
if(processName === 'broadcastingTx' && !isOn) {
$scope.sendStatus = 'success';
$scope.$digest();
} else if(showName) {
$scope.sendStatus = showName;
}
}
$scope.onConfirm = function() {
$scope.approve(true);
};
$scope.onSuccessConfirm = function() {
$ionicHistory.nextViewOptions({
disableAnimate: true
});
$state.go('tabs.send');
};
function publishAndSign(wallet, txp) {
walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
});
};
}, onSendStatusChange);
}
});

View file

@ -44,10 +44,11 @@ angular.module('copayApp.controllers').controller('tourController',
};
ongoingProcess.set('creatingWallet', false);
var wallet = walletClient;
$state.go('onboarding.collectEmail', {
fromOnboarding: true,
walletId: wallet.credentials.walletId
});
// $state.go('onboarding.collectEmail', {
// fromOnboarding: true,
// walletId: wallet.credentials.walletId
// });
$state.go('tabs.home');
});
};