Merge pull request #269 from Bitcoin-com/wallet/dev

Wallet/dev

Author: Jean-Baptiste Dominguez

Gruntfile.js

@@ -163,7 +163,7 @@ module.exports = function(grunt) {
       },
       bitanalytics: {
         src: [
-          'bitanalytics/bitanalytics-0.1.0.js'
+          'bitanalytics/bitanalytics.js'
         ],
         dest: 'www/lib/bitanalytics.js'
       },

app-template/bitcoincom/appConfig.json

@@ -24,9 +24,9 @@
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Bitcoin Wallet",
-  "version": "4.13.2",
-  "fullVersion": "4.13-rc3",
-  "androidVersion": "413200",
+  "version": "5.0.0",
+  "fullVersion": "5.0-rc1",
+  "androidVersion": "500000",
   "_extraCSS": "",
   "_enabledExtensions": {
     "coinbase": false,

app-template/bitcoincom/css/bitcoin.com.css

@@ -268,5 +268,33 @@ div.onboarding-topic {
 	display: block;
 	float: left;
 	max-height: 100%;
-	max-width: 100%;
+  max-width: 100%;
+}
+
+.bitpay-banner {
+	background: #1A3A8B;
+	padding: 10px;
+	box-shadow: 0px 5px 10px 0px #cccccc;
+	height: 5em;
+}
+
+.bitpay-logo { 
+	display: block;
+	max-height: 100%;
+  width: 100%;
+  height: 4em;
+}
+
+.egifter-banner {
+	background: #1A3A8B;
+	padding: 10px;
+	box-shadow: 0px 5px 10px 0px #cccccc;
+  height: 5em;
+  text-align: center;
+}
+
+.egifter-logo { 
+	max-height: 100%;
+  max-width: 100%;
+  height: 4em;
 }

app-template/config-template.xml

@@ -72,7 +72,7 @@
     <plugin name="cordova-plugin-queries-schemes" spec="~0.1.5" />
     <plugin name="cordova-plugin-firebase" spec="https://github.com/arnesson/cordova-plugin-firebase.git" />
     <plugin name="cordova-plugin-wkwebview-inputfocusfix" spec="https://github.com/onderceylan/cordova-plugin-wkwebview-inputfocusfix.git" />
-    <plugin name="cordova-plugin-media" spec="~5.0.2">
+    <plugin name="cordova-plugin-media-fork" spec="~5.0.3">
         <variable name="KEEP_AVAUDIOSESSION_ALWAYS_ACTIVE" value="NO" />
     </plugin>
     <!-- Supported Platforms -->