anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merged wallet/sprint20 into wallet/task/475.

Browse source 
# Conflicts:
#	src/js/services/bitcoincomService.js
This commit is contained in:
Brendon Duncan 2018-07-18 10:47:43 +12:00
commit ef121f52fa
43 changed files with 789 additions and 999 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/services/bitcoincomService.js
View file

@ -1,12 +1,13 @@
'use strict';
angular.module('copayApp.services').factory('bitcoincomService', function(gettextCatalog, $http, $log, lodash, moment, storageService, configService, platformInfo, nextStepsService, homeIntegrationsService) {
angular.module('copayApp.services').factory('bitcoincomService', function(gettextCatalog, nextStepsService, platformInfo) {
var root = {};
var credentials = {};
/*
* Development: 'testnet'
* Production: 'livenet'
*/
*/
var os = platformInfo.isAndroid ? 'android' : platformInfo.isIOS ? 'ios' : 'desktop';
credentials.NETWORK = 'livenet';
//credentials.NETWORK = 'testnet';
@ -20,28 +21,28 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex
name: 'games',
title: gettextCatalog.getString('Bitcoin Cash Games'),
icon: 'icon-games',
href: 'http://cashgames.bitcoin.com'
href: 'https://cashgames.bitcoin.com'
};
var newsItem = {
name: 'news',
title: gettextCatalog.getString('News'),
icon: 'icon-news',
href: 'http://news.bitcoin.com'
href: 'https://news.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=News'
};
var poolItem = {
name: 'pool',
title: gettextCatalog.getString('Mining Pool'),
icon: 'icon-mining',
href: 'http://pool.bitcoin.com'
href: 'https://pool.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Pool'
};
var toolsItem = {
name: 'tools',
title: gettextCatalog.getString('Tools'),
icon: 'icon-tools',
href: 'http://tools.bitcoin.com'
href: 'https://tools.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Tools'
};
var priceChartItem = {
@ -55,7 +56,7 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex
name: 'faucet',
title: gettextCatalog.getString('Free Bitcoin Cash'),
icon: 'icon-faucet',
href: 'https://free.bitcoin.com/'
href: 'https://free.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Faucet'
};
var _getBitPay = function(endpoint) {