From e4d51007530873d3496e6f21e577cacc4d0a5955 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Tue, 22 May 2018 19:29:57 -0700 Subject: [PATCH 01/16] Initial change for displaying fiat in "Recent Transactions". Does not yet display loading UI. --- src/js/services/profileService.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 068c3b2ae..ecf761b53 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -932,8 +932,19 @@ angular.module('copayApp.services') x.txid = x.data ? x.data.txid : null; x.types = [x.type]; - if (x.data && x.data.amount) - x.amountStr = txFormatService.formatAmountStr(x.wallet.coin, x.data.amount); + if (x.data && x.data.amount) { + x.amountStr = null; // Will have loading state in view + configService.whenAvailable(function(config) { + if (config.wallet.settings.priceDisplay === "fiat") { + txFormatService.formatAlternativeStr(x.wallet.coin, x.data.amount, function(formattedString) { + x.amountStr = formattedString; + // Will I need an apply() after this? + }); + } else { + x.amountStr = txFormatService.formatAmountStr(x.wallet.coin, x.data.amount); + } + }); + } x.action = function() { // TODO? From 429e9c8446ca0d2db2e1b3ee5575e0218641c3b7 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Wed, 23 May 2018 18:04:42 -0700 Subject: [PATCH 02/16] In Recent Transactions it displays the crypto amount if the fiat display setting is selected but the fiat amount is not ready yet. --- src/js/services/profileService.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index ecf761b53..dac88169f 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -933,15 +933,13 @@ angular.module('copayApp.services') x.types = [x.type]; if (x.data && x.data.amount) { - x.amountStr = null; // Will have loading state in view + // Default to showing amount in crypto because we have that now + x.amountStr = txFormatService.formatAmountStr(x.wallet.coin, x.data.amount); configService.whenAvailable(function(config) { if (config.wallet.settings.priceDisplay === "fiat") { txFormatService.formatAlternativeStr(x.wallet.coin, x.data.amount, function(formattedString) { x.amountStr = formattedString; - // Will I need an apply() after this? }); - } else { - x.amountStr = txFormatService.formatAmountStr(x.wallet.coin, x.data.amount); } }); } From e03aab09628e5cd7a5515639a8ccff29e80840ef Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Thu, 24 May 2018 14:57:34 +0800 Subject: [PATCH 03/16] Adds faucet link --- src/js/services/bitcoincomService.js | 8 ++ src/sass/icons.scss | 5 ++ www/css/main.css | 3 + www/img/icon-faucet.svg | 120 +++++++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 www/img/icon-faucet.svg diff --git a/src/js/services/bitcoincomService.js b/src/js/services/bitcoincomService.js index 07e0d8aa4..6e73c5a0a 100644 --- a/src/js/services/bitcoincomService.js +++ b/src/js/services/bitcoincomService.js @@ -16,6 +16,13 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, credentials.BITPAY_API_URL = "https://bitpay.com"; }; + var faucetItem = { + name: 'faucet', + title: 'Free Bitcoin Cash', + icon: 'icon-faucet', + href: 'https://free.bitcoin.com/' + }; + var cashGamesItem = { name: 'games', title: 'Bitcoin Cash Games', @@ -70,6 +77,7 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, }; var register = function() { + nextStepsService.register(faucetItem); nextStepsService.register(cashGamesItem); nextStepsService.register(newsItem); nextStepsService.register(poolItem); diff --git a/src/sass/icons.scss b/src/sass/icons.scss index 9bb26919f..c5ba231a6 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -83,6 +83,11 @@ background-color: #1da1f2; background-size: 60%; } + + &.icon-faucet { + background-image: url('../img/icon-faucet.svg'); + background-size: 70%; + } } } diff --git a/www/css/main.css b/www/css/main.css index e68b0f6ee..3de6e99ac 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -10034,6 +10034,9 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm background-image: url("../img/icon-twitter-white.svg"); background-color: #1da1f2; background-size: 60%; } + .big-icon-svg.theme-circle > .bg.icon-faucet { + background-image: url("../img/icon-faucet.svg"); + background-size: 70%; } .big-icon-svg.theme-circle-services > .bg { border: 1px solid #191919; } .big-icon-svg.theme-circle-community > .bg { diff --git a/www/img/icon-faucet.svg b/www/img/icon-faucet.svg new file mode 100644 index 000000000..e2eb5beed --- /dev/null +++ b/www/img/icon-faucet.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 73944ea1266695cbdfe144a539b6d3a59cd7dda6 Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Thu, 24 May 2018 16:35:37 +0800 Subject: [PATCH 04/16] Moves faucet link to the bottom, update buy.bitcoin.com icon style --- src/js/services/bitcoincomService.js | 24 ++++++++++++++++-------- src/js/services/pricechartService.js | 12 ------------ src/sass/icons.scss | 2 +- www/css/main.css | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/js/services/bitcoincomService.js b/src/js/services/bitcoincomService.js index 6e73c5a0a..681ed8f4d 100644 --- a/src/js/services/bitcoincomService.js +++ b/src/js/services/bitcoincomService.js @@ -16,13 +16,6 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, credentials.BITPAY_API_URL = "https://bitpay.com"; }; - var faucetItem = { - name: 'faucet', - title: 'Free Bitcoin Cash', - icon: 'icon-faucet', - href: 'https://free.bitcoin.com/' - }; - var cashGamesItem = { name: 'games', title: 'Bitcoin Cash Games', @@ -51,6 +44,20 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, href: 'http://tools.bitcoin.com' }; + var priceChartItem = { + name: 'pricechart', + title: 'Bitcoin Price Charts', + icon: 'icon-chart', + sref: 'tabs.pricechart', + }; + + var faucetItem = { + name: 'faucet', + title: 'Free Bitcoin Cash', + icon: 'icon-faucet', + href: 'https://free.bitcoin.com/' + }; + var _getBitPay = function(endpoint) { return { method: 'GET', @@ -77,11 +84,12 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http, }; var register = function() { - nextStepsService.register(faucetItem); nextStepsService.register(cashGamesItem); nextStepsService.register(newsItem); nextStepsService.register(poolItem); nextStepsService.register(toolsItem); + nextStepsService.register(priceChartItem); + nextStepsService.register(faucetItem); }; register(); diff --git a/src/js/services/pricechartService.js b/src/js/services/pricechartService.js index becb62ad5..7e4f27457 100644 --- a/src/js/services/pricechartService.js +++ b/src/js/services/pricechartService.js @@ -3,17 +3,5 @@ angular.module('copayApp.services').factory('pricechartService', function($http, var root = {}; var credentials = {}; - var nextStepItem = { - name: 'pricechart', - title: 'Bitcoin Price Charts', - icon: 'icon-chart', - sref: 'tabs.pricechart', - }; - - var register = function() { - nextStepsService.register(nextStepItem); - }; - - register(); return root; }); diff --git a/src/sass/icons.scss b/src/sass/icons.scss index c5ba231a6..4693025f6 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -69,7 +69,7 @@ } &.icon-buy-bitcoin2 { - background-color: #494949; + border: 1px solid #faba13; } &.icon-reddit-white { diff --git a/www/css/main.css b/www/css/main.css index 3de6e99ac..4e7faac0a 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -10025,7 +10025,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm .big-icon-svg.theme-circle > .bg.icon-shapeshift { background-color: #263e5c; } .big-icon-svg.theme-circle > .bg.icon-buy-bitcoin2 { - background-color: #494949; } + border: 1px solid #faba13; } .big-icon-svg.theme-circle > .bg.icon-reddit-white { background-image: url("../img/icon-reddit-white.svg"); background-color: #ff4500; From e5734cf0833a9773307d1e31ccd6ee5f5558009f Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 24 May 2018 11:54:58 -0700 Subject: [PATCH 05/16] Wallet balance display on the Receive tab now adheres to the Price Display setting. --- src/js/controllers/tab-receive.js | 6 ++++++ www/views/tab-receive.html | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 1eef60954..de5f53abb 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -13,6 +13,8 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi var currentAddressSocket = {}; var paymentSubscriptionObj = { op:"addr_sub" } + $scope.displayBalanceAsFiat = true; + $scope.requestSpecificAmount = function() { $state.go('tabs.paymentRequest.amount', { id: $scope.wallet.credentials.walletId, @@ -211,6 +213,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi if ($scope.wallet && walletId == $scope.wallet.id && type == 'NewIncomingTx') $scope.setAddress(true); }) ]; + + configService.whenAvailable(function(config) { + $scope.displayBalanceAsFiat = config.wallet.settings.priceDisplay === 'fiat'; + }); }); $scope.$on("$ionicView.enter", function(event, data) { diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index d15088e47..23e61b069 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -94,7 +94,8 @@ {{wallet.name || wallet.id}}

- {{wallet.status.totalBalanceStr}} + {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} + {{wallet.status.totalBalanceStr}} [Balance Hidden] From 05a8952f877f750d185caf09954c26aab7f19151 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 24 May 2018 14:36:51 -0700 Subject: [PATCH 06/16] Displaying fiat amounts in wallet selector in Receive tab. --- src/js/directives/walletSelector.js | 6 +++++- www/views/includes/walletSelector.html | 9 ++++++--- www/views/tab-receive.html | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/js/directives/walletSelector.js b/src/js/directives/walletSelector.js index 256a2c20d..d747ef3e4 100644 --- a/src/js/directives/walletSelector.js +++ b/src/js/directives/walletSelector.js @@ -2,6 +2,9 @@ angular.module('copayApp.directives') .directive('walletSelector', function($rootScope, $timeout, configService) { + + console.log("walletSelector"); + return { restrict: 'E', templateUrl: 'views/includes/walletSelector.html', @@ -11,7 +14,8 @@ angular.module('copayApp.directives') show: '=walletSelectorShow', wallets: '=walletSelectorWallets', selectedWallet: '=walletSelectorSelectedWallet', - onSelect: '=walletSelectorOnSelect' + onSelect: '=walletSelectorOnSelect', + displayBalanceAsFiat : '=walletSelectorDisplayBalanceAsFiat' }, link: function(scope, element, attrs) { scope.hide = function() { diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html index a53d1c7f1..71ca11a8b 100644 --- a/www/views/includes/walletSelector.html +++ b/www/views/includes/walletSelector.html @@ -2,7 +2,8 @@ + ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)"> +

{{title}}
@@ -26,7 +27,8 @@ Incomplete - {{wallet.status.availableBalanceStr}} + {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} + {{wallet.status.availableBalanceStr}} [Balance Hidden] @@ -57,7 +59,8 @@ Incomplete - {{wallet.status.availableBalanceStr}} + {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} + {{wallet.status.availableBalanceStr}} [Balance Hidden] diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 23e61b069..cb53dc8e9 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -114,6 +114,7 @@ wallet-selector-wallets="wallets" wallet-selector-selected-wallet="wallet" wallet-selector-show="showWallets" - wallet-selector-on-select="onWalletSelect"> + wallet-selector-on-select="onWalletSelect" + wallet-selector-display-balance-as-fiat="displayBalanceAsFiat"> From e0511ccb53adac96407f65ad2fb45dc395c27c39 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 24 May 2018 15:29:59 -0700 Subject: [PATCH 07/16] Dislaying fiat amounts in Send tab, according to Price Display setting. --- src/js/controllers/tab-send.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 65077995f..29f1749cb 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -72,15 +72,22 @@ angular.module('copayApp.controllers').controller('tabSendController', function( return item.network == 'livenet'; }); } + var walletList = []; lodash.each(walletsToTransfer, function(v) { + var displayBalanceAsFiat = + v.status.alternativeBalanceAvailable && + config.wallet.settings.priceDisplay === 'fiat'; + walletList.push({ color: v.color, name: v.name, recipientType: 'wallet', coin: v.coin, network: v.network, - balanceString: v.cachedBalance, + balanceString: displayBalanceAsFiat ? + v.status.totalBalanceAlternative + ' ' + v.status.alternativeIsoCode : + v.cachedBalance, getAddress: function(cb) { walletService.getAddress(v, false, cb); }, From c3347931ef265b69fe19afc2306b5ec8b88e921e Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 24 May 2018 15:54:47 -0700 Subject: [PATCH 08/16] The wallet list in the Confirm screen nows displays balances according to the Price Display setting. --- src/js/controllers/confirm.js | 2 ++ www/views/confirm.html | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 6ec1d9469..fc92a2287 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -205,6 +205,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( } }); + $scope.displayBalanceAsFiat = walletConfig.settings.priceDisplay === 'fiat'; + }); diff --git a/www/views/confirm.html b/www/views/confirm.html index 8bed9035f..443043d49 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -131,7 +131,8 @@ wallet-selector-wallets="wallets" wallet-selector-selected-wallet="wallet" wallet-selector-show="walletSelector" - wallet-selector-on-select="onWalletSelect"> + wallet-selector-on-select="onWalletSelect" + wallet-selector-display-balance-as-fiat="displayBalanceAsFiat"> From e7e578f20c4fbb314f7e5b5ca5e0d0ee570dbc07 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 24 May 2018 18:36:20 -0700 Subject: [PATCH 09/16] Manually reversing 2 commits. --- src/js/controllers/tab-scan.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js index c29be53ad..4908a6f65 100644 --- a/src/js/controllers/tab-scan.js +++ b/src/js/controllers/tab-scan.js @@ -61,7 +61,10 @@ angular.module('copayApp.controllers').controller('tabScanController', function( $scope.$on("$ionicView.afterEnter", function() { // try initializing and refreshing status any time the view is entered - scannerService.gentleInitialize(); + if(!scannerService.isInitialized()) { + scannerService.gentleInitialize(); + } + activate(); }); function activate(){ From 6ec9a3af688ce4e555c4ca028d7b2732a267f62c Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 24 May 2018 18:43:14 -0700 Subject: [PATCH 10/16] Fix for reading QR code. --- src/js/services/incomingData.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index b912c3233..846e7a6db 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -12,6 +12,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat var originalAddress = null; var noPrefixInAddress = 0; + // Sometimes (testing in Chrome, when reading QR Code) data is an object + // that has a string data.result. + data = data.result || data; + if (data.toLowerCase().indexOf('bitcoin') < 0) { noPrefixInAddress = 1; } From 576bb2098a8a43f67198c434fbb9957251e03d03 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 24 May 2018 18:56:05 -0700 Subject: [PATCH 11/16] Moved the fix for reading the QR code higher up the call stack, so it would only be used when needed. --- src/js/controllers/tab-scan.js | 3 +++ src/js/services/incomingData.js | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js index 4908a6f65..83d6f733e 100644 --- a/src/js/controllers/tab-scan.js +++ b/src/js/controllers/tab-scan.js @@ -105,6 +105,9 @@ angular.module('copayApp.controllers').controller('tabScanController', function( function handleSuccessfulScan(contents){ $log.debug('Scan returned: "' + contents + '"'); scannerService.pausePreview(); + // Sometimes (testing in Chrome, when reading QR Code) data is an object + // that has a string data.result. + contents = contents.result || contents; incomingData.redir(contents); } diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 846e7a6db..a318e1157 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -11,10 +11,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat root.redir = function(data, shapeshiftData) { var originalAddress = null; var noPrefixInAddress = 0; - - // Sometimes (testing in Chrome, when reading QR Code) data is an object - // that has a string data.result. - data = data.result || data; if (data.toLowerCase().indexOf('bitcoin') < 0) { noPrefixInAddress = 1; From 9f1223fd9410f2f7f522f868081c02675f7c4995 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Fri, 25 May 2018 11:40:57 +0900 Subject: [PATCH 12/16] Remove console.log --- src/js/directives/walletSelector.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/js/directives/walletSelector.js b/src/js/directives/walletSelector.js index d747ef3e4..79053f812 100644 --- a/src/js/directives/walletSelector.js +++ b/src/js/directives/walletSelector.js @@ -2,9 +2,6 @@ angular.module('copayApp.directives') .directive('walletSelector', function($rootScope, $timeout, configService) { - - console.log("walletSelector"); - return { restrict: 'E', templateUrl: 'views/includes/walletSelector.html', From a1e321a764274375da96cf7f5c6ed4396ffbe2b5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Fri, 25 May 2018 11:49:34 +0900 Subject: [PATCH 13/16] Remove parenthesis --- www/views/tab-receive.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index cb53dc8e9..4806b0c88 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -95,7 +95,7 @@

{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} - {{wallet.status.totalBalanceStr}} + {{wallet.status.totalBalanceStr}} [Balance Hidden] From 16550d3b9a658c861fd24ac685ade3847f4ba924 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Fri, 25 May 2018 11:50:00 +0900 Subject: [PATCH 14/16] Remove parenthesis --- www/views/includes/walletSelector.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html index 71ca11a8b..755331a06 100644 --- a/www/views/includes/walletSelector.html +++ b/www/views/includes/walletSelector.html @@ -28,7 +28,7 @@ {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} - {{wallet.status.availableBalanceStr}} + {{wallet.status.availableBalanceStr}} [Balance Hidden] @@ -60,7 +60,7 @@ {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} - {{wallet.status.availableBalanceStr}} + {{wallet.status.availableBalanceStr}} [Balance Hidden] From 2e7d1c2cc8843c895c8c26b0f91492a1e30465ca Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Fri, 25 May 2018 12:14:49 +0900 Subject: [PATCH 15/16] Fix - 356 - Remove vibration --- src/js/controllers/amount.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index ce09a4137..f10121ee6 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -322,7 +322,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.'); checkFontSize(); $scope.processAmount(); - navigator.vibrate(50); }; $scope.pushOperator = function(operator) { @@ -358,7 +357,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.amountModel.amount = $scope.alternativeAmount = $scope.globalResult = ''; $scope.allowSend = false; checkFontSize(); - navigator.vibrate(50); }; From 63c76fe13e810d6665f2d97ae5f5350a9073d613 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Fri, 25 May 2018 18:15:02 +0900 Subject: [PATCH 16/16] 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);