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

Merge pull request #130 from Bitcoin-com/wallet/task/339

Browse source 
Improvement - 339 - "Payment received" screen is skipped after first transaction
This commit is contained in:
Sam Cheng Hung 2018-05-22 10:40:04 +08:00 • committed by GitHub
commit 68a6e04224
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -54,7 +54,7 @@
</div>
</div>
<!-- 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="hidePaymentScreen()">
<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"/>
<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 "/>