diff --git a/app-template/package.json b/app-template/package.json index 1b9235f8c..0d396c2af 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -42,7 +42,7 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { - "bitcore-wallet-client": "4.0.0", + "bitcore-wallet-client": "4.1.0", "coveralls": "^2.11.9", "express": "^4.11.2", "fs": "0.0.2", diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json index e6320e72a..5e013d96e 100644 --- a/chrome-app/manifest.json +++ b/chrome-app/manifest.json @@ -1,11 +1,11 @@ - { + { "//":"PLEASE! Do not edit this file directly", - "//":" Modify it at app-template/", + "//":" Modify it at app-template/", "manifest_version": 2, "name": "BitPay", "description": "The BitPay Bitcoin Wallet", - "version": "0.6.0", + "version": "0.7.0", "permissions": [ "storage", "unlimitedStorage", diff --git a/package.json b/package.json index 24776e4fc..c34d05ca9 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ - { + { "//":"PLEASE! Do not edit this file directly", - "//":" Modify it at app-template/", + "//":" Modify it at app-template/", "name": "bitpay", "description": "The BitPay Bitcoin Wallet", "author": "BitPay", - "version": "0.6.0", + "version": "0.7.0", "keywords": [ "wallet", "copay", @@ -45,7 +45,7 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { - "bitcore-wallet-client": "4.0.0", + "bitcore-wallet-client": "4.1.0", "coveralls": "^2.11.9", "express": "^4.11.2", "fs": "0.0.2", diff --git a/public/img/onboarding-success.svg b/public/img/onboarding-success.svg new file mode 100644 index 000000000..665a3fd01 --- /dev/null +++ b/public/img/onboarding-success.svg @@ -0,0 +1,18 @@ + + + + Group 3 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/onboarding-tour-control.svg b/public/img/onboarding-tour-control.svg new file mode 100644 index 000000000..68b1867e5 --- /dev/null +++ b/public/img/onboarding-tour-control.svg @@ -0,0 +1,43 @@ + + + + bg-3 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/onboarding-tour-currency-bg.svg b/public/img/onboarding-tour-currency-bg.svg new file mode 100644 index 000000000..169671aad --- /dev/null +++ b/public/img/onboarding-tour-currency-bg.svg @@ -0,0 +1,48 @@ + + + + bitcoin-currency + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 BTC = $650 + + + + + + + \ No newline at end of file diff --git a/public/img/onboarding-tour-phone.svg b/public/img/onboarding-tour-phone.svg new file mode 100644 index 000000000..095c78f0e --- /dev/null +++ b/public/img/onboarding-tour-phone.svg @@ -0,0 +1,167 @@ + + + + digital-money + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/onboarding-welcome-bg.png b/public/img/onboarding-welcome-bg.png new file mode 100644 index 000000000..64916e9d3 Binary files /dev/null and b/public/img/onboarding-welcome-bg.png differ diff --git a/public/img/onboarding-welcome-shopping24.png b/public/img/onboarding-welcome-shopping24.png new file mode 100644 index 000000000..1dab91a3d Binary files /dev/null and b/public/img/onboarding-welcome-shopping24.png differ diff --git a/public/roboto-font/Roboto-Black.woff b/public/roboto-font/Roboto-Black.woff new file mode 100644 index 000000000..be889ddc2 Binary files /dev/null and b/public/roboto-font/Roboto-Black.woff differ diff --git a/public/roboto-font/Roboto-Black.woff2 b/public/roboto-font/Roboto-Black.woff2 new file mode 100644 index 000000000..7569a5df4 Binary files /dev/null and b/public/roboto-font/Roboto-Black.woff2 differ diff --git a/public/roboto-font/Roboto-BlackItalic.woff b/public/roboto-font/Roboto-BlackItalic.woff new file mode 100644 index 000000000..7e9de98d6 Binary files /dev/null and b/public/roboto-font/Roboto-BlackItalic.woff differ diff --git a/public/roboto-font/Roboto-BlackItalic.woff2 b/public/roboto-font/Roboto-BlackItalic.woff2 new file mode 100644 index 000000000..34696138f Binary files /dev/null and b/public/roboto-font/Roboto-BlackItalic.woff2 differ diff --git a/public/roboto-font/Roboto-Bold.woff b/public/roboto-font/Roboto-Bold.woff new file mode 100644 index 000000000..3d86753b5 Binary files /dev/null and b/public/roboto-font/Roboto-Bold.woff differ diff --git a/public/roboto-font/Roboto-Bold.woff2 b/public/roboto-font/Roboto-Bold.woff2 new file mode 100644 index 000000000..bd05e2eac Binary files /dev/null and b/public/roboto-font/Roboto-Bold.woff2 differ diff --git a/public/roboto-font/Roboto-BoldItalic.woff b/public/roboto-font/Roboto-BoldItalic.woff new file mode 100644 index 000000000..bfe5843d0 Binary files /dev/null and b/public/roboto-font/Roboto-BoldItalic.woff differ diff --git a/public/roboto-font/Roboto-BoldItalic.woff2 b/public/roboto-font/Roboto-BoldItalic.woff2 new file mode 100644 index 000000000..ac381b7cb Binary files /dev/null and b/public/roboto-font/Roboto-BoldItalic.woff2 differ diff --git a/public/roboto-font/Roboto-Italic.woff b/public/roboto-font/Roboto-Italic.woff new file mode 100644 index 000000000..f386c07c2 Binary files /dev/null and b/public/roboto-font/Roboto-Italic.woff differ diff --git a/public/roboto-font/Roboto-Italic.woff2 b/public/roboto-font/Roboto-Italic.woff2 new file mode 100644 index 000000000..2f4d451bb Binary files /dev/null and b/public/roboto-font/Roboto-Italic.woff2 differ diff --git a/public/roboto-font/Roboto-Light.woff b/public/roboto-font/Roboto-Light.woff new file mode 100644 index 000000000..ec6bf5749 Binary files /dev/null and b/public/roboto-font/Roboto-Light.woff differ diff --git a/public/roboto-font/Roboto-Light.woff2 b/public/roboto-font/Roboto-Light.woff2 new file mode 100644 index 000000000..288201788 Binary files /dev/null and b/public/roboto-font/Roboto-Light.woff2 differ diff --git a/public/roboto-font/Roboto-LightItalic.woff b/public/roboto-font/Roboto-LightItalic.woff new file mode 100644 index 000000000..54d6bb1aa Binary files /dev/null and b/public/roboto-font/Roboto-LightItalic.woff differ diff --git a/public/roboto-font/Roboto-LightItalic.woff2 b/public/roboto-font/Roboto-LightItalic.woff2 new file mode 100644 index 000000000..b427fa5aa Binary files /dev/null and b/public/roboto-font/Roboto-LightItalic.woff2 differ diff --git a/public/roboto-font/Roboto-Medium.woff b/public/roboto-font/Roboto-Medium.woff new file mode 100644 index 000000000..d30a88ac8 Binary files /dev/null and b/public/roboto-font/Roboto-Medium.woff differ diff --git a/public/roboto-font/Roboto-Medium.woff2 b/public/roboto-font/Roboto-Medium.woff2 new file mode 100644 index 000000000..eeddd93ec Binary files /dev/null and b/public/roboto-font/Roboto-Medium.woff2 differ diff --git a/public/roboto-font/Roboto-MediumItalic.woff b/public/roboto-font/Roboto-MediumItalic.woff new file mode 100644 index 000000000..0c8cd6c18 Binary files /dev/null and b/public/roboto-font/Roboto-MediumItalic.woff differ diff --git a/public/roboto-font/Roboto-MediumItalic.woff2 b/public/roboto-font/Roboto-MediumItalic.woff2 new file mode 100644 index 000000000..e0b4d4858 Binary files /dev/null and b/public/roboto-font/Roboto-MediumItalic.woff2 differ diff --git a/public/roboto-font/Roboto-Regular.woff b/public/roboto-font/Roboto-Regular.woff new file mode 100644 index 000000000..464d20623 Binary files /dev/null and b/public/roboto-font/Roboto-Regular.woff differ diff --git a/public/roboto-font/Roboto-Regular.woff2 b/public/roboto-font/Roboto-Regular.woff2 new file mode 100644 index 000000000..f96619675 Binary files /dev/null and b/public/roboto-font/Roboto-Regular.woff2 differ diff --git a/public/roboto-font/Roboto-Thin.woff b/public/roboto-font/Roboto-Thin.woff new file mode 100644 index 000000000..09faa40d1 Binary files /dev/null and b/public/roboto-font/Roboto-Thin.woff differ diff --git a/public/roboto-font/Roboto-Thin.woff2 b/public/roboto-font/Roboto-Thin.woff2 new file mode 100644 index 000000000..bd28dbcd3 Binary files /dev/null and b/public/roboto-font/Roboto-Thin.woff2 differ diff --git a/public/roboto-font/Roboto-ThinItalic.woff b/public/roboto-font/Roboto-ThinItalic.woff new file mode 100644 index 000000000..3f58cbf54 Binary files /dev/null and b/public/roboto-font/Roboto-ThinItalic.woff differ diff --git a/public/roboto-font/Roboto-ThinItalic.woff2 b/public/roboto-font/Roboto-ThinItalic.woff2 new file mode 100644 index 000000000..12a1eef88 Binary files /dev/null and b/public/roboto-font/Roboto-ThinItalic.woff2 differ diff --git a/public/views/activity.html b/public/views/activity.html index 1002f3d43..cd14c773e 100644 --- a/public/views/activity.html +++ b/public/views/activity.html @@ -19,7 +19,7 @@
-
+
diff --git a/public/views/add.html b/public/views/add.html index fdcdf2481..b41d8bd08 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -2,7 +2,7 @@ {{'Add wallet' | translate}} - @@ -10,17 +10,17 @@ - +

Create new wallet

 - +

Join shared wallet

 - +

Import wallet

 diff --git a/public/views/backup.html b/public/views/backup.html index c4a41b2cf..f7dceb589 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,5 +1,5 @@ - + {{'Back' | translate}} diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html index d242adbc6..1717c430d 100644 --- a/public/views/bitpayCard.html +++ b/public/views/bitpayCard.html @@ -31,11 +31,6 @@ Login to your account 2-Step Verification -
- {{bitpayCard.error}} -
All Activity -
- {{bitpayCard.error}} -
-
No transactions yet
@@ -176,11 +166,6 @@
-
- {{bitpayCard.error}} -
diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index fa14a145c..83801f931 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -10,12 +10,11 @@ -
- +
Testnet wallets only work with Glidera Sandbox Accounts
-
+
Daily buy limit: {{limits.dailyBuy|currency:'':2}} {{limits.currency}} (remaining {{limits.dailyBuyRemaining|currency:'':2}} {{limits.currency}}) @@ -23,7 +22,7 @@ Monthly buy limit: {{limits.monthlyBuy|currency:'':2}} {{limits.currency}} (remaining {{limits.monthlyBuyRemaining|currency:'':2}} {{limits.currency}}) -
+
@@ -37,21 +36,6 @@ ng-submit="buy.get2faCode(token)" novalidate>
- - - - + +
@@ -99,7 +85,7 @@ @@ -128,11 +114,6 @@

-
- - {{buy.error}} - -

Purchase initiated

diff --git a/public/views/confirm.html b/public/views/confirm.html index 6d1188178..d2f74bb4c 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -1,5 +1,5 @@ - + {{'Back' | translate}} @@ -42,7 +42,7 @@

- Add Description + Add Description {{description}} diff --git a/public/views/copayers.html b/public/views/copayers.html index 92330a040..156be72be 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -4,17 +4,11 @@ {{wallet.name}} - - - -

Share this invitation with your copayers

diff --git a/public/views/create.html b/public/views/create.html index 9a8c54957..c379f7d72 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -1,11 +1,11 @@ - + - + diff --git a/public/views/export.html b/public/views/export.html index fcb9e75f7..563513f03 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -1,11 +1,11 @@ - + - + diff --git a/public/views/glidera.html b/public/views/glidera.html index 9f6ca236b..f9c83d5d5 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -10,38 +10,14 @@ -
- +
Testnet wallets only work with Glidera Sandbox Accounts
-
-
- {{error}} -
-
-
- -
- -
- Preferences -
-
-
-
+
-
+
@@ -70,9 +46,6 @@
-
- {{error}} -
-
- +
+
- - + + {{personalInfo.firstName}} {{personalInfo.lastName}} {{email}} +
@@ -133,54 +107,56 @@
- buy bitcoin + buy bitcoin Buy Bitcoin + - - buy bitcoin + buy bitcoin Sell Bitcoin +
-
-

Activity

+
+
+ Activity +
+ class="item"> No activity in your account
-
- - bought - bought - bought - bought + -

- Bought - Sold - {{tx.qty}} BTC -

-

- {{tx.subtotal|currency:'':2}} {{tx.currency}} -

-
-
-
- -
-
- Processing -
-
+ +
+
- -
+
+ Processing +
+ + + bought + bought + bought + bought + +

+ Bought + Sold + {{tx.qty}} BTC +

+

+ {{tx.subtotal|currency:'':2}} {{tx.currency}} +

+
diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html index 82df62a0a..626118f94 100644 --- a/public/views/glideraUri.html +++ b/public/views/glideraUri.html @@ -1,22 +1,24 @@ -
-
+ + + + + + Glidera + -
+ -
-
-
- -
+
+ Testnet wallets only work with Glidera Sandbox Accounts +
-
-
{{glidera.error}}
- +
+ +
+ Connecting...
-
-
+ + diff --git a/public/views/import.html b/public/views/import.html index e539912ee..79d347ebd 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -1,15 +1,15 @@ - + - + - + diff --git a/public/views/includes/terms.html b/public/views/includes/terms.html index c66f1f02f..3d17e514c 100644 --- a/public/views/includes/terms.html +++ b/public/views/includes/terms.html @@ -1,14 +1,12 @@ -
    -
  • The software you are about to use functions as a free, open source, and multi-signature digital wallet.
    • -
  • The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.
    • -
  • While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software.
    • -
  • You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws.
    • -
  • You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software.
    • -
  • IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE.
    • -
  • All transaction requests are irreversible.
    • -
  • The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network.
    • -
  • To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement.
    • -
  • You assume any and all risks associated with the use of the software.
    • -
  • In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held 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.
    • -
  • We reserve the right to modify this disclaimer from time to time.
    • -
+

+ The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. +

+

+ While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. +

+

+ IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. +

+

+ To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held 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. We reserve the right to modify this disclaimer from time to time. +

diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index 76931d556..fca106357 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -1,42 +1,58 @@ -
- Payment Received +
+ Copayer joined +
+ +
+ Wallet created +
+ +
+ Payment Sent
{{x.amountStr}}
+ +
+ Payment Received +
+ {{x.amountStr}} +
+
+
- Proposal Deleted + Proposal Deleted
- Proposal Rejected + Proposal Rejected
- + {{x.amountStr}} {{x.message}} - + - Proposal Accepted + Proposal Accepted

+ {{ x.creatorName}}@ {{x.wallet.name}}

- diff --git a/public/views/join.html b/public/views/join.html index 8b0b488c6..b8ad6d21f 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,11 +1,11 @@ - - Join shared wallet + {{'Join shared wallet' | translate}} diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html index 441468e98..a8bd30182 100644 --- a/public/views/modals/addressbook.html +++ b/public/views/modals/addressbook.html @@ -1,7 +1,7 @@
@@ -11,7 +11,7 @@ @@ -56,7 +56,7 @@