diff --git a/app-template/package.json b/app-template/package.json index 875eecb93..64474379a 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 @@ -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/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..f353072c2 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 && npm i fs-extra && cd app-template && node apply.js", "postinstall": "npm run build", "build": "grunt", "start": "node app.js", 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> -
+
- - -
  • -
    - * 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/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/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/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/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/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/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 +

    -
    - -