From 63c76fe13e810d6665f2d97ae5f5350a9073d613 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Fri, 25 May 2018 18:15:02 +0900
Subject: [PATCH] Update version and show rc-beta

---
 app-template/bitcoincom/appConfig.json | 5 +++--
 app-template/package-template.json     | 1 +
 src/js/controllers/preferencesAbout.js | 2 +-
 util/buildAppConfig.js                 | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json
index b87f3dbd2..41c2789c8 100644
--- a/app-template/bitcoincom/appConfig.json
+++ b/app-template/bitcoincom/appConfig.json
@@ -24,8 +24,9 @@
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Bitcoin Wallet",
-  "version": "4.10.1",
-  "androidVersion": "410100",
+  "version": "4.11.0",
+  "fullVersion": "4.11-rc1",
+  "androidVersion": "411000",
   "_extraCSS": "",
   "_enabledExtensions": {
     "coinbase": false,
diff --git a/app-template/package-template.json b/app-template/package-template.json
index 955e33e7e..660063183 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -3,6 +3,7 @@
   "description": "*DESCRIPTION*",
   "author": "BitPay",
   "version": "*VERSION*",
+  "fullVersion": "*FULLVERSION*",
   "keywords": [
     "bitcoin",
     "wallet",
diff --git a/src/js/controllers/preferencesAbout.js b/src/js/controllers/preferencesAbout.js
index a7c756cce..463e92030 100644
--- a/src/js/controllers/preferencesAbout.js
+++ b/src/js/controllers/preferencesAbout.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesAbout',
   function($scope, $window, appConfigService, gettextCatalog, externalLinkService, $ionicNavBarDelegate) {
 
     $scope.title = gettextCatalog.getString('About') + ' ' + appConfigService.nameCase;
-    $scope.version = $window.version;
+    $scope.version = $window.fullVersion;
     $scope.commitHash = $window.commitHash;
 
     $scope.openExternalLink = function() {
diff --git a/util/buildAppConfig.js b/util/buildAppConfig.js
index 55012a4b2..eb11bc0fe 100755
--- a/util/buildAppConfig.js
+++ b/util/buildAppConfig.js
@@ -26,6 +26,7 @@ console.log('v' + pkg.version + ' #' + commitHash + ' App:' + appConfig.name);
 
 var content = 'window.version="' + pkg.version + '";';
 content = content + '\nwindow.commitHash="' + commitHash + '";';
+content = content + '\nwindow.fullVersion="' + pkg.fullVersion + '";';
 
 content = content + '\nwindow.appConfig=' + JSON.stringify(appConfig) + ';';
 fs.writeFileSync("./src/js/appConfig.js", content);