From 5e03f803de44ce1b2308c368bbc4867f04f6aaa9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 6 Sep 2016 15:14:07 -0300 Subject: [PATCH 01/12] Fix bitpay card. Replaces the app-name in desktop --- app-template/package.json | 4 +- public/views/bitpayCard.html | 85 +++++++++++---------- public/views/modals/tx-status.html | 8 +- public/views/preferencesBitpayCard.html | 4 +- src/js/controllers/bitpayCard.js | 3 +- src/js/controllers/preferencesBitpayCard.js | 21 +++-- src/sass/main.scss | 1 + src/sass/views/bitpayCard.scss | 16 ++++ src/sass/views/walletDetails.scss | 1 + 9 files changed, 84 insertions(+), 59 deletions(-) create mode 100644 src/sass/views/bitpayCard.scss 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; } From 42a8eaa1199e1302055da4af0f6905a4ea6cadf2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 7 Sep 2016 10:49:47 -0300 Subject: [PATCH 02/12] Fix button to skip onboarding-email --- public/views/onboarding/collectEmail.html | 8 +++----- src/sass/views/onboarding/onboard-collect-email.scss | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html index 5145b53e7..7505add47 100644 --- a/public/views/onboarding/collectEmail.html +++ b/public/views/onboarding/collectEmail.html @@ -16,11 +16,9 @@ -
- -
+
diff --git a/src/sass/views/onboarding/onboard-collect-email.scss b/src/sass/views/onboarding/onboard-collect-email.scss index ea71241ee..41edf34bf 100644 --- a/src/sass/views/onboarding/onboard-collect-email.scss +++ b/src/sass/views/onboarding/onboard-collect-email.scss @@ -14,14 +14,14 @@ opacity: 1; background: #fff; color: rgb(108, 108, 108); - height: 13rem; + height: 14rem; animation-name: topBottom; animation-iteration-count: 1; animation-timing-function: ease-in; animation-duration: 1s; animation-delay: 2s; position: absolute; - bottom: -13rem; + bottom: -14rem; animation-fill-mode: forwards; z-index: 5; margin-top: 0; From dd9e48df1497bb384256e37bf10a87ac872d882c Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 7 Sep 2016 12:23:09 -0300 Subject: [PATCH 03/12] complete export process --- public/views/export.html | 29 ++-- public/views/preferencesAdvanced.html | 2 +- public/views/tab-export-file.html | 189 ++++++++++++-------------- public/views/tab-export-qrCode.html | 33 ++--- src/js/controllers/export.js | 53 +++++--- src/js/routes.js | 19 --- 6 files changed, 150 insertions(+), 175 deletions(-) diff --git a/public/views/export.html b/public/views/export.html index 563513f03..0d17c0124 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -1,13 +1,22 @@ - - + + + {{'Export wallet' | translate}} + + + + - - - + +
+
+ File/Text +
+
+ QR Code +
+
- - - - - +
+
+ diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index e2a87c140..e63d6eb8c 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -17,7 +17,7 @@ Sweep paper wallet - + Export Wallet diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html index 6e64f2fce..70fc041c4 100644 --- a/public/views/tab-export-file.html +++ b/public/views/tab-export-file.html @@ -1,104 +1,93 @@ - - - {{'Export Wallet' | translate}} - - - - +
+
+ + Failed to export +
- +
+
+ -
-
- - Failed to export -
- - - - - - - - Show advanced options - Hide advanced options - - - - Do not include private key - - -
- - - - WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. - - -
- -
- - - - WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. - - -
- - - - -
-

Export options

- - -
+
+ -
-
-

Wallet Export

-
- -
-
- - Copy this text as it is to a safe place (notepad or email) -
-
-
- - + + Show advanced options + Hide advanced options + + +
+ + Do not include private key + +
+ +
+ + + + WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. + + +
+ +
+ + + + WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. + + +
+ + + + + +
+

Export options

+ + +
+
+ +
+ +
+ +

Copy this text as it is to a safe place (notepad or email)

