'
};
});
diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js
index 78856e62f..21478102b 100644
--- a/src/js/directives/incomingDataMenu.js
+++ b/src/js/directives/incomingDataMenu.js
@@ -1,28 +1,23 @@
'use strict';
angular.module('copayApp.directives')
- .directive('incomingDataMenu', function($timeout, $rootScope, $state, externalLinkService, sendFlowService, bitcoinCashJsService) {
+ .directive('incomingDataMenu', function($timeout, $rootScope, $state, externalLinkService) {
return {
restrict: 'E',
templateUrl: 'views/includes/incomingDataMenu.html',
link: function(scope, element, attrs) {
$rootScope.$on('incomingDataMenu.showMenu', function(event, data) {
$timeout(function() {
- scope.data = data;
-
- if (scope.data.parsed.privateKey) {
- scope.type = "privateKey";
- } else if (scope.data.parsed.url) {
- scope.type = "url";
- } else if (scope.data.parsed.publicAddress) {
- scope.type = "bitcoinAddress";
- var prefix = scope.data.parsed.isTestnet ? 'bchtest:' : 'bitcoincash:';
- scope.data.toAddress = (prefix + scope.data.parsed.publicAddress.cashAddr) || scope.data.parsed.publicAddress.legacy || scope.data.parsed.publicAddress.bitpay;
- } else {
- scope.type = "text";
- }
-
+ scope.data = data.data;
+ scope.type = data.type;
scope.showMenu = true;
+ scope.https = false;
+
+ if (scope.type === 'url') {
+ if (scope.data.indexOf('https://') === 0) {
+ scope.https = true;
+ }
+ }
});
});
scope.hide = function() {
@@ -33,9 +28,18 @@ angular.module('copayApp.directives')
externalLinkService.open(url);
};
scope.sendPaymentToAddress = function(bitcoinAddress) {
+ var noPrefixInAddress = 0;
+ if (bitcoinAddress.toLowerCase().indexOf('bitcoin') < 0) {
+ noPrefixInAddress = 1;
+ }
scope.showMenu = false;
- sendFlowService.start({
- data: bitcoinAddress
+ $state.go('tabs.send').then(function() {
+ $timeout(function() {
+ $state.transitionTo('tabs.send.amount', {
+ toAddress: bitcoinAddress,
+ noPrefix: noPrefixInAddress
+ });
+ }, 50);
});
};
scope.addToAddressBook = function(bitcoinAddress) {
diff --git a/src/js/directives/shapeshiftCoinTrader.js b/src/js/directives/shapeshiftCoinTrader.js
index 793f380fb..d5c62f431 100644
--- a/src/js/directives/shapeshiftCoinTrader.js
+++ b/src/js/directives/shapeshiftCoinTrader.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function($interval, shapeshiftApiService, profileService, incomingDataService, ongoingProcess) {
+angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function($interval, shapeshiftApiService, profileService, incomingData, ongoingProcess) {
return {
restrict: 'E',
transclude: true,
@@ -111,8 +111,7 @@ angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function
orderId: $scope.depositInfo.orderId
};
- // How to handle this
- if (incomingDataService.redir(sendAddress, 'shapeshift', shapeshiftData)) {
+ if (incomingData.redir(sendAddress, shapeshiftData)) {
ongoingProcess.set('connectingShapeshift', false);
return;
}
diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js
index 830bed677..3f4db0ef9 100644
--- a/src/js/directives/slideToAccept.js
+++ b/src/js/directives/slideToAccept.js
@@ -116,8 +116,7 @@ angular.module('copayApp.directives')
function getTransformStyle(translatePct) {
return {
- 'transform': 'translateX(' + translatePct + '%)',
- '-webkit-transform': 'translateX(' + translatePct + '%)'
+ 'transform': 'translateX(' + translatePct + '%)'
};
}
diff --git a/src/js/directives/slideToAcceptSuccess.js b/src/js/directives/slideToAcceptSuccess.js
index ec6321b95..fbd588bfe 100644
--- a/src/js/directives/slideToAcceptSuccess.js
+++ b/src/js/directives/slideToAcceptSuccess.js
@@ -9,12 +9,12 @@ angular.module('copayApp.directives')
scope: {
isShown: '=slideSuccessShow',
onConfirm: '&slideSuccessOnConfirm',
- hideOnConfirm: '=slideSuccessHideOnConfirm',
- onShare: '=slideSuccessOnShare',
+ hideOnConfirm: '=slideSuccessHideOnConfirm'
},
link: function(scope, element, attrs) {
- scope.isCordova = platformInfo.isCordova;
- scope.hasShareFunction = typeof scope.onShare === 'function';
+
+ scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
+
var elm = element[0];
elm.style.display = 'none';
scope.$watch('isShown', function() {
@@ -32,9 +32,6 @@ angular.module('copayApp.directives')
elm.style.display = 'none';
}
};
- scope.onShareButtonClick = function() {
- scope.onShare();
- }
}
};
});
diff --git a/src/js/directives/wallet-balance.directive.js b/src/js/directives/wallet-balance.directive.js
deleted file mode 100644
index 4d8ca2875..000000000
--- a/src/js/directives/wallet-balance.directive.js
+++ /dev/null
@@ -1,131 +0,0 @@
-'use strict';
-
-(function(){
-
- angular
- .module('bitcoincom.directives')
- .directive('walletBalance', function() {
- return {
- restrict: 'E',
- scope: {
- displayAsFiat: '@',
- totalBalanceSat: '@',
- // The Wallet object is sometimes not stringify()-able, so not interpolatable,
- // so can't be passed to a directive.
- walletCoin: '@',
- walletStatus: '@',
- walletCachedBalance: '@',
- walletCachedBalanceUpdatedOn: '@',
- walletCachedStatus: '@'
- },
- templateUrl: 'views/includes/wallet-balance.html',
- controller: walletBalanceController
- }
- });
-
- function walletBalanceController($log, $scope, txFormatService) {
- var cryptoBalanceHasBeenDisplayed = false;
-
- formatBalance();
- $scope.$watchGroup(['displayAsFiat', 'totalBalanceSat'], function onWalletBalanceWatch() {
- formatBalance();
- });
-
- function displayCryptoBalance(walletStatus, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatus) {
-
- if (walletStatus && walletStatus.isValid && walletStatus.totalBalanceStr) {
- setDisplay(walletStatus.totalBalanceStr, '');
- cryptoBalanceHasBeenDisplayed = true;
- return;
- }
-
- if (walletCachedBalance) {
- setDisplay(walletCachedBalance, walletCachedBalanceUpdatedOn);
- return;
- }
-
- if (walletCachedStatus && walletCachedStatus.isValid && walletCachedStatus.totalBalanceStr) {
- setDisplay(walletCachedStatus.totalBalanceStr, '');
- return;
- }
-
- setDisplay('', '');
- }
-
- function displayFiatBalance(walletStatus, walletCachedStatus, walletCoin) {
- var displayAmount = '';
- if (walletStatus && walletStatus.isValid && walletStatus.alternativeBalanceAvailable) {
- displayAmount = walletStatus.totalBalanceAlternative + ' ' + walletStatus.alternativeIsoCode;
- setDisplay(displayAmount, '');
- return;
- }
-
- if (walletCachedStatus && walletCachedStatus.isValid && walletCachedStatus.alternativeBalanceAvailable) {
- displayAmount = walletCachedStatus.totalBalanceAlternative + ' ' + walletCachedStatus.alternativeIsoCode;
- setDisplay(displayAmount, '');
- return;
- }
-
- getFiatBalance(walletStatus, walletCachedStatus, walletCoin);
- }
-
- function formatBalance() {
- var displayAsFiat = $scope.displayAsFiat === 'true';
-
- var walletStatusObj = null;
- var walletCachedBalance = null;
- var walletCachedBalanceUpdatedOn = null;
- var walletCachedStatusObj = null;
-
- try {
- walletStatusObj = JSON.parse($scope.walletStatus);
- } catch (e) {
- $log.warn('Failed to parse walletStatus.', e);
- }
-
- try {
- walletCachedStatusObj = JSON.parse($scope.walletCachedStatus);
- } catch (e) {
- $log.warn('Failed to parse walletCachedStatus.', e);
- }
-
- if (!displayAsFiat || displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
- displayCryptoBalance(walletStatusObj, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatusObj);
- }
-
- if (displayAsFiat) {
- displayFiatBalance(walletStatusObj, walletCachedStatusObj, $scope.walletCoin);
- }
- }
-
- function getFiatBalance(walletStatus, walletCachedStatus, walletCoin) {
- var totalBalanceSat = null;
-
- if (walletStatus && walletStatus.isValid) {
- totalBalanceSat = walletStatus.totalBalanceSat
- } else if (walletCachedStatus && walletCachedStatus.isValid) {
- totalBalanceSat = walletCachedStatus.totalBalanceSat
- }
-
- // 0 is valid
- if (totalBalanceSat === null) {
- $log.warn('Abandoning call to get fiat balance, because no valid wallet status (cached or otherwise).');
- return;
- }
-
- txFormatService.formatAlternativeStr(walletCoin, totalBalanceSat, function onFormatAlernativeStr(formatted) {
- if (formatted) {
- setDisplay(formatted, '');
- } else {
- $log.error('Failed to format fiat balance of wallet.');
- }
- });
- }
-
- function setDisplay(amount, cachedBalanceUpdatedOn) {
- $scope.displayAmount = amount;
- $scope.cachedBalanceUpdatedOn = cachedBalanceUpdatedOn;
- }
- }
-})();
-
diff --git a/src/js/directives/walletSelector.js b/src/js/directives/walletSelector.js
index 8a96a0805..578d298ce 100644
--- a/src/js/directives/walletSelector.js
+++ b/src/js/directives/walletSelector.js
@@ -8,21 +8,16 @@ angular.module('copayApp.directives')
transclude: true,
scope: {
title: '=walletSelectorTitle',
- forceTitle: '=walletSelectorForceTitle',
show: '=walletSelectorShow',
wallets: '=walletSelectorWallets',
selectedWallet: '=walletSelectorSelectedWallet',
onSelect: '=walletSelectorOnSelect',
- onHide: '=walletSelectorOnHide',
- displayBalanceAsFiat : '=walletSelectorDisplayBalanceAsFiat'
+ alwaysDisplayBitcoinCore: '=walletSelectorAlwaysDisplayBitcoinCore'
},
link: function(scope, element, attrs) {
- console.log(scope, element, attrs);
+ scope.displayWallet = true;
scope.hide = function() {
scope.show = false;
- if (typeof scope.onHide === "function") {
- scope.onHide()
- }
};
scope.selectWallet = function(wallet) {
$timeout(function() {
@@ -33,6 +28,19 @@ angular.module('copayApp.directives')
scope.$watch('wallets', function(newValue, oldValue) {
scope.wallets = newValue;
});
+ scope.initDisplayBitcoinCoreConfig = function() {
+ configService.whenAvailable(function(config) {
+ scope.displayBitcoinCore = config.displayBitcoinCore.enabled;
+ scope.initWalletDisplay();
+ });
+ };
+ scope.initWalletDisplay = function() {
+ scope.displayWallet = scope.alwaysDisplayBitcoinCore ? true : scope.displayBitcoinCore;
+ };
+ scope.initDisplayBitcoinCoreConfig();
+ $rootScope.$on('Local/SettingsUpdated', function(e, walletId) {
+ scope.initDisplayBitcoinCoreConfig();
+ });
}
};
});
diff --git a/src/js/models/profile.js b/src/js/models/profile.js
index 7690d1c2d..74b0c33b9 100644
--- a/src/js/models/profile.js
+++ b/src/js/models/profile.js
@@ -9,12 +9,12 @@ function Profile() {
this.version = '1.0.0';
};
-Profile.create = function(appVersion) {
+Profile.create = function(opts) {
+ opts = opts || {};
var x = new Profile();
- x.appVersion = appVersion;
x.createdOn = Date.now();
- x.credentials = [];
+ x.credentials = opts.credentials || [];
x.disclaimerAccepted = true;
x.checked = {};
return x;
@@ -23,7 +23,6 @@ Profile.create = function(appVersion) {
Profile.fromObj = function(obj) {
var x = new Profile();
- x.appVersion = obj.appVersion;
x.createdOn = obj.createdOn;
x.credentials = obj.credentials;
x.disclaimerAccepted = obj.disclaimerAccepted;
@@ -63,39 +62,6 @@ Profile.prototype.isDeviceChecked = function(ua) {
return this.checkedUA == ua;
};
-/**
- *
- * @param {Profile} other
- */
-Profile.prototype.merge = function(other) {
-
- var newCredentials = [];
- var otherCredentialsLength = other.credentials.length;
- var thisProfile = this;
-
- other.credentials.forEach(function(otherCredential) {
- var credentialExists = false;
- thisProfile.credentials.forEach(function(thisCredential) {
- if (otherCredential.walletId === thisCredential.walletId) {
- credentialExists = true;
- }
- });
- if (!credentialExists) {
- newCredentials.push(otherCredential);
- }
- });
-
- Array.prototype.push.apply(this.credentials, newCredentials);
-};
-
-/**
- * It's a simple operation, but it means that all the profile logic stays
- * in this file.
- * @param {string} appVersion - ie "4.11.0"
- */
-Profile.prototype.setAppVersion = function(appVersion) {
- this.appVersion = appVersion;
-}
Profile.prototype.setChecked = function(ua, walletId) {
if (this.checkedUA != ua) {
diff --git a/src/js/routes.js b/src/js/routes.js
index d2b78aac3..337363fcc 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -236,7 +236,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
.state('tabs.receive', {
- url: '/receive/:walletId',
+ url: '/receive',
views: {
'tab-receive': {
controller: 'tabReceiveController',
@@ -287,44 +287,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/
.state('tabs.send.amount', {
- url: '/amount',
+ url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin/:fixedUnit/:fromWalletId/:minShapeshiftAmount/:maxShapeshiftAmount/:shapeshiftOrderId/:displayAddress/:noPrefix',
views: {
'tab-send@tabs': {
controller: 'amountController',
- controllerAs: 'vm',
templateUrl: 'views/amount.html'
}
}
})
- .state('tabs.send.wallet-to-wallet', {
- url: '/wallet-to-wallet',
- views: {
- 'tab-send@tabs': {
- controller: 'walletSelectorController',
- templateUrl: 'views/walletSelector.html'
- }
- }
- })
- .state('tabs.send.origin', {
- url: '/origin',
- views: {
- 'tab-send@tabs': {
- controller: 'walletSelectorController',
- templateUrl: 'views/walletSelector.html',
- }
- }
- })
- .state('tabs.send.destination', {
- url: '/destination',
- views: {
- 'tab-send@tabs': {
- controller: 'walletSelectorController',
- templateUrl: 'views/walletSelector.html',
- }
- }
- })
.state('tabs.send.confirm', {
- url: '/confirm',
+ url: '/confirm/:recipientType/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:coin/:useSendMax/:fromWalletId/:displayAddress/:requiredFeeRate',
views: {
'tab-send@tabs': {
controller: 'confirmController',
@@ -344,19 +316,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
- .state('tabs.send.review', {
- url: '/review/:thirdParty/:amount/:fromWalletId/:sendMax/:toAddress/:toWalletId',
- views: {
- 'tab-send@tabs': {
- controller: 'reviewController',
- controllerAs: 'vm',
- templateUrl: 'views/review.html'
- }
- },
- params: {
- paypro: null
- }
- })
/*
*
@@ -736,17 +695,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
})
.state('tabs.paymentRequest.amount', {
- url: '/amount/:toWalletId',
+ url: '/amount/:coin',
views: {
'tab-receive@tabs': {
controller: 'amountController',
- controllerAs: 'vm',
templateUrl: 'views/amount.html'
}
}
})
.state('tabs.paymentRequest.confirm', {
- url: '/confirm/:amount/:toWalletId',
+ url: '/confirm/:amount/:currency/:coin',
views: {
'tab-receive@tabs': {
controller: 'customAmountController',
@@ -837,15 +795,63 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
fromOnboarding: null
},
})
- .state('tabs.shareApp', {
- url: '/shareApp',
+
+ /*
+ *
+ * Feedback
+ *
+ */
+
+ .state('tabs.feedback', {
+ url: '/feedback',
views: {
'tab-settings@tabs': {
- controller: 'shareAppController',
- templateUrl: 'views/shareApp.html'
+ templateUrl: 'views/feedback/send.html',
+ controller: 'sendController'
}
}
})
+ .state('tabs.shareApp', {
+ url: '/shareApp/:score/:skipped/:fromSettings',
+ views: {
+ 'tab-settings@tabs': {
+ controller: 'completeController',
+ templateUrl: 'views/feedback/complete.html'
+ }
+ }
+ })
+ .state('tabs.rate', {
+ url: '/rate',
+ abstract: true
+ })
+ .state('tabs.rate.send', {
+ url: '/send/:score',
+ views: {
+ 'tab-home@tabs': {
+ templateUrl: 'views/feedback/send.html',
+ controller: 'sendController'
+ }
+ }
+ })
+ .state('tabs.rate.complete', {
+ url: '/complete/:score/:skipped',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'completeController',
+ templateUrl: 'views/feedback/complete.html'
+ }
+ }
+ })
+ .state('tabs.rate.rateApp', {
+ url: '/rateApp/:score',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'rateAppController',
+ templateUrl: 'views/feedback/rateApp.html'
+ }
+ }
+ })
+
/*
*
* Buy or Sell Bitcoin
@@ -887,7 +893,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
views: {
'tab-home@tabs': {
controller: 'amountController',
- controllerAs: 'vm',
templateUrl: 'views/amount.html'
}
}
@@ -953,7 +958,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
views: {
'tab-home@tabs': {
controller: 'amountController',
- controllerAs: 'vm',
templateUrl: 'views/amount.html'
}
}
@@ -1012,7 +1016,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
/* Shapeshift */
.state('tabs.shapeshift', {
- url: '/shapeshift/:fromWalletId/:toWalletId',
+ url: '/shapeshift',
views: {
'tab-home@tabs': {
controller: 'shapeshiftController',
@@ -1073,7 +1077,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
views: {
'tab-home@tabs': {
controller: 'amountController',
- controllerAs: 'vm',
templateUrl: 'views/amount.html'
}
},
@@ -1126,7 +1129,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
views: {
'tab-home@tabs': {
controller: 'amountController',
- controllerAs: 'vm',
templateUrl: 'views/amount.html'
}
},
@@ -1183,7 +1185,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
views: {
'tab-home@tabs': {
controller: 'amountController',
- controllerAs: 'vm',
templateUrl: 'views/amount.html'
}
}
@@ -1207,82 +1208,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
});
})
- .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buydotbitcoindotcomService, pushNotificationsService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) {
+ .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buydotbitcoindotcomService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) {
$ionicPlatform.ready(function() {
-
- // Init BitAnalytics
- var os = platformInfo.isAndroid ? 'android' : platformInfo.isIOS ? 'ios' : 'desktop';
- window.BitAnalytics.initialize(os, $window.fullVersion, {"firebase": {},
- "ga": {
- "trackingId": "UA-59964190-23",
- "eventLabels": ["id", "icon-off"]
- },
- "adjust": {
- "token": "au1onbhgg5q8",
- "environment" : "production",
- "eventTypes": {
- "banner_click": "sc5i8u",
- "buy_bitcoin_click": "t1vcdz",
- "transfer_success": "f68evo",
- "wallet_created": "nd3dg5",
- "wallet_opened": "4n39l7"
- }
- }
- });
-
- configService.whenAvailable(function(config) {
- pushNotificationsService.init();
- });
- //firebaseEventsService.init();
-
- var channel = "ga";
- if (platformInfo.isCordova) {
- channel = "firebase";
- }
-
- // Send a log to test
- var log = new window.BitAnalytics.LogEvent("wallet_opened", [], [channel, "adjust"]);
- window.BitAnalytics.LogEventHandlers.postEvent(log);
-
- var actionBanner = new window.BitAnalytics.ActionFactory.createAction('click', {
- name: 'banner_click',
- class: 'track_banner_click',
- params: ['href-banner', 'id'],
- channels: [channel, 'adjust']
- });
- window.BitAnalytics.ActionHandlers.trackAction(actionBanner);
-
- var actionBuyBitcoin = new window.BitAnalytics.ActionFactory.createAction('click', {
- name: 'buy_bitcoin_click',
- class: 'track_buy_bitcoin_click',
- params: ['href', 'id'],
- channels: [channel, 'adjust']
- });
- window.BitAnalytics.ActionHandlers.trackAction(actionBuyBitcoin);
-
- var actionLinkClickOut = new window.BitAnalytics.ActionFactory.createAction('click', {
- name: 'link_click_out',
- class: 'track_link_click_out',
- params: ['href', 'id'],
- channels: [channel]
- });
- window.BitAnalytics.ActionHandlers.trackAction(actionLinkClickOut);
-
- var actionTabOpen = new window.BitAnalytics.ActionFactory.createAction('click', {
- name: 'tab_open',
- class: 'track_tab_open',
- params: ['href', 'title', 'icon-off'],
- channels: [channel]
- });
- window.BitAnalytics.ActionHandlers.trackAction(actionTabOpen);
-
- var actionShapeShiftStart = new window.BitAnalytics.ActionFactory.createAction('click', {
- name: 'shapeshift_start_click',
- class: 'track_shapeshift_start_click',
- channels: [channel]
- });
- window.BitAnalytics.ActionHandlers.trackAction(actionShapeShiftStart);
// Init language
uxLanguage.init(function (lang) {
@@ -1323,10 +1251,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
if (screen.width < 768 && platformInfo.isCordova)
screen.lockOrientation('portrait');
- if (ionic.Platform.isAndroid() && platformInfo.isCordova && StatusBar) {
- StatusBar.backgroundColorByHexString('#000000');
- }
-
if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard && !platformInfo.isWP) {
cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false);
cordova.plugins.Keyboard.disableScroll(true);
@@ -1453,13 +1377,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
win.menu = nativeMenuBar;
}
-
- $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
- if (document.body.classList.contains('keyboard-open')) {
- document.body.classList.remove('keyboard-open');
- $log.debug('Prevented keyboard open bug..');
- }
+ $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
$log.debug('Route change from:', fromState.name || '-', ' to:', toState.name);
$log.debug(' toParams:' + JSON.stringify(toParams || {}));
$log.debug(' fromParams:' + JSON.stringify(fromParams || {}));
diff --git a/src/js/services/bannerService.js b/src/js/services/bannerService.js
deleted file mode 100644
index d48d8861e..000000000
--- a/src/js/services/bannerService.js
+++ /dev/null
@@ -1,78 +0,0 @@
-'use strict';
-angular.module('copayApp.services').factory('bannerService', function ($http, $log) {
- // Export
- var root = {};
-
- // Constant
- var API_URL = 'https://bwscash.bitcoin.com/bws/api/v1/marketing';
-
- // Variable
- var hasFetched = false;
- var banners = [];
- var defaultBanner = {
- id: 'default-banner',
- imageURL: 'img/banner-store.png',
- url: 'https://store.bitcoin.com/',
- isLocal: true
- };
-
- // Private methods
- var fetchSettings = function (cb) {
- var req = {
- method: 'GET',
- url: API_URL+'/settings',
- headers: {
- 'Content-Type': 'application/json',
- 'Accept': 'application/json'
- }
- };
- $http(req).then(function (response) {
- $log.info('Get banner settings: SUCCESS');
- banners = response.data;
- return cb(true);
- }, function (error) {
- $log.error('Get banner settings: ERROR ' + error.statusText);
- return cb(false);
- });
- };
-
- root.getBanner = function (cb) {
-
- // If not fetch get the banner
- if (!hasFetched) {
- hasFetched = true;
-
- // If never fetch, lets fetch
- fetchSettings(function (isSuccess) {
- root.getBanner(cb);
- });
-
- // If fetch, and got banners, lets have a look
- } else if (banners.length > 0) {
- var selectedBanners = [];
- for(var i in banners) {
- var banner = banners[i];
-
- // Generate the URL for the banner
- var fileName = banner.image.substring(0, banner.image.lastIndexOf('.'));
- var extension = banner.image.substring(banner.image.lastIndexOf('.')+1);
- banner.imageURL = API_URL +'/banners/'+fileName+"/"+extension;
-
- // Add the banner
- selectedBanners.push(banners[i]);
- }
-
- // If no banner activated, return the default one
- if (selectedBanners.length == 0) {
- return cb(defaultBanner);
- } else {
- return cb(selectedBanners[Math.floor(Math.random()*banners.length)]);
- }
-
- } else {
- return cb(defaultBanner);
- }
- };
-
- return root;
-});
\ No newline at end of file
diff --git a/src/js/services/bitcoin-uri.service.js b/src/js/services/bitcoin-uri.service.js
deleted file mode 100644
index 3da84f3da..000000000
--- a/src/js/services/bitcoin-uri.service.js
+++ /dev/null
@@ -1,416 +0,0 @@
-'use strict';
-
-// https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki
-// https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki
-
-(function(){
-
- angular
- .module('bitcoincom.services')
- .factory('bitcoinUriService', bitcoinUriService);
-
- function bitcoinUriService(bitcoinCashJsService, bwcService, $log) {
- var bch = bitcoinCashJsService.getBitcoinCashJs();
- var bitcore = bwcService.getBitcore();
-
- var service = {
- parse: parse
- };
-
- return service;
-
- function bitpayAddrOnMainnet(address) {
- var Address = bch.Address;
- var BitpayFormat = Address.BitpayFormat;
-
- var mainnet = bch.Networks.mainnet;
-
- var result = null;
- if (address[0] == 'C') {
- try {
- result = Address.fromString(address, mainnet, 'pubkeyhash', BitpayFormat);
- } catch (e) {};
-
- } else if (address[0] == 'H') {
- try {
- result = Address.fromString(address, mainnet, 'scripthash', BitpayFormat);
- } catch (e) {};
-
- }
- return result;
- }
-
- function cashAddrOnMainnet(address) {
- var Address = bch.Address;
- var CashAddrFormat = Address.CashAddrFormat;
-
- var mainnet = bch.Networks.mainnet;
-
- var prefixed = 'bitcoincash:' + address;
- var result = null;
- if (address[0] == 'q') {
- try {
- result = Address.fromString(prefixed, mainnet, 'pubkeyhash', CashAddrFormat);
- } catch (e) {};
-
- } else if (address[0] == 'p') {
- try {
- result = Address.fromString(prefixed, mainnet, 'scripthash', CashAddrFormat);
- } catch (e) {};
-
- }
- return result;
- }
-
- function cashAddrOnTestnet(address) {
- var Address = bch.Address;
- var CashAddrFormat = Address.CashAddrFormat;
-
- var testnet = bch.Networks.testnet;
-
- var prefixed = 'bchtest:' + address;
- var result = null;
- if (address[0] == 'q') {
- try {
- result = Address.fromString(prefixed, testnet, 'pubkeyhash', CashAddrFormat);
- } catch (e) {};
-
- } else if (address[0] == 'p') {
- try {
- result = Address.fromString(prefixed, testnet, 'scripthash', CashAddrFormat);
- } catch (e) {};
-
- }
- return result;
- }
-
- function infoFromWalletImportText(data) {
- var split = data.split('|');
- // Copay seems to use extra parameter for coin.
- if (split.length < 5 || split.length > 6) {
- return null;
- }
-
- var type = parseInt(split[0], 10);
- if (isNaN(type)) {
- return null;
- }
-
- var data = split[1];
- var network = split[2];
- if (!(network === 'livenet' || network === 'testnet')) {
- return null;
- }
- var isTestnet = network === 'testnet';
-
- var derivationPath = split[3];
- if (!/^m\/\d+'\/\d+'\/\d+'$/.test(derivationPath)) {
- return null;
- }
-
- var hasPassphraseText = split[4];
- if (!(hasPassphraseText === 'true' || hasPassphraseText === 'false')) {
- return null;
- }
- var hasPassphrase = hasPassphraseText === 'true';
-
- var coin; // Intentionally undefined as may not be present
- if (split.length > 5) {
- var coinText = split[5];
- if (!(coinText === 'bch' || coinText === 'btc')) {
- return null;
- }
- coin = coinText;
- }
-
- return {
- type: type,
- data: data,
- isTestnet: isTestnet,
- derivationPath: derivationPath,
- hasPassphrase: hasPassphrase,
- coin: coin
- };
- }
-
- /*
- For parsing:
- BIP21
- BIP72
-
- returns:
- {
- amount: '',
- amountInSatoshis: 0,
- bareUrl: '',
- coin: '',
- copayInvitation: '',
- import: { // testnet info in root, coin info in root if available
- data: '',
- derivationPath: '',
- hasPassphrase: false,
- type: 1,
- },
- isValid: false,
- label: '',
- message: '',
- other: {
- somethingIDontUnderstand: 'Its value'
- },
- privateKey: {
- encrypted: '',
- wif: ''
- }'',
- publicAddress: {
- bitpay: '',
- cashAddr: '',
- legacy: '',
- },
- req: {
- "req-param0": '',
- "req-param1": ''
- },
- testnet: false,
- url: '' // For BIP70
- }
-
- Only fields that are present in the data are defined in the returned object. Both privateKey and publicAddress only have 1 field defined, if they exist at all.
- The exception to this is the coin property, which is determined from other data, such as the prefix or address type.
-
- */
-
- function parse(data) {
- var parsed = {
- isValid: false
- };
-
- if (typeof data !== 'string') {
- return parsed;
- }
-
- // Identify prefix
- var trimmed = data.trim();
- var colonSplit = /^([\w-]*):?(.*)$/.exec(trimmed);
- if (!colonSplit) {
- return parsed;
- }
-
- var addressAndParams = '';
- var preColonLower = colonSplit[1].toLowerCase();
- if (preColonLower === 'bitcoin') {
- parsed.coin = 'btc';
- addressAndParams = colonSplit[2].trim();
- console.log('Is btc');
-
- } else if (/^(?:bitcoincash)|(?:bitcoin-cash)$/.test(preColonLower)) {
- parsed.coin = 'bch';
- parsed.test = false;
- addressAndParams = colonSplit[2].trim();
- console.log('Is bch');
-
- } else if (/^(?:bchtest)$/.test(preColonLower)) {
- parsed.coin = 'bch';
- parsed.isTestnet = true;
- addressAndParams = colonSplit[2].trim();
- console.log('Is bch');
-
- } else if (colonSplit[2] === '') {
- // No colon and no coin specifier.
- addressAndParams = colonSplit[1].trim();
- console.log('No prefix.');
-
- } else if (/^https?$/.test(colonSplit[1])) { // Plain URL
- addressAndParams = trimmed;
-
- } else if (colonSplit[2].indexOf('|') == 0) { // Import
- addressAndParams = trimmed
- } else {
- // Something we don't recognise
- return parsed;
- }
-
- // Remove erroneous leading slashes
- //var leadingSlashes = /^\/*([^\/]+(?:.*))$/.exec(addressAndParams);
- var leadingSlashes = /^\/*(.*)$/.exec(addressAndParams);
- if (!leadingSlashes) {
- return parsed;
- }
- addressAndParams = leadingSlashes[1];
-
- var questionMarkSplit = /^([^\?]*)\??([^\?]*)$/.exec(addressAndParams);
- if (!questionMarkSplit) {
- return parsed;
- }
-
- var address = questionMarkSplit[1];
- var params = questionMarkSplit[2];
-
- if (params.length > 0) {
- var paramsSplit = params.split('&');
- var others;
- var req;
- var paramCount = paramsSplit.length;
- for(var i = 0; i < paramCount; i++) {
- var param = paramsSplit[i];
- var valueSplit = param.split('=');
- if (valueSplit.length !== 2) {
- return parsed;
- }
-
- var key = valueSplit[0];
- var value = valueSplit[1];
- var decodedValue = decodeURIComponent(value);
- switch(key) {
- case 'amount':
- var amount = parseFloat(decodedValue);
- if (amount) { // Checking for NaN, or no numbers at all etc. & convert to satoshi
- parsed.amount = decodedValue; // Need to check if a currency is precised
- parsed.amountInSatoshis = amount * 100000000
- } else {
- return parsed;
- }
- break;
-
- case 'label':
- parsed.label = decodedValue;
- break;
-
- case 'message':
- parsed.message = decodedValue;
- break;
-
- case 'r':
- // Could use a more comprehesive regex to test URL validity, but then how would we know
- // which part of the validation it failed?
- if (decodedValue.startsWith('https://')) {
- parsed.url = decodedValue;
- } else {
- return parsed;
- }
- break;
-
- default:
- if (key.startsWith('req-')) {
- req = req || {};
- req[key] = decodedValue;
- } else {
- others = others || {};
- others[key] = decodedValue;
- }
- }
-
- };
- }
-
- parsed.others = others;
- parsed.req = req;
-
-
- if (address) {
- var addressLowerCase = address.toLowerCase();
- var copayInvitationRe = /^[0-9A-HJ-NP-Za-km-z]{70,80}$/;
- //var legacyRe = /^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$/;
- //var legacyTestnetRe = /^[mn][a-km-zA-HJ-NP-Z1-9]{25,34}$/;
- var privateKeyEncryptedRe = /^6P[1-9A-HJ-NP-Za-km-z]{56}$/;
- var privateKeyForUncompressedPublicKeyRe = /^5[1-9A-HJ-NP-Za-km-z]{50}$/;
- var privateKeyForUncompressedPublicKeyTestnetRe = /^9[1-9A-HJ-NP-Za-km-z]{50}$/;
- var privateKeyForCompressedPublicKeyRe = /^[KL][1-9A-HJ-NP-Za-km-z]{51}$/;
- var privateKeyForCompressedPublicKeyTestnetRe = /^[c][1-9A-HJ-NP-Za-km-z]{51}$/;
- var urlRe = /^https?:\/\/.+/;
-
- var bitpayAddrMainnet = bitpayAddrOnMainnet(address);
- var cashAddrTestnet = cashAddrOnTestnet(addressLowerCase);
- var cashAddrMainnet = cashAddrOnMainnet(addressLowerCase);
- var importInfo = infoFromWalletImportText(address);
- var privateKey = '';
-
- if (parsed.isTestnet && cashAddrTestnet) {
- parsed.address = addressLowerCase;
- parsed.coin = 'bch';
- parsed.publicAddress = {
- cashAddr: addressLowerCase
- };
- parsed.isValid = true;
-
- } else if (cashAddrMainnet) {
- parsed.coin = 'bch';
- parsed.publicAddress = {
- cashAddr: addressLowerCase
- };
- parsed.isTestnet = false;
- parsed.isValid = true;
-
- } else if (bitcore.Address.isValid(address, 'livenet')) {
- parsed.publicAddress = {
- legacy: address
- };
- parsed.isTestnet = false;
- parsed.isValid = true;
-
- } else if (bitcore.Address.isValid(address, 'testnet')) {
- parsed.publicAddress = {
- legacy: address
- };
- parsed.isTestnet = true;
- parsed.isValid = true;
-
- } else if (bitpayAddrMainnet) {
- parsed.coin = 'bch';
- parsed.publicAddress = {
- bitpay: address
- };
- parsed.isTestnet = false;
- parsed.isValid = true;
-
- } else if (copayInvitationRe.test(address) ) {
- parsed.copayInvitation = address;
- parsed.isValid = true;
-
- } else if (privateKeyForUncompressedPublicKeyRe.test(address) || privateKeyForCompressedPublicKeyRe.test(address)) {
- privateKey = address;
- try {
- new bitcore.PrivateKey(privateKey, 'livenet');
- parsed.privateKey = { wif: privateKey };
- parsed.isTestnet = false;
- parsed.isValid = true;
- } catch (e) {}
-
- } else if (privateKeyForUncompressedPublicKeyTestnetRe.test(address) || privateKeyForCompressedPublicKeyTestnetRe.test(address)) {
- privateKey = address;
- try {
- new bitcore.PrivateKey(privateKey, 'testnet');
- parsed.privateKey = { wif: privateKey };
- parsed.isTestnet = true;
- parsed.isValid = true;
- } catch (e) {}
-
- } else if (privateKeyEncryptedRe.test(address)) {
- parsed.privateKey = { encrypted: address };
- parsed.isValid = true;
-
- } else if (urlRe.test(address)) {
- parsed.bareUrl = trimmed;
- parsed.isValid = true;
-
- } else if (importInfo) {
- parsed.import = {
- type: importInfo.type,
- data: importInfo.data,
- derivationPath: importInfo.derivationPath,
- hasPassphrase: importInfo.hasPassphrase
- };
- parsed.coin = importInfo.coin;
- parsed.isTestnet = importInfo.isTestnet;
- parsed.isValid = true;
- }
-
- } else {
- parsed.isValid = !!parsed.url; // BIP72
- }
-
- return parsed;
- }
-
- }
-
-})();
diff --git a/src/js/services/bitcoin-uri.service.spec.js b/src/js/services/bitcoin-uri.service.spec.js
deleted file mode 100644
index 2ddbd0d2e..000000000
--- a/src/js/services/bitcoin-uri.service.spec.js
+++ /dev/null
@@ -1,429 +0,0 @@
-describe('bitcoinUriService', function() {
- var bitcoinUriService;
-
- beforeEach(function() {
- module('bitcoinCashJsModule');
- module('bitcoincom.services');
- module('bwcModule');
-
- inject(function($injector){
- bitcoinUriService = $injector.get('bitcoinUriService');
- });
- });
-
-
- it('Bitcoin BIP72', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin:?r=https://bitpay.com/i/CwzbKP3k3JNgXJBfuoerDr');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('btc');
- expect(parsed.isTestnet).toBeUndefined();
- expect(parsed.publicAddress).toBeUndefined();
- expect(parsed.url).toBe('https://bitpay.com/i/CwzbKP3k3JNgXJBfuoerDr');
- });
-
- it('Bitcoin Cash BIP72', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash:?r=https://bitpay.com/i/SmHdie5dvBnG5kouZzEPzu');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress).toBeUndefined();
- expect(parsed.isTestnet).toBeUndefined();
- expect(parsed.url).toBe('https://bitpay.com/i/SmHdie5dvBnG5kouZzEPzu');
- });
-
- it('Bitcoin Cash prefix with legacy address', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash:1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.legacy).toBe('1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitcoin Cash prefix with legacy address on testnet', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash:mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.legacy).toBe('mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
- expect(parsed.isTestnet).toBe(true);
- });
-
- it('Bitcoin Cash uri with extended params', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash:qr8v2vqnzntykakht43rqmxq8cdjzjp795fc3vsjgc?unknown=something&mystery=Melton%20probang&req-one=ichi&req-beta=Ni%20san');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.others.mystery).toBe('Melton probang');
- expect(parsed.others.unknown).toBe('something');
- expect(parsed.publicAddress.cashAddr).toBe('qr8v2vqnzntykakht43rqmxq8cdjzjp795fc3vsjgc');
- expect(parsed.req['req-beta']).toBe('Ni san');
- expect(parsed.req['req-one']).toBe('ichi');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitcoin Cash uri with invalid amount', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash:qq0knhwj4d5zy3kdph24w6etq58vwzua6sm7lhcmuk?amount=three');
-
- expect(parsed.isValid).toBe(false);
- });
-
-
- it('Bitcoin testnet address', function() {
-
- var parsed = bitcoinUriService.parse('mtWcoToWhbtPoCby5fvs8xdBujT5GGenD4');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBeUndefined();
- expect(parsed.publicAddress.legacy).toBe('mtWcoToWhbtPoCby5fvs8xdBujT5GGenD4');
- expect(parsed.isTestnet).toBe(true);
- });
-
- it('Bitcoin uri', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin:15yCdKWVKRvfXMJpPYZBqMhiGKwjKzZdLN');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('btc');
- expect(parsed.publicAddress.legacy).toBe('15yCdKWVKRvfXMJpPYZBqMhiGKwjKzZdLN');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitcoin uri with encoded label', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin:1MxudKDEBWZ1yjizUSf6htacenNtb3DWbT?label=Mr.%20Smith');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('btc');
- expect(parsed.label).toBe('Mr. Smith');
- expect(parsed.publicAddress.legacy).toBe('1MxudKDEBWZ1yjizUSf6htacenNtb3DWbT');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitcoin uri with params', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin:12nCRhMDfxVnuF3uYMXv2fNxBohNmacfWu?amount=20.3&label=Luke-Jr&message=Donation%20for%20project%20xyz');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.amount).toBe('20.3');
- expect(parsed.amountInSatoshis).toBe(2030000000);
- expect(parsed.coin).toBe('btc');
- expect(parsed.label).toBe('Luke-Jr');
- expect(parsed.publicAddress.legacy).toBe('12nCRhMDfxVnuF3uYMXv2fNxBohNmacfWu');
- expect(parsed.message).toBe('Donation for project xyz');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitcoin uri with slash', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin:/1GhpYmbRaf73AZRxDwAGr6653iZBGzdgeA');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('btc');
- expect(parsed.publicAddress.legacy).toBe('1GhpYmbRaf73AZRxDwAGr6653iZBGzdgeA');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitcoin uri with slashes', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin://18PCPhgZJjLxe9g3Q1BXLpL5aVut1fW3aX');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('btc');
- expect(parsed.publicAddress.legacy).toBe('18PCPhgZJjLxe9g3Q1BXLpL5aVut1fW3aX');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitcoin uri with space', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin: 19cPoKU5ZazY8NkLEsxK7drBqJnpGkax3d');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('btc');
- expect(parsed.publicAddress.legacy).toBe('19cPoKU5ZazY8NkLEsxK7drBqJnpGkax3d');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('Bitpay without prefix', function() {
-
- var parsed = bitcoinUriService.parse('CJoRov8TirekvajiimQpb5Hk95evA7H2Yz');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.bitpay).toBe('CJoRov8TirekvajiimQpb5Hk95evA7H2Yz');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('legacy address', function() {
-
- var parsed = bitcoinUriService.parse('1JXeGEu7bNEAYu6URT6dU6g1Ys6ffSAWYW');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBeUndefined();
- expect(parsed.publicAddress.legacy).toBe('1JXeGEu7bNEAYu6URT6dU6g1Ys6ffSAWYW');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('cashAddr testnet with prefix', function() {
-
- var parsed = bitcoinUriService.parse('bchtest:qpcz6pmurq9ctg5848trzz9zmuuygj4q5qam7ph3gt');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qpcz6pmurq9ctg5848trzz9zmuuygj4q5qam7ph3gt');
- expect(parsed.isTestnet).toBe(true);
- });
-
- it('cashAddr uppercase', function() {
-
- var parsed = bitcoinUriService.parse('BITCOINCASH:QZZG9NMC5VX8GAP6XFATX3TWNSDN2YRMCSSULSMY44');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qzzg9nmc5vx8gap6xfatx3twnsdn2yrmcssulsmy44');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('cashAddr with dash', function() {
-
- var parsed = bitcoinUriService.parse('bitcoin-cash:qpshfu3dk5s3e7zdcgdcun6xgxtra6uyxs7g580js0');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qpshfu3dk5s3e7zdcgdcun6xgxtra6uyxs7g580js0');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('cashAddr with prefix', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash:qrq9p82a247lecv08ldk5p5h6ahtnjzpqcnh8yhq92');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qrq9p82a247lecv08ldk5p5h6ahtnjzpqcnh8yhq92');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('cashAddr with slash', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash:/qzdectfmuw0xxztfx7mh045830dqcshj85hr44l35a');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qzdectfmuw0xxztfx7mh045830dqcshj85hr44l35a');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('cashAddr with slashes', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash://qpj966w8utue75lqqq3rlgh20zkz3rmydqpq8syv9c');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qpj966w8utue75lqqq3rlgh20zkz3rmydqpq8syv9c');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('cashAddr with space', function() {
-
- var parsed = bitcoinUriService.parse('bitcoincash: qpar9ldle8z6alcwgclejdhc24ha2xrg0szs5802ce');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qpar9ldle8z6alcwgclejdhc24ha2xrg0szs5802ce');
- expect(parsed.isTestnet).toBe(false);
- });
-
-
- it('cashAddr with space on testnet', function() {
-
- var parsed = bitcoinUriService.parse('bchtest: qqjxkmtaxk4nv6w9h5ht2fjcj9c7ruh0fu7cnxsx5j');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qqjxkmtaxk4nv6w9h5ht2fjcj9c7ruh0fu7cnxsx5j');
- expect(parsed.isTestnet).toBe(true);
- });
-
- it('cashAddr without prefix', function() {
-
- var parsed = bitcoinUriService.parse('qqen2y3l28dpk0dzsag8w027ds96u7z4pc0uxtl0nq');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.coin).toBe('bch');
- expect(parsed.publicAddress.cashAddr).toBe('qqen2y3l28dpk0dzsag8w027ds96u7z4pc0uxtl0nq');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('copay invitation', function() {
-
- var parsed = bitcoinUriService.parse('PD5B7rEEj72st9d5nFszyuKxJP6FAGS7idVC2SMqiMxUcWVd8JifZDJw1UgjUctxefUFE3Sz6qLbch');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.copayInvitation).toBe('PD5B7rEEj72st9d5nFszyuKxJP6FAGS7idVC2SMqiMxUcWVd8JifZDJw1UgjUctxefUFE3Sz6qLbch');
- });
-
-
- it ('import BCH wallet no password', function() {
- var parsed = bitcoinUriService.parse("1|suggest route obvious broccoli good position hidden tone history around final lobster|livenet|m/44'/0'/0'|false");
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.import.type).toBe(1);
- expect(parsed.import.data).toBe('suggest route obvious broccoli good position hidden tone history around final lobster');
- expect(parsed.isTestnet).toBe(false);
- expect(parsed.import.derivationPath).toBe("m/44'/0'/0'");
- expect(parsed.import.hasPassphrase).toBe(false);
- });
-
- it ('import BCH wallet with passphrase', function() {
- var parsed = bitcoinUriService.parse("1|fringe hazard all hobby trap myth fire stand sock empty soon east|livenet|m/44'/0'/0'|true");
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.import.type).toBe(1);
- expect(parsed.import.data).toBe('fringe hazard all hobby trap myth fire stand sock empty soon east');
- expect(parsed.isTestnet).toBe(false);
- expect(parsed.import.derivationPath).toBe("m/44'/0'/0'");
- expect(parsed.import.hasPassphrase).toBe(true);
- });
-
- it ('import BTC wallet testnet', function() {
- // From copay
- var parsed = bitcoinUriService.parse("1|cat wealth column firm wet sauce tornado era feature monster click eyebrow|testnet|m/44'/1'/0'|false|btc");
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.import.type).toBe(1);
- expect(parsed.import.data).toBe('cat wealth column firm wet sauce tornado era feature monster click eyebrow');
- expect(parsed.isTestnet).toBe(true);
- expect(parsed.import.derivationPath).toBe("m/44'/1'/0'");
- expect(parsed.import.hasPassphrase).toBe(false);
- });
-
- // Invalid addresses from https://github.com/bitcoincashorg/bitcoincash.org/blob/master/spec/cashaddr.md
- it('invalid cashAddr style 1', function() {
- var parsed = bitcoinUriService.parse('prefix:x64nx6hz');
- expect(parsed.isValid).toBe(false);
- });
-
- it('invalid cashAddr style 2', function() {
- var parsed = bitcoinUriService.parse('p:gpf8m4h7');
- expect(parsed.isValid).toBe(false);
- });
-
- it('invalid cashAddr style 3', function() {
- var parsed = bitcoinUriService.parse('bitcoincash:qpzry9x8gf2tvdw0s3jn54khce6mua7lcw20ayyn');
- expect(parsed.isValid).toBe(false);
- });
-
- it('invalid cashAddr style 4', function() {
- var parsed = bitcoinUriService.parse('bchtest:testnetaddress4d6njnut');
- expect(parsed.isValid).toBe(false);
- });
-
- it('invalid cashAddr style 5', function() {
- var parsed = bitcoinUriService.parse('bchreg:555555555555555555555555555555555555555555555udxmlmrz');
- expect(parsed.isValid).toBe(false);
- });
-
- it('non-string', function() {
-
- var parsed = bitcoinUriService.parse([1, 2, 3, 4]);
-
- expect(parsed.isValid).toBe(false);
- });
-
- it('private key encrypted with BIP38', function() {
-
- var parsed = bitcoinUriService.parse('6PRN5nEDmX842gsBzJryPu8Tw5kcsaQq1GPLcjVQPcEStvbFAtz11JX9pX');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.privateKey.encrypted).toBe('6PRN5nEDmX842gsBzJryPu8Tw5kcsaQq1GPLcjVQPcEStvbFAtz11JX9pX');
- });
-
- it('private key for compressed pubkey mainnet', function() {
-
- var parsed = bitcoinUriService.parse('5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.privateKey.wif).toBe('5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('private key for compressed pubkey mainnet with wrong checksum', function() {
-
- var parsed = bitcoinUriService.parse('5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTu');
-
- expect(parsed.isValid).toBe(false);
- });
-
- it('private key for compressed pubkey testnet', function() {
-
- var parsed = bitcoinUriService.parse('cNJFgo1driFnPcBdBX8BrJrpxchBWXwXCvNH5SoSkdcF6JXXwHMm');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.privateKey.wif).toBe('cNJFgo1driFnPcBdBX8BrJrpxchBWXwXCvNH5SoSkdcF6JXXwHMm');
- expect(parsed.isTestnet).toBe(true);
- });
-
- it('private key for compressed pubkey testnet with wrong checksum', function() {
-
- var parsed = bitcoinUriService.parse('cNJFgo1driFnPcBdBX8BrJrpxchBWXwXCvNH5SoSkdcF6JXXwHMM');
-
- expect(parsed.isValid).toBe(false);
- });
-
- it('private key for uncompressed pubkey mainnet', function() {
-
- var parsed = bitcoinUriService.parse('L18V3rAhCKEioPnJ4BHLCCsaYa8eSNFrMjNQ2EdwgeAdmBSnTMwx');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.privateKey.wif).toBe('L18V3rAhCKEioPnJ4BHLCCsaYa8eSNFrMjNQ2EdwgeAdmBSnTMwx');
- expect(parsed.isTestnet).toBe(false);
- });
-
- it('private key for uncompressed pubkey mainnet with wrong checksum', function() {
-
- var parsed = bitcoinUriService.parse('L18V3rAhCKEioPnJ4BHLCCsaYa8eSNFrMjNQ2EdwgeAdmBSnTTwx');
-
- expect(parsed.isValid).toBe(false);
- });
-
- it('private key for uncompressed pubkey testnet', function() {
-
- var parsed = bitcoinUriService.parse('92Pg46rUhgTT7romnV7iGW6W1gbGdeezqdbJCzShkCsYNzyyNcc');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.privateKey.wif).toBe('92Pg46rUhgTT7romnV7iGW6W1gbGdeezqdbJCzShkCsYNzyyNcc');
- expect(parsed.isTestnet).toBe(true);
- });
-
- it('private key for uncompressed pubkey testnet with wrong checksum', function() {
-
- var parsed = bitcoinUriService.parse('92Pg46rUhgTT7romnV7iGW6W1gbGdeezqdbJCzShkCsYNzyyNcC');
-
- expect(parsed.isValid).toBe(false);
- });
-
- it('URL only, http', function() {
-
- var parsed = bitcoinUriService.parse('http://paperwallet.bitcoin.com');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.bareUrl).toBe('http://paperwallet.bitcoin.com');
- });
-
- it('URL only, https with query', function() {
-
- var parsed = bitcoinUriService.parse('https://purse.io/?one=two&three=four');
-
- expect(parsed.isValid).toBe(true);
- expect(parsed.bareUrl).toBe('https://purse.io/?one=two&three=four');
- });
-
-});
\ No newline at end of file
diff --git a/src/js/services/bitcoincomService.js b/src/js/services/bitcoincomService.js
index 62a75b4d1..07e0d8aa4 100644
--- a/src/js/services/bitcoincomService.js
+++ b/src/js/services/bitcoincomService.js
@@ -1,13 +1,12 @@
'use strict';
-angular.module('copayApp.services').factory('bitcoincomService', function(gettextCatalog, nextStepsService, platformInfo) {
+angular.module('copayApp.services').factory('bitcoincomService', function($http, $log, lodash, moment, storageService, configService, platformInfo, nextStepsService, homeIntegrationsService) {
var root = {};
var credentials = {};
/*
* Development: 'testnet'
* Production: 'livenet'
- */
- var os = platformInfo.isAndroid ? 'android' : platformInfo.isIOS ? 'ios' : 'desktop';
+ */
credentials.NETWORK = 'livenet';
//credentials.NETWORK = 'testnet';
@@ -19,44 +18,30 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex
var cashGamesItem = {
name: 'games',
- title: gettextCatalog.getString('Bitcoin Cash Games'),
+ title: 'Bitcoin Cash Games',
icon: 'icon-games',
- href: 'https://cashgames.bitcoin.com'
+ href: 'http://cashgames.bitcoin.com'
};
var newsItem = {
name: 'news',
- title: gettextCatalog.getString('News'),
+ title: 'News',
icon: 'icon-news',
- href: 'https://news.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=News'
+ href: 'http://news.bitcoin.com'
};
var poolItem = {
name: 'pool',
- title: gettextCatalog.getString('Mining Pool'),
+ title: 'Mining Pool',
icon: 'icon-mining',
- href: 'https://pool.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Pool'
+ href: 'http://pool.bitcoin.com'
};
var toolsItem = {
name: 'tools',
- title: gettextCatalog.getString('Tools'),
+ title: 'Tools',
icon: 'icon-tools',
- href: 'https://tools.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Tools'
- };
-
- var priceChartItem = {
- name: 'pricechart',
- title: gettextCatalog.getString('Bitcoin Price Charts'),
- icon: 'icon-chart',
- sref: 'tabs.pricechart',
- };
-
- var faucetItem = {
- name: 'faucet',
- title: gettextCatalog.getString('Free Bitcoin Cash'),
- icon: 'icon-faucet',
- href: 'https://free.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Faucet'
+ href: 'http://tools.bitcoin.com'
};
var _getBitPay = function(endpoint) {
@@ -85,14 +70,10 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex
};
var register = function() {
- if (!platformInfo.isAndroid) { // To comply with Google Play policies
- nextStepsService.register(cashGamesItem);
- }
+ 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/buyAndSellService.js b/src/js/services/buyAndSellService.js
index e35403131..65a9a93c7 100644
--- a/src/js/services/buyAndSellService.js
+++ b/src/js/services/buyAndSellService.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.services').factory('buyAndSellService', function(gettextCatalog, $log, servicesService, lodash, $ionicScrollDelegate, $timeout) {
+angular.module('copayApp.services').factory('buyAndSellService', function($log, servicesService, lodash, $ionicScrollDelegate, $timeout) {
var root = {};
var services = [];
var linkedServices = [];
@@ -23,7 +23,7 @@ angular.module('copayApp.services').factory('buyAndSellService', function(gettex
if (linkedServices.length == 0) {
servicesService.register({
- title: gettextCatalog.getString('Buy Bitcoin'),
+ title: 'Buy Bitcoin',
name: 'buyandsell',
icon: 'icon-buy-bitcoin2',
sref: 'tabs.buyandsell',
diff --git a/src/js/services/clipboardService.js b/src/js/services/clipboardService.js
deleted file mode 100644
index 9b1a61fbe..000000000
--- a/src/js/services/clipboardService.js
+++ /dev/null
@@ -1,51 +0,0 @@
-'use strict';
-
-angular.module('copayApp.services').factory('clipboardService', function ($http, $log, $timeout, platformInfo, nodeWebkitService, gettextCatalog, ionicToast, clipboard) {
- var root = {};
-
- root.copyToClipboard = function (data) {
- if (!data) return;
-
- $log.debug("Copy '"+data+"' to clipboard");
- if (platformInfo.isCordova) {
- cordova.plugins.clipboard.copy(data);
- } else if (platformInfo.isNW) {
- nodeWebkitService.writeToClipboard(data);
- } else if (navigator && navigator.clipboard) {
- $log.debug("Use navigator clipboard.")
- navigator.clipboard.writeText(data).catch(function onClipboardError(err) {
- $log.debug("Clipboard writing is not supported in your browser..");
- });
- } else if (clipboard.supported) {
- clipboard.copyText(data);
- } else {
- // Not supported
- return;
- }
- };
-
- root.readFromClipboard = function (cb) {
- $log.debug("Read from clipboard");
- if (platformInfo.isCordova) {
- cordova.plugins.clipboard.paste(function(text) {
- cb(text);
- })
- } else if (platformInfo.isNW) {
- $timeout(function() {
- cb(nodeWebkitService.readFromClipboard());
- },0);
- } else {
- navigator.clipboard.readText()
- .then(function (text) {
- cb(text);
- })
- .catch(function (err) {
- $log.debug("Clipboard reading is not supported in browser..");
- });
-
- return;
- }
- };
-
- return root;
-});
\ No newline at end of file
diff --git a/src/js/services/communityService.js b/src/js/services/communityService.js
index 93a4afe5e..85e4b155f 100644
--- a/src/js/services/communityService.js
+++ b/src/js/services/communityService.js
@@ -1,5 +1,5 @@
'use strict'
-angular.module('copayApp.services').factory('communityService', function(configService, gettextCatalog, $log, lodash) {
+angular.module('copayApp.services').factory('communityService', function(configService, $log, lodash) {
var root = {};
var services = [];
@@ -37,15 +37,15 @@ angular.module('copayApp.services').factory('communityService', function(configS
var bchRedditItem = {
name: 'bchreddit',
- title: gettextCatalog.getString('Bitcoin Cash Reddit'),
- icon: 'icon-reddit-white',
+ title: 'Bitcoin Cash Reddit',
+ icon: 'icon-reddit',
href: 'http://reddit.com/r/btc'
};
var bitcoincomTwitterItem = {
name: 'bitcoincomTwitter',
- title: gettextCatalog.getString('Bitcoin.com Twitter'),
- icon: 'icon-twitter-white',
+ title: 'Bitcoin.com Twitter',
+ icon: 'icon-twitter',
href: 'https://twitter.com/BTCTN'
};
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 6f2c0ec67..fcf496775 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -18,7 +18,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
},
bwscash: {
- url: 'https://bws.freepages.dk/bws/api'
+ url: 'https://bwscash.bitcoin.com/bws/api'
},
download: {
@@ -85,6 +85,10 @@ angular.module('copayApp.services').factory('configService', function(storageSer
enabled: true,
},
+ displayBitcoinCore: {
+ enabled: false,
+ },
+
hideNextSteps: {
enabled: isWindowsPhoneApp ? true : false,
},
@@ -107,7 +111,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
enabled: false,
},
- soundsEnabled: true,
+ soundsEnabled: false,
log: {
filter: 'debug',
@@ -115,8 +119,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer
bitcoinAlias: 'btc',
bitcoinCashAlias: 'bch',
- bitcoinWalletColor: '#535353', // Dark Grey
- bitcoinCashWalletColor: '#eeb640', // Observatory
+ bitcoinWalletColor: '#fab915', // Observatory
+ bitcoinCashWalletColor: '#26B03C', // Dollar Green
homeSectionIsHidden: {
services: false
diff --git a/src/js/services/desktopSecureStorageService.js b/src/js/services/desktopSecureStorageService.js
deleted file mode 100644
index 6e148da2c..000000000
--- a/src/js/services/desktopSecureStorageService.js
+++ /dev/null
@@ -1,6 +0,0 @@
-'use strict';
-
-angular.module('copayApp.services').factory('desktopSecureStorageService', function($log) {
- // Placeholder
- return {};
-});
\ No newline at end of file
diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js
index 5189527b2..bba972b81 100644
--- a/src/js/services/feeService.js
+++ b/src/js/services/feeService.js
@@ -12,7 +12,6 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
normal: gettext('Normal'),
economy: gettext('Economy'),
superEconomy: gettext('Super Economy'),
-// free: gettext('No fee (works only for BCH)'),
custom: gettext('Custom')
};
@@ -32,7 +31,6 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
root.getFeeRate = function(coin, network, feeLevel, cb) {
if (feeLevel == 'custom') return cb();
-// if (feeLevel == 'free') return cb(null, 0);
network = network || 'livenet';
@@ -50,8 +48,8 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
})
});
}
- var feeRate = feeLevelRate.feePerKb;
+ var feeRate = feeLevelRate.feePerKb;
if (!fromCache) $log.debug('Dynamic fee: ' + feeLevel + '/' + network + ' ' + (feeLevelRate.feePerKb / 1000).toFixed() + ' SAT/B');
diff --git a/src/js/services/feedbackService.js b/src/js/services/feedbackService.js
new file mode 100644
index 000000000..ae4711d27
--- /dev/null
+++ b/src/js/services/feedbackService.js
@@ -0,0 +1,59 @@
+'use strict';
+angular.module('copayApp.services').factory('feedbackService', function($http, $log, $httpParamSerializer, configService) {
+ var root = {};
+// var URL = "https://script.google.com/macros/s/1pWGRxVSUX9CxPqNAKZTppWHtDvyVtZv9HteY_TRQbWc/exec";
+ var URL = "https://wallet-data.bitcoin.com/feedback.php";
+
+ root.send = function(dataSrc, cb) {
+ $http(_post(dataSrc)).then(function() {
+ $log.info("SUCCESS: Feedback sent");
+ return cb();
+ }, function(err) {
+ $log.info("ERROR: Feedback sent anyway.");
+ return cb(err);
+ });
+ };
+
+ var _post = function(dataSrc) {
+ return {
+ method: 'POST',
+ url: URL,
+ headers: {
+ 'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'
+ },
+ data: $httpParamSerializer(dataSrc)
+ };
+ };
+
+ root.isVersionUpdated = function(currentVersion, savedVersion) {
+
+ if (!verifyTagFormat(currentVersion))
+ return 'Cannot verify the format of version tag: ' + currentVersion;
+ if (!verifyTagFormat(savedVersion))
+ return 'Cannot verify the format of the saved version tag: ' + savedVersion;
+
+ var current = formatTagNumber(currentVersion);
+ var saved = formatTagNumber(savedVersion);
+ if (saved.major > current.major || (saved.major == current.major && saved.minor > current.minor))
+ return false;
+
+ return true;
+
+ function verifyTagFormat(tag) {
+ var regex = /^v?\d+\.\d+\.\d+$/i;
+ return regex.exec(tag);
+ };
+
+ function formatTagNumber(tag) {
+ var formattedNumber = tag.replace(/^v/i, '').split('.');
+ return {
+ major: +formattedNumber[0],
+ minor: +formattedNumber[1],
+ patch: +formattedNumber[2]
+ };
+ };
+
+ };
+
+ return root;
+});
diff --git a/src/js/services/firebaseEventsService.js b/src/js/services/firebaseEventsService.js
index d6ce6f1cc..d81e682d7 100644
--- a/src/js/services/firebaseEventsService.js
+++ b/src/js/services/firebaseEventsService.js
@@ -1,5 +1,5 @@
'use strict';
-angular.module('copayApp.services').factory('firebaseEventsService', function firebaseEventsService($log, platformInfo) {
+angular.module('copayApp.services').factory('firebaseEventsService', function firebaseEventsService($log, $state, $ionicHistory, sjcl, platformInfo, lodash, appConfigService, profileService, configService) {
var root = {};
var useEvents = platformInfo.isCordova && !platformInfo.isWP;
diff --git a/src/js/services/incoming-data.service.js b/src/js/services/incoming-data.service.js
deleted file mode 100644
index eece6d17c..000000000
--- a/src/js/services/incoming-data.service.js
+++ /dev/null
@@ -1,79 +0,0 @@
-'use strict';
-
-/**
- * incomingDataService is an intermediate to redirect either to the sendFlow
- * or to import/join a wallet.
- */
-angular.module('copayApp.services').factory('incomingDataService', function(bitcoinUriService, $log, $state, $rootScope, scannerService, sendFlowService, gettextCatalog) {
-
- var root = {};
-
- root.showMenu = function(data) {
- $rootScope.$broadcast('incomingDataMenu.showMenu', data);
- };
-
- root.redir = function(data, cbError) {
- var parsed = bitcoinUriService.parse(data);
-
- console.log(parsed);
- $log.debug(parsed);
-
-
- if (parsed.isValid) {
- if (parsed.isTestnet) {
- if (cbError) {
- var errorMessage = gettextCatalog.getString('Testnet is not supported.');
- cbError(new Error(errorMessage));
- }
- } else {
- scannerService.pausePreview();
-
- /**
- * Strategy for the action
- */
- if (parsed.copayInvitation) {
- $state.go('tabs.home').then(function() {
- $state.transitionTo('tabs.add.join', {
- url: data
- });
- });
- } else if (parsed.import) {
- $state.go('tabs.home').then(function() {
- $state.transitionTo('tabs.add.import', {
- code: data
- });
- });
- } else if (
- !parsed.isValid
- || parsed.privateKey
- || (sendFlowService.state.isEmpty() && !parsed.url && !parsed.amount)
- ) {
- root.showMenu({
- original: data,
- parsed: parsed
- });
- } else {
- var state = sendFlowService.state.getClone();
- state.data = data;
-
- sendFlowService.start(state, function onError(err) {
- /**
- * OnError, open the menu (link not validated)
- */
- root.showMenu({
- original: data,
- parsed: parsed
- });
- });
- }
- }
- } else {
- if (cbError) {
- var errorMessage = gettextCatalog.getString('Data not recognised.');
- cbError(new Error(errorMessage));
- }
- }
- };
-
- return root;
-});
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
new file mode 100644
index 000000000..b912c3233
--- /dev/null
+++ b/src/js/services/incomingData.js
@@ -0,0 +1,432 @@
+'use strict';
+
+angular.module('copayApp.services').factory('incomingData', function($log, $state, $timeout, $ionicHistory, bitcore, bitcoreCash, $rootScope, payproService, scannerService, appConfigService, popupService, gettextCatalog, bitcoinCashJsService) {
+
+ var root = {};
+
+ root.showMenu = function(data) {
+ $rootScope.$broadcast('incomingDataMenu.showMenu', data);
+ };
+
+ root.redir = function(data, shapeshiftData) {
+ var originalAddress = null;
+ var noPrefixInAddress = 0;
+
+ if (data.toLowerCase().indexOf('bitcoin') < 0) {
+ noPrefixInAddress = 1;
+ }
+
+ if (typeof(data) == 'string' && !(/^bitcoin(cash)?:\?r=[\w+]/).exec(data) && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) {
+ try {
+ noPrefixInAddress = 0;
+
+ if (data[0] == 'p' || data[0] == 'q') {
+ data = 'bitcoincash:' + data;
+ }
+ var paramString = '';
+ if (data.indexOf('?') >= 0) {
+ paramString = data.substring(data.indexOf('?'));
+ data = data.substring(0, data.indexOf('?'));
+ }
+
+ if (data.indexOf('BITCOINCASH:') >= 0) {
+ data = data.toLowerCase();
+ }
+ originalAddress = data.replace('bitcoincash:', '');
+ var legacyAddress = bitcoinCashJsService.readAddress(data).legacy;
+ data = 'bitcoincash:' + legacyAddress + paramString;
+ } catch (ex) {}
+ }
+
+ $log.debug('Processing incoming data: ' + data);
+
+ function sanitizeUri(data) {
+ // Fixes when a region uses comma to separate decimals
+ var regex = /[\?\&]amount=(\d+([\,\.]\d+)?)/i;
+ var match = regex.exec(data);
+ if (!match || match.length === 0) {
+ return data;
+ }
+ var value = match[0].replace(',', '.');
+ var newUri = data.replace(regex, value);
+
+ // mobile devices, uris like copay://glidera
+ newUri.replace('://', ':');
+
+ return newUri;
+ }
+
+ function getParameterByName(name, url) {
+ if (!url) return;
+ name = name.replace(/[\[\]]/g, "\\$&");
+ var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+ results = regex.exec(url);
+ if (!results) return null;
+ if (!results[2]) return '';
+ return decodeURIComponent(results[2].replace(/\+/g, " "));
+ }
+
+ function checkPrivateKey(privateKey) {
+ try {
+ new bitcore.PrivateKey(privateKey, 'livenet');
+ } catch (err) {
+ return false;
+ }
+ return true;
+ }
+
+ function goSend(addr, amount, message, coin, shapeshiftData) {
+ $state.go('tabs.send', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.send' ? false : true
+ });
+ // Timeout is required to enable the "Back" button
+ $timeout(function() {
+ if (amount) {
+ $state.transitionTo('tabs.send.confirm', {
+ toAmount: amount,
+ toAddress: addr,
+ displayAddress: originalAddress ? originalAddress : addr,
+ description: message,
+ coin: coin
+ });
+ } else {
+ var params = {
+ toAddress: addr,
+ coin: coin,
+ displayAddress: originalAddress ? originalAddress : addr,
+ noPrefix: noPrefixInAddress
+ };
+ if (shapeshiftData) {
+ params['fromWalletId'] = shapeshiftData.fromWalletId;
+ params['minShapeshiftAmount'] = shapeshiftData.minAmount;
+ params['maxShapeshiftAmount'] = shapeshiftData.maxAmount;
+ params['shapeshiftOrderId'] = shapeshiftData.orderId;
+ }
+ $state.transitionTo('tabs.send.amount', params);
+ }
+ }, 100);
+ }
+ // data extensions for Payment Protocol with non-backwards-compatible request
+ if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) {
+ var coin = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc';
+ data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, ''));
+ if (coin == 'bch') {
+ payproService.getPayProDetailsViaHttp(data, function(err, details) {
+ if (err) {
+ popupService.showAlert(gettextCatalog.getString('Error'), err)
+ } else {
+ handlePayPro(createBchPayProObject(details), coin);
+ }
+ });
+ } else {
+ payproService.getPayProDetails(data, coin, function(err, details) {
+ if (err) {
+ popupService.showAlert(gettextCatalog.getString('Error'), err);
+ } else {
+ handlePayPro(details, coin);
+ }
+ });
+ }
+ return true;
+ }
+
+ data = sanitizeUri(data);
+
+ // Bitcoin URL
+ if (bitcore.URI.isValid(data)) {
+ var coin = 'btc';
+ var parsed = new bitcore.URI(data);
+
+ var addr = parsed.address ? parsed.address.toString() : '';
+ var message = parsed.message;
+
+ var amount = parsed.amount ? parsed.amount : '';
+
+ if (parsed.r) {
+ payproService.getPayProDetails(parsed.r, coin, function(err, details) {
+ if (err) {
+ if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData);
+ else popupService.showAlert(gettextCatalog.getString('Error'), err);
+ } else handlePayPro(details, coin);
+ });
+ } else {
+ goSend(addr, amount, message, coin, shapeshiftData);
+ }
+ return true;
+ // Cash URI
+ } else if (bitcoreCash.URI.isValid(data)) {
+ var coin = 'bch';
+ var parsed = new bitcoreCash.URI(data);
+
+ var addr = parsed.address ? parsed.address.toString() : '';
+ var message = parsed.message;
+
+ var amount = parsed.amount ? parsed.amount : '';
+
+ // paypro not yet supported on cash
+ if (parsed.r) {
+ payproService.getPayProDetails(parsed.r, coin, function(err, details) {
+ if (err) {
+ if (addr && amount)
+ goSend(addr, amount, message, coin, shapeshiftData);
+ else
+ popupService.showAlert(gettextCatalog.getString('Error'), err);
+ }
+ handlePayPro(details, coin);
+ });
+ } else {
+ goSend(addr, amount, message, coin, shapeshiftData);
+ }
+ return true;
+
+ // Cash URI with bitcoin (btc) address version number?
+ } else if (bitcore.URI.isValid(data.replace(/^bitcoincash:/,'bitcoin:'))) {
+ $log.debug('Handling bitcoincash URI with legacy address');
+ var coin = 'bch';
+ var parsed = new bitcore.URI(data.replace(/^bitcoincash:/,'bitcoin:'));
+
+ var oldAddr = parsed.address ? parsed.address.toString() : '';
+ if (!oldAddr) return false;
+
+ var addr = '';
+
+ var a = bitcore.Address(oldAddr).toObject();
+ addr = bitcoreCash.Address.fromObject(a).toString();
+
+ // Translate address
+ $log.debug('address transalated to:' + addr);
+ popupService.showConfirm(
+ gettextCatalog.getString('Bitcoin cash Payment'),
+ gettextCatalog.getString('Payment address was translated to new Bitcoin Cash address format: ' + addr),
+ gettextCatalog.getString('OK'),
+ gettextCatalog.getString('Cancel'),
+ function(ret) {
+ if (!ret) return false;
+
+ var message = parsed.message;
+ var amount = parsed.amount ? parsed.amount : '';
+
+ // paypro not yet supported on cash
+ if (parsed.r) {
+ payproService.getPayProDetails(parsed.r, coin, function(err, details) {
+ if (err) {
+ if (addr && amount)
+ goSend(addr, amount, message, coin, shapeshiftData);
+ else
+ popupService.showAlert(gettextCatalog.getString('Error'), err);
+ }
+ handlePayPro(details, coin);
+ });
+ } else {
+ goSend(addr, amount, message, coin, shapeshiftData);
+ }
+ }
+ );
+ return true;
+ // Plain URL
+ } else if (/^https?:\/\//.test(data)) {
+ payproService.getPayProDetails(data, coin, function(err, details) {
+ if (err) {
+ root.showMenu({
+ data: data,
+ type: 'url'
+ });
+ return;
+ }
+ handlePayPro(details);
+ return true;
+ });
+ // Plain Address
+ } else if (bitcore.Address.isValid(data, 'livenet') || bitcore.Address.isValid(data, 'testnet')) {
+ if ($state.includes('tabs.scan')) {
+ root.showMenu({
+ data: data,
+ type: 'bitcoinAddress'
+ });
+ } else {
+ goToAmountPage(data);
+ }
+ } else if (bitcoreCash.Address.isValid(data, 'livenet')) {
+ if ($state.includes('tabs.scan')) {
+ root.showMenu({
+ data: data,
+ type: 'bitcoinAddress',
+ coin: 'bch',
+ });
+ } else {
+ goToAmountPage(data, 'bch');
+ }
+ } else if (data && data.indexOf(appConfigService.name + '://glidera') === 0) {
+ var code = getParameterByName('code', data);
+ $ionicHistory.nextViewOptions({
+ disableAnimate: true
+ });
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ $ionicHistory.nextViewOptions({
+ disableAnimate: true
+ });
+ $state.transitionTo('tabs.buyandsell.glidera', {
+ code: code
+ });
+ });
+ return true;
+
+ } else if (data && data.indexOf(appConfigService.name + '://coinbase') === 0) {
+ var code = getParameterByName('code', data);
+ $ionicHistory.nextViewOptions({
+ disableAnimate: true
+ });
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ $ionicHistory.nextViewOptions({
+ disableAnimate: true
+ });
+ $state.transitionTo('tabs.buyandsell.coinbase', {
+ code: code
+ });
+ });
+ return true;
+
+ // BitPayCard Authentication
+ } else if (data && data.indexOf(appConfigService.name + '://') === 0) {
+
+ // Disable BitPay Card
+ if (!appConfigService._enabledExtensions.debitcard) return false;
+
+ var secret = getParameterByName('secret', data);
+ var email = getParameterByName('email', data);
+ var otp = getParameterByName('otp', data);
+ var reason = getParameterByName('r', data);
+
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ switch (reason) {
+ default:
+ case '0':
+ /* For BitPay card binding */
+ $state.transitionTo('tabs.bitpayCardIntro', {
+ secret: secret,
+ email: email,
+ otp: otp
+ });
+ break;
+ }
+ });
+ return true;
+
+ // Join
+ } else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ $state.transitionTo('tabs.add.join', {
+ url: data
+ });
+ });
+ return true;
+
+ // Old join
+ } else if (data && data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ $state.transitionTo('tabs.add.join', {
+ url: data
+ });
+ });
+ return true;
+ } else if (data && (data.substring(0, 2) == '6P' || checkPrivateKey(data))) {
+ root.showMenu({
+ data: data,
+ type: 'privateKey'
+ });
+ } else if (data && ((data.substring(0, 2) == '1|') || (data.substring(0, 2) == '2|') || (data.substring(0, 2) == '3|'))) {
+ $state.go('tabs.home').then(function() {
+ $state.transitionTo('tabs.add.import', {
+ code: data
+ });
+ });
+ return true;
+
+ } else {
+ if ($state.includes('tabs.scan')) {
+ root.showMenu({
+ data: data,
+ type: 'text'
+ });
+ }
+ }
+ return false;
+ };
+
+ function goToAmountPage(toAddress, coin) {
+ $state.go('tabs.send', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.send' ? false : true
+ });
+ $timeout(function() {
+ $state.transitionTo('tabs.send.amount', {
+ toAddress: toAddress,
+ coin: coin,
+ noPrefix: 1
+ });
+ }, 100);
+ }
+
+ function createBchPayProObject(payProData) {
+ var displayAddr = payProData.outputs[0].address;
+ var toAddr = bitcoinCashJsService.readAddress('bitcoincash:' + displayAddr).legacy;
+ return {
+ amount: payProData.outputs[0].amount,
+ caTrusted: true,
+ domain: 'bitpay.com',
+ expires: Math.floor(new Date(payProData.expires).getTime() / 1000),
+ memo: payProData.memo,
+ network: 'livenet',
+ requiredFeeRate: payProData.requiredFeeRate,
+ selfSigned: 0,
+ time: Math.ceil(new Date(payProData.time).getTime() / 1000),
+ displayAddress: displayAddr,
+ toAddress: toAddr,
+ url: payProData.paymentUrl,
+ verified: true
+ };
+ }
+
+ function handlePayPro(payProDetails, coin) {
+ var stateParams = {
+ toAmount: payProDetails.amount,
+ toAddress: payProDetails.toAddress,
+ description: payProDetails.memo,
+ paypro: payProDetails,
+ coin: coin,
+ };
+
+ // fee
+ if (payProDetails.requiredFeeRate) {
+ stateParams.requiredFeeRate = payProDetails.requiredFeeRate * 1024;
+ }
+
+ scannerService.pausePreview();
+ $state.go('tabs.send', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.send' ? false : true
+ }).then(function() {
+ $timeout(function() {
+ $state.transitionTo('tabs.send.confirm', stateParams);
+ });
+ });
+ }
+
+ return root;
+});
diff --git a/src/js/services/latest-release.service.js b/src/js/services/latest-release.service.js
deleted file mode 100644
index 85c50bb03..000000000
--- a/src/js/services/latest-release.service.js
+++ /dev/null
@@ -1,180 +0,0 @@
-'use strict';
-
-(function() {
-
- angular
- .module('bitcoincom.services')
- .factory('latestReleaseService', latestReleaseService);
-
- function latestReleaseService($log, $http, $ionicPopup, configService, externalLinkService, gettextCatalog, platformInfo) {
-
- var service = {
- // Functions
- checkLatestRelease: checkLatestRelease,
- requestLatestRelease: requestLatestRelease,
- showUpdatePopup: showUpdatePopup
- };
-
- return service;
-
- function checkLatestRelease(cb) {
- var releaseURL = configService.getDefaults().release.url;
-
- requestLatestRelease(releaseURL, function (err, releaseData) {
- if (err) return cb(err);
- var currentVersion = window.version;
- var latestVersion = releaseData.tag_name;
-
- if (!verifyTagFormat(currentVersion))
- return cb('Cannot verify the format of version tag: ' + currentVersion);
- if (!verifyTagFormat(latestVersion))
- return cb('Cannot verify the format of latest release tag: ' + latestVersion);
-
- var current = formatTagNumber(currentVersion);
- var latest = formatTagNumber(latestVersion);
-
- if (latest.major < current.major || (latest.major === current.major && latest.minor <= current.minor)) {
- return cb(null, false);
- }
-
- var releaseSearchTerm = "";
- if (platformInfo.isNW) { // XX SP: DESKTOP: Check if the latest release is already available for current OS
- var platform = process.platform;
- if (platform === "darwin") {
- releaseSearchTerm = "osx";
- } else if (platform === "win32") {
- releaseSearchTerm = "win";
- } else if (platform === "linux") {
- releaseSearchTerm = "linux";
- }
- var foundNewVersion = false;
- for (var i in releaseData.assets) {
- if (releaseData.assets[i].name.indexOf(releaseSearchTerm) !== -1) {
- foundNewVersion = true;
- break;
- }
- }
- }
-
- $log.debug('A new version is available: ' + latestVersion);
-
- var releaseNotes = false;
- if (releaseData.body) {
- var releaseLines = releaseData.body.split('\n');
- for (var lineNum in releaseLines) {
- if (releaseLines[lineNum].substring(0, 2) === "# ") {
- releaseLines[lineNum] = "" + releaseLines[lineNum].substring(2) + "";
- } else if (releaseLines[lineNum].substring(0, 2) === "- ") {
- releaseLines[lineNum] = "• " + releaseLines[lineNum].substring(2);
- }
- }
- releaseNotes = releaseLines.join('\n');
- }
-
- return cb(null, {latestVersion: latestVersion, releaseNotes: releaseNotes});
- });
-
- function verifyTagFormat(tag) {
- var regex = /^v?\d+\.\d+(\.\d+)?(-rc\d)?$/i;
- return regex.exec(tag);
- }
-
- function formatTagNumber(tag) {
- var label = false;
- if (tag.split("-")[1]) { // Move postfixes like "-rc2" to a variable
- label = tag.split("-")[1];
- tag = tag.split("-")[0];
- }
-
- var formattedNumber = tag.replace(/^v/i, '').split('.');
- return {
- major: +(formattedNumber[0] ? +formattedNumber[0] : 0),
- minor: +(formattedNumber[1] ? +formattedNumber[1] : 0),
- patch: +(formattedNumber[2] ? +formattedNumber[2] : 0),
- label: label /* XX SP: Maybe we can use this in a later stage (with for example 1.0.0-rc2 the value will be "rc2" and false if there is no label) */
- };
- }
- }
-
- function requestLatestRelease(releaseURL, cb) {
- $log.debug('Retrieving latest release information...');
-
- var request = {
- url: releaseURL,
- method: 'GET',
- json: true
- };
-
- $http(request).then(function (release) {
- $log.debug('Latest release: ' + release.data.name);
- return cb(null, release.data);
- }, function (err) {
- return cb('Cannot get the release information: ' + err);
- });
- }
-
- function showUpdatePopup() {
- var buttons = [];
-
- if (!platformInfo.isIOS) { // There is no GitHub-release for iPhone
- buttons.push({
- text: "GitHub",
- type: 'button-positive',
- onTap: function () {
- var url = 'https://github.com/Bitcoin-com/Wallet/releases/latest';
- externalLinkService.open(url, false);
- }
- });
- }
- if (platformInfo.isAndroid) {
- buttons.unshift({
- text: "Google Play Store",
- type: 'button-positive',
- onTap: function () {
- var url = 'https://play.google.com/store/apps/details?id=com.bitcoin.mwallet';
- externalLinkService.open(url, false);
- }
- });
- }
- if (platformInfo.isIOS) {
- buttons.unshift({
- text: "App Store",
- type: 'button-positive',
- onTap: function () {
- var url = 'https://itunes.apple.com/app/id1252903728';
- externalLinkService.open(url, false);
- }
- });
- } else if (platformInfo.isNW) {
- if (process.platform === 'darwin') {
- buttons.unshift({
- text: "Mac App Store",
- type: 'button-positive',
- onTap: function () {
- var url = 'https://itunes.apple.com/app/bitcoin-com-wallet/id1383072453';
- externalLinkService.open(url, false);
- }
- });
- }
- }
-
- if (buttons.length === 1) { // There is only one source to download (probably on desktop, so open GitHub release page..)
- buttons[0].onTap();
- } else {
- buttons.push({
- text: gettextCatalog.getString('Go Back'),
- type: 'button-positive',
- onTap: function () {
- return true;
- }
- });
- $ionicPopup.show({
- title: gettextCatalog.getString('Update Available'),
- subTitle: gettextCatalog.getString('An update to this app is available. For your security, please update to the latest version.'),
- cssClass: 'popup-update',
- buttons: buttons
- });
- }
- }
- }
-})();
\ No newline at end of file
diff --git a/src/js/services/latestReleaseService.js b/src/js/services/latestReleaseService.js
new file mode 100644
index 000000000..87aace87f
--- /dev/null
+++ b/src/js/services/latestReleaseService.js
@@ -0,0 +1,63 @@
+'use strict';
+angular.module('copayApp.services')
+ .factory('latestReleaseService', function latestReleaseServiceFactory($log, $http, configService) {
+
+ var root = {};
+
+ root.checkLatestRelease = function(cb) {
+ var releaseURL = configService.getDefaults().release.url;
+
+ requestLatestRelease(releaseURL, function(err, release) {
+ if (err) return cb(err);
+ var currentVersion = window.version;
+ var latestVersion = release.data.tag_name;
+
+ if (!verifyTagFormat(currentVersion))
+ return cb('Cannot verify the format of version tag: ' + currentVersion);
+ if (!verifyTagFormat(latestVersion))
+ return cb('Cannot verify the format of latest release tag: ' + latestVersion);
+
+ var current = formatTagNumber(currentVersion);
+ var latest = formatTagNumber(latestVersion);
+
+ if (latest.major < current.major || (latest.major == current.major && latest.minor <= current.minor))
+ return cb(null, false);
+
+ $log.debug('A new version is available: ' + latestVersion);
+ return cb(null, true);
+ });
+
+ function verifyTagFormat(tag) {
+ var regex = /^v?\d+\.\d+\.\d+$/i;
+ return regex.exec(tag);
+ };
+
+ function formatTagNumber(tag) {
+ var formattedNumber = tag.replace(/^v/i, '').split('.');
+ return {
+ major: +formattedNumber[0],
+ minor: +formattedNumber[1],
+ patch: +formattedNumber[2]
+ };
+ };
+ };
+
+ function requestLatestRelease(releaseURL, cb) {
+ $log.debug('Retrieving latest relsease information...');
+
+ var request = {
+ url: releaseURL,
+ method: 'GET',
+ json: true
+ };
+
+ $http(request).then(function(release) {
+ $log.debug('Latest release: ' + release.data.name);
+ return cb(null, release);
+ }, function(err) {
+ return cb('Cannot get the release information: ' + err);
+ });
+ };
+
+ return root;
+ });
diff --git a/src/js/services/localStorage.js b/src/js/services/localStorage.js
index ba0db231b..c772b7eef 100644
--- a/src/js/services/localStorage.js
+++ b/src/js/services/localStorage.js
@@ -20,7 +20,8 @@ angular.module('copayApp.services')
if (isChromeApp || isNW) {
chrome.storage.local.get(k,
function(data) {
- return cb(chrome.runtime.lastError, data[k]);
+ //TODO check for errors
+ return cb(null, data[k]);
});
} else {
return cb(null, ls.getItem(k));
@@ -55,24 +56,16 @@ angular.module('copayApp.services')
obj[k] = v;
- chrome.storage.local.set(obj, function(){
- cb(chrome.runtime.lastError);
- });
+ chrome.storage.local.set(obj, cb);
} else {
- try {
- ls.setItem(k, v);
- } catch (e) {
- return cb(e);
- }
+ ls.setItem(k, v);
return cb();
}
};
root.remove = function(k, cb) {
if (isChromeApp || isNW) {
- chrome.storage.local.remove(k, function(){
- cb(chrome.runtime.lastError);
- });
+ chrome.storage.local.remove(k, cb);
} else {
ls.removeItem(k);
return cb();
diff --git a/src/js/services/mobileSecureStorageService.js b/src/js/services/mobileSecureStorageService.js
deleted file mode 100644
index f9994fdf8..000000000
--- a/src/js/services/mobileSecureStorageService.js
+++ /dev/null
@@ -1,88 +0,0 @@
-'use strict';
-
-angular.module('copayApp.services').factory('mobileSecureStorageService', function($log, appConfigService, platformInfo) {
- var root = {};
-
- var isReady = false;
- var initialisationFailed = false;
- var pending = [];
-
- var storage = null;
-
- if (platformInfo.isCordova) {
- storage = new cordova.plugins.SecureStorage(
- function () {
- isReady = true;
- for (var i = 0; i < pending.length; i++) {
- pending[i]();
- }
- pending = [];
- },
- function (error) {
- initialisationFailed = true;
- },
- appConfigService.packageNameId);
- }
-
- root.get = function(key, cb) {
-
- if (!platformInfo.isMobile) {
- cb(new Error('mobileSecureStorageService is only available on mobile.'));
- return;
- }
-
- if (!isReady) {
- if (initialisationFailed) {
- cb(new Error('mobileSecureStorageService initialisation failed.'));
- } else {
- pending.push(function(){ root.get(key, cb); });
- }
- return;
- }
-
- storage.get(
- function (value) {
- cb(null, value);
- },
- function (error) {
- $log.debug('mss get failed. ' + error);
- if (error.message === 'Failure in SecureStorage.get() - The specified item could not be found in the keychain' || // iOS
- error.message === 'Key [_SS_profile] not found.') { // Android
- // The callback expects no error, but also no value, if it cannot be found.
- cb(null, null);
- } else {
- cb(new Error(error));
- }
- },
- key);
- };
-
- root.set = function(key, value, cb) {
-
- if (!platformInfo.isMobile) {
- cb(new Error('mobileSecureStorageService is only available on mobile.'));
- }
-
- if (!isReady) {
- if (initialisationFailed) {
- cb(new Error('mobileSecureStorageService initialisation failed.'));
- } else {
- pending.push(function(){ root.set(key, value, cb); });
- }
- return;
- }
-
- storage.set(
- function (value) {
- cb();
- },
- function (error) {
- cb(new Error(error));
- },
- key, value);
-
- };
-
- return root;
-});
-
diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js
index 422be070f..147985dbb 100644
--- a/src/js/services/onGoingProcess.js
+++ b/src/js/services/onGoingProcess.js
@@ -52,7 +52,11 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
root.clear = function() {
ongoingProcess = {};
- $ionicLoading.hide();
+ if (isCordova && !isWindowsPhoneApp) {
+ window.plugins.spinnerDialog.hide();
+ } else {
+ $ionicLoading.hide();
+ }
};
root.get = function(processName) {
@@ -74,21 +78,28 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
root.onGoingProcessName = name;
var showName = $filter('translate')(processNames[name] || name);
-
- if (root.onGoingProcessName) {
- var tmpl;
- if (isWindowsPhoneApp) tmpl = '
-
+ 
+ 
@@ -50,4 +66,4 @@
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
-
+
-
+
@@ -38,11 +38,11 @@
@@ -57,40 +57,16 @@
-
-
-
-
-
-
- Cancel
-
- 
-
-
-
-
+
diff --git a/www/views/includes/nextSteps.html b/www/views/includes/nextSteps.html
index 6f42ae400..f7a196baf 100644
--- a/www/views/includes/nextSteps.html
+++ b/www/views/includes/nextSteps.html
@@ -6,15 +6,15 @@
+ 
- 
Share this transaction
- 
-
+ ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)">
- 
+ Bitcoin Cash (BCH)
+ Bitcoin Core (BTC)