Merge pull request #485 from Bitcoin-com/wallet/prod

Release 5.4

Author: Jean-Baptiste Dominguez

.gitignore

@@ -4,7 +4,7 @@ i18n/crowdin_api_key.txt
 src/js/translations.js
 
 package-lock.json
-
+package.json
 
 # cordova
 plugins
@@ -90,6 +90,7 @@ src/sass/*.css
 src/sass/app
 
 # copay www
+www/css/*
 www/lib/*
 www/js/app.js
 

Gruntfile.js

@@ -105,7 +105,7 @@ module.exports = function(grunt) {
           'src/js/directives/*.js',
           'src/js/filters/*.js',
           'src/js/routes.js',
-          'src/js/services/*.js',
+          'src/js/services/**/*.js',
           'src/js/models/*.js',
           'src/js/controllers/**/*.js'
         ],
@@ -188,8 +188,8 @@ module.exports = function(grunt) {
           'src/js/models/*.js',
           '!src/js/models/*.spec.js',
 
-          'src/js/services/*.js',
-          '!src/js/services/*.spec.js',
+          'src/js/services/**/*.js',
+          '!src/js/services/**/*.spec.js',
 
           'src/js/controllers/**/*.js',
           '!src/js/controllers/**/*.spec.js',
@@ -201,7 +201,8 @@ module.exports = function(grunt) {
           'src/js/trezor-url.js',
           'bower_components/trezor-connect/connect.js',
           'node_modules/bezier-easing/dist/bezier-easing.min.js',
-          'node_modules/cordova-plugin-qrscanner/dist/cordova-plugin-qrscanner-lib.min.js'
+          'node_modules/cordova-plugin-qrscanner/dist/cordova-plugin-qrscanner-lib.min.js',
+          'node_modules/cordova-plugin-camera-preview/www/CameraPreview.js'
         ],
         dest: 'www/js/app.js'
       }
@@ -261,6 +262,24 @@ module.exports = function(grunt) {
           },
         },
       },
+      gen_constant_moonpay_dev: {
+        src: 'src/js/templates/constants/moonpay-config.constant.js',
+        dest: 'src/js/generated/constants/moonpay-config.constant.js',
+        options: {
+          process: function (content, srcpath) {
+            return processMoonPayConfig(content, 'dev');
+          },
+        },
+      },
+      gen_constant_moonpay_prod: {
+        src: 'src/js/templates/constants/moonpay-config.constant.js',
+        dest: 'src/js/generated/constants/moonpay-config.constant.js',
+        options: {
+          process: function (content, srcpath) {
+            return processMoonPayConfig(content, 'prod');
+          },
+        },
+      },
       ionic_fonts: {
         expand: true,
         flatten: true,
@@ -369,8 +388,8 @@ module.exports = function(grunt) {
 
   grunt.registerTask('default', ['pre-dev', 'main']);
   grunt.registerTask('main', ['nggettext_compile', 'exec:appConfig', 'exec:externalServices', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']);
-  grunt.registerTask('pre-dev', ['copy:gen_constant_leanplum_dev']);
-  grunt.registerTask('prod', ['copy:gen_constant_leanplum_prod', 'main', 'uglify']);
+  grunt.registerTask('pre-dev', ['copy:gen_constant_leanplum_dev', 'copy:gen_constant_moonpay_dev']);
+  grunt.registerTask('prod', ['copy:gen_constant_leanplum_prod', 'copy:gen_constant_moonpay_prod', 'main', 'uglify']);
   grunt.registerTask('translate', ['nggettext_extract']);
   grunt.registerTask('chrome', ['default','exec:chrome']);
   grunt.registerTask('cordovaclean', ['exec:cordovaclean']);
@@ -423,7 +442,7 @@ module.exports = function(grunt) {
   function processLeanplumConfig(content, env) {
     var leanplumConfig = {};
     try {
-      leanplumConfig = grunt.file.readJSON('../leanplum-config.json');
+      leanplumConfig = grunt.file.readJSON('../wallet-configs/app-v1/leanplum-config.json');
     } catch (e) {
       // Without this, there is no clue on the console about what happened.
       if (env === 'prod') {
@@ -446,4 +465,36 @@ module.exports = function(grunt) {
       .replace("key: ''", "key: '" + key + "'");
     return newContent;
   }
+
+  function processMoonPayConfig(content, env) {
+    var moonPayConfig = {};
+    try {
+      moonPayConfig = grunt.file.readJSON('../wallet-configs/app-v1/moonpay-config.json');
+    } catch (e) {
+      // Without this, there is no clue on the console about what happened.
+      if (env === 'prod') {
+        console.error('Error reading JSON', e);
+        throw e;
+      } else { // Allow people to build if they don't care about MoonPay
+        console.warn('Failed to read MoonPay config JSON', e);
+        return content;
+      }
+    }
+
+    var moonPayForEnv = env === 'prod' ? moonPayConfig.prod : moonPayConfig.dev;
+    var baseUrl = moonPayForEnv.baseUrl;
+    var pubKey = moonPayForEnv.pubKey;
+    var secretKey = moonPayForEnv.secretKey;
+    console.log('MoonPay baseUrl: "' + baseUrl + '"');
+    console.log('MoonPay pubKey:    "' + pubKey + '"');
+    console.log('MoonPay secretKey:    "' + secretKey + '"');
+    console.log('MoonPay env:    "' + env + '"');
+
+    var newContent = '// Generated\n' + content
+      .replace("baseUrl: ''","baseUrl: '" + baseUrl + "'")
+      .replace("pubKey: ''", "pubKey: '" + pubKey + "'")
+      .replace("secretKey: ''", "secretKey: '" + secretKey + "'")
+      .replace("env: ''", "env: '" + env + "'");
+    return newContent;
+  }
 };

app-template/bitcoincom/appConfig.json

@@ -24,9 +24,9 @@
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Bitcoin Wallet",
-  "version": "5.2.4",
-  "fullVersion": "5.2-hotfix2",
-  "androidVersion": "502202",
+  "version": "5.4.3",
+  "fullVersion": "5.4-rc4",
+  "androidVersion": "504300",
   "_extraCSS": "",
   "_enabledExtensions": {
     "coinbase": false,