+
+
\ No newline at end of file diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html index b6254e42d..18ca08122 100644 --- a/public/views/tab-export-qrCode.html +++ b/public/views/tab-export-qrCode.html @@ -1,25 +1,10 @@ - - - {{'Export Wallet' | translate}} - - - - +
+
+ +
+
From the destination device, go to Add wallet > Import wallet and scan this QR code
+
- - -
-
- -
-
From the destination device, go to Add wallet > Import wallet and scan this QR code
-
- -
-
Exporting via QR not supported for this wallet
-
- - - +
+
Exporting via QR not supported for this wallet
+
diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index 1e4d78e47..c68443750 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -5,16 +5,14 @@ angular.module('copayApp.controllers').controller('exportController', var prevState; var isWP = platformInfo.isWP; var isAndroid = platformInfo.isAndroid; - var wallet = profileService.getWallet($stateParams.walletId); - $scope.isEncrypted = wallet.isPrivKeyEncrypted(); - $scope.isCordova = platformInfo.isCordova; - $scope.isSafari = platformInfo.isSafari; $scope.init = function() { - $scope.supported = true; - $scope.exportQR = false; - $scope.noSignEnabled = false; + $scope.formData = {}; + $scope.isEncrypted = wallet.isPrivKeyEncrypted(); + $scope.isCordova = platformInfo.isCordova; + $scope.isSafari = platformInfo.isSafari; + $scope.formData.noSignEnabled = false; $scope.showAdvanced = false; $scope.wallet = wallet; $scope.canSign = wallet.canSign(); @@ -22,13 +20,15 @@ angular.module('copayApp.controllers').controller('exportController', walletService.getEncodedWalletInfo(wallet, function(err, code) { if (err || !code) { $log.warn(err); - return $state.go('wallet.preferencesAdvanced') + return $ionicHistory.goBack(); } if (!code) - $scope.supported = false; - else - $scope.exportWalletInfo = code; + $scope.formData.supported = false; + else { + $scope.formData.supported = true; + $scope.formData.exportWalletInfo = code; + } $timeout(function() { $scope.$apply(); @@ -38,14 +38,25 @@ angular.module('copayApp.controllers').controller('exportController', /* EXPORT WITHOUT PRIVATE KEY - PENDING + */ $scope.noSignEnabledChange = function() { - $scope.exportWalletInfo = encodeWalletInfo(); - $timeout(function() { - $scope.$apply(); - }, 1); + if (!$scope.supported) return; + + walletService.getEncodedWalletInfo(wallet, function(err, code) { + if (err) { + $log.error(err); + $scope.formData.supported = false; + $scope.formData.exportWalletInfo = null; + } else { + $scope.formData.supported = true; + $scope.formData.exportWalletInfo = code; + } + $timeout(function() { + $scope.$apply(); + }, 1); + }); }; - */ $scope.downloadWalletBackup = function() { $scope.getAddressbook(function(err, localAddressBook) { @@ -54,11 +65,11 @@ angular.module('copayApp.controllers').controller('exportController', return; } var opts = { - noSign: $scope.noSignEnabled, + noSign: $scope.formData.noSignEnabled, addressBook: localAddressBook }; - backupService.walletDownload($scope.password, opts, function(err) { + backupService.walletDownload($scope.formData.password, opts, function(err) { if (err) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); return; @@ -91,11 +102,11 @@ angular.module('copayApp.controllers').controller('exportController', return cb(null); } var opts = { - noSign: $scope.noSignEnabled, + noSign: $scope.formData.noSignEnabled, addressBook: localAddressBook }; - var ew = backupService.walletExport($scope.password, opts); + var ew = backupService.walletExport($scope.formData.password, opts); if (!ew) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); } @@ -132,7 +143,7 @@ angular.module('copayApp.controllers').controller('exportController', var ew = backup; if (!ew) return; - if ($scope.noSignEnabled) + if ($scope.formData.noSignEnabled) name = name + '(No Private Key)'; var subject = 'Copay Wallet Backup: ' + name; diff --git a/src/js/routes.js b/src/js/routes.js index 1b8f754d0..70a2041e6 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -459,7 +459,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.preferences.export', { - abstract: true, url: '/export', views: { 'preferences': { @@ -467,24 +466,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - .state('tabs.preferences.export.file', { - url: '/tab-export-file', - needProfile: true, - views: { - 'tab-export-file': { - templateUrl: 'views/tab-export-file.html', - }, - } - }) - .state('tabs.preferences.export.qrCode', { - url: '/tab-export-qrCode', - needProfile: true, - views: { - 'tab-export-qrCode': { - templateUrl: 'views/tab-export-qrCode.html', - }, - } - }) .state('tabs.preferences.preferencesBwsUrl', { url: '/preferencesBwsUrl', views: { From 419c1e617bb5a37d89e17ac6c14c98121f77646e Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 7 Sep 2016 12:27:28 -0300 Subject: [PATCH 04/12] clean --- src/js/controllers/export.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index c68443750..5dd718955 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -1,10 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('exportController', - function($rootScope, $scope, $timeout, $log, $ionicHistory, lodash, backupService, walletService, storageService, profileService, platformInfo, gettext, gettextCatalog, $state, $stateParams, popupService) { - var prevState; - var isWP = platformInfo.isWP; - var isAndroid = platformInfo.isAndroid; + function($scope, $timeout, $log, $ionicHistory, backupService, walletService, storageService, profileService, platformInfo, gettextCatalog, $state, $stateParams, popupService) { var wallet = profileService.getWallet($stateParams.walletId); $scope.init = function() { @@ -41,7 +38,7 @@ angular.module('copayApp.controllers').controller('exportController', */ $scope.noSignEnabledChange = function() { - if (!$scope.supported) return; + if (!$scope.formData.supported) return; walletService.getEncodedWalletInfo(wallet, function(err, code) { if (err) { From 040b2e6627c7af1d2b4d2c88c4557852c9c2ba6c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 7 Sep 2016 13:34:47 -0300 Subject: [PATCH 05/12] Fix modals tx, txp and search --- public/views/modals/search.html | 70 +++---- public/views/modals/tx-details.html | 288 +++++++++++++-------------- public/views/modals/txp-details.html | 174 +++++++--------- public/views/tab-settings.html | 3 +- public/views/walletDetails.html | 102 +++++----- src/sass/common.scss | 4 + src/sass/main.scss | 2 +- src/sass/views/walletDetails.scss | 12 +- 8 files changed, 309 insertions(+), 346 deletions(-) diff --git a/public/views/modals/search.html b/public/views/modals/search.html index 0f9bd863a..497061603 100644 --- a/public/views/modals/search.html +++ b/public/views/modals/search.html @@ -1,11 +1,11 @@ - -
- - Close - + + +
+ Search Transactions
-

Search Transactions

 @@ -18,14 +18,33 @@
-
-
- sync - sync - sync -
+
-
+ + + + + - + + (possible double spend) + + + {{btx.amountStr}} + + +

+ + + Unconfirmed + +

+ + + sync + sync + sync + +

{{btx.note.body}}

@@ -49,31 +68,8 @@
Invalid -

+ -
- - + - - - - (possible double spend) - - - {{btx.amountStr}} - - -

- - - Unconfirmed - -

-
- -
- -
{{filteredTxHistory.length - txHistorySearchResults.length}} more diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 48a92f8c6..3052c391d 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -1,163 +1,159 @@ - -
- - Close - + + +
+ Transaction
-

Transaction

 - -
-
-
-
- sync -

Received

-
-
- sync -

Sent

-
-
- sync -

Moved

-
- -
- {{btx.amountStr}} -
-
- - {{alternativeAmountStr}} - - - {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) - -
+ +
+
+
+ sync +

Received

-
- - +
+ sync +

Sent

+
+
+ sync +

Moved

+
+ +
+ {{btx.amountStr}} +
+
+ + {{alternativeAmountStr}} + + + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) +
+
+ - +
+
-

Details

- -
    -
  • - To - - - {{btx.merchant.domain}} - {{btx.merchant.domain}} - - - {{btx.labelTo}} - - +
      +
      Details
      +
    • + To + + + {{btx.merchant.domain}} + {{btx.merchant.domain}} -
      • - -
    • - Recipients - {{btx.recipientCount}} - - + + {{btx.labelTo}} + -
      • + + -
      -
      +
    • + Recipients + {{btx.recipientCount}} + + + +
      • -
    • - - This transaction has become invalid; possibly due to a double spend attempt. - -
      • - -
    • - Date - - - - -
      • - -
    • - Fee - {{btx.feeStr}} -
      • - -
    • - Description - {{btx.message}} -
      • - -
    • - Merchant message - - {{btx.merchant.pr.pd.memo}} - -
      • - -
    • - Confirmations - - - Unconfirmed - - - {{btx.confirmations}} - - - {{btx.safeConfirmed}} - - -
      • - -
    • - Comment - {{btx.note.body}}
      - - Edited by {{btx.note.editedByName}}, - - -
      • -
    - -
    -

    Participants

    -
      -
    • - - - - - - {{c.copayerName}} ({{'Me'|translate}}) -
      • -
    +
    -
    -
    - - -
    +
  • + + This transaction has become invalid; possibly due to a double spend attempt. + +
    • + +
  • + Date + + + + +
    • + +
  • + Fee + {{btx.feeStr}} +
    • + +
  • + Description + {{btx.message}} +
    • + +
  • + Merchant message + + {{btx.merchant.pr.pd.memo}} + +
    • + +
  • + Confirmations + + + Unconfirmed + + + {{btx.confirmations}} + + + {{btx.safeConfirmed}} + + +
    • + +
  • + Comment + {{btx.note.body}}
    + + Edited by {{btx.note.editedByName}}, + + +
    • +
+ +
+
Participants
+
+ + + + + {{c.copayerName}} ({{'Me'|translate}}) +
+
+ +
+
+ +
+
+
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index af12277a0..c04b0a380 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -1,118 +1,102 @@ - -
- - Close - + + +
+ Payment Proposal
-

Payment Proposal

 - -
-
    -
  • +
    {{tx.amountStr}}
    {{tx.alternativeAmountStr}}
    - + - Multiple recipients
    -
    • -
  • -
    -
    - The payment was removed by creator -
    +
    +
    + The payment was removed by creator
    -
    • -
  • +
-
- - + +
+ + +
+
+
Payment accepted, but not yet broadcasted
+ +
- - -
  • - -
    -
    -
    Payment accepted, but not yet broadcasted
    - - -
    -
    -
    Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.
    -
    -
    Payment Sent
    -
    Payment Rejected
    +
    +
    Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.
    -
    • -
  • -

    Details

    +
    Payment Sent
    +
    Payment Rejected
    +
    • -
      -
    • +
        +
        Details
        +
      • Description {{tx.message}}
        • -
      • +
      • Recipients {{tx.recipientCount}} - - + +
        • -
        -
      • +
      • Fee {{tx.feeStr}}
        • -
      • +
      • Time
        • -
      • +
      • Created by {{tx.creatorName}}
        • -
      -
      - Warning: this transaction has unconfirmed inputs -
      -
      • -
    • +
      + Warning: this transaction has unconfirmed inputs +
      -
      -

      Payment details

      -
        -
      • +
        +
        Payment details
        +
      • To @@ -122,56 +106,48 @@
        • -
      • +
      • Expired
        • -
      • +
      • Expires
        • -
      • +
      • Merchant Message {{tx.paypro.pr.pd.memo}}
        • -
      -
      +
    - -
  • -

    -
    - {{tx.requiredSignatures}}/{{tx.walletN}} +
    +
    +
    + {{tx.requiredSignatures}}/{{tx.walletN}} +
    + Participants
    - Participants -

    -
      -
    • - - - - +
    • + + + {{ac.copayerName}} ({{'Me'|translate}})
      • -
    -
    • - - -
  • -
    - * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
    - -
    • - + +
    +
    + * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created. +
    +
    diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index f7d2942a1..92276b712 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -6,10 +6,9 @@
    - + Address Book -
    Preferences
    diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index 0bef1c79b..3bd314da6 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -84,29 +84,23 @@
    -
    -

    Payment Proposals

    -

    Unsent transactions

    -
    -
      -
    • - -
      • -
    - -
    - Total Locked Balance: - {{lockedBalanceStr}} - {{lockedBalanceAlternative}} {{alternativeIsoCode}} -
    +
    +
    + Payment Proposals + Unsent transactions +
    +
    + +
    +
    + Total Locked Balance: + {{status.lockedBalanceStr}} + {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}}
    -

    - Activity -

    -
    -
    -
    - sync - sync - sync -
    - -
    -
    - -

    {{btx.note.body}}

    -

    Received

    -     -
    - -
    - -

    {{btx.message}}

    -

    {{btx.note.body}}

    -

    {{wallet.addressbook[btx.addressTo]}}

    -

    Sent

    -     -
    - -
    - -

    {{btx.note.body}}

    -

    Moved

    -     -
    - Invalid -
    - -
    +
    +
    + + - @@ -191,11 +153,37 @@ Unconfirmed

    -
    + + sync + sync + sync + +

    +
    + +

    {{btx.note.body}}

    +

    Received

    +     +
    + +
    + +

    {{btx.message}}

    +

    {{btx.note.body}}

    +

    {{wallet.addressbook[btx.addressTo]}}

    +

    Sent

    +     +
    + +
    + +

    {{btx.note.body}}

    +

    Moved

    +     +
    + Invalid +

    -
    - -
    Date: Wed, 7 Sep 2016 13:54:24 -0300 Subject: [PATCH 06/12] add parameter to controller in termsjs --- src/js/controllers/onboarding/terms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/onboarding/terms.js b/src/js/controllers/onboarding/terms.js index ac9473933..5f6955e09 100644 --- a/src/js/controllers/onboarding/terms.js +++ b/src/js/controllers/onboarding/terms.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('termsController', function($scope, $log, $state, uxLanguage, profileService, externalLinkService) { +angular.module('copayApp.controllers').controller('termsController', function($scope, $log, $state, $window, uxLanguage, profileService, externalLinkService) { $scope.lang = uxLanguage.currentLanguage; $scope.disclaimerUrl = $window.appConfig.disclaimerUrl; From cb10f0612b500bd2de45d92255b19d06b577d9db Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 7 Sep 2016 15:09:19 -0300 Subject: [PATCH 07/12] New version --- chrome-app/manifest.json | 2 +- package.json | 8 ++++---- webkitbuilds/.desktop | 2 +- webkitbuilds/setup-win.iss | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json index d0240e0cc..957ccbaa1 100644 --- a/chrome-app/manifest.json +++ b/chrome-app/manifest.json @@ -5,7 +5,7 @@ "manifest_version": 2, "name": "BitPay", "description": "The BitPay Bitcoin Wallet", - "version": "0.8.0", + "version": "0.10.0", "permissions": [ "storage", "unlimitedStorage", diff --git a/package.json b/package.json index b4086fa2f..b77dda8b2 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "name": "bitpay", "description": "The BitPay Bitcoin Wallet", "author": "BitPay", - "version": "0.8.0", + "version": "0.10.0", "keywords": [ "wallet", "copay", @@ -16,14 +16,14 @@ ], "main": "public/index.html", "window": { - "title": "Copay - A multisignature bitcoin wallet", + "title": "BitPay - The BitPay Bitcoin Wallet", "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 @@ -88,7 +88,7 @@ "xcode": "^0.8.2" }, "scripts": { - "preinstall": "bower install && cd app-template && ./apply.js", + "preinstall": "bower install && cd app-template && node apply.js", "postinstall": "npm run build", "build": "grunt", "start": "node app.js", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 805d086bd..fda89fccb 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=0.8.0 +Version=0.10.0 Name=BitPay Comment=The BitPay Bitcoin Wallet Exec=bitpay diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index 3fe57e4b6..cdab1e334 100755 --- a/webkitbuilds/setup-win.iss +++ b/webkitbuilds/setup-win.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "bitpay" -#define MyAppVersion "0.8.0" +#define MyAppVersion "0.10.0" #define MyAppPublisher "BitPay" #define MyAppURL "https://bitpay.com" #define MyAppExeName "*NAMECASENOSPACE.exe" From afc898b386f60edd580ff985ca8df2e75d61f5b0 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 7 Sep 2016 15:11:26 -0300 Subject: [PATCH 08/12] fix notifications shown on recent activity view --- public/views/tab-home.html | 4 ++-- src/js/services/profileService.js | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/public/views/tab-home.html b/public/views/tab-home.html index a31f00002..d01eb6b2f 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -19,7 +19,7 @@
    -
    +
    Recent Activity @@ -28,7 +28,7 @@
    Updating activity. Please stand by
    -     +
    diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 4bd0612b0..e13af5c93 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -30,7 +30,7 @@ angular.module('copayApp.services') root.updateWalletSettings = function(wallet) { var defaults = configService.getDefaults(); - configService.whenAvailable(function(config){ + configService.whenAvailable(function(config) { wallet.usingCustomBWS = config.bwsFor && config.bwsFor[wallet.id] && (config.bwsFor[wallet.id] != defaults.bws.url); wallet.name = (config.aliasFor && config.aliasFor[wallet.id]) || wallet.credentials.walletName; wallet.color = (config.colorFor && config.colorFor[wallet.id]) || '#4A90E2'; @@ -77,7 +77,7 @@ angular.module('copayApp.services') var opts = opts || {}; var walletId = wallet.credentials.walletId; - if ((root.wallet[walletId] && root.wallet[walletId].started) && !opts.force) { + if ((root.wallet[walletId] && root.wallet[walletId].started) && !opts.force) { return false; } @@ -762,7 +762,7 @@ angular.module('copayApp.services') var TIME_STAMP = 60 * 60 * 24 * 7; var MAX = 100; - var ignored = { + var typeFilter1 = { 'NewBlock': 1, 'BalanceUpdated': 1, 'NewOutgoingTxByThirdParty': 1, @@ -771,6 +771,12 @@ angular.module('copayApp.services') 'TxProposalFinallyRejected': 1, }; + var typeFilter2 = { + 'TxProposalAcceptedBy': 1, + 'TxProposalRejectedBy': 1, + 'NewTxProposal': 1, + } + var w = root.getWallets(); if (lodash.isEmpty(w)) return cb(); @@ -868,9 +874,15 @@ angular.module('copayApp.services') $log.warn('Error updating notifications:' + err); } else { var n = lodash.filter(wallet.cachedActivity.n, function(x) { - return !ignored[x.type]; + return !typeFilter1[x.type]; }); + if (wallet.n == 1) { + var n = lodash.filter(n, function(x) { + return !typeFilter2[x.type]; + }); + } + var idToName = {}; if (wallet.cachedStatus) { lodash.each(wallet.cachedStatus.wallet.copayers, function(c) { @@ -911,7 +923,7 @@ angular.module('copayApp.services') txps = txps.concat(x.pendingTxps); }); txps = lodash.sortBy(txps, 'pendingForUs', 'createdOn'); - txps = lodash.compact(lodash.flatten(txps)).slice(0,MAX); + txps = lodash.compact(lodash.flatten(txps)).slice(0, MAX); var n = txps.length; return cb(null, txps, n); }; From 8e5a9232de98003d50c22622491dbdeedac7e691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 7 Sep 2016 15:34:48 -0300 Subject: [PATCH 09/12] add fs extra to package json --- app-template/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-template/package.json b/app-template/package.json index 8d9f6570d..64474379a 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -85,7 +85,7 @@ "xcode": "^0.8.2" }, "scripts": { - "preinstall": "bower install && cd app-template && node apply.js", + "preinstall": "bower install && npm i fs-extra && cd app-template && node apply.js", "postinstall": "npm run build", "build": "grunt", "start": "node app.js", diff --git a/package.json b/package.json index b77dda8b2..f353072c2 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "xcode": "^0.8.2" }, "scripts": { - "preinstall": "bower install && cd app-template && node apply.js", + "preinstall": "bower install && npm i fs-extra && cd app-template && node apply.js", "postinstall": "npm run build", "build": "grunt", "start": "node app.js", From 53cf7c32b097037e70ca2d0ccfcb3e35261a33fe Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 7 Sep 2016 15:35:14 -0300 Subject: [PATCH 10/12] fix cb --- src/js/controllers/walletDetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index fa6ea0d47..afa0e3223 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -144,7 +144,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.updateTxHistory = function(cb) { - + if (!cb) cb = function() {}; if ($scope.updatingTxHistory) return; $scope.updatingTxHistory = true; From c80ec7196c9cac9731d033662b7907ec3ba947fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 7 Sep 2016 16:48:16 -0300 Subject: [PATCH 11/12] fix notes on send tab --- src/js/controllers/confirm.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 4c701775c..58ca12906 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -17,6 +17,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.showDescriptionPopup = function() { + + $scope.data = { + comment: null + }; + var commentPopup = $ionicPopup.show({ templateUrl: "views/includes/note.html", title: gettextCatalog.getString('Set description'), @@ -25,9 +30,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.commentPopupClose = function() { commentPopup.close(); }; - $scope.commentPopupSave = function(description) { - $log.debug('Saving description: ' + description); - $scope.description = description; + $scope.commentPopupSave = function() { + $log.debug('Saving description: ' + $scope.data.comment); + $scope.description = $scope.data.comment; commentPopup.close(); }; }; From 12b2f065918ebc5c2b6a46a64d11f547267bed52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 7 Sep 2016 17:03:21 -0300 Subject: [PATCH 12/12] copy secret to clipboard --- public/views/copayers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/copayers.html b/public/views/copayers.html index aa5b8f626..6d905ba51 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -14,7 +14,7 @@

    Share this invitation with your copayers

    -
    +