diff --git a/.gitignore b/.gitignore index 1e2936aed..4a30d65d8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,8 @@ webkitbuilds/* !webkitbuilds/build-osx.sh !webkitbuilds/Background.png - +#fonts +public/fonts # chrome extensions browser-extensions/chrome/copay-chrome-extension diff --git a/Gruntfile.js b/Gruntfile.js index b47500e53..998453b7e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,7 +61,7 @@ module.exports = function(grunt) { 'src/js/routes.js', 'src/js/services/*.js', 'src/js/models/*.js', - 'src/js/controllers/*.js' + 'src/js/controllers/**/*.js' ], tasks: ['concat:js'] } @@ -93,17 +93,13 @@ module.exports = function(grunt) { 'bower_components/angular/angular.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', 'bower_components/angular-foundation/mm-foundation-tpls.js', - 'bower_components/angular-touch/angular-touch.js', - 'bower_components/fastclick/lib/fastclick.js', - 'bower_components/stateful-fastclick/dist/stateful-fastclick.js', - 'bower_components/angular-stateful-fastclick/lib/angular-stateful-fastclick.js', 'bower_components/angular-moment/angular-moment.js', 'bower_components/ng-lodash/build/ng-lodash.js', 'bower_components/angular-qrcode/angular-qrcode.js', 'bower_components/angular-gettext/dist/angular-gettext.js', - 'bower_components/angular-ui-switch/angular-ui-switch.js', 'bower_components/angular-sanitize/angular-sanitize.js', 'bower_components/ng-csv/build/ng-csv.js', + 'bower_components/angular-mocks/angular-mocks.js', 'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js' ], dest: 'public/lib/angular.js' @@ -116,7 +112,7 @@ module.exports = function(grunt) { 'src/js/filters/*.js', 'src/js/models/*.js', 'src/js/services/*.js', - 'src/js/controllers/*.js', + 'src/js/controllers/**/*.js', 'src/js/translations.js', 'src/js/version.js', 'src/js/coinbase.js', @@ -134,11 +130,38 @@ module.exports = function(grunt) { src: [ 'bower_components/angular/angular-csp.css', 'bower_components/foundation/css/foundation.css', - 'bower_components/animate.css/animate.css', - 'bower_components/angular-ui-switch/angular-ui-switch.css' + 'bower_components/animate.css/animate.css' ], dest: 'public/css/foundation.css', - } + }, + ionic_js: { + src: [ + 'bower_components/ionic/release/js/ionic.bundle.min.js' + ], + dest: 'public/lib/ionic.bundle.js' + }, + ionic_css: { + src: [ + 'bower_components/ionic/release/css/ionic.min.css' + ], + dest: 'public/css/ionic.css', + }, + ui_components_js: { + src: [ + 'bower_components/jquery/dist/jquery.js', + 'bower_components/roundSlider/dist/roundslider.min.js', + 'bower_components/angular-gridster/dist/angular-gridster.min.js', + 'bower_components/javascript-detect-element-resize/detect-element-resize.js' + ], + dest: 'public/lib/ui-components.js' + }, + ui_components_css: { + src: [ + 'bower_components/roundSlider/dist/roundslider.min.css', + 'bower_components/angular-gridster/dist/angular-gridster.min.css' + ], + dest: 'public/css/ui-components.css', + }, }, uglify: { options: { @@ -156,11 +179,10 @@ module.exports = function(grunt) { files: { 'i18n/po/template.pot': [ 'public/index.html', - 'public/views/*.html', 'public/views/**/*.html', 'src/js/routes.js', 'src/js/services/*.js', - 'src/js/controllers/*.js' + 'src/js/controllers/**/*.js' ] } }, @@ -182,6 +204,12 @@ module.exports = function(grunt) { src: 'bower_components/foundation-icon-fonts/foundation-icons.*', dest: 'public/icons/' }, + ionic_fonts: { + expand: true, + flatten: true, + src: 'bower_components/ionic/release/fonts/ionicons.*', + dest: 'public/fonts/' + }, linux: { files: [{ expand: true, @@ -242,7 +270,7 @@ module.exports = function(grunt) { } }); - grunt.registerTask('default', ['nggettext_compile', 'exec:version', 'exec:coinbase', 'browserify', 'sass', 'concat', 'copy:icons']); + grunt.registerTask('default', ['nggettext_compile', 'exec:version', 'exec:coinbase', 'browserify', 'sass', 'concat', 'copy:icons', 'copy:ionic_fonts']); grunt.registerTask('prod', ['default', 'uglify']); grunt.registerTask('translate', ['nggettext_extract']); grunt.registerTask('test', ['karma:unit']); diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js index 417566863..0e80686f9 100644 --- a/angular-bitcore-wallet-client/index.js +++ b/angular-bitcore-wallet-client/index.js @@ -30,6 +30,7 @@ bwcModule.provider("bwcService", function() { }; service.getClient = function(walletData, opts) { + opts = opts || {}; //note opts use `baseurl` all lowercase; var bwc = new Client({ diff --git a/bower.json b/bower.json index 2cc0da959..774cdfec4 100644 --- a/bower.json +++ b/bower.json @@ -14,23 +14,19 @@ "angular-moment": "0.10.1", "angular-qrcode": "monospaced/angular-qrcode#~6.2.1", "angular-ui-router": "0.2.18", - "angular-ui-switch": "0.1.1", "animate.css": "3.5.1", "foundation": "5.5.3", "foundation-icon-fonts": "*", + "ionic": "1.3.1", "moment": "2.10.3", "ng-lodash": "0.2.3", "qrcode-decoder-js": "*", "trezor-connect": "~1.0.1", - "ng-csv": "~0.3.6", - "angular-touch": "^1.5.5", - "fastclick": "^1.0.6", - "stateful-fastclick": "^1.0.2", - "angular-stateful-fastclick": "^1.0.2" + "ng-csv": "~0.3.6" }, "resolutions": { "angular": "1.4.6", "qrcode-generator": "0.1.0", - "fastclick": "1.0.6" + "angular-ui-router": "0.2.18" } } diff --git a/browser-extensions/include b/browser-extensions/include index b1e3e514f..25f00ad10 100644 --- a/browser-extensions/include +++ b/browser-extensions/include @@ -1,6 +1,7 @@ -./index.html +./index.html ./css/*.css ./font/* +./fonts/* ./icons/* ./img/* ./img/**/* diff --git a/cordova/config.xml b/cordova/config.xml index 8da7b4375..94305a93c 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="2.0.0" + android-versionCode="105" + ios-CFBundleVersion="2.0.0"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index cf7369c6c..89311af34 100644 --- a/cordova/wp/Package.appxmanifest +++ b/cordova/wp/Package.appxmanifest @@ -1,6 +1,6 @@ - + Copay Bitcoin Wallet diff --git a/cordova/wp/Properties/WMAppManifest.xml b/cordova/wp/Properties/WMAppManifest.xml index 86de2b523..f8bb1e098 100644 --- a/cordova/wp/Properties/WMAppManifest.xml +++ b/cordova/wp/Properties/WMAppManifest.xml @@ -11,7 +11,7 @@ - + Assets\icon@2.png diff --git a/package.json b/package.json index 3630ea293..55c254da6 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.12.14", - "androidVersionCode": "104", + "version": "2.0.0", + "androidVersionCode": "105", "keywords": [ "wallet", "copay", @@ -42,7 +42,7 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { - "bitcore-wallet-client": "2.5.0", + "bitcore-wallet-client": "~2.5.0", "express": "^4.11.2", "fs": "0.0.2", "grunt": "^0.4.5", @@ -91,6 +91,7 @@ "load-grunt-tasks": "^3.5.0", "mocha": "^2.4.5", "phantomjs-prebuilt": "^2.1.7", + "ionic": "^1.7.14", "xcode": "^0.8.2" } } diff --git a/public/index.html b/public/index.html index 6522699c5..5de553b9f 100644 --- a/public/index.html +++ b/public/index.html @@ -6,46 +6,45 @@ + + Copay - Multisignature Wallet -
-
-
-
-
-
- -
-
-
-
-
-
-
-
- + + + +
+ + + + + +
+
+
+
+
-
-
- + + + + + diff --git a/public/views/backup.html b/public/views/backup.html index e7990c779..c39c20c69 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -19,17 +19,17 @@ -
-
- - {{wordsC.error|translate}} - -
+
+ + {{wordsC.error|translate}} + +
+
Write your wallet recovery phrase
@@ -37,21 +37,21 @@ To restore this {{index.m}}-{{index.n}} shared wallet you will need : -
    -
  1. Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
    2. -
  2. OR the wallet recovery phrase of all copayers in the wallet
    3. -
  3. OR 1 wallet export file and the remaining quorum of wallet recovery phrases (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet recovery phrases of any of the other copayers).
    4. -
