diff --git a/app-template/index.html b/app-template/index.html index fc0a3db2b..2946d7928 100644 --- a/app-template/index.html +++ b/app-template/index.html @@ -7,7 +7,7 @@ - + diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 9b4969168..819192f75 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi var listeners = []; $scope.bchAddressType = { type: 'cashaddr' }; var bchAddresses = {}; - $scope.payment_recieved = false; + $scope.showingPaymentReceived = false; $scope.isCordova = platformInfo.isCordova; $scope.isNW = platformInfo.isNW; @@ -56,14 +56,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi // create subscription var msg = JSON.stringify(paymentSubscriptionObj); currentAddressSocket.onopen = function (event) { - console.log("message sent: " + msg); + //console.log("message sent: " + msg); currentAddressSocket.send(msg); } // listen for response currentAddressSocket.onmessage = function (event) { - console.log("message received:" + event.data); + //console.log("message received:" + event.data); receivedPayment(event.data); } @@ -118,7 +118,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }*/ if (data.op == "utx") { - $scope.payment_recieved = true + $scope.showingPaymentReceived = true $scope.$apply(); } } diff --git a/www/css/payment-received.css b/www/css/payment-received.css new file mode 100644 index 000000000..da7365c93 --- /dev/null +++ b/www/css/payment-received.css @@ -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; +} \ No newline at end of file diff --git a/www/index.html b/www/index.html index c0a6ac27f..76827f685 100644 --- a/www/index.html +++ b/www/index.html @@ -7,7 +7,7 @@ - + diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 4dd0979e1..bffde00a9 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -28,7 +28,7 @@
-
+
- -
+ +
-

Payment Received!
Click To See Address Again

+

Payment Received!

Return To Address