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 dbd5438d2..c34d05ca9 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "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/icon-backup.svg b/public/img/icon-backup.svg new file mode 100755 index 000000000..37e44d19c --- /dev/null +++ b/public/img/icon-backup.svg @@ -0,0 +1,28 @@ + + + + item-ico-backup + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-bitcoin.svg b/public/img/icon-bitcoin.svg new file mode 100755 index 000000000..42747c028 --- /dev/null +++ b/public/img/icon-bitcoin.svg @@ -0,0 +1,24 @@ + + + + item-ico-bitcoin + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-bitpay.svg b/public/img/icon-bitpay.svg new file mode 100644 index 000000000..5105aa1fe --- /dev/null +++ b/public/img/icon-bitpay.svg @@ -0,0 +1,15 @@ + + + + Oval 87 + bitpay-logo-grayscale + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-gift.svg b/public/img/icon-gift.svg new file mode 100755 index 000000000..fbb6344cd --- /dev/null +++ b/public/img/icon-gift.svg @@ -0,0 +1,30 @@ + + + + item-ico-gift + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-wallet.svg b/public/img/icon-wallet.svg index b8b642c96..9cbcfb85f 100644 --- a/public/img/icon-wallet.svg +++ b/public/img/icon-wallet.svg @@ -1,21 +1,28 @@ - - - - -Wallet-Copy -Created with Sketch. - - - - - - - + + + + Wallet Copy + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/roboto-font/LICENSE.txt b/public/roboto-font/LICENSE.txt new file mode 100755 index 000000000..75b52484e --- /dev/null +++ b/public/roboto-font/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/public/roboto-font/Roboto-Black.ttf b/public/roboto-font/Roboto-Black.ttf new file mode 100755 index 000000000..fbde625d4 Binary files /dev/null and b/public/roboto-font/Roboto-Black.ttf 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.ttf b/public/roboto-font/Roboto-BlackItalic.ttf new file mode 100755 index 000000000..60f7782a2 Binary files /dev/null and b/public/roboto-font/Roboto-BlackItalic.ttf 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.ttf b/public/roboto-font/Roboto-Bold.ttf new file mode 100755 index 000000000..a355c27cd Binary files /dev/null and b/public/roboto-font/Roboto-Bold.ttf 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.ttf b/public/roboto-font/Roboto-BoldItalic.ttf new file mode 100755 index 000000000..3c9a7a373 Binary files /dev/null and b/public/roboto-font/Roboto-BoldItalic.ttf 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.ttf b/public/roboto-font/Roboto-Italic.ttf new file mode 100755 index 000000000..ff6046d5b Binary files /dev/null and b/public/roboto-font/Roboto-Italic.ttf 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.ttf b/public/roboto-font/Roboto-Light.ttf new file mode 100755 index 000000000..94c6bcc67 Binary files /dev/null and b/public/roboto-font/Roboto-Light.ttf 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.ttf b/public/roboto-font/Roboto-LightItalic.ttf new file mode 100755 index 000000000..04cc00230 Binary files /dev/null and b/public/roboto-font/Roboto-LightItalic.ttf 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.ttf b/public/roboto-font/Roboto-Medium.ttf new file mode 100755 index 000000000..39c63d746 Binary files /dev/null and b/public/roboto-font/Roboto-Medium.ttf 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.ttf b/public/roboto-font/Roboto-MediumItalic.ttf new file mode 100755 index 000000000..dc743f0a6 Binary files /dev/null and b/public/roboto-font/Roboto-MediumItalic.ttf 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.ttf b/public/roboto-font/Roboto-Regular.ttf new file mode 100755 index 000000000..8c082c8de Binary files /dev/null and b/public/roboto-font/Roboto-Regular.ttf 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.ttf b/public/roboto-font/Roboto-Thin.ttf new file mode 100755 index 000000000..d69555029 Binary files /dev/null and b/public/roboto-font/Roboto-Thin.ttf 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.ttf b/public/roboto-font/Roboto-ThinItalic.ttf new file mode 100755 index 000000000..07172ff66 Binary files /dev/null and b/public/roboto-font/Roboto-ThinItalic.ttf 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 d10d45479..bfbc44076 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 2e2d68854..25287a4e2 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -1,26 +1,26 @@ - + + {{'Add wallet' | translate}} - Add wallet - +

