diff --git a/app-template/package.json b/app-template/package.json index 3e19f4248..bd5b5dac6 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -13,14 +13,14 @@ ], "main": "public/index.html", "window": { - "title": "Copay - A multisignature bitcoin wallet", + "title": "*NAMECASE* - *DESCRIPTION*", "icon": "./public/img/icons/icon-256.png", "toolbar": false, "show": true, "visible": true, "resizable": true, "frame": true, - "width": 800, + "width": 400, "height": 600, "position": "center", "fullscreen": false diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html index 758f2bd01..9e10307a7 100644 --- a/public/views/bitpayCard.html +++ b/public/views/bitpayCard.html @@ -1,13 +1,13 @@ - BitPay Card - @@ -93,8 +93,8 @@
-
-
+
+
${{bitpayCard.bitpayCardCurrentBalance}}
Available balance
@@ -110,7 +110,7 @@
- @@ -127,40 +127,41 @@
-
-
- -
- -
-
- {{tx.merchant.name}} -
-
- {{tx.merchant.city}}, {{tx.merchant.state}} -
-
+
- {{desc}} -
-
- - -
-
-
- {{tx.amount | currency:'$':2 }} + ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']" + class="item row" + ng-init="bitpayCard.getMerchantInfo(tx)"> +
+ +
+ +
+
+ {{tx.merchant.name}} +
+
+ {{tx.merchant.city}}, {{tx.merchant.state}} +
+
+
+ {{desc}} +
+
+ + +
+
+
+ {{tx.amount | currency:'$':2 }} +
+
-
@@ -171,7 +172,7 @@ ng-submit="bitpayCard.sendFunds()" novalidate> -
+
@@ -19,7 +19,7 @@ Payment Proposal Created
- OKAY + OKAY
@@ -31,7 +31,7 @@ Payment Accepted
- OKAY + OKAY
@@ -41,7 +41,7 @@ Payment Rejected
- OKAY + OKAY
diff --git a/public/views/preferencesBitpayCard.html b/public/views/preferencesBitpayCard.html index 99f31f893..c3dfe26c0 100644 --- a/public/views/preferencesBitpayCard.html +++ b/public/views/preferencesBitpayCard.html @@ -8,9 +8,9 @@ Preferences - +
    -
  • +
  • Log out
diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index d04118af0..fe199d85d 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, popupService) { +angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, popupService, gettextCatalog, bwcError) { var self = this; var wallet; @@ -168,6 +168,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }; walletService.createTx(wallet, txp, function(err, createdTxp) { + ongoingProcess.set('Processing Transaction...', false); if (err) { popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); return; diff --git a/src/js/controllers/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js index 991d91c74..8a297c8aa 100644 --- a/src/js/controllers/preferencesBitpayCard.js +++ b/src/js/controllers/preferencesBitpayCard.js @@ -1,15 +1,20 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesBitpayCardController', - function($scope, $ionicModal, bitpayCardService) { + function($scope, $state, $timeout, bitpayCardService, popupService) { - this.logout = function() { - $ionicModal.fromTemplateUrl('views/modals/bitpay-card-confirmation.html', { - scope: $scope, - animation: 'slide-in-up' - }).then(function(modal) { - $scope.bitpayCardConfirmationModal = modal; - $scope.bitpayCardConfirmationModal.show(); + $scope.logout = function() { + var title = 'Are you sure you would like to log out of your Bitpay Card account?'; + popupService.showConfirm(title, null, function(res) { + if (res) logout(); + }); + }; + + var logout = function() { + bitpayCardService.logout(function() { + $timeout(function() { + $state.go('bitpayCard.main'); + }, 100); }); }; diff --git a/src/sass/main.scss b/src/sass/main.scss index 0f218dd75..56ca04354 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -995,5 +995,6 @@ input[type=number] { @import "views/add"; @import "views/tab-home"; @import "views/walletDetails"; +@import "views/bitpayCard"; @import 'views/onboarding/onboarding'; @import "views/includes/walletActivity"; diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss new file mode 100644 index 000000000..4d431a4d4 --- /dev/null +++ b/src/sass/views/bitpayCard.scss @@ -0,0 +1,16 @@ +#bitpayCard { + .amount { + width: 100%; + text-align: center; + padding: 2rem 1rem 1.5rem 1rem; + min-height: 115px; + margin-bottom: 25px; + border-color: #172565; + background-color: #1e3186; + background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%); + color: #fff; + } + strong { + line-height: 100%; + } +} diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 633f076ee..dc2ac38eb 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -1,6 +1,7 @@ #walletDetails { .bar-header { border: 0; + background: none; .title, .button { color: #fff; }