diff --git a/.gitignore b/.gitignore index cf8d8b2ea..d92341dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,10 @@ i18n/po/*.mo i18n/crowdin_api_key.txt src/js/translations.js +# Coinbase API ClientID/Secret +coinbase.json +src/js/coinbase.js + # version src/js/version.js diff --git a/Gruntfile.js b/Gruntfile.js index bf463a00b..01406f682 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,6 +7,9 @@ module.exports = function(grunt) { version: { command: 'node ./util/version.js' }, + coinbase: { + command: 'node ./util/coinbase.js' + }, clear: { command: 'rm -Rf bower_components node_modules' }, @@ -75,6 +78,7 @@ module.exports = function(grunt) { 'src/js/controllers/*.js', 'src/js/translations.js', 'src/js/version.js', + 'src/js/coinbase.js', 'src/js/init.js', 'src/js/trezor-url.js', 'bower_components/trezor-connect/login.js' @@ -209,7 +213,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-node-webkit-builder'); grunt.loadNpmTasks('grunt-contrib-compress'); - grunt.registerTask('default', ['nggettext_compile', 'exec:version', 'browserify', 'concat', 'copy:icons']); + grunt.registerTask('default', ['nggettext_compile', 'exec:version', 'exec:coinbase', 'browserify', 'concat', 'copy:icons']); grunt.registerTask('prod', ['default', 'uglify']); grunt.registerTask('translate', ['nggettext_extract']); grunt.registerTask('test', ['karma:unit']); diff --git a/public/img/coinbase-logo-inverse.png b/public/img/coinbase-logo-inverse.png new file mode 100644 index 000000000..b6470219d Binary files /dev/null and b/public/img/coinbase-logo-inverse.png differ diff --git a/public/img/coinbase-logo.png b/public/img/coinbase-logo.png new file mode 100644 index 000000000..53da54f52 Binary files /dev/null and b/public/img/coinbase-logo.png differ diff --git a/public/views/buyAndSell.html b/public/views/buyAndSell.html new file mode 100644 index 000000000..f38e5772c --- /dev/null +++ b/public/views/buyAndSell.html @@ -0,0 +1,20 @@ +
+ + diff --git a/public/views/buyCoinbase.html b/public/views/buyCoinbase.html new file mode 100644 index 000000000..ce7eb33dd --- /dev/null +++ b/public/views/buyCoinbase.html @@ -0,0 +1,183 @@ + + + ++ Buy confirmed. Funds will be send soon to your selected Copay Wallet +
+ ++ Bitcoin purchase completed. Coinbase has queued the transfer to your selected Copay wallet. +
+ + +Connect your Coinbase account to get started
+ + + Connect to Coinbase + + +You will need to log back in to buy or sell bitcoin in Copay.
++ The transaction is not yet confirmed, and will show as "Processing" in your Activity. The bitcoin sale will be completed automatically once it is confirmed by Coinbase. +
+ ++ A transfer has been initiated to your bank account and should arrive at {{sell.success.payout_at | amCalendar}}. +
+ + +