Create new wallet

 - +

Join shared wallet

 - +

Import wallet

 diff --git a/public/views/amount.html b/public/views/amount.html index afb62b7fa..1e93728ee 100644 --- a/public/views/amount.html +++ b/public/views/amount.html @@ -1,22 +1,16 @@ - - - Enter Amount + - - - +
- -
- Recipient -
+
Recipient
@@ -25,24 +19,20 @@
-
- Amount -
- +
Amount
+ {{alternativeIsoCode}} + {{unitName}} - {{alternativeIsoCode}} - {{unitName}} - -
{{amount || "0.00" }}
-
- {{globalResult}} {{amountResult || '0.00'}} {{alternativeIsoCode}} -
-
- {{globalResult}} {{alternativeResult || '0.00'}} {{unitName}} -
+
{{amount || "0.00" }}
+
+ {{globalResult}} {{amountResult || '0.00'}} {{alternativeIsoCode}}
+
+ {{globalResult}} {{alternativeResult || '0.00'}} {{unitName}} +
+
@@ -84,6 +74,5 @@
-
- - + diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html index 3a7dc4ec5..5463dff26 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/buyAmazon.html b/public/views/buyAmazon.html index 33ddb7985..d428c84e2 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -12,18 +12,15 @@
-
- {{buy.error}} -
- There was an error when trying to buy gift card, but the funds were sent to BitPay Invoice. Please, contact - BitPay to refund your bitcoin -
- Amount: {{buy.errorInfo.amount}} {{buy.errorInfo.currency}}
- BitPay Invoice ID: {{buy.errorInfo.invoiceId}}. -
-
- Open invoice -
+
+ There was an error when trying to buy gift card, but the funds were sent to BitPay Invoice. Please, contact + BitPay to refund your bitcoin +
+ Amount: {{buy.errorInfo.amount}} {{buy.errorInfo.currency}}
+ BitPay Invoice ID: {{buy.errorInfo.invoiceId}}. +
+
+ Open invoice
diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index a447eff9b..78621413b 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/buyandsell.html b/public/views/buyandsell.html index 3649604be..a516f5b69 100644 --- a/public/views/buyandsell.html +++ b/public/views/buyandsell.html @@ -12,9 +12,6 @@ - - TODO - diff --git a/public/views/confirm.html b/public/views/confirm.html index def430623..6d1188178 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -1,61 +1,56 @@ + + + {{'Back' | translate}} + + - - - Confirm - - - - + - +

+
+ Sending +
{{amountStr}}
+
{{alternativeAmountStr}}
+
+
-
-
- Sending -
{{amountStr}}
-
{{alternativeAmountStr}}
+
+
Fee: {{feeLevel}} + + {{fee || '...'}} + +
+ +
+ + {{toAddress}} +

{{toName}}

+ +
+ + + {{_paypro.domain}}
-
-
Fee: {{feeLevel}} - - {{fee || '...'}} - -
- -
- - {{toAddress}} -

{{toName}}

- -
- - - {{_paypro.domain}} -
-
- -
- - No wallet with enough funds -
- - - -
- Add Description - {{description}} - - -
+
+ + No wallet with enough funds
- - + + +
+ Add Description + {{description}} + + +
+
+ + + 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 b626ad29d..b086db3ea 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/backupLaterPopup.html b/public/views/includes/backupLaterPopup.html index 91d28fd13..5e6304755 100644 --- a/public/views/includes/backupLaterPopup.html +++ b/public/views/includes/backupLaterPopup.html @@ -1,10 +1,10 @@

Without a backup, you could lose money

If something happens to this device, this app is deleted, or your password forgotten, neither you nor Bitpay can revoer your funds. - -
diff --git a/public/views/includes/backupWarningPopup.html b/public/views/includes/backupWarningPopup.html index a8e3cd9c1..fbe1b79fd 100644 --- a/public/views/includes/backupWarningPopup.html +++ b/public/views/includes/backupWarningPopup.html @@ -1,7 +1,7 @@

Screenshots are not secure

if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen. -
diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index 7e50b47d2..8574d8497 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -1,41 +1,58 @@ + + +
+ Copayer joined +
+ +
+ Wallet created +
+ +
+ Payment Sent +
+ {{x.amountStr}} +
+
- - - {{x.amountStr}} + +
+ Payment Received +
+ {{x.amountStr}} +
+
+ +
+ + Proposal Deleted +
+ +
+ + Proposal Rejected +
+ +
+ + + + {{x.amountStr}} + {{x.message}} + + + + Proposal Accepted + +
+ + +

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

- - - - - Proposal Deleted - - - - - Proposal Rejected - - - - - - - {{x.amountStr}} - {{x.message}} - - - - Proposal Accepted - - - - -
- - - - · - - {{ x.creatorName}}@{{x.wallet.name}} -
- diff --git a/public/views/includes/wallets.html b/public/views/includes/wallets.html index 978d7804e..356ce9135 100644 --- a/public/views/includes/wallets.html +++ b/public/views/includes/wallets.html @@ -1,7 +1,7 @@
-
+
{{wallet.name || wallet.id}} @@ -10,6 +10,7 @@ Incomplete +
diff --git a/public/views/join.html b/public/views/join.html index 97b18ae75..54f6805c8 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,7 +1,7 @@ - @@ -133,4 +133,3 @@ - diff --git a/public/views/modals/glidera-tx-details.html b/public/views/modals/glidera-tx-details.html index 8696edc71..bc19dc485 100644 --- a/public/views/modals/glidera-tx-details.html +++ b/public/views/modals/glidera-tx-details.html @@ -1,5 +1,5 @@ - + diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html index a539eaaa0..eb5bda54b 100644 --- a/public/views/onboarding/collectEmail.html +++ b/public/views/onboarding/collectEmail.html @@ -1,14 +1,14 @@ - - + + - - - Wallet Created - Where would you like to receive email notifications about payments + + Wallet Created + Where would you like to receive email notifications about payments
diff --git a/public/views/onboarding/terms.html b/public/views/onboarding/terms.html index ccea31db9..775c14fdb 100644 --- a/public/views/onboarding/terms.html +++ b/public/views/onboarding/terms.html @@ -1,6 +1,6 @@ - - Terms of Use + + {{'Terms of Use' | translate}} - diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html index d1b33b704..6a4d908f2 100644 --- a/public/views/onboarding/welcome.html +++ b/public/views/onboarding/welcome.html @@ -1,5 +1,5 @@ - +
@@ -16,6 +16,5 @@
-
diff --git a/public/views/preferences.html b/public/views/preferences.html index f1fc1d0a3..dfecc04c7 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -9,7 +9,7 @@
Preferences
-
+
Wallet Name {{alias||wallet.walletName}} @@ -28,7 +28,7 @@ {{wallet.externalSource}}
-
+
█ Wallet Color @@ -36,7 +36,7 @@
-
+
Email Notifications Disabled @@ -47,7 +47,7 @@
Security
-
+
Backup
@@ -61,14 +61,14 @@ Request Fingerprint
-
+
Delete recovery phrase
Advanced
-
+
Advanced
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 611538017..7c5943167 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -26,15 +26,15 @@
-
+
Terms of Use
-
+
Translators
-
+
Session log
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 406ab13a1..5d0b8aaaa 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -9,27 +9,27 @@
-
+
Wallet Information
-
+
Sweep paper wallet
-
+
Export Wallet
-
+
Wallet Service URL
-
+
Transaction History
-
+
Delete Wallet
diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index f5a7796e8..462ff9ea4 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -10,7 +10,11 @@ -

+
+ Testnet wallets only work with Glidera Sandbox Accounts +
+ +
Daily sell limit: {{limits.dailySell|currency:'':2}} {{limits.currency}} (remaining {{limits.dailySellRemaining|currency:'':2}} {{limits.currency}}) @@ -18,7 +22,7 @@ Monthly sell limit: {{limits.monthlySell|currency:'':2}} {{limits.currency}} (remaining {{limits.monthlySellRemaining|currency:'':2}} {{limits.currency}}) -

+
@@ -31,19 +35,6 @@ ng-submit="sell.get2faCode(token)" novalidate>
- - + +
@@ -92,7 +85,7 @@ @@ -122,11 +115,6 @@

-
- - {{sell.error}} - -

Sale initiated

diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html index 8114e1739..a3c37856b 100644 --- a/public/views/tab-create-personal.html +++ b/public/views/tab-create-personal.html @@ -1,7 +1,7 @@ - @@ -28,7 +28,7 @@ ng-blur="create.formFocus(false)"> - + Show advanced options Hide advanced options diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html index 758d8ef3f..b7831389c 100644 --- a/public/views/tab-create-shared.html +++ b/public/views/tab-create-shared.html @@ -1,6 +1,6 @@ - @@ -61,7 +61,7 @@ - + Show advanced options Hide advanced options diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html index 9a2e8a450..db4e14aff 100644 --- a/public/views/tab-export-file.html +++ b/public/views/tab-export-file.html @@ -1,7 +1,7 @@ Export Wallet - diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html index a16fcd428..f524273d0 100644 --- a/public/views/tab-export-qrCode.html +++ b/public/views/tab-export-qrCode.html @@ -1,7 +1,7 @@ Export Wallet - diff --git a/public/views/tab-home.html b/public/views/tab-home.html index dad46a8b3..804fa28a3 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -1,5 +1,4 @@ - - + Home @@ -7,85 +6,106 @@

-
+
Recent Activity +
Updating activity. Please stand by
-
-
+
+
Wallets - +
-
- No Wallet -
- - - {{item.name || item.id}} - - {{item.m}}-of-{{item.n}} + + + + +

{{wallet.name || wallet.id}}

+ + {{wallet.m}}-of-{{wallet.n}} - + Incomplete - - {{item.status.availableBalanceStr}} - +

+ {{wallet.status.availableBalanceStr}} +

+

+ [Balance Hidden] +

+ - BitPay Card + +

BitPay Card

 - Gift Cards + +

Gift Cards
-
-
+
+
Buy & Sell Bitcoin
- - + + + - + +
-
-
+
+
Next steps
- - Add BitPay Card + + + + + Create a bitcoin wallet + - - Buy and Sell Bitcoin + + + + + Buy Bitcoin + - - Buy a Gift Cards + + + + + Add BitPay Card + + + + + + + Add Amazon Gift Card +
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html index 437251135..e0069afa8 100644 --- a/public/views/tab-import-file.html +++ b/public/views/tab-import-file.html @@ -1,6 +1,6 @@ - + - diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html index 9a85f29f7..041f3d499 100644 --- a/public/views/tab-import-hardware.html +++ b/public/views/tab-import-hardware.html @@ -1,6 +1,6 @@ - + - diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html index c0255a2c7..42d4525fd 100644 --- a/public/views/tab-import-phrase.html +++ b/public/views/tab-import-phrase.html @@ -1,6 +1,6 @@ - + - diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html index 6a3287722..6036b7127 100644 --- a/public/views/tab-receive.html +++ b/public/views/tab-receive.html @@ -1,42 +1,37 @@ - - Receive + + {{'Receive' | translate}} -
- +
+ +
+ Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup. +
{{error|translate}}
-
-
-
- -
-
-
-
No Wallet
-
+
Share address
-
+
Next Address
- ... - {{addr}} + ... + {{addr}}
diff --git a/public/views/tab-send.html b/public/views/tab-send.html index 078fc2fcd..b3041548c 100644 --- a/public/views/tab-send.html +++ b/public/views/tab-send.html @@ -1,16 +1,12 @@ - - - Send + + {{'Send' | translate}} - -
-
- Recipient -
+
Recipient
+