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

Improvement - 339 - "Payment received" screen is skipped after first transaction

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-05-21 17:37:21 +02:00 • committed by Sebastiaan Pasma
commit 56a59093ee
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/tab-receive.js
View file

@ -126,7 +126,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
} }
} }
$scope.paymentReceivedCoin = $scope.wallet.coin; $scope.paymentReceivedCoin = $scope.wallet.coin;
$scope.showingPaymentReceived = true $scope.showingPaymentReceived = true;
$scope.$apply(); $scope.$apply();
} }
} }
@ -248,6 +248,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.setAddress(); $scope.setAddress();
}; };
$scope.togglePaymentScreen = function() {
$scope.showingPaymentReceived = !$scope.showingPaymentReceived;
};
$scope.showWalletSelector = function() { $scope.showWalletSelector = function() {
if ($scope.singleWallet) return; if ($scope.singleWallet) return;
$scope.walletSelectorTitle = gettextCatalog.getString('Select a wallet'); $scope.walletSelectorTitle = gettextCatalog.getString('Select a wallet');

2
www/views/tab-receive.html
View file

@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<!-- animation for payment received --> <!-- animation for payment received -->
<div class="payment-received-container" ng-show="showingPaymentReceived" ng-click="showingPaymentReceived = false"> <div class="payment-received-container" ng-show="showingPaymentReceived" ng-click="togglePaymentScreen()">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2"> <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
<circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/> <circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
<polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/> <polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>