+
+ Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend. + OR the wallet recovery phrase of all copayers in the wallet + OR 1 wallet export file and the remaining quorum of wallet recovery phrases (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet recovery phrases of any of the other copayers). +
To restore this {{index.m}}-{{index.n}} shared wallet you will need : -
    -
  1. Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
    2. -
  2. OR the wallet recovery phrases of all copayers in the wallet
    3. -
+
+ Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend. + OR the wallet recovery phrases of all copayers in the wallet +
@@ -97,7 +97,7 @@
@@ -9,13 +9,7 @@
- + {{buy.loading}}
@@ -32,42 +26,42 @@
-
+
-
-
- - +
- - - - BTC - USD
@@ -87,7 +81,7 @@
-
@@ -102,7 +96,7 @@
- @@ -146,11 +140,11 @@
  • Total {{buy.buyInfo.total.amount}} {{buy.buyInfo.total.currency}} -
    • +
  • Payout at {{buy.buyInfo.payout_at | amCalendar}} -
    • +
  • Deposit into Copay Wallet {{buy.selectedWalletName}} @@ -158,7 +152,7 @@
    -
    -
    • +
    diff --git a/public/views/coinbase.html b/public/views/coinbase.html index 051cc3f68..7111704c9 100644 --- a/public/views/coinbase.html +++ b/public/views/coinbase.html @@ -28,13 +28,7 @@
    - + Connecting to Coinbase... {{index.coinbaseLoading}}
    @@ -156,7 +150,7 @@ Sold Bought - -{{tx.amount.amount.replace('-','')}} + -{{tx.amount.amount.replace('-','')}} {{tx.amount.currency}}
    diff --git a/public/views/coinbaseUri.html b/public/views/coinbaseUri.html index b5475440e..995454fff 100644 --- a/public/views/coinbaseUri.html +++ b/public/views/coinbaseUri.html @@ -1,5 +1,5 @@ -
    @@ -8,13 +8,7 @@
    - + Connecting to Coinbase...
    @@ -22,10 +16,10 @@
    -
    - +
    {{coinbase.error}}
    diff --git a/public/views/copayers.html b/public/views/copayers.html index 1277ee210..bf8b1a35d 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -13,13 +13,7 @@
    - +
    diff --git a/public/views/create.html b/public/views/create.html index 17451479a..c48be7bf0 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -6,30 +6,18 @@ -
    +
    - + Creating Wallet...
    - + Connecting to {{create.hwWallet}} Wallet... Please accept to export two public keys from the Trezor app
    @@ -164,10 +152,11 @@
    -
    -
    @@ -184,5 +173,5 @@
    -
    +
    diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 30e824c90..f8e233397 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -25,20 +25,14 @@
    -
    +
    - + Creating Wallet...
    -
    diff --git a/public/views/export.html b/public/views/export.html index 70e5e9e33..79cbafdca 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -4,8 +4,6 @@ ng-init="titleSection='Export'; goBackToState = 'preferencesAdvanced'">
    - -

    @@ -19,7 +17,6 @@
    A spending password is set for this wallet. Exporting keeps the spending password in the export archive. -
    @@ -29,16 +26,12 @@
    - +
    - +
    @@ -46,20 +39,13 @@

    -
      -
    • - - Include address book and history cache -
      • -
    - -
      -
    • - - Do not include private key -
      • -
    + + Include address book and history cache + + + Do not include private key +
    @@ -80,7 +66,6 @@
    -
    - +
    diff --git a/public/views/glidera.html b/public/views/glidera.html index ecbb23ec5..8baf17bac 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -10,13 +10,7 @@
    - + Connecting to Glidera... {{index.glideraLoading}}
    @@ -146,9 +140,9 @@
    -
      -
    • buy bitcoin diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html index 20c661c87..0407880cb 100644 --- a/public/views/glideraUri.html +++ b/public/views/glideraUri.html @@ -1,5 +1,5 @@ -
      @@ -8,13 +8,7 @@
      - + Connecting to Glidera...
      @@ -22,10 +16,10 @@
      -
      - +
      {{glidera.error}}
      diff --git a/public/views/import.html b/public/views/import.html index 04800d26b..da78df49a 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -4,28 +4,16 @@ ng-init="titleSection='Import wallet'; goBackToState = 'add'; noColor = true">
      -
      +
      - + Importing wallet...
      - + Connecting to {{import.hwWallet}} Wallet...
      @@ -51,7 +39,7 @@
      -
      +
      - +
      - +
      -
      +
      @@ -232,6 +220,6 @@
      -
      +
      diff --git a/public/views/includes/alert.html b/public/views/includes/alert.html index 8c5532544..2da1e9b3a 100644 --- a/public/views/includes/alert.html +++ b/public/views/includes/alert.html @@ -1,14 +1,9 @@ -
      -
      - -
      -
      -
      - - {{index.showAlert.msg|translate}} -
      -
      - OK -
      +
      +
      + + {{msg|translate}}
      -
      +
      + OK +
      +
      diff --git a/public/views/includes/confirm-tx.html b/public/views/includes/confirm-tx.html index 57f348423..4a2100566 100644 --- a/public/views/includes/confirm-tx.html +++ b/public/views/includes/confirm-tx.html @@ -1,47 +1,39 @@ -
      - -
      - -
      -

      Send bitcoin

      +
      + +
      +
      +
      {{tx.amountStr}}
      +
      {{tx.alternativeAmountStr}}
      + +
      + + + + Multiple recipients +
      -
      -
      {{tx.amountStr}}
      -
      {{tx.alternativeAmountStr}}
      - -
      - - - - Multiple recipients - +
      +
      + Fee ({{feeLevel|translate}}): + {{tx.feeStr}} + {{feeAlternativeStr}}
      -
      -
      - Fee ({{confirm.feeLevel|translate}}): - {{tx.feeStr}} - {{confirm.feeAlternativeStr}} -
      -
      - {{confirm.feeRateStr}} of the transaction -
      +
      + {{feeRateStr}} of the transaction
      -
      -
      - -
      -
      - -
      +
      +
      +
      + +
      +
      +
      diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index 7d89c9e9f..c13a44156 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -1,6 +1,6 @@ -
      +
      -
      +
      diff --git a/public/views/includes/note.html b/public/views/includes/note.html new file mode 100644 index 000000000..8f984dd83 --- /dev/null +++ b/public/views/includes/note.html @@ -0,0 +1,13 @@ +
      + + +
      +
      + +
      +
      + +
      diff --git a/public/views/includes/password.html b/public/views/includes/password.html index cf50268b2..66f0e24b9 100644 --- a/public/views/includes/password.html +++ b/public/views/includes/password.html @@ -1,49 +1,42 @@ -
      -
      - -
      -
      -

      +

      - Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down + Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down - {{pass.error|translate}} + {{error|translate}}

      -
      diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 997fecfc4..771224690 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -1,51 +1,53 @@ -
      -
      +
      - + Joining Wallet...
      - + Connecting to {{join.hwWallet}} Wallet... Please accept to export two public keys from the Trezor app
      -
      +
      {{join.error|translate}}
      -
      +
      -
      +
      diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html new file mode 100644 index 000000000..be83f8287 --- /dev/null +++ b/public/views/modals/addressbook.html @@ -0,0 +1,135 @@ + +
      + + + +
      +
      +
      +
      + My wallets +
      +
      + My contacts +
      +
      +
      +
      +
      +
      + + Getting address for wallet {{selectedWalletName}} ... +
      +
      + + +
      + +
      + + +
      +

      Add a new entry

      +
      +
      {{error|translate}}
      + + + + Not valid + + + + + + + +
      + +
      + +
      +
      + + + +
      +
      + +
      +
      + +
      +
      +
      +
      +
      +
      +       +
      +       \ No newline at end of file diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html index c14be7666..27c2630d8 100644 --- a/public/views/modals/customized-amount.html +++ b/public/views/modals/customized-amount.html @@ -1,87 +1,91 @@ - + + + + +
      +
      +

      QR Code

      +
        +
      • + +
        + + + Share address + +
        +
        • +
      + +

      Details

      +
        +
      • + Address: + + {{addr}} + +
        • +
      • + Amount: + + {{customizedAmountUnit}} + {{customizedAlternativeUnit}} + +
        • +
      -
      • -
    -

    Details

    -
      -
    • - Address: - - {{addr}} - -
      • -
    • - Amount: - - {{customizedAmountUnit}} - {{customizedAlternativeUnit}} - -
      • -
    -
    -
    -
    -
    -
    - - - Not valid - - - - -
    -
    - -
    - - - {{unitName}} -
    -
    -
    - -
    - - - {{ alternativeIsoCode }} -
    -
    - -
    -
    -
    -
    -
    +
    +
    +
    +
    + + + Not valid + + + + +
    +
    + +
    + + + {{unitName}} +
    +
    +
    + +
    + + + {{ alternativeIsoCode }} +
    +
    + + +
    +
    +
    +
    + + diff --git a/public/views/modals/destination-address.html b/public/views/modals/destination-address.html deleted file mode 100644 index 4d94ab27a..000000000 --- a/public/views/modals/destination-address.html +++ /dev/null @@ -1,156 +0,0 @@ -
    - - -
    -
    -
    -
    - My wallets -
    -
    - My contacts -
    -
    -
    -
    -
    -
    - - Getting address for wallet {{selectedWalletName}} ... -
    -
    - - -
    - -
    - - -
    -

    Add a new entry

    -
    -
    {{error|translate}}
    - - - - Not valid - - - - - - - -
    - -
    - -
    -
    - - - -
    -
    - -
    -
    - -
    -
    -
    - -
    - -
    - -
    -
    -
    diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html index a7484be79..ca7599de5 100644 --- a/public/views/modals/paypro.html +++ b/public/views/modals/paypro.html @@ -1,63 +1,66 @@ - + + -

    Details

    -
      -
    • - Pay To - {{paypro.domain}} -
      • -
    • - Address - {{paypro.toAddress}} -
      • -
    • - Certified by - - - - {{paypro.caName}}
      - (Trusted) -       - - - Self-signed Certificate + +
      +
      +
      + {{unitTotal}} {{unitName}} +
      +
      + {{ alternative }} {{ alternativeIsoCode }} +
      +
      + +

      Details

      +
        +
      • + Pay To + {{paypro.domain}} +
        • +
      • + Address + {{paypro.toAddress}} +
        • +
      • + Certified by + + + + {{paypro.caName}}
        + (Trusted) +         + + + Self-signed Certificate + + + {{paypro.caName}}
        + WARNING: UNTRUSTED CERTIFICATE +         +         - - {{paypro.caName}}
        - WARNING: UNTRUSTED CERTIFICATE -         - - -
        • -
      • - Memo - {{paypro.memo}} -
        • -
      • - Expires - {{paypro.expires * 1000 | amTimeAgo }} -
        • -
      -
      -
      +
      • +
    • + Memo + {{paypro.memo}} +
      • +
    • + Expires + {{paypro.expires * 1000 | amTimeAgo }} +
      • +
    + +
    + +     diff --git a/public/views/modals/search.html b/public/views/modals/search.html new file mode 100644 index 000000000..747528921 --- /dev/null +++ b/public/views/modals/search.html @@ -0,0 +1,82 @@ + + + + +
    + +
    + + +
    +
    + +
    +
    +
    + sync + sync + sync +
    +
    + + + {{btx.note.body}} + Received + + + + + {{btx.message}} + {{btx.note.body}} + {{index.addressbook[btx.addressTo]}} + Sent + + + Moved + Invalid +
    +
    + +
    + + + + - + + (possible double spend) + + + {{btx.amountStr}} + + +
    + + + Unconfirmed + +
    +
    +
    + +
    +
    + + +     +     diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 235835e67..f0519af46 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -1,148 +1,166 @@ - + + -
    -
    -
    -
    - sync -

    Received

    + +
    +
    +
    +
    + sync +

    Received

    +
    +
    + sync +

    Sent

    +
    +
    + sync +

    Moved

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

    Sent

    + +

    Details

    + +
      +
    • + To + + + {{btx.merchant.domain}} + {{btx.merchant.domain}} + + + {{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}}) +
      • +
    -
    - sync -

    Moved

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

    Details

    - -
      - -
    • - To - - - {{btx.merchant.domain}} - {{btx.merchant.domain}} - - - {{btx.labelTo}} - - - -
      • - -
    • - Recipients - {{btx.recipientCount}} - - - -
      • - -
      -
      - -
    • - - This transaction has become invalid; possibly due to a double spend attempt. - -
    • - Date - - - - -
      • -
    • - Fee - {{btx.feeStr}} -
      • -
    • - Note - {{btx.message}} -
      • -
    • - Merchant message - - {{btx.merchant.pr.pd.memo}} - -
      • -
    • - Confirmations - - - Unconfirmed - - - {{btx.confirmations}} - - - {{btx.safeConfirmed}} - - - -
      • -
    - -
    -

    Participants

    -
      -
    • - - - - - - {{c.copayerName}} ({{'Me'|translate}}) -
      • -
    -
    - -
    -
    - -
    -
    - -
    -
    +     + diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 847585874..d1c4b5bca 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -1,193 +1,181 @@ - -
    -
    -
    {{tx.amountStr}}
    -
    {{tx.alternativeAmountStr}}
    - - - - - - Multiple recipients - - -
    + + -
    -
    - The payment was removed by creator -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    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 -
    +
    +
    + + {{loading|translate}}
    -

    Details

    -
      -
    • - Note - {{tx.message}} -
      • + +
      +
      +
      {{tx.amountStr}}
      +
      {{tx.alternativeAmountStr}}
      + + + + + Multiple recipients + +
      -
    • - Recipients - {{tx.recipientCount}} - - - -
      • +
      +
      + {{error|translate}} +
      -
      -
      +
      +
      + The payment was removed by creator +
      +
      -
    • - Fee - {{tx.feeStr}} -
      • -
    • - Time - - - -
      • -
    • - Created by - {{tx.creatorName}} -
      • -
    -
    - Warning: this transaction has unconfirmed inputs -
    +
    +
    + +
    +
    + +
    +
    -
    -

    Payment details

    -
      -
    • - To - - - {{tx.paypro.domain}} - {{tx.paypro.domain}} +
      +
      +
      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
      +
      +
    + +

    Details

    + +
      +
    • + Description + {{tx.message}} +
      • + +
    • + Recipients + {{tx.recipientCount}} + + - - -
      • -
    • - Expired - - - -
      • -
    • - Expires - - - -
      • -
    • - Merchant Message - {{tx.paypro.pr.pd.memo}} -
      • -
    -
    + -
    -

    -
    - {{tx.requiredSignatures}}/{{tx.walletN}} +
    +
    + +
  • + Fee + {{tx.feeStr}} +
    • + +
  • + Time + + + +
    • + +
  • + Created by + {{tx.creatorName}} +
    • + + +
    + Warning: this transaction has unconfirmed inputs
    - 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. +
    +

    Payment details

    +
      +
    • + To + + + {{tx.paypro.domain}} + {{tx.paypro.domain}} + + + +
      • +
    • + Expired + + + +
      • +
    • + Expires + + + +
      • +
    • + Merchant Message + {{tx.paypro.pr.pd.memo}} +
      • +
    +
    + +
    +

    +
    + {{tx.requiredSignatures}}/{{tx.walletN}} +
    + 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. +
    + +
    - -
    - -
    -
    + + diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html index 8265eacea..2a3323bf7 100644 --- a/public/views/paperWallet.html +++ b/public/views/paperWallet.html @@ -8,13 +8,7 @@

    - + Scanning wallet funds... Sending funds...
    @@ -24,7 +18,7 @@
    -
    +
    @@ -42,12 +36,12 @@
    -
    +
    @@ -60,11 +54,11 @@
    -
    diff --git a/public/views/preferences.html b/public/views/preferences.html index 5d9e11187..d7d8bde31 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -1,6 +1,6 @@ -
    @@ -33,17 +33,17 @@
    █ -
    +
    Color
  • - {{preferences.externalSource}} + {{preferences.externalSource}}
    Hardware wallet
    -
    • +
  • @@ -56,7 +56,7 @@
  • - +
    Advanced
    • @@ -67,20 +67,13 @@
    + + Request Spending Password + -
      - -
    • - -
      Request Spending Password
      -
      • - -
    • - -
      Scan Fingerprint
      -
      • -
    - + + Scan Fingerprint +
    diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index d4e2808f6..ddc53b5fd 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -8,13 +8,7 @@
    - + Deleting Wallet...
    diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index e7d308fb8..8356744c5 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -1,5 +1,5 @@ -
    @@ -11,13 +11,7 @@

    - + Saving preferences...
    diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 6d775615c..878e5909d 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -8,13 +8,7 @@
    - +
    Loading... diff --git a/public/views/preferencesGlobal.html b/public/views/preferencesGlobal.html index e86e4c86e..02f346db8 100644 --- a/public/views/preferencesGlobal.html +++ b/public/views/preferencesGlobal.html @@ -1,14 +1,11 @@ -
    -

    -
      +
      • {{prefGlobal.currentLanguageName|translate}} @@ -18,7 +15,8 @@

      -
        + +
        • {{prefGlobal.unitName}} @@ -26,6 +24,7 @@
          Unit
          • +
        • {{prefGlobal.selectedAlternative.name}} @@ -35,7 +34,8 @@

        -
          + +
          • {{prefGlobal.feeOpts[prefGlobal.currentFeeLevel]|translate}} @@ -43,41 +43,37 @@
            Bitcoin Network Fee Policy
            • -
          • - -
            Use Unconfirmed Funds
            -
          + + + Use Unconfirmed Funds + +

          -
            -
          • - -
            Enable push notifications
            -
            • -
          + + Enable push notifications +

          -
            -
          • - -
            Enable Glidera Service
            -
            • -
          + + + Enable Glidera Service +

          -
            -
          • - -
            Enable Coinbase Service
            -
            • -
          + + + Enable Coinbase Service +

          +
          • About Copay
          +
          Push notifications for Copay are currently disabled. Enable them in the Settings app.
            diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html index 1de09b0c3..de8142b7e 100644 --- a/public/views/preferencesHistory.html +++ b/public/views/preferencesHistory.html @@ -6,14 +6,22 @@

            diff --git a/public/views/sellCoinbase.html b/public/views/sellCoinbase.html index a9450325e..f83369293 100644 --- a/public/views/sellCoinbase.html +++ b/public/views/sellCoinbase.html @@ -1,5 +1,5 @@ -
            @@ -9,13 +9,7 @@
            - + {{sell.loading}}
            @@ -30,25 +24,25 @@
          -
          -
          - @@ -57,28 +51,28 @@
          - - - - BTC - USD
          @@ -100,13 +94,13 @@
          -
          - Continue @@ -114,20 +108,20 @@
          -

          Price Sensitivity

          +

          Price Sensitivity

          Coinbase has not yet implemented an immediate method to sell bitcoin from a wallet. To make this sale, funds will be sent to your Coinbase account, and sold when Coinbase accepts the transaction (usually one hour).

          -

          Estimated sale value: {{sell.sellPrice.amount * amount | currency : 'USD ' : 2}}
          - Still sell if price fall until: + Still sell if price fall until: {{(sell.sellPrice.amount - (selectedPriceSensitivity.value / 100) * sell.sellPrice.amount) * amount | currency : 'USD ' : 2}}

          @@ -136,7 +130,7 @@ Back
          - @@ -182,15 +176,15 @@
        • Total {{sell.sellInfo.total.amount}} {{sell.sellInfo.total.currency}} -
          • +
        • Payout at {{sell.sellInfo.payout_at | amCalendar}} -
          • +
        -
        - +
    diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 2ea8829f4..87cc10eae 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -1,5 +1,5 @@ -
    @@ -9,13 +9,7 @@
    - + {{sell.loading}}
    @@ -24,7 +18,7 @@

    Daily sell limit: {{index.glideraLimits.dailySell|currency:'':2}} {{index.glideraLimits.currency}} - (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}}) + (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}})
    Monthly sell limit: {{index.glideraLimits.monthlySell|currency:'':2}} {{index.glideraLimits.currency}} @@ -42,16 +36,16 @@

    - -
    - @@ -61,24 +55,24 @@
    - - - BTC - USD - +
    - Sell - {{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin - {{sell.sellPrice.qty}} BTC + Sell + {{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin + {{sell.sellPrice.qty}} BTC at {{sell.sellPrice.price|currency:'':2}} {{sell.sellPrice.currency}}/BTC
    @@ -90,13 +84,13 @@ ...
    -
    - +
    @@ -105,10 +99,10 @@ A SMS containing a confirmation code was sent to your phone.
    Please, enter the code below

    -
    -
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 021edbb5e..703943492 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -18,26 +18,14 @@
    - + Reconnecting to Wallet Service...
    - +
    - + {{home.onGoingProcess}}...
    @@ -71,242 +53,221 @@ --> -
    -
    -
    -
    -
    - {{index.updateError|translate}} - -
    - -
    - Scan status finished with error -
    Tap to retry -
    - -
    - {{index.totalBalanceStr}} -
    - {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}} -
    -
    - Pending Confirmation: - {{index.pendingAmountStr}} + + + + +
    +
    +
    +
    + {{index.updateError|translate}} +
    -
    -
    +
    + Scan status finished with error +
    Tap to retry +
    -
    -
    - ... -
    -
    -
    +
    + {{index.totalBalanceStr}} +
    {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
    +
    + Pending Confirmation: {{index.pendingAmountStr}} +
    +
    -
    - -
    -
    - -
    -
    - -
    -
    - - - WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet. - -
    - -
    - -
    -
    - - - WARNING: Wallet not registered - -
    -
    - This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. -
    -
    - - Recreate - -
    -
    - -
    - {{newRelease}} -
    - -
    -

    Payment Proposals

    -

    Unsent transactions

    -
    -
    -
    - -
    - Total Locked Balance: - {{index.lockedBalanceStr}} - {{index.lockedBalanceAlternative}} - {{index.alternativeIsoCode}} -
    -
    - - - -
    - No transactions yet -
    - -
    -

    - Activity - -

    - -
    -
    -
    - -
    -
    {{index.txProgress}} transactions downloaded
    -
    Updating transaction history. Please stand by.
    -
    -
    -
    -
    -
    -
    - +
    +
    + ... +
    -
    -   -
    -
    -   -
    -
    -
    +
    -
    -
    -
    - -
    - - -
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + + + WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet. +
    -
    - Cancel -
    -
    -
    -
    -
    - sync - sync - sync +
    +
    + + + WARNING: Wallet not registered +
    -
    - Received - - {{index.addressbook[btx.addressTo]}} - - {{btx.message}} +
    + This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. +
    +
    + + Recreate + +
    +
    + +
    + {{newRelease}} +
    + +
    +

    Payment Proposals

    +

    Unsent transactions

    +
    +
    +
    +
    + +
    + Total Locked Balance: + {{index.lockedBalanceStr}} + {{index.lockedBalanceAlternative}} + {{index.alternativeIsoCode}} +
    +
    + + + +

    + Activity + +

    + +
    No transactions yet +
    + +
    + +
    +
    +
    + +
    +
    +
    {{index.txProgress}} transactions downloaded
    +
    Updating transaction history. Please stand by.
    +
    +
    +
    + +
    +
    +
    + +
    +
    +   +
    +
    +   +
    +
    +
    + +
    +
    +
    + sync + sync + sync +
    +
    + + + {{btx.note.body}} + Received + + + + + {{btx.message}} + {{btx.note.body}} + {{index.addressbook[btx.addressTo]}} + Sent + + + Moved + Invalid +
    +
    + +
    + + + + - + + (possible double spend) + + + {{btx.amountStr}} + - - Sent - - - Moved - Invalid +
    + + + Unconfirmed + +
    +
    +
    + +
    -
    -
    - - + - - - - (possible double spend) - - - {{btx.amountStr}} - - -
    - - - Unconfirmed - +
    +
    + +
    -
    -
    - + +
    + {{index.completeHistory.length - index.txHistory.length}} + more  +
    + + +
    -
    -
    - -
    -
    - -
    - - Show more - - ({{index.completeHistory.length - index.txHistory.length}}) - - - ({{index.result.length - index.txHistorySearchResults.length}}) - - - -
    -
    - - +
    -
    +