From 794f6a01df737a5d71e30db378638bbf6c4f9e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 12 Dec 2016 14:18:49 -0300 Subject: [PATCH] receive money from glidera in any wallet --- src/js/controllers/amount.js | 12 +++++++----- src/js/controllers/confirm.js | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 51a42904d..7a60db095 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -36,12 +36,14 @@ angular.module('copayApp.controllers').controller('amountController', function($ throw ('bad params'); } - glideraService.getLimits($scope.glideraAccessToken, function(err, limits) { - $scope.limits = limits; - $timeout(function() { - $scope.$apply(); + if ($scope.isGlidera) { + glideraService.getLimits($scope.glideraAccessToken, function(err, limits) { + $scope.limits = limits; + $timeout(function() { + $scope.$apply(); + }); }); - }); + } var reNr = /^[1234567890\.]$/; var reOp = /^[\*\+\-\/]$/; diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 9fe8355f9..91437f4fa 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -70,6 +70,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( return; } + if ($scope.isGlidera == 'buy') { + initConfirm(); + return; + } + var filteredWallets = []; var index = 0; var enoughFunds = false;