Revert "Revert "Merge remote-tracking branch 'origin/instantpaymentverification'""
This reverts commit 453f77770d.
This commit is contained in:
Kadir Sekha
parent
453f77770d
commit
c4d40110b7
5 changed files with 219 additions and 1 deletions
|
|
@ -7,6 +7,7 @@
|
|||
<meta name="msapplication-tap-highlight" content="no">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
<link rel="stylesheet" type="text/css" href="css/main.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/payment-received.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/chartist.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/bitcoin.com.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/icomoon.css">
|
||||
|
|
|
|||
|
|
@ -5,10 +5,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
var listeners = [];
|
||||
$scope.bchAddressType = { type: 'cashaddr' };
|
||||
var bchAddresses = {};
|
||||
$scope.showingPaymentReceived = false;
|
||||
|
||||
$scope.isCordova = platformInfo.isCordova;
|
||||
$scope.isNW = platformInfo.isNW;
|
||||
|
||||
var currentAddressSocket = {};
|
||||
var paymentSubscriptionObj = { op:"addr_sub" }
|
||||
|
||||
$scope.requestSpecificAmount = function() {
|
||||
$state.go('tabs.paymentRequest.amount', {
|
||||
id: $scope.wallet.credentials.walletId,
|
||||
|
|
@ -28,11 +32,39 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
popupService.showAlert(err);
|
||||
}
|
||||
|
||||
//close existing socket
|
||||
if (currentAddressSocket.close === 'function') {
|
||||
currentAddressSocket.close();
|
||||
}
|
||||
|
||||
if ($scope.wallet.coin == 'bch') {
|
||||
bchAddresses = bitcoinCashJsService.translateAddresses(addr);
|
||||
$scope.addr = bchAddresses[$scope.bchAddressType.type];
|
||||
|
||||
// listen to bch address
|
||||
currentAddressSocket = new WebSocket("wss://ws.blockchain.info/bch/inv");
|
||||
paymentSubscriptionObj.addr = bchAddresses['legacy'];
|
||||
|
||||
} else {
|
||||
$scope.addr = addr;
|
||||
|
||||
// listen to btc address
|
||||
currentAddressSocket = new WebSocket("wss://ws.blockchain.info/inv");
|
||||
paymentSubscriptionObj.addr = $scope.addr
|
||||
}
|
||||
|
||||
// create subscription
|
||||
var msg = JSON.stringify(paymentSubscriptionObj);
|
||||
currentAddressSocket.onopen = function (event) {
|
||||
//console.log("message sent: " + msg);
|
||||
currentAddressSocket.send(msg);
|
||||
}
|
||||
|
||||
|
||||
// listen for response
|
||||
currentAddressSocket.onmessage = function (event) {
|
||||
//console.log("message received:" + event.data);
|
||||
receivedPayment(event.data);
|
||||
}
|
||||
|
||||
$timeout(function() {
|
||||
|
|
@ -41,6 +73,56 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
});
|
||||
};
|
||||
|
||||
var receivedPayment = function(data) {
|
||||
data = JSON.parse(data);
|
||||
//example payment data
|
||||
/*{
|
||||
"op": "utx",
|
||||
"x": {
|
||||
"lock_time": 0,
|
||||
"ver": 1,
|
||||
"size": 192,
|
||||
"inputs": [
|
||||
{
|
||||
"sequence": 4294967295,
|
||||
"prev_out": {
|
||||
"spent": true,
|
||||
"tx_index": 99005468,
|
||||
"type": 0,
|
||||
"addr": "1BwGf3z7n2fHk6NoVJNkV32qwyAYsMhkWf",
|
||||
"value": 65574000,
|
||||
"n": 0,
|
||||
"script": "76a91477f4c9ee75e449a74c21a4decfb50519cbc245b388ac"
|
||||
},
|
||||
"script": "483045022100e4ff962c292705f051c2c2fc519fa775a4d8955bce1a3e29884b2785277999ed02200b537ebd22a9f25fbbbcc9113c69c1389400703ef2017d80959ef0f1d685756c012102618e08e0c8fd4c5fe539184a30fe35a2f5fccf7ad62054cad29360d871f8187d"
|
||||
}
|
||||
],
|
||||
"time": 1440086763,
|
||||
"tx_index": 99006637,
|
||||
"vin_sz": 1,
|
||||
"hash": "0857b9de1884eec314ecf67c040a2657b8e083e1f95e31d0b5ba3d328841fc7f",
|
||||
"vout_sz": 1,
|
||||
"relayed_by": "127.0.0.1",
|
||||
"out": [
|
||||
{
|
||||
"spent": false,
|
||||
"tx_index": 99006637,
|
||||
"type": 0,
|
||||
"addr": "1A828tTnkVFJfSvLCqF42ohZ51ksS3jJgX",
|
||||
"value": 65564000,
|
||||
"n": 0,
|
||||
"script": "76a914640cfdf7b79d94d1c980133e3587bd6053f091f388ac"
|
||||
}
|
||||
]
|
||||
}
|
||||
}*/
|
||||
|
||||
if (data.op == "utx") {
|
||||
$scope.showingPaymentReceived = true
|
||||
$scope.$apply();
|
||||
}
|
||||
}
|
||||
|
||||
$scope.displayAddress = function(type) {
|
||||
$scope.bchAddressType.type = type;
|
||||
$scope.addr = bchAddresses[$scope.bchAddressType.type];
|
||||
|
|
|
|||
122
www/css/payment-received.css
Normal file
122
www/css/payment-received.css
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
/*
|
||||
CSS svg animation
|
||||
|
||||
Copyright (c) 2018 by Lee Porter (https://codepen.io/elevaunt/pen/JYRBzJ)
|
||||
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
svg {
|
||||
width: 100px;
|
||||
display: block;
|
||||
margin: 40px auto 0;
|
||||
}
|
||||
.path {
|
||||
stroke-dasharray: 1000;
|
||||
stroke-dashoffset: 0;
|
||||
}
|
||||
.path.circle {
|
||||
-webkit-animation: dash 0.9s ease-in-out;
|
||||
animation: dash 0.9s ease-in-out;
|
||||
}
|
||||
.path.line {
|
||||
stroke-dashoffset: 1000;
|
||||
-webkit-animation: dash 0.9s 0.35s ease-in-out forwards;
|
||||
animation: dash 0.9s 0.35s ease-in-out forwards;
|
||||
}
|
||||
.path.check {
|
||||
stroke-dashoffset: -100;
|
||||
-webkit-animation: dash-check 0.9s 0.35s ease-in-out forwards;
|
||||
animation: dash-check 0.9s 0.35s ease-in-out forwards;
|
||||
}
|
||||
p {
|
||||
text-align: center;
|
||||
margin: 20px 0 60px;
|
||||
font-size: 1.25em;
|
||||
}
|
||||
p.success {
|
||||
color: #27B03C;
|
||||
font-family:sans-serif;
|
||||
}
|
||||
|
||||
@-webkit-keyframes dash {
|
||||
0% {
|
||||
stroke-dashoffset: 1000;
|
||||
}
|
||||
100% {
|
||||
stroke-dashoffset: 0;
|
||||
}
|
||||
}
|
||||
@keyframes dash {
|
||||
0% {
|
||||
stroke-dashoffset: 1000;
|
||||
}
|
||||
100% {
|
||||
stroke-dashoffset: 0;
|
||||
}
|
||||
}
|
||||
@-webkit-keyframes dash-check {
|
||||
0% {
|
||||
stroke-dashoffset: -100;
|
||||
}
|
||||
100% {
|
||||
stroke-dashoffset: 900;
|
||||
}
|
||||
}
|
||||
@keyframes dash-check {
|
||||
0% {
|
||||
stroke-dashoffset: -100;
|
||||
}
|
||||
100% {
|
||||
stroke-dashoffset: 900;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*!
|
||||
* animate.css -http://daneden.me/animate
|
||||
* Version - 3.6.0
|
||||
* Licensed under the MIT license - http://opensource.org/licenses/MIT
|
||||
*
|
||||
* Copyright (c) 2018 Daniel Eden
|
||||
*/
|
||||
|
||||
.animated {
|
||||
animation-delay: 0.55s;
|
||||
-webkit-animation-duration: 0.5s;
|
||||
animation-duration: 0.5s;
|
||||
-webkit-animation-fill-mode: both;
|
||||
animation-fill-mode: both;
|
||||
}
|
||||
|
||||
|
||||
@-webkit-keyframes fadeIn {
|
||||
from {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
to {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes fadeIn {
|
||||
from {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
to {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.fadeIn {
|
||||
-webkit-animation-name: fadeIn;
|
||||
animation-name: fadeIn;
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
<meta name="msapplication-tap-highlight" content="no">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
<link rel="stylesheet" type="text/css" href="css/main.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/payment-received.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/chartist.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/bitcoin.com.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/icomoon.css">
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="address-info" ng-if="wallet && wallet.isComplete()">
|
||||
<div ng-show="!showingPaymentReceived">
|
||||
<div>
|
||||
<button ng-show="addr" class="button button-standard button-small" ng-click="requestSpecificAmount()">
|
||||
<span translate>Request Specific amount</span>
|
||||
|
|
@ -39,17 +40,28 @@
|
|||
<span translate>Show address</span>
|
||||
</button>
|
||||
</span>
|
||||
|
||||
<qrcode ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode>
|
||||
<div class="address-label">
|
||||
<span class="ellipsis">{{addr}}</span>
|
||||
<ion-spinner ng-show="!addr" class="spinner-dark" icon="crescent"></ion-spinner>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button ng-show="addr" class="button-address" ng-click="setAddress(true)">
|
||||
<span translate>Generate new address</span>
|
||||
</button><br/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- animation for payment received -->
|
||||
<div ng-show="showingPaymentReceived" ng-click="showingPaymentReceived = false">
|
||||
<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 "/>
|
||||
</svg>
|
||||
<p class="success animated fadeIn">Payment Received!<br> <br>Return To Address</p>
|
||||
</div>
|
||||
<!-- end of animation -->
|
||||
<div ng-show="addr && wallet.coin == 'bch'">
|
||||
<label class="item-input item-select">
|
||||
<div class="input-label" translate